合并分支 'bug.server.v3.2.4.20210425.liuquan' 到 'XDJK-master'

bug.server.v3.2.4.20210425.liuquan

查看合并请求 !12

packageA/chat/chat.js

@@ -657,7 +657,6 @@ Page({
   /**
    *  服务提前结束 0同意 1拒绝
    */
-
   endInquiry: function (e) {
     var alldata = wx.getStorageSync('data')
     let that = this;
@@ -690,42 +689,51 @@ Page({
       unitid: that.data.doctorunitid
     }
     Service.seeBuyStaus(data).then((res) => {
-      if (res.code == 1 && res.data.status == '1') {
-        that.setData({
-          payFlag: true,
-          payFlag1: false,
-          sendBtns: true,
-          end_time: res.data.end_time_stamp,
-          status: false,
-          serviceName: res.data.name
-        })
-        return;
-      } else if (res.code == 1 && res.data.status == "0") {
-        that.setData({
-          payFlag1: true,
-          end_time: '待接诊',
-          sendBtns: true,
-          status: true,
-          serviceName: res.data.name
-        })
-        return;
-      } else if (res.code == 1 && res.data.status == "2") {
-        that.setData({
-          payFlag: false,
-          payFlag1: false,
-          end_time: '已结束',
-          sendBtns: true,
-          status: true,
-          serviceName: res.data.name
-        })
-        that.getFreeChat(that.data.t_unionid, wx.getStorageSync('data').unionid);
-      } else {
-        that.setData({
-          payFlag: false,
-          end_time: '',
-          serviceName: '未知',
-        })
-        that.getFreeChat(that.data.t_unionid, wx.getStorageSync('data').unionid);
+      if (res.code == 1) {
+        switch (Number(res.data.status)) {
+          case 0:
+            that.setData({
+              payFlag1: true,
+              end_time: '待接诊',
+              sendBtns: true,
+              status: true,
+              serviceName: res.data.name
+            })
+            return;
+          case 1:
+            that.setData({
+              payFlag: true,
+              payFlag1: false,
+              sendBtns: true,
+              end_time: res.data.end_time_stamp,
+              status: false,
+              serviceName: res.data.name
+            })
+            return;
+          case 2:
+            that.setData({
+              payFlag: false,
+              payFlag1: false,
+              end_time: '已结束',
+              sendBtns: true,
+              status: true,
+              serviceName: res.data.name
+            })
+            if( res.data.counsel=="20"){
+              that.getFreeChat(that.data.t_unionid, wx.getStorageSync('data').unionid);
+            }
+            return
+          default:
+            that.setData({
+              payFlag: false,
+              end_time: '',
+              serviceName: '未知',
+            })
+            if( res.data.counsel=="20"){
+            that.getFreeChat(that.data.t_unionid, wx.getStorageSync('data').unionid);
+            }
+            break;
+        }
       }
     }).catch(error => {
       console.error("返回用户支付列表", error)
@@ -1131,7 +1139,6 @@ Page({
       message.payload.data = message.payload.data.type;
     }
     Arr.push(message);
-
     that.setData({
       unsentMessageList: that.data.unsentMessageList.concat(Arr),
       msgContent: ''