From 7b565a61fac5f12ba9b068ff02839de0415c88fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Fri, 16 Jun 2023 14:17:03 +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/project/projectDetail.vue | 91 ++++++++++++++++-------------
 1 file changed, 49 insertions(+), 42 deletions(-)

diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue
index a93655a5..d633dc02 100644
--- a/src/views/project/projectDetail.vue
+++ b/src/views/project/projectDetail.vue
@@ -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 == '拍卖' || 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 != '拍卖' && biddingTimeType != 2">友情提示：非拍卖竞价方式下，竞价过程中不显示竞价记录！</p>
+          <p v-if="detail.biddingType == '自由竞价' && biddingTimeType != 2">友情提示：自由竞价方式下，竞价过程中不显示竞价记录！</p>
           <table v-else width="100%" cellspacing="0">
             <tr>
               <td>出价人账号</td>
@@ -198,11 +198,11 @@
     <div style="height: 3rem;"></div>
     <div class="bottomBtn" v-if="">
       <van-row v-if="!showBtn">
-        <van-col span="8" style="margin-top: 4px;" @click="showPopup">
-          <van-image src="../../static/images/icon/clock.png" style="vertical-align: text-bottom;" />
-          <p style="line-height: 0.2rem;color: #999999">提醒</p>
-        </van-col>
-        <van-col span="16">
+<!--        <van-col span="8" style="margin-top: 4px;" @click="showPopup">-->
+<!--          <van-image src="../../static/images/icon/clock.png" style="vertical-align: text-bottom;" />-->
+<!--          <p style="line-height: 0.2rem;color: #999999">提醒</p>-->
+<!--        </van-col>-->
+        <van-col span="24">
           <van-button round color="#C21F3A" block :disabled="isSignup" :to="{path:'signUp',query:{projectId:detail.id,deposit:detail.deposit,projectName:detail.projectName}}">
             {{ btnMsg }}<br/>
             <span style="font-size: 10px">保证金￥{{detail.deposit}}</span>
@@ -497,9 +497,10 @@ export default {
         })
         return;
       }
+
       if (this.detail.biddingDirect == '反向竞价'){
         // if (this.biddinglistInformation.length<1){
-          if(this.detail.price<=this.price){
+          if(this.detail.price<this.price){
             this.$toast({
               icon: 'fail', // 找到自己需要的图标
               message: '出价不能高于挂牌价格',
@@ -508,45 +509,51 @@ 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.length<1){
-          if(this.detail.price>=this.price){
-            this.$toast({
-              icon: 'fail', // 找到自己需要的图标
-              message: '出价不能低于挂牌价格',
-              duration:"1000",
-              onClose:function(){
+          }else{
+            if (this.detail.biddingType=='阶梯竞价'||this.detail.biddingType=='公开竞价'){
+              if (this.biddinglistInformation.length>1){
+                //判断用户出价不能高于当前出价最低价格
+                if(this.biddinglistInformation[0].money < this.price){
+                  this.$toast({
+                    icon: 'fail', // 找到自己需要的图标
+                    message: '出价不能高于当前出价最低价格',
+                    duration:"1000",
+                    onClose:function(){
+                    }
+                  })
+                  return;
+                }
               }
-            })
-            return;
+            }
           }
-        // }else{
-        if (this.detail.biddingType=='拍卖'||this.detail.biddingType=='阶梯竞价') {
-          if (this.biddinglistInformation[0].money >= this.price) {
-            this.$toast({
-              icon: 'fail', // 找到自己需要的图标
-              message: '出价不能低于当前出价最高价格',
-              duration: "1000",
-              onClose: function () {
+
+      }else{
+        if(this.detail.price>this.price){
+          this.$toast({
+            icon: 'fail', // 找到自己需要的图标
+            message: '出价不能低于挂牌价格',
+            duration:"1000",
+            onClose:function(){
+            }
+          })
+          return;
+        }else{
+          if (this.detail.biddingType=='阶梯竞价'||this.detail.biddingType=='公开竞价'){
+            if (this.biddinglistInformation.length>1){
+              //判断用户出价不能高于当前出价最低价格
+              if(this.biddinglistInformation[0].money > this.price){
+                this.$toast({
+                  icon: 'fail', // 找到自己需要的图标
+                  message: '出价不能低于当前出价最高价格',
+                  duration:"1000",
+                  onClose:function(){
+                  }
+                })
+                return;
               }
-            })
-            return;
+            }
           }
         }
-        // }
       }
       let data= {
         projectId:this.id,