From 4feeebb21b2b0e8f243b0a46efd1609bdcf7bf58 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 1 Mar 2024 13:42:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E7=94=9F3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 user/commpents/mynavbar/index.js              |  4 +++-
 user/commpents/mynavbar/index.wxml            |  2 +-
 user/commpents/navbar/index.js                |  1 +
 user/pages/mobile_login/index.json            |  2 +-
 user/pages/yishi/expertDetail/expertDetail.js | 20 +++++++++++++++++++
 user/pages/yishi/onlinesetup/index.js         | 19 ++++++++++++++++--
 6 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/user/commpents/mynavbar/index.js b/user/commpents/mynavbar/index.js
index d8bc3f1..ff9d082 100644
--- a/user/commpents/mynavbar/index.js
+++ b/user/commpents/mynavbar/index.js
@@ -1,4 +1,6 @@
 // commpents/mynavbar/index.js
+import { API } from '../../../utils/network/api'
+const api = new API()
 Component({
   /**
    * 组件的属性列表
@@ -15,7 +17,7 @@ Component({
    * 组件的初始数据
    */
   data: {
-    
+    static_host: api.getStaticHost()
   },
 
   /**
diff --git a/user/commpents/mynavbar/index.wxml b/user/commpents/mynavbar/index.wxml
index e131b2b..7402c61 100644
--- a/user/commpents/mynavbar/index.wxml
+++ b/user/commpents/mynavbar/index.wxml
@@ -1,6 +1,6 @@
 <view class="container">
   <view class="tui-navigatorbar">
-    <image wx:if="{{ navbarData.showCapsule==1 }}" class="tui-navigatorbar-back" bindtap="_navback" src="/TUIKit/static/assets/ic_back_black.svg" />
+    <image wx:if="{{ navbarData.showCapsule==1 }}" class="tui-navigatorbar-back" bindtap="_navback" src="{{static_host}}/applet/doctor/static/images/yishi/back.png" />
     <view class="conversation-title">{{ navbarData.title }}</view>
   </view>
   <view class="box">
diff --git a/user/commpents/navbar/index.js b/user/commpents/navbar/index.js
index 9e288de..e69055b 100644
--- a/user/commpents/navbar/index.js
+++ b/user/commpents/navbar/index.js
@@ -1,3 +1,4 @@
+import { API } from '../../../utils/network/api'
 const app = getApp()
 const api = new API()
 Component({
diff --git a/user/pages/mobile_login/index.json b/user/pages/mobile_login/index.json
index 583e3ce..a2d5b48 100644
--- a/user/pages/mobile_login/index.json
+++ b/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",
diff --git a/user/pages/yishi/expertDetail/expertDetail.js b/user/pages/yishi/expertDetail/expertDetail.js
index 490ad70..efd780c 100644
--- a/user/pages/yishi/expertDetail/expertDetail.js
+++ b/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
         })
diff --git a/user/pages/yishi/onlinesetup/index.js b/user/pages/yishi/onlinesetup/index.js
index 034a3f4..0e75d9a 100644
--- a/user/pages/yishi/onlinesetup/index.js
+++ b/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({