From 9943f57db7d1140557b9be7f0a7ce9373d8f03da 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:03:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/biddingHall/index.vue     | 14 +++++++-------
 src/views/project/projectDetail.vue |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/biddingHall/index.vue b/src/views/biddingHall/index.vue
index 3a79ef0a..78b7ba91 100644
--- a/src/views/biddingHall/index.vue
+++ b/src/views/biddingHall/index.vue
@@ -115,20 +115,20 @@
               <span style="color: #848484">当前价：</span>
 
               <!--自由竞价竞价中-->
-              <span :style="{'font-size':'14px',color: {'未开始': '#007E72','已结束': '#848484','竞价中': '#c21F3a',}[item.projectShowStatus]}" v-if="item.biddingType=='自由竞价'&&item.deadline>0">*</span>
+              <span :style="{'font-size':'14px',color: {'正在报名': '#007E72','等待竞价': '#848484','等待成交': '#848484','已经成交': '#848484','正在竞价': '#c21F3a',}[item.projectShowStatus]}" v-if="item.biddingType=='自由竞价'&&item.deadline>0">*</span>
               <!--自由竞价竞价结束(有人出价)-->
-              <span :style="{'font-size':'14px',color: {'未开始': '#007E72','已结束': '#848484','竞价中': '#c21F3a',}[item.projectShowStatus]}" v-if="(item.biddingType=='自由竞价'&&item.deadline<=0)&&item.money">{{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.money}}{{item.priceUnit}}</span>
               <!--自由竞价竞价结束(无人出价)-->
-              <span :style="{'font-size':'14px',color: {'未开始': '#007E72','已结束': '#848484','竞价中': '#c21F3a',}[item.projectShowStatus]}" v-if="(item.biddingType=='自由竞价'&&item.deadline<=0)&&!item.money">暂无出价</span>
+              <span :style="{'font-size':'14px',color: {'正在报名': '#007E72','等待竞价': '#848484','等待成交': '#848484','已经成交': '#848484','正在竞价': '#c21F3a',}[item.projectShowStatus]}" v-if="(item.biddingType=='自由竞价'&&item.deadline<=0)&&!item.money">暂无出价</span>
 
               <!--阶梯竞价竞价中(有人出价)-->
-              <span :style="{'font-size':'14px',color: {'未开始': '#007E72','已结束': '#848484','竞价中': '#c21F3a',}[item.projectShowStatus]}" v-if="(item.biddingType!='自由竞价'&&item.deadline>0)&&item.money">{{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.money}}{{item.priceUnit}}</span>
               <!--阶梯竞价竞价中(无人出价)-->
-              <span :style="{'font-size':'14px',color: {'未开始': '#007E72','已结束': '#848484','竞价中': '#c21F3a',}[item.projectShowStatus]}" v-if="(item.biddingType!='自由竞价'&&item.deadline>0)&&!item.money">暂无出价</span>
+              <span :style="{'font-size':'14px',color: {'正在报名': '#007E72','等待竞价': '#848484','等待成交': '#848484','已经成交': '#848484','正在竞价': '#c21F3a',}[item.projectShowStatus]}" v-if="(item.biddingType!='自由竞价'&&item.deadline>0)&&!item.money">暂无出价</span>
               <!--阶梯竞价竞价结束(有人出价)-->
-              <span :style="{'font-size':'14px',color: {'未开始': '#007E72','已结束': '#848484','竞价中': '#c21F3a',}[item.projectShowStatus]}" v-if="(item.biddingType!='自由竞价'&&item.deadline<=0)&&item.money">{{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.money}}{{item.priceUnit}}</span>
               <!--阶梯竞价竞价结束(无人出价)-->
-              <span :style="{'font-size':'14px',color: {'未开始': '#007E72','已结束': '#848484','竞价中': '#c21F3a',}[item.projectShowStatus]}" v-if="(item.biddingType!='自由竞价'&&item.deadline<=0)&&!item.money">暂无出价</span>
+              <span :style="{'font-size':'14px',color: {'正在报名': '#007E72','等待竞价': '#848484','等待成交': '#848484','已经成交': '#848484','正在竞价': '#c21F3a',}[item.projectShowStatus]}" v-if="(item.biddingType!='自由竞价'&&item.deadline<=0)&&!item.money">暂无出价</span>
 
             </p>
             <p :style="{
diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue
index f4f9b617..e4255d53 100644
--- a/src/views/project/projectDetail.vue
+++ b/src/views/project/projectDetail.vue
@@ -521,7 +521,7 @@ export default {
         }
         $('#timeData').html(this.TimeInterval(biddingStopTime-nowDate));
 
-        if (s < 2 && m < 1){
+        if (s < 1 && m < 1){
           console.log("竞价结束22222222222")
           getBiddingStopTime(this.id).then(response => {
             this.$set(this.detail,'biddingStopTime',response.data)