From 607844a215defd435e54d3505b6aa80a4a7e1df3 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, 1 Nov 2023 14:55:16 +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 | 72 ++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/views/biddingHall/index.vue b/src/views/biddingHall/index.vue
index 92d75214..df350d6d 100644
--- a/src/views/biddingHall/index.vue
+++ b/src/views/biddingHall/index.vue
@@ -109,50 +109,50 @@
 
           <div class="list_li_tt">
             <p>{{item.content}}</p>
-            <p :style="{
-                color: {
-                  '未开始': '#007E72',
-                  '已结束': '#848484',
-                  '进行中': '#c21F3a',
-                }[item.timeType]}">{{item.timeType}}</p>
           </div>
           <div class="list_li_time">
-
             <p>
-              <span style="color: #848484">竞价结束日期：{{item.biddingStopTime.substr(0,10)}}</span>
-            </p>
+              <span style="color: #848484">当前价</span>
+              <span :style="{'font-size':'14px',
+              color: {
+                '未开始': '#007E72',
+                '已结束': '#848484',
+                '进行中': '#c21F3a',
+              }[item.timeType]}" v-if="item.biddingType=='自由竞价'&&item.deadline>0">
+                *
+              </span>
 
-              <p>
-                <span style="color: #848484">当前价</span>
-                <span :style="{'font-size':'14px',
-                color: {
-                  '未开始': '#007E72',
-                  '已结束': '#848484',
-                  '进行中': '#c21F3a',
-                }[item.timeType]}" v-if="item.biddingType=='自由竞价'&&item.deadline>0">
-                  *
-                </span>
+              <span :style="{'font-size':'14px',
+              color: {
+                '未开始': '#007E72',
+                '已结束': '#848484',
+                '进行中': '#c21F3a',
+              }[item.timeType]}" v-if="(item.biddingType!='自由竞价'&&item.money) || item.deadline<=0">
+                {{item.money}}{{item.priceUnit}}
+              </span>
+
+              <span :style="{'font-size':'14px',
+              color: {
+                '未开始': '#007E72',
+                '已结束': '#848484',
+                '进行中': '#c21F3a',
+              }[item.timeType]}" v-if="item.biddingType!='自由竞价'&&!item.money">
+                暂无出价
+              </span>
 
-                <span :style="{'font-size':'14px',
-                color: {
-                  '未开始': '#007E72',
-                  '已结束': '#848484',
-                  '进行中': '#c21F3a',
-                }[item.timeType]}" v-if="(item.biddingType!='自由竞价'&&item.money) || item.deadline<=0">
-                  {{item.money}}{{item.priceUnit}}
-                </span>
 
-                <span :style="{'font-size':'14px',
+            </p>
+            <p :style="{
                 color: {
                   '未开始': '#007E72',
                   '已结束': '#848484',
                   '进行中': '#c21F3a',
-                }[item.timeType]}" v-if="item.biddingType!='自由竞价'&&!item.money">
-                  暂无出价
-                </span>
-
-
-              </p>
+                }[item.timeType]}">{{item.timeType}}</p>
+          </div>
+          <div class="list_li_time">
+            <p>
+              <span style="color: #848484">竞价时间：{{item.biddingStartTime}} ~ {{item.biddingStopTime}}</span>
+            </p>
           </div>
 
         </div>
@@ -296,9 +296,9 @@ export default {
               time = endDate-nowDate>0?endDate-nowDate:0
             }
             console.log(time)
-            this.infoList.push({content:item.projectName,biddingType:item.biddingType,deadline:time,currentPrice:item.price,priceUnit:item.unit,id:item.id,money:item.money,timeType:item.timeType,biddingStopTime:item.biddingStopTime})
+            this.infoList.push({content:item.projectName,biddingType:item.biddingType,deadline:time,currentPrice:item.price,priceUnit:item.unit,id:item.id,money:item.money,timeType:item.timeType,biddingStopTime:item.biddingStopTime,biddingStartTime:item.biddingStartTime})
           }else{
-            this.infoList.push({content:item.projectName,biddingType:item.biddingType,deadline:0,currentPrice:item.price,priceUnit:item.unit,id:item.id,money:item.money,timeType:item.timeType,biddingStopTime:item.biddingStopTime})
+            this.infoList.push({content:item.projectName,biddingType:item.biddingType,deadline:0,currentPrice:item.price,priceUnit:item.unit,id:item.id,money:item.money,timeType:item.timeType,biddingStopTime:item.biddingStopTime,biddingStartTime:item.biddingStartTime})
           }
         })
         if(this.infoList.length >= response.total){