From d05211a7f314a05f25951e67d115838a00068db9 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Wed, 8 May 2024 15:34:38 +0800
Subject: [PATCH] 5.8

---
 Pages/yishi/wenzhen_v2/wenzhen.js          |  3 +++
 Pages/yishi/wenzhen_v2/wenzhen.wxml        |  6 +++---
 user/pages/yishi/onlinechufang/index.js    |  2 ++
 user/pages/yishi/orderdetail/index.js      | 22 +++++++++++++---------
 user/pages/yishi/orderdetail/index.wxml    |  2 +-
 user/pages/yishi/wenzhenorderV2/index.wxml |  4 ++--
 6 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index a910072..74031c2 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -267,6 +267,7 @@ Page({
           item.patient_age = order.patient_age;
           item.patient_name = order.patient_name;
           item.patient_sex = order.patient_sex;
+          item.no_inquiry_cancel_time=order.no_inquiry_cancel_time;
           new_conversationList.push(item);
         })
       };
@@ -307,6 +308,7 @@ Page({
       if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过
       let lastMessage = item.lastMessage;
       let type = lastMessage.type;
+      let no_inquiry_cancel_time=item.no_inquiry_cancel_time;
       let userProfile = item.userProfile;
       if(!lastMessage) return;
       let cloudCustomData = lastMessage.cloudCustomData;
@@ -371,6 +373,7 @@ Page({
       txt.Text= lastMessage.messageForShow;
       session_item.last_message_content = txt;
       session_item.message_send_time = getTimeAgo(lastMessage.lastTime);
+      session_item.no_inquiry_cancel_time=no_inquiry_cancel_time;
 
       session_item.remaining_month_inquiry_count=remaining_month_inquiry_count;
       session_item.service_package_start_time=service_package_start_time;
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml
index 0c5785a..d64ab32 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxml
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml
@@ -86,9 +86,9 @@
             </view>
           </view>
           <view class="content_4" wx:if="{{ item.inquiry_status == 3 }}">
-            <text wx:if="{{item.inquiry_type ==2 || item.inquiry_type ==4}}">不接诊5分钟后自动取消</text>
-            <text wx:elif="{{item.inquiry_type ==3 || (item.inquiry_type ==1 && item.inquiry_mode!=8 && item.inquiry_mode!=9)}}">不接诊24小时后自动取消</text>
-            <text wx:elif="{{item.inquiry_type ==1 && (item.inquiry_mode==8 || item.inquiry_mode==9)}}">不接诊72小时后自动取消</text>
+            <text wx:if="{{item.inquiry_type ==2 || item.inquiry_type ==4}}">不接诊<text wx:if="{{item.no_inquiry_cancel_time<60}}">{{no_inquiry_cancel_time}}分钟</text><text wx:else>{{item.no_inquiry_cancel_time/60}}小时</text>后自动取消</text>
+            <text wx:elif="{{item.inquiry_type ==3 || (item.inquiry_type ==1 && item.inquiry_mode!=8 && item.inquiry_mode!=9)}}">不接诊<text wx:if="{{item.no_inquiry_cancel_time<60}}">{{no_inquiry_cancel_time}}分钟</text><text wx:else>{{item.no_inquiry_cancel_time/60}}小时</text>后自动取消</text>
+            <text wx:elif="{{item.inquiry_type ==1 && (item.inquiry_mode==8 || item.inquiry_mode==9)}}">不接诊<text wx:if="{{item.no_inquiry_cancel_time<60}}">{{no_inquiry_cancel_time}}分钟</text><text wx:else>{{item.no_inquiry_cancel_time/60}}小时</text>后自动取消</text>
           </view>
         </view>         
          <!-- aa -->
diff --git a/user/pages/yishi/onlinechufang/index.js b/user/pages/yishi/onlinechufang/index.js
index 37de07e..3713a16 100644
--- a/user/pages/yishi/onlinechufang/index.js
+++ b/user/pages/yishi/onlinechufang/index.js
@@ -462,6 +462,7 @@ Page({
     save_durg_prescription_product_num = Number.parseInt(save_durg_prescription_product_num)
     console.log(save_durg_prescription_product_num)
     if(isNaN(save_durg_prescription_product_num)){
+     wx.hideKeyboard();
       Dialog.alert({
         message: '请输入正确数字',
       }).then(() => {
@@ -473,6 +474,7 @@ Page({
     }
    let prescription_num=this.data.prescription_num?this.data.prescription_num:5
     if(save_durg_prescription_product_num > prescription_num){
+        wx.hideKeyboard();
       Dialog.alert({
         message: '药品数量不允许添加超过'+prescription_num+'个',
       }).then(() => {
diff --git a/user/pages/yishi/orderdetail/index.js b/user/pages/yishi/orderdetail/index.js
index f66d23b..42ed820 100644
--- a/user/pages/yishi/orderdetail/index.js
+++ b/user/pages/yishi/orderdetail/index.js
@@ -37,19 +37,23 @@ Page({
     this.setData({
       date: date
     })
+    this.getDoctorAccountInfo();
   },
   onHide(){
-    this.setData({
-      list: [],
-      date: "",
-      current_page: 0,
-      total: 0,
-      per_page: 0,
-      last_page: 0
-    })
+    // this.setData({
+    //   list: [],
+    //   date: "",
+    //   current_page: 0,
+    //   total: 0,
+    //   per_page: 0,
+    //   last_page: 0
+    // })
   },
   onShow(){
-    this.getDoctorAccountInfo();
+    //   if(this.data.date){
+    //     this.getDoctorAccountInfo();
+    //   }
+   
   },
   switchTab(e){
    let {id}=e.currentTarget.dataset;
diff --git a/user/pages/yishi/orderdetail/index.wxml b/user/pages/yishi/orderdetail/index.wxml
index be28630..90b7400 100644
--- a/user/pages/yishi/orderdetail/index.wxml
+++ b/user/pages/yishi/orderdetail/index.wxml
@@ -9,7 +9,7 @@
     <view class="order_item" wx:for="{{list}}">
       <view class="order_item_content">
         <view class="order_item_content_top ">
-          {{ item.inquiry_type==1 && item.inquiry_mode==1?'在线问诊-图文':item.inquiry_type==1 && item.inquiry_mode==2?'在线问诊-视频':item.inquiry_type==1 && item.inquiry_mode==6?'疑难会诊':(item.inquiry_type==1 && item.inquiry_mode==8)?'在线问诊-健康包':(item.inquiry_type==1 && item.inquiry_mode==9)?'在线问诊-随访包':item.inquiry_type==2?'快速问诊':item.inquiry_type==3?'公益问诊':item.inquiry_type==4?'问诊购药':'其他' }}
+          {{ (item.inquiry_type==1 && item.inquiry_mode==1)?'在线问诊-图文':item.inquiry_type==1 && item.inquiry_mode==2?'在线问诊-视频':item.inquiry_type==1 && item.inquiry_mode==6?'疑难会诊':(item.inquiry_type==1 && item.inquiry_mode==8)?'健康包':(item.inquiry_type==1 && item.inquiry_mode==9)?'随访包':item.inquiry_type==2?'快速问诊':item.inquiry_type==3?'公益问诊':item.inquiry_type==4?'问诊购药':item.order_type==4?'随访包':item.order_type==5? '健康包':'其他' }}
         <!-- <view class="order_status order_status_cancle">{{ 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?'已取消':'其他' }}</view> -->
         <view class="order_status order_status_cancle {{item.entry_status==1?'entrying':item.entry_status==2?'entrysuccess':item.entry_status==3?'entryfail':'' }}">{{ item.entry_status==1?'入账中':item.entry_status==2?'入账成功':item.entry_status==3?'入账失败':'未知' }}</view>
         </view>
diff --git a/user/pages/yishi/wenzhenorderV2/index.wxml b/user/pages/yishi/wenzhenorderV2/index.wxml
index d8228e3..01a688c 100644
--- a/user/pages/yishi/wenzhenorderV2/index.wxml
+++ b/user/pages/yishi/wenzhenorderV2/index.wxml
@@ -5,14 +5,14 @@
         <view class="order_item" wx:for="{{order_list}}">
           <view class="order_item_content" data-index="{{index}}" bindtap="selectOrder">
             <!-- （1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药） -->
-            <view class="order_item_content_top">{{item.inquiry_type==1 && item.inquiry_mode==1?'在线问诊-图文':item.inquiry_type==1 && item.inquiry_mode==2?'在线问诊-视频':item.inquiry_type==1 && item.inquiry_mode==6?'疑难会诊':item.inquiry_type==1 && item.inquiry_mode==8?'在线问诊-健康包':item.inquiry_type==1 && item.inquiry_mode==9?'在线问诊-随访包':item.inquiry_type==2?'快速问诊':item.inquiry_type==3?'公益问诊':item.inquiry_type==4?'问诊购药':item.inquiry_type==5?'糖组检测':'未知'}}</view>
+            <view class="order_item_content_top">{{item.inquiry_type==1 && item.inquiry_mode==1?'在线问诊-图文':item.inquiry_type==1 && item.inquiry_mode==2?'在线问诊-视频':item.inquiry_type==1 && item.inquiry_mode==6?'疑难会诊':item.inquiry_type==1 && item.inquiry_mode==8?'健康包':item.inquiry_type==1 && item.inquiry_mode==9?'随访包':item.inquiry_type==2?'快速问诊':item.inquiry_type==3?'公益问诊':item.inquiry_type==4?'问诊购药':item.inquiry_type==5?'糖组检测':item.inquiry_type==4?'问诊购药':item.order_type==4?'随访包':item.order_type==5? '健康包':'其他'}}</view>
             <view class="order_item_content_data">
               <view class="order_id">订单编号：<text style="font-size: 30rpx;color: rgba(0,0,0,0.85);">{{item.order_no}}</text></view>
               <view class="order_id">就诊患者：<text style="font-size: 30rpx;color: rgba(0,0,0,0.85);">{{item.patient_name}}（{{item.patient_sex==1?'男':'女'}}，{{item.patient_age}}岁）</text></view>
               <view class="order_id">接诊时间：<text style="font-size: 30rpx;color: rgba(0,0,0,0.85);">{{item.start_time}}</text></view>
               <view class="order_id">结束时间：<text style="font-size: 30rpx;color: rgba(0,0,0,0.85);">{{item.finish_time}}</text></view>
               <view class="order_id">订单金额：<text style="font-size: 30rpx;color: rgba(0,0,0,0.85);">￥{{item.amount_total}}</text></view>
-              <view class="order_id"><text 	decode>入账<text style="opacity: 0;">入账</text>：</text><text style="font-size: 30rpx;color: #FF5D2E;">{{item.amount_total}}*0.75元</text></view>
+              <view class="order_id"><text 	decode style="opacity: 0;">入账</text><text >入账：</text><text style="font-size: 30rpx;color: #FF5D2E;">{{item.amount_total}}*0.75元</text></view>
             </view>
           </view>
         </view>