优化

Pages/yaoshi/prescription/prescription.js

@@ -15,7 +15,7 @@ Page({
     // 此页面 页面内容距最顶部的距离
     height: app.globalData.height,
     order_prescription_id: "",
-    prescription_img: "",
+    prescription_img_oss_path: "",
     doctor_sign_image: ""
   },
   onLoad(options) {
@@ -72,7 +72,7 @@ Page({
     api.getPharmacistPrescriptioninfo({order_prescription_id: this.data.order_prescription_id}).then(response => {
       console.log(response.data);
       this.setData({
-        prescription_img: response.data.prescription_img,
+        prescription_img_oss_path: response.data.prescription_img_oss_path,
         doctor_sign_image: response.data.doctor_sign_image
       })
     }).catch(errors => {console.error(errors);})

Pages/yaoshi/prescription/prescription.wxml

@@ -3,7 +3,7 @@
   <view class="img_box" wx:if="{{false}}">
     <view class="img_content">
       <image class="case_img"
-        src="{{prescription_img}}"
+        src="{{prescription_img_oss_path}}"
         mode="widthFix"
       />
       <image class="doctor_sign_image"
@@ -13,7 +13,7 @@
     </view>
   </view>
   <view class="imgbox">
-    <image src="{{prescription_img}}" mode="widthFix" class="prescription"></image>
+    <image src="{{prescription_img_oss_path}}" mode="widthFix" class="prescription"></image>
     <image src="{{doctor_sign_image}}" mode="widthFix" class="doctorSign"></image>
   </view>
   <view class="button_group">

Pages/yishi/case/index.wxml

@@ -1,3 +1,4 @@
+<wxs module="dateSubstr" src="./../../../utils/substr.wxs"></wxs>
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container">
   <view class="main_title">基础信息</view>
@@ -20,7 +21,7 @@
       </view>
       <view class="disease_box_item">
         <view class="title">确诊日期：</view>
-        <view class="conent">{{case_detail.diagnosis_date}}</view>
+        <view class="conent">{{dateSubstr.substring(case_detail.diagnosis_date,0,10)}}</view>
       </view>
       <!-- <view class="disease_box_item">
         <view class="title">医生诊断：</view>

Pages/yishi/index/index.js

@@ -98,7 +98,8 @@ Page({
     confirmBtn: {
       "openType": "contact",
       "content": "确认",
-    }
+    },
+    overlay_show: false
   },
   //  获取状态栏信息
   getMenuButtonBound() {
@@ -137,13 +138,27 @@ Page({
   },
   confirmJieSuanDialog(){
     this.setData({
-      jiesuan_dialog_visible: false
+      jiesuan_dialog_visible: false,
     })
+    const overlay_show = wx.getStorageSync('overlay_show')
+    if(!overlay_show){
+      this.setData({
+        overlay_show: true
+      })
+      wx.setStorageSync('overlay_show', "1")
+    }
   },
   cancelJieSuanDialog(){
     this.setData({
-      jiesuan_dialog_visible: false
+      jiesuan_dialog_visible: false,
     })
+    const overlay_show = wx.getStorageSync('overlay_show')
+    if(!overlay_show){
+      this.setData({
+        overlay_show: true
+      })
+      wx.setStorageSync('overlay_show', "1")
+    }
   },
   confirmContactDialog(){
     this.setData({
@@ -192,7 +207,7 @@ Page({
       shiming_status_url: "",
       iden_auth_status_url: "/Pages/yishi/identity/index",
       multi_point_status_url: "/Pages/yishi/zhiye_identity/index",
-      skeleton_loading: true
+      skeleton_loading: false
     })
     wx.offCopyUrl(this.Copylistener) // 需传入与监听时同一个的函数对象
 
@@ -464,15 +479,15 @@ Page({
       if(!this.data.default_dialog_show){
         this.setData({
           dialog_visible: true,
+        });
+      }
+      this.setData({
+        "info.info_shiming_status_txt": "绑定结算银行卡",
+        "info.info_shiming_status": "info_shiming_status_yes",
+        shiming_status_url: "/Pages/yishi/bankcard/index",
+        dialog_content: "请您先绑定结算银行卡",
+        default_dialog_show: true
       });
-    }
-    this.setData({
-      "info.info_shiming_status_txt": "绑定结算银行卡",
-      "info.info_shiming_status": "info_shiming_status_yes",
-      shiming_status_url: "/Pages/yishi/bankcard/index",
-      dialog_content: "请您先绑定结算银行卡",
-      default_dialog_show: true
-  });
       return false;
     }
     
@@ -641,5 +656,10 @@ Page({
     })
 
     return retult;
+  },
+  onClickHideOverlay(){
+    this.setData({
+      overlay_show: false
+    })
   }
 })

Pages/yishi/index/index.json

@@ -7,7 +7,8 @@
     "t-badge": "tdesign-miniprogram/badge/badge",
     "t-dialog": "tdesign-miniprogram/dialog/dialog",
     "van-image": "@vant/weapp/image/index",
-    "t-skeleton": "tdesign-miniprogram/skeleton/skeleton"
+    "t-skeleton": "tdesign-miniprogram/skeleton/skeleton",
+    "van-overlay": "@vant/weapp/overlay/index"
   },
   "enablePullDownRefresh": false,
   "backgroundTextStyle":"dark"

Pages/yishi/index/index.wxml

@@ -222,6 +222,17 @@
     confirm-button-color="#3CC7C0"
     confirm-button-open-type="contact"
   /> -->
+
+  <van-overlay show="{{ overlay_show }}" z-index="999999999999">
+    <van-image class="overlay_show"
+      fit="widthFix"
+      style="position: absolute; padding-top: {{stateHeight + navHeight}}px;"
+      width="100vw"
+          src="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/collection.png"
+        />
+    <van-button color="rgba(0, 0, 0, .1)" style="position: fixed;bottom: 50rpx;left: 50%;transform: translateX(-50%);width: 90vw;border: 1px solid #fff;border-radius: 50px;" block round bind:click="onClickHideOverlay">我知道了</van-button>
+  </van-overlay>
+
 </view>
 
 

Pages/yishi/onlinechufang/index.js

@@ -200,6 +200,9 @@ Page({
     params.product_keyword = this.data.product_name;
     api.getBasicProductSearch(params).then(response => {
       console.log(response);
+      this.setData({
+        drug_content_show: false
+      })
       if(response.data.length > 0){
         this.setData({
           search_drug_list_empty: false,
@@ -252,7 +255,7 @@ Page({
     console.log("disease_class_id: ", disease_class_id);
     let list = this.data.zhenduan_list;
     let find_index = list.findIndex(item => {
-      return item.disease_class_id == disease_class_id
+      return item.icd_id == disease_class_id
     });
     console.log("find_idex： ", find_index)
     list.splice(find_index, 1);

Pages/yishi/onlinesetupprice/index.wxml

@@ -4,7 +4,7 @@
     <view class="price_steup_box_top">
       <view class="price_steup_box_top_title">每日接诊数量</view>
       <view class="price_steup_box_top_stepper">
-        <van-stepper value="{{ info.work_num_day }}" min="1" max="{{config.max_work_num_day}}" integer  bind:change="onStepperChange" />
+        <van-stepper value="{{ info.work_num_day }}" min="0" max="{{config.max_work_num_day}}" integer  bind:change="onStepperChange" />
       </view>
     </view>
     <view class="price_steup_box_bottom">

Pages/yishi/quickreply/index.js

@@ -21,7 +21,8 @@ Page({
     current_words_type: 1,
     focus: false,
     words_css: "border-radius: 20rpx;margin-bottom: 20rpx;",
-    from: ""
+    from: "",
+    open: false
   },
   onLoad(options){
     let from = options.from;
@@ -80,7 +81,9 @@ Page({
     }
     api.delDoctorWords({doctor_words_id: doctor_words_id}).then(response => {
       console.log(response);
-      
+      this.setData({
+        open: false
+      })
     }).then(()=>{
       this.getList(words_type)
     }).catch(errors => {console.error(errors);})
@@ -122,10 +125,16 @@ Page({
   wordsOpen(e){
     console.log("open")
     console.log(e);
+    this.setData({
+      open: true
+    })
   },
   wordsClick(e){
     console.log("click")
     console.log(e);
+    if(this.data.open){
+      return
+    }
     let words = e.currentTarget.dataset.words;
     let from = this.data.from;
     if(from){

Pages/yishi/quickreply/index.wxml

@@ -38,7 +38,7 @@
             <van-cell-group>
               <van-cell custom-style="{{words_css}}" title="{{index + 1}}、{{item.words}}" />
             </van-cell-group>
-            <view slot="right" class="delWords" bindtap="delWords" data-doctor_words_id="{{item.doctor_words_id}}">删除</view>
+            <view slot="right" class="delWords" catchtap="delWords" data-doctor_words_id="{{item.doctor_words_id}}">删除</view>
           </van-swipe-cell>
         </view>
         <view class="btn">

Pages/yishi/wenzhen_v2/wenzhen.js

@@ -31,6 +31,10 @@ Page({
     total: 0,
     per_page: 0,
     last_page: 0,
+    dot_1: false,
+    dot_2: false,
+    dot_3: false,
+    dot_4: false,
   },
   onLoad() {
     console.log("wenzhen onloadddd");
@@ -141,6 +145,10 @@ Page({
       total: 0,
       per_page: 0,
       last_page: 0,
+      dot_1: false,
+      dot_2: false,
+      dot_3: false,
+      dot_4: false,
     })
     wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived);
   },
@@ -412,6 +420,10 @@ Page({
       if(unreadCount > 0){
         totalUnreadCount = totalUnreadCount + unreadCount;
         session_item.message_dot = true;
+        let dot_name = "dot_"+inquiry_type
+        this.setData({
+          [dot_name]: true
+        })
       }else{
         if(item.inquiry_status == 3){
           totalUnreadCount = totalUnreadCount + 1;

Pages/yishi/wenzhen_v2/wenzhen.wxml

@@ -152,7 +152,7 @@
     bind:change="vanTabsChange"
     wx:if="{{ has_data }}" 
     >
-      <van-tab title="在线问诊" name="1" wx:if="{{data_list_1.length > 0}}">
+      <van-tab title="在线问诊" dot="{{dot_1}}" name="1" wx:if="{{data_list_1.length > 0}}">
         <!-- <wenzhen-data 
           name="{{ item.patient_name }}"
           sex="{{ item.patient_sex==1?'男':'女' }}"
@@ -199,7 +199,7 @@
         </view>         
          <!-- aa -->
       </van-tab>
-      <van-tab title="快速问诊" name="2" wx:if="{{data_list_2.length > 0}}">
+      <van-tab title="快速问诊" dot="{{dot_2}}" name="2" wx:if="{{data_list_2.length > 0}}">
         <!-- <wenzhen-data 
           name="{{ item.patient_name }}"
           sex="{{ item.patient_sex==1?'男':'女' }}"
@@ -243,7 +243,7 @@
           <view class="content_4" wx:if="{{ item.inquiry_status == 3 }}">不接诊24小时后自动取消</view>
         </view>  
       </van-tab>
-      <van-tab title="公益问诊" name="3" wx:if="{{data_list_3.length > 0}}">
+      <van-tab title="公益问诊" dot="{{dot_3}}" name="3" wx:if="{{data_list_3.length > 0}}">
         <!-- <wenzhen-data 
           name="{{ item.patient_name }}"
           sex="{{ item.patient_sex==1?'男':'女' }}"
@@ -287,7 +287,7 @@
           <view class="content_4" wx:if="{{ item.inquiry_status == 3 }}">不接诊24小时后自动取消</view>
         </view>  
       </van-tab>
-      <van-tab title="问诊购药" name="4" wx:if="{{data_list_4.length > 0}}">
+      <van-tab title="问诊购药" dot="{{dot_4}}" name="4" wx:if="{{data_list_4.length > 0}}">
         <!-- <wenzhen-data 
           name="{{ item.patient_name }}"
           sex="{{ item.patient_sex==1?'男':'女' }}"

Pages/yishi/wenzhenorderV2/index.js

@@ -76,9 +76,10 @@ Page({
     params.per_page = this.data.per_page;
     api.getDoctorWithdrawalOrder(params).then(response => {
       console.log(response);
+      let list = this.data.order_list
       if(response.data.total > 0){
         this.setData({
-          order_list: response.data.data,
+          order_list: list.concat(response.data.data),
           current_page: response.data.current_page,
           per_page: response.data.per_page,
           last_page: response.data.last_page

Pages/yishi/wenzhenorderV2/index.json

@@ -5,7 +5,8 @@
     "van-checkbox": "@vant/weapp/checkbox/index",
     "van-checkbox-group": "@vant/weapp/checkbox-group/index",
     "van-button": "@vant/weapp/button/index",
-    "van-empty": "@vant/weapp/empty/index"
+    "van-empty": "@vant/weapp/empty/index",
+    "van-divider": "@vant/weapp/divider/index"
   },
   "onReachBottomDistance": 100
 }

Pages/yishi/wenzhenorderV2/index.wxml

@@ -18,6 +18,6 @@
         </view>
     </view>
   <van-empty description="暂无数据" wx:if="{{order_list.length == 0}}" />
-
+  <van-divider contentPosition="center" wx:if="{{order_list.length > 0 && current_page == last_page}}">到底了~</van-divider>
 
 </view>

Pages/yishi/wenzhenorderV2/index.wxss

@@ -3,13 +3,14 @@ page{
 }
 .container{
   width: 100vw;
+  padding-bottom: 50rpx;
 }
 .order_list{
   display: flex;
   width: 92vw;
   margin: 0 auto;
   flex-direction: column;
-  padding-bottom: 180rpx;
+
 }
 .order_item{
   display: flex;

Pages/yishi/zhiye_identity/index.js

@@ -100,7 +100,7 @@ Page({
   add(){
     let _this = this;
     wx.requestSubscribeMessage({
-      tmplIds: ['kUy70xHlr7ADo4aIHiictM4Te7MSec3E5kHsYvFQu40'],
+      tmplIds: ['XWfEQYtb8_ubz8pCs3GoCG6TFxpDz9jn52895yvDm3s','bGGoKtDZC23GZtrrxuy6i5V7OhHgRgwXWx4yoDO1tlA'],
       success (res) { 
         console.log(res);
         console.log(_this.data.id_card_front);

TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js

@@ -164,7 +164,7 @@ Component({
         if (customMessage.message_type === GDXZ_CUSTOM_MSEEAGE.PRESCRIBE_VERIFY) {
           let data = customMessage.data;
           const renderDom = [{
-            type: 'prescribe',
+            type: 'prescribe_verify',
             product_name: data.product_name,
             order_inquiry_id: data.order_inquiry_id,
             order_prescription_id: data.order_prescription_id,

TUIKit/components/TUIChat/components/MessageInput/index.js

@@ -415,16 +415,24 @@ Component({
           app.go("/Pages/yishi/case/index?order_inquiry_id="+this.data.order_inquiry_id)
           break;
         case '11'://在线开方
-          let usertype =  wx.getStorageSync('usertype');
+          let _this = this;
-          let userID = wx.getStorageSync('user_id_'+usertype);
+          console.log("开始订阅消息");
-          let multi_point_status = wx.getStorageSync(userID+'_multi_point_status');
+          wx.requestSubscribeMessage({
-          if(multi_point_status == 1){
+            tmplIds: ['5Tl-xmaWXrKP5BB8E6b3oTdPHbHa7WYWbmvZiuz4TLs'],
-            app.go("/Pages/yishi/onlinechufang/index?order_inquiry_id="+this.data.order_inquiry_id)
+            success (res) {
-          }else{
+              console.log(res);
-            this.setData({
+              let usertype =  wx.getStorageSync('usertype');
-              dialog_visible: true
+              let userID = wx.getStorageSync('user_id_'+usertype);
-            })
+              let multi_point_status = wx.getStorageSync(userID+'_multi_point_status');
-          }
+              if(multi_point_status == 1){
+                app.go("/Pages/yishi/onlinechufang/index?order_inquiry_id="+_this.data.order_inquiry_id)
+              }else{
+                _this.setData({
+                  dialog_visible: true
+                })
+              }
+            }
+          })
           break;
         default:
           break;

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

@@ -209,6 +209,12 @@ Component({
         if(customMessage.message_type != GDXZ_CUSTOM_MSEEAGE.PRESCRIBE){
           show_avatar = false;
         }
+
+        if(customMessage.message_type != GDXZ_CUSTOM_MSEEAGE.TRABECULA){
+          
+          //收到横条消息去触发父组件getbase方法
+          this.triggerEvent('getInquiryMessageBasic');
+        }
       }
       return show_avatar;
     },
@@ -260,9 +266,11 @@ Component({
 
     // 收到的消息
     $onMessageReceived(value) {
+
       let autoToButtom = this.data.autoToButtom;
       console.log("autoToButtom:", autoToButtom)
       const message = value.data[0];
+      
       if(message.flow == 'out'){
         message.isRead = false;
       }
@@ -493,6 +501,7 @@ Component({
           console.warn('revokeMessage error:', imError);
         });
     },
+
     // 撤回消息重新发送
     resendMessage(e) {
       this.triggerEvent('resendMessage', {

TUIKit/components/TUIChat/index.wxml

@@ -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 {{baseInfo.inquiry_status==4?'- 197rpx':'+ 20px'}} - 100rpx - {{navbar_height}}px);"><!-- 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 - 197rpx - 100rpx - {{navbar_height}}px);"><!-- 100vh -input-area高度 - info高度 -navbar高度  -->
     <!-- <view wx:if="{{showTips}}" class="safetytips-box"> -->
     <!-- <view class="safetytips">
       <text>【安全提示】本 APP 仅用于体验腾讯云即时通信 IM 产品功能，不可用于业务洽谈与拓展。请勿轻信汇款、中奖等涉及钱款等信息，勿轻易拨打陌生电话，谨防上当受骗。</text>
@@ -24,19 +24,19 @@
     </view> -->
   <!-- </view> -->
     <!-- <scroll-view  class="message-list" bindtap="triggerClose"> -->
-    <MessageList id="MessageList" conversation="{{conversation}}" unreadCount="{{unreadCount}}" bind:changeMemberCount="changeMemberCount" bind:resendMessage="resendMessage" bind:typing="typing" order_inquiry_id="{{order_inquiry_id}}"></MessageList>
+    <MessageList bind:getInquiryMessageBasic="getInquiryMessageBasic" id="MessageList" conversation="{{conversation}}" unreadCount="{{unreadCount}}" bind:changeMemberCount="changeMemberCount" bind:resendMessage="resendMessage" bind:typing="typing" order_inquiry_id="{{order_inquiry_id}}"></MessageList>
   <!-- </scroll-view> -->
   </view>
   <view class="group-profile">
     <TUIGroup id="TUIGroup" wx:if="{{isShow}}" conversation="{{conversation}}" bind:groupCall="groupCall" bind:showConversationList="showConversationList"></TUIGroup>
   </view>
-  <view class="input-area" style="{{input_area_style}}" wx:if="{{baseInfo.inquiry_status == 4}}">
+  <view class="input-area" style="{{input_area_style}}">
     <view class="message-input" style="{{viewData.style}}" wx:if="{{showChat}}">
       <MessageInput bind:myhandleExtensions="myhandleExtensions" id="MessageInput" inquiry_type="{{inquiry_type}}" baseInfo="{{baseInfo}}" order_inquiry_id="{{order_inquiry_id}}" conversation="{{conversation}}" hasCallKit="{{hasCallKit}}" bind:sendMessage="sendMessage" bind:downKeysBoards="downKeysBoards" bind:pullKeysBoards="pullKeysBoards" bind:showMessageErrorImage="showMessageErrorImage" 
       bind:handleCall="handleCall" ></MessageInput>
     </view>
   </view>
-  <view style="height: 40px;position: fixed;bottom: 0;width: 100%;background-color: #fff;z-index: 1;" wx:if="{{baseInfo.inquiry_status==4}}">
+  <view style="height: 40px;position: fixed;bottom: 0;width: 100%;background-color: #fff;z-index: 1;">
     
   </view>
 </view>

utils/substr.wxs

@@ -0,0 +1,12 @@
+var filters = {//截取字符串返回
+    substring:function(str,start,end){
+      if(!str){
+        return
+      }
+        //也可做一些判断 //我不需要所以没做其他处理，直接返回的
+        return str.substring(start,end);
+    }
+}
+module.exports = {
+    substring:filters.substring
+}