From a29d46ebe7a09977dbec28e3e0cccfed92e5643c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Mon, 26 Jun 2023 16:37:56 +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     | 26 +++++++++++++-------------
 src/views/project/projectDetail.vue |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/views/biddingHall/index.vue b/src/views/biddingHall/index.vue
index 624916b9..954f58ba 100644
--- a/src/views/biddingHall/index.vue
+++ b/src/views/biddingHall/index.vue
@@ -134,7 +134,7 @@
                 </template>
               </van-count-down>
               <p>
-                <span style="color: #848484">当前价 </span>
+                <span style="color: #848484">当前价</span>
                 <span :style="{'font-size':'14px',
                 color: {
                   '未开始': '#007E72',
@@ -143,26 +143,26 @@
                 }[item.timeType]}" v-if="item.biddingType=='自由竞价'&&item.deadline>0">
                   *
                 </span>
+
                 <span :style="{'font-size':'14px',
                 color: {
                   '未开始': '#007E72',
                   '已结束': '#848484',
                   '进行中': '#c21F3a',
-                }[item.timeType]}" v-else>
-                  {{item.money}}
+                }[item.timeType]}" v-if="item.biddingType!='自由竞价'&&(item.money!=null||item.money!=0||item.money!=undefined)">
+                  {{item.money}}{{item.priceUnit}}
                 </span>
-                <span v-if="item.money" :style="{
-                color: {
-                  '未开始': '#007E72',
-                  '已结束': '#848484',
-                  '进行中': '#c21F3a',
-                }[item.timeType]}">{{item.priceUnit}}</span>
-                <span v-else :style="{
+
+                <span :style="{'font-size':'14px',
                 color: {
                   '未开始': '#007E72',
                   '已结束': '#848484',
                   '进行中': '#c21F3a',
-                }[item.timeType]}">暂无出价</span>
+                }[item.timeType]}" v-if="item.biddingType!='自由竞价'&&(item.money==null||item.money==0||item.money==undefined)">
+                  暂无出价
+                </span>
+
+
               </p>
           </div>
 
@@ -302,9 +302,9 @@ export default {
               time = endDate-nowDate>0?endDate-nowDate:0
             }
             console.log(time)
-            this.infoList.push({content:item.projectName,deadline:time,currentPrice:item.price,priceUnit:item.unit,id:item.id,money:item.money,timeType:item.timeType})
+            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})
           }else{
-            this.infoList.push({content:item.projectName,deadline:0,currentPrice:item.price,priceUnit:item.unit,id:item.id,money:item.money,timeType:item.timeType})
+            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})
           }
         })
         if(this.infoList.length >= response.total){
diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue
index 01a6406f..3155fdc4 100644
--- a/src/views/project/projectDetail.vue
+++ b/src/views/project/projectDetail.vue
@@ -545,7 +545,7 @@ export default {
         })
         return;
       }
-
+      this.price = this.price.toFixed(2)
       if (this.detail.biddingDirect == '反向竞价'){
         // if (this.biddinglistInformation.length<1){
           if(this.detail.price<this.price){