医生3.1

user/pages/mobile_login/index.json

@@ -1,7 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "m-nav-bar": "../../../commpents/mynavbar/index",
+    "m-nav-bar": "../../commpents/mynavbar/index",
     "van-field": "@vant/weapp/field/index",
     "van-button": "@vant/weapp/button/index",
     "van-checkbox": "@vant/weapp/checkbox/index",

user/pages/yishi/expertDetail/expertDetail.js

@@ -261,6 +261,25 @@ bindchange(e){
       }
     })
   },
+  hasOtherInquiry(arr){
+    if(arr){
+        for (var i = 0; i < arr.length; ++i) {
+            if(arr[i].is_enable==1 && arr[i].inquiry_type==1 && arr[i].inquiry_mode==2){
+                this.setData({
+                    canVideo:true,
+                    videoPrice:arr[i].inquiry_price
+                })
+            };
+            if(arr[i].is_enable==1 && arr[i].inquiry_type==1 && arr[i].inquiry_mode==6){
+                this.setData({
+                    canDiffcult:true,
+                    yinanPrice:arr[i].inquiry_price
+                })
+            }
+
+        }
+    }
+  },
   formatInquiryStatus(arr){
     var  a='3';
     if(arr){
@@ -312,6 +331,7 @@ bindchange(e){
         console.log("inquiryType:"+inquiryType)
         if(inquiryType==1){
          this.loopArr(doctor_inquiry_config,3);
+         this.hasOtherInquiry(doctor_inquiry_config)
          this.setData({
             canTuwen:true
         })

user/pages/yishi/onlinesetup/index.js

@@ -38,7 +38,8 @@ Page({
       ]
     },
     sub_visible: false,
-    showSetting:false
+    showSetting:false,
+    difficultSetting:false
   },
   onLoad(){
 
@@ -94,7 +95,12 @@ 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.config_service_id,
+              difficultSetting:true
+            })
+        }else{
+            this.setData({
+                difficultSetting:false
             })
         } 
       }).catch(errors => {console.error(errors);})
@@ -116,6 +122,15 @@ Page({
             })
             return false;
         }
+    }
+    if(this.data.active==2){
+        if(!this.data.difficultSetting){
+            wx.showToast({
+              title: '请先设置服务设置',
+              icon:'none'
+            })
+            return false;
+        }
     }
       this.setData({ note: this.data.open_note });
       wx.vibrateShort({