优化

Pages/kickedout/index.js

@@ -0,0 +1,9 @@
+const app = getApp()
+Page({
+  data: {
+
+  },
+  confirmJieSuanDialog(){
+    app.go("/Pages/index/index");
+  }
+})

Pages/kickedout/index.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "t-dialog": "tdesign-miniprogram/dialog/dialog"
+  }
+}

Pages/kickedout/index.wxml

@@ -0,0 +1,9 @@
+<t-dialog
+    visible="{{ true }}"
+    title="温馨提示"
+    content="您已被踢下线"
+  >
+<view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="confirmJieSuanDialog">
+  好的
+</view>
+</t-dialog>

Pages/kickedout/index.wxss

@@ -0,0 +1,11 @@
+.dialog{
+  width: 50%;
+  text-align: center;
+  height: 100rpx;
+  line-height: 100rpx;
+}
+.dialog_confirm_btn{
+  border-top: 1px solid #E9E9E9;
+  color: #3CC7C0;
+  width: 100%;
+}

Pages/yaoshi/prescription/prescription.js

@@ -12,10 +12,11 @@ Page({
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '处方详情', //导航栏 中间的标题
     },
-
     // 此页面 页面内容距最顶部的距离
     height: app.globalData.height,
-    order_prescription_id: ""
+    order_prescription_id: "",
+    prescription_img: "",
+    doctor_sign_image: ""
   },
   onLoad(options) {
     let order_prescription_id = options.order_prescription_id;
@@ -70,6 +71,10 @@ Page({
   onShow(){
     api.getPharmacistPrescriptioninfo({order_prescription_id: this.data.order_prescription_id}).then(response => {
       console.log(response.data);
+      this.setData({
+        prescription_img: response.data.prescription_img,
+        doctor_sign_image: response.data.doctor_sign_image
+      })
     }).catch(errors => {console.error(errors);})
   },
   putPharmacistPrescriptionVerify(e){

Pages/yaoshi/prescription/prescription.wxml

@@ -3,8 +3,12 @@
   <view class="img_box">
     <view class="img_content">
       <image class="case_img"
-      src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/prescription_demo.png"
-      mode="widthFix"
+        src="{{prescription_img}}"
+        mode="widthFix"
+      />
+      <image class="doctor_sign_image"
+        src="{{doctor_sign_image}}"
+        mode="widthFix"
       />
     </view>
   </view>

Pages/yishi/case/index.wxss

@@ -38,7 +38,7 @@ page{
 }
 .info_item{
   text-align: center;
-  /* width: 180rpx; */
+  width: 190rpx;
   height: 60rpx;
   display: flex;
   align-items: center;

Pages/yishi/index/index.wxss

@@ -1,3 +1,6 @@
+page{
+  background-color: #FAFAFA;
+}
 .container{
   width: 100vw;
 }
@@ -31,19 +34,23 @@
   background-color: rgb(255, 255, 255);
   border-radius: 10rpx;
   box-shadow: 0px 2px 4px 0px rgba(0,0,0,0.06);
+  z-index: 999;
 }
 .info{
   display: flex;
   flex-direction: column;
+  z-index: 999;
 }
 .info_top{
   display: flex;
   align-items: center;
   justify-content: space-around;
+  z-index: 999;
 }
 .info_photo{
   margin-left: 20rpx;
   flex: 1;
+  z-index: 999;
 }
 .info_content{
   color: #000;
@@ -52,16 +59,19 @@
   flex-direction: column;
   justify-content: space-between;
   padding-left: 20rpx;
+  z-index: 999;
 }
 .info_mobile{
   font-size: 36rpx;
   letter-spacing: 3rpx;
+  z-index: 999;
 }
 .info_wenzhen{
   margin: 20rpx 0 0 30rpx;
   font-size: 28rpx;
   color: #666666;
   display: flex;
+  z-index: 999;
 }
 .info_wenzhen_new{
   flex: 1;
@@ -178,6 +188,7 @@
   flex-wrap: wrap;
   justify-content: space-evenly;
   border-radius: 10rpx;
+  background-color: #fff;
 }
 .fun_box_item{
   width: 40vw;

Pages/yishi/myinfo/index.js

@@ -44,13 +44,13 @@ Page({
   },
   logOut(){
     console.log("退出登录");
-    let usertype =  wx.getStorageSync('usertype');
     wx.showModal({
       title: '确认退出登录',
       content: '退出登录后您需要重新登录',
       success (res) {
         if (res.confirm) {
           console.log('用户点击确定')
+          let usertype =  wx.getStorageSync('usertype');
           wx.setStorageSync('AUTH_TOKEN_'+usertype, "");
           wx.setStorageSync('user_id_'+usertype, "");
           wx.setStorageSync('client_user_id_'+usertype, "");

Pages/yishi/onlinechufang/index.js

@@ -36,7 +36,8 @@ Page({
     case_detail: {},
     sub_disabled: false,
     from: "",
-    now_filed_focus: 'save_durg_prescription_product_num'
+    now_filed_focus: 'save_durg_prescription_product_num',
+    page_meta_show: true
   },
   changeFocus(e){
     let next_filed_focus = e.currentTarget.dataset.next_filed_focus;

Pages/yishi/onlinechufang/index.wxml

@@ -1,3 +1,4 @@
+<!-- <page-meta page-style="{{ page_meta_show ? 'overflow: hidden;' : '' }}" /> -->
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container">
   <view class="item">

Pages/yishi/onlinechufang/index.wxss

@@ -2,8 +2,6 @@ page{
   background-color: #F6F6F6;
 }
 .container{
-  width: 100vw;
-  background-color: #F6F6F6;
   letter-spacing: 3rpx;
 }
 .item{
@@ -71,6 +69,7 @@ page{
   margin: 20rpx 0;
   position: relative;
   left: 4vw;
+  width: 50vw;
 }
 .drugs_box{
   width: 92vw;

Pages/yishi/onlinesetup/index.js

@@ -110,8 +110,8 @@ Page({
     this.setData({ 
       "info.work_num_day": event.detail 
     });
-
-    this.updateConfig();
+    let price = this.data.info.inquiry_price;
+    this.updateConfig(price);
 
   },
   onPriceChange(e){

Pages/yishi/quickreply/index.js

@@ -11,7 +11,7 @@ Page({
     },
     height: app.globalData.height, 
     stickyProps: {
-      offsetTop: app.globalData.height*2 + 20,
+      offsetTop: (app.globalData.height * 2),
       zIndex: 99
     },
     list_1: [],
@@ -19,7 +19,7 @@ Page({
     show: false,
     add_message: "",
     current_words_type: 1,
-    focus: true,
+    focus: false,
     words_css: "border-radius: 20rpx;margin-bottom: 20rpx;",
     from: ""
   },

Pages/yishi/quickreply/index.wxml

@@ -3,16 +3,14 @@
 
   <t-tabs
       defaultValue="{{ current_words_type }}"
-      sticky
       swipeable="{{false}}"
-      stickyProps="{{stickyProps}}"
       t-class="custom-tabs"
       bind:change="onTabChange"
       theme="line"
       custom-style="font-size: 32rpx"
     >
       <t-tab-panel label="问诊" value="1">
-        <view class="item_list">
+        <view class="item_list1">
           <van-swipe-cell right-width="{{ 65 }}" 
           bind:close="wordsClose"
           bind:open="wordsOpen" 
@@ -30,7 +28,7 @@
         </view>
       </t-tab-panel>
       <t-tab-panel label="处方" value="2">
-        <view class="item_list">
+        <view class="item_list2">
           <van-swipe-cell right-width="{{ 65 }}" 
           bind:close="wordsClose"
           bind:open="wordsOpen" 

Pages/yishi/quickreply/index.wxss

@@ -4,7 +4,11 @@ page{
 .container{
   width: 100vw;
 }
-.item_list{
+.item_list1{
+  width: 92vw;
+  margin: 40rpx auto 180rpx auto;
+}
+.item_list2{
   width: 92vw;
   margin: 40rpx auto;
 }
@@ -25,8 +29,9 @@ page{
   height: 130rpx;
   background-color: #fff;
   position: fixed;
-  bottom: 50rpx;
+  bottom: 0;
   width: 100%;
+  padding-bottom: 30rpx;
 }
 .popup_box{
   height: 500rpx;
@@ -69,4 +74,7 @@ page{
   padding: 32rpx !important;
   font-size: 34rpx !important;
   color: #333 !important;
+  word-wrap: break-word;
+  word-break: normal;
+  word-break:break-all;
 }

Pages/yishi/wenzhen_v2/wenzhen.js

@@ -29,8 +29,10 @@ Page({
     if(wx.$TUIKit){
       wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
     }else{
-      app.imInit();
-      wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
+      app.imInit().then(res => {
+        console.log("wenzhen onload imInit");
+        wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
+      });
     }
     setInterval(() => {
       let system_notice_unreadnnum = wx.getStorageSync(userID+"_system_notice_unreadnnum");
@@ -78,8 +80,12 @@ Page({
     }).catch(error => {
       console.log(error)
       // 补偿登录操作
-      app.imInit();
-      this.getConversationList();
+      app.imInit().then(res => {
+        this.getConversationList();
+      }).catch(error => {
+        console.log(error)
+        this.getConversationList();
+      });
     });
   },
   go(e){
@@ -264,14 +270,14 @@ Page({
 
     let usertype =  wx.getStorageSync('usertype');
     let userID = wx.getStorageSync('user_id_'+usertype);
-    let wenzhen_info = 0;
+    let totalUnreadCount = 0;
     let message_inquiry_type = this.data.message_inquiry_type;
 
     this.data.conversationList.forEach(item => {
       let conversationID = item.conversationID;
       if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过
-      let type = item.type;
       let lastMessage = item.lastMessage;
+      let type = lastMessage.type;
       let userProfile = item.userProfile;
       if(!lastMessage) return;
       let cloudCustomData = lastMessage.cloudCustomData;
@@ -303,7 +309,7 @@ Page({
       session_item.from_account = userProfile.userID;
       let unreadCount = item.unreadCount;
       if(unreadCount > 0){
-        wenzhen_info = wenzhen_info + unreadCount;
+        totalUnreadCount = totalUnreadCount + unreadCount;
         session_item.message_dot = true;
       }else{
         session_item.message_dot = false;
@@ -311,9 +317,9 @@ Page({
       session_list[inquiry_type - 1].push(session_item);
     })
 
-    if(wenzhen_info == 0) wenzhen_info = "";
-    if(wenzhen_info > 99) wenzhen_info = "99+";
-    wx.setStorageSync(userID+'_wenzhen_info', wenzhen_info);
+    if(totalUnreadCount == 0){
+      app.formatUnReadNum(userID+"_wenzhen_info", totalUnreadCount);
+    }
 
     this.setData({
       data_list_1: session_data_list_1,

Pages/yishi/wenzhen_v2/wenzhen.wxml

@@ -151,4 +151,7 @@
   </view>
 
   <view style="height: 200rpx;"></view>
+
+
+
 </view>

Pages/yishi/yizhensetup/index.wxml

@@ -49,7 +49,7 @@
   </view>
 
   <view class="go">
-    <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>
+    <van-button disabled="{{!info.is_open || info.is_open==0}}" 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