From a35f8fc3ed7e3e5deb993271a94b631929e53ff0 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Thu, 9 May 2024 14:28:15 +0800
Subject: [PATCH] 5.9

---
 Pages/yishi/wenzhen_v2/wenzhen.js                  |  4 ++--
 Pages/yishi/wenzhen_v2/wenzhen.wxml                |  3 ++-
 .../TUIKit/components/TUIChat/index.wxml           |  2 +-
 filters/filter.wxs                                 | 10 ++++++++++
 user/pages/yishi/addServiceContent/index.js        |  2 +-
 user/pages/yishi/addServiceContent/index.wxml      |  2 +-
 user/pages/yishi/onlinesetup/index.wxml            |  4 ++--
 user/pages/yishi/onlinesetupprice/index.js         | 14 +++++++++++---
 user/pages/yishi/wenzhenorderV2/index.wxml         |  4 +++-
 user/pages/yishi/yizhensetupprice/index.js         | 10 ++++++++--
 user/pages/yishi/yizhensetupprice/index.wxml       |  1 +
 11 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index 33fc29c..2531896 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -102,7 +102,7 @@ Page({
     //避免onshow加载多次
     this.setData({
       hasOnShow: true,
-      isLock:true
+      isLock:false
     })
 
 
@@ -473,7 +473,7 @@ Page({
   
     app.go(url);
     this.setData({
-        isLock: true
+        isLock: false
       })
   },
   postDoctorInquiry(e){
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml
index d64ab32..636ad7e 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxml
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml
@@ -226,7 +226,8 @@
           </view>
           <view class="content_2">问诊已结束</view>
           <view class="content_3">
-            <view class="status status_end">{{ item.inquiry_type==1?'专家问诊':item.inquiry_type==2?'快速问诊':item.inquiry_type==3?'公益问诊':item.inquiry_type==4?'问诊购药':item.inquiry_type==5?'糖组检测':'其他' }}</view>
+            <!-- {{item.inquiry_mode==1?'':item.inquiry_mode==2?'video':item.inquiry_mode==6?'yinan':item.inquiry_mode==8?'healthy':item.inquiry_mode==9?'visit':'other'}}">{{item.inquiry_mode==1?'图文':item.inquiry_mode==2?'视频':item.inquiry_mode==6?'疑难问诊':item.inquiry_mode==7?'附赠回复':item.inquiry_mode==8?'健康包':item.inquiry_mode==9?'随访包':'其他'}} -->
+            <view class="status status_end">{{ (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==7)?'附赠回复':(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>
           <view class="content_4" wx:if="{{ item.inquiry_status == 3 }}">不接诊24小时后自动取消</view>
         </view>  
diff --git a/TUIChatService/TUIKit/components/TUIChat/index.wxml b/TUIChatService/TUIKit/components/TUIChat/index.wxml
index 4c73457..f900166 100644
--- a/TUIChatService/TUIKit/components/TUIChat/index.wxml
+++ b/TUIChatService/TUIKit/components/TUIChat/index.wxml
@@ -3,7 +3,7 @@
 <view class="container">
   <view class="info" wx:if="{{ baseInfo.inquiry_status > 0 }}">
     <view class="yaotip" hidden="{{showYaotip}}" wx:if="{{baseInfo.inquiry_status==4 && baseInfo.inquiry_mode==8}}">
-   <view>健康包剩{{serviceInfo.remaining_quantity}}盒肝爽颗粒(步长),请询问患者是否开具。</view>
+   <view>健康包剩{{serviceInfo.remaining_quantity}}盒肝爽颗粒(步长)，请询问患者是否开具。</view>
    <van-icon name="cross" bind:tap="closeYaotip"/>
   </view>
     <view class="left" >
diff --git a/filters/filter.wxs b/filters/filter.wxs
index 4c4a8bf..6b7f190 100644
--- a/filters/filter.wxs
+++ b/filters/filter.wxs
@@ -75,7 +75,17 @@ function formatwenzhenList(arr,type){
     }
   
   };
+  function countMoney(value){
+      var m=parseFloat(value)*0.75;
+      var index= m.toString().indexOf(".");
+      if(index!=-1){
+        return m.toString().substring(0, index+3)
+      }else{
+          return m
+      }
+  };
 module.exports = {
+    countMoney:countMoney,
   formatwenzhenList:formatwenzhenList,
   numberTOstring:numberTOstring,
   transforDay:transforDay,
diff --git a/user/pages/yishi/addServiceContent/index.js b/user/pages/yishi/addServiceContent/index.js
index f578e0d..e9f6b1b 100644
--- a/user/pages/yishi/addServiceContent/index.js
+++ b/user/pages/yishi/addServiceContent/index.js
@@ -229,7 +229,7 @@ getFollowDetail(){
     
     this.setData({
         showServiceNumber:false,
-        monthly_frequency:index==0?10:0
+        monthly_frequency:index==0?10:'0'
     })
   },
   cancelServiceNumber(){
diff --git a/user/pages/yishi/addServiceContent/index.wxml b/user/pages/yishi/addServiceContent/index.wxml
index 9ed50ef..6644502 100644
--- a/user/pages/yishi/addServiceContent/index.wxml
+++ b/user/pages/yishi/addServiceContent/index.wxml
@@ -6,7 +6,7 @@
       <view class="price_steup_box_top_title">服务次数/月</view>
       <view class="price_steup_box_top_stepper" bind:tap="openServiceNumber">
         <text class="amount nodata" wx:if="{{monthly_frequency===''}}">请选择服务次数</text>
-        <text class="amount" wx:else>{{monthly_frequency===0?'不限次数':'10次'}}</text>
+        <text class="amount" wx:else>{{monthly_frequency==='0'?'不限次数':'10次'}}</text>
 
         <van-icon name="arrow" color="#999" style="margin-top: 2rpx;"/>
       </view>
diff --git a/user/pages/yishi/onlinesetup/index.wxml b/user/pages/yishi/onlinesetup/index.wxml
index e666c56..740282c 100644
--- a/user/pages/yishi/onlinesetup/index.wxml
+++ b/user/pages/yishi/onlinesetup/index.wxml
@@ -62,7 +62,7 @@
                     <view class="switch_box_note">{{ (info.is_open==1 && active==1)?'已开启，患者可以向您发起随访包服务':'已关闭，暂不接诊' }}</view>
                 </view>
                 <view class="help">
-                    <van-cell size="large"  custom-style="font-size:32rpx;" title="服务内容介绍和结算" is-link border="{{false}}" />
+                    <van-cell size="large" url="/user/pages/yishi/manual_detail/index?manual_id=14"  custom-style="font-size:32rpx;" title="服务内容介绍和结算" is-link border="{{false}}" />
                 </view>
             </view>
             <view class="checked_box" style="margin-top: 30rpx;">
@@ -153,7 +153,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=13" custom-style="font-size:32rpx;" title="服务内容介绍和结算" is-link border="{{false}}" />
               </view>
           </view>
 
diff --git a/user/pages/yishi/onlinesetupprice/index.js b/user/pages/yishi/onlinesetupprice/index.js
index 22fdcfe..4a5e15b 100644
--- a/user/pages/yishi/onlinesetupprice/index.js
+++ b/user/pages/yishi/onlinesetupprice/index.js
@@ -51,11 +51,12 @@ Page({
         // config: response.data.config,
         // note: response.data.info.is_open == 1? this.data.open_note : this.data.close_note
       })
+      this.getSysconfig();
     }).catch(errors => {console.error(errors);})
-    this.getSysconfig();
+   
   },
   getSysconfig(){
-      let {inquiry_type,inquiry_mode}=this.data;
+      let {inquiry_type,inquiry_mode,info}=this.data;
     api.getSysconfig({
         inquiry_type,
         inquiry_mode
@@ -65,7 +66,14 @@ Page({
           'config': response.data
           // config: response.data.config,
           // note: response.data.info.is_open == 1? this.data.open_note : this.data.close_note
-        })
+        });
+    
+        if(!info.work_num_day){
+        
+            this.setData({
+                'info.work_num_day':response.data.default_work_num_day
+            })
+        }
       }).catch(errors => {console.error(errors);})
     
   },
diff --git a/user/pages/yishi/wenzhenorderV2/index.wxml b/user/pages/yishi/wenzhenorderV2/index.wxml
index 01a688c..93eaca2 100644
--- a/user/pages/yishi/wenzhenorderV2/index.wxml
+++ b/user/pages/yishi/wenzhenorderV2/index.wxml
@@ -1,5 +1,7 @@
 <!-- 问诊订单 -->
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
+<wxs src="../../../../filters/filter.wxs" module="filter"></wxs>
+
 <view class="container">
     <view class="order_list">
         <view class="order_item" wx:for="{{order_list}}">
@@ -12,7 +14,7 @@
               <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 style="opacity: 0;">入账</text><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;">{{filter.countMoney(item.amount_total)}}元</text></view>
             </view>
           </view>
         </view>
diff --git a/user/pages/yishi/yizhensetupprice/index.js b/user/pages/yishi/yizhensetupprice/index.js
index 9e6ad32..cbe6e77 100644
--- a/user/pages/yishi/yizhensetupprice/index.js
+++ b/user/pages/yishi/yizhensetupprice/index.js
@@ -62,11 +62,12 @@ Page({
     //   this.setData({
     //     note: note
     //   })
-    }).catch(errors => {console.error(errors);})
     this.getSysconfig()
+    }).catch(errors => {console.error(errors);})
+   
   },
   getSysconfig(){
-    let {inquiry_type,inquiry_mode}=this.data;
+    let {inquiry_type,inquiry_mode,info}=this.data;
   api.getSysconfig({
       inquiry_type,
       inquiry_mode
@@ -77,6 +78,11 @@ Page({
         // config: response.data.config,
         // note: response.data.info.is_open == 1? this.data.open_note : this.data.close_note
       })
+      if(!info.work_num_day){
+        this.setData({
+            'info.work_num_day':response.data.default_work_num_day
+        })
+    }
          this.formatAmounts();
       this.formatAmountValue();
     }).catch(errors => {console.error(errors);})
diff --git a/user/pages/yishi/yizhensetupprice/index.wxml b/user/pages/yishi/yizhensetupprice/index.wxml
index 0aa7c5f..b68b9cd 100644
--- a/user/pages/yishi/yizhensetupprice/index.wxml
+++ b/user/pages/yishi/yizhensetupprice/index.wxml
@@ -1,4 +1,5 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
+
 <view class="container">
   <view class="checked_box">
     <view class="price_steup_box">