From befbab6c65e42a73d7b621a01ab9d2118ecad966 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, 19 Jun 2023 17:12:13 +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     | 16 +++++++++++++---
 src/views/user/supply/supplyAdd.vue | 13 ++++++++++++-
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/views/biddingHall/index.vue b/src/views/biddingHall/index.vue
index 3142ee1f..cd90a770 100644
--- a/src/views/biddingHall/index.vue
+++ b/src/views/biddingHall/index.vue
@@ -125,7 +125,17 @@
                 <span style="color: #666666">距竞价结束</span><span>{{timeData.days}}天{{timeData.hours}}时{{timeData.minutes}}分{{timeData.seconds}}秒</span>
               </template>
             </van-count-down>
-            <van-row> <span style="color: #666666">当前价 </span><span style="font-size: 14px">{{item.currentPrice}}</span> <span>{{item.priceUnit}}</span></van-row>
+            <van-row>
+              <span style="color: #666666">当前价 </span>
+              <span style="font-size: 14px" v-if="item.biddingType=='自由竞价'&&item.deadline>0">
+                *
+              </span>
+              <span style="font-size: 14px" v-else>
+                {{item.money}}
+              </span>
+              <span v-if="item.money">{{item.priceUnit}}</span>
+              <span v-else>暂无出价</span>
+            </van-row>
           </van-col>
         </van-row>
       </van-list>
@@ -222,9 +232,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})
+            this.infoList.push({content:item.projectName,deadline:time,currentPrice:item.price,priceUnit:item.unit,id:item.id,money:item.money})
           }else{
-            this.infoList.push({content:item.projectName,deadline:0,currentPrice:item.price,priceUnit:item.unit,id:item.id})
+            this.infoList.push({content:item.projectName,deadline:0,currentPrice:item.price,priceUnit:item.unit,id:item.id,money:item.money})
           }
         })
         if(this.infoList.length >= response.total){
diff --git a/src/views/user/supply/supplyAdd.vue b/src/views/user/supply/supplyAdd.vue
index 6eac89e0..0ea482c9 100644
--- a/src/views/user/supply/supplyAdd.vue
+++ b/src/views/user/supply/supplyAdd.vue
@@ -92,6 +92,7 @@ export default {
   methods: {
     afterRead(file) {
       // 此时可以自行将文件上传至服务器
+
       for ( var i = 0 ; i < this.fileList.length ; i++){
         if(this.fileList[i].url == undefined&&this.fileList!='') {
           this.fileList[i] = {url:this.fileList[i].content, id: '', isImage: true};
@@ -147,6 +148,11 @@ export default {
       if(this.$route.query.type == 'update'){
         this.file.tableId = this.$route.query.id ;
         updateDemand(this.form).then(response => {
+          this.$toast.loading({
+            message: "上传中...",
+            forbidClick: true,
+            duration: 0,
+          });
           for (var i = 0 ; i < this.fileList.length ; i++){
             if(this.fileList[i].url.indexOf('http://') == -1&&this.fileList!=''){
               this.file.files.push(this.fileList[i].url);
@@ -168,9 +174,15 @@ export default {
       }else{
         userDemand(this.form).then(response => {
           this.file.tableId = response.data;
+          this.$toast.loading({
+            message: "上传中...",
+            forbidClick: true,
+            duration: 0,
+          });
           for(var i = 0 ; i < this.fileList.length ; i++){
             this.file.files.push(this.fileList[i].url);
           }
+
           base64Attach(this.file).then(response => {
             if (response.code == 200){
               Dialog.confirm({
@@ -179,7 +191,6 @@ export default {
                 confirmButtonText: '确定',
                 showCancelButton:false
               }).then(() => {
-                self.location=document.referrer;
               })
             }
           });