From 57c9167c23630bdadec5e905a7f1a33389e69ed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Fri, 8 Dec 2023 17:36:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E5=80=BC=E4=BF=AE=E6=94=B9=E3=80=81=E4=BA=A4=E6=98=93?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=AF=8F=E4=B8=A4=E7=A7=92=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9C=80=E6=96=B0=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/biddingHall/index.vue     |  4 +---
 src/views/project/projectDetail.vue |  9 +++++++--
 src/views/user/bidding/index.vue    | 28 ++++++++--------------------
 3 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/src/views/biddingHall/index.vue b/src/views/biddingHall/index.vue
index 78b7ba91..13cc3060 100644
--- a/src/views/biddingHall/index.vue
+++ b/src/views/biddingHall/index.vue
@@ -133,9 +133,7 @@
             </p>
             <p :style="{
                 color: {
-                  '未开始': '#007E72',
-                  '已结束': '#848484',
-                  '竞价中': '#c21F3a',
+                  '正在报名': '#007E72','等待竞价': '#848484','等待成交': '#848484','已经成交': '#848484','正在竞价': '#c21F3a',
                 }[item.projectShowStatus]}">{{item.projectShowStatus}}</p>
           </div>
           <div class="list_li_time">
diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue
index f6f5bb0f..014c45a6 100644
--- a/src/views/project/projectDetail.vue
+++ b/src/views/project/projectDetail.vue
@@ -502,6 +502,11 @@ export default {
       let m = Math.floor(difference/1000/60%60);
       let s = Math.floor(difference/1000%60);
 
+      if (s%2 == 0&&time!=0){
+        getBiddingStopTime(this.id).then(response =>{
+          this.$set(this.detail,'biddingStopTime',response.data);
+        });
+      }
 
       if (differenceSetime <= 0 && difference >= 0 && difference <=time){
         console.log("竞价剩余两分钟"+"m:"+m+"s:"+s)
@@ -529,7 +534,7 @@ export default {
               this.$set(this.detail,'biddingStopTime',response.data)
               this.getTime();
             } else {
-              clearInterval(this.timeCount);
+              // clearInterval(this.timeCount);
               this.process = "竞价结束"
               this.tip = this.detail.biddingStopTime + "结束竞价"
               this.btnMsg = "竞价结束"
@@ -617,7 +622,7 @@ export default {
       }
       if(nowDate>biddingStopTime){
         //console.log('竞价结束')
-        clearInterval(this.timeCount);
+        // clearInterval(this.timeCount);
         this.process= "竞价结束"
         this.tip=this.detail.biddingStopTime+"结束竞价"
         this.btnMsg="竞价结束"
diff --git a/src/views/user/bidding/index.vue b/src/views/user/bidding/index.vue
index 199cfdc3..6969b8e4 100644
--- a/src/views/user/bidding/index.vue
+++ b/src/views/user/bidding/index.vue
@@ -20,9 +20,7 @@
           <p>{{item.projectName}}</p>
           <p :style="{
                 color: {
-                  '未开始': '#007E72',
-                  '已结束': '#848484',
-                  '竞价中': '#c21F3a',
+                  '正在报名': '#007E72','等待竞价': '#848484','等待成交': '#848484','已经成交': '#848484','正在竞价': '#c21F3a',
                 }[item.projectShowStatus]}">{{item.projectShowStatus}}</p>
         </div>
         <div class="list_li_time" @click="$router.push({name:'projectDetail', query: {id:item.id}})">
@@ -31,9 +29,7 @@
               <span style="color: #848484;font-size: 14PX;">距结束</span>
               <span :style="{'font-size':'14px',
                 color: {
-                  '未开始': '#007E72',
-                  '已结束': '#848484',
-                  '竞价中': '#c21F3a',
+                  '正在报名': '#007E72','等待竞价': '#848484','等待成交': '#848484','已经成交': '#848484','正在竞价': '#c21F3a',
                 }[item.projectShowStatus]}">
                     <span style="font-size: 18PX;">{{timeData.days}}</span>天
                     <span style="font-size: 18PX;">{{timeData.hours}}</span>时
@@ -48,27 +44,21 @@
             <span style="color: #848484">当前价格</span>
             <span :style="{'font-size':'14px',
                   color: {
-                    '未开始': '#007E72',
-                    '已结束': '#848484',
-                    '竞价中': '#c21F3a',
-                  }[item.projectShowStatus]}" v-if="item.biddingType=='1'&&item.projectShowStatus=='竞价中'">
+                    '正在报名': '#007E72','等待竞价': '#848484','等待成交': '#848484','已经成交': '#848484','正在竞价': '#c21F3a',
+                  }[item.projectShowStatus]}" v-if="item.biddingType=='1'&&item.projectShowStatus=='正在竞价'">
                     *
                   </span>
 
             <span :style="{'font-size':'14px',
                   color: {
-                    '未开始': '#007E72',
-                    '已结束': '#848484',
-                    '竞价中': '#c21F3a',
-                  }[item.projectShowStatus]}" v-if="(item.biddingType!='1'&&item.money) || item.projectShowStatus=='已结束'">
+                    '正在报名': '#007E72','等待竞价': '#848484','等待成交': '#848484','已经成交': '#848484','正在竞价': '#c21F3a',
+                  }[item.projectShowStatus]}" v-if="(item.biddingType!='1'&&item.money) || item.projectShowStatus=='等待成交'">
                     {{item.money}}{{item.unit}}
                   </span>
 
             <span :style="{'font-size':'14px',
                   color: {
-                    '未开始': '#007E72',
-                    '已结束': '#848484',
-                    '竞价中': '#c21F3a',
+                    '正在报名': '#007E72','等待竞价': '#848484','等待成交': '#848484','已经成交': '#848484','正在竞价': '#c21F3a',
                   }[item.projectShowStatus]}" v-if="item.biddingType!='1'&&!item.money">
                     暂无出价
             </span>
@@ -79,9 +69,7 @@
             <span style="color: #848484">我的出价</span>
             <span :style="{'font-size':'14px',
               color: {
-                '未开始': '#007E72',
-                '已结束': '#848484',
-                '竞价中': '#c21F3a',
+                '正在报名': '#007E72','等待竞价': '#848484','等待成交': '#848484','已经成交': '#848484','正在竞价': '#c21F3a',
               }[item.projectShowStatus]}" v-if="item.biddingType!='自由竞价'&&item.money">
                 {{item.memberMoney}}{{item.unit}}
             </span>