From abec264df98bdf67ed2113b74664ecec1df49b05 Mon Sep 17 00:00:00 2001
From: zzy <411037547@qq.com>
Date: Thu, 25 May 2023 09:05:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=86=E6=B6=A6=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E9=A1=B5=E9=9D=A2=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/projectWarning/components/listUnit.vue | 14 ++++++++++----
 pages/projectWarning/detail.vue              |  7 +++++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/pages/projectWarning/components/listUnit.vue b/pages/projectWarning/components/listUnit.vue
index b654fc3..bf7159b 100644
--- a/pages/projectWarning/components/listUnit.vue
+++ b/pages/projectWarning/components/listUnit.vue
@@ -24,10 +24,16 @@
 			<!-- 中间 -->
 			<!-- 资质到期时间 -->
 			<p class="titleStyle" >
-        <text style="font-size: 12px;color: orangered" v-if="item.EXPIREDAYS!==0">预计</text>
-        <text :style="{fontSize:item.EXPIREDAYS!==0?'28px':'18px',lineHeight:'50px',margin:'0 4px'}">
-        {{item.EXPIREDAYS!==0?`${item.EXPIREDAYS}`:'完成保底'}}</text><text style="font-size: 12px" v-if="item.EXPIREDAYS!==0">天</text>
-      </p>
+				<text v-if="item.EXPIREDAYS!==0">
+					<text style="font-size: 12px;color: orangered;">预计</text>
+					<text style="font-size: 28px;line-height: 50px;margin: 0 4px;">{{item.EXPIREDAYS}}</text>
+					<text style="font-size: 12px;">天</text>
+				</text>
+				<text v-else>
+					<text style="fontSize:18px;lineHeight:50px;margin:0 4px;color: red;" v-if="item.SWITCH_DATE">已切换</text>
+					<text style="fontSize:18px;lineHeight:50px;margin:0 4px;" v-else>完成保底</text>
+				</text>
+			</p>
 		</view>
 		<!-- 分割线 -->
 		<view class="bb1"></view>
diff --git a/pages/projectWarning/detail.vue b/pages/projectWarning/detail.vue
index 2e2af28..4450896 100644
--- a/pages/projectWarning/detail.vue
+++ b/pages/projectWarning/detail.vue
@@ -58,8 +58,11 @@
               <span v-if="dataDetail.EXPIREDAYS===0" class="strong">已完成</span>保底！
             </view>
             <view class="text" :style="{marginBottom: dataDetail.PROJECTWARNING_STATE===2000?'8px':'0px'}">
-              是否依合同将分润比例进行切换：<br/> 驿达<span class="strong">{{YDValue|| '-'}}%</span>,
-              商家<span class="strong">{{SJValue|| '-'}}%</span>？
+			  <span v-if="dataDetail.PROJECTWARNING_STATE===9000">{{dataDetail.PROJECTWARNING_DESC}}：</span>
+			  <span v-else>是否依合同将分润比例进行切换：</span><br/> 
+              驿达<span class="strong">{{YDValue|| '-'}}%</span>,
+              商家<span class="strong">{{SJValue|| '-'}}%</span>
+			  <span v-if="dataDetail.PROJECTWARNING_STATE>0&&dataDetail.PROJECTWARNING_STATE<9000">？</span>
             </view>
           </view>
         </view>