From 4e744083d1eb746d46dffdbdc40c1d225038ef0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Thu, 18 May 2023 14:48:17 +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/utils/request.js                          | 10 +--
 src/views/project/projectDetail.vue           | 90 ++++++++++++-------
 src/views/project/signUp.vue                  | 30 ++++++-
 src/views/register/companyRegister.vue        |  1 +
 src/views/register/userRegister.vue           |  1 +
 .../accountSetting/bankInformation/index.vue  |  3 +
 6 files changed, 96 insertions(+), 39 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index ae607ddc..b3d7c24b 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -16,11 +16,11 @@ const service = axios.create({
 })
 // request拦截器
 service.interceptors.request.use(config => {
-  Toast.loading({
-    message: '加载中...',
-    forbidClick: true,
-    duration: 0
-  });
+  // Toast.loading({
+  //   message: '加载中...',
+  //   forbidClick: true,
+  //   duration: 0
+  // });
   // 是否需要设置 token
   const isToken = (config.headers || {}).isToken === false
   if (getToken() && !isToken) {
diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue
index 6a796e5b..2c21710a 100644
--- a/src/views/project/projectDetail.vue
+++ b/src/views/project/projectDetail.vue
@@ -29,7 +29,7 @@
           </van-row>
           <van-row>
             <van-col span="5">{{ process }}</van-col>
-            <van-col span="19"><van-count-down :time="time" format="DD 天 HH 时 mm 分 ss 秒" /></van-col>
+            <van-col span="19"><van-count-down :time="time" format="DD 天 HH 时 mm 分 ss 秒" @change="timerChange" /></van-col>
           </van-row>
           <van-row>
             <van-col span="5">挂牌价</van-col>
@@ -40,7 +40,7 @@
             <van-col span="19" class="money"><span>{{ detail.deposit }}</span> 元</van-col>
           </van-row>
         </div>
-        <div class="lead" v-if="detail.biddingType == '拍卖' || detail.biddingTimeType == 2">
+        <div class="lead" v-if="detail.biddingType == '拍卖' || biddingTimeType == 2">
           <van-row >
             <van-col span="2"><van-image src="../../static/images/icon/phone.png" style="vertical-align: text-top;" /></van-col>
             <template v-if="biddinglistInformation!=undefined&&biddinglistInformation.length>0">
@@ -170,7 +170,7 @@
       <van-tab title="竞价记录" title-style="font-size:12px;">
         <p class="delTitle">竞价记录</p>
         <div class="biddingList">
-          <p v-if="detail.biddingType != '拍卖' && detail.biddingTimeType != 2">友情提示：非拍卖竞价方式下，竞价过程中不显示竞价记录！</p>
+          <p v-if="detail.biddingType != '拍卖' && biddingTimeType != 2">友情提示：非拍卖竞价方式下，竞价过程中不显示竞价记录！</p>
           <table v-else width="100%" cellspacing="0">
             <tr>
               <td>出价人账号</td>
@@ -267,7 +267,7 @@ export default {
       process:"",
       tip:"",
       btnMsg:"",
-      time:0,
+      time:1000000000000000000,
       timeMsg:"",
       isSignup:false,
       showBtn:false,
@@ -275,7 +275,9 @@ export default {
       userAccount:"",
       userName:"",
       userId:"",
-      timeConfig:''
+      timeConfig:'',
+      biddinglistInformationLength:0,
+      biddingTimeType:0
     };
   },
   computed: {
@@ -320,6 +322,7 @@ export default {
       this.show = true;
     },
     reload(){
+      console.log("结束进入")
       getOutProjectDetail(this.id).then(response =>{
         this.detail=response.data
         this.getDicts("rollout_type").then(res =>{
@@ -359,12 +362,6 @@ export default {
         let signupStopTime =  Date.parse(this.detail.signupStopTime)+0
         let nowDate = Date.parse(new Date());
 
-        console.log('竞价开始时间'+biddingStartTime)
-        console.log('竞价截止时间'+biddingStopTime)
-        console.log('报名开始时间'+signupStartTime)
-        console.log('报名截止时间'+signupStopTime)
-        console.log('当前时间'+nowDate)
-
         if(signupStartTime>nowDate){
           console.log('未开始')
           this.process= "报名未开始"
@@ -401,6 +398,7 @@ export default {
         }
         if(biddingStartTime>nowDate&&nowDate>signupStopTime){
           console.log('竞价未开始')
+          this.biddingTimeType = 3;
           this.process= "竞价未开始"
           this.tip=this.detail.biddingStartTime+"开始竞价"
           this.timeMsg="距竞价开始"
@@ -427,6 +425,7 @@ export default {
         }
         if(biddingStopTime>nowDate&&nowDate>biddingStartTime){
           console.log('竞价中')
+          this.biddingTimeType = 1;
           this.process= "竞价中"
           this.tip=this.detail.biddingStopTime+"结束竞价"
           this.timeMsg="距竞价结束"
@@ -458,13 +457,15 @@ export default {
           })
         }
         if(nowDate>biddingStopTime){
-          console.log('竞价结束')
+          console.log('竞价结束111111111')
           this.process= "竞价结束"
           this.tip=this.detail.biddingStopTime+"结束竞价"
           this.btnMsg="竞价结束"
           this.timeMsg="竞价结束"
           this.time = 0
           this.isSignup = true
+          this.showBtn=false
+          this.biddingTimeType = 2;
         }
       });
       getWebConfig().then(response =>{
@@ -477,6 +478,7 @@ export default {
       });
       getBiddingList(this.id).then(response =>{
         this.biddinglistInformation = response.rows
+        this.biddinglistInformationLength = response.total
         if (response.rows.length>0&&this.detail.ladderPrice){
           this.price = response.rows[0].money+this.detail.ladderPrice
         }
@@ -496,7 +498,7 @@ export default {
         return;
       }
       if (this.detail.biddingDirect == '递减竞价'){
-        if (this.biddinglistInformation.length<1){
+        // if (this.biddinglistInformation.length<1){
           if(this.detail.price<=this.price){
             this.$toast({
               icon: 'fail', // 找到自己需要的图标
@@ -507,20 +509,20 @@ export default {
             })
             return;
           }
-        }else{
-          if(this.biddinglistInformation[0].money<=this.price){
-            this.$toast({
-              icon: 'fail', // 找到自己需要的图标
-              message: '出价不能高于当前出价最低价格',
-              duration:"1000",
-              onClose:function(){
-              }
-            })
-            return;
-          }
-        }
+        // }else{
+        //   if(this.biddinglistInformation[0].money<=this.price){
+        //     this.$toast({
+        //       icon: 'fail', // 找到自己需要的图标
+        //       message: '出价不能高于当前出价最低价格',
+        //       duration:"1000",
+        //       onClose:function(){
+        //       }
+        //     })
+        //     return;
+        //   }
+        // }
       }else{
-        if (this.biddinglistInformation.length<1){
+        // if (this.biddinglistInformation.length<1){
           if(this.detail.price>=this.price){
             this.$toast({
               icon: 'fail', // 找到自己需要的图标
@@ -531,18 +533,20 @@ export default {
             })
             return;
           }
-        }else{
-          if(this.biddinglistInformation[0].money>=this.price){
+        // }else{
+        if (this.detail.biddingType=='拍卖'||this.detail.biddingType=='阶梯竞价') {
+          if (this.biddinglistInformation[0].money >= this.price) {
             this.$toast({
               icon: 'fail', // 找到自己需要的图标
               message: '出价不能低于当前出价最高价格',
-              duration:"1000",
-              onClose:function(){
+              duration: "1000",
+              onClose: function () {
               }
             })
             return;
           }
         }
+        // }
       }
       let data= {
         projectId:this.id,
@@ -562,7 +566,7 @@ export default {
             message: '出价成功',
             duration:"1000",
             onClose:function(){
-              _this.reload()
+              // _this.reload()
             }
           })
 
@@ -644,6 +648,30 @@ export default {
         }
       }
     },
+    timerChange(value){
+      let d = value.days;
+      let h = value.hours;
+      let m = value.minutes;
+      let s = value.seconds;
+      if (d==0 && h==0 && m<2){
+        console.log("竞价剩余两分钟"+"m:"+m+"s:"+s)
+
+        if (m == 0 && s==0){
+          console.log("竞价结束22222222222")
+          this.reload();
+        }
+        getBiddingList(this.id).then(response =>{
+          this.biddinglistInformation = response.rows
+          if (response.rows.length>this.biddinglistInformationLength){
+            console.log("有人出价")
+            this.biddinglistInformationLength = response.rows.length;
+            this.time = 120000
+          }
+
+        });
+
+      }
+    }
   }
 };
 </script>
diff --git a/src/views/project/signUp.vue b/src/views/project/signUp.vue
index 2ae1307d..85cbbb1b 100644
--- a/src/views/project/signUp.vue
+++ b/src/views/project/signUp.vue
@@ -12,10 +12,22 @@
         <span>项目名称:</span>
         <span style="color:#007E72;font-size: 0.45rem;font-weight: bold;">{{ projectName }}</span>
       </p>
-      <p style="padding:10px 20px 0;font-size: 0.4rem;margin-bottom: 20px">
+      <p style="padding:10px 20px 0;font-size: 0.4rem;">
         <span>缴纳保证金:</span>
         <span style="color:#C21F3A;font-size: 0.45rem;font-weight: bold;">¥{{ deposit }}</span>
       </p>
+      <p class="" style="padding:10px 20px 0px;font-size: 0.4rem">
+        <span>保证金缴纳账号:</span>
+        <span style="color:#007E72;font-size: 0.45rem;font-weight: bold;">{{ payAccount }}</span>
+      </p>
+      <p class="" style="padding:10px 20px 0px;font-size: 0.4rem">
+        <span>账户名称:</span>
+        <span style="color:#007E72;font-size: 0.45rem;font-weight: bold;">{{ accountName }}</span>
+      </p>
+      <p class="" style="padding:10px 20px 0px;font-size: 0.4rem;margin-bottom: 20px">
+        <span>开户银行:</span>
+        <span style="color:#007E72;font-size: 0.45rem;font-weight: bold;">{{ bankName }}</span>
+      </p>
     </van-row>
     <van-row style="padding:0 20px;">
     <h2 style="margin-bottom:10px;">1.竞买人请确认以下事项并勾选</h2>
@@ -145,7 +157,7 @@
 </template>
 
 <script>
-import {getMember, submmitSignup, uploadPic} from "../../api/project";
+import {getMember, submmitSignup, uploadPic,getOutProjectDetail} from "../../api/project";
 import {getInfo} from "../../api/login";
 
 export default {
@@ -173,6 +185,9 @@ export default {
       accountType:"",
       bankType:"",
       payeePaymentLines:"",
+      payAccount :"",
+      accountName :"",
+      bankName:"",
     };
   },
   created() {
@@ -197,7 +212,16 @@ export default {
         });
 
       })
-    })
+    });
+    getOutProjectDetail(this.$route.query.projectId).then(res => {
+      this.projectId = res.data.projectId
+      this.deposit = res.data.deposit
+      this.projectName = res.data.projectName
+
+      this.payAccount = res.data.payAccount
+      this.accountName = res.data.accountName
+      this.bankName = res.data.bankName
+    });
   },
   methods: {
     onRead (file) {
diff --git a/src/views/register/companyRegister.vue b/src/views/register/companyRegister.vue
index f208c699..41d2114e 100644
--- a/src/views/register/companyRegister.vue
+++ b/src/views/register/companyRegister.vue
@@ -120,6 +120,7 @@ export default {
         })
         return;
       }
+      this.form.accountType = '1';
       userRegister(this.form).then((res) => {
         this.$toast({
           icon: 'success', // 找到自己需要的图标
diff --git a/src/views/register/userRegister.vue b/src/views/register/userRegister.vue
index 21a86d23..00ad0273 100644
--- a/src/views/register/userRegister.vue
+++ b/src/views/register/userRegister.vue
@@ -94,6 +94,7 @@ export default {
         })
         return;
       }
+      this.form.accountType = '2';
       userRegister(this.form).then((res) => {
         this.$toast({
           icon: 'success', // 找到自己需要的图标
diff --git a/src/views/user/accountSetting/bankInformation/index.vue b/src/views/user/accountSetting/bankInformation/index.vue
index b25104f1..ba80f503 100644
--- a/src/views/user/accountSetting/bankInformation/index.vue
+++ b/src/views/user/accountSetting/bankInformation/index.vue
@@ -194,6 +194,8 @@ import {Dialog} from "vant";
       },
       onConfirmBankType(value){
         this.showBankType = false;
+        this.form.bankAddress = '';
+        this.form.payeePaymentLines = '';
         this.bankType = value.dictLabel;
         this.form.bankType = value.dictValue;
       },
@@ -207,6 +209,7 @@ import {Dialog} from "vant";
       onConfirmBankAddress(value){
         console.log(value)
         this.form.bankAddress = value.bankDeposit;
+        this.form.payeePaymentLines = value.payeePaymentLines;
         this.showBankAddress = false;
       },
       onConfirmAccountType(value){