优化

Pages/yishi/my/index.js

@@ -35,7 +35,9 @@ Page({
       stateHeight: stateHeight + top, //  状态栏高度
     });
   },
-
+  onLoad(){
+    console.log("onLoad ");
+  },
   onShow: function () {
     // console.log("onshow ");
     if (typeof this.getTabBar === 'function' && this.getTabBar()) {
@@ -44,8 +46,7 @@ Page({
       })
     }
     this.getMenuButtonBound();
-  },
+ 
-  onLoad(){
     // console.log("my onLoad");
     //获取个人中心数据
     api.getDoctorCenter().then(response => {

Pages/yishi/onlinechufang/index.js

@@ -36,7 +36,7 @@ Page({
     case_detail: {},
     sub_disabled: false,
     from: "",
-    now_filed_focus: 'save_durg_single_use'
+    now_filed_focus: 'save_durg_prescription_product_num'
   },
   changeFocus(e){
     let next_filed_focus = e.currentTarget.dataset.next_filed_focus;
@@ -70,13 +70,23 @@ Page({
       order_prescription_id: order_prescription_id,
       from: from
     })
+    if(from == 'chat'){
+      this.setData({
+        "navbarData.title": '处方详情'
+      })
+    }
   },
   select_drug(e){
     this.setData({
       drug_content_show: true,
       product_name: e.currentTarget.dataset.product_name,
       select_drug_id: e.currentTarget.dataset.product_id,
-      save_durg_product_id: e.currentTarget.dataset.product_id
+      save_durg_product_id: e.currentTarget.dataset.product_id,
+      save_durg_single_use: e.currentTarget.dataset.single_use,
+      save_durg_frequency_use: e.currentTarget.dataset.frequency_use,
+      save_durg_single_unit: e.currentTarget.dataset.single_unit,
+      save_durg_available_days: e.currentTarget.dataset.available_days,
+      save_durg_packaging_unit: e.currentTarget.dataset.packaging_unit,
     });
   },
   showPopup() {

Pages/yishi/onlinechufang/index.wxml

@@ -106,6 +106,11 @@
           <view class="search_drug_list_item" 
             data-product_name="{{item.product_name}}" 
             data-product_id="{{item.product_id}}" 
+            data-single_use="{{item.single_use}}" 
+            data-frequency_use="{{item.frequency_use}}" 
+            data-single_unit="{{item.single_unit}}" 
+            data-available_days="{{item.available_days}}" 
+            data-packaging_unit="{{item.packaging_unit}}" 
             bindtap="select_drug" 
             wx:for="{{search_drug_list}}">
           <view>{{item.product_name}}</view>

Pages/yishi/wenzhen_v2/wenzhen.wxml

@@ -49,7 +49,7 @@
           order_inquiry_id="{{ item.order_inquiry_id }}"
           inquiry_type="{{item.inquiry_type}}"
           from_account="{{item.from_account}}"
-          status_text="{{ item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'已接诊':item.inquiry_status==5?'已完成':item.inquiry_status==6?'已结束':item.inquiry_status==7?'已取消':'其他' }}"
+          status_text="{{ item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'接诊中':item.inquiry_status==5?'已完成':item.inquiry_status==6?'已结束':item.inquiry_status==7?'已取消':'其他' }}"
           note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
           message_dot="{{item.message_dot}}"
           wx:for="{{ data_list_1 }}"
@@ -59,7 +59,7 @@
       </t-tab-panel>
 
       <t-tab-panel label="快速问诊" value="2" wx:if="{{data_list_2.length > 0}}">
-        <!-- 1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消 -->
+        <!-- 1:待支付 2:待分配 3:待接诊 4:接诊中 5:已完成 6:已结束 7:已取消 -->
         <wenzhen-data 
           name="{{ item.patient_name }}"
           sex="{{ item.patient_sex==1?'男':'女' }}"
@@ -70,7 +70,7 @@
           order_inquiry_id="{{ item.order_inquiry_id }}"
           inquiry_type="{{item.inquiry_type}}"
           from_account="{{item.from_account}}"
-          status_text="{{ item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'已接诊':item.inquiry_status==5?'已完成':item.inquiry_status==6?'已结束':item.inquiry_status==7?'已取消':'其他' }}"
+          status_text="{{ item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'接诊中':item.inquiry_status==5?'已完成':item.inquiry_status==6?'已结束':item.inquiry_status==7?'已取消':'其他' }}"
           note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
           message_dot="{{item.message_dot}}"
           from_account="{{item.from_account}}"
@@ -101,7 +101,7 @@
           order_inquiry_id="{{ item.order_inquiry_id }}"
           inquiry_type="{{item.inquiry_type}}"
           from_account="{{item.from_account}}"
-          status_text="{{ item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'已接诊':item.inquiry_status==5?'已完成':item.inquiry_status==6?'已结束':item.inquiry_status==7?'已取消':'其他' }}"
+          status_text="{{ item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'接诊中':item.inquiry_status==5?'已完成':item.inquiry_status==6?'已结束':item.inquiry_status==7?'已取消':'其他' }}"
           note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
           message_dot="{{item.message_dot}}"
           wx:for="{{ data_list_3 }}"
@@ -122,7 +122,7 @@
           order_inquiry_id="{{ item.order_inquiry_id }}"
           inquiry_type="{{item.inquiry_type}}"
           from_account="{{item.from_account}}"
-          status_text="{{ item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'已接诊':item.inquiry_status==5?'已完成':item.inquiry_status==6?'已结束':item.inquiry_status==7?'已取消':'其他' }}"
+          status_text="{{ item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'接诊中':item.inquiry_status==5?'已完成':item.inquiry_status==6?'已结束':item.inquiry_status==7?'已取消':'其他' }}"
           note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
           message_dot="{{item.message_dot}}"
           wx:for="{{ data_list_4 }}"
@@ -139,7 +139,7 @@
           date="{{ item.message_send_time }}"
           desc="{{ item.last_message_content.Text }}"
           status="{{ item.inquiry_status }}"
-          status_text="{{ item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'已接诊':item.inquiry_status==5?'已完成':item.inquiry_status==6?'已结束':item.inquiry_status==7?'已取消':'其他' }}"
+          status_text="{{ item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'接诊中':item.inquiry_status==5?'已完成':item.inquiry_status==6?'已结束':item.inquiry_status==7?'已取消':'其他' }}"
           note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
           message_dot="{{item.message_dot}}"
           wx:for="{{ data_list_5 }}"

Pages/yishi/yizhensetup/index.wxml

@@ -49,7 +49,7 @@
   </view>
 
   <view class="go">
-    <van-button color="#3CC7C0" bind:click="go" data-url="/Pages/yishi/wenzhen_v2/wenzhen" custom-style="border-radius: 20rpx;font-size:30rpx;" type="primary" block>去接诊</van-button>
+    <van-button disabled="{{!info.is_open}}" color="#3CC7C0" bind:click="go" data-url="/Pages/yishi/wenzhen_v2/wenzhen" custom-style="border-radius: 20rpx;font-size:30rpx;" type="primary" block>去接诊</van-button>
   </view>
 
   <t-picker

Pages/yishi/zhiye_identity/index.js

@@ -14,7 +14,8 @@ Page({
     sign_image: [],
     btn_txt: "提交",
     multi_point_status: "",
-    btn_disabled: true
+    btn_disabled: true,
+    sfz_show: false
   },
 
   onLoad(){
@@ -237,9 +238,21 @@ Page({
   },
   onshowIdCardFrontNote(){
     console.log("onshowIdCardFrontNote");
+    this.setData({
+      sfz_show: true
+    })
   },
   onshowIdCardBackNote(){
     console.log("onshowIdCardBackNote");
+    this.setData({
+      sfz_show: true
+    })
+  },
+  onsfzClose(){
+    console.log("onsfzClose");
+    this.setData({
+      sfz_show: false
+    })
   },
   go(e){
     // if(this.data.btn_disabled){

Pages/yishi/zhiye_identity/index.json

@@ -7,6 +7,8 @@
     "van-cell": "@vant/weapp/cell/index",
     "van-cell-group": "@vant/weapp/cell-group/index",
     "van-divider": "@vant/weapp/divider/index",
-    "van-button": "@vant/weapp/button/index"
+    "van-button": "@vant/weapp/button/index",
+    "van-popup": "@vant/weapp/popup/index",
+    "van-image": "@vant/weapp/image/index"
   }
 }

Pages/yishi/zhiye_identity/index.wxml

@@ -74,4 +74,24 @@
     </view>
     <view style="height: 50rpx;"></view>
   </van-cell-group>
+
+  <van-popup
+    show="{{ sfz_show }}"
+    closeable
+    round
+    lock-scroll
+    position="bottom"
+    bind:close="onsfzClose"
+  >
+  <view class="zhiye_popup">
+    <view class="zhiye_popup_title">身份证示例</view>
+    <view class="zhiye_popup_img">
+      <van-image lazy-load slot="loading" type="spinner" fit="widthFix" width="420rpx" src="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/yishi/cert/sfz1.png" />
+    </view>
+    <view class="zhiye_popup_img">
+      <van-image lazy-load slot="loading" type="spinner" fit="widthFix" width="420rpx" src="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/yishi/cert/sfz2.png" />
+    </view>
+  </view>
+  </van-popup>
+
 </view>

Pages/yishi/zhiye_identity/index.wxss

@@ -38,4 +38,20 @@
   display: flex;
   justify-content: center;
   align-items: center;
+}
+.zhiye_popup{
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding-bottom: 20rpx;
+  min-height: 550rpx;
+}
+.zhiye_popup_title{
+  margin-top: 16px;
+  font-size: 32rpx;
+  font-weight: 600;
+  letter-spacing: 5rpx;
+}
+.zhiye_popup_img{
+  margin-top: 30rpx;
 }

TUIKit/components/TUIChat/components/MessageList/index.js

@@ -159,11 +159,11 @@ Component({
         }).then((res) => {
           let HMM_data = res.data;//HMM
           let HMM_messageList_del = [];
-          console.log("HMM getMessageList: ", HMM_data);
+          // console.log("HMM getMessageList: ", HMM_data);
           let HMM_messageList = HMM_data.messageList;
           HMM_messageList.forEach(item => {
-            let HMM_type = item.type;
+            // let HMM_type = item.type;
-            console.log(item)
+            // console.log(item)
             //去除自定义消息
             // if(HMM_type == "TIMCustomElem") return;
             let show_avatar = this.checkShowAvatar(item);
@@ -186,9 +186,9 @@ Component({
       }
     },
     checkShowAvatar(message){
-      console.log("checkShowAvatar ");
+      // console.log("checkShowAvatar ");
       let type = message.type;
-      console.log("message type: ", type);
+      // console.log("message type: ", type);
       let show_avatar = true;
       if(type === "TIMCustomElem"){
         const customMessage = JSON.parse(message.payload.data);
@@ -268,7 +268,7 @@ Component({
             });
           } catch (error) {
           }
-          if ((item.type === MESSAGE_TYPE_TEXT.TIM_CUSTOM_ELEM && this.data.typingMessage.businessID !== BUSINESS_ID_TEXT.USER_TYPING) || item.type !== MESSAGE_TYPE_TEXT.TIM_CUSTOM_ELEM) {
+          if ((item.type === MESSAGE_TYPE_TEXT.TIM_CUSTOM_ELEM && this.data.typingMessage.businessID !== BUSINESS_ID_TEXT.USER_TYPING)) {
             this.data.showNewMessageCount.push(message);
             this.setData({
               showNewMessageCount: this.data.showNewMessageCount,

TUIKit/components/TUIChat/index.js

@@ -103,11 +103,11 @@ Component({
     ready() {
       //修改为组件传值
       // this.getInquiryMessageBasic()
-      console.log("app.globalData.scene from TUIchat ready: ", app.globalData.scene);
+      // console.log("app.globalData.scene from TUIchat ready: ", app.globalData.scene);
       let pages = getCurrentPages();
-      console.log("pages:", pages)
+      // console.log("pages:", pages)
-      console.log("pages.length:", pages.length)
+      // console.log("pages.length:", pages.length)
-      console.log("pages:", pages[0])
+      // console.log("pages:", pages[0])
       if(pages.length == 1){
         console.log("navbarData.showCapsule");
         this.setData({
@@ -171,7 +171,9 @@ Component({
     confirmDialog(){
       api.putDoctorInquiryFinish({order_inquiry_id: this.data.order_inquiry_id}).then(response => {
         console.log(response);
-        this.getInquiryMessageBasic()
+        this.getInquiryMessageBasic();
+        //调用子组件中的跳到最新消息
+        this.selectComponent('#MessageList').handleJumpNewMessage();
       }).catch(errors => {console.error(errors);})
       this.setData({
         dialog_visible: false

TUIKit/components/TUIChat/index.wxml

@@ -5,7 +5,7 @@
   <view class="left">
     <view class="name">{{baseInfo.patient_family_name}}</view>
     <view class="age">{{baseInfo.patient_family_sex==1?'男':'女'}}｜{{baseInfo.patient_family_age}}岁</view>
-    <view class="status {{baseInfo.inquiry_status==5?'status_complete':''}}">{{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 class="status {{baseInfo.inquiry_status==5?'status_complete':''}}">{{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 class="right">
     <text class="right_txt" bindtap="putDoctorInquiryFinish" wx:if="{{baseInfo.inquiry_status==4}}">结束问诊</text>
@@ -16,7 +16,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 - 197rpx - 100rpx - {{navbar_height}}px);">
+  <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':'+ 20px'}} - 100rpx - {{navbar_height}}px);"><!-- 100vh -input-area高度 - info高度 -navbar高度  -->
     <!-- <view wx:if="{{showTips}}" class="safetytips-box"> -->
     <!-- <view class="safetytips">
       <text>【安全提示】本 APP 仅用于体验腾讯云即时通信 IM 产品功能，不可用于业务洽谈与拓展。请勿轻信汇款、中奖等涉及钱款等信息，勿轻易拨打陌生电话，谨防上当受骗。</text>
@@ -36,7 +36,7 @@
       bind:handleCall="handleCall" ></MessageInput>
     </view>
   </view>
-  <view style="height: 40px;position: fixed;bottom: 0;width: 100%;background-color: #fff;z-index: 1;">
+  <view style="height: 40px;position: fixed;bottom: 0;width: 100%;background-color: #fff;z-index: 1;" wx:if="{{baseInfo.inquiry_status==4}}">
     
   </view>
 </view>