From e95873a3e091613e1b519b41c875e53bc93e1c8a 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, 19 Oct 2023 13:59:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project/projectDetail.vue | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue
index 70a83457..fd7814f1 100644
--- a/src/views/project/projectDetail.vue
+++ b/src/views/project/projectDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <van-nav-bar
-      title="项目详情4"
+      title="项目详情5"
       left-arrow
       fixed
       placeholder
@@ -278,7 +278,7 @@ export default {
       btnMsg:"",
       time:null,
       timeMsg:"",
-      isSignup:false,
+      isSignup:true,
       showBtn:false,
       price:null,
       userAccount:"",
@@ -440,9 +440,13 @@ export default {
               if((response.rows.length != that.biddinglistInformationLength) && that.detail.ladderPrice){
 
                 if (that.detail.biddingDirect == 2 ||that.detail.biddingDirect == '反向竞价') {
-                  that.price = parseInt(response.rows[0].money) - parseInt(that.detail.ladderPrice)
+                  if(response.rows[0].money<=that.price) {
+                    that.price = parseInt(response.rows[0].money) - parseInt(that.detail.ladderPrice)
+                  }
                 }else{
-                  that.price = parseInt(response.rows[0].money) + parseInt(that.detail.ladderPrice)
+                  if(response.rows[0].money>=that.price) {
+                    that.price = parseInt(response.rows[0].money) + parseInt(that.detail.ladderPrice)
+                  }
                 }
               }
               that.biddinglistInformationLength = response.total
@@ -499,7 +503,7 @@ export default {
         //console.log('未开始')
         this.process= "报名未开始"
         this.tip=this.detail.signupStartTime+"开始报名"
-        this.btnMsg="立即报名"
+        this.btnMsg="报名未开始"
         this.timeMsg="距报名开始"
         $('#timeData').html(this.TimeInterval(signupStartTime-nowDate))
         // this.timeData = ;
@@ -508,6 +512,7 @@ export default {
       if(signupStopTime>nowDate&&signupStopTime>signupStartTime){
         //console.log('报名中')
         this.process= "报名中"
+        this.isSignup=false
         this.tip=this.detail.signupStopTime+"报名截止"
         this.btnMsg="立即报名"
         this.timeMsg="距报名截止"
@@ -530,7 +535,7 @@ export default {
         // this.timeData = this.TimeInterval(biddingStartTime-nowDate);
         this.isSignup=true;
         if(this.getSignupData=="1"){
-          this.btnMsg="立即竞价"
+          this.btnMsg="已报名"
           // this.price=this.detail.ladderPrice?this.biddinglistInformation[0].money+this.detail.ladderPrice:this.biddinglistInformation[0].money+1
         }else{
           this.btnMsg="未报名"
@@ -627,15 +632,19 @@ export default {
         if (response.rows.length>0&&that.detail.ladderPrice){
           if (that.price == 0){return;}
           if (that.detail.biddingDirect == 2 ||that.detail.biddingDirect == '反向竞价') {
-            that.price = parseFloat(response.rows[0].money - that.detail.ladderPrice).toFixed(2)
+            if(response.rows[0].money<=that.price){
+              that.price = parseFloat(response.rows[0].money - that.detail.ladderPrice).toFixed(2)
+            }
           }else{
-            that.price = parseFloat(response.rows[0].money + that.detail.ladderPrice).toFixed(2)
+            console.log(response.rows[0].money>=that.price)
+            if(response.rows[0].money>=that.price){
+              that.price = parseFloat(response.rows[0].money + that.detail.ladderPrice).toFixed(2)
+            }
           }
         }else if (response.rows.length>0&&!that.detail.ladderPrice){
           if (that.price == 0){return;}
           that.price = response.rows[0].money
-        }
-        else{
+        }else{
           if (that.detail.biddingDirect == 2 ||that.detail.biddingDirect == '反向竞价') {
             that.price = parseFloat(that.detail.price).toFixed(2)
           }else{