From bdc8abf326a20ff10ebd6efcee6ffc381e36f76e Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 22 Mar 2024 16:10:50 +0800
Subject: [PATCH] =?UTF-8?q?3.22=E5=8C=BB=E7=94=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/index/index.wxss                  |   2 +-
 Pages/yishi/wenzhen_v2/wenzhen.js             |  23 ++--
 Pages/yishi/wenzhen_v2/wenzhen.wxml           |   2 +-
 TUICallKit/TUICallKit/TUICallKit.js           |   8 +-
 .../component/SingleCall/SingleCall.js        |  12 +-
 .../component/SingleCall/SingleCall.wxml      |   2 +-
 .../TUICallService/serve/callManager.js       |   3 +
 .../TUICallService/serve/callManager.ts       |   1 +
 TUICallKit/pages/globalCall/globalCall.js     |   2 +
 .../TUICallKit/TUICallKit/TUICallKit.js       |   3 -
 .../TUICallKit/TUICallKit/TUICallKit.json     |   7 -
 .../TUICallKit/TUICallKit/TUICallKit.wxml     |   0
 .../TUICallKit/TUICallKit/TUICallKit.wxss     |   0
 .../TUIChat/components/MessageInput/index.js  |  17 ++-
 .../components/MessageInput/index.wxml        |   8 +-
 .../TUIKit/components/TUIChat/index.wxml      |   6 +-
 app.js                                        |  31 +++--
 commpents/te_navbar/index.js                  |   3 +-
 user/commpents/myprofile/index.js             |  10 +-
 user/commpents/myprofile/index.wxml           | 121 +++++++++++++++---
 user/commpents/te_navbar/index.js             |  11 +-
 user/pages/yishi/chufangsetup/index.json      |   2 +-
 user/pages/yishi/expertDetail/expertDetail.js |  95 +++++++++++---
 .../yishi/expertDetail/expertDetail.wxml      |  76 ++++++-----
 .../yishi/expertDetail/expertDetail.wxss      |  17 ++-
 user/pages/yishi/onlinesetup/index.js         |  11 +-
 user/pages/yishi/onlinesetup/index.wxml       |   6 +-
 user/pages/yishi/onlinesetupprice/index.wxml  |   5 +-
 user/pages/yishi/service_setting/index.js     |  18 ++-
 user/pages/yishi/service_setting/index.wxml   |   2 +-
 user/pages/yishi/service_setting/index.wxss   |   2 +-
 user/pages/yishi/yizhensetup/index.js         |  44 ++++++-
 user/pages/yishi/yizhensetup/index.wxml       |  19 ++-
 user/pages/yishi/yizhensetup/index.wxss       |   5 +-
 34 files changed, 437 insertions(+), 137 deletions(-)
 delete mode 100644 TUIChatService/TUIKit/components/TUICallKit/TUICallKit/TUICallKit.js
 delete mode 100644 TUIChatService/TUIKit/components/TUICallKit/TUICallKit/TUICallKit.json
 delete mode 100644 TUIChatService/TUIKit/components/TUICallKit/TUICallKit/TUICallKit.wxml
 delete mode 100644 TUIChatService/TUIKit/components/TUICallKit/TUICallKit/TUICallKit.wxss

diff --git a/Pages/yishi/index/index.wxss b/Pages/yishi/index/index.wxss
index 1590082..b9673ab 100644
--- a/Pages/yishi/index/index.wxss
+++ b/Pages/yishi/index/index.wxss
@@ -255,7 +255,7 @@ page{
 }
 .introicon{
     top:2rpx;
-    left:50rpx;
+    right:-2rpx;
     width:32rpx;
     height:32rpx;
     display: flex;
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index 90caa34..2f6a6ee 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -117,7 +117,10 @@ Page({
     if (typeof this.getTabBar === 'function' && this.getTabBar()) {
       this.getTabBar().stopInterval()
     }
-    clearInterval(this.data.unreadnnum_inter)
+    if(this.data.unreadnnum_inter){
+        clearInterval(this.data.unreadnnum_inter);
+    }
+  
     this.setData({
       hasOnShow: false,
       data_list_1: [],
@@ -177,7 +180,9 @@ Page({
     })
     let url = e.currentTarget.dataset.url;
     let name = e.currentTarget.dataset.name;
-    wx.setStorageSync(name, 0);
+    if(name){
+        wx.setStorageSync(name, 0);
+    }
     app.go(url);
   },
   $onMessageReceived(value) {
@@ -188,7 +193,7 @@ Page({
   formatStatus(){
     let order_inquiry_id_list = [];
     order_inquiry_id_list.push("");//初始化一个，防止失败
-    console.log(this.data.conversationList.length)
+    console.log(this.data.conversationList)
     let arr=this.data.conversationList.filter(item => item.conversationID != 'C2Cadministrator');
    
     arr.forEach(item => {
@@ -223,7 +228,8 @@ Page({
         }else{
             order_inquiry_ids+=item
         }
-    })
+    });
+    //console.log(order_inquiry_ids)
     api.getDoctorInquiryMessageAttr({order_inquiry_ids: order_inquiry_ids}).then(response => {
       let new_conversationList = [];
       if(response.data.length > 0){
@@ -261,12 +267,12 @@ Page({
           new_conversationList.push(item);
         })
       };
-      console.log(new_conversationList);
+      //console.log(new_conversationList);
       this.setData({
         conversationList: new_conversationList
       })
     }).then(() => {
-      console.log("开始格式化formatConversationList")
+      //console.log("开始格式化formatConversationList")
       this.formatConversationList();
     }).catch(errors => {console.error(errors);})
   },
@@ -290,7 +296,7 @@ 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(this.data.conversationList);
     this.data.conversationList.forEach(item => {
       let conversationID = item.conversationID;
       if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过
@@ -411,7 +417,6 @@ Page({
     this.setData({
       show: false
     })
-    console.log(111);
     // console.log("开始订阅消息");
     // wx.requestSubscribeMessage({
     //   tmplIds: ['jhYUf91ULCTX_f69hazqAYwImdFf8ELasRAwB6X-MTM'],
@@ -450,6 +455,8 @@ Page({
       // console.log("开始接诊");
       // console.log(response);
     }).then(() => {
+        console.log(e)
+     console.log("gochat")
       this.goChat(e);
     }).catch(errors => {
       console.error(errors);
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml
index 334482b..a107d04 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxml
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml
@@ -232,6 +232,6 @@
     content="为保障服务质量，请您查看患者病历后再去接诊"
   >
   <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="go" data-from_account="{{show_dialog_from_account}}" data-url="/user/pages/yishi/case/index?order_inquiry_id={{show_dialog_order_inquiry_id}}" >去查看</view>
-  <view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="postDoctorInquiry" data-from_account="{{show_dialog_from_account}}" data-inquiry_type="{{show_dialog_inquiry_type}}" data-order_inquiry_id="{{show_dialog_order_inquiry_id}}" data-url="/TUIChatKit/pages/index" >去接诊</view>
+  <view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="postDoctorInquiry" data-from_account="{{show_dialog_from_account}}" data-inquiry_type="{{show_dialog_inquiry_type}}" data-order_inquiry_id="{{show_dialog_order_inquiry_id}}" data-url="/TUIChatService/pages/index" >去接诊</view>
 </t-dialog>
 </view>
\ No newline at end of file
diff --git a/TUICallKit/TUICallKit/TUICallKit.js b/TUICallKit/TUICallKit/TUICallKit.js
index b925821..f2e2e39 100644
--- a/TUICallKit/TUICallKit/TUICallKit.js
+++ b/TUICallKit/TUICallKit/TUICallKit.js
@@ -1,6 +1,4 @@
-import { TUIStore, StoreName, NAME } from "../index";
-import { TUICallKitServer } from "../TUICallService/index";
-
+import { TUICallKitServer,TUIStore, StoreName, NAME } from "../index";
 const {
   CALL_STATUS,
   CALL_ROLE,
@@ -207,6 +205,7 @@ Component({
   lifetimes: {
     attached() {
       let that = this;
+   
       TUIStore.watch(
         StoreName.CALL,
         {
@@ -231,6 +230,7 @@ Component({
     },
     async detached() {
       let that = this;
+      TUICallKitServer.getTUICallEngineInstance().handleExceptionExit();
       TUIStore.unwatch(StoreName.CALL, {
         [CALL_STATUS]: this.handleCallStatusChange.bind(that),
         [IS_GROUP]: this.handleIsGroupChange.bind(that),
@@ -246,7 +246,7 @@ Component({
         [PUSHER]: this.handlePusherChange.bind(that),
         [PLAYER]: this.handlePlayerListChange.bind(that),
       });
-      await TUICallKitServer.reject();
+     
     },
   },
 });
diff --git a/TUICallKit/TUICallKit/component/SingleCall/SingleCall.js b/TUICallKit/TUICallKit/component/SingleCall/SingleCall.js
index f61a180..dd04160 100644
--- a/TUICallKit/TUICallKit/component/SingleCall/SingleCall.js
+++ b/TUICallKit/TUICallKit/component/SingleCall/SingleCall.js
@@ -44,9 +44,8 @@ Component({
     moved(){
         //console.log('moved')
     },
-    detached(){
-        //console.log('detached')
-        this.hangup()
+    async detached(){
+    
     }
   },
   pageLifetimes: {
@@ -54,7 +53,7 @@ Component({
      
     },
     hide() {
-     this.hangup()
+     // this.hangup()
     },
   },
   data:{
@@ -69,7 +68,8 @@ Component({
     IMG_CAMERA_FALSE:`${PATH}/doctor_camera_false.png`,
     IMG_TRANS:`${PATH}/doctor_trans.png`,
     IMG_SWITCH_CAMERA:`${PATH}/doctor_switch_camera.png`,
-    patient_avatar:wx.getStorageSync('patient_avatar')
+    patient_avatar:wx.getStorageSync('patient_avatar'),
+    patient_name:wx.getStorageSync('patientInfo')?wx.getStorageSync('patientInfo').patient_family_data.patient_name:''
   },
   methods: {
     async accept() {
@@ -77,11 +77,9 @@ Component({
     },
     async hangup() {
       await TUICallKitServer.hangup();
-      console.log(this.data.remoteUserInfoList)
     },
     async reject() {
       await TUICallKitServer.reject();
-      //console.log(this.data.remoteUserInfoList)
     },
     async switchCamera() {
       await TUICallKitServer.switchCamera();
diff --git a/TUICallKit/TUICallKit/component/SingleCall/SingleCall.wxml b/TUICallKit/TUICallKit/component/SingleCall/SingleCall.wxml
index 1a351b1..f8fbf26 100644
--- a/TUICallKit/TUICallKit/component/SingleCall/SingleCall.wxml
+++ b/TUICallKit/TUICallKit/component/SingleCall/SingleCall.wxml
@@ -20,7 +20,7 @@
   <view wx:if="{{callStatus === 'calling' && callMediaType === 2}}" class="invite-calling">
     <view class="invite-calling-header">
         <view class="other-view white" wx:if="{{callRole == 'caller'}}">
-        <text>{{callDuration}}</text>
+        <text>{{patient_name}}</text>
       </view>
       <view class="invite-calling-header-right">
        
diff --git a/TUICallKit/TUICallService/serve/callManager.js b/TUICallKit/TUICallService/serve/callManager.js
index 2d2b3ff..fd78ecd 100644
--- a/TUICallKit/TUICallService/serve/callManager.js
+++ b/TUICallKit/TUICallService/serve/callManager.js
@@ -87,9 +87,11 @@ class CallManager {
         });
     }
     _handleCallStatusToCalling() {
+        console.log('isPageRedirected:'+this._isPageRedirected);
         if (this._isPageRedirected)
             return;
         this._targetPagePath = this.getRoute().route;
+        console.log('videourl:'+`/${this._globalCallPagePath}`);
         // @ts-ignore
         wx.navigateTo({
             url: `/${this._globalCallPagePath}`,
@@ -115,6 +117,7 @@ class CallManager {
                 this._isPageRedirected = false;
             },
             fail: () => {
+                this._isPageRedirected = false;
                 console.error(`${PREFIX} navigateBack fail!`);
             },
             complete: () => { },
diff --git a/TUICallKit/TUICallService/serve/callManager.ts b/TUICallKit/TUICallService/serve/callManager.ts
index 56e525e..bc0a6db 100644
--- a/TUICallKit/TUICallService/serve/callManager.ts
+++ b/TUICallKit/TUICallService/serve/callManager.ts
@@ -95,6 +95,7 @@ export class CallManager {
         this._isPageRedirected = false;
       },
       fail: () => {
+        this._isPageRedirected = false;
         console.error(`${PREFIX} navigateBack fail!`);
       },
       complete: () => {},
diff --git a/TUICallKit/pages/globalCall/globalCall.js b/TUICallKit/pages/globalCall/globalCall.js
index 29455fb..e53ddc7 100644
--- a/TUICallKit/pages/globalCall/globalCall.js
+++ b/TUICallKit/pages/globalCall/globalCall.js
@@ -1,9 +1,11 @@
+import { TUICallKitServer } from "../../index";
 Page({
   data: {},
   onShow() {
 
   },
   onHide(){
+    TUICallKitServer.getTUICallEngineInstance().handleExceptionExit();
      console.log('接听页面隐藏'); 
   }
 });
diff --git a/TUIChatService/TUIKit/components/TUICallKit/TUICallKit/TUICallKit.js b/TUIChatService/TUIKit/components/TUICallKit/TUICallKit/TUICallKit.js
deleted file mode 100644
index 4b43351..0000000
--- a/TUIChatService/TUIKit/components/TUICallKit/TUICallKit/TUICallKit.js
+++ /dev/null
@@ -1,3 +0,0 @@
-Component({
- 
-})
\ No newline at end of file
diff --git a/TUIChatService/TUIKit/components/TUICallKit/TUICallKit/TUICallKit.json b/TUIChatService/TUIKit/components/TUICallKit/TUICallKit/TUICallKit.json
deleted file mode 100644
index 52dd6e0..0000000
--- a/TUIChatService/TUIKit/components/TUICallKit/TUICallKit/TUICallKit.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-  },
-  "navigationStyle": "custom",
-  "disableScroll": true
-}
\ No newline at end of file
diff --git a/TUIChatService/TUIKit/components/TUICallKit/TUICallKit/TUICallKit.wxml b/TUIChatService/TUIKit/components/TUICallKit/TUICallKit/TUICallKit.wxml
deleted file mode 100644
index e69de29..0000000
diff --git a/TUIChatService/TUIKit/components/TUICallKit/TUICallKit/TUICallKit.wxss b/TUIChatService/TUIKit/components/TUICallKit/TUICallKit/TUICallKit.wxss
deleted file mode 100644
index e69de29..0000000
diff --git a/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js
index 9f12489..8a7108a 100644
--- a/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js
@@ -82,7 +82,7 @@ Component({
         this.setData({
             baseInfo:newVal,
             patient_user_id: newVal.patient_user_id,
-          family_id: newVal.family_id,
+           family_id: newVal.family_id,
         });
       },
     },
@@ -125,7 +125,8 @@ Component({
     notShow: false,
     isShow: true,
     currentDate: null,
-    minDate:null,
+    minDate:new Date().getTime(),
+    maxDate:null,
     commonFunction: [
       { name: '查看完整病历', key: '10' },
       { name: '在线开处方', key: '11' },
@@ -299,6 +300,13 @@ Component({
   },
   pageLifetimes:{
     show(){
+        var currentDate = new Date();
+// 在当前日期基础上增加2天
+      currentDate.setDate(currentDate.getDate() + 2);
+var twoDaysLaterTimestamp = currentDate.getTime();
+this.setData({
+    maxDate:twoDaysLaterTimestamp
+})
       //获得常用语
       let words = wx.getStorageSync('words');
       // console.log("words from chat: ", words);
@@ -442,7 +450,7 @@ Component({
     },
     call() {
         let {baseInfo}=this.data;
-        console.log(baseInfo)
+       
         wx.setStorage({
             key:'patientInfo',
             data:{
@@ -464,7 +472,8 @@ Component({
             order_inquiry_id:baseInfo.order_inquiry_id
         }).then(async(res)=>{
            let result=res.data;
-           console.log("userID:"+this.data.patient_user_id)
+           console.log("本人userID:"+app.globalData.config.userID);
+           console.log("呼叫userID:"+this.data.patient_user_id)
            TUICallKitServer.setLogLevel(0);
            await TUICallKitServer.call({
             userID: this.data.patient_user_id,
diff --git a/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.wxml b/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.wxml
index 48e77a6..da7bb5e 100644
--- a/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.wxml
+++ b/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.wxml
@@ -10,10 +10,13 @@
         <image class="TUI-icon" bindtap="switchAudio" 
         src="{{isAudio ? '../../../../static/assets/keyboard.svg' : '../../../../static/assets/audio.svg'}}" />
         <view wx:if="{{!isAudio || isEmoji}}" class="TUI-message-input-main {{ focus && 'TUI-message-input-main-focus'}}" >
-            <textarea focus="{{false}}" hold-keyboard id="mytextarea" class="TUI-message-input-area" adjust-position="{{false}}" cursor-spacing="0"
+            <!-- <textarea class="TUI-message-input-area" adjust-position="{{true}}" cursor-spacing="-300" placeholder="请输入文字" value="{{message}}" bindinput="onInputValueChange" maxlength="-1" type="text" auto-height="{{true}}" placeholder-class="textarea-placeholder" confirm-type="send" show-confirm-bar="{{false}}" 	disable-default-padding="{{true}}" bindfocus="inputBindFocus" bindblur="inputBindBlur" bindconfirm="sendTextMessage" /> -->
+            <textarea focus="{{false}}" id="mytextarea" cursor-spacing="-300" class="TUI-message-input-area" adjust-position="{{true}}" 
                 value="{{message}}" bindinput="onInputValueChange" maxlength="-1" type="text" auto-height="{{true}}"
                 placeholder="请输入文字" placeholder-class="input-placeholder" confirm-type="return" show-confirm-bar="{{false}}"
+                disable-default-padding="{{true}}" 
                 bindfocus="inputBindFocus"
+             
                 bindblur="inputBindBlur" 
                 bindconfirm="sendTextMessage"
                 bindlinechange="inputBindLinechange"
@@ -112,7 +115,7 @@
 <view class="record-modal" wx:if="{{popupToggle}}"   bind:longpress="handleLongPress"
             bind:touchmove="handleTouchMove"
             bind:touchend="handleTouchEnd">
-    <view   class="wrapper">
+    <view   class="wrapper" style="align-items: flex-start;">
         <view class="modal-loading">
         </view>
     </view>
@@ -197,6 +200,7 @@
  bind:confirm="confirmTimepicker"
   value="{{ currentDate }}"
   min-date="{{ minDate }}"
+  max-date="{{maxDate}}"
   formatter="{{ formatter }}"
 />
 
diff --git a/TUIChatService/TUIKit/components/TUIChat/index.wxml b/TUIChatService/TUIKit/components/TUIChat/index.wxml
index fff8f79..c851d64 100644
--- a/TUIChatService/TUIKit/components/TUIChat/index.wxml
+++ b/TUIChatService/TUIKit/components/TUIChat/index.wxml
@@ -32,7 +32,7 @@
       <view class="status {{baseInfo.inquiry_status==5?'status_complete':''}}" wx:else="{{baseInfo.inquiry_status!=4}}">{{baseInfo.inquiry_status==1?'待支付':baseInfo.inquiry_status==2?'待分配':baseInfo.inquiry_status==3?'待接诊':baseInfo.inquiry_status==4?'接诊中':baseInfo.inquiry_status==5?'问诊完成':baseInfo.inquiry_status==6?'已结束':baseInfo.inquiry_status==7?'已取消':'未知'}}</view>
     </view>
   </view>
-  <view class="yuyuetip" bind:tap="openTime" wx:if="{{isEditTime && videoInfo.is_reservation_time && (baseInfo.inquiry_status==4) && videoInfo.is_video==0}}">
+  <view class="yuyuetip" bind:tap="openTime" wx:if="{{isEditTime && videoInfo.is_reservation_time && (baseInfo.inquiry_status==4) && videoInfo.is_video==0 && videoInfo.update_number==0 }}">
     <view >如需要修改视频时间，请点击这里</view>
     <van-icon name="arrow" size="14px" style="margin-top: 3rpx;" color="#FF9C00" />
   </view>
@@ -43,7 +43,7 @@
      <image class="tui-navigatorbar-back" bindtap="goBack" src="../../static/assets/ic_back_black.svg" />
      <view class="conversation-title">{{conversationName}}</view>
     </view> -->
-  <view class="list-box {{ showTips && 'list-box-notips'}} || {{ showGroupTips && 'list-box-group'}}  || {{ showAll && 'list-box-group-notips'}}" style="height: calc(100vh {{baseInfo.inquiry_status==4?'- 197rpx':'- 196rpx'}} - 100rpx - {{navbar_height}}px {{(isEditTime && videoInfo.is_reservation_time && (baseInfo.inquiry_status==4)  && videoInfo.is_video==0) ?'- 72rpx':'- 0rpx'}});"><!-- 100vh -input-area高度 - info高度 -navbar高度  -->
+  <view class="list-box {{ showTips && 'list-box-notips'}} || {{ showGroupTips && 'list-box-group'}}  || {{ showAll && 'list-box-group-notips'}}" style="height: calc(100vh {{baseInfo.inquiry_status==4?'- 197rpx':'- 196rpx'}} - 100rpx - {{navbar_height}}px {{(isEditTime && videoInfo.is_reservation_time && (baseInfo.inquiry_status==4)  && videoInfo.is_video==0 && videoInfo.update_number==0) ?'- 72rpx':'- 0rpx'}});"><!-- 100vh -input-area高度 - info高度 -navbar高度  -->
     <!-- <view wx:if="{{showTips}}" class="safetytips-box"> -->
     <!-- <view class="safetytips">
       <text>【安全提示】本 APP 仅用于体验腾讯云即时通信 IM 产品功能，不可用于业务洽谈与拓展。请勿轻信汇款、中奖等涉及钱款等信息，勿轻易拨打陌生电话，谨防上当受骗。</text>
@@ -93,7 +93,7 @@
   确定
 </view>
 </t-dialog>
-<van-overlay show="{{ showTip && baseInfo.inquiry_mode==2 }}"  z-index="999">
+<van-overlay show="{{ showTip && baseInfo.inquiry_mode==2 && baseInfo.inquiry_status==4}}"  z-index="999">
   <view class="wrapper">
     <view class="block">
     <image src="{{static_host}}/applet/doctor/static/images/yishi/yuyue_star.png" mode="" class="star" />
diff --git a/app.js b/app.js
index 2a435b3..87538b4 100644
--- a/app.js
+++ b/app.js
@@ -5,12 +5,7 @@ import { API } from './utils/network/api'
 import constant from './utils/constant';
 const { GDXZ_CUSTOM_MSEEAGE } = constant;
 const api = new API();
-require.async('./TUICallKit/TUICallService/serve/callManager').then(res => {
-    console.log(res)
-    wx.callManager = new res.CallManager();
-  }).catch(({mod, errMsg}) => {
-    console.error(`path: ${mod}, ${errMsg}`)
-  })
+
 App({
   onLaunch: function (options) {
     // 判断是否由分享进入小程序
@@ -85,9 +80,15 @@ App({
             userSig
         });
         let THIS=this;
-        login_promise.then((imResponse)=> {
+        login_promise.then(async(imResponse)=> {
           // console.log(imResponse.data); // 登录成功
-          wx.callManager.init({
+          await require.async('./TUICallKit/TUICallService/serve/callManager').then(res => {
+            console.log(res)
+            wx.callManager = new res.CallManager();
+          }).catch(({mod, errMsg}) => {
+            console.error(`path: ${mod}, ${errMsg}`)
+          })
+          await wx.callManager.init({
             sdkAppID: Number(this.globalData.config.SDKAPPID),   // 请填入 sdkAppID
             userID: this.globalData.config.userID,    // 请填入 userID
             userSig: userSig,   // 请填入 userSig
@@ -130,6 +131,7 @@ App({
     }
     this.clearAllInterval();
     this.globalData.chat_sdk_ready = false;
+    this.globalData.config.userID='';
   },
   clearAllInterval(){
     this.globalData.app_inter.forEach(item => {
@@ -263,9 +265,16 @@ App({
     app_inter: []
   },
   go(url, ...params){
-    wx.navigateTo({
-      url: url
-    })
+    if (getCurrentPages().length >= 9) {
+       wx.redirectTo({
+         url: url
+       })
+      } else {
+        wx.navigateTo({
+            url: url
+        })
+      }
+   
   },
   formatWenZhenInfo(){
     this.getConversationList();
diff --git a/commpents/te_navbar/index.js b/commpents/te_navbar/index.js
index cadc4e8..2e7c129 100644
--- a/commpents/te_navbar/index.js
+++ b/commpents/te_navbar/index.js
@@ -25,9 +25,10 @@ Component({
    */
   methods: {
     onBack() {
-      console.log("onBackonBackonBack");
+      
       let back_url = this.data.navbarData.back_url;
       let back_url_type = this.data.navbarData.back_url_type;
+    
       if(back_url){
         if(back_url_type == 0){
           app.go(back_url);
diff --git a/user/commpents/myprofile/index.js b/user/commpents/myprofile/index.js
index af96a52..b725f47 100644
--- a/user/commpents/myprofile/index.js
+++ b/user/commpents/myprofile/index.js
@@ -211,6 +211,7 @@ Component({
               avatar_reason: response.data.avatar_reason,
               department_custom_mobile_reason: response.data.department_custom_mobile_reason,
               brief_introduction_reason: response.data.brief_introduction_reason,
+              email:response.data.email,
               be_good_at_reason: response.data.be_good_at_reason,
               license_cert_reason: response.data.license_cert_reason,
               qualification_cert_reason: response.data.qualification_cert_reason,
@@ -924,10 +925,13 @@ Component({
       params.department_custom_name = this.data.custom_keshi;//自定义科室名称
       if(!this.data.office_phone){wx.showToast({title: '请输入科室电话',icon: "error"});return}
       params.department_custom_mobile = this.data.office_phone;//科室电话
-      if(!(/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/.test(this.data.email))){
-        wx.showToast({title: '请输入正确格式的邮箱',icon: "error"});return
+      if(this.data.indentity){
+        if(!(/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/.test(this.data.email))){
+            wx.showToast({title: '请输入正确格式的邮箱',icon: "error"});return
+          }
+          params.email=this.data.email;
       }
-      params.email=this.data.email;
+     
       params.doctor_expertise = this.data.zhuanchang_columns.filter(e => e.is_selected == 1 ).map(e => e.expertise_id);//专长
       if(params.doctor_expertise.length == 0){wx.showToast({title: '请选择专长',icon: "error"});return}
       if(!this.data.select_zhicheng_id){wx.showToast({title: '请选择职称',icon: "error"});return}
diff --git a/user/commpents/myprofile/index.wxml b/user/commpents/myprofile/index.wxml
index d755bd2..0137ef5 100644
--- a/user/commpents/myprofile/index.wxml
+++ b/user/commpents/myprofile/index.wxml
@@ -5,9 +5,15 @@
             <view class="right">
               <view class="note">真人正脸</view>
               <t-avatar image="{{ avatar }}" />
-              <view class="icon" wx:if="{{ !(indentity && iden_auth_disabled) || !(!indentity && introduction_status==2)}}">
+              <view class="icon" wx:if="{{indentity}}">
+                <t-icon name="chevron-right" size="48rpx" data-name="chevron-right" wx:if="{{!iden_auth_disabled}}" />
+             </view>
+             <view class="icon" wx:else>
+                <t-icon name="chevron-right" size="48rpx" data-name="chevron-right" wx:if="{{introduction_status!=2}}" />
+             </view>
+              <!-- <view class="icon" wx:if="{{ !(indentity && iden_auth_disabled) || !(!indentity && introduction_status==2)}}">
                 <t-icon name="chevron-right" size="48rpx" data-name="chevron-right" />
-              </view>
+              </view> -->
             </view>
           </van-uploader>
         </view>
@@ -21,8 +27,16 @@
 
         <!-- <t-cell title="头像" hover required arrow note="真人正脸" /> -->
         <!-- {{!indentity && introduction_status==3}} -->
-        <t-cell title="城市" hover required arrow="{{ !((indentity && iden_auth_disabled) || (!indentity && introduction_status!=2)) }}" note="{{ city_note }}" bindtap="{{((indentity && iden_auth_disabled) || (!indentity && introduction_status!=2))?'':'onCityShow'}}"/>
+        <view wx:if="{{indentity}}">
+            <t-cell title="城市" hover required arrow="{{ ! iden_auth_disabled }}" note="{{ city_note }}" bindtap="{{iden_auth_disabled?'':'onCityShow'}}"/>
+        </view>
+        <view wx:else>
+            <t-cell title="城市" hover required arrow="{{false}}" note="{{ city_note }}" bindtap="{{true?'':'onCityShow'}}"/>
+        </view>
+       
+        <!-- <t-cell title="城市" hover required arrow="{{ !((indentity && iden_auth_disabled) || (!indentity && introduction_status!=2)) }}" note="{{ city_note }}" bindtap="{{((indentity && iden_auth_disabled) || (!indentity && introduction_status!=2))?'':'onCityShow'}}"/> -->
         
+      <view>    
         <t-cascader
           visible="{{ city_show }}"
           theme="tab"
@@ -33,8 +47,15 @@
           bind:change="onChangeCity" 
           bind:close="onCloseCity"
         ></t-cascader>
+      </view>
+      <view wx:if="{{indentity}}">
+        <t-cell title="医院" hover required arrow="{{ !iden_auth_disabled}}" note="{{ yiyuan_note }}" bindtap="{{iden_auth_disabled?'':'onYiYuanShow'}}"/>
+      </view>
+      <view wx:else>
+        <t-cell title="医院" hover required arrow="{{ false}}" note="{{ yiyuan_note }}" bindtap="{{true?'':'onYiYuanShow'}}"/>
+      </view>
 
-        <t-cell title="医院" hover required arrow="{{ !((indentity && iden_auth_disabled) || (!indentity && introduction_status!=2)) }}" note="{{ yiyuan_note }}" bindtap="{{((indentity && iden_auth_disabled) || (!indentity && introduction_status!=2))?'':'onYiYuanShow'}}"/>
+        <!-- <t-cell title="医院" hover required arrow="{{ !((indentity && iden_auth_disabled) || (!indentity && introduction_status!=2)) }}" note="{{ yiyuan_note }}" bindtap="{{((indentity && iden_auth_disabled) || (!indentity && introduction_status!=2))?'':'onYiYuanShow'}}"/> -->
         <van-popup
           show="{{ yiyuan_show }}"
           position="bottom"
@@ -64,12 +85,20 @@
         <van-empty description="暂无医院" wx:if="{{yiyuan_columns.length == 0}}"/>
 
         </van-popup>
-        <t-cell title="科室" hover required arrow="{{ !((indentity && iden_auth_disabled) || (!indentity && introduction_status!=2)) }}" note="{{keshi_note}}" 
-        bindtap="{{((indentity && iden_auth_disabled) || (!indentity && introduction_status!=2))?'':'onKeshiShow'}}" bordered="{{ select_keshi_id == '' }}"/>
+        <view wx:if="{{indentity}}">
+          <t-cell title="科室" hover required arrow="{{ !iden_auth_disabled}}" note="{{keshi_note}}" 
+        bindtap="{{iden_auth_disabled?'':'onKeshiShow'}}" bordered="{{ select_keshi_id == '' }}"/>
+        </view>
+        <view wx:else>
+          <t-cell title="科室" hover required arrow="{{ false}}" note="{{keshi_note}}" 
+        bindtap="{{true?'':'onKeshiShow'}}" bordered="{{ select_keshi_id == '' }}"/>
+        </view>
+        <!-- <t-cell title="科室" hover required arrow="{{ !((indentity && iden_auth_disabled) || (!indentity && introduction_status!=2)) }}" note="{{keshi_note}}" 
+        bindtap="{{((indentity && iden_auth_disabled) || (!indentity && introduction_status!=2))?'':'onKeshiShow'}}" bordered="{{ select_keshi_id == '' }}"/> -->
 
         <view class="custom_keshi" wx:if="{{ select_keshi_id != ''}}">
           <van-field bind:change="onCustomKeshiChange" 
-          disabled="{{(indentity && iden_auth_disabled)}}"
+          disabled="{{(indentity && iden_auth_disabled) || (!indentity && introduction_status==2)}}"
           type="text" model:value="{{custom_keshi}}" label="" 
           placeholder="请输入您所在科室实际名称" border="{{department_custom_name_reason == ''}}" />
         </view>
@@ -220,8 +249,16 @@
           </view>
         </t-popup>
 
-        <t-cell title="职称" hover required arrow="{{ !((indentity && iden_auth_disabled) || (!indentity && introduction_status!=2)) }}" note="{{zhicheng_note}}"
-        bindtap="{{((indentity && iden_auth_disabled) || (!indentity && introduction_status!=2))?'':'onZhiChengShow'}}" />
+      <view wx:if="{{indentity}}">
+        <t-cell title="职称" hover required arrow="{{ !iden_auth_disabled}}" note="{{zhicheng_note}}"
+        bindtap="{{iden_auth_disabled ?'':'onZhiChengShow'}}" />
+      </view>
+      <view wx:else>
+        <t-cell title="职称" hover required arrow="{{false}}" note="{{zhicheng_note}}"
+        bindtap="{{true ?'':'onZhiChengShow'}}" />
+      </view>
+      <!-- <t-cell title="职称" hover required arrow="{{ !((indentity && iden_auth_disabled) || (!indentity && introduction_status!=2)) }}" note="{{zhicheng_note}}"
+        bindtap="{{((indentity && iden_auth_disabled) || (!indentity && introduction_status!=2))?'':'onZhiChengShow'}}" /> -->
         <!-- <t-input 
         label="科室电话" 
         placeholder="请输入科室电话" 
@@ -230,8 +267,39 @@
         suffixIcon="{{ { name: 'chevron-right', ariaLabel: '右' } }}" /> -->
 
         <!-- <t-cell title="专长" hover required arrow note="请选择专长"/> -->
-
-          <van-field
+          <view wx:if="{{indentity}}">
+            <van-field
+            model:value="{{ office_phone }}"
+            bind:change="onOfficePhoneChange"
+            placeholder="请输入科室电话"
+            placeholder-style="font-size:30rpx;letter-spacing: 2rpx;color:rgba(0, 0, 0, 0.4);"
+            input-align="right"
+            type="number"
+            clearable
+            disabled="{{iden_auth_disabled}}"
+            border="{{ department_custom_mobile_reason == '' }}"
+            custom-style="font-size:30rpx;"
+          >
+          <text slot="label">科室电话 <text style="color: #e34d59;">*</text> </text>
+          </van-field>
+          </view>
+          <view wx:else>
+            <van-field
+            model:value="{{ office_phone }}"
+            bind:change="onOfficePhoneChange"
+            placeholder="请输入科室电话"
+            placeholder-style="font-size:30rpx;letter-spacing: 2rpx;color:rgba(0, 0, 0, 0.4);"
+            input-align="right"
+            type="number"
+            clearable
+            disabled="{{true}}"
+            border="{{ department_custom_mobile_reason == '' }}"
+            custom-style="font-size:30rpx;"
+          >
+          <text slot="label">科室电话 <text style="color: #e34d59;">*</text> </text>
+          </van-field>
+          </view>
+          <!-- <van-field
             model:value="{{ office_phone }}"
             bind:change="onOfficePhoneChange"
             placeholder="请输入科室电话"
@@ -244,7 +312,7 @@
             custom-style="font-size:30rpx;"
           >
           <text slot="label">科室电话 <text style="color: #e34d59;">*</text> </text>
-          </van-field>
+          </van-field> -->
 
         <view class="has_error" wx:if="{{ department_custom_mobile_reason != '' }}" >
           <view class="error_box">
@@ -273,7 +341,8 @@
             <text class="error_msg">{{ email_reason }}</text>
           </view>
         </view>
-        <view class="zhuanchang" bindtap="{{(indentity && iden_auth_disabled)?'':'onZhuanChangShow'}}">
+        <view wx:if="{{indentity}}">
+            <view class="zhuanchang" bindtap="{{iden_auth_disabled?'':'onZhuanChangShow'}}">
           <view class="title">专长 <text class="required"> *</text></view>
           <view class="content">
             <view class="content_item" wx:key="expertise_name" wx:if="{{data.is_selected == 1}}" wx:for="{{ zhuanchang_columns }}" wx:for-item="data">
@@ -283,11 +352,29 @@
           
           <view class="right">
             <view class="note">{{zhuanchang_note}}</view>
-            <view class="icon" wx:if="{{ !(indentity && iden_auth_disabled) }}">
+            <view class="icon" wx:if="{{ !iden_auth_disabled}}">
               <t-icon name="chevron-right" size="48rpx" data-name="chevron-right" />
             </view>
           </view>
         </view>
+        </view>
+        <view wx:else>
+            <view class="zhuanchang" bindtap="{{introduction_status==2?'':'onZhuanChangShow'}}">
+          <view class="title">专长 <text class="required"> *</text></view>
+          <view class="content">
+            <view class="content_item" wx:key="expertise_name" wx:if="{{data.is_selected == 1}}" wx:for="{{ zhuanchang_columns }}" wx:for-item="data">
+                {{data.expertise_name}}
+            </view>
+          </view>
+          
+          <view class="right">
+            <view class="note">{{zhuanchang_note}}</view>
+            <view class="icon" wx:if="{{ introduction_status!=2}}">
+              <t-icon name="chevron-right" size="48rpx" data-name="chevron-right" />
+            </view>
+          </view>
+        </view>
+        </view>
 
         <m-textarea-cell 
         textarea_cell_name="个人简介" 
@@ -296,7 +383,7 @@
         textarea_cell_note_show="{{!(indentity && iden_auth_disabled)}}"
         textarea_cell_content_placeholder="您目前就职医院与科室、社会兼职、所获荣誉、参与科研课题及发表论文等信息（10~1000字）" 
         textarea_val="{{textarea_jianjie}}"
-        disabled="{{(indentity && iden_auth_disabled)}}"
+        disabled="{{(indentity && iden_auth_disabled) || (!indentity && introduction_status==2)}}"
         has_error_content="{{ brief_introduction_reason }}"
         data-textarea_name="textarea_jianjie" 
         bindTextAreaBlur="getTextAreaVal" />
@@ -306,7 +393,7 @@
         t_icon_name="view-module" 
         bind:showNote="onshowShanChangNote"
         textarea_cell_note_show="{{!(indentity && iden_auth_disabled)}}"
-        disabled="{{(indentity && iden_auth_disabled)}}"
+        disabled="{{(indentity && iden_auth_disabled) || (!indentity && introduction_status==2)}}"
         textarea_val="{{textarea_shanchang}}"
         has_error_content="{{ be_good_at_reason }}"
         textarea_cell_content_placeholder="描述您所擅长治疗的疾病或者研究方向（10~1000字）" 
@@ -382,7 +469,7 @@
           <van-button data-from="doctorauthiden" disabled="{{iden_auth_disabled}}" color="#3CC7C0" custom-style="border-radius: 20rpx;" type="primary" block bind:click="addDoctorAuthIden">{{iden_auth_status_txt}}</van-button>
         </view>
         <view class="sub_button" wx:else>
-          <van-button color="#3CC7C0" data-from="myinfo" disabled="{{introduction_status==2}}" custom-style="border-radius: 20rpx;" type="primary" block bind:click="{{introduction_status==0?'addDoctorAuthIden':'handleUpdateIntroduction'}}">{{iden_auth_status_txt}}</van-button>
+          <van-button color="#3CC7C0" data-from="myinfo" disabled="{{introduction_status==2}}" custom-style="border-radius: 20rpx;" type="primary" block bind:click="handleUpdateIntroduction">{{iden_auth_status_txt}}</van-button>
         </view>
 
 
diff --git a/user/commpents/te_navbar/index.js b/user/commpents/te_navbar/index.js
index cadc4e8..294b2c3 100644
--- a/user/commpents/te_navbar/index.js
+++ b/user/commpents/te_navbar/index.js
@@ -28,6 +28,8 @@ Component({
       console.log("onBackonBackonBack");
       let back_url = this.data.navbarData.back_url;
       let back_url_type = this.data.navbarData.back_url_type;
+      console.log("--------");
+      console.log(back_url);
       if(back_url){
         if(back_url_type == 0){
           app.go(back_url);
@@ -37,7 +39,14 @@ Component({
           });
         }
       }else{
-        wx.navigateBack();
+        wx.navigateBack({
+            fail:function(){
+                wx.reLaunch({
+                    delta:1,
+                  url: '/Pages/yishi/index/index',
+                })
+            }
+        });
       }
     },
     onGoHome() {
diff --git a/user/pages/yishi/chufangsetup/index.json b/user/pages/yishi/chufangsetup/index.json
index 8aa4e22..814a742 100644
--- a/user/pages/yishi/chufangsetup/index.json
+++ b/user/pages/yishi/chufangsetup/index.json
@@ -1,7 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "te-nav-bar": "../../../../commpents/te_navbar/index",
+    "te-nav-bar": "../../../commpents/te_navbar/index",
     "t-tabs": "tdesign-miniprogram/tabs/tabs",
     "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel",
     "van-empty": "@vant/weapp/empty/index"
diff --git a/user/pages/yishi/expertDetail/expertDetail.js b/user/pages/yishi/expertDetail/expertDetail.js
index acbc441..61965ac 100644
--- a/user/pages/yishi/expertDetail/expertDetail.js
+++ b/user/pages/yishi/expertDetail/expertDetail.js
@@ -51,18 +51,25 @@ Page({
     follow: false,
     id:'',
     expertInquiry_price:'',
+    freePrice:'',
+    freeAmount:0,
+    expertAmount:0,
+    hasFree:false,
+    hasExpert:false,
     recieveStatus:0,
     commentList: [],
     totalComment:0,
     isFinished:false,
     isReceivePatient:false, //是否可接诊
     service_content:'【医生填写的服务内容】',
-    service_process:'【医生填写的服务流程】'
+    service_process:'【医生填写的服务流程】',
+    cycle:'',
+    rounds:''
   },
   getHeight(){
     wx.createSelectorQuery().select('#swiperitem3').boundingClientRect( (rect)=>{
         this.setData({
-            tab3Height:rect.height*2
+            tab3Height:rect.height
         })
         console.log('元素高度为：', rect.height)
       }).exec()
@@ -264,15 +271,33 @@ 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){
+            if(arr[i].inquiry_type==1 && arr[i].inquiry_mode==1){
+                if(arr[i].is_enable==1){
+                    this.setData({
+                        hasExpert:true
+                    }) 
+                };
+               this.setData({
+                expertAmount:arr[i].work_num_day-arr[i].order_inquiry_count
+               })
+            }
+            if(arr[i].inquiry_type==1 && arr[i].inquiry_mode==2){
+                if(arr[i].is_enable==1){
+                    this.setData({
+                        canVideo:true
+                    }) 
+                };
                 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){
+            if(arr[i].inquiry_type==1 && arr[i].inquiry_mode==6){
+                if(arr[i].is_enable==1){
+                    this.setData({
+                        canDiffcult:true
+                    })
+                }
                 this.setData({
-                    canDiffcult:true,
                     yinanPrice:arr[i].inquiry_price
                 })
             }
@@ -282,28 +307,66 @@ bindchange(e){
   },
   formatInquiryStatus(arr){
     var  a='3';
+    console.log(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==1){
+         if(arr[i].inquiry_type==1 && arr[i].inquiry_mode==1){
+             if(arr[i].is_enable==1 ){
+                 this.setData({
+                    hasExpert:true
+                 })
+                a='2';
+             }
             this.setData({
+                expertAmount:arr[i].work_num_day-arr[i].order_inquiry_count,
                 expertInquiry_price: arr[i].inquiry_price
             })
-            a='2';
+           
         };
-        if(arr[i].is_enable==1 && arr[i].inquiry_type==1 && arr[i].inquiry_mode==2){
+        if(arr[i].inquiry_type==1 && arr[i].inquiry_mode==6){
+            if(arr[i].is_enable==1){
+                this.setData({
+                    canDiffcult:true
+                })
+            }
+           this.setData({
+              yinanPrice: arr[i].inquiry_price
+           })  
+       };
+        if(arr[i].inquiry_type==1 && arr[i].inquiry_mode==2){
+            if(arr[i].is_enable==1){
+                this.setData({
+                    canVideo:true,
+                 
+                })
+            }
             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){
+        if(arr[i].inquiry_type==1 && arr[i].inquiry_mode==6){
+            if(arr[i].is_enable==1 ){
+                this.setData({
+                    canDiffcult:true
+                }) 
+            }
+            console.log(' yinanPrice:'+arr[i].inquiry_price)
             this.setData({
-                canDiffcult:true,
                 yinanPrice:arr[i].inquiry_price
             })
         }
-        if(arr[i].is_enable==1 && arr[i].inquiry_type==3){
-          return '1'
+        if(arr[i].inquiry_type==3){
+            this.setData({
+                freePrice:arr[i].inquiry_price,
+                freeAmount:arr[i].work_num_day-arr[i].order_inquiry_count,
+            })
+            if(arr[i].is_enable==1){
+                this.setData({
+                    hasFree:true
+                 })
+                return '1'    
+            }
+         
         };
       }
    
@@ -371,7 +434,9 @@ bindchange(e){
    if(config_message){
        this.setData({
         service_content:config_message.content_message,
-        service_process:config_message.process_message
+        service_process:config_message.process_message,
+        rounds:config_message.rounds,
+        cycle:config_message.cycle
        })
 
    }
diff --git a/user/pages/yishi/expertDetail/expertDetail.wxml b/user/pages/yishi/expertDetail/expertDetail.wxml
index d73807e..14ae10b 100644
--- a/user/pages/yishi/expertDetail/expertDetail.wxml
+++ b/user/pages/yishi/expertDetail/expertDetail.wxml
@@ -67,23 +67,37 @@
       </view>
       <view class="tabs">
         <view class="tab " bindtap="switchTab" data-id="0">
-           <image wx:if="{{currentData==0 && canTuwen}}" src="{{static_host}}/applet/doctor/static/images/yishi/tuwen_on.png" alt="" class="tabbg" ></image>
-           <image wx:elif="{{currentData==0 && !canTuwen}}" src="{{static_host}}/applet/doctor/static/images/yishi/tuwen_disable_on.png" alt="" class="tabbg" ></image>
+           <image wx:if="{{currentData==0 && canTuwen}}" src="{{static_host}}/applet/doctor/static/images/yishi/tuwen_on.png" alt="" class="tabbg on" ></image>
+           <image wx:elif="{{currentData==0 && !canTuwen}}" src="{{static_host}}/applet/doctor/static/images/yishi/tuwen_disable_on.png" alt="" class="tabbg on" ></image>
            <image wx:elif="{{currentData!=0 && canTuwen}}" src="{{static_host}}/applet/doctor/static/images/yishi/tuwen.png" alt="" class="tabbg" ></image>
            <image  wx:elif="{{currentData!=0 && !canTuwen}}" src="{{static_host}}/applet/doctor/static/images/yishi/tuwen_disable.png" alt="" class="tabbg" ></image>
            <view class="typebox" wx:if="{{canTuwen}}">
               <view class="name">图文问诊</view>
-              <view class="price">￥{{current_inquiry_config.inquiry_price}}/次</view>
-              <view class="jiaprice" wx:if="{{expertInquiry_price && current_inquiry_config.inquiry_type==3}}">￥{{expertInquiry_price}}/次</view>
+              <view class="pricebox" wx:if="{{hasExpert && !hasFree}}">
+                <view class="price">￥{{expertInquiry_price}}/次</view>
+              </view>
+              <view class="pricebox" wx:if="{{!hasExpert && hasFree}}">
+                <view class="price">￥{{freePrice}}/次</view> 
+              </view>
+              <view class="pricebox" wx:if="{{hasExpert && hasFree}}">
+                <view class="price" wx:if="{{freeAmount>0}}">￥{{freePrice}}/次</view> 
+                <view class="price" wx:if="{{freeAmount<=0 && expertAmount>0}}">￥{{expertInquiry_price}}/次</view>
+                <view class="price" wx:if="{{freeAmount<=0 && expertAmount<=0}}">￥{{freePrice}}/次</view> 
+                <view class="jiaprice" wx:if="{{expertInquiry_price && current_inquiry_config.inquiry_type==3 && !(freeAmount<=0 && expertAmount>0)}}">￥{{expertInquiry_price}}/次</view>
+              </view>
+              <!-- <view class="price">￥{{current_inquiry_config.inquiry_price}}/次</view>
+              <view class="jiaprice" wx:if="{{expertInquiry_price && current_inquiry_config.inquiry_type==3}}">￥{{expertInquiry_price}}/次</view> -->
            </view>
           <view class="typebox disable" wx:else>
-              <view class="name">图文问诊</view>
-              <view class="price">暂未开通</view>
+            <view class="name">图文问诊</view>
+              <view class="price" wx:if="{{expertInquiry_price}}">￥{{expertInquiry_price}}/次</view>
+     
+              <view class="price" wx:if="{{!(expertInquiry_price && freePrice)}}">暂未开通</view>
            </view> 
         </view>
         <view class="tab " bindtap="switchTab" data-id="1">
-           <image src="{{static_host}}/applet/doctor/static/images/yishi/video_on.png" wx:if="{{currentData==1 && canVideo}}" alt="" class="tabbg" ></image>
-           <image wx:elif="{{currentData==1 && !canVideo}}" src="{{static_host}}/applet/doctor/static/images/yishi/video_disable_on.png" alt="" class="tabbg" ></image>
+           <image src="{{static_host}}/applet/doctor/static/images/yishi/video_on.png" wx:if="{{currentData==1 && canVideo}}" alt="" class="tabbg on" ></image>
+           <image wx:elif="{{currentData==1 && !canVideo}}" src="{{static_host}}/applet/doctor/static/images/yishi/video_disable_on.png" alt="" class="tabbg on" ></image>
            <image wx:elif="{{currentData!=1 && canVideo}}" src="{{static_host}}/applet/doctor/static/images/yishi/video.png" alt="" class="tabbg" ></image>
           <image wx:else src="{{static_host}}/applet/doctor/static/images/yishi/video_disable.png"  alt="" class="tabbg" ></image>
           <view class="typebox" wx:if="{{canVideo}}">
@@ -96,8 +110,8 @@
            </view> 
         </view>
         <view class="tab " bindtap="switchTab" data-id="2">
-           <image wx:if="{{currentData==2 && canDiffcult}}" src="{{static_host}}/applet/doctor/static/images/yishi/yinan_on.png" alt="" class="tabbg" ></image>
-           <image wx:elif="{{currentData==2 && !canDiffcult}}" src="{{static_host}}/applet/doctor/static/images/yishi/yinan_disable_on.png" alt="" class="tabbg" ></image>
+           <image wx:if="{{currentData==2 && canDiffcult}}" src="{{static_host}}/applet/doctor/static/images/yishi/yinan_on.png" alt="" class="tabbg on" ></image>
+           <image wx:elif="{{currentData==2 && !canDiffcult}}" src="{{static_host}}/applet/doctor/static/images/yishi/yinan_disable_on.png" alt="" class="tabbg on" ></image>
            <image wx:elif="{{currentData!=2 && canDiffcult}}" src="{{static_host}}/applet/doctor/static/images/yishi/yinan.png" alt="" class="tabbg" ></image>
            <image wx:elif="{{currentData!=2 && !canDiffcult}}" src="{{static_host}}/applet/doctor/static/images/yishi/yinan_disable.png" alt="" class="tabbg" ></image>
            <view class="typebox" wx:if="{{canDiffcult}}">
@@ -111,30 +125,30 @@
         </view>
        
       </view>
-      <swiper current="{{currentData}}" class="swiperbox"  bindchange="bindchange" style="height:{{currentData==0?'350rpx':currentData==1?'700rpx':tab3Height+'rpx'}}">
+      <swiper current="{{currentData}}" class="swiperbox"  bindchange="bindchange" style="height:{{currentData==0?'350rpx':currentData==1?'700rpx':tab3Height+'px'}}">
           <swiper-item class="">
             
             <view class="swiper-item">
-              <image src="{{static_host}}/applet/doctor/static/images/yishi/tuwen_bg.png" class="itembg"style="height:auto;" mode="widthFix"  wx:if="{{canTuwen}}"></image>
+              <image src="{{static_host}}/applet/doctor/static/images/yishi/tuwen_bg.png" class="itembg" style="height:auto;" mode="widthFix"  wx:if="{{canTuwen}}"></image>
               <image src="{{static_host}}/applet/doctor/static/images/yishi/tuwen_bg_disable.png" class="itembg" style="height:auto;" mode="widthFix" wx:else=""></image>
            
               <view class="itembox">
                 <view class="title">通过文字、图片、语音进行咨询</view>
               <view class="tipbox {{!canTuwen?'active':''}}">
                 <view class="tipmsg">
-                  <view class="circle"></view>
+                  <view class="circle tuwen"></view>
                   <view class="msg">可通过文字、图片、语音等形式和医生进行沟通；</view>
                 </view>
                 <view class="tipmsg">
-                  <view class="circle"></view>
+                  <view class="circle tuwen"></view>
                   <view class="msg">医生接诊后24小时内10个沟通回合；</view>
                 </view>
                 <view class="tipmsg">
-                  <view class="circle"></view>
+                  <view class="circle tuwen"></view>
                   <view class="msg">医生未接诊，平台24小时内自动退款；</view>
                 </view>
                 <view class="tipmsg">
-                  <view class="circle"></view>
+                  <view class="circle tuwen"></view>
                   <view class="msg">医生未回复，可联系平台客服协商进行退款。</view>
                 </view>
               </view>
@@ -151,35 +165,35 @@
                 <view class="title">通过视频面对面进行咨询</view>
               <view class="tipbox {{!canVideo?'active':''}}">
                 <view class="tipmsg">
-                  <view class="circle"></view>
+                  <view class="circle video"></view>
                   <view class="msg">医生接诊后，主动和就诊人预约视频时间；</view>
                 </view>
                 <view class="tipmsg">
-                  <view class="circle"></view>
+                  <view class="circle video"></view>
                   <view class="msg">若预约时间因故需要改变，可与医生图文协商时间；</view>
                 </view>
                 <view class="tipmsg">
-                  <view class="circle"></view>
+                  <view class="circle video"></view>
                   <view class="msg">视频交流服务时长一般为5-10分钟；</view>
                 </view>
                 <view class="tipmsg">
-                  <view class="circle"></view>
+                  <view class="circle video"></view>
                   <view class="msg">医生接诊后48小时内可以通过文字、图片、语音等形式和医生不限制沟通回合数；</view>
                 </view>
                 <view class="tipmsg">
-                  <view class="circle"></view>
+                  <view class="circle video"></view>
                   <view class="msg">医生未接诊，平台24小时内自动退款；</view>
                 </view>
                 <view class="tipmsg">
-                  <view class="circle"></view>
+                  <view class="circle video"></view>
                   <view class="msg">医生未回复或未进行视频，可联系平台客服协商进行退款；</view>
                 </view>
                 <view class="tipmsg">
-                  <view class="circle"></view>
+                  <view class="circle video"></view>
                   <view class="msg">如因您个人原因（忘记时间、迟到、中途断开未在进入视频等情况），咨询费用可能将无法退回，请准时接收医生视频请求；</view>
                 </view>
                 <view class="tipmsg">
-                  <view class="circle"></view>
+                  <view class="circle video"></view>
                   <view class="msg">视频不支持回放。</view>
                 </view>
                </view>
@@ -194,27 +208,27 @@
                 <view class="title">通过文字、图片、语音进行咨询</view>
               <view class="tipbox {{!canDiffcult?'active':''}}">
                 <view class="tipmsg">
-                  <view class="circle"></view>
+                  <view class="circle yinan"></view>
                   <view class="msg">{{service_content}}；</view>
                 </view>
                 <view class="tipmsg">
-                  <view class="circle"></view>
+                  <view class="circle yinan"></view>
                   <view class="msg">{{service_process}}；</view>
                 </view>
                 <view class="tipmsg">
-                  <view class="circle"></view>
+                  <view class="circle yinan"></view>
                   <view class="msg">可通过文字、图片、语音等形式和医生进行沟通；</view>
                 </view>
                 <view class="tipmsg">
-                  <view class="circle"></view>
-                  <view class="msg">医生接诊后【医生选择的服务周期】内【医生选择的服务次数】沟通回合；</view>
+                  <view class="circle yinan"></view>
+                  <view class="msg">医生接诊后{{cycle}}天内{{rounds==0?'不限':rounds+'个'}}沟通回合；</view>
                 </view>
                 <view class="tipmsg">
-                  <view class="circle"></view>
+                  <view class="circle yinan"></view>
                   <view class="msg">医生未接诊，平台24小时内自动退款；</view>
                 </view>
                 <view class="tipmsg">
-                  <view class="circle"></view>
+                  <view class="circle yinan"></view>
                   <view class="msg">医生未回复或医生服务不满意，可联系平台客服协商进行退款。</view>
                 </view>
               </view>
diff --git a/user/pages/yishi/expertDetail/expertDetail.wxss b/user/pages/yishi/expertDetail/expertDetail.wxss
index 1912f97..6b86fcc 100644
--- a/user/pages/yishi/expertDetail/expertDetail.wxss
+++ b/user/pages/yishi/expertDetail/expertDetail.wxss
@@ -543,6 +543,9 @@ z-index:0;
 height: 314rpx;
  position: absolute;
 }
+.tabbg.on{
+    height: 330rpx;
+}
 .typebox{
   margin-top: 158rpx;
   position: relative;
@@ -573,7 +576,7 @@ color: #999999;
 text-decoration: line-through;
 }
 .swiperbox{
-  margin-top: 30rpx;
+  margin-top: 50rpx;
 }
 .swiper-item{
   border-radius: 20rpx;
@@ -662,4 +665,16 @@ padding:0 15rpx;
 border: 1rpx solid #3CC7C0;
 align-items: center;
 color: #3CC7C0;
+}
+.tipbox .tipmsg .circle.tuwen{
+    background: #3BB5FE;
+  }
+  .tipbox .tipmsg .circle.video{
+  background: #52C41A;
+}
+.tipbox .tipmsg .circle.yinan{
+  background: #FF9C00;
+}
+.boxwraper::-webkit-scrollbar{
+    width:0;
 }
\ No newline at end of file
diff --git a/user/pages/yishi/onlinesetup/index.js b/user/pages/yishi/onlinesetup/index.js
index 0e75d9a..b848ee1 100644
--- a/user/pages/yishi/onlinesetup/index.js
+++ b/user/pages/yishi/onlinesetup/index.js
@@ -115,6 +115,13 @@ Page({
         let check = this.checkPrice(inquiry_price);
         if(!check) return;
       }
+     if(this.data.active==1 && detail){
+         wx.showToast({
+           title: '即将开通',
+           icon:'none',
+         })
+         return false
+     }
     if(this.data.active==1 || this.data.active==2){
         if(!this.data.info.work_num_day || !this.data.info.inquiry_price){
             this.setData({
@@ -197,8 +204,10 @@ Page({
     this.setData({
         showSetting: false
       })
-      if(active==1){
+      if(active==0){
         app.go("/user/pages/yishi/onlinesetupprice/index?inquiry_mode=1")
+      }else if(active==1){
+        app.go("/user/pages/yishi/onlinesetupprice/index?inquiry_mode=2")
       }else if(active==2){
         app.go("/user/pages/yishi/onlinesetupprice/index?inquiry_mode=6")
       }
diff --git a/user/pages/yishi/onlinesetup/index.wxml b/user/pages/yishi/onlinesetup/index.wxml
index 97f8d2e..38c4979 100644
--- a/user/pages/yishi/onlinesetup/index.wxml
+++ b/user/pages/yishi/onlinesetup/index.wxml
@@ -42,8 +42,6 @@
                 </text>
             </view>
         </view>
-            
-
             <view class="go">
                 <van-button disabled="{{info.is_open!=1}}" bind:click="putDoctorInquiryConfig" color="#3CC7C0" custom-style="border-radius: 20rpx;font-size:30rpx;" type="primary" block>去接诊</van-button>
             </view>
@@ -61,7 +59,7 @@
                     <view class="switch_box_note">{{ (info.is_open==1&& active==1)?'已开启，患者可以向您发起视频问诊':'已关闭，暂不接诊'}}</view>
                 </view>
                 <view class="help">
-                    <van-cell size="large" url="/user/pages/yishi/manual_detail/index?manual_id=6" custom-style="font-size:32rpx;" title="视频问诊操作手册" is-link border="{{false}}" />
+                    <van-cell size="large" url="/user/pages/yishi/manual_detail/index?manual_id=12" custom-style="font-size:32rpx;" title="视频问诊操作手册" is-link border="{{false}}" />
                 </view>
             </view>
 
@@ -116,7 +114,7 @@
                     <view class="switch_box_note">{{ (info.is_open==1 && active==2)?'已开启，患者可以向您发起疑难会诊':'已关闭，暂不接诊'}}</view>
                 </view>
                 <view class="help">
-                    <van-cell size="large" url="/user/pages/yishi/manual_detail/index?manual_id=6" custom-style="font-size:32rpx;" title="疑难会诊操作手册" is-link border="{{false}}" />
+                    <van-cell size="large" url="/user/pages/yishi/manual_detail/index?manual_id=11" custom-style="font-size:32rpx;" title="疑难会诊操作手册" is-link border="{{false}}" />
                 </view>
             </view>
 
diff --git a/user/pages/yishi/onlinesetupprice/index.wxml b/user/pages/yishi/onlinesetupprice/index.wxml
index 53cc1c8..39104b5 100644
--- a/user/pages/yishi/onlinesetupprice/index.wxml
+++ b/user/pages/yishi/onlinesetupprice/index.wxml
@@ -20,10 +20,11 @@
 <view class="bottom">
   <text class="bottom_txt" wx:if="{{inquiry_mode==1}}">
     提示：服务开启后，患者按照所设置的价格向您购买图文问诊服务
-    1、接诊后，患者可与您在{{config.duration/60}}小时内进行{{config.times_number}}回合沟通 
+    1、接诊后，患者可与您在<text class="green">{{config.duration/60}}小时内进行{{config.times_number}}回合沟通\n</text>2、若开启公益问诊，图文问诊价格以公益问诊价格为准\n3、每日接诊数量和问诊价格<text class="green">每日仅限调整1次，每月仅限调整5次\n</text>4、价格修改后立即生效，不影响修改之前已生成的问诊订单\n
+    <!-- 1、接诊后，患者可与您在{{config.duration/60}}小时内进行{{config.times_number}}回合沟通 
     2、若开启公益问诊，图文问诊价格以公益问诊价格为准
     3、每日接诊数量和问诊价格每日仅限调整1次，每月仅限调整5次 
-    4、价格修改后立即生效，不影响修改之前已生成的问诊订单 
+    4、价格修改后立即生效，不影响修改之前已生成的问诊订单  -->
   </text>
   <text wx:elif="{{inquiry_mode==2}}">
     提示：服务开通后，患者可以向您购买视频问诊服务，接诊后<text class="green">需要您主动和患者预约视频时间并同步设置预约时间\n</text>1、视频问诊价格<text class="green">每日仅限调整1次，每自然月仅限调整5次\n</text>2、单价修改后立即生效，不影响当日已生成的问诊订单3、<text class="green">24小时不接诊，订单自动取消</text>，并不展示在您的接诊列表中\n4、接诊后，您与患者<text class="green">沟通有效期为48小时</text>，同时提供无回合限制图文、语音形式交流\n5、患者因服务不满意等原因要求退款时，平台会和您协商处理\n
diff --git a/user/pages/yishi/service_setting/index.js b/user/pages/yishi/service_setting/index.js
index 3dba8c6..678fe1f 100644
--- a/user/pages/yishi/service_setting/index.js
+++ b/user/pages/yishi/service_setting/index.js
@@ -107,7 +107,7 @@ Page({
     })
   },
   openPreview(){
-    let {process_message,content_message,}=this.data;
+    let {process_message,content_message,cycle,rounds}=this.data;
     if(content_message.length<10){
         wx.showToast({
           title: '服务内容不少于10个字符',
@@ -122,9 +122,25 @@ Page({
         })
         return false
     };
+    if(!cycle){
+        wx.showToast({
+          title: '请设置服务周期',
+          icon:'none'
+        })
+        return false
+    }
+    if(!rounds && rounds!=0){
+        wx.showToast({
+          title: '请设置服务回合数',
+          icon:'none'
+        })
+        return false
+    }
     wx.setStorageSync('config_message', {
         content_message,
         process_message,
+        rounds,
+        cycle
     })
     this.setData({
         showPreview:true
diff --git a/user/pages/yishi/service_setting/index.wxml b/user/pages/yishi/service_setting/index.wxml
index 06b6106..7a4f105 100644
--- a/user/pages/yishi/service_setting/index.wxml
+++ b/user/pages/yishi/service_setting/index.wxml
@@ -35,7 +35,7 @@
             <view class="cell" bindtap="openRound">
                 <view class="name">服务回合数</view>
                 <view class="right">
-                    <view class="msg" wx:if="{{rounds || rounds===0}}">{{rounds}}</view>
+                    <view class="msg" wx:if="{{rounds || rounds===0}}">{{rounds==0?'不限次':rounds}}</view>
                     <view class="msg" wx:else>去设置</view>
                     <van-icon name="arrow" class="icon" />
                 </view>
diff --git a/user/pages/yishi/service_setting/index.wxss b/user/pages/yishi/service_setting/index.wxss
index 1cbea42..cc88f23 100644
--- a/user/pages/yishi/service_setting/index.wxss
+++ b/user/pages/yishi/service_setting/index.wxss
@@ -104,7 +104,7 @@
 }
 
 .btnbox {
-    margin-bottom: 20rpx;
+    margin-bottom: 80rpx;
 }
 
 .btn {
diff --git a/user/pages/yishi/yizhensetup/index.js b/user/pages/yishi/yizhensetup/index.js
index 508a340..33a664d 100644
--- a/user/pages/yishi/yizhensetup/index.js
+++ b/user/pages/yishi/yizhensetup/index.js
@@ -11,6 +11,8 @@ Page({
     },
     height: app.globalData.height, 
     checked: true,
+    canFree:false,
+    showSetting:false,
     open_note: "已开启，可在问诊消息中进行接诊",
     close_note: "已关闭，暂不接收公益问诊",
     note: "",
@@ -44,6 +46,11 @@ Page({
 
   },
   onShow(){
+    let doctor_id=wx.getStorageSync('client_user_id_2');
+    console.log(doctor_id);
+    if(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:会员）
@@ -66,6 +73,21 @@ Page({
       })
     }).catch(errors => {console.error(errors);})
   },
+  getService(id){
+    api.getDoctorService(id).then(response=>{
+        let res=response.data;
+    for (let i = 0; i < res.length; i++) {
+        if(res[i].inquiry_mode==1 && res[i].inquiry_type==3){
+            this.setData({
+                canFree:true
+            })
+            break;
+        };
+        
+    }
+      
+    })
+   },
   formatAmounts(){
     let list = this.data.config.system_inquiry_price.map(item => {
       let it = {};
@@ -104,6 +126,13 @@ Page({
   doChange(detail){
     let is_open = 0;
     if(detail){
+
+            if(!this.data.canFree){
+                this.setData({
+                    showSetting:true
+                })
+                return false;
+            }
       wx.vibrateShort({
         "type": "heavy"
       })
@@ -202,7 +231,20 @@ Page({
 
     this.putDoctorInquiryConfig()
   },
-
+  settingcancelDialog(){
+     
+    this.setData({
+        showSetting: false
+      })
+  },
+  settingconfirmDialog(){
+   
+    this.setData({
+        showSetting: false
+      })
+      app.go("/user/pages/yishi/yizhensetupprice/index")
+      
+  },
   onPickerCancel(e) {
     const { key } = e.currentTarget.dataset;
     console.log(e, '取消');
diff --git a/user/pages/yishi/yizhensetup/index.wxml b/user/pages/yishi/yizhensetup/index.wxml
index 78cb76f..eaf02c5 100644
--- a/user/pages/yishi/yizhensetup/index.wxml
+++ b/user/pages/yishi/yizhensetup/index.wxml
@@ -28,9 +28,10 @@
       border="{{true}}" 
       url="/user/pages/yishi/yizhensetupprice/index"
       >
-        <view class="num">
+        <view class="num" wx:if="{{canFree}}">
           {{ info.work_num_day }}
         </view>
+       <view calss="cell_value_seting" wx:else>去设置</view>
       </van-cell>
       <view class="price_steup_box_bottom">
         <van-cell size="large" custom-style="font-size:32rpx;border-radius: 20rpx;" 
@@ -38,11 +39,11 @@
         border="{{false}}" 
         url="/user/pages/yishi/yizhensetupprice/index"
         >
-          <view>
+          <view wx:if="{{canFree}}">
             <text class="price">{{ amountText }}</text>
             <text style="color: #000;"> 元</text>
           </view>
-          
+          <view  calss="cell_value_seting" wx:else >去设置</view>
         </van-cell>
       </view>
     </view>
@@ -88,4 +89,16 @@
     确定
   </view>
 </t-dialog>
+<t-dialog
+    visible="{{ showSetting }}"
+    title="提示"
+    content="请先设置每日接诊数量和问诊单价"
+  >
+  <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="settingcancelDialog">
+    取消
+  </view>
+  <view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="settingconfirmDialog">
+    去设置
+  </view>
+</t-dialog>
 </view>
\ No newline at end of file
diff --git a/user/pages/yishi/yizhensetup/index.wxss b/user/pages/yishi/yizhensetup/index.wxss
index 5c845f9..013e150 100644
--- a/user/pages/yishi/yizhensetup/index.wxss
+++ b/user/pages/yishi/yizhensetup/index.wxss
@@ -135,4 +135,7 @@ page{
 .dialog_confirm_btn{
   border-top: 1px solid #E9E9E9;
   color: #3CC7C0;
-}
\ No newline at end of file
+}
+.cell_value_seting{
+    color: rgba(0,0,0,0.45);
+  }
\ No newline at end of file