From f550ed1da6e8c6201a8c99d5d1629c5ee2a7c7cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Wed, 22 Mar 2023 14:42:08 +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/api/user/index.js                        |  2 +-
 src/views/index.vue                          |  4 ++--
 src/views/project/projectDetail.vue          | 20 ++++++++---------
 src/views/project/signUp.vue                 |  8 +++++++
 src/views/sunVillage_info/list_signature.vue |  6 ++---
 src/views/user/interaction/index.vue         | 23 ++++++++++----------
 6 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/src/api/user/index.js b/src/api/user/index.js
index 5fc7e2d9..333ee4bd 100644
--- a/src/api/user/index.js
+++ b/src/api/user/index.js
@@ -81,7 +81,7 @@ export function updateCommunicate(query){
 //咨询详情
 export function selectCommunicate(id){
   return request({
-    url: '/transaction/communicate/'+id,
+    url: '/transaction/communicate/get/'+id,
     method: 'get'
   })
 }
diff --git a/src/views/index.vue b/src/views/index.vue
index ee96a49f..b1596ac4 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -103,11 +103,11 @@ export default {
         for (var i = 0; i < response.rows.length; i++) {
           this.newList.push(response.rows[i]);
           var imgStrs = response.rows[i].content.match(/<IMG src=\"([^\"]*?)\">/gi)
+          console.log(imgStrs)
           if (imgStrs != null && imgStrs != '') {
             this.newList[i].img = imgStrs[0].substr(10,(imgStrs[0].length-12));
           }
         }
-        console.log(this.newList)
         if(this.newList.length >= response.total){
           this.finished = true;
           return;
@@ -125,7 +125,7 @@ export default {
         for (var i = 0; i < response.rows.length; i++) {
           var imgStrs = response.rows[i].content.match(/<IMG src=\"([^\"]*?)\">/gi)
           if (imgStrs != null && imgStrs != '') {
-            this.bannerList[i].img = imgStrs[0].substr(10,(imgStrs[0].length-12));
+            this.bannerList[i].img = '/api'+imgStrs[0].substr(10,(imgStrs[0].length-12));
           }
         }
         this.loading = false;
diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue
index cff51c9b..45d4a162 100644
--- a/src/views/project/projectDetail.vue
+++ b/src/views/project/projectDetail.vue
@@ -70,7 +70,7 @@
           <van-row>
             <van-col span="24"><span>竞价方向：</span>{{ detail.biddingDirect }}</van-col>
           </van-row>
-          <van-row>
+          <van-row v-if="detail.ladderPrice">
             <van-col span="24"><span>阶梯价（加价幅度）：</span>{{ detail.ladderPrice }}</van-col>
           </van-row>
           <van-row>
@@ -206,7 +206,7 @@
         </van-col>
       </van-row>
       <van-field v-if="showBtn&&!detail.ladderPrice" v-model="price" type="number" input-align="center" placeholder="请输入出价金额" />
-      <van-row v-if="showBtn">
+      <van-row v-if="showBtn" type="flex" justify="space-around">
         <van-col span="4" v-if="detail.ladderPrice" style="text-align: center;line-height: 1rem">
           <van-button color="#e2e2e2" icon="minus" size="small" @click="sub"></van-button>
         </van-col>
@@ -488,7 +488,7 @@ export default {
       }
       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: '出价不能高于挂牌价格',
@@ -499,7 +499,7 @@ export default {
             return;
           }
         }else{
-          if(this.biddinglistInformation[0].money<this.price){
+          if(this.biddinglistInformation[0].money<=this.price){
             this.$toast({
               icon: 'fail', // 找到自己需要的图标
               message: '出价不能高于当前出价最低价格',
@@ -512,7 +512,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: '出价不能低于挂牌价格',
@@ -523,7 +523,7 @@ export default {
             return;
           }
         }else{
-          if(this.biddinglistInformation[0].money>this.price){
+          if(this.biddinglistInformation[0].money>=this.price){
             this.$toast({
               icon: 'fail', // 找到自己需要的图标
               message: '出价不能低于当前出价最高价格',
@@ -562,7 +562,7 @@ export default {
     },
     add(){
       if (this.detail.biddingDirect == '递减竞价'){
-        if (this.biddinglistInformation.length<1){
+        if (this.biddinglistInformation.length<=1){
           if(this.detail.price<this.price){
             this.$toast({
               icon: 'fail', // 找到自己需要的图标
@@ -574,7 +574,7 @@ export default {
             return;
           }
         }else{
-          if(this.biddinglistInformation[0].money<this.price){
+          if(this.biddinglistInformation[0].money<=this.price){
             this.$toast({
               icon: 'fail', // 找到自己需要的图标
               message: '出价不能高于当前出价最低价格',
@@ -587,7 +587,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: '出价不能低于挂牌价格',
@@ -598,7 +598,7 @@ export default {
             return;
           }
         }else{
-          if(this.biddinglistInformation[0].money>this.price){
+          if(this.biddinglistInformation[0].money>=this.price){
             this.$toast({
               icon: 'fail', // 找到自己需要的图标
               message: '出价不能低于当前出价最高价格',
diff --git a/src/views/project/signUp.vue b/src/views/project/signUp.vue
index 811b5b48..c3bde4b6 100644
--- a/src/views/project/signUp.vue
+++ b/src/views/project/signUp.vue
@@ -179,6 +179,14 @@ export default {
           icon: 'warning', // 找到自己需要的图标
           message: '保存之前，请先勾选<<竞拍服务协议>>!'
         })
+        return;
+      }
+      if(this.fileList.length<1){
+        this.$toast({
+          icon: 'warning', // 找到自己需要的图标
+          message: '请上传相关凭证'
+        })
+        return;
       }
       submmitSignup(values).then(response =>{
         if(response.code==200){
diff --git a/src/views/sunVillage_info/list_signature.vue b/src/views/sunVillage_info/list_signature.vue
index 0913adfc..8d57df7f 100644
--- a/src/views/sunVillage_info/list_signature.vue
+++ b/src/views/sunVillage_info/list_signature.vue
@@ -17,7 +17,7 @@
         @load="getList"
       >
         <!----1-->
-        <van-swipe-cell v-for="(item,index) in applicationList" :key="index" >
+        <van-swipe-cell v-for="(item,index) in applicationList" :key="index" :disabled="item.secondIsSign =='是'&&item.attachement ==  null&&item.isArchive == '否'">
           <div class="item" @click="goDetail(item.id)">
             <div class="info">
               <div class="title">
@@ -37,11 +37,11 @@
             <div class="operation">
               <!-- delete 删除 edit编辑 view查看 list榜单 -->
 
-              <div class="opera_btn" style="margin-right: 10px;" v-if="item.signingMode == '线上' && item.firstIsSign =='否' " @click="openPopup(item.id)">
+              <div class="opera_btn" v-if="item.signingMode == '线上' && item.firstIsSign =='否' " @click="openPopup(item.id)">
                 <img src="../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="35">
                 <p>签名</p>
               </div>
-              <div class="opera_btn" style="margin-right: 10px;" v-if="item.signingMode == '线上' && item.attachement !=  null ">
+              <div class="opera_btn" style="margin: 0 10px;" v-if="item.signingMode == '线上' && item.attachement !=  null ">
                 <img src="../../assets/images/sunVillage_info/signature_icon_03.png" alt="" width="35">
                 <p>预览</p>
               </div>
diff --git a/src/views/user/interaction/index.vue b/src/views/user/interaction/index.vue
index a1cf273d..88cddd4b 100644
--- a/src/views/user/interaction/index.vue
+++ b/src/views/user/interaction/index.vue
@@ -12,6 +12,7 @@
     <van-list
       v-model="loading"
       :finished="finished"
+      :immediate-check="false"
       finished-text="没有更多了"
       style="margin-top: 10px;"
       @load="getList()"
@@ -21,18 +22,18 @@
           <van-row>
             <van-col span="20"><van-icon name="../../static/images/icon/questions.png" size="18" style="top: 5px;margin-right: 5px;"/>
               {{item.content}}</van-col>
-            <van-col span="4" style="text-align: right;font-size: 0.2rem;color: #007E72;" v-if="item.reply != null">已回复</van-col>
-            <van-col span="4" style="text-align: right;font-size: 0.2rem;color: #c21F3a;" v-if="item.reply == null">未回复</van-col>
+            <van-col span="4" style="text-align: right;font-size: 0.2rem;color: #007E72;" v-if="item.reply">已回复</van-col>
+            <van-col span="4" style="text-align: right;font-size: 0.2rem;color: #c21F3a;" v-if="!item.reply">未回复</van-col>
           </van-row>
         </template>
         <template #label>
           <van-icon name="../../static/images/icon/answer.png" size="18" style="top: 5px;margin-right: 5px;"/>{{item.reply}}
           <van-row>
             <van-col span="18">发布时间：{{item.logintime}}</van-col>
-            <van-col span="3" style="color: #007E72;text-align: right;" @click="goAdd('update',item.id)" v-if="item.reply == null">
+            <van-col span="3" style="color: #007E72;text-align: right;" @click="goAdd('update',item.id)" v-if="!item.reply">
               <van-icon name="edit" size="15" style="top:3px"/>修改
             </van-col>
-            <van-col span="3" style="color: #007E72;text-align: right;" @click="deleteInteraction(item.id)" v-if="item.reply == null">
+            <van-col span="3" style="color: #007E72;text-align: right;" @click="deleteInteraction(item.id)" v-if="!item.reply">
               <van-icon name="delete-o" size="15" style="top:3px"/>删除
             </van-col>
           </van-row>
@@ -66,7 +67,12 @@ export default {
     };
   },
   created() {
-    this.getInfo();
+    getInfo().then(response => {
+      getMember(response.user.userId).then(response => {
+        this.queryParams.memberId = response.data.id;
+        this.getList()
+      });
+    });
   },
   methods: {
     goAdd(type,id){
@@ -80,13 +86,6 @@ export default {
     goClickLeft(){
       window.location='user';
     },
-    getInfo(){
-      getInfo().then(response => {
-        getMember(response.user.userId).then(response => {
-          this.queryParams.memberId = response.data.id;
-        });
-      });
-    },
     getList(){
       this.loading = true;
       userConsulting(this.queryParams).then(response => {