From 7c454f40e671bd1cec46d5b2a747be4fa3f14746 Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Thu, 7 Dec 2023 09:34:29 +0800
Subject: [PATCH 1/3] biddingStopSetime

---
 src/views/project/projectDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue
index d0b6711d..f4f9b617 100644
--- a/src/views/project/projectDetail.vue
+++ b/src/views/project/projectDetail.vue
@@ -60,7 +60,7 @@
             <van-col span="24"><span>竞价开始时间：</span>{{ detail.biddingStartTime }}</van-col>
           </van-row>
           <van-row>
-            <van-col span="24"><span>竞价结束时间<span v-if="detail.delayPeriod!=0">(含延期)</span>：</span>{{ detail.biddingStopTime }}</van-col>
+            <van-col span="24"><span>竞价结束时间：</span>{{ detail.biddingStopSetime }}</van-col>
           </van-row>
           <van-row>
             <van-col span="24"><span>竞价方式：</span>{{ detail.biddingType }}</van-col>

From 6af4c8ca70b7eee2a7a09ffc39935b2911fce9ee Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Thu, 7 Dec 2023 09:58:06 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=88=91=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/biddingHall/index.vue      | 2 +-
 src/views/project/index.vue          | 2 +-
 src/views/user/application/index.vue | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/biddingHall/index.vue b/src/views/biddingHall/index.vue
index 34d3d4a0..99a31a66 100644
--- a/src/views/biddingHall/index.vue
+++ b/src/views/biddingHall/index.vue
@@ -151,7 +151,7 @@
           </div>
           <div class="list_li_time">
             <p>
-              <span style="color: #848484">竞价时间：{{item.biddingStartTime}} ~ {{item.biddingStopTime}}</span>
+              <span style="color: #848484">竞价时间：{{item.biddingStartTime}}~{{item.biddingStopSetime}}</span>
             </p>
           </div>
 
diff --git a/src/views/project/index.vue b/src/views/project/index.vue
index 7b50f527..8d4fa1c4 100644
--- a/src/views/project/index.vue
+++ b/src/views/project/index.vue
@@ -25,7 +25,7 @@
                 <p class="title">【{{item.rollout}}】{{item.projectName}}</p>
                 <p class="type">{{ item.projectShowStatus }}</p>
                 <p class="timeEnd">报名结束 {{ item.signupStopTime }}</p>
-                <p class="timeEnd">竞价结束 {{ item.biddingStopTime }}</p>
+                <p class="timeEnd">竞价结束 {{ item.biddingStopSetime }}</p>
                 <van-row>
                   <van-col span="12" class="money"><span>{{ item.price }}</span>{{ item.unit }}</van-col>
                   <van-col span="8" offset="4" class="time">{{ item.projectReleaseTime }}</van-col>
diff --git a/src/views/user/application/index.vue b/src/views/user/application/index.vue
index b37f3cac..47b4d9bf 100644
--- a/src/views/user/application/index.vue
+++ b/src/views/user/application/index.vue
@@ -19,8 +19,8 @@
           </template>
           <template #label>
             <p>报名状态：<span :style="{color:item.depositStatus == '1' ? '#007E72':'#c21F3a'}">{{item.depositStatus}}</span></p>
-            <p>开始时间：{{item.biddingStartTime}}</p>
-            <p>结束时间：{{item.biddingStopTime}}</p>
+            <p>开始时间：{{item.signupStartTime}}</p>
+            <p>结束时间：{{item.signupStopTime}}</p>
             <p>距<span style="margin: 0 0.5em">结</span>束：
               <van-count-down :time="item.endTime">
                 <template #default="timeData">{{timeData.days}}天{{timeData.hours}}时{{timeData.minutes}}分{{timeData.seconds}}秒</template>

From 4994090dee2f5498f6fe1cb66276a32ee72c9901 Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Thu, 7 Dec 2023 10:58:35 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=AB=9E=E4=BB=B7=E5=A4=A7=E5=8E=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/user/application/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/user/application/index.vue b/src/views/user/application/index.vue
index 47b4d9bf..46b2bf7a 100644
--- a/src/views/user/application/index.vue
+++ b/src/views/user/application/index.vue
@@ -19,8 +19,8 @@
           </template>
           <template #label>
             <p>报名状态：<span :style="{color:item.depositStatus == '1' ? '#007E72':'#c21F3a'}">{{item.depositStatus}}</span></p>
-            <p>开始时间：{{item.signupStartTime}}</p>
-            <p>结束时间：{{item.signupStopTime}}</p>
+            <p>竞价开始时间：{{item.biddingStartTime}}</p>
+            <p>实际竞价结束时间：{{item.biddingStopTime}}</p>
             <p>距<span style="margin: 0 0.5em">结</span>束：
               <van-count-down :time="item.endTime">
                 <template #default="timeData">{{timeData.days}}天{{timeData.hours}}时{{timeData.minutes}}分{{timeData.seconds}}秒</template>