From 26e760342bd687d44ffab17c291a7321bc7ac6ae Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Thu, 14 Dec 2023 14:46:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=81=8A=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/sickform/index.js                     | 14 ++++++++++++++
 Pages/yishi/sickform/index.wxml                   |  8 ++++----
 Pages/yishi/sickform/index.wxss                   |  5 +++++
 Pages/yishi/wenzhen_v2/wenzhen.wxml               | 15 ++++++++++++---
 Pages/yishi/write_sickform/index.js               |  6 +++---
 .../TUIChat/components/MessageInput/index.js      |  3 +++
 .../TUIChat/components/MessageInput/index.wxml    |  2 +-
 .../TUIChat/components/MessageInput/index.wxss    |  2 +-
 8 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/Pages/yishi/sickform/index.js b/Pages/yishi/sickform/index.js
index c9fac44..bb308d2 100644
--- a/Pages/yishi/sickform/index.js
+++ b/Pages/yishi/sickform/index.js
@@ -291,6 +291,20 @@ for (let i = 0; i < list2.length; i++) {
       
     })
   },
+  handleIpt(e){
+    let key = e.target.dataset.id;
+    let obj="personInfo."+key;
+    if(key=='height' || key=="weight"){
+     this.setData({
+       [obj]:e.detail.value
+     })
+    }else{
+     this.setData({
+       [obj]: e.detail.value
+     })
+    }
+   
+ },
   openMaritalPicker() {
       this.setData({
         showMarital: true
diff --git a/Pages/yishi/sickform/index.wxml b/Pages/yishi/sickform/index.wxml
index 7b2a3ec..e2cbec0 100644
--- a/Pages/yishi/sickform/index.wxml
+++ b/Pages/yishi/sickform/index.wxml
@@ -3,7 +3,7 @@
   <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
   <view class="container"> 
     <view class="questionbox">
-    <view class="cellbox">
+    <view class="cellbox" wx:if="{{list1.length>0}}">
    <view class="basictitle">基本信息</view>
     <view class="cell" wx:if="{{filter.formatwenzhenList(list1,'height').ISHAS}}">
         <view class="cellrow">
@@ -11,7 +11,7 @@
             {{filter.formatwenzhenList(list1,'height').NUMBER}}、身高（CM）
           </view>
           <view class="iptbox">
-            <input type="text" value="{{user_info.name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请输入身高" placeholder-class="placeholder" class="ipt" disabled="{{!showBtn}}" />
+            <input type="text" value="{{personInfo.height}}"  	bindinput="handleIpt"  data-id="height" placeholder="请输入身高" placeholder-class="placeholder" class="ipt" disabled="{{!showBtn}}" />
 
           </view>
         </view>
@@ -22,7 +22,7 @@
             {{filter.formatwenzhenList(list1,'weight').NUMBER}}、体重（KG）
           </view>
           <view class="iptbox">
-            <input type="text" value="{{user_info.name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请请输入体重" placeholder-class="placeholder" class="ipt" disabled="{{!showBtn}}" />
+            <input type="text" value="{{personInfo.weight}}"  	bindinput="handleIpt"  data-id="weight" placeholder="请请输入体重" placeholder-class="placeholder" class="ipt" disabled="{{!showBtn}}" />
 
           </view>
         </view>
@@ -63,7 +63,7 @@
       </view>
      
    </view>
-   <view class="cellbox">
+   <view class="cellbox" wx:if="{{list2.length>0}}">
      <view class="basictitle">个人情况</view>
      <view class="sickHis">
         <view class="list">
diff --git a/Pages/yishi/sickform/index.wxss b/Pages/yishi/sickform/index.wxss
index 307e6e8..5d0aa61 100644
--- a/Pages/yishi/sickform/index.wxss
+++ b/Pages/yishi/sickform/index.wxss
@@ -143,4 +143,9 @@ margin-bottom: 20rpx;
 } */
 .van-radio{
   margin-bottom: 10rpx!important;
+}
+.van-radio__icon--disabled.van-radio__icon--checked{
+  color:#3cc7c0!important;
+  background-color: #fff;
+  border-color:#3cc7c0 ;
 }
\ No newline at end of file
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml
index 0da3547..5f130d3 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxml
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml
@@ -247,7 +247,10 @@
               <!-- <van-button bind:click="go" data-url="/Pages/yishi/chat_session/index" plain custom-style="width:200rpx;  border-radius: 10rpx;" color="#3CC7C0">会话列表</van-button> -->
             </view>
           </view>
-          <view class="content_4" wx:if="{{ item.inquiry_status == 3 }}">不接诊24小时后自动取消</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}}">不接诊524小时后自动取消</text>
+          </view>
         </view>  
       </van-tab>
       <van-tab title="公益问诊" dot="{{dot_3}}" name="3" wx:if="{{data_list_3.length > 0}}">
@@ -291,7 +294,10 @@
               <!-- <van-button bind:click="go" data-url="/Pages/yishi/chat_session/index" plain custom-style="width:200rpx;  border-radius: 10rpx;" color="#3CC7C0">会话列表</van-button> -->
             </view>
           </view>
-          <view class="content_4" wx:if="{{ item.inquiry_status == 3 }}">不接诊24小时后自动取消</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}}">不接诊524小时后自动取消</text>
+          </view>
         </view>  
       </van-tab>
       <van-tab title="问诊购药" dot="{{dot_4}}" name="4" wx:if="{{data_list_4.length > 0}}">
@@ -335,7 +341,10 @@
               <!-- <van-button bind:click="go" data-url="/Pages/yishi/chat_session/index" plain custom-style="width:200rpx;  border-radius: 10rpx;" color="#3CC7C0">会话列表</van-button> -->
             </view>
           </view>
-          <view class="content_4" wx:if="{{ item.inquiry_status == 3 }}">不接诊24小时后自动取消</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}}">不接诊524小时后自动取消</text>
+          </view>
         </view>  
       </van-tab>
       <van-tab title="报告解读" dot="{{dot_5}}" name="5" wx:if="{{data_list_5.length > 0}}">
diff --git a/Pages/yishi/write_sickform/index.js b/Pages/yishi/write_sickform/index.js
index c718c74..7d1c6a6 100644
--- a/Pages/yishi/write_sickform/index.js
+++ b/Pages/yishi/write_sickform/index.js
@@ -16,8 +16,8 @@ Page({
     obj:{
       height:'身高',
       weight:'体重',
-      nation_name:'民族',
-      job_name:'职业',
+      nation_id:'民族',
+      job_id:'职业',
       marital_status:'婚姻状态',
       allergy_history:'是否有过敏史？',
       family_history:'是否有家族病史？',
@@ -56,7 +56,7 @@ Page({
    let arr1=[];
    let arr2=[];
    result.forEach(item => {
-     if(item=="weight" || item=="height" || item=="marital_status" || item=="nation_name" || item=="job_name"){
+     if(item=="weight" || item=="height" || item=="marital_status" || item=="nation_id" || item=="job_id"){
       if(obj[item]){
         arr1.push(item);
        }
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js
index ba53d86..1aa8e6d 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.js
@@ -294,6 +294,8 @@ Component({
         isEmoji: false,
         text: '按住说话',
         focus: false,
+        message:'',
+        sendMessageBtn:false
       });
       this.setData({
         displayFlag: '',
@@ -443,6 +445,7 @@ Component({
       }
       this.setData({
         displayFlag: targetFlag,
+        isAudio:false
       });
       var myEventDetail = {} // detail对象，提供给事件监听函数
       myEventDetail.displayFlag = targetFlag;
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxml b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
index b3d7311..3f290dc 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
@@ -28,7 +28,7 @@
           <view class="TUI-sendMessage-btn" wx:if="{{ has_emoji }}">
               <image class="TUI-icon" bindtap="handleEmoji" src="../../../../static/assets/face-emoji.svg" />
           </view>
-           <view class="TUI-sendMessage-btn" wx:if="{{!isAudio || isEmoji}}">
+           <view class="TUI-sendMessage-btn" >
             <view wx:if="{{!sendMessageBtn}}" bindtap="handleExtensions" class="TUI-sendMessage-btn">
               <image  class="TUI-icon" src="{{static_host}}/applet/doctor/static/images/chat/tianjia.png" />
           </view>
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxss b/TUIKit/components/TUIChat/components/MessageInput/index.wxss
index cd6fefa..a175394 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxss
@@ -111,7 +111,7 @@
   border-radius: 10rpx;
   color: #fff;
   max-height: 200rpx;
-  padding: 20rpx 0;
+  padding: 13rpx 0;
   height: 50rpx;
 }
 .TUI-sendMessage-btn-input{