From 188bd836e4d1b6f2566263e3865ff5b9db65428d 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, 29 Jun 2023 17:44:52 +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/components/common/nav_footer.vue       |  2 +-
 src/views/project/projectDetail.vue        | 36 +++++++++++++---------
 src/views/user/signature/signatureList.vue |  2 +-
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/components/common/nav_footer.vue b/src/components/common/nav_footer.vue
index 31fa2ac2..4121b1b0 100644
--- a/src/components/common/nav_footer.vue
+++ b/src/components/common/nav_footer.vue
@@ -6,7 +6,7 @@
     </router-link>
     <router-link to="/project" class="tab" active-class="active">
       <span class="icon"><van-icon name="notes-o" size="25" /></span>
-      <p class="text">供应项目</p>
+      <p class="text">交易项目</p>
     </router-link>
     <router-link to="/user" class="tab" active-class="active">
       <span class="icon"><van-icon name="contact" size="25" /></span>
diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue
index 0fc7f9bc..573dbec0 100644
--- a/src/views/project/projectDetail.vue
+++ b/src/views/project/projectDetail.vue
@@ -71,7 +71,7 @@
             <van-col span="24"><span>竞价方向：</span>{{ detail.biddingDirect }}</van-col>
           </van-row>
           <van-row v-if="detail.ladderPrice">
-            <van-col span="24"><span>阶梯价(增减幅度)：</span>{{ detail.ladderPrice }} 元</van-col>
+            <van-col span="24"><span>阶梯价(增减幅度)：</span>￥{{ detail.ladderPrice }} 元</van-col>
           </van-row>
           <van-row>
             <van-col span="24"><span>延时周期：</span>{{timeConfig}}分钟</van-col>
@@ -217,15 +217,16 @@
         </van-col>
         <van-col span="16">
 
-          <van-button round color="#C21F3A" block @click="offer">
-            <p>出价</p>
-            <p v-if="detail.ladderPrice">{{price}}元</p>
-          </van-button>
-
-          <van-button v-if="isFirst == 'Y'" round color="#C21F3A" block @click="offerFirst" style="margin-top: 10px;">
-            <p>出价</p>
-          </van-button>
+          <div style="display: flex;">
+            <van-button round color="#C21F3A" block @click="offer">
+              <p>出价</p>
+              <p v-if="detail.ladderPrice">{{price}}元</p>
+            </van-button>
 
+            <van-button v-if="isFirst == 'Y'" round color="#C21F3A" block @click="offerFirst" style="margin-left: 10px;">
+              <p>优先跟价</p>
+            </van-button>
+          </div>
         </van-col>
         <van-col span="4" v-if="detail.ladderPrice" style="text-align: center;line-height: 1rem">
           <van-button color="#e2e2e2" icon="plus" size="small" @click="add"></van-button>
@@ -405,7 +406,12 @@ export default {
             }else{
               that.price = response.rows[0].money + that.detail.ladderPrice
             }
-
+          }else{
+            if (that.detail.biddingDirect == 2 ||that.detail.biddingDirect == '反向竞价') {
+              that.price = that.detail.price - that.detail.ladderPrice
+            }else{
+              that.price = that.detail.price + that.detail.ladderPrice
+            }
           }
         });
 
@@ -562,7 +568,7 @@ export default {
           userId:this.userId,
           userAccount:this.userAccount,
           userName:this.userName,
-          money:parseInt(newMoney).toFixed(2),
+          money:parseFloat(newMoney),
         };
         biddingSubmit(data).then(response =>{
           let _this = this
@@ -687,7 +693,7 @@ export default {
     add(){
       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: '出价不能高于挂牌价格',
@@ -699,7 +705,7 @@ export default {
           }
         }else{
 
-          if(this.biddinglistInformation[0].money <= (parseInt(this.price)+parseInt(this.detail.ladderPrice))){
+          if(this.biddinglistInformation[0].money <= (parseFloat(this.price)+parseFloat(this.detail.ladderPrice))){
             this.$toast({
               icon: 'fail', // 找到自己需要的图标
               message: '出价不能高于当前出价最低价格',
@@ -712,7 +718,7 @@ export default {
         }
       }else{
         if (this.biddinglistInformation.length<1){
-          if(this.detail.price>=this.price){
+          if(this.detail.price>this.price){
             this.$toast({
               icon: 'fail', // 找到自己需要的图标
               message: '出价不能低于挂牌价格',
@@ -777,7 +783,7 @@ export default {
             return;
           }
         }else{
-          if(this.biddinglistInformation[0].money>=(parseInt(this.price)-parseInt(this.detail.ladderPrice))){
+          if(this.biddinglistInformation[0].money>=(parseFloat(this.price)-parseFloat(this.detail.ladderPrice))){
             this.$toast({
               icon: 'fail', // 找到自己需要的图标
               message: '出价不能低于当前出价最高价格',
diff --git a/src/views/user/signature/signatureList.vue b/src/views/user/signature/signatureList.vue
index a2016676..3c2c1342 100644
--- a/src/views/user/signature/signatureList.vue
+++ b/src/views/user/signature/signatureList.vue
@@ -44,7 +44,7 @@
                 <p>预览</p>
               </div>
               <div class="opera_btn" v-if="item.signingMode == '线上' && item.isArchive == '是' ">
-                <a :href="'/api/profile/download'+item.contractPdf" download style="color: #333333">
+                <a :href="'/api/profile/download/'+item.contractPdf" download style="color: #333333">
                   <img src="../../../assets/images/sunVillage_info/signature_icon_04.png" alt="" width="35">
                   <p>电子合同</p>
                 </a>