git 修复

Pages/yishi/wenzhen_v2/wenzhen.js

@@ -267,7 +267,8 @@ Page({
           new_conversationList.push(item);
         })
       };
-      //console.log(new_conversationList);
+      console.log(2222);
+      console.log(new_conversationList);
       this.setData({
         conversationList: new_conversationList
       })
@@ -296,7 +297,8 @@ Page({
     let userID = wx.getStorageSync('user_id_'+usertype);
     let totalUnreadCount = 0;
     let message_inquiry_type = this.data.message_inquiry_type;
-    //console.log(this.data.conversationList);
+    console.log(11111);
+    console.log(this.data.conversationList);
     this.data.conversationList.forEach(item => {
       let conversationID = item.conversationID;
       if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过

user/pages/yishi/onlinesetup/index.js

@@ -148,11 +148,8 @@ Page({
   },
 
   getConfig(){
-    let {inquiry_type,inquiry_mode}=this.data;
+    // let {inquiry_type,inquiry_mode}=this.data;
-    api.getServiceConfig({
+    api.getServiceConfig().then(response => {
-        inquiry_type,
-        inquiry_mode
-    }).then(response => {
         let result=response.data;
         if(result){
             this.setData({
@@ -160,7 +157,7 @@ Page({
              'config_setting.service_process':result.service_process,
              'config_setting.service_period':result.service_period,
              'config_setting.service_rounds':result.service_rounds,
-              'config_setting.config_service_id':result.config_service_id,
+              'config_setting.config_service_id':result.difficult_consultation_id,
               difficultSetting:true
             })
         }else{

user/pages/yishi/yizhensetup/index.js

@@ -46,11 +46,11 @@ Page({
   },
   onShow(){
     this.getDoctorOpen()
-    // let doctor_id=wx.getStorageSync('client_user_id_2');
+    let doctor_id=wx.getStorageSync('client_user_id_2');
-    // console.log(doctor_id);
+  
-    // if(doctor_id){
+    if(doctor_id){
-    //     this.getService(doctor_id)
+        this.getService(doctor_id)
-    // }
+    }
     let params = {};
     params.inquiry_type = this.data.inquiry_type;//接诊类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药）
     params.inquiry_mode = this.data.inquiry_mode;//接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员）

utils/network/api.js

@@ -1005,6 +1005,12 @@ postServiceConfig(params) {//新增医生问诊配置-服务设置
             method: 'GET'
         }) 
     }
+    getDoctorService(params){//获取开通服务
+        return this.request({
+            url: `${this.baseUrl}/doctor/inquiry/service/${params}`,
+            method: 'GET'
+        }) 
+    }
     getOpen(params){//获取医生问诊服务开启状态
         return this.request({
             url: `${this.baseUrl}/doctor/inquiry/config/open`,