From 18fe36eab139e7f4bd6053fb7f1d8a617e1c2671 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Wed, 17 Jan 2024 17:20:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E4=BA=A4=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/biddingHall/index.vue     | 6 +++---
 src/views/project/projectDetail.vue | 4 ++--
 src/views/user/bidding/index.vue    | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/biddingHall/index.vue b/src/views/biddingHall/index.vue
index caeea3cd..edf072d6 100644
--- a/src/views/biddingHall/index.vue
+++ b/src/views/biddingHall/index.vue
@@ -115,11 +115,11 @@
               <span style="color: #848484">当前价：</span>
 
               <!--自由竞价竞价中-->
-              <span :style="{'font-size':'14px',color: {'正在报名': '#007E72','等待竞价': '#848484','等待成交': '#848484','已经成交': '#848484','正在竞价': '#c21F3a',}[item.projectShowStatus]}" v-if="item.biddingType=='自由竞价'&&item.deadline>0 && item.projectShowStatus != '已经成交'">*</span>
+              <span :style="{'font-size':'14px',color: {'正在报名': '#007E72','等待竞价': '#848484','等待成交': '#848484','已经成交': '#848484','正在竞价': '#c21F3a',}[item.projectShowStatus]}" v-if="item.biddingType=='自由竞价'&&item.deadline>0 && item.projectShowStatus == '正在竞价'">*</span>
               <!--自由竞价竞价中-->
-              <span :style="{'font-size':'14px',color: {'正在报名': '#007E72','等待竞价': '#848484','等待成交': '#848484','已经成交': '#848484','正在竞价': '#c21F3a',}[item.projectShowStatus]}" v-if="(item.biddingType=='自由竞价'&&item.deadline<=0)&&item.money && item.projectShowStatus != '已经成交'">*</span>
+              <span :style="{'font-size':'14px',color: {'正在报名': '#007E72','等待竞价': '#848484','等待成交': '#848484','已经成交': '#848484','正在竞价': '#c21F3a',}[item.projectShowStatus]}" v-if="(item.biddingType=='自由竞价'&&item.deadline<=0)&&item.money && item.projectShowStatus == '正在竞价'">*</span>
               <!--自由竞价竞价结束(有人出价)-->
-              <span :style="{'font-size':'14px',color: {'正在报名': '#007E72','等待竞价': '#848484','等待成交': '#848484','已经成交': '#848484','正在竞价': '#c21F3a',}[item.projectShowStatus]}" v-if="(item.biddingType=='自由竞价'&&item.deadline<=0)&&item.money && item.projectShowStatus == '已经成交'">{{item.money}}{{item.priceUnit}}</span>
+              <span :style="{'font-size':'14px',color: {'正在报名': '#007E72','等待竞价': '#848484','等待成交': '#848484','已经成交': '#848484','正在竞价': '#c21F3a',}[item.projectShowStatus]}" v-if="(item.biddingType=='自由竞价'&&item.deadline<=0)&&item.money && item.projectShowStatus != '正在竞价'">{{item.money}}{{item.priceUnit}}</span>
               <!--自由竞价竞价结束(无人出价)-->
               <span :style="{'font-size':'14px',color: {'正在报名': '#007E72','等待竞价': '#848484','等待成交': '#848484','已经成交': '#848484','正在竞价': '#c21F3a',}[item.projectShowStatus]}" v-if="(item.biddingType=='自由竞价'&&item.deadline<=0)&&!item.money">暂无出价</span>
 
diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue
index cb904f28..ff46e954 100644
--- a/src/views/project/projectDetail.vue
+++ b/src/views/project/projectDetail.vue
@@ -39,7 +39,7 @@
           </van-row>
         </div>
 
-        <div class="lead" v-if="((detail.biddingType=='自由竞价' || detail.biddingType=='1')&&detail.projectShowStatus=='已经成交') || (detail.biddingType!='自由竞价' && detail.biddingType!='1')">
+        <div class="lead" v-if="((detail.biddingType=='自由竞价' || detail.biddingType=='1')&&detail.projectShowStatus!='正在竞价') || (detail.biddingType!='自由竞价' && detail.biddingType!='1')">
           <van-row >
             <van-col span="2"><van-image src="../../static/images/icon/phone.png" style="vertical-align: text-top;" /></van-col>
             <template v-if="biddinglistInformation!=undefined&&biddinglistInformation.length>0">
@@ -187,7 +187,7 @@
       <van-tab title="竞价记录" title-style="font-size:12px;">
         <p class="delTitle">竞价记录</p>
         <div class="biddingList">
-          <p v-if="detail.biddingType == '自由竞价' && detail.projectShowStatus != '已经成交'">友情提示：自由竞价方式下，项目成交前不显示竞价记录！</p>
+          <p v-if="detail.biddingType == '自由竞价' && detail.projectShowStatus == '正在竞价'">友情提示：自由竞价方式下，项目正在竞价不显示竞价记录！</p>
           <table v-else width="100%" cellspacing="0">
             <tr>
               <td>出价人</td>
diff --git a/src/views/user/bidding/index.vue b/src/views/user/bidding/index.vue
index 9aadffc2..14495f34 100644
--- a/src/views/user/bidding/index.vue
+++ b/src/views/user/bidding/index.vue
@@ -45,21 +45,21 @@
             <span :style="{'font-size':'14px',
                   color: {
                     '正在报名': '#007E72','等待竞价': '#848484','等待成交': '#848484','已经成交': '#848484','正在竞价': '#c21F3a',
-                  }[item.projectShowStatus]}" v-if="item.biddingType=='1'&&item.projectShowStatus!='已经成交'">
+                  }[item.projectShowStatus]}" v-if="item.biddingType=='1'&&item.projectShowStatus=='正在竞价'">
                     *
                   </span>
 
             <span :style="{'font-size':'14px',
                   color: {
                     '正在报名': '#007E72','等待竞价': '#848484','等待成交': '#848484','已经成交': '#848484','正在竞价': '#c21F3a',
-                  }[item.projectShowStatus]}" v-if="(item.biddingType=='1'&&item.projectShowStatus=='已经成交'&&item.money) || (item.biddingType!='1'&&item.money)">
+                  }[item.projectShowStatus]}" v-if="(item.biddingType=='1'&&item.projectShowStatus!='正在竞价'&&item.money) || (item.biddingType!='1'&&item.money)">
                     {{item.money}}{{item.unit}}
                   </span>
 
             <span :style="{'font-size':'14px',
                   color: {
                     '正在报名': '#007E72','等待竞价': '#848484','等待成交': '#848484','已经成交': '#848484','正在竞价': '#c21F3a',
-                  }[item.projectShowStatus]}" v-if="(item.biddingType!='1'&&!item.money) || (item.biddingType=='1'&&item.projectShowStatus=='已经成交'&&!item.money)">
+                  }[item.projectShowStatus]}" v-if="(item.biddingType!='1'&&!item.money) || (item.biddingType=='1'&&item.projectShowStatus!='正在竞价'&&!item.money)">
                     暂无出价
             </span>
           </p>