更新

pages/chatRoom/dialogbox.js

@@ -30,6 +30,7 @@ Page({
         gambitList: [], //话题列表
         sendfrom: [],
         isEndGambit: true, //是否结束话题，用于点击编辑不结束话题
+        fdatastatus: 0, // 0 1 2对接中
     },
     /**
      * 生命周期函数--监听页面加载
@@ -41,6 +42,11 @@ Page({
             timdialogid: options.id,
             userid: wx.getStorageSync('userData').userid
         });
+        if (options.fdatastatus) {
+            this.setData({
+                fdatastatus: options.fdatastatus
+            })
+        }
         //判断是否存在安全距离
         let iosX = (getApp().globalData.safeAreaBottom == 0) ? false : true;
         this.setData({
@@ -361,6 +367,9 @@ Page({
                             title: text,
                             icon: "none"
                         })
+                        if (res.msg == '成功') that.setData({
+                            joinHands: false
+                        })
                     })
                 }
             }
@@ -390,6 +399,9 @@ Page({
                             title: text,
                             icon: "none"
                         })
+                        if (res.msg == '成功') that.setData({
+                            joinHands: false
+                        })
                     })
                 }
             }

pages/chatRoom/dialogbox.wxml

@@ -1,7 +1,7 @@
 <!-- 头部 -->
 <view class="header">
     <view class="header_title">{{headerTitle}}</view>
-    <view class="header_botton" wx:if="{{joinHands}}">
+    <view class="header_botton" wx:if="{{joinHands&&fdatastatus==2}}">
         <van-button custom-class='head-bot-class head-bot-l' catchtap="refuseToCooperate">暂不合作</van-button>
         <van-button custom-class='head-bot-class head-bot-r' catchtap="confirmTheCooperation">确认合作</van-button>
     </view>

pages/tabbar-pages/supplyAndDemand/index.js

@@ -75,10 +75,11 @@ Page({
     //跳转聊天
     toLinkUpPage(e) {
         const {
-            timdialogid
+            timdialogid,
+            fdatastatus
         } = e.currentTarget.dataset;
         wx.navigateTo({
-            url: '/pages/chatRoom/dialogbox?id=' + timdialogid,
+            url: '/pages/chatRoom/dialogbox?id=' + timdialogid + '&fdatastatus=' + fdatastatus,
         })
     },
     /* tabs切换接口 */
@@ -355,7 +356,7 @@ Page({
         });
         this.setData({
             searchFocus: false,
-            searchText:value
+            searchText: value
         })
         this.InitializeDataPaging();
         if (this.data.active == 0) {

pages/tabbar-pages/supplyAndDemand/index.wxml

@@ -54,7 +54,7 @@
                 </view>
                 <view class="abutting-joint-timeAndBut">
                     <view class="abutting-joint-time">{{item.checkdate}}</view>
-                    <van-button custom-class="abutting-joint-but" data-timdialogid="{{item.imdialogs[0].timdialogid}}" catchtap="toLinkUpPage"><text class="abutting-joint-but-text">继续沟通</text></van-button>
+                    <van-button custom-class="abutting-joint-but" data-fdatastatus="2" data-timdialogid="{{item.imdialogs[0].timdialogid}}" catchtap="toLinkUpPage"><text class="abutting-joint-but-text">继续沟通</text></van-button>
                 </view>
             </view>
             <view style="width: 100vw; height: 30rpx;"></view>
@@ -105,7 +105,7 @@
     <view class="CommunicationOfNumber">
         <view class="CommunicationOfNumber-title">沟通列表</view>
         <view class="CommunicationOfNumber-list">
-            <view wx:for="{{imdialogs}}" wx:key="index">{{item.createdate}}<text data-timdialogid="{{item.timdialogid}}" catchtap="toLinkUpPage" class="text">用户：{{item.fname}}</text><text wx:if="{{item.fdatastatus==0}}">发起联系，遗憾未达成合作</text><text wx:elif='{{item.fdatastatus==1}}'>发起联系，恭喜达成合作</text><text wx:else>发起联系，正在对接中</text></view>
+            <view wx:for="{{imdialogs}}" wx:key="index">{{item.createdate}}<text data-timdialogid="{{item.timdialogid}}" data-fdatastatus="{{item.fdatastatus}}" catchtap="toLinkUpPage" class="text">用户：{{item.fname}}</text><text wx:if="{{item.fdatastatus==0}}">发起联系，遗憾未达成合作</text><text wx:elif='{{item.fdatastatus==1}}'>发起联系，恭喜达成合作</text><text wx:else>发起联系，正在对接中</text></view>
         </view>
     </view>
     <view style="height: 50px;"></view>