From 44350c10a200e51b43355382cdf21632fa503570 Mon Sep 17 00:00:00 2001
From: HAOMingMing <HAOMingMing@igandan.com>
Date: Mon, 6 Mar 2023 18:28:46 +0800
Subject: [PATCH 01/83] delete index btns

---
 Pages/index/index.wxml      | 4 ++--
 project.private.config.json | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Pages/index/index.wxml b/Pages/index/index.wxml
index 57ad1f6..9e9e106 100644
--- a/Pages/index/index.wxml
+++ b/Pages/index/index.wxml
@@ -29,9 +29,9 @@
       </t-image>
   </view>
 
-  <button bindtap="shenfang">审方提醒(长期)</button>
+  <!-- <button bindtap="shenfang">审方提醒(长期)</button>
   <button bindtap="yici">患者回复通知(一次)</button>
-  <button bindtap="check">获取订阅状态</button>
+  <button bindtap="check">获取订阅状态</button> -->
   
 </view>
 
diff --git a/project.private.config.json b/project.private.config.json
index 21b462b..b4e92c7 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -1,9 +1,8 @@
 {
-  "projectname": "test_miniprogram2",
+  "projectname": "miniprogram-doctor",
   "setting": {
     "compileHotReLoad": true,
-    "urlCheck": false,
-    "bigPackageSizeSupport": false
+    "urlCheck": false
   },
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "condition": {

From e7a66399ef31cb6dbc3e85d946685e2d2c5b2c14 Mon Sep 17 00:00:00 2001
From: HAOMingMing <HAOMingMing@igandan.com>
Date: Mon, 6 Mar 2023 18:43:48 +0800
Subject: [PATCH 02/83] no message

---
 project.private.config.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/project.private.config.json b/project.private.config.json
index 21b462b..f60c780 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -2,8 +2,7 @@
   "projectname": "test_miniprogram2",
   "setting": {
     "compileHotReLoad": true,
-    "urlCheck": false,
-    "bigPackageSizeSupport": false
+    "urlCheck": false
   },
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "condition": {

From d24afeaaad0f039a7476be3dce98bacaeea7c27f Mon Sep 17 00:00:00 2001
From: HAOMingMing <HAOMingMing@igandan.com>
Date: Mon, 6 Mar 2023 18:48:00 +0800
Subject: [PATCH 03/83] no message

---
 Pages/index/index.wxml | 37 -------------------------------------
 1 file changed, 37 deletions(-)
 delete mode 100644 Pages/index/index.wxml

diff --git a/Pages/index/index.wxml b/Pages/index/index.wxml
deleted file mode 100644
index 57ad1f6..0000000
--- a/Pages/index/index.wxml
+++ /dev/null
@@ -1,37 +0,0 @@
-<import src="index.skeleton.wxml"/>
-<template is="skeleton" wx:if="{{loading}}" />
-<view class="title">请选择您的身份</view>
-<view>
-    <view class="item" data-usertype="2" 
-        data-url="/Pages/yishi/index/index" bindtap="goCheck" >
-        <t-image 
-        class="item_img"  
-        src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yi.png" 
-        mode="heightFix" 
-        height="220rpx" 
-        aria-label="医师端" 
-        loading="slot"
-        >
-          <t-loading slot="loading" theme="circular" size="40rpx" loading />
-        </t-image>
-    </view>
-  <view class="item" 
-      data-url="/Pages/yaoshi/home/home" 
-      data-usertype="3" bindtap="goCheck">
-      <t-image 
-      class="item_img"  
-      src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yao.png" 
-      mode="heightFix" 
-      height="220rpx" 
-      aria-label="药师端" 
-      loading="slot">
-        <t-loading slot="loading" theme="circular" size="40rpx" loading />
-      </t-image>
-  </view>
-
-  <button bindtap="shenfang">审方提醒(长期)</button>
-  <button bindtap="yici">患者回复通知(一次)</button>
-  <button bindtap="check">获取订阅状态</button>
-  
-</view>
-

From 6f43b1c48fe2feeb49a4613119e4fba53b62c9fb Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Mon, 6 Mar 2023 18:55:28 +0800
Subject: [PATCH 04/83] a

---
 project.private.config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.private.config.json b/project.private.config.json
index 21b462b..967608d 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -1,5 +1,5 @@
 {
-  "projectname": "test_miniprogram2",
+  "projectname": "miniprogram-doctor",
   "setting": {
     "compileHotReLoad": true,
     "urlCheck": false,

From 959bfc61b1f0d6ce9861c7fa3b6c7e3e248de7a1 Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Tue, 14 Mar 2023 14:09:21 +0800
Subject: [PATCH 05/83] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yaoshi/home/home.js                     |   2 +-
 Pages/yaoshi/my/my.js                         |   2 +-
 Pages/yishi/appraise/index.js                 |   2 +-
 Pages/yishi/appraise/index.json               |   3 +-
 Pages/yishi/appraise/index.wxml               |   5 +-
 Pages/yishi/appraise/index.wxss               |   5 +-
 Pages/yishi/bankcard/index.wxml               |   2 +-
 Pages/yishi/case/index.js                     |  18 ++
 Pages/yishi/case/index.wxml                   |  61 ++--
 Pages/yishi/case/index.wxss                   |   4 +-
 Pages/yishi/cash/index.js                     |   2 -
 Pages/yishi/cash/index.wxml                   |   2 +-
 Pages/yishi/cash/index.wxss                   |   8 +-
 Pages/yishi/cashrecord/index.wxml             |   2 +-
 Pages/yishi/cashrecord/index.wxss             |   7 +-
 Pages/yishi/chat/index.js                     |  63 ++--
 Pages/yishi/chat/index.wxml                   |  10 +-
 Pages/yishi/chat_session/index.js             |  48 +---
 Pages/yishi/chufangsetup/index.js             |   2 +-
 Pages/yishi/chufangsetup/index.json           |   3 +-
 Pages/yishi/chufangsetup/index.wxml           |   3 +-
 Pages/yishi/chufangsetup/index.wxss           |   7 +-
 Pages/yishi/identity/index.js                 |  66 +----
 Pages/yishi/identity/index.wxss               |  22 +-
 Pages/yishi/index/index.js                    |  20 +-
 Pages/yishi/manual/index.wxml                 |   2 +-
 Pages/yishi/manual/index.wxss                 |  10 +-
 Pages/yishi/manual_detail/index.json          |   2 +-
 Pages/yishi/manual_detail/index.wxml          |   5 +-
 Pages/yishi/manual_detail/index.wxss          |   9 +-
 Pages/yishi/my/index.wxml                     |   4 +-
 Pages/yishi/myaccount/index.json              |   3 +-
 Pages/yishi/myaccount/index.wxml              |   3 +-
 Pages/yishi/myaccount/index.wxss              |   7 +-
 Pages/yishi/myinfo/index.js                   |   2 +-
 Pages/yishi/quickreply/index.js               |   9 +-
 Pages/yishi/quickreply/index.wxml             |   6 +-
 Pages/yishi/quickreply/index.wxss             |   5 +-
 Pages/yishi/service_notice/index.wxml         |   2 +-
 Pages/yishi/service_notice/index.wxss         |   8 +-
 Pages/yishi/system_notice/index.wxml          |   2 +-
 Pages/yishi/system_notice/index.wxss          |   8 +-
 Pages/yishi/wenzhen/wenzhen.js                | 163 ++++++++++-
 Pages/yishi/wenzhen/wenzhen.json              |   4 +-
 Pages/yishi/wenzhen/wenzhen.wxml              | 110 +++++--
 Pages/yishi/wenzhen/wenzhen.wxss              |   8 +-
 Pages/yishi/wenzhen_v2/wenzhen.js             | 270 ++++++++++++++++++
 Pages/yishi/wenzhen_v2/wenzhen.json           |  13 +
 Pages/yishi/wenzhen_v2/wenzhen.wxml           | 176 ++++++++++++
 Pages/yishi/wenzhen_v2/wenzhen.wxss           |  51 ++++
 Pages/yishi/zhiye_identity/index.wxml         |   1 +
 .../MessageElements/TextMessage/index.wxml    |   2 +-
 .../MessageElements/TextMessage/index.wxss    |  18 ++
 .../TUIChat/components/MessageInput/index.js  |  25 +-
 .../components/MessageInput/index.wxml        |  12 +-
 .../components/MessageInput/index.wxss        |  34 ++-
 .../TUIChat/components/MessageList/index.js   |   2 +
 TUIKit/components/TUIChat/index.js            |   4 +
 TUIKit/components/TUIChat/index.wxml          |   4 +-
 TUIKit/components/TUIConversation/index.js    |   1 +
 app.js                                        | 112 ++++++--
 app.json                                      |   7 +-
 commpents/myprofile/index.js                  | 144 ++++++++--
 commpents/myprofile/index.wxml                |  24 +-
 commpents/myprofile/index.wxss                |  51 +++-
 commpents/textarea-cell/index.js              |   6 +-
 commpents/textarea-cell/index.wxml            |   4 +
 commpents/textarea-cell/index.wxss            |  30 ++
 commpents/upload-cell/index.js                |   6 +-
 commpents/upload-cell/index.wxml              |   4 +-
 commpents/wenzhen_data/index.js               |  44 ++-
 commpents/wenzhen_data/index.json             |   3 +-
 commpents/wenzhen_data/index.wxml             |  24 +-
 commpents/wenzhen_data/index.wxss             |   5 +-
 custom-tab-bar/index.js                       |  50 +++-
 custom-tab-bar/index.wxml                     |  97 ++++++-
 utils/network/api.js                          |  30 ++
 utils/network/request.js                      |   4 +
 utils/util.js                                 |  40 +++
 79 files changed, 1601 insertions(+), 438 deletions(-)
 create mode 100644 Pages/yishi/wenzhen_v2/wenzhen.js
 create mode 100644 Pages/yishi/wenzhen_v2/wenzhen.json
 create mode 100644 Pages/yishi/wenzhen_v2/wenzhen.wxml
 create mode 100644 Pages/yishi/wenzhen_v2/wenzhen.wxss

diff --git a/Pages/yaoshi/home/home.js b/Pages/yaoshi/home/home.js
index c86eab1..30226a9 100644
--- a/Pages/yaoshi/home/home.js
+++ b/Pages/yaoshi/home/home.js
@@ -25,7 +25,7 @@ Page({
   onShow: function () {
     if (typeof this.getTabBar === 'function' && this.getTabBar()) {
       this.getTabBar().setData({
-        currentTab: 0  //数字是当前页面在tabbar的索引,如我的查询页索引是2，因此这边为2，同理首页就为0，审批页面为1
+        active: 0,  //数字是当前页面在tabbar的索引,如我的查询页索引是2，因此这边为2，同理首页就为0，审批页面为1
       })
     }
   }
diff --git a/Pages/yaoshi/my/my.js b/Pages/yaoshi/my/my.js
index 6284fd5..3d1a988 100644
--- a/Pages/yaoshi/my/my.js
+++ b/Pages/yaoshi/my/my.js
@@ -24,7 +24,7 @@ Page({
   onShow() {
     if (typeof this.getTabBar === 'function' && this.getTabBar()) {
       this.getTabBar().setData({
-        currentTab: 1  //数字是当前页面在tabbar的索引,如我的查询页索引是2，因此这边为2，同理首页就为0，审批页面为1
+        active: 1,  //数字是当前页面在tabbar的索引,如我的查询页索引是2，因此这边为2，同理首页就为0，审批页面为1
       })
     }
   }
diff --git a/Pages/yishi/appraise/index.js b/Pages/yishi/appraise/index.js
index 9e058c1..a52f6c5 100644
--- a/Pages/yishi/appraise/index.js
+++ b/Pages/yishi/appraise/index.js
@@ -51,7 +51,7 @@ Page({
   },
   onTabsChange(e){
     console.log(e);
-    let list_name = "appraise_list_" + this.data.evaluation_type;
+    let list_name = "appraise_list_" + e.detail.value;
     this.setData({
       evaluation_type: e.detail.value,
       current_page: 0,
diff --git a/Pages/yishi/appraise/index.json b/Pages/yishi/appraise/index.json
index d2a16c5..32a4098 100644
--- a/Pages/yishi/appraise/index.json
+++ b/Pages/yishi/appraise/index.json
@@ -4,7 +4,8 @@
     "te-nav-bar": "/commpents/te_navbar",
     "appraise-data": "/commpents/appraise_data/index",
     "t-tabs": "tdesign-miniprogram/tabs/tabs",
-    "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel"
+    "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel",
+    "van-empty": "@vant/weapp/empty/index"
   },
   "enablePullDownRefresh": true,
   "onReachBottomDistance": 100
diff --git a/Pages/yishi/appraise/index.wxml b/Pages/yishi/appraise/index.wxml
index 6a5cb41..80226b2 100644
--- a/Pages/yishi/appraise/index.wxml
+++ b/Pages/yishi/appraise/index.wxml
@@ -20,8 +20,9 @@
             date="{{item.created_at}}"
             wx:for="{{appraise_list_1}}"
           />
-
         </view>
+        <van-empty description="暂无数据" wx:if="{{appraise_list_1.length == 0}}" />
+
       </t-tab-panel>
       <t-tab-panel label="好评（{{good_quantity}}）" value="2">
         <view class="item_list">
@@ -33,6 +34,7 @@
             wx:for="{{appraise_list_2}}"
             />
         </view>
+        <van-empty description="暂无数据" wx:if="{{appraise_list_2.length == 0}}" />
       </t-tab-panel>
 
       <t-tab-panel label="中/差评（{{bad_quantity}}）" value="3">
@@ -45,6 +47,7 @@
             wx:for="{{appraise_list_3}}"
             />
         </view>
+        <van-empty description="暂无数据" wx:if="{{appraise_list_3.length == 0}}" />
       </t-tab-panel>
     </t-tabs>
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/appraise/index.wxss b/Pages/yishi/appraise/index.wxss
index 9316094..87cec88 100644
--- a/Pages/yishi/appraise/index.wxss
+++ b/Pages/yishi/appraise/index.wxss
@@ -1,7 +1,8 @@
+page{
+  background-color: #F6F6F6;
+}
 .container{
   width: 100vw;
-  height: 100vh;
-  background-color: #F6F6F6;
 }
 .t-tab-panel,.t-tabs__content {
   background-color: #F6F6F6;
diff --git a/Pages/yishi/bankcard/index.wxml b/Pages/yishi/bankcard/index.wxml
index bcde031..8931661 100644
--- a/Pages/yishi/bankcard/index.wxml
+++ b/Pages/yishi/bankcard/index.wxml
@@ -5,7 +5,7 @@
     <view class="help_title">
       <text wx:if="{{ !banklist_empty }}">我的银行卡</text>
     </view>
-    <view class="help_note">
+    <view class="help_note" data-url="/Pages/yishi/manual/index" bindtap="go">
       操作手册-银行卡<t-icon size="26rpx" style="display: inline-block;" name="chevron-right" size="48rpx" data-name="chevron-right" />
     </view>
   </view>
diff --git a/Pages/yishi/case/index.js b/Pages/yishi/case/index.js
index 49cc377..e73cfb4 100644
--- a/Pages/yishi/case/index.js
+++ b/Pages/yishi/case/index.js
@@ -1,3 +1,5 @@
+import { API } from './../../../utils/network/api'
+let api = new API()
 const app = getApp()
 Page({
   data: {
@@ -6,5 +8,21 @@ Page({
       title: '病历信息', //导航栏 中间的标题
     },
     height: app.globalData.height,
+    order_inquiry_id: "",
+    case_detail: {}
+  },
+  onLoad(options){
+    this.setData({
+      order_inquiry_id: options.order_inquiry_id
+    })
+  },
+  onShow(){
+    //获取患者问诊病例
+    api.getDoctorInquiryCase({order_inquiry_id: this.data.order_inquiry_id}).then(response => {
+      console.log(response);
+      this.setData({
+        case_detail: response.data
+      })
+    }).catch(errors => {console.error(errors);})
   }
 })
\ No newline at end of file
diff --git a/Pages/yishi/case/index.wxml b/Pages/yishi/case/index.wxml
index 187c8ff..b8790ce 100644
--- a/Pages/yishi/case/index.wxml
+++ b/Pages/yishi/case/index.wxml
@@ -1,56 +1,58 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
-<view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
+<view class="container">
   <view class="main_title">基础信息</view>
   <view class="data_box">
     <view class="data_box_top">
-      <view class="name">张三三</view>
-      <view class="sex">男｜30岁 </view>
+      <view class="name">{{case_detail.name}}</view>
+      <view class="sex">{{case_detail.sex==1?'男':case_detail.sex==2?'女':'未知'}}｜{{case_detail.age}}岁 </view>
     </view>
     <view class="info">
-      <view class="height info_item"><text class="info_title">身高：</text><text class="info_val">182cm</text></view>
-      <view class="weight info_item"><text class="info_title">体重：</text><text class="info_val">98KG</text></view>
-      <view class="minzu info_item"><text class="info_title">民族：</text><text class="info_val">汉族</text></view>
-      <view class="zhiye info_item"><text class="info_title">职业：</text><text class="info_val">学生</text></view>
-      <view class="hunyin info_item"><text class="info_title">婚姻：</text><text class="info_val">已婚</text></view>
+      <view class="height info_item"><text class="info_title">身高：</text><text class="info_val">{{case_detail.height}}cm</text></view>
+      <view class="weight info_item"><text class="info_title">体重：</text><text class="info_val">{{case_detail.weight}}KG</text></view>
+      <view class="minzu info_item"><text class="info_title">民族：</text><text class="info_val">{{case_detail.nation_name}}</text></view>
+      <view class="zhiye info_item"><text class="info_title">职业：</text><text class="info_val">{{case_detail.job_name}}</text></view>
+      <view class="hunyin info_item"><text class="info_title">婚姻：</text><text class="info_val">{{case_detail.nation_name}}</text></view>
     </view>
     <view class="disease_box">
       <view class="disease_box_item">
         <view class="title">所患疾病：</view>
-        <view class="conent">肝炎</view>
+        <view class="conent">{{case_detail.disease_class_name}}</view>
       </view>
       <view class="disease_box_item">
         <view class="title">确诊日期：</view>
-        <view class="conent">2022年8月29日 10:23</view>
+        <view class="conent">{{case_detail.diagnosis_date}}</view>
       </view>
-      <view class="disease_box_item">
+      <!-- <view class="disease_box_item">
         <view class="title">医生诊断：</view>
-        <view class="conent">过度劳累，失眠不足导致可以多</view>
-      </view>
+        <view class="conent">{{case_detail.disease_class_name}}</view>
+      </view> -->
       <view class="disease_box_item">
         <view class="title">确诊医院：</view>
-        <view class="conent">首都医科大学附属北京佑安医院</view>
+        <view class="conent">{{case_detail.diagnosis_hospital}}</view>
       </view>
       <view class="disease_box_item">
         <view class="title">正在服用的药品信息：</view>
-        <view class="conent">无/有</view>
+        <view class="conent">{{case_detail.disease_class_name}}</view>
       </view>
       <view class="disease_info">
         详细描述：阿托伐他汀钙片8片 （用法用量：常用的起始剂量为10mg每日一次
       </view>
       <view class="disease_box_item">
         <view class="title">病情描述：</view>
-        <view class="conent">过度劳累，失眠不足导致可以多休息几天，没有好转的话可以去医院看看先吧...</view>
+        <view class="conent">{{case_detail.disease_desc}}</view>
       </view>
       <view class="disease_box_item">
-        <view class="title">用药意向:：</view>
-        <view class="conent">阿托伐他汀钙片8片(用法用量:常用的起始剂量为10mg每日一次剂量调整时间为4周或更长。阿托伐他汀每日用量可在一天内的任何时间一次服用，并不受进餐影响。)</view>
+        <view class="title">用药意向：</view>
+        <view class="conent">
+          <text wx:for="{{case_detail.product}}">{{item}};</text>
+        </view>
       </view>
       <view class="disease_box_item">
         <view class="title">问诊本人复诊凭证(病例/处方单/检查报告/住院单可任选其一)：</view>
         <view class="conent">无</view>
       </view>
       <view class="img_box">
-        <t-image id="loading-img" shape="round" src="" width="72" height="72" />
+        <t-image id="loading-img" shape="round" src="{{item.url}}" width="72" height="72" wx:for="{{case_detail.diagnose_images}}"/>
       </view>
     </view>
   </view>
@@ -59,35 +61,38 @@
     <view class="disease_box">
       <view class="disease_box_item">
         <view class="title">过敏史：</view>
-        <view class="conent">无/有(显示内容)</view>
+        <view class="conent">{{case_detail.is_allergy_history==0?'否':case_detail.allergy_history}}</view>
       </view>
       <view class="disease_box_item">
         <view class="title">家族史：</view>
-        <view class="conent">无/有(显示内容)</view>
+        <view class="conent">{{case_detail.is_family_history==0?'否':case_detail.family_history}}</view>
       </view>
       <view class="disease_box_item">
         <view class="title">是否备孕、妊娠或者哺乳期：</view>
-        <view class="conent">不是/是(显示内容)</view>
+        <view class="conent">{{case_detail.is_pregnant==0?'否':case_detail.pregnant}}</view>
       </view>
       <view class="disease_box_item">
         <view class="title">饮酒史：</view>
-        <view class="conent">从不、偶尔、经常、每天、已解酒</view>
+        <view class="conent">{{case_detail.drink_wine_status==1?'从不':case_detail.drink_wine_status==2?'偶尔':case_detail.drink_wine_status==3?'经常':case_detail.drink_wine_status==4?'每天':case_detail.drink_wine_status==5?'已戒酒':'其他'}}</view>
       </view>
       <view class="disease_box_item">
         <view class="title">吸烟史：</view>
-        <view class="conent">从不、偶尔、经常、每天、已解酒</view>
+        <view class="conent">{{case_detail.smoke_status==1?'从不':case_detail.smoke_status==2?'偶尔':case_detail.smoke_status==3?'经常':case_detail.smoke_status==4?'每天':case_detail.smoke_status==5?'已戒烟':'其他'}}</view>
       </view>
       <view class="disease_box_item">
         <view class="title">手术史：</view>
-        <view class="conent">无/有(手术名称)</view>
+        <view class="conent">{{case_detail.is_operation==0?'否':case_detail.operation}}</view>
       </view>
       <view class="disease_box_item">
         <view class="title">接触化学物：</view>
-        <view class="conent">从不、偶尔、经常、每天</view>
+        <view class="conent">{{case_detail.chemical_compound_status==1?'从不':case_detail.chemical_compound_status==2?'偶尔':case_detail.chemical_compound_status==3?'经常':case_detail.chemical_compound_status==4?'每天':'其他'}}</view>
       </view>
-      <view class="disease_info">
-        详细描述:如经常染发、接触油漆或者甲醛等
+      <view class="disease_info" wx:if="{{case_detail.chemical_compound_status > 1}}">
+        详细描述:{{case_detail.chemical_compound_describe}}
       </view>
     </view>
   </view>
+  <view style="height: 50rpx;">
+    
+  </view>
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/case/index.wxss b/Pages/yishi/case/index.wxss
index 566f2a5..e04e7a1 100644
--- a/Pages/yishi/case/index.wxss
+++ b/Pages/yishi/case/index.wxss
@@ -1,6 +1,8 @@
+page{
+  background-color: #F6F6F6;
+}
 .container{
   width: 100vw;
-  background-color: #F6F6F6;
   padding: 0 4vw;
 }
 .main_title{
diff --git a/Pages/yishi/cash/index.js b/Pages/yishi/cash/index.js
index dcc5f22..467c097 100644
--- a/Pages/yishi/cash/index.js
+++ b/Pages/yishi/cash/index.js
@@ -18,8 +18,6 @@ Page({
     income_tax: "12"
   },
   onLoad(options){
-    
-
     //获取提现数据
     api.getDoctorWithdrawal().then(response => {
       console.log(response);
diff --git a/Pages/yishi/cash/index.wxml b/Pages/yishi/cash/index.wxml
index c920702..937eb7c 100644
--- a/Pages/yishi/cash/index.wxml
+++ b/Pages/yishi/cash/index.wxml
@@ -1,6 +1,6 @@
 <!-- 提现页面 -->
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
-<view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
+<view class="container">
   <view class="top">
     <view class="txt_title">结算银行卡</view>
     <view class="rule">提现规则</view>
diff --git a/Pages/yishi/cash/index.wxss b/Pages/yishi/cash/index.wxss
index cce587b..44d5df4 100644
--- a/Pages/yishi/cash/index.wxss
+++ b/Pages/yishi/cash/index.wxss
@@ -1,12 +1,14 @@
-.container{
+page{
   background-color: #F4F4F4;
+}
+.container{
+  margin-top: 20rpx;
   width: 100vw;
-  height: 100vh;
 }
 .top{
   display: flex;
   width: 92vw;
-  margin: 30rpx auto;
+  margin: 0 auto 20rpx auto;
   justify-content: space-between;
 }
 .txt_title{
diff --git a/Pages/yishi/cashrecord/index.wxml b/Pages/yishi/cashrecord/index.wxml
index 5e3234d..9e42712 100644
--- a/Pages/yishi/cashrecord/index.wxml
+++ b/Pages/yishi/cashrecord/index.wxml
@@ -1,6 +1,6 @@
 <!-- 提现记录 -->
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
-<view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
+<view class="container">
   <view class="top">
     <view class="top_txt">
         <view class="month">2022年<van-icon name="arrow-down" color="#fff" size="40rpx" /></view>
diff --git a/Pages/yishi/cashrecord/index.wxss b/Pages/yishi/cashrecord/index.wxss
index 1bd1276..6147fb6 100644
--- a/Pages/yishi/cashrecord/index.wxss
+++ b/Pages/yishi/cashrecord/index.wxss
@@ -1,11 +1,12 @@
-.container{
+page{
   background-color: #F4F4F4;
+}
+.container{
   width: 100vw;
-  height: 100vh;
 }
 .top{
   width: 92vw;
-  margin: 50rpx auto 0 auto;
+  margin: 20rpx auto 0 auto;
   background-color: #3CC7C0;
   height: 150rpx;
   border-radius: 20rpx;
diff --git a/Pages/yishi/chat/index.js b/Pages/yishi/chat/index.js
index 37dc475..c278fca 100644
--- a/Pages/yishi/chat/index.js
+++ b/Pages/yishi/chat/index.js
@@ -1,63 +1,38 @@
-// index.js
-import TIM from '../../../TUIKit/lib/tim-wx-sdk';
-import { genTestUserSig }  from '../../../TUIKit/debug/GenerateTestUserSig';
-import TIMUploadPlugin from '../../../TUIKit/lib/tim-upload-plugin';
 const app = getApp()
 Page({
   data: {
-    config: {
-        userID: "xiaobeibei", //User ID
-        SDKAPPID: 1400793692, // Your SDKAppID
-        SECRETKEY: "44d97cf741fc758be98cdad100015582b6ad1dc5a3b6676c1997a57279eecfa9", // Your secretKey
-        EXPIRETIME: 604800,
-    },
-    patient_account: "ayu",
+    patient_account: "10000",
     title: '患者姓名',
-    height: app.globalData.height, 
+    height: app.globalData.height,
+    order_inquiry_id: ""
   },
-  onLoad() {
+  onLoad(option) {
     console.log("chat onload");
-      let sign = genTestUserSig(this.data.config);
-      console.log("sign: ", sign);
-      const userSig = sign.userSig;
-      console.log("userSig: ", userSig);
-      wx.$TUIKit = TIM.create({
-        SDKAppID: this.data.config.SDKAPPID
-      });
-     
-      wx.$chat_SDKAppID = this.data.config.SDKAPPID;
-      wx.$chat_userID = this.data.config.userID;
-      wx.$chat_userSig = userSig;
-      wx.$TUIKitTIM = TIM;
-      wx.$TUIKit.registerPlugin({ 'tim-upload-plugin': TIMUploadPlugin });            
-      wx.$TUIKit.login({
-          userID: this.data.config.userID,
-          userSig
-      });
-      wx.$TUIKit.setLogLevel(3);//设置日志级别
-      wx.setStorage({
-          key: 'currentUserID',
-          data: [],
-      });
-      wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady,this);
+    let from_account = option.from_account;
+    let order_inquiry_id = option.order_inquiry_id;
+    this.setData({
+      patient_account: from_account,
+      order_inquiry_id: order_inquiry_id,
+    })
   },
   onUnload() {
     console.log("chat onUnload");
-      wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady,this);
   },
   onShow(){
     let _this = this;
     let interval = setInterval(() => {
+      console.log("chat init ,");
+      console.log("app.globalData.chat_sdk_ready: ", app.globalData.chat_sdk_ready);
       if(app.globalData.chat_sdk_ready){
-        _this.onSDKReady();
+        const TUIChat = _this.selectComponent('#TUIChat');
+        TUIChat.init();
+        wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, _this.$onMessageReceived, _this);
         clearInterval(interval);
       }
-    }, 100);
+    }, 1000);
   },
-  onSDKReady() {
-      console.error("chat js: onSDKReady")
-      const TUIChat = this.selectComponent('#TUIChat');
-      TUIChat.init();
-      app.globalData.chat_sdk_ready = true
+  $onMessageReceived(value) {
+    const message = value.data[0];
+    console.log("message from chat: ",message)
   }
 })
diff --git a/Pages/yishi/chat/index.wxml b/Pages/yishi/chat/index.wxml
index 43ee0d6..a441fac 100644
--- a/Pages/yishi/chat/index.wxml
+++ b/Pages/yishi/chat/index.wxml
@@ -1,7 +1,5 @@
-<!-- 一对一聊天 -->
+<!-- 一对一聊天  不带会话列表 -->
 <view>
-    <TUIChat id="TUIChat" currentConversationID="C2C{{patient_account}}"
-     unreadCount="9" hasCallKit="{{ true }}" bind:handleCall="handleCall"
-
-     ></TUIChat>
-</view>
\ No newline at end of file
+    <TUIChat id="TUIChat" currentConversationID="C2C{{patient_account}}" order_inquiry_id="{{order_inquiry_id}}"
+    hasCallKit="{{ true }}" bind:handleCall="handleCall"></TUIChat>
+</view>
diff --git a/Pages/yishi/chat_session/index.js b/Pages/yishi/chat_session/index.js
index 86de744..250c643 100644
--- a/Pages/yishi/chat_session/index.js
+++ b/Pages/yishi/chat_session/index.js
@@ -1,50 +1,24 @@
 // index.js
-import TIM from '../../../TUIKit/lib/tim-wx-sdk';
-import { genTestUserSig }  from '../../../TUIKit/debug/GenerateTestUserSig';
-import TIMUploadPlugin from '../../../TUIKit/lib/tim-upload-plugin';
 const app = getApp()
 Page({
   data: {
-    config: {
-        userID: "xiaobeibei", //User ID
-        SDKAPPID: 1400793692, // Your SDKAppID
-        SECRETKEY: "44d97cf741fc758be98cdad100015582b6ad1dc5a3b6676c1997a57279eecfa9", // Your secretKey
-        EXPIRETIME: 604800,
-    },
     title: '患者姓名',
     height: app.globalData.height, 
   },
   onLoad() {
-      let sign = genTestUserSig(this.data.config);
-      console.log("sign: ", sign);
-      const userSig = sign.userSig;
-      console.log("userSig: ", userSig);
-      wx.$TUIKit = TIM.create({
-        SDKAppID: this.data.config.SDKAPPID
-      });
-     
-      wx.$chat_SDKAppID = this.data.config.SDKAPPID;
-      wx.$chat_userID = this.data.config.userID;
-      wx.$chat_userSig = userSig;
-      wx.$TUIKitTIM = TIM;
-      wx.$TUIKit.registerPlugin({ 'tim-upload-plugin': TIMUploadPlugin });            
-      wx.$TUIKit.login({
-          userID: this.data.config.userID,
-          userSig
-      });
-      wx.$TUIKit.setLogLevel(3);//设置日志级别
-      wx.setStorage({
-          key: 'currentUserID',
-          data: [],
-      });
-      wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady,this);
+    console.log("onLoad chat_session")
   },
   onUnload() {
-      wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady,this);
+ 
   },
-  onSDKReady() {
-      console.warn("chat js: onSDKReady")
-      const TUIKit = this.selectComponent('#TUIKit');
-      TUIKit.init();
+  onShow(){
+    let _this = this;
+    let interval = setInterval(() => {
+      if(app.globalData.chat_sdk_ready){
+        const TUIKit = _this.selectComponent('#TUIKit');
+        TUIKit.init();
+        clearInterval(interval);
+      }
+    }, 100);
   }
 })
diff --git a/Pages/yishi/chufangsetup/index.js b/Pages/yishi/chufangsetup/index.js
index 9e70719..351f298 100644
--- a/Pages/yishi/chufangsetup/index.js
+++ b/Pages/yishi/chufangsetup/index.js
@@ -61,7 +61,7 @@ Page({
   getList(){
     //获取处方列表
     let params = {};
-    params.prescription_status = this.data.prescription_status;//处方审核状态（0:审核中 2:审核驳回）
+    params.pharmacist_audit_status = this.data.prescription_status;//处方审核状态（0:审核中 2:审核驳回）
     params.page = this.data.current_page + 1;
     api.getDoctorPrescription(params).then(response => {
       console.log(response);
diff --git a/Pages/yishi/chufangsetup/index.json b/Pages/yishi/chufangsetup/index.json
index 3bfe750..203ffc8 100644
--- a/Pages/yishi/chufangsetup/index.json
+++ b/Pages/yishi/chufangsetup/index.json
@@ -3,6 +3,7 @@
   "usingComponents": {
     "te-nav-bar": "/commpents/te_navbar",
     "t-tabs": "tdesign-miniprogram/tabs/tabs",
-    "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel"
+    "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel",
+    "van-empty": "@vant/weapp/empty/index"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/chufangsetup/index.wxml b/Pages/yishi/chufangsetup/index.wxml
index ff2804c..00f5fb3 100644
--- a/Pages/yishi/chufangsetup/index.wxml
+++ b/Pages/yishi/chufangsetup/index.wxml
@@ -1,5 +1,5 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
-<view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
+<view class="container">
   <view class="tabs">
     <t-tabs
       defaultValue="{{0}}"
@@ -52,6 +52,7 @@
             </view>
           </view>
           
+          <van-empty description="暂无数据" wx:if="{{chufang_list_0.length == 0}}" />
         </view>
       </t-tab-panel>
 
diff --git a/Pages/yishi/chufangsetup/index.wxss b/Pages/yishi/chufangsetup/index.wxss
index 1713f28..cb38bfb 100644
--- a/Pages/yishi/chufangsetup/index.wxss
+++ b/Pages/yishi/chufangsetup/index.wxss
@@ -1,7 +1,8 @@
+page{
+  background-color: #F6F6F6;
+}
 .container{
   width: 100vw;
-  height: 100vh;
-  background-color: #F6F6F6;
 }
 .t-tabs__content{
   background-color: #F6F6F6;
@@ -14,7 +15,7 @@
 }
 .item_list{
   width: 90vw;
-  margin: 0 auto;
+  margin: 20rpx auto;
 }
 .item{
   width: 100%;
diff --git a/Pages/yishi/identity/index.js b/Pages/yishi/identity/index.js
index 52443e9..18fe3d1 100644
--- a/Pages/yishi/identity/index.js
+++ b/Pages/yishi/identity/index.js
@@ -1,5 +1,4 @@
 // Pages/yishi/identity/index.js
-import Toast from '@vant/weapp/toast/toast';
 import { API } from './../../../utils/network/api'
 import { FileUtil } from './../../../utils/fileutil'
 
@@ -16,70 +15,7 @@ Page({
     stickyProps: {
       zIndex: 2,
     },
-    realname:"",
-    idcard:"",
-    avatar: "https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/default_photo.png",
-    is_avatar: false,
-    city_show: false,
-    keshi_show: false,
-    yiyuan_show: false,
-    zhuanchang_show: false,
-    zhiye_show: false,
-    zige_show: false,
-    zhicheng_show: false,
-    zhicheng_img_show: false,
-    next_btn_txt: "下一步",
-    next_btn_disabled: false,
-    office_phone: "",
-    keshi_note: "请选择科室",
-    keshi_columns: [],
-    select_keshi_id: "",
-    select_keshi_index: "",
-    custom_keshi: "",
-    zhicheng_note: "请选择职称",
-    zhicheng_columns: [
-      {
-        text: "执业医师",
-        value: 1
-      },
-      {
-        text: "主治医师",
-        value: 2
-      },
-      {
-        text: "副主任医师",
-        value: 3
-      },
-      {
-        text: "主任医师",
-        value: 4
-      }
-    ],
-    select_zhicheng_id: "",
-    select_zhicheng_index: "",
-    select_yiyuan_index: "",
-    yiyuan_columns: [],
-    zhuanchang_columns: [],
-    zhuanchang_selected_columns: [],
-    select_province_id: "",
-    select_city_id: "",
-    select_county_id: "",
-    city_note: "请选择城市",
-    yiyuan_note: "请选择医院",
-    select_yiyuan_id: "",
-    area_sub_titles: ["省份","市区","区县"],
-    areaList: [],
-    textarea_jianjie: "",
-    textarea_shanchang: "",
-    zhiye_file_list:[],
-    zige_file_list:[],
-    zhicheng_file_list:[],
-    doctorauthiden_data_ready: false,
-    basicdepartment_data_ready: false,
-    areaprovince_data_ready: false,
-    iden_auth_status: 0,
-    iden_auth_disabled: 0,
-    iden_auth_status_txt: "未认证",
+   
   },
   onLoad(){
     let _this = this;
diff --git a/Pages/yishi/identity/index.wxss b/Pages/yishi/identity/index.wxss
index 1569fc4..1a9fd97 100644
--- a/Pages/yishi/identity/index.wxss
+++ b/Pages/yishi/identity/index.wxss
@@ -1,27 +1,7 @@
 .required{
   color: #e34d59;
 }
-.photo{
-  position: relative;
-  padding: 32rpx;
-  display: flex;
-  justify-content: space-between;
-  font-size: 32rpx;
-  font-weight: 400;
-  align-items: center;
-}
-.photo::after {
-  position: absolute;
-  box-sizing: border-box;
-  content: ' ';
-  pointer-events: none;
-  right: 0;
-  left: 32rpx;
-  bottom: 0;
-  border-bottom: 1px solid var(--td-cell-border-color, var(--td-gray-color-3, #e7e7e7));
-  transform: scaleY(0.5);
-  left: 32rpx;
-}
+
 .title{
   font-size: 30rpx;
   color: #1C2023;
diff --git a/Pages/yishi/index/index.js b/Pages/yishi/index/index.js
index 8c40bef..f4b1b4d 100644
--- a/Pages/yishi/index/index.js
+++ b/Pages/yishi/index/index.js
@@ -110,6 +110,17 @@ Page({
   },
 
   onLoad(){
+    
+  },
+
+  onShow: function () {
+    if (typeof this.getTabBar === 'function' && this.getTabBar()) {
+      this.getTabBar().setData({
+        active: 0,  //数字是当前页面在tabbar的索引,如我的查询页索引是2，因此这边为2，同理首页就为0，审批页面为1
+      })
+    }
+    this.getMenuButtonBound();
+
     api.yiShiIndex().then(response => {
       console.log(response);
       let avatar = response.data.info.avatar;
@@ -180,15 +191,6 @@ Page({
     })
   },
 
-  onShow: function () {
-    if (typeof this.getTabBar === 'function' && this.getTabBar()) {
-      this.getTabBar().setData({
-        currentTab: 0  //数字是当前页面在tabbar的索引,如我的查询页索引是2，因此这边为2，同理首页就为0，审批页面为1
-      })
-    }
-    this.getMenuButtonBound();
-  },
-
   onADChange(){
     // console.log("onADChange");
   },
diff --git a/Pages/yishi/manual/index.wxml b/Pages/yishi/manual/index.wxml
index 1125938..a325693 100644
--- a/Pages/yishi/manual/index.wxml
+++ b/Pages/yishi/manual/index.wxml
@@ -1,6 +1,6 @@
 <!-- 操作手册 -->
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
-<view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
+<view class="container">
   <view class="item_list">
     <van-cell url="/Pages/yishi/manual_detail/index?manual_id={{item.manual_id}}" custom-style="border-radius: 20rpx;margin-bottom: 20rpx;" title="{{item.title}}" is-link wx:for="{{list}}" />
   </view>
diff --git a/Pages/yishi/manual/index.wxss b/Pages/yishi/manual/index.wxss
index fd15078..7787fa6 100644
--- a/Pages/yishi/manual/index.wxss
+++ b/Pages/yishi/manual/index.wxss
@@ -1,9 +1,11 @@
-.container{
-  width: 100vw;
-  height: 100vh;
+page{
   background-color: #F6F6F6;
 }
+.container{
+  margin-top: 20rpx;
+  width: 100vw;
+}
 .item_list{
   width: 92vw;
-  margin: 20rpx auto;
+  margin: 0 auto;
 }
\ No newline at end of file
diff --git a/Pages/yishi/manual_detail/index.json b/Pages/yishi/manual_detail/index.json
index c977da1..3b3b8cc 100644
--- a/Pages/yishi/manual_detail/index.json
+++ b/Pages/yishi/manual_detail/index.json
@@ -1,6 +1,6 @@
 {
   "component": true,
   "usingComponents": {
-    "m-nav-bar": "/commpents/mynavbar/index"
+    "te-nav-bar": "/commpents/te_navbar"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/manual_detail/index.wxml b/Pages/yishi/manual_detail/index.wxml
index 9bed7f9..2ee6c78 100644
--- a/Pages/yishi/manual_detail/index.wxml
+++ b/Pages/yishi/manual_detail/index.wxml
@@ -1,4 +1,5 @@
 <!-- 操作手册详情 -->
-<m-nav-bar navbarData="{{navbarData}}">
+<te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
+<view class="container">
   <rich-text nodes="{{html_content}}" space="nbsp"></rich-text>
-</m-nav-bar>
+</view>
diff --git a/Pages/yishi/manual_detail/index.wxss b/Pages/yishi/manual_detail/index.wxss
index d4dbc33..893b247 100644
--- a/Pages/yishi/manual_detail/index.wxss
+++ b/Pages/yishi/manual_detail/index.wxss
@@ -1 +1,8 @@
-/* Pages/yishi/manual_detail/index.wxss */
\ No newline at end of file
+/* Pages/yishi/manual_detail/index.wxss */
+page{
+  background-color: #F6F6F6;
+}
+.container{
+  width: 92vw;
+  margin: 20rpx auto;
+}
\ No newline at end of file
diff --git a/Pages/yishi/my/index.wxml b/Pages/yishi/my/index.wxml
index 6e85b58..1b373d3 100644
--- a/Pages/yishi/my/index.wxml
+++ b/Pages/yishi/my/index.wxml
@@ -9,8 +9,8 @@
     <view class="info">
       <view class="name">{{user_name}}</view>
       <view class="renzheng">
-        <view class="yishi">已医师认证></view>
-        <view class="zhiye">未多点执业认证></view>
+        <view class="yishi">{{iden_auth_status==1?'已医师认证':'未医师认证'}}></view>
+        <view class="zhiye">{{multi_point_status==1?'已多点执业认证':'未多点执业认证'}}></view>
       </view>
     </view>
     <view class="icon">
diff --git a/Pages/yishi/myaccount/index.json b/Pages/yishi/myaccount/index.json
index da4c903..dba4393 100644
--- a/Pages/yishi/myaccount/index.json
+++ b/Pages/yishi/myaccount/index.json
@@ -7,6 +7,7 @@
     "t-picker-item": "tdesign-miniprogram/picker-item/picker-item",
     "van-icon": "@vant/weapp/icon/index",
     "van-cell": "@vant/weapp/cell/index",
-    "van-cell-group": "@vant/weapp/cell-group/index"
+    "van-cell-group": "@vant/weapp/cell-group/index",
+    "van-empty": "@vant/weapp/empty/index"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/myaccount/index.wxml b/Pages/yishi/myaccount/index.wxml
index e5df2b9..065be45 100644
--- a/Pages/yishi/myaccount/index.wxml
+++ b/Pages/yishi/myaccount/index.wxml
@@ -1,5 +1,5 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
-<view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
+<view class="container">
   <view class="top">
     <view class="top_txt">
       <view style="font-size: 30rpx;">
@@ -20,6 +20,7 @@
   <view class="txt_title">账单</view>
   <view class="content">
     <van-cell bindtap="goDetail" data-url="/Pages/yishi/orderdetail/index" data-md="{{item.month}}-{{item.day}}" title-style="font-size: 30rpx;" title="{{item.month}}月{{item.day}}日" value="+{{item.total_amount}}元"  is-link wx:for="{{bill}}" />
+    <van-empty description="暂无账单" wx:if="{{ bill }}" />
   </view>
 
   <t-image custom-style="position: fixed; right: 0;bottom: 262rpx;" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/account_rule.png" mode="heightFix" height="84rpx" aria-label="role" />
diff --git a/Pages/yishi/myaccount/index.wxss b/Pages/yishi/myaccount/index.wxss
index 3360f3c..569ce52 100644
--- a/Pages/yishi/myaccount/index.wxss
+++ b/Pages/yishi/myaccount/index.wxss
@@ -1,11 +1,12 @@
-.container{
+page{
   background-color: #F4F4F4;
+}
+.container{
   width: 100vw;
-  height: 100vh;
 }
 .top{
   width: 92vw;
-  margin: 50rpx auto 0 auto;
+  margin: 20rpx auto 0 auto;
   background-color: #3CC7C0;
   height: 150rpx;
   border-radius: 20rpx;
diff --git a/Pages/yishi/myinfo/index.js b/Pages/yishi/myinfo/index.js
index b31a021..438aabc 100644
--- a/Pages/yishi/myinfo/index.js
+++ b/Pages/yishi/myinfo/index.js
@@ -14,7 +14,7 @@ Page({
     idcard_status: 0,
     iden_auth_status: 0,
     user_name: "",
-    brief_introduction: "点击编辑"
+    brief_introduction: "我的简介"
   },
   onLoad(){
     //获取医生我的账户数据
diff --git a/Pages/yishi/quickreply/index.js b/Pages/yishi/quickreply/index.js
index 98a2dcc..bec4627 100644
--- a/Pages/yishi/quickreply/index.js
+++ b/Pages/yishi/quickreply/index.js
@@ -17,7 +17,8 @@ Page({
     list_2: [],
     show: false,
     add_message: "",
-    current_words_type: 1
+    current_words_type: 1,
+    focus: true
   },
   onTabChange(e){
     this.setData({
@@ -68,5 +69,9 @@ Page({
       show: false,
     });
   },
-
+  onInput(){
+    this.setData({
+      focus: true
+    })
+  }
 })
\ No newline at end of file
diff --git a/Pages/yishi/quickreply/index.wxml b/Pages/yishi/quickreply/index.wxml
index 0cf49fe..7f39966 100644
--- a/Pages/yishi/quickreply/index.wxml
+++ b/Pages/yishi/quickreply/index.wxml
@@ -1,5 +1,5 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
-<view class="container"  style="height: calc(100vh - 96rpx - {{height}}px);">
+<view class="container">
 
   <t-tabs
       defaultValue="{{ current_words_type }}"
@@ -45,7 +45,11 @@
           type="textarea"
           placeholder="请输入文字"
           autosize
+          maxlength="500"
+          custom-style="height: 100%;"
           border="{{ false }}"
+          focus="{{focus}}"
+          bindtap="onInput"
         />
       </view>
     </view>
diff --git a/Pages/yishi/quickreply/index.wxss b/Pages/yishi/quickreply/index.wxss
index 9477ccb..08c4d3f 100644
--- a/Pages/yishi/quickreply/index.wxss
+++ b/Pages/yishi/quickreply/index.wxss
@@ -1,7 +1,8 @@
+page{
+  background-color: #F6F6F6;
+}
 .container{
   width: 100vw;
-  height: 100vh;
-  background-color: #F6F6F6;
 }
 .item_list{
   width: 92vw;
diff --git a/Pages/yishi/service_notice/index.wxml b/Pages/yishi/service_notice/index.wxml
index a811f45..bf81a96 100644
--- a/Pages/yishi/service_notice/index.wxml
+++ b/Pages/yishi/service_notice/index.wxml
@@ -1,5 +1,5 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
-<view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
+<view class="container">
   <view class="list">
 
     <view class="item">
diff --git a/Pages/yishi/service_notice/index.wxss b/Pages/yishi/service_notice/index.wxss
index 466c0e7..47c4885 100644
--- a/Pages/yishi/service_notice/index.wxss
+++ b/Pages/yishi/service_notice/index.wxss
@@ -1,11 +1,13 @@
-.container{
+page{
   background-color: #F4F4F4;
-  height: 100vh;
+}
+.container{
   width: 100vw;
+  padding-top: 20rpx;
 }
 .list{
   width: 92vw;
-  margin: 20rpx auto;
+  margin: 0 auto;
 }
 .item{
   display: flex;
diff --git a/Pages/yishi/system_notice/index.wxml b/Pages/yishi/system_notice/index.wxml
index 2702ba0..eabc117 100644
--- a/Pages/yishi/system_notice/index.wxml
+++ b/Pages/yishi/system_notice/index.wxml
@@ -1,5 +1,5 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
-<view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
+<view class="container">
   <view class="list">
 
     <view class="item" bindtap="go" data-url="/Pages/yishi/notice_deatil/index">
diff --git a/Pages/yishi/system_notice/index.wxss b/Pages/yishi/system_notice/index.wxss
index 4b11f53..4547adb 100644
--- a/Pages/yishi/system_notice/index.wxss
+++ b/Pages/yishi/system_notice/index.wxss
@@ -1,11 +1,13 @@
-.container{
+page{
   background-color: #F4F4F4;
-  height: 100vh;
+}
+.container{
   width: 100vw;
+  padding-top: 20rpx;
 }
 .list{
   width: 92vw;
-  margin: 20rpx auto;
+  margin: 0 auto;
 }
 .item{
   display: flex;
diff --git a/Pages/yishi/wenzhen/wenzhen.js b/Pages/yishi/wenzhen/wenzhen.js
index 9585f20..f53123c 100644
--- a/Pages/yishi/wenzhen/wenzhen.js
+++ b/Pages/yishi/wenzhen/wenzhen.js
@@ -1,3 +1,7 @@
+import { API } from './../../../utils/network/api'
+import { getTimeAgo } from './../../../utils/util'
+import TIM from '../../../TUIKit/lib/tim-wx-sdk';
+const api = new API()
 const app = getApp()
 Page({
   data: {
@@ -6,17 +10,46 @@ Page({
       title: '问诊消息', //导航栏 中间的标题
     },
     height: app.globalData.height, 
-    has_data: true
+    has_data: true,
+    data_list_1: [],
+    data_list_2: [],
+    data_list_3: [],
+    data_list_4: [],
+    data_list_5: [],
+    message_inquiry_type: 2,
+  },
+  onLoad() {
+    console.log("wenzhen onload");
+    
   },
-
   onShow: function () {
     if (typeof this.getTabBar === 'function' && this.getTabBar()) {
       this.getTabBar().setData({
         active: 1  //数字是当前页面在tabbar的索引,如我的查询页索引是2，因此这边为2，同理首页就为0，审批页面为1
       })
     }
-  },
 
+    let session_data_list_1 = wx.getStorageSync('session_data_list_1'); 
+    let session_data_list_2 = wx.getStorageSync('session_data_list_2');
+    let session_data_list_3 = wx.getStorageSync('session_data_list_3');
+    let session_data_list_4 = wx.getStorageSync('session_data_list_4');
+    if(!session_data_list_1) wx.setStorageSync('session_data_list_1', []);
+    if(!session_data_list_2) wx.setStorageSync('session_data_list_2', []);
+    if(!session_data_list_3) wx.setStorageSync('session_data_list_3', []);
+    if(!session_data_list_4) wx.setStorageSync('session_data_list_4', []);
+    this.setData({"data_list_1": session_data_list_1});
+    this.setData({"data_list_2": session_data_list_2});
+    this.setData({"data_list_3": session_data_list_3});
+    this.setData({"data_list_4": session_data_list_4});
+    if(session_data_list_1.length == 0) this.getDoctorInquiryMessage(1);
+    if(session_data_list_2.length == 0) this.getDoctorInquiryMessage(2);
+    if(session_data_list_3.length == 0) this.getDoctorInquiryMessage(3);
+    if(session_data_list_4.length == 0) this.getDoctorInquiryMessage(4);
+    
+    
+    wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
+
+  },
   go(e){
     wx.navigateTo({
       url: e.currentTarget.dataset.url,
@@ -34,5 +67,129 @@ Page({
         res.eventChannel.emit('acceptDataFromOpenerPage', { data: 'test' })
       }
     })
+  },
+
+  $onMessageReceived(value) {
+    const message = value.data[0];
+    console.log("message from wenzhen: ",message)
+    let cloudCustomData = JSON.parse(message.cloudCustomData);
+    let inquiry_type = cloudCustomData.inquiry_type;
+    let order_inquiry_id = cloudCustomData.order_inquiry_id;
+    let type = message.type;
+    let message_txt = "新消息";
+    console.log(type)
+    switch (type) {
+      case TIM.TYPES.MSG_TEXT:
+        console.log("文本消息");
+        message_txt = message.payload.text;
+        break;
+      case TIM.TYPES.MSG_IMAGE:
+        console.log("图片消息");
+        message_txt = "[图片]";
+        break;
+      case TIM.TYPES.MSG_AUDIO:
+        console.log("音频消息")
+        message_txt = "[语言]";
+        break;
+      case TIM.TYPES.MSG_VIDEO:
+        console.log("视频消息");
+        message_txt = "[视频]";
+        break;
+      case TIM.TYPES.MSG_FILE:
+        console.log("文件消息")
+        message_txt = "[文件]";
+        break;
+      case TIM.TYPES.MSG_CUSTOM:
+        console.log("自定义消息")
+        break;
+      case TIM.TYPES.MSG_MERGER:
+        console.log("合并消息")
+        break;
+      case TIM.TYPES.MSG_LOCATION:
+        console.log("位置消息")
+        message_txt = "[位置]";
+        break;
+      case TIM.TYPES.MSG_FACE:
+        console.log("表情消息")
+        message_txt = "[表情]";
+        break;
+      default:
+        break;
+    }
+    let list_name = "data_list_" + inquiry_type;
+    let _index = this.data[list_name].findIndex(item => {
+      return item.order_inquiry_id == order_inquiry_id;
+    })
+    
+    let new_list = [];
+    //没有当前会话
+    if(_index > -1){
+      let target = list_name + "[" + _index + "].last_message_content.Text";
+      let target_dot = list_name + "[" + _index + "].message_dot";
+      console.log("target: ",target);
+      this.setData({
+        [target]: message_txt,
+        [target_dot]: true
+      })
+      new_list.push(this.data[list_name][_index]);//先放入目标
+    }else{
+      let item = {};
+      item.inquiry_status = message.inquiry_status;
+      let txt = {};
+      txt.Text= message_txt;
+      item.last_message_content = txt;
+      item.message_send_time = message.message_send_time;
+      item.message_seq = message.message_seq;
+      item.message_type = message.message_type;
+      item.order_inquiry_id = message.order_inquiry_id;
+      item.patient_age = message.patient_age;
+      item.patient_name = message.patient_name;
+      item.patient_sex = message.patient_sex;
+      item.to_user_id = message.to_user_id;
+      item.message_dot = true;
+      new_list.push(item);
+    }
+    
+    //置顶
+    this.data[list_name].forEach((item, index) => {
+      if(index != _index){
+        new_list.push(item)
+      }
+    })
+
+    this.setData({
+      [list_name]: new_list
+    })
+
+    wx.setStorageSync('session_'+list_name, new_list);
+  },
+  getDoctorInquiryMessage(message_inquiry_type){
+    let list_name = "data_list_" + message_inquiry_type;
+    this.setData({
+      [list_name]: []
+    })
+    //获取医生问诊消息列表
+    api.getDoctorInquiryMessage({message_inquiry_type: message_inquiry_type}).then(response => {
+      console.log(response);
+      if(response.data){
+        console.log(list_name);
+        let data_list = this.data[list_name];
+        response.data.forEach((item) => {
+          item.message_send_time = getTimeAgo(item.message_send_time);
+          data_list.push(item);
+        })
+        this.setData({
+          [list_name]: data_list,
+        })
+        wx.setStorageSync('session_'+list_name, data_list);
+      }
+    }).catch(errors => {console.error(errors);})
+  },
+  onTabsChange(e){
+    console.log(e);
+    this.setData({
+      message_inquiry_type: e.detail.value,
+    })
+    this.getDoctorInquiryMessage(e.detail.value)
   }
 })
\ No newline at end of file
diff --git a/Pages/yishi/wenzhen/wenzhen.json b/Pages/yishi/wenzhen/wenzhen.json
index 53dfaec..b988581 100644
--- a/Pages/yishi/wenzhen/wenzhen.json
+++ b/Pages/yishi/wenzhen/wenzhen.json
@@ -6,6 +6,8 @@
     "t-image": "tdesign-miniprogram/image/image",
     "t-tabs": "tdesign-miniprogram/tabs/tabs",
     "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel",
-    "van-button": "@vant/weapp/button/index"
+    "t-badge": "tdesign-miniprogram/badge/badge",
+    "van-button": "@vant/weapp/button/index",
+    "van-empty": "@vant/weapp/empty/index"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/wenzhen/wenzhen.wxml b/Pages/yishi/wenzhen/wenzhen.wxml
index 1b273e4..c2f0b92 100644
--- a/Pages/yishi/wenzhen/wenzhen.wxml
+++ b/Pages/yishi/wenzhen/wenzhen.wxml
@@ -3,11 +3,16 @@
 <view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
   <view class="top">
       <view class="top_left" bindtap="go" data-url="/Pages/yishi/service_notice/index">
-        <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice.png" mode="heightFix" height="108rpx" aria-label="notice" />
+        <t-badge dot offset="{{ [1, 1] }}" class="wrapper">
+          <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice.png" mode="heightFix" height="108rpx" aria-label="notice" />
+        </t-badge>
+        
         服务通知
       </view>
       <view class="top_right" bindtap="go" data-url="/Pages/yishi/system_notice/index">
-        <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/system_notice.png" mode="heightFix" height="108rpx" aria-label="notice" />
+        <t-badge count="8" offset="{{ [1, 1] }}" class="wrapper">
+          <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/system_notice.png" mode="heightFix" height="108rpx" aria-label="notice" />
+        </t-badge>
         系统公告
       </view>
   </view>
@@ -20,21 +25,20 @@
 
   <view class="tabs" wx:if="{{ has_data }}" >
     <t-tabs
-      defaultValue="{{0}}"
+      defaultValue="{{ message_inquiry_type }}"
       sticky
       bind:change="onTabsChange"
-      bind:click="onTabsClick"
       bind:scroll="onStickyScroll"
       t-class="custom-tabs"
       theme="line"
       custom-style="font-size: 32rpx"
 
     >
-      <t-tab-panel label="快速问诊" value="0">
+      <t-tab-panel label="快速问诊" value="1">
         <wenzhen-data 
         name="李四"
         sex="女"
-        age="19"
+        age="199"
         desc="VVVVVVVV"
         status="0"
         status_text="待接诊"
@@ -44,26 +48,48 @@
         <wenzhen-data 
         name="李放四"
         sex="女"
-        age="199"
+        age="19"
         desc="VVVVVVVV"
         status="1"
         status_text="接诊中"
         />
+
+        <wenzhen-data 
+          name="{{ item.patient_name }}"
+          sex="{{ item.patient_sex==1?'男':'女' }}"
+          age="{{ item.patient_age }}"
+          date="{{ item.message_send_time }}"
+          desc="{{ item.last_message_content.Text }}"
+          status="{{ item.inquiry_status }}"
+          status_text="{{ 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?'已取消':'其他' }}"
+          note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
+          message_dot="{{item.message_dot}}"
+          wx:for="{{ data_list_1 }}"
+         />
+
+         <van-empty description="暂无数据" wx:if="{{data_list_1.length == 0}}" />
       </t-tab-panel>
 
-      <t-tab-panel label="问诊购药" value="1">
+      <t-tab-panel label="问诊购药" value="2">
+        <!-- 1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消 -->
         <wenzhen-data 
-        name="张三"
-        sex="男"
-        age="19"
-        desc="VVVVVVVV"
-        status="0"
-        status_text="待接诊"
-        note="xxx"
+          name="{{ item.patient_name }}"
+          sex="{{ item.patient_sex==1?'男':'女' }}"
+          age="{{ item.patient_age }}"
+          date="{{ item.message_send_time }}"
+          desc="{{ item.last_message_content.Text }}"
+          status="{{ item.inquiry_status }}"
+          status_text="{{ 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?'已取消':'其他' }}"
+          note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
+          message_dot="{{item.message_dot}}"
+          wx:for="{{ data_list_2 }}"
          />
+
+         <van-empty description="暂无数据" wx:if="{{data_list_2.length == 0}}" />
+
       </t-tab-panel>
-      <t-tab-panel label="在线问诊" value="2">
-        <wenzhen-data 
+      <t-tab-panel label="在线问诊" value="3">
+        <!-- <wenzhen-data 
         name="王五"
         sex="女"
         age="19"
@@ -71,9 +97,25 @@
         status="0"
         status_text="待接诊"
         note="xxx"
+         /> -->
+
+         <wenzhen-data 
+          name="{{ item.patient_name }}"
+          sex="{{ item.patient_sex==1?'男':'女' }}"
+          age="{{ item.patient_age }}"
+          date="{{ item.message_send_time }}"
+          desc="{{ item.last_message_content.Text }}"
+          status="{{ item.inquiry_status }}"
+          status_text="{{ 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?'已取消':'其他' }}"
+          note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
+          message_dot="{{item.message_dot}}"
+          wx:for="{{ data_list_3 }}"
          />
+
+         <van-empty description="暂无数据" wx:if="{{data_list_3.length == 0}}" />
+
       </t-tab-panel>
-      <t-tab-panel label="公益问诊" value="3">
+      <t-tab-panel label="公益问诊" value="4">
         <wenzhen-data 
         name="赵柳"
         sex="女"
@@ -83,8 +125,23 @@
         status_text="待接诊"
         note="xxx"
          />
+
+         <wenzhen-data 
+          name="{{ item.patient_name }}"
+          sex="{{ item.patient_sex==1?'男':'女' }}"
+          age="{{ item.patient_age }}"
+          date="{{ item.message_send_time }}"
+          desc="{{ item.last_message_content.Text }}"
+          status="{{ item.inquiry_status }}"
+          status_text="{{ 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?'已取消':'其他' }}"
+          note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
+          message_dot="{{item.message_dot}}"
+          wx:for="{{ data_list_4 }}"
+         />
+
+         <van-empty description="暂无数据" wx:if="{{data_list_4.length == 0}}" />
       </t-tab-panel>
-      <t-tab-panel label="问诊结束" value="4">
+      <t-tab-panel label="问诊结束" value="5">
         <wenzhen-data 
         name="谢广坤"
         sex="女"
@@ -94,6 +151,21 @@
         status_class="status_end"
         status_text="快速问诊"
         />
+
+        <wenzhen-data 
+          name="{{ item.patient_name }}"
+          sex="{{ item.patient_sex==1?'男':'女' }}"
+          age="{{ item.patient_age }}"
+          date="{{ item.message_send_time }}"
+          desc="{{ item.last_message_content.Text }}"
+          status="{{ item.inquiry_status }}"
+          status_text="{{ 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?'已取消':'其他' }}"
+          note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
+          message_dot="{{item.message_dot}}"
+          wx:for="{{ data_list_5 }}"
+         />
+
+         <van-empty description="暂无数据" wx:if="{{data_list_5.length == 0}}" />
       </t-tab-panel>
     </t-tabs>
   </view>
diff --git a/Pages/yishi/wenzhen/wenzhen.wxss b/Pages/yishi/wenzhen/wenzhen.wxss
index 95dbf9b..933153a 100644
--- a/Pages/yishi/wenzhen/wenzhen.wxss
+++ b/Pages/yishi/wenzhen/wenzhen.wxss
@@ -1,10 +1,12 @@
-.container{
+page{
   background-color: #F4F4F4;
+}
+.container{
   width: 100vw;
-  height: 100vh;
+  padding-top: 20rpx;
 }
 .top{
-  margin: 30rpx auto;
+  margin: 0 auto 30rpx auto;
   display: flex;
   padding: 20rpx 20rpx;
   background-color: rgb(255, 255, 255);
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
new file mode 100644
index 0000000..128b573
--- /dev/null
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -0,0 +1,270 @@
+import { API } from './../../../utils/network/api'
+import { getTimeAgo } from './../../../utils/util'
+// import TIM from '../../../TUIKit/lib/tim-wx-sdk';
+const api = new API()
+const app = getApp()
+Page({
+  data: {
+    navbarData: {
+      showCapsule: 0, //是否显示左上角图标   1表示显示    0表示不显示
+      title: '问诊消息', //导航栏 中间的标题
+    },
+    height: app.globalData.height, 
+    has_data: true,
+    data_list_1: [],
+    data_list_2: [],
+    data_list_3: [],
+    data_list_4: [],
+    data_list_5: [],
+    conversationList: [],
+    message_inquiry_type: 2,
+  },
+  onLoad() {
+    console.log("wenzhen onload");
+    
+  },
+  onShow: function () {
+    console.log("onShow from wenzhen V2")
+    if (typeof this.getTabBar === 'function' && this.getTabBar()) {
+      this.getTabBar().setData({
+        active: 1  //数字是当前页面在tabbar的索引,如我的查询页索引是2，因此这边为2，同理首页就为0，审批页面为1
+      })
+    }
+    this.getConversationList();
+    wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
+  },
+  getConversationList(){
+    wx.$TUIKit.getConversationList().then((imResponse) => {
+      console.log("imResponse.data.conversationList from wenzhen_v2: ", imResponse.data.conversationList);
+      this.setData({
+        conversationList: imResponse.data.conversationList,
+      });
+    }).then(() => {
+      console.log("开始查询订单状态")
+      this.formatStatus();
+    });
+  },
+  go(e){
+    wx.navigateTo({
+      url: e.currentTarget.dataset.url,
+      events: {
+        // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
+        acceptDataFromOpenedPage: function(data) {
+          console.log(data)
+        },
+        someEvent: function(data) {
+          console.log(data)
+        }
+      },
+      success: function(res) {
+        // 通过 eventChannel 向被打开页面传送数据
+        res.eventChannel.emit('acceptDataFromOpenerPage', { data: 'test' })
+      }
+    })
+  },
+  $onMessageReceived(value) {
+    const message = value.data[0];
+    console.log("message from wenzhen: ",message)
+    this.getConversationList();
+    // let cloudCustomData = JSON.parse(message.cloudCustomData);
+    // let inquiry_type = cloudCustomData.inquiry_type;
+    // let order_inquiry_id = cloudCustomData.order_inquiry_id;
+    // let type = message.type;
+    // let message_txt = "新消息";
+    // console.log(type)
+    // switch (type) {
+    //   case TIM.TYPES.MSG_TEXT:
+    //     console.log("文本消息");
+    //     message_txt = message.payload.text;
+    //     break;
+    //   case TIM.TYPES.MSG_IMAGE:
+    //     console.log("图片消息");
+    //     message_txt = "[图片]";
+    //     break;
+    //   case TIM.TYPES.MSG_AUDIO:
+    //     console.log("音频消息")
+    //     message_txt = "[语言]";
+    //     break;
+    //   case TIM.TYPES.MSG_VIDEO:
+    //     console.log("视频消息");
+    //     message_txt = "[视频]";
+    //     break;
+    //   case TIM.TYPES.MSG_FILE:
+    //     console.log("文件消息")
+    //     message_txt = "[文件]";
+    //     break;
+    //   case TIM.TYPES.MSG_CUSTOM:
+    //     console.log("自定义消息")
+    //     break;
+    //   case TIM.TYPES.MSG_MERGER:
+    //     console.log("合并消息")
+    //     break;
+    //   case TIM.TYPES.MSG_LOCATION:
+    //     console.log("位置消息")
+    //     message_txt = "[位置]";
+    //     break;
+    //   case TIM.TYPES.MSG_FACE:
+    //     console.log("表情消息")
+    //     message_txt = "[表情]";
+    //     break;
+    //   default:
+    //     break;
+    // }
+    // let list_name = "data_list_" + inquiry_type;
+    // let _index = this.data[list_name].findIndex(item => {
+    //   return item.order_inquiry_id == order_inquiry_id;
+    // })
+    
+    // let new_list = [];
+    // //没有当前会话
+    // if(_index > -1){
+    //   let target = list_name + "[" + _index + "].last_message_content.Text";
+    //   let target_dot = list_name + "[" + _index + "].message_dot";
+    //   console.log("target: ",target);
+    //   this.setData({
+    //     [target]: message_txt,
+    //     [target_dot]: true
+    //   })
+    //   new_list.push(this.data[list_name][_index]);//先放入目标
+    // }else{
+    //   let item = {};
+    //   item.inquiry_status = message.inquiry_status;
+    //   let txt = {};
+    //   txt.Text= message_txt;
+    //   item.last_message_content = txt;
+    //   item.message_send_time = message.message_send_time;
+    //   item.message_seq = message.message_seq;
+    //   item.message_type = message.message_type;
+    //   item.order_inquiry_id = message.order_inquiry_id;
+    //   item.patient_age = message.patient_age;
+    //   item.patient_name = message.patient_name;
+    //   item.patient_sex = message.patient_sex;
+    //   item.to_user_id = message.to_user_id;
+    //   item.message_dot = true;
+    //   new_list.push(item);
+    // }
+    
+    // //置顶
+    // this.data[list_name].forEach((item, index) => {
+    //   if(index != _index){
+    //     new_list.push(item)
+    //   }
+    // })
+
+    // this.setData({
+    //   [list_name]: new_list
+    // })
+
+  },
+  formatStatus(){
+    
+
+    let order_inquiry_id_list = [];
+
+    this.data.conversationList.forEach(item => {
+      let conversationID = item.conversationID;
+      if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过
+      let lastMessage = item.lastMessage;
+      if(!lastMessage) return;
+      let cloudCustomData = lastMessage.cloudCustomData;
+      if(!cloudCustomData) return;
+      let cloudCustomDataJson = JSON.parse(cloudCustomData);
+      let order_inquiry_id = cloudCustomDataJson.order_inquiry_id;
+      order_inquiry_id_list.push(order_inquiry_id);//准备去请求后端那订单状态
+    })
+
+    let conversationList =  this.data.conversationList;
+    //获取医生问诊消息用户属性
+    api.getDoctorInquiryMessageAttr({order_inquiry_ids: order_inquiry_id_list.join(",")}).then(response => {
+      if(response.data.length > 0){
+        let  new_conversationList = [];
+        conversationList.forEach(item => {
+          let conversationID = item.conversationID;
+          if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过
+          let lastMessage = item.lastMessage;
+          if(!lastMessage) return;
+          let cloudCustomData = lastMessage.cloudCustomData;
+          if(!cloudCustomData) return;
+          let cloudCustomDataJson = JSON.parse(item.lastMessage.cloudCustomData);
+          let order_inquiry_id = cloudCustomDataJson.order_inquiry_id;
+          let order = response.data.find(attr_item => {
+            return attr_item.order_inquiry_id == order_inquiry_id;
+          })
+          if(!order) return;
+
+          item.inquiry_status = order.inquiry_status;
+          item.patient_age = order.patient_age;
+          item.patient_name = order.patient_name;
+          item.patient_sex = order.patient_sex;
+
+          new_conversationList.push(item);
+        })
+
+        this.setData({
+          conversationList: new_conversationList
+        })
+
+      }
+    }).then(() => {
+      console.log("开始格式化formatConversationList")
+      this.formatConversationList();
+    }).catch(errors => {console.error(errors);})
+  },
+  formatConversationList(){
+    let session_list = [];
+    let session_data_list_1 = [];
+    let session_data_list_2 = [];
+    let session_data_list_3 = [];
+    let session_data_list_4 = [];
+    session_list.push(session_data_list_1);
+    session_list.push(session_data_list_2);
+    session_list.push(session_data_list_3);
+    session_list.push(session_data_list_4);
+
+    this.data.conversationList.forEach(item => {
+      let conversationID = item.conversationID;
+      if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过
+      let type = item.type;
+      let lastMessage = item.lastMessage;
+      let userProfile = item.userProfile;
+      if(!lastMessage) return;
+      let cloudCustomData = lastMessage.cloudCustomData;
+      if(!cloudCustomData) return;
+      let cloudCustomDataJson = JSON.parse(cloudCustomData);
+      let order_inquiry_id = cloudCustomDataJson.order_inquiry_id;
+      if(!order_inquiry_id) return;
+      let inquiry_type = cloudCustomDataJson.inquiry_type;
+      let session_item = {};
+      session_item.inquiry_status = item.inquiry_status;//订单状态暂无
+      let txt = {};
+      txt.Text= lastMessage.messageForShow;
+      session_item.last_message_content = txt;
+      session_item.message_send_time = getTimeAgo(lastMessage.lastTime);
+      session_item.message_type = type;
+      session_item.order_inquiry_id = order_inquiry_id;
+      session_item.patient_age = item.patient_age;//暂无
+      session_item.patient_name = userProfile.nick;
+      session_item.from_account = userProfile.userID;
+      session_item.patient_sex = item.patient_sex;//暂无
+      let unreadCount = item.unreadCount;
+      if(unreadCount > 0){
+        session_item.message_dot = true;
+      }else{
+        session_item.message_dot = false;
+      }
+      session_list[inquiry_type - 1].push(session_item);
+    })
+
+
+
+    this.setData({
+      data_list_1: session_data_list_1,
+      data_list_2: session_data_list_2,
+      data_list_3: session_data_list_3,
+      data_list_4: session_data_list_4,
+    })
+  },
+  onTabsChange(e){
+    console.log(e);
+  }
+})
\ No newline at end of file
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.json b/Pages/yishi/wenzhen_v2/wenzhen.json
new file mode 100644
index 0000000..b988581
--- /dev/null
+++ b/Pages/yishi/wenzhen_v2/wenzhen.json
@@ -0,0 +1,13 @@
+{
+  "component": true,
+  "usingComponents": {
+    "te-nav-bar": "/commpents/te_navbar",
+    "wenzhen-data": "/commpents/wenzhen_data/index",
+    "t-image": "tdesign-miniprogram/image/image",
+    "t-tabs": "tdesign-miniprogram/tabs/tabs",
+    "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel",
+    "t-badge": "tdesign-miniprogram/badge/badge",
+    "van-button": "@vant/weapp/button/index",
+    "van-empty": "@vant/weapp/empty/index"
+  }
+}
\ No newline at end of file
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml
new file mode 100644
index 0000000..38f81c4
--- /dev/null
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml
@@ -0,0 +1,176 @@
+<!-- 问诊页面 -->
+<te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
+<view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
+  <view class="top">
+      <view class="top_left" bindtap="go" data-url="/Pages/yishi/service_notice/index">
+        <t-badge dot offset="{{ [1, 1] }}" class="wrapper">
+          <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice.png" mode="heightFix" height="108rpx" aria-label="notice" />
+        </t-badge>
+        
+        服务通知
+      </view>
+      <view class="top_right" bindtap="go" data-url="/Pages/yishi/system_notice/index">
+        <t-badge count="8" offset="{{ [1, 1] }}" class="wrapper">
+          <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/system_notice.png" mode="heightFix" height="108rpx" aria-label="notice" />
+        </t-badge>
+        系统公告
+      </view>
+  </view>
+
+  <view class="empty" wx:if="{{ !has_data }}" >
+    <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/wnzhen_empty.png" mode="heightFix" height="108rpx" aria-label="empty" />
+    <view class="empty_note">您还未设置在线问诊价格</view>
+  </view>
+  <van-button color="#3CC7C0" custom-style="width: 92vw;margin: 0 auto;border-radius: 10rpx;" block wx:if="{{ !has_data }}">开通图文问诊</van-button>
+
+  <view class="tabs" wx:if="{{ has_data }}" >
+    <t-tabs
+      defaultValue="{{ message_inquiry_type }}"
+      sticky
+      bind:change="onTabsChange"
+      bind:scroll="onStickyScroll"
+      t-class="custom-tabs"
+      theme="line"
+      custom-style="font-size: 32rpx"
+
+    >
+      <t-tab-panel label="快速问诊" value="1">
+        <wenzhen-data 
+        name="李四"
+        sex="女"
+        age="19"
+        desc="VVVVVVVV"
+        status="0"
+        status_text="待接诊"
+        note="xxx"
+         />
+
+        <wenzhen-data 
+        name="李放四"
+        sex="女"
+        age="199"
+        desc="VVVVVVVV"
+        status="1"
+        status_text="接诊中"
+        />
+
+        <wenzhen-data 
+          name="{{ item.patient_name }}"
+          sex="{{ item.patient_sex==1?'男':'女' }}"
+          age="{{ item.patient_age }}"
+          date="{{ item.message_send_time }}"
+          desc="{{ item.last_message_content.Text }}"
+          status="{{ item.inquiry_status }}"
+          status_text="{{ 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?'已取消':'其他' }}"
+          note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
+          message_dot="{{item.message_dot}}"
+          wx:for="{{ data_list_1 }}"
+         />
+
+         <van-empty description="暂无数据" wx:if="{{data_list_1.length == 0}}" />
+      </t-tab-panel>
+
+      <t-tab-panel label="问诊购药" value="2">
+        <!-- 1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消 -->
+        <wenzhen-data 
+          name="{{ item.patient_name }}"
+          sex="{{ item.patient_sex==1?'男':'女' }}"
+          age="{{ item.patient_age }}"
+          date="{{ item.message_send_time }}"
+          desc="{{ item.last_message_content.Text }}"
+          status="{{ item.inquiry_status }}"
+          order_inquiry_id="{{ item.order_inquiry_id }}"
+          status_text="{{ 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?'已取消':'其他' }}"
+          note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
+          message_dot="{{item.message_dot}}"
+          from_account="{{item.from_account}}"
+          wx:for="{{ data_list_2 }}"
+         />
+
+         <van-empty description="暂无数据" wx:if="{{data_list_2.length == 0}}" />
+
+      </t-tab-panel>
+      <t-tab-panel label="在线问诊" value="3">
+        <!-- <wenzhen-data 
+        name="王五"
+        sex="女"
+        age="19"
+        desc="VVVVVVVV"
+        status="0"
+        status_text="待接诊"
+        note="xxx"
+         /> -->
+
+         <wenzhen-data 
+          name="{{ item.patient_name }}"
+          sex="{{ item.patient_sex==1?'男':'女' }}"
+          age="{{ item.patient_age }}"
+          date="{{ item.message_send_time }}"
+          desc="{{ item.last_message_content.Text }}"
+          status="{{ item.inquiry_status }}"
+          status_text="{{ 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?'已取消':'其他' }}"
+          note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
+          message_dot="{{item.message_dot}}"
+          wx:for="{{ data_list_3 }}"
+         />
+
+         <van-empty description="暂无数据" wx:if="{{data_list_3.length == 0}}" />
+
+      </t-tab-panel>
+      <t-tab-panel label="公益问诊" value="4">
+        <wenzhen-data 
+        name="赵柳"
+        sex="女"
+        age="19"
+        desc="VVVVVVVV"
+        status="0"
+        status_text="待接诊"
+        note="xxx"
+         />
+
+         <wenzhen-data 
+          name="{{ item.patient_name }}"
+          sex="{{ item.patient_sex==1?'男':'女' }}"
+          age="{{ item.patient_age }}"
+          date="{{ item.message_send_time }}"
+          desc="{{ item.last_message_content.Text }}"
+          status="{{ item.inquiry_status }}"
+          status_text="{{ 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?'已取消':'其他' }}"
+          note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
+          message_dot="{{item.message_dot}}"
+          wx:for="{{ data_list_4 }}"
+         />
+
+         <van-empty description="暂无数据" wx:if="{{data_list_4.length == 0}}" />
+      </t-tab-panel>
+      <t-tab-panel label="问诊结束" value="5">
+        <wenzhen-data 
+        name="谢广坤"
+        sex="女"
+        age="199"
+        desc="VVVVVVVV"
+        status="2"
+        status_class="status_end"
+        status_text="快速问诊"
+        />
+
+        <wenzhen-data 
+          name="{{ item.patient_name }}"
+          sex="{{ item.patient_sex==1?'男':'女' }}"
+          age="{{ item.patient_age }}"
+          date="{{ item.message_send_time }}"
+          desc="{{ item.last_message_content.Text }}"
+          status="{{ item.inquiry_status }}"
+          status_text="{{ 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?'已取消':'其他' }}"
+          note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
+          message_dot="{{item.message_dot}}"
+          wx:for="{{ data_list_5 }}"
+         />
+
+         <van-empty description="暂无数据" wx:if="{{data_list_5.length == 0}}" />
+      </t-tab-panel>
+    </t-tabs>
+  </view>
+
+  <view style="height: 200rpx;"></view>
+</view>
\ No newline at end of file
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxss b/Pages/yishi/wenzhen_v2/wenzhen.wxss
new file mode 100644
index 0000000..d418242
--- /dev/null
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxss
@@ -0,0 +1,51 @@
+page{
+  background-color: #F4F4F4;
+}
+.container{
+  width: 100vw;
+  padding-top: 20rpx;
+}
+.top{
+  margin: 0 auto 30rpx auto;
+  display: flex;
+  padding: 20rpx 20rpx;
+  background-color: rgb(255, 255, 255);
+}
+.top_left, .top_right{
+  flex: 1;
+  text-align: center;
+  display: flex;
+  flex-direction: column;
+  color: #666666;
+  font-size: 20rpx;
+}
+.top_left{
+  border-right: 1px solid #F4F4F4;
+}
+.t-tab-panel,.t-tabs__content {
+  background-color: #F4F4F4 !important;
+}
+.t-tabs__item--active{
+  color: #49B9AD !important;
+  font-size: 32rpx !important;
+}
+.t-tabs__item-inner--line{
+  font-size: 28rpx !important;
+}
+.t-tabs__track{
+  background-color: var(--td-tab-track-color, var(--td-primary-color, #49B9AD)) !important;
+}
+.empty{
+  width: 92vw;
+  margin: 0 auto;
+  height: 500rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+}
+.empty_note{
+  font-size: 24rpx;
+  color: #999999;
+  margin-top: 30rpx;
+}
\ No newline at end of file
diff --git a/Pages/yishi/zhiye_identity/index.wxml b/Pages/yishi/zhiye_identity/index.wxml
index ad5240b..3d986e1 100644
--- a/Pages/yishi/zhiye_identity/index.wxml
+++ b/Pages/yishi/zhiye_identity/index.wxml
@@ -32,6 +32,7 @@
   
   <van-cell-group border="{{ false }}">
     <van-cell 
+    url="/Pages/yishi/manual/index"
     title="多点执业认证流程" 
     border="{{ false }}"
     value='查看操作手册' 
diff --git a/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxml b/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxml
index 1365c7e..8ef8cb9 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxml
@@ -1,4 +1,4 @@
-<view class="text-message {{isMine?'my-text':''}}" >
+<view class="text-message {{isMine?'my-text':'your-text'}}" >
   <view class="message-body-span" wx:for="{{renderDom}}" wx:key="index">
     <span class="message-body-span-text" wx:if="{{item.name === 'span'}}">{{item.text}}</span>
     <image wx:if="{{item.name === 'img'}}" class="emoji-icon" src="{{item.src}}" />
diff --git a/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxss b/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxss
index 5809238..3bb26d7 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxss
@@ -29,6 +29,24 @@
   border: 1rpx solid #1ACAD3;
   border-style: none none solid solid
 }
+.your-text {
+  position: relative;
+  border-radius: 10px 10px 10px 10px;
+  background: rgb(255, 255, 255);
+  border: 1rpx solid #D8D8D8;
+}
+.your-text::after{
+  content:'';
+  position: absolute;
+  top: 45rpx;
+  left: 0;
+  transform: translate(-50%,-50%) rotate(45deg);
+  width: 16rpx;
+  height: 16rpx;
+  background: rgb(255, 255, 255);
+  border: 1rpx solid #D8D8D8;
+  border-style: none none solid solid
+}
 .message-body-span {
   display: flex;
   justify-content: center;
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js
index e3ce880..6c50b87 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.js
@@ -16,6 +16,10 @@ Component({
         });
       },
     },
+    order_inquiry_id: {
+      type: String,
+      value: {},
+    },
     hasCallKit: {
       type: Boolean,
       value: false,
@@ -331,7 +335,7 @@ Component({
           });
           break;
         case '10'://查看完整病历
-          app.go("/Pages/yishi/case/index")
+          app.go("/Pages/yishi/case/index?order_inquiry_id="+this.data.order_inquiry_id)
           break;
         case '11'://在线开方
           app.go("/Pages/yishi/onlinechufang/index")
@@ -483,16 +487,16 @@ Component({
       const text = flag ? msg : this.data.message;
       const { FEAT_NATIVE_CODE } = constant;
       const message = wx.$TUIKit.createTextMessage({
-        to,
+        to, 
         conversationType: this.data.conversation.type,
         payload: {
           text,
         },
-        cloudCustomData: JSON.stringify({ messageFeature:
-        {
-          needTyping: FEAT_NATIVE_CODE.FEAT_TYPING,
-          version: FEAT_NATIVE_CODE.NATIVE_VERSION,
-        },
+        cloudCustomData: JSON.stringify({
+          order_inquiry_id: "AA",
+          inquiry_type: "BB",
+          message_type: 0,
+          is_system: 0
         }),
       });
       this.setData({
@@ -519,6 +523,7 @@ Component({
 
     // 发送正在输入状态消息
     sendTypingStatusMessage() {
+
       const { BUSINESS_ID_TEXT, FEAT_NATIVE_CODE } = constant;
       // 创建正在输入状态消息, "typingStatus":1,正在输入中1,  输入结束0, "version": 1 兼容老版本,userAction:0, // 14表示正在输入,actionParam:"EIMAMSG_InputStatus_Ing" //"EIMAMSG_InputStatus_Ing" 表示正在输入, "EIMAMSG_InputStatus_End" 表示输入结束
       const typingMessage = wx.$TUIKit.createCustomMessage({
@@ -668,9 +673,9 @@ Component({
     },
     // 发送正在输入消息
     $sendTypingMessage(message) {
-      wx.$TUIKit.sendMessage(message, {
-        onlineUserOnly: true,
-      });
+      // wx.$TUIKit.sendMessage(message, {
+      //   onlineUserOnly: true,
+      // });
     },
 
     $sendTIMMessage(message) {
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxml b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
index 0d03825..7ecbbb1 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
@@ -25,12 +25,12 @@
           <view class="TUI-sendMessage-btn" wx:if="{{ has_emoji }}">
               <image class="TUI-icon" bindtap="handleEmoji" src="../../../../static/assets/face-emoji.svg" />
           </view>
-            <view wx:if="{{!sendMessageBtn}}" bindtap="handleExtensions" class="TUI-sendMessage-btn">
-                <image class="TUI-icon" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/chat/tianjia.png" />
-            </view>
-            <view wx:else class="TUI-sendMessage-btn" bindtap="sendTextMessage">
-                发送
-            </view>
+          <view wx:if="{{!sendMessageBtn}}" bindtap="handleExtensions" class="TUI-sendMessage-btn">
+              <image class="TUI-icon" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/chat/tianjia.png" />
+          </view>
+          <view wx:else class="TUI-sendMessage-btn TUI-sendMessage-btn-input" bindtap="sendTextMessage">
+              发送
+          </view>
         </view>
     </view>
     <view wx:if="{{displayFlag === 'emoji'}}" class="TUI-Emoji-area">
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxss b/TUIKit/components/TUIChat/components/MessageInput/index.wxss
index ea5471c..16393b2 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxss
@@ -6,9 +6,9 @@
     display: flex;
     padding-bottom: 16rpx;
     background-color: #fff;
-    width: calc(100vw - 38rpx);
+    width: 95vw;
     overflow: scroll;
-    padding-left: 38rpx;
+    margin: 0 auto;
 }
 .TUI-commom-function {
     background-color: blueviolet;
@@ -37,25 +37,27 @@
     margin-left: 48rpx;
 }
 .TUI-message-input-functions {
-    display: flex;
+  flex: 2;
+  display: flex;
+  justify-content: center;
 }
 .TUI-message-input-main {
-    height: 30px;
+    min-height: 78rpx;
     background-color: #F1F1F1;
-    flex: 1;
+    flex: 9;
     margin: 0 10rpx;
     padding: 0 5rpx;
-    border-radius: 5rpx;
+    border-radius: 10rpx;
     display: flex;
     align-items: center;
 }
 .TUI-message-input-main-focus {
-    height: auto;
+    min-height: 78rpx;
     background-color: #F1F1F1;
-    flex: 1;
+    flex: 9;
     margin: 0 10rpx;
     padding: 0 5rpx;
-    border-radius: 5rpx;
+    border-radius: 10rpx;
     display: flex;
     align-items: center;   
 }
@@ -66,6 +68,7 @@
     /* 最多显示10行 */
     line-height: 30rpx;
     overflow: scroll;
+    padding: 20rpx 20rpx;
 }
 .TUI-icon {
     width: 56rpx;
@@ -96,9 +99,16 @@
 }
 
 .TUI-sendMessage-btn {
-    display: flex;
-    align-items: center;
-    margin: 0 10rpx;
+  display: flex;
+  align-items: center;
+  width: 90%;
+  text-align: center;
+  justify-content: center;
+  border-radius: 10rpx;
+  color: #fff;
+}
+.TUI-sendMessage-btn-input{
+  background-color: #3CC7C0;
 }
 
 .TUI-Emoji-area {
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index 0c7a134..11834d0 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -208,6 +208,8 @@ Component({
       wx.$TUIKit.setMessageRead({ conversationID: this.data.conversation.conversationID }).then(() => {
         logger.log('| MessageList | setMessageRead | ok');
       });
+      console.log('| MessageList | setMessageRead | ok');
+      console.log('message cloudCustomData：', message.cloudCustomData);
       const { BUSINESS_ID_TEXT, MESSAGE_TYPE_TEXT } = constant;
       this.messageTimeForShow(message);
       this.setData({
diff --git a/TUIKit/components/TUIChat/index.js b/TUIKit/components/TUIChat/index.js
index 3cd4945..aedd762 100644
--- a/TUIKit/components/TUIChat/index.js
+++ b/TUIKit/components/TUIChat/index.js
@@ -31,6 +31,10 @@ Component({
         });
       },
     },
+    order_inquiry_id: {
+      type: String,
+      value: ''
+    },
     unreadCount: {
       type: Number,
       value: '',
diff --git a/TUIKit/components/TUIChat/index.wxml b/TUIKit/components/TUIChat/index.wxml
index e558cea..f28a852 100644
--- a/TUIKit/components/TUIChat/index.wxml
+++ b/TUIKit/components/TUIChat/index.wxml
@@ -2,7 +2,7 @@
 <view class="container">
    <view class="tui-navigatorbar">
      <image class="tui-navigatorbar-back" bindtap="goBack" src="../../static/assets/ic_back_white.svg" />
-     <view class="conversation-title">{{conversationName}}-患者姓名</view>
+     <view class="conversation-title">{{conversationName}}</view>
     </view>
   <view   class="list-box {{ showTips && 'list-box-notips'}} || {{ showGroupTips && 'list-box-group'}}  || {{ showAll && 'list-box-group-notips'}}  ">
     <view wx:if="{{showTips}}" class="safetytips-box">
@@ -20,7 +20,7 @@
   </view>
   <view class="input-area">
   <view class="message-input" style="{{viewData.style}}" wx:if="{{showChat}}">
-    <MessageInput id="MessageInput" conversation="{{conversation}}" hasCallKit="{{hasCallKit}}" bind:sendMessage="sendMessage" bind:downKeysBoards="downKeysBoards" bind:pullKeysBoards="pullKeysBoards" bind:showMessageErrorImage="showMessageErrorImage" 
+    <MessageInput id="MessageInput" 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>
diff --git a/TUIKit/components/TUIConversation/index.js b/TUIKit/components/TUIConversation/index.js
index c8584b4..e3f7d26 100644
--- a/TUIKit/components/TUIConversation/index.js
+++ b/TUIKit/components/TUIConversation/index.js
@@ -116,6 +116,7 @@ Component({
     },
     getConversationList() {
       wx.$TUIKit.getConversationList().then((imResponse) => {
+        console.log("imResponse.data.conversationList: ", imResponse.data.conversationList);
         this.setData({
           conversationList: imResponse.data.conversationList,
         });
diff --git a/app.js b/app.js
index 4300824..34010e1 100644
--- a/app.js
+++ b/app.js
@@ -1,4 +1,7 @@
 import Aegis from './TUIKit/lib/aegis';
+import TIM from './TUIKit/lib/tim-wx-sdk';
+import { genTestUserSig }  from './TUIKit/debug/GenerateTestUserSig';
+import TIMUploadPlugin from './TUIKit/lib/tim-upload-plugin';
 App({
   onLaunch: function (options) {
     // 判断是否由分享进入小程序
@@ -17,29 +20,88 @@ App({
       }
     })
 
-    // console.log("download fonts from oss ");
-    // let loadStatus = false;
-    // if (!loadStatus) {
-    //   wx.loadFontFace({
-    //     global: true,
-    //     family: 'AlibabaPuHuiTi',
-    //     source: 'url("https://oss.igandan.com/app/fonts/AlibabaPuHuiTi/STXINGKA.TTF")',
-    //     // source: 'url("https://oss.igandan.com/app/fonts/AlibabaPuHuiTi/AlibabaPuHuiTi-2-65-Medium.ttf")',
-    //     success() {
-    //         loadStatus = true;
-    //         console.log("download fonts from oss success");
-    //     },
-    //     fail(){
-    //       console.log("download fonts from oss error");
-    //     },
-    //     complete(){
-    //       console.log("download fonts from oss complete");
-    //     }
-    //   });
-    // }
-    this.aegisInit()
+    console.log("download fonts from oss ");
+    let loadStatus = false;
+    if (!loadStatus) {
+      wx.loadFontFace({
+        global: true,
+        family: 'AlibabaPuHuiTi',
+        // source: 'url("https://oss.igandan.com/app/fonts/AlibabaPuHuiTi/STXINGKA.TTF")',
+        source: 'url("https://docwebsite.oss-cn-beijing.aliyuncs.com/app/fonts/AlibabaPuHuiTi/AlibabaPuHuiTi-2-65-Medium/AlibabaPuHuiTi-2-65-Medium.ttf")',
+        success() {
+            loadStatus = true;
+            console.log("download fonts from oss success");
+        },
+        fail(){
+          console.log("download fonts from oss error");
+        },
+        complete(){
+          console.log("download fonts from oss complete");
+        }
+      });
+    }
 
+    this.aegisInit()
     console.warn("app.js  wx.aegis: ", wx.aegis);
+
+    //初始化tab-bar角标
+    let index_info = wx.getStorageSync('index_info');
+    let wenzhen_info = wx.getStorageSync('wenzhen_info');
+    let my_info = wx.getStorageSync('my_info');
+    if(!index_info) wx.setStorageSync('index_info',"");
+    if(!wenzhen_info) wx.setStorageSync('wenzhen_info', "");
+    if(!my_info) wx.setStorageSync('my_info', "");
+  },
+  onShow(){
+    this.imInit(this.onSDKReady, this);
+  },
+  imInit(onSDKReady, obj){
+    let sign = genTestUserSig(this.globalData.config);
+    console.log("sign: ", sign);
+    const userSig = sign.userSig;
+    console.log("userSig: ", userSig);
+    wx.$TUIKit = TIM.create({
+      SDKAppID: this.globalData.config.SDKAPPID
+    });
+    
+    wx.$chat_SDKAppID = this.globalData.config.SDKAPPID;
+    wx.$chat_userID = this.globalData.config.userID;
+    wx.$chat_userSig = userSig;
+    wx.$TUIKitTIM = TIM;
+    wx.$TUIKit.registerPlugin({ 'tim-upload-plugin': TIMUploadPlugin });            
+    wx.$TUIKit.login({
+        userID: this.globalData.config.userID,
+        userSig
+    });
+    wx.$TUIKit.setLogLevel(3);//设置日志级别
+    wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.SDK_READY, onSDKReady, obj);
+  },
+  onSDKReady(){
+    console.log("onSDKReady from app.js");
+    this.globalData.chat_sdk_ready = true;
+    
+    wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onSystemPushReceived, this);
+  },
+  $onSystemPushReceived(e){
+    console.log("onSystemPushReceived from app.js");
+    console.log(e)
+    let message = e.data[0];
+    console.log(message)
+
+    let type = message.type;
+    console.log(type);
+    
+   
+    this.formatTabBarNum("wenzhen_info");
+
+  },
+  formatTabBarNum(name){
+    let val = wx.getStorageSync(name);
+    if(val == "") val = 0;
+    if(val == "+99") val = 100;
+    val = val + 1;
+    if(val > 99) val = '+99';
+    wx.setStorageSync(name, val);
   },
   aegisInit() {
     wx.aegis = new Aegis({
@@ -53,7 +115,13 @@ App({
     share: false,  // 分享默认为false
     height: 0,
     login_url: "/Pages/login/index",
-    chat_sdk_ready: false
+    chat_sdk_ready: false,
+    config: {
+      userID: "123456", //User ID
+      SDKAPPID: 1400796919, // Your SDKAppID
+      SECRETKEY: "a5bcd8c583181cf004e9d91a47687d719d4b5d2a10ce33fbee95d587889447d8", // Your secretKey
+      EXPIRETIME: 604800,
+    },
   },
   go(url, ...params){
     wx.navigateTo({
diff --git a/app.json b/app.json
index 86cc64f..fff176f 100644
--- a/app.json
+++ b/app.json
@@ -48,7 +48,8 @@
     "Pages/login/index",
     "Pages/mobile_login/index",
     "Pages/yishi/manual_detail/index",
-    "Pages/yishi/addzhenduan/index"
+    "Pages/yishi/addzhenduan/index",
+    "Pages/yishi/wenzhen_v2/wenzhen"
   ],
   "window": {
     "navigationBarBackgroundColor": "#ffffff",
@@ -81,8 +82,8 @@
         "selectedIconPath": "/static/images/yishi/tabbar_icon/index_select.png"
       },
       {
-        "pagePath": "Pages/yishi/wenzhen/wenzhen",
-        "text": "问诊(Y)",
+        "pagePath": "Pages/yishi/wenzhen_v2/wenzhen",
+        "text": "问诊(Z)",
         "iconPath": "/static/images/yishi/tabbar_icon/wenzhen.png",
         "selectedIconPath": "/static/images/yishi/tabbar_icon/wenzhen_select.png"
       },
diff --git a/commpents/myprofile/index.js b/commpents/myprofile/index.js
index 5d8544b..53fac75 100644
--- a/commpents/myprofile/index.js
+++ b/commpents/myprofile/index.js
@@ -1,6 +1,7 @@
 // commpents/myprofile/index.js
 import Toast from '@vant/weapp/toast/toast';
 import { API } from './../../utils/network/api'
+import { FileUtil } from './../../utils/fileutil'
 
 const api = new API()
 const app = getApp()
@@ -88,6 +89,13 @@ Component({
     iden_auth_status: 0,
     iden_auth_disabled: 0,
     iden_auth_status_txt: "未认证",
+    avatar_reason: "",
+    department_custom_mobile_reason: "",
+    brief_introduction_reason: "",
+    be_good_at_reason: "",
+    license_cert_reason: "",
+    qualification_cert_reason: "",
+    work_cert_reason: "",
   },
 
   options: {
@@ -97,6 +105,11 @@ Component({
   lifetimes: {
     attached(){
       let _this = this;
+      console.log(_this.data.zhicheng_columns);
+      _this.setData({
+        "zhicheng_columns[0].text": "AAA"
+      })
+      console.log(_this.data.zhicheng_columns);
       //获得医师身份认证
       api.getDoctorAuthIden().then(response => {
         console.log("getDoctorAuthIden: ",response);
@@ -115,6 +128,13 @@ Component({
           select_yiyuan_id: response.data.hospital.hospital_id,
           hospital: response.data.hospital,
           iden_auth_status: response.data.iden_auth_status,
+          avatar_reason: response.data.avatar_reason,
+          department_custom_mobile_reason: response.data.department_custom_mobile_reason,
+          brief_introduction_reason: response.data.brief_introduction_reason,
+          be_good_at_reason: response.data.be_good_at_reason,
+          license_cert_reason: response.data.license_cert_reason,
+          qualification_cert_reason: response.data.qualification_cert_reason,
+          work_cert_reason: response.data.work_cert_reason,
         });
         let iden_auth_status = response.data.iden_auth_status;
         console.log("iden_auth_status: ",iden_auth_status)
@@ -200,18 +220,24 @@ Component({
       let zhicheng_huixian = false;
       let area_huixian = false;
       //执行回显
+      let huixian_try_count = 0;
       let data_replay = setInterval(() => {
-        console.log("执行回显。。。")
+        try {
+          console.log("执行回显。。。", huixian_try_count);
 
         //回显科室
         if(_this.data.doctorauthiden_data_ready && _this.data.basicdepartment_data_ready){
           let index = _this.data.keshi_columns.findIndex(item => {
+            console.log("value: ",item.value);
+            console.log("select_keshi_id: ", _this.data.select_keshi_id);
             return item.value == _this.data.select_keshi_id
           })
-          _this.setData({
-            select_keshi_index: index,
-            keshi_note: _this.data.keshi_columns[index].text
-          })
+          if(index){
+            _this.setData({
+              select_keshi_index: index,
+              keshi_note: _this.data.keshi_columns[index].text
+            })
+          }
           keshi_huixian = true;
         }
         //回显职称
@@ -283,16 +309,19 @@ Component({
 
           area_huixian = true;
         }
-
+        } catch (error) {
+          console.error(error)
+        }
+        huixian_try_count = huixian_try_count + 1;
         //都回显成功后，清除计时器
         console.log("keshi_huixian: ", keshi_huixian)
         console.log("zhicheng_huixian: ", zhicheng_huixian)
         console.log("area_huixian: ", area_huixian)
-        if(keshi_huixian && zhicheng_huixian && area_huixian){
+        if((keshi_huixian && zhicheng_huixian && area_huixian) || huixian_try_count > 100){
           clearInterval(data_replay);
         }
-        console.log("计时器")
-      }, 1000);
+        console.log("计时器");
+      }, 100);
     },
   },
 
@@ -558,12 +587,21 @@ Component({
     },
     select_zhuanchang(e){
       console.log(e);
-      let expertise_name = e.currentTarget.dataset.expertise_name;
-      let expertise_id = e.currentTarget.dataset.expertise_id;
-      let is_selected = e.currentTarget.dataset.is_selected;
-      let index = e.currentTarget.dataset.index;
-      let data = "zhuanchang_columns["+index+"].is_selected";
-      this.setData({[data]: is_selected==1?0:1})
+      let count = 0
+      this.data.zhuanchang_columns.forEach(item => {
+        count = count + 1;
+      })
+      if(count < 10){
+        let is_selected = e.currentTarget.dataset.is_selected;
+        let index = e.currentTarget.dataset.index;
+        let data = "zhuanchang_columns["+index+"].is_selected";
+        this.setData({[data]: is_selected==1?0:1})
+      }else{
+        wx.showToast({
+          title: '最多10个专长',
+          icon: "error"
+        })
+      }
     },
     zhuanchangConfirm(e){
       this.setData({ zhuanchang_show: false });
@@ -617,6 +655,80 @@ Component({
         })
   
       }).catch(errors => {console.error(errors);})
-    }
+    },
+    doUploadFile(event) {
+      console.log("index douploadFIle: ", event);
+      const scene = event.currentTarget.dataset.scene;
+      const field_name = event.currentTarget.dataset.field_name;
+      const file_multiple = event.currentTarget.dataset.file_multiple;//是否为多张图
+      console.log("scene: ", scene);
+      console.log("field_name: ", field_name);
+      console.log("file_multiple: ", file_multiple);
+      let _this = this;
+      api.getOssSign({user_type:2,scene:scene}).then(response => {
+        console.log(response);
+        const { file } = event.detail;
+        console.log("file: ", file);
+        const filename = FileUtil.getFileName(file);
+        const host = response.data.host;
+        const signature = response.data.signature;
+        const ossAccessKeyId = response.data.accessid;
+        const policy = response.data.policy;
+        const key = response.data.dir+filename;
+        const filePath = file.url; // 待上传文件的文件路径。
+        wx.uploadFile({
+          url: host, // 开发者服务器的URL。
+          filePath: filePath,
+          name: 'file', // 必须填file。
+          formData: {
+            key,
+            policy,
+            OSSAccessKeyId: ossAccessKeyId,
+            signature,
+          },
+          success: (res) => {
+            console.log("upload: ", res);
+            if (res.statusCode === 204) {
+              if(scene == 1){
+                this.setData({
+                  is_avatar: true
+                })
+              }
+              wx.showToast({title: '上传成功'})
+              if(file_multiple == "true"){//多张图
+                let img = {}
+                img.url = host+"/"+key;
+                img.isImg = true;
+  
+                let img_list = _this.data[field_name];
+                console.log("img_list: ", img_list);
+                img_list.push(img);
+                console.log("img_list: ", img_list);
+  
+                this.setData({
+                  [field_name]: img_list
+                });
+              }else{
+                this.setData({[field_name]: host+"/"+key});
+              }
+            }
+          },
+          fail: err => {
+            console.log(err);
+          }
+        });
+      }).catch(errors => {
+        console.error(errors);
+      })
+    },
+    doDeleteFile(event){
+      console.log(event);
+      let url = event.detail.file.url;
+      let file_name = event.currentTarget.dataset.field_name;
+      let img_list = this.data[file_name].filter(item => item.url != url);
+      this.setData({
+        [file_name]: img_list
+      })
+    },
   }
 })
diff --git a/commpents/myprofile/index.wxml b/commpents/myprofile/index.wxml
index 88252a7..f417f7f 100644
--- a/commpents/myprofile/index.wxml
+++ b/commpents/myprofile/index.wxml
@@ -1,4 +1,4 @@
-<view class="photo">
+        <view class="photo" style="border-bottom: {{avatar_reason==''?'1px solid var(--td-cell-border-color, var(--td-gray-color-3, #e7e7e7));':'unset'}}">
           <view class="title">头像 <text class="required"> *</text></view>
           <van-uploader bind:after-read="doUploadFile" data-scene="1" data-field_name="avatar" data-file_multiple="false">
             <view class="right">
@@ -11,6 +11,13 @@
           </van-uploader>
         </view>
 
+        <view class="has_error" wx:if="{{ avatar_reason != '' }}" >
+          <view class="error_box">
+            <t-icon color="red" name="close-circle-filled" size="48rpx" data-name="close-circle-filled" />
+            <text class="error_msg">{{ avatar_reason }}</text>
+          </view>
+        </view>
+
         <!-- <t-cell title="头像" hover required arrow note="真人正脸" /> -->
         <t-cell title="城市" hover required arrow note="{{ city_note }}" bindtap="onCityShow"/>
         
@@ -127,7 +134,7 @@
             </view>
             <view class="zhuanchang_box">
             
-              <view class="zhuanchang_box_item {{ data.is_selected==1?'zhuanchang_box_item_checked':'' }}" wx:key="expertise_name" bindtap="select_zhuanchang" 
+              <view class="zhuanchang_box_item {{ data.is_selected==1?'zhuanchang_box_item_checked':'' }}" wx:key="expertise_name"            bindtap="select_zhuanchang" 
                 data-expertise_name="{{data.expertise_name}}" 
                 data-expertise_id="{{data.expertise_id}}"  
                 data-is_selected="{{data.is_selected}}"  
@@ -160,9 +167,17 @@
             input-align="right"
             required
             clearable
+            border="{{ department_custom_mobile_reason == '' }}"
             custom-style="font-size:30rpx;"
           />
 
+        <view class="has_error" wx:if="{{ department_custom_mobile_reason != '' }}" >
+          <view class="error_box">
+            <t-icon color="red" name="close-circle-filled" size="48rpx" data-name="close-circle-filled" />
+            <text class="error_msg">{{ department_custom_mobile_reason }}</text>
+          </view>
+        </view>
+
         <view class="zhuanchang" bindtap="onZhuanChangShow">
           <view class="title">专长 <text class="required"> *</text></view>
           <view class="content">
@@ -185,6 +200,7 @@
         bind:showNote="onshowJianJieNote"
         textarea_cell_content_placeholder="您的从业经历，职称，所获荣誉等信息（10~1000字）" 
         textarea_val="{{textarea_jianjie}}"
+        has_error_content="{{ be_good_at_reason }}"
         data-textarea_name="textarea_jianjie" bindTextAreaBlur="getTextAreaVal" />
 
         <m-textarea-cell 
@@ -192,6 +208,7 @@
         t_icon_name="view-module" 
         bind:showNote="onshowShanChangNote"
         textarea_val="{{textarea_shanchang}}"
+        has_error_content="{{ brief_introduction_reason }}"
         textarea_cell_content_placeholder="您的专业领域、擅长疾病、研究方法等信息（10~1000字）" 
         textarea_cell_note="查看示例" data-textarea_name="textarea_shanchang" bindTextAreaBlur="getTextAreaVal" />
 
@@ -208,6 +225,7 @@
         bindDeleteFile="doDeleteFile"
         upload_cell_desc="请提供清晰的职业证书原件照片，需包含证书编码、加盖钢印的证书照片、姓名、执业范围、最新执业医院，最少上传2张。" 
         upload_cell_note="查看示例"
+        has_error_content="{{ license_cert_reason }}"
         wx:if="{{indentity}}"
         />
 
@@ -224,6 +242,7 @@
         bind:showNote="onshowZiGeNote"
         upload_cell_desc="请提供清晰的资格证书原件照片，需包含证书编码、加盖钢印的证书照片、姓名、职称等，最少上传1张。" 
         upload_cell_note="查看示例"
+        has_error_content="{{ qualification_cert_reason }}"
         wx:if="{{indentity}}"
          />
 
@@ -240,6 +259,7 @@
         bindDeleteFile="doDeleteFile"
         upload_cell_desc="请提供清晰的职称证书原件照片，需包含证书编码、加盖钢印的证书照片、姓名等，最少上传1张。" 
         upload_cell_note="查看示例"
+        has_error_content="{{ work_cert_reason }}"
         wx:if="{{indentity}}"
          />
         
diff --git a/commpents/myprofile/index.wxss b/commpents/myprofile/index.wxss
index 1569fc4..ff80501 100644
--- a/commpents/myprofile/index.wxss
+++ b/commpents/myprofile/index.wxss
@@ -3,25 +3,15 @@
 }
 .photo{
   position: relative;
-  padding: 32rpx;
+  padding: 32rpx 32rpx 32rpx 0;
+  margin-left: 32rpx;
   display: flex;
   justify-content: space-between;
   font-size: 32rpx;
   font-weight: 400;
   align-items: center;
 }
-.photo::after {
-  position: absolute;
-  box-sizing: border-box;
-  content: ' ';
-  pointer-events: none;
-  right: 0;
-  left: 32rpx;
-  bottom: 0;
-  border-bottom: 1px solid var(--td-cell-border-color, var(--td-gray-color-3, #e7e7e7));
-  transform: scaleY(0.5);
-  left: 32rpx;
-}
+
 .title{
   font-size: 30rpx;
   color: #1C2023;
@@ -187,4 +177,39 @@
 
 .zhuanchang_btn--confirm {
   color: #3cc7c0;
+}
+.error_box{
+  position: relative;
+  display: flex;
+  background-color: #FEF1F1;
+  width: calc(95vw - 64rpx);
+  height: 100rpx;
+  margin: 30rpx auto 0 auto;
+  align-items: center;
+  padding-left: 32rpx;
+  border-radius: 10rpx;
+}
+.error_box::after{
+  border-radius: 5rpx;
+  position: absolute;
+  width: 0px;
+  height: 0px;
+  border-width: 16rpx;
+  border-style: solid;
+  border-color: transparent transparent #FEF1F1 transparent;
+  content: ' ';
+  left: 50rpx;
+  top: -30rpx;
+}
+.error_msg{
+  position: relative;
+  margin-left: 10rpx;
+  color: #FF0000;
+  letter-spacing: 3rpx;
+  font-weight: 600;
+}
+.has_error{
+  margin-left: 32rpx;
+  padding-bottom: 20rpx;
+  border-bottom: 1rpx solid #e7e7e7;
 }
\ No newline at end of file
diff --git a/commpents/textarea-cell/index.js b/commpents/textarea-cell/index.js
index ec83398..0ab622b 100644
--- a/commpents/textarea-cell/index.js
+++ b/commpents/textarea-cell/index.js
@@ -31,7 +31,11 @@ Component({
     textarea_val: {
       type: String,
       value: '',
-    }
+    },
+    has_error_content: {
+      type: String,
+      value: "",
+    },
   },
 
   /**
diff --git a/commpents/textarea-cell/index.wxml b/commpents/textarea-cell/index.wxml
index 3dc485d..dbc67b3 100644
--- a/commpents/textarea-cell/index.wxml
+++ b/commpents/textarea-cell/index.wxml
@@ -9,4 +9,8 @@
   <view class="textarea-cell-content">
     <textarea bindblur="bindTextAreaBlur" maxlength="1000" style="margin: 32rpx 32rpx 0 32rpx; width: 100%; height: 90%; background-color: #FAFAFA;" name="" id="" placeholder="{{ textarea_cell_content_placeholder }}" value="{{textarea_val}}"></textarea>
   </view>
+  <view class="error_box" wx:if="{{ has_error_content != '' }}" >
+    <t-icon color="red" name="close-circle-filled" size="48rpx" data-name="close-circle-filled" />
+    <text class="error_msg">{{ has_error_content }}</text>
+  </view>
 </view>
\ No newline at end of file
diff --git a/commpents/textarea-cell/index.wxss b/commpents/textarea-cell/index.wxss
index 701f799..2883557 100644
--- a/commpents/textarea-cell/index.wxss
+++ b/commpents/textarea-cell/index.wxss
@@ -43,4 +43,34 @@
 }
 .textarea-cell-name{
   font-size: 30rpx;
+}
+.error_box{
+  position: relative;
+  display: flex;
+  background-color: #FEF1F1;
+  width: calc(95vw - 64rpx);
+  height: 100rpx;
+  margin: 30rpx auto 0 auto;
+  align-items: center;
+  padding-left: 32rpx;
+  border-radius: 10rpx;
+}
+.error_box::after{
+  border-radius: 5rpx;
+  position: absolute;
+  width: 0px;
+  height: 0px;
+  border-width: 16rpx;
+  border-style: solid;
+  border-color: transparent transparent #FEF1F1 transparent;
+  content: ' ';
+  left: 50rpx;
+  top: -30rpx;
+}
+.error_msg{
+  position: relative;
+  margin-left: 10rpx;
+  color: #FF0000;
+  letter-spacing: 3rpx;
+  font-weight: 600;
 }
\ No newline at end of file
diff --git a/commpents/upload-cell/index.js b/commpents/upload-cell/index.js
index 72c9b16..afdf91e 100644
--- a/commpents/upload-cell/index.js
+++ b/commpents/upload-cell/index.js
@@ -28,9 +28,9 @@ Component({
       type: String,
       value: '32rpx',
     },
-    has_error: {
-      type: Boolean,
-      value: false,
+    has_error_content: {
+      type: String,
+      value: "",
     },
     fileList:{
       type: Array,
diff --git a/commpents/upload-cell/index.wxml b/commpents/upload-cell/index.wxml
index 113b69f..a423d5c 100644
--- a/commpents/upload-cell/index.wxml
+++ b/commpents/upload-cell/index.wxml
@@ -14,8 +14,8 @@
       <van-image width="100" height="100" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/upload_button.png" />
     </van-uploader>
   </view>
-  <view class="error_box" wx:if="{{ has_error }}" >
+  <view class="error_box" wx:if="{{ has_error_content != '' }}" >
     <t-icon color="red" name="close-circle-filled" size="48rpx" data-name="close-circle-filled" />
-    <text class="error_msg">拒绝原因照片不清晰</text>
+    <text class="error_msg">{{ has_error_content }}</text>
   </view>
 </view>
\ No newline at end of file
diff --git a/commpents/wenzhen_data/index.js b/commpents/wenzhen_data/index.js
index 5e23a8e..2df19bd 100644
--- a/commpents/wenzhen_data/index.js
+++ b/commpents/wenzhen_data/index.js
@@ -4,6 +4,10 @@ Component({
    * 组件的属性列表
    */
   properties: {
+    from_account: {
+      type: String,
+      value: '10000',
+    },
     name: {
       type: String,
       value: '张三三',
@@ -23,6 +27,11 @@ Component({
     desc: {
       type: String,
       value: '这是示例备注desc',
+      observer(desc) {
+        this.setData({
+          desc: desc,
+        });
+      },
     },
     status_text: {
       type: String,
@@ -35,10 +44,23 @@ Component({
     status_class: {
       type: String,
     },
+    order_inquiry_id: {
+      type: String,
+      value: '',
+    },
     note: {
       type: String,
       value: '不接诊24小时后自动取消',
     },
+    message_dot:{
+      type: Boolean,
+      value: false,
+      observer(dot) {
+        this.setData({
+          message_dot: dot,
+        });
+      },
+    }
   },
 
   /**
@@ -54,20 +76,14 @@ Component({
   methods: {
     go(e){
       wx.navigateTo({
-        url: e.currentTarget.dataset.url,
-        events: {
-          // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
-          acceptDataFromOpenedPage: function(data) {
-            console.log(data)
-          },
-          someEvent: function(data) {
-            console.log(data)
-          }
-        },
-        success: function(res) {
-          // 通过 eventChannel 向被打开页面传送数据
-          res.eventChannel.emit('acceptDataFromOpenerPage', { data: 'test' })
-        }
+        url: e.currentTarget.dataset.url
+      })
+    },
+    goChat(e){
+      let from_account = e.currentTarget.dataset.from_account;
+      let order_inquiry_id = e.currentTarget.dataset.order_inquiry_id;
+      wx.navigateTo({
+        url: e.currentTarget.dataset.url+"?from_account="+from_account+"&order_inquiry_id="+order_inquiry_id
       })
     },
     tabShow(){
diff --git a/commpents/wenzhen_data/index.json b/commpents/wenzhen_data/index.json
index 4c7316e..107984d 100644
--- a/commpents/wenzhen_data/index.json
+++ b/commpents/wenzhen_data/index.json
@@ -2,6 +2,7 @@
   "component": true,
   "usingComponents": {
     "van-button": "@vant/weapp/button/index",
-    "van-popup": "@vant/weapp/popup/index"
+    "van-popup": "@vant/weapp/popup/index",
+    "t-badge": "tdesign-miniprogram/badge/badge"
   }
 }
\ No newline at end of file
diff --git a/commpents/wenzhen_data/index.wxml b/commpents/wenzhen_data/index.wxml
index 513d8cb..6347815 100644
--- a/commpents/wenzhen_data/index.wxml
+++ b/commpents/wenzhen_data/index.wxml
@@ -1,20 +1,24 @@
 <view class="content">
   <view class="content_1">
-    <view class="name"><text style="font-size: 34rpx;color: #333;">就诊人：</text>{{name}}  {{sex}}｜{{age}}岁</view>
+    <view class="name">
+      <text style="font-size: 34rpx;color: #333;">就诊人：</text>
+      {{name}}  {{sex}}｜{{age}}<t-badge dot="{{message_dot}}" offset="{{ [-4, 4] }}" content="岁" />
+    </view>
     <view class="date"> {{date}}</view>
   </view>
   <view class="content_2">{{desc}}</view>
   <view class="content_3">
-    <view class="status {{ status_class }}">{{status_text}}</view>
-    <view class="btn" wx:if="{{ status == 0 }}">
-      <van-button bind:click="go" data-url="/Pages/yishi/case/index" plain custom-style="width:200rpx;  border-radius: 10rpx;" color="#3CC7C0">查看病历</van-button>
-      <van-button type="default" bindtap="tabShow" custom-style="width:200rpx;  border-radius: 10rpx;" color="#3CC7C0">去接诊</van-button>
+    <view class="status {{ status_class }}">{{ status_text }}</view>
+    <view class="btn" wx:if="{{ status == 3 }}">
+      <van-button bind:click="go" data-url="/Pages/yishi/case/index?order_inquiry_id={{order_inquiry_id}}" plain custom-style="width:200rpx;  border-radius: 10rpx;" color="#3CC7C0">查看病历</van-button>
+      <van-button type="default" bindtap="tabShow" custom-style="width:200rpx;  border-radius: 10rpx;margin-left:20rpx;" color="#3CC7C0">去接诊</van-button>
     </view>
-    <view class="btn" wx:if="{{ status == 1 }}">
-      <van-button plain custom-style="width:200rpx;  border-radius: 10rpx;" color="#3CC7C0">问诊详情</van-button>
+    <view class="btn" wx:if="{{ status >= 4 }}">
+      <van-button bind:click="goChat" data-from_account="{{from_account}}" data-url="/Pages/yishi/chat/index" plain custom-style="width:200rpx;  border-radius: 10rpx;" color="#3CC7C0">问诊详情</van-button>
+      <!-- <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="{{ status == 0 }}">{{note}}</view>
+  <view class="content_4" wx:if="{{ status == 3 }}">{{note}}</view>
 </view>
 
 <van-popup show="{{ show }}" bind:close="onClose" round>
@@ -22,8 +26,8 @@
     <view class="pop_title">温馨提示</view>
     <view class="pop_note">为保障服务质量，请您查看患者病历信息在选择是否接诊。</view>
     <view class="pop_btn">
-      <view class="pop_btn_left" bindtap="go" data-url="/Pages/yishi/case/index" >去查看</view>
-      <view class="pop_btn_right" bindtap="go" data-url="/Pages/yishi/chat/index" >去接诊</view>
+      <view class="pop_btn_left" bindtap="go" data-from_account="{{from_account}}" data-url="/Pages/yishi/case/index?order_inquiry_id={{order_inquiry_id}}" >去查看</view>
+      <view class="pop_btn_right" bindtap="goChat" data-from_account="{{from_account}}" data-order_inquiry_id="{{order_inquiry_id}}" data-url="/Pages/yishi/chat/index" >去接诊</view>
     </view>
   </view>
 </van-popup>
\ No newline at end of file
diff --git a/commpents/wenzhen_data/index.wxss b/commpents/wenzhen_data/index.wxss
index 72f6b37..1fad6c2 100644
--- a/commpents/wenzhen_data/index.wxss
+++ b/commpents/wenzhen_data/index.wxss
@@ -2,7 +2,7 @@
   background-color: #fff;
   display: flex;
   flex-direction: column;
-  margin-bottom: 20rpx;
+  margin-top: 20rpx;
 }
 .content_1,.content_3,.content_2{
   display: flex;
@@ -39,8 +39,7 @@
 .btn{
   flex: 2;
   display: flex;
-  justify-content: space-around;
-
+  justify-content: flex-end;
 }
 .content_4{
   flex: 5;
diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js
index 3ad8a0b..720aaa5 100644
--- a/custom-tab-bar/index.js
+++ b/custom-tab-bar/index.js
@@ -1,4 +1,5 @@
 // custom-tab-bar/index.js
+const app = getApp()
 Component({
 
   /**
@@ -10,55 +11,77 @@ Component({
     "backgroundColor": "#ffffff",
     "selectedColor": "#fff",
     "listAll": {
-      "list2":[
+      "list1":[
         {
         "pagePath": "/Pages/yaoshi/home/home",
         "text": "首页",
         "iconPath": "/static/images/yaoshi/tabbar_icon/home.png",
-        "selectedIconPath": "/static/images/yaoshi/tabbar_icon/home_select.png"
+        "selectedIconPath": "/static/images/yaoshi/tabbar_icon/home_select.png",
+        "info": ""
       },
       {
         "pagePath": "/Pages/yaoshi/my/my",
         "text": "我的",
         "iconPath": "/static/images/yaoshi/tabbar_icon/my.png",
-        "selectedIconPath": "/static/images/yaoshi/tabbar_icon/my_select.png"
+        "selectedIconPath": "/static/images/yaoshi/tabbar_icon/my_select.png",
+        "info": ""
       }],
-      "list1":[
+      "list2":[
         {
         "pagePath": "/Pages/yishi/index/index",
         "text": "首页(Y)",
         "iconPath": "/static/images/yishi/tabbar_icon/index.png",
-        "selectedIconPath": "/static/images/yishi/tabbar_icon/index_select.png"
+        "selectedIconPath": "/static/images/yishi/tabbar_icon/index_select.png",
+        "info": ""
       },
       {
-        "pagePath": "/Pages/yishi/wenzhen/wenzhen",
-        "text": "问诊(Y)",
+        "pagePath": "/Pages/yishi/wenzhen_v2/wenzhen",
+        "text": "问诊(Z)",
         "iconPath": "/static/images/yishi/tabbar_icon/wenzhen.png",
-        "selectedIconPath": "/static/images/yishi/tabbar_icon/wenzhen_select.png"
+        "selectedIconPath": "/static/images/yishi/tabbar_icon/wenzhen_select.png",
+        "info": "99"
       },
       {
         "pagePath": "/Pages/yishi/my/index",
         "text": "我的(Y)",
         "iconPath": "/static/images/yishi/tabbar_icon/my.png",
-        "selectedIconPath": "/static/images/yishi/tabbar_icon/my_select.png"
+        "selectedIconPath": "/static/images/yishi/tabbar_icon/my_select.png",
+        "info": ""
       }]
     },
     items: [ ],
     dialog_visible: false,
-    dialog_content: ""
+    dialog_content: "",
+    usertype: "",
+    index_info: "",
+    wenzhen_info: "",
+    my_info: "",
   },
   attached() {
     const usertype = wx.getStorageSync('usertype')
     console.log("usertype: " ,usertype);
     if (usertype == 2) {
       this.setData({
-        items: this.data.listAll.list1
+        usertype: usertype,
+        items: this.data.listAll.list2
       })
     }else{
       this.setData({
-        items: this.data.listAll.list2
+        usertype: usertype,
+        items: this.data.listAll.list1
       })
     }
+    let _this = this;
+    setInterval(() => {
+      let index_info = wx.getStorageSync('index_info');
+      let wenzhen_info = wx.getStorageSync('wenzhen_info');
+      let my_info = wx.getStorageSync('my_info');
+      _this.setData({
+        index_info: index_info,
+        wenzhen_info: wenzhen_info,
+        my_info: my_info,
+      })
+    }, 500);
   },
   methods: {
     // swichNav: function (e) {
@@ -83,7 +106,8 @@ Component({
       // })
       console.log("custom tab bar onChange");
       // return;
-      let url = this.data.items[e.detail].pagePath
+      let url = this.data.items[e.detail].pagePath;
+      console.log(url);
       wx.switchTab({
         url: url,
       })
diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml
index 6fee57f..3576289 100644
--- a/custom-tab-bar/index.wxml
+++ b/custom-tab-bar/index.wxml
@@ -1,26 +1,97 @@
-<!-- <view class="nav-tabs" wx:if="{{tabBarShow}}">
-  <view class="tab-list {{currentTab == idx ? 'active' : 'default' }}" wx:for="{{items}}" wx:key="prototype" wx:for-index="idx" wx:for-item="item" data-current="{{idx}}" data-url="{{item.pagePath}}" bindtap="swichNav">
-    <text class="tab-text" wx:for-index="idx" data-current="{{idx}}" src="{{currentTab == idx ? item.selectedIconPath : item.iconPath }}">{{item.text}}</text>
-    <image class="iconPath" wx:for-index="idx" data-current="{{idx}}" src="{{currentTab == idx ? item.selectedIconPath : item.iconPath }}"></image>
-  </view>
-</view> -->
-<van-tabbar active="{{ active }}" bind:change="onChange">
-  <van-tabbar-item info="3" data-url="{{item.pagePath}}" url="{{item.pagePath}}"  wx:for="{{items}}">
+
+<van-tabbar active="{{ active }}" bind:change="onChange" 
+active-color="#3CC7C0" inactive-color="#999999" wx:if="{{usertype == 2}}" >
+
+  <van-tabbar-item info="{{index_info}}" data-url="{{listAll.list2[0].pagePath}}" url="{{listAll.list2[0].pagePath}}">
     <image
       slot="icon"
-      src="{{ item.iconPath }}"
-      data-url="{{ item.pagePath }}"
+      src="{{ listAll.list2[0].iconPath }}"
+      data-url="{{ listAll.list2[0].pagePath }}"
       mode="aspectFit"
       style="width: 30px; height: 18px;"
     />
     <image
       slot="icon-active"
-      src="{{ item.selectedIconPath }}"
+      src="{{ listAll.list2[0].selectedIconPath }}"
       mode="aspectFit"
       style="width: 30px; height: 18px;"
-      data-url="{{ item.pagePath }}"
+      data-url="{{ listAll.list2[0].pagePath }}"
     />
-    {{item.text}}
+    {{listAll.list2[0].text}}
+  </van-tabbar-item>
+
+  <van-tabbar-item info="{{wenzhen_info}}" data-url="{{listAll.list2[1].pagePath}}" url="{{listAll.list2[1].pagePath}}">
+    <image
+      slot="icon"
+      src="{{ listAll.list2[1].iconPath }}"
+      data-url="{{ listAll.list2[1].pagePath }}"
+      mode="aspectFit"
+      style="width: 30px; height: 18px;"
+    />
+    <image
+      slot="icon-active"
+      src="{{ listAll.list2[1].selectedIconPath }}"
+      mode="aspectFit"
+      style="width: 30px; height: 18px;"
+      data-url="{{ listAll.list2[1].pagePath }}"
+    />
+    {{listAll.list2[1].text}}
+  </van-tabbar-item>
+
+  <van-tabbar-item info="{{my_info}}" data-url="{{listAll.list2[2].pagePath}}" url="{{listAll.list2[2].pagePath}}">
+    <image
+      slot="icon"
+      src="{{ listAll.list2[2].iconPath }}"
+      data-url="{{ listAll.list2[2].pagePath }}"
+      mode="aspectFit"
+      style="width: 30px; height: 18px;"
+    />
+    <image
+      slot="icon-active"
+      src="{{ listAll.list2[2].selectedIconPath }}"
+      mode="aspectFit"
+      style="width: 30px; height: 18px;"
+      data-url="{{ listAll.list2[2].pagePath }}"
+    />
+    {{listAll.list2[2].text}}
+  </van-tabbar-item>
+</van-tabbar>
+
+<van-tabbar active="{{ active }}" bind:change="onChange" 
+active-color="#74A2FA" inactive-color="#999999" wx:if="{{usertype == 3}}" >
+<van-tabbar-item info="{{my_info}}" data-url="{{listAll.list1[0].pagePath}}" url="{{listAll.list1[0].pagePath}}">
+    <image
+      slot="icon"
+      src="{{ listAll.list1[0].iconPath }}"
+      data-url="{{ listAll.list1[0].pagePath }}"
+      mode="aspectFit"
+      style="width: 30px; height: 18px;"
+    />
+    <image
+      slot="icon-active"
+      src="{{ listAll.list1[0].selectedIconPath }}"
+      mode="aspectFit"
+      style="width: 30px; height: 18px;"
+      data-url="{{ listAll.list1[0].pagePath }}"
+    />
+    {{listAll.list1[0].text}}
+  </van-tabbar-item>
+<van-tabbar-item info="{{my_info}}" data-url="{{listAll.list1[1].pagePath}}" url="{{listAll.list1[1].pagePath}}">
+    <image
+      slot="icon"
+      src="{{ listAll.list1[1].iconPath }}"
+      data-url="{{ listAll.list1[1].pagePath }}"
+      mode="aspectFit"
+      style="width: 30px; height: 18px;"
+    />
+    <image
+      slot="icon-active"
+      src="{{ listAll.list1[1].selectedIconPath }}"
+      mode="aspectFit"
+      style="width: 30px; height: 18px;"
+      data-url="{{ listAll.list1[1].pagePath }}"
+    />
+    {{listAll.list1[1].text}}
   </van-tabbar-item>
 </van-tabbar>
 <t-dialog
diff --git a/utils/network/api.js b/utils/network/api.js
index e32955e..fc23408 100644
--- a/utils/network/api.js
+++ b/utils/network/api.js
@@ -434,6 +434,36 @@ class API extends HTTP {
       ...params
     }
   })
+}
+ //获取医生问诊消息列表
+ getDoctorInquiryMessage(params) {
+  return this.request({
+    url: `${this.baseUrl}/doctor/inquiry/message`,
+    method: 'GET',
+    data: {
+      ...params
+    }
+  })
+}
+ //获取医生问诊消息用户属性
+ getDoctorInquiryMessageAttr(params) {
+  return this.request({
+    url: `${this.baseUrl}/doctor/inquiry/message/attr`,
+    method: 'POST',
+    data: {
+      ...params
+    }
+  })
+}
+ //获取患者问诊病例
+ getDoctorInquiryCase(params) {
+  return this.request({
+    url: `${this.baseUrl}/doctor/inquiry/case`,
+    method: 'GET',
+    data: {
+      ...params
+    }
+  })
 }
 }
 
diff --git a/utils/network/request.js b/utils/network/request.js
index 8c695e3..740b86a 100644
--- a/utils/network/request.js
+++ b/utils/network/request.js
@@ -47,6 +47,9 @@ class HTTP {
             } else {
               reject(res.data.message)
               this._show_error(res.data.message)
+              wx.navigateTo({
+                url: "/Pages/index/index"
+              })
             }
         } else {
             resolve(res.data)
@@ -68,6 +71,7 @@ class HTTP {
       icon: 'none',
       duration: 2000
     })
+
   }
 }
 
diff --git a/utils/util.js b/utils/util.js
index a878422..cc63f42 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -9,6 +9,17 @@ const formatTime = date => {
   return `${[year, month, day].map(formatNumber).join('/')} ${[hour, minute, second].map(formatNumber).join(':')}`
 }
 
+const formatChatTime = date => {
+  const year = date.getFullYear()
+  const month = date.getMonth() + 1
+  const day = date.getDate()
+  const hour = date.getHours()
+  const minute = date.getMinutes()
+  const second = date.getSeconds()
+
+  return `${[year, month, day].map(formatNumber).join('-')} ${[hour, minute].map(formatNumber).join(':')}`
+}
+
 const getDateArr = date => {
   const year = date.getFullYear()
   const month = date.getMonth() + 1
@@ -25,8 +36,37 @@ const formatNumber = n => {
   return n[1] ? n : `0${n}`
 }
 
+const getTimeAgo = stringTime =>{
+  var minute = 1000 * 60;
+  var hour = minute *60;
+  var day = hour *24;
+  var week = day * 7;
+  var month = day * 30;
+  var time1 = new Date().getTime();//当前的时间戳
+  var time2 = stringTime*1000;//指定时间的时间戳
+  var time = time1 - time2;
+  var result = null;
+  if(time < 0){
+    return '刚刚';
+  }else if(time/month >= 1){
+    result = formatChatTime(new Date(time2));
+  }else if(time/week >= 1){
+    result = formatChatTime(new Date(time2));
+  }else if(time/day >= 1){
+    result = formatChatTime(new Date(time2));
+  }else if(time/hour >= 1){
+    result = parseInt(time/hour) + "小时前";
+  }else if(time/minute >= 1){
+    result = parseInt(time/minute) + "分钟前";
+  }else {
+    result = "刚刚";
+  }
+  return result;
+}
+
 module.exports = {
   formatTime,
   getDateArr,
   formatNumber,
+  getTimeAgo,
 }

From 9a392a445b893d36976f6ba134eda282640a21ed Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Tue, 14 Mar 2023 18:53:05 +0800
Subject: [PATCH 06/83] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yaoshi/home/home.wxss           |  5 +-
 Pages/yishi/cash/index.json           |  1 +
 Pages/yishi/cash/index.wxml           |  2 +-
 Pages/yishi/cashrecord/index.js       | 46 +++++++++++--
 Pages/yishi/cashrecord/index.json     |  5 +-
 Pages/yishi/cashrecord/index.wxml     | 40 ++++++-----
 Pages/yishi/cashrecord/index.wxss     |  3 +
 Pages/yishi/chat/index.wxss           |  3 -
 Pages/yishi/identity/index.js         | 26 ++++---
 Pages/yishi/index/index.js            | 40 +++++++++--
 Pages/yishi/index/index.json          |  1 +
 Pages/yishi/index/index.wxml          | 12 +++-
 Pages/yishi/index/index.wxss          |  2 +-
 Pages/yishi/kuaisusetup/index.wxml    |  2 +-
 Pages/yishi/kuaisusetup/index.wxss    |  5 +-
 Pages/yishi/myaccount/index.wxss      |  4 +-
 Pages/yishi/notice_deatil/index.wxss  |  5 +-
 Pages/yishi/onlinesetup/index.js      |  6 +-
 Pages/yishi/wenzhenorder/index.js     |  4 +-
 Pages/yishi/wenzhenorder/index.json   |  3 +-
 Pages/yishi/wenzhenorder/index.wxml   |  3 +-
 Pages/yishi/yizhensetup/index.wxml    |  2 +-
 Pages/yishi/yizhensetup/index.wxss    |  5 +-
 Pages/yishi/zhiye_identity/index.js   | 98 ++++++++++++++++-----------
 Pages/yishi/zhiye_identity/index.wxml |  3 +
 commpents/myprofile/index.js          | 33 +++++----
 commpents/wenzhen_data/index.js       | 14 ++--
 utils/network/request.js              |  3 -
 28 files changed, 251 insertions(+), 125 deletions(-)

diff --git a/Pages/yaoshi/home/home.wxss b/Pages/yaoshi/home/home.wxss
index 028c6bc..0628c84 100644
--- a/Pages/yaoshi/home/home.wxss
+++ b/Pages/yaoshi/home/home.wxss
@@ -1,7 +1,8 @@
-.container{
+page{
   background-color: #F4F5F7;
+}
+.container{
   width: 100vw;
-  height: 100vh;
 }
 .main{
   width: 90vw;
diff --git a/Pages/yishi/cash/index.json b/Pages/yishi/cash/index.json
index c77fddd..7095cf3 100644
--- a/Pages/yishi/cash/index.json
+++ b/Pages/yishi/cash/index.json
@@ -3,6 +3,7 @@
   "usingComponents": {
     "te-nav-bar": "/commpents/te_navbar",
     "t-image": "tdesign-miniprogram/image/image",
+    "van-icon": "@vant/weapp/icon/index",
     "van-button": "@vant/weapp/button/index"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/cash/index.wxml b/Pages/yishi/cash/index.wxml
index 937eb7c..5e79139 100644
--- a/Pages/yishi/cash/index.wxml
+++ b/Pages/yishi/cash/index.wxml
@@ -3,7 +3,7 @@
 <view class="container">
   <view class="top">
     <view class="txt_title">结算银行卡</view>
-    <view class="rule">提现规则</view>
+    <view class="rule">提现规则<van-icon name="warning-o" color="#FF9800" /></view>
   </view>
   <view class="bankcard">
     <view class="bankcard_icon">
diff --git a/Pages/yishi/cashrecord/index.js b/Pages/yishi/cashrecord/index.js
index d02f6ca..0d9255c 100644
--- a/Pages/yishi/cashrecord/index.js
+++ b/Pages/yishi/cashrecord/index.js
@@ -13,11 +13,21 @@ Page({
     current_page: 0,
     total: 0,
     per_page: 0,
-    last_page: 0
+    last_page: 0,
+    dateVisible: false,
+    select_date: '2023',
+    years: [
+      { label: '2022年', value: '2022' },
+      { label: '2023年', value: '2023' },
+      { label: '2024年', value: '2024' },
+    ],
   },
   onLoad(){
+    this.getDoctorWithdrawalRecord();
+  },
+  getDoctorWithdrawalRecord(){
     //获取提现数据
-    api.getDoctorWithdrawalRecord({year:'2023'}).then(response => {
+    api.getDoctorWithdrawalRecord({year: this.data.select_date}).then(response => {
       console.log(response);
       if(response.data.total > 0){
         this.setData({
@@ -28,8 +38,36 @@ Page({
           last_page: response.data.last_page,
         })
       }
-    }).catch(errors => {
-      console.error(errors);
+    }).catch(errors => { console.error(errors); })
+  },
+  onDatePicker() {
+    this.setData({ dateVisible: true });
+  },
+  onPickerChange(e) {
+    const { key } = e.currentTarget.dataset;
+    const { value } = e.detail;
+
+    console.log('picker change:', e.detail);
+
+    this.setData({
+      select_date: value
     })
+
+    this.getDoctorWithdrawalRecord();
+
+  },
+  onColumnChange(e) {
+    const { key } = e.currentTarget.dataset;
+    const { value } = e.detail;
+
+    console.log('Column change:', e.detail);
+    
+  },
+  onPickerCancel(e) {
+    const { key } = e.currentTarget.dataset;
+    const { value } = e.detail;
+
+    console.log('picker Cancel:', e.detail);
+
   }
 })
\ No newline at end of file
diff --git a/Pages/yishi/cashrecord/index.json b/Pages/yishi/cashrecord/index.json
index 0439bb9..acbbb5d 100644
--- a/Pages/yishi/cashrecord/index.json
+++ b/Pages/yishi/cashrecord/index.json
@@ -3,6 +3,9 @@
   "usingComponents": {
     "te-nav-bar": "/commpents/te_navbar",
     "van-icon": "@vant/weapp/icon/index",
-    "t-image": "tdesign-miniprogram/image/image"
+    "van-empty": "@vant/weapp/empty/index",
+    "t-image": "tdesign-miniprogram/image/image",
+    "t-picker": "tdesign-miniprogram/picker/picker",
+    "t-picker-item": "tdesign-miniprogram/picker-item/picker-item"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/cashrecord/index.wxml b/Pages/yishi/cashrecord/index.wxml
index 9e42712..a27962d 100644
--- a/Pages/yishi/cashrecord/index.wxml
+++ b/Pages/yishi/cashrecord/index.wxml
@@ -2,8 +2,8 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container">
   <view class="top">
-    <view class="top_txt">
-        <view class="month">2022年<van-icon name="arrow-down" color="#fff" size="40rpx" /></view>
+    <view class="top_txt" bindtap="onDatePicker">
+        <view class="month">{{select_date}}年<van-icon name="arrow-down" color="#fff" size="40rpx" /></view>
     </view>
   </view>
   <view class="data_list">
@@ -47,25 +47,23 @@
       <view class="data_item_bottom">个人所得税：￥12.00</view>
     </view>
 
-    <view class="data_item">
-      <view class="data_item_top">
-        <view class="data_item_top_icon">
-          <t-image custom-style="" src="/static/images/yishi/bankcard/js_icon.png" mode="heightFix" height="50rpx" aria-label="role" />
-        </view>
-        <view class="data_item_top_content">
-          <view class="name">张三三<text style="margin-left:20rpx;font-size: 28rpx;corlor:#999;">（尾号9900）</text></view>
-          <view class="date">12.09  13:23</view>
-        </view>
-        <view class="data_item_top_num">
-          <view class="jine">￥123.00</view>
-          <view class="status_box">
-            <view class="status status_ing">结算中</view>
-          </view>
-        </view>
-      </view>
-      <view class="data_item_bottom">个人所得税：￥12.00</view>
-    </view>
-
+    
+    <van-empty description="暂无数据" wx:if="{{record_list.length == 0}}" />
     
   </view>
+
+  <t-picker
+    visible="{{dateVisible}}"
+    value="{{[select_date]}}"
+    data-key="date"
+    title="选择年份"
+    cancelBtn="取消"
+    confirmBtn="确认"
+    bindchange="onPickerChange"
+    bindpick="onColumnChange"
+    bindcancel="onPickerCancel"
+  > 
+  <t-picker-item options="{{years}}" />
+</t-picker>
+
 </view>
diff --git a/Pages/yishi/cashrecord/index.wxss b/Pages/yishi/cashrecord/index.wxss
index 6147fb6..5f863aa 100644
--- a/Pages/yishi/cashrecord/index.wxss
+++ b/Pages/yishi/cashrecord/index.wxss
@@ -93,4 +93,7 @@ page{
   justify-content: flex-end;
   margin-right: 20rpx;
   color: #666;
+}
+.t-picker__confirm{
+  color: #3CC7C0 !important;
 }
\ No newline at end of file
diff --git a/Pages/yishi/chat/index.wxss b/Pages/yishi/chat/index.wxss
index 7642336..c44f761 100644
--- a/Pages/yishi/chat/index.wxss
+++ b/Pages/yishi/chat/index.wxss
@@ -2,7 +2,4 @@
   background-color: #F4F4F4;
   width: 100vw;
   height: 100vh;
-}
-.top{
-  
 }
\ No newline at end of file
diff --git a/Pages/yishi/identity/index.js b/Pages/yishi/identity/index.js
index 18fe3d1..751b8c4 100644
--- a/Pages/yishi/identity/index.js
+++ b/Pages/yishi/identity/index.js
@@ -307,6 +307,7 @@ Page({
   },
   //新增实名认证信息
   postDoctorAuthReal(){
+
     const realname = this.data.realname.trim();
     const idcard = this.data.idcard.trim();
 
@@ -333,16 +334,23 @@ Page({
       wx.showToast({title: '身份证输入有误', icon:'error'})
       return false;
     }
-    
-    var params = {
-      card_name: realname,
-      card_num: idcard,
-    }
-    api.postDoctorAuthReal(params).then(response => {
-      console.log(response);
-    }).catch(errors => {
-      console.error(errors);
+
+    wx.requestSubscribeMessage({
+      tmplIds: ['kUy70xHlr7ADo4aIHiictM4Te7MSec3E5kHsYvFQu40'],
+      success (res) {
+        console.log(res)
+        var params = {
+          card_name: realname,
+          card_num: idcard,
+        }
+        api.postDoctorAuthReal(params).then(response => {
+          console.log(response);
+        }).catch(errors => {
+          console.error(errors);
+        })
+      }
     })
+    
   },
   onTabsChange(event) {
     console.log(`Change tab, tab-panel value is ${event.detail.value}.`);
diff --git a/Pages/yishi/index/index.js b/Pages/yishi/index/index.js
index f4b1b4d..4874348 100644
--- a/Pages/yishi/index/index.js
+++ b/Pages/yishi/index/index.js
@@ -22,6 +22,7 @@ Page({
     },
     iden_auth_status_txt: "未认证",
     multi_point_status_txt: "未认证",
+    shiming_status_url: "",
     iden_auth_status_url: "/Pages/yishi/identity/index",
     multi_point_status_url: "/Pages/yishi/zhiye_identity/index",
     current: 0,
@@ -87,7 +88,8 @@ Page({
         case_text: "已全部通过"
       },
     ],
-    skeleton_loading: true
+    skeleton_loading: true,
+    contactKeFu: false
   },
   //  获取状态栏信息
   getMenuButtonBound() {
@@ -249,7 +251,13 @@ Page({
         return;
       }
     }
-
+    let url = e.currentTarget.dataset.url;
+    console.log(url);
+    if(url.indexOf("wenzhen") > -1){
+      wx.switchTab({
+        url: url,
+      })
+    }
     app.go(e.currentTarget.dataset.url)
 
   },
@@ -283,6 +291,7 @@ Page({
       this.setData({
         "info.info_shiming_status_txt": "认证失败",
         "info.info_shiming_status": "info_shiming_status_yes",
+        shiming_status_url: "/Pages/yishi/identity/index",
         dialog_content: "实名认证失败",
         dialog_visible: true
       });
@@ -295,6 +304,7 @@ Page({
       this.setData({
         "info.info_shiming_status_txt": "前往医师身份认证",
         "info.info_shiming_status": "info_shiming_status_yes",
+        shiming_status_url: "/Pages/yishi/identity/index",
         dialog_content: "请您前往医师身份认证",
         dialog_visible: true
       });
@@ -304,6 +314,7 @@ Page({
       this.setData({
         "info.info_shiming_status_txt": "审核中",
         "info.info_shiming_status": "info_shiming_status_yes",
+        shiming_status_url: "/Pages/yishi/identity/index",
         dialog_content: "您的医师身份认证正在审核中",
         dialog_visible: true
     });
@@ -324,6 +335,7 @@ Page({
       this.setData({
         "info.info_shiming_status_txt": "前往多点执业认证",
         "info.info_shiming_status": "info_shiming_status_yes",
+        shiming_status_url: "/Pages/yishi/zhiye_identity/index",
         dialog_content: "请您先进行多点执业认证",
         dialog_visible: true
       });
@@ -333,6 +345,7 @@ Page({
       this.setData({
         "info.info_shiming_status_txt": "审核中",
         "info.info_shiming_status": "info_shiming_status_yes",
+        shiming_status_url: "/Pages/yishi/zhiye_identity/index",
         dialog_content: "您的多点执业认证正在审核中",
         dialog_visible: true
     });
@@ -342,6 +355,7 @@ Page({
       this.setData({
         "info.info_shiming_status_txt": "认证失败",
         "info.info_shiming_status": "info_shiming_status_yes",
+        shiming_status_url: "/Pages/yishi/zhiye_identity/index",
         dialog_content: "您的多点执业认证失败",
         dialog_visible: true
     });
@@ -355,6 +369,7 @@ Page({
       this.setData({
         "info.info_shiming_status_txt": "绑定结算银行卡",
         "info.info_shiming_status": "info_shiming_status_yes",
+        shiming_status_url: "/Pages/yishi/bankcard/index",
         dialog_content: "请您先绑定结算银行卡",
         dialog_visible: true
     });
@@ -366,14 +381,31 @@ Page({
       this.setData({
         "info.info_shiming_status_txt": "开启在线问诊",
         "info.info_shiming_status": "info_shiming_status_yes",
-        multi_point_status_url: "/Pages/yishi/onlinesetup/index",
+        shiming_status_url: "/Pages/yishi/onlinesetup/index",
         dialog_content: "请您先前往在线问诊管理中开通在线问诊",
         dialog_visible: true
     });
       return false;
     }
-    this.setData({"info.info_shiming_status_txt": "去接诊"});
+    this.setData({
+      "info.info_shiming_status_txt": "去接诊",
+      shiming_status_url: "/Pages/yishi/wenzhen_v2/wenzhen",
+    });
     this.setData({"info.info_shiming_status": "info_shiming_status_yes"});
     return true;
+  },
+  contactKeFu(){
+    let _this = this;
+    console.log("concatKeFu");
+    wx.requestSubscribeMessage({
+      tmplIds: ['JMPmlYGh1HcUSuEfJCVQUIsZv4H5ar3QvXZfrNYNFuc'],
+      success (res) {
+        console.log(res);
+        _this.setData({
+          contactKeFu: true
+        })
+
+      }
+    })
   }
 })
\ No newline at end of file
diff --git a/Pages/yishi/index/index.json b/Pages/yishi/index/index.json
index 1df70e4..4f6315d 100644
--- a/Pages/yishi/index/index.json
+++ b/Pages/yishi/index/index.json
@@ -4,6 +4,7 @@
     "t-avatar": "tdesign-miniprogram/avatar/avatar",
     "van-image": "@vant/weapp/image/index",
     "van-button": "@vant/weapp/button/index",
+    "van-dialog": "@vant/weapp/dialog/index",
     "t-swiper": "tdesign-miniprogram/swiper/swiper",
     "t-swiper-nav": "tdesign-miniprogram/swiper-nav/swiper-nav",
     "t-badge": "tdesign-miniprogram/badge/badge",
diff --git a/Pages/yishi/index/index.wxml b/Pages/yishi/index/index.wxml
index 9db1c61..a74188e 100644
--- a/Pages/yishi/index/index.wxml
+++ b/Pages/yishi/index/index.wxml
@@ -23,7 +23,7 @@
         </view>
         
       </view>
-      <view class="info_shiming">
+      <view class="info_shiming" bindtap="go" data-url="{{shiming_status_url}}">
         <view class="info_shiming_status {{info.info_shiming_status}}">{{info.info_shiming_status_txt}}</view>
       </view>
     </view>
@@ -131,7 +131,7 @@
       <t-badge dot="{{info.reject_prescription_number ? true : false}}" offset="{{ ['-14rpx', '10rpx'] }}" class="wrapper" content="处方管理" />
       </view>
     </view>
-    <view class="fun_box_item" bindtap="go" data-moudle="8">
+    <view class="fun_box_item" data-moudle="8" bindtap="contactKeFu">
       <image class="fun_box_item_img"
           mode="widthFix"
           src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/kefu.png"
@@ -152,4 +152,12 @@
     确定
   </view>
   </t-dialog>
+
+  <van-dialog
+    title="立即联系客服"
+    show="{{ contactKeFu }}"
+    show-cancel-button
+    confirm-button-color="#3CC7C0"
+    confirm-button-open-type="contact"
+  />
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/index/index.wxss b/Pages/yishi/index/index.wxss
index 6f403f4..02e951b 100644
--- a/Pages/yishi/index/index.wxss
+++ b/Pages/yishi/index/index.wxss
@@ -201,4 +201,4 @@
 .dialog_confirm_btn{
   border-top: 1px solid #E9E9E9;
   color: #3CC7C0;
-}
\ No newline at end of file
+}
diff --git a/Pages/yishi/kuaisusetup/index.wxml b/Pages/yishi/kuaisusetup/index.wxml
index 8f3be2b..4621ea8 100644
--- a/Pages/yishi/kuaisusetup/index.wxml
+++ b/Pages/yishi/kuaisusetup/index.wxml
@@ -1,5 +1,5 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
-<view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
+<view class="container">
   <view class="switch_box">
     <view class="switch_box_top">
       <view class="switch_box_item">
diff --git a/Pages/yishi/kuaisusetup/index.wxss b/Pages/yishi/kuaisusetup/index.wxss
index 0af51b2..8aa348a 100644
--- a/Pages/yishi/kuaisusetup/index.wxss
+++ b/Pages/yishi/kuaisusetup/index.wxss
@@ -1,7 +1,8 @@
+page{
+  background-color: #F6F6F6;
+}
 .container{
   width: 100vw;
-  height: 100vh;
-  background-color: #F6F6F6;
 }
 .switch_box{
   display: flex;
diff --git a/Pages/yishi/myaccount/index.wxss b/Pages/yishi/myaccount/index.wxss
index 569ce52..f84c243 100644
--- a/Pages/yishi/myaccount/index.wxss
+++ b/Pages/yishi/myaccount/index.wxss
@@ -62,6 +62,8 @@ page{
   border-radius: 20rpx;
   padding: 20rpx 0;
 }
-
+.t-picker__confirm{
+  color: #3CC7C0 !important;
+}
 
 
diff --git a/Pages/yishi/notice_deatil/index.wxss b/Pages/yishi/notice_deatil/index.wxss
index 866e79d..c4c450c 100644
--- a/Pages/yishi/notice_deatil/index.wxss
+++ b/Pages/yishi/notice_deatil/index.wxss
@@ -1,6 +1,7 @@
-.container{
+page{
   background-color: #F4F4F4;
-  height: 100vh;
+}
+.container{
   width: 100vw;
 }
 .data{
diff --git a/Pages/yishi/onlinesetup/index.js b/Pages/yishi/onlinesetup/index.js
index fe21f1a..a9bcbc5 100644
--- a/Pages/yishi/onlinesetup/index.js
+++ b/Pages/yishi/onlinesetup/index.js
@@ -91,9 +91,9 @@ Page({
   },
   onPriceChange(e){
     console.log(e.detail);
-    let value = e.detail.value;
-    let min = this.data.config.min_inquiry_price;
-    let max = this.data.config.max_inquiry_price;
+    let value = Number(e.detail.value);
+    let min = Number(this.data.config.min_inquiry_price);
+    let max = Number(this.data.config.max_inquiry_price);
     if(value < min){
       value = min;
       Toast.fail('价格不能低于' + min + '元');
diff --git a/Pages/yishi/wenzhenorder/index.js b/Pages/yishi/wenzhenorder/index.js
index 5b76265..a945e82 100644
--- a/Pages/yishi/wenzhenorder/index.js
+++ b/Pages/yishi/wenzhenorder/index.js
@@ -24,8 +24,8 @@ Page({
   onLoad(){
     //可提现问诊订单列表
     let params = {};
-    params.page = page;
-    params.per_page = per_page;
+    params.page = this.data.page;
+    params.per_page = this.data.per_page;
     api.getDoctorWithdrawalOrder(params).then(response => {
       console.log(response);
       if(response.data.total > 0){
diff --git a/Pages/yishi/wenzhenorder/index.json b/Pages/yishi/wenzhenorder/index.json
index 8d4e19e..70a874f 100644
--- a/Pages/yishi/wenzhenorder/index.json
+++ b/Pages/yishi/wenzhenorder/index.json
@@ -4,6 +4,7 @@
     "te-nav-bar": "/commpents/te_navbar",
     "van-checkbox": "@vant/weapp/checkbox/index",
     "van-checkbox-group": "@vant/weapp/checkbox-group/index",
-    "van-button": "@vant/weapp/button/index"
+    "van-button": "@vant/weapp/button/index",
+    "van-empty": "@vant/weapp/empty/index"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/wenzhenorder/index.wxml b/Pages/yishi/wenzhenorder/index.wxml
index a289885..d0372f4 100644
--- a/Pages/yishi/wenzhenorder/index.wxml
+++ b/Pages/yishi/wenzhenorder/index.wxml
@@ -37,7 +37,8 @@
             </view>
           </view>
         </view>
-      
+        
+        <van-empty description="暂无数据" wx:if="{{order_list.length == 0}}" />
         
     </view>
   </van-checkbox-group>
diff --git a/Pages/yishi/yizhensetup/index.wxml b/Pages/yishi/yizhensetup/index.wxml
index 1e3cd4e..673e6e4 100644
--- a/Pages/yishi/yizhensetup/index.wxml
+++ b/Pages/yishi/yizhensetup/index.wxml
@@ -1,5 +1,5 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
-<view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
+<view class="container">
   <view class="switch_box">
     <view class="switch_box_top">
       <view class="switch_box_item">
diff --git a/Pages/yishi/yizhensetup/index.wxss b/Pages/yishi/yizhensetup/index.wxss
index 0cfbc64..44ef568 100644
--- a/Pages/yishi/yizhensetup/index.wxss
+++ b/Pages/yishi/yizhensetup/index.wxss
@@ -1,7 +1,8 @@
+page{
+  background-color: #F6F6F6;
+}
 .container{
   width: 100vw;
-  height: 100vh;
-  background-color: #F6F6F6;
 }
 .switch_box{
   display: flex;
diff --git a/Pages/yishi/zhiye_identity/index.js b/Pages/yishi/zhiye_identity/index.js
index 13ec417..66d1b05 100644
--- a/Pages/yishi/zhiye_identity/index.js
+++ b/Pages/yishi/zhiye_identity/index.js
@@ -63,46 +63,66 @@ Page({
     }
   },
   add(){
-    let id_card_front = this.data.id_card_front[0].url;
-    console.log("id_card_front: ", id_card_front);
-    if(id_card_front == ""){
-      wx.showToast({
-        title: '请上传身份证',
-        icon: "error"
-      })
-      return;
-    }
-    let id_card_back = this.data.id_card_back[0].url;
-    console.log("id_card_back: ", id_card_back);
-    if(id_card_back == ""){
-      wx.showToast({
-        title: '请上传身份证',
-        icon: "error"
-      })
-      return;
-    }
-    let sign_image = this.data.sign_image;
-    console.log("sign_image: ", sign_image);
-    if(sign_image == ""){
-      wx.showToast({
-        title: '请上传签名',
-        icon: "error"
-      })
-      return;
-    }
-    let params = {};
-    params.id_card_front = id_card_front;
-    params.id_card_back = id_card_back;
-    params.sign_image = sign_image;
-    api.postDoctorAuthMulti(params).then(response => {
-      console.log("postDoctorAuthMulti: ",response);
-      wx.showToast({
-        title: '提交成功',
-        icon: "success"
-      })
-    }).catch(errors => {
-      console.error(errors);
+    let _this = this;
+    wx.requestSubscribeMessage({
+      tmplIds: ['kUy70xHlr7ADo4aIHiictM4Te7MSec3E5kHsYvFQu40'],
+      success (res) { 
+        console.log(res);
+        let id_card_front = _this.data.id_card_front[0].url;
+        console.log("id_card_front: ", id_card_front);
+        if(id_card_front == ""){
+          wx.showToast({
+            title: '请上传身份证',
+            icon: "error"
+          })
+          return;
+        }
+        let id_card_back = _this.data.id_card_back[0].url;
+        console.log("id_card_back: ", id_card_back);
+        if(id_card_back == ""){
+          wx.showToast({
+            title: '请上传身份证',
+            icon: "error"
+          })
+          return;
+        }
+        let sign_image = _this.data.sign_image;
+        console.log("sign_image: ", sign_image);
+        if(sign_image == ""){
+          wx.showToast({
+            title: '请上传签名',
+            icon: "error"
+          })
+          return;
+        }
+        let params = {};
+        params.id_card_front = id_card_front;
+        params.id_card_back = id_card_back;
+        params.sign_image = sign_image;
+        api.postDoctorAuthMulti(params).then(response => {
+          console.log("postDoctorAuthMulti: ",response);
+          wx.showToast({
+            title: '提交成功',
+            icon: "success"
+          })
+
+          
+          // 订阅处方审核结果通知（长期）
+          wx.requestSubscribeMessage({
+            tmplIds: ['kUy70xHlr7ADo4aIHiictM4Te7MSec3E5kHsYvFQu40'],
+            success (res) { console.log(res); }
+          })
+
+
+        }).catch(errors => {
+          console.error(errors);
+        })
+      },
+      fail (res) { console.log(res) },
+      complete (res) { console.log(res) },
     })
+
+    
   },
   doUploadFile(event) {
     console.log("index douploadFIle: ", event);
diff --git a/Pages/yishi/zhiye_identity/index.wxml b/Pages/yishi/zhiye_identity/index.wxml
index 3d986e1..a06e626 100644
--- a/Pages/yishi/zhiye_identity/index.wxml
+++ b/Pages/yishi/zhiye_identity/index.wxml
@@ -59,5 +59,8 @@
       <!-- <van-button custom-style="font-size:30rpx; color:#fff; border-radius: 20rpx; background-color: #999"  block>资料未填写完</van-button> -->
       <van-button bind:click="add" custom-style="font-size:30rpx; color:#fff; border-radius: 20rpx; background-color: #3CC7C0"  block>提交</van-button>
     </view>
+    <view style="height: 50rpx;"> 
+      
+    </view>
   </van-cell-group>
 </view>
\ No newline at end of file
diff --git a/commpents/myprofile/index.js b/commpents/myprofile/index.js
index 53fac75..560f0fd 100644
--- a/commpents/myprofile/index.js
+++ b/commpents/myprofile/index.js
@@ -638,23 +638,26 @@ Component({
       params.qualification_cert = this.data.zige_file_list.map(e => e.url);//医生资格证
       if(this.data.zhicheng_file_list.length == 0){wx.showToast({title: '请上传职称证',icon: "error"});return}
       params.work_cert = this.data.zhicheng_file_list.map(e => e.url);//工作证，职称证
-      
-  
       console.log(params);
   
-      api.postDoctorAuthIden(params).then(response => {
-        console.log(response);
-        wx.showToast({
-          title: '提交成功',
-          icon: "success"
-        })
-  
-        this.setData({
-          iden_auth_status_txt: "审核中",
-          iden_auth_disabled: true
-        })
-  
-      }).catch(errors => {console.error(errors);})
+      let _this = this;
+      wx.requestSubscribeMessage({
+        tmplIds: ['kUy70xHlr7ADo4aIHiictM4Te7MSec3E5kHsYvFQu40'],
+        success (res) {
+          console.log(res);
+          api.postDoctorAuthIden(params).then(response => {
+            console.log(response);
+            wx.showToast({
+              title: '提交成功',
+              icon: "success"
+            })
+            _this.setData({
+              iden_auth_status_txt: "审核中",
+              iden_auth_disabled: true
+            })
+          }).catch(errors => {console.error(errors);})
+        }
+      })
     },
     doUploadFile(event) {
       console.log("index douploadFIle: ", event);
diff --git a/commpents/wenzhen_data/index.js b/commpents/wenzhen_data/index.js
index 2df19bd..fa8b97e 100644
--- a/commpents/wenzhen_data/index.js
+++ b/commpents/wenzhen_data/index.js
@@ -80,10 +80,16 @@ Component({
       })
     },
     goChat(e){
-      let from_account = e.currentTarget.dataset.from_account;
-      let order_inquiry_id = e.currentTarget.dataset.order_inquiry_id;
-      wx.navigateTo({
-        url: e.currentTarget.dataset.url+"?from_account="+from_account+"&order_inquiry_id="+order_inquiry_id
+      wx.requestSubscribeMessage({
+        tmplIds: ['jhYUf91ULCTX_f69hazqAYwImdFf8ELasRAwB6X-MTM'],
+        success (res) {
+          console.log(res);
+          let from_account = e.currentTarget.dataset.from_account;
+          let order_inquiry_id = e.currentTarget.dataset.order_inquiry_id;
+          wx.navigateTo({
+            url: e.currentTarget.dataset.url+"?from_account="+from_account+"&order_inquiry_id="+order_inquiry_id
+          })
+        }
       })
     },
     tabShow(){
diff --git a/utils/network/request.js b/utils/network/request.js
index 740b86a..e0c1d2d 100644
--- a/utils/network/request.js
+++ b/utils/network/request.js
@@ -47,9 +47,6 @@ class HTTP {
             } else {
               reject(res.data.message)
               this._show_error(res.data.message)
-              wx.navigateTo({
-                url: "/Pages/index/index"
-              })
             }
         } else {
             resolve(res.data)

From dea1555b9b222aee91b19015712f2cbdcc4e0a64 Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Tue, 14 Mar 2023 18:59:25 +0800
Subject: [PATCH 07/83] tt

---
 Pages/yishi/cashrecord/index.wxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Pages/yishi/cashrecord/index.wxml b/Pages/yishi/cashrecord/index.wxml
index a27962d..71c87ec 100644
--- a/Pages/yishi/cashrecord/index.wxml
+++ b/Pages/yishi/cashrecord/index.wxml
@@ -34,7 +34,7 @@
           <t-image custom-style="" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/bankcard/js_icon.png" mode="heightFix" height="50rpx" aria-label="role" />
         </view>
         <view class="data_item_top_content">
-          <view class="name">张三三<text style="margin-left:20rpx;font-size: 28rpx;corlor:#999;">（尾号9900）</text></view>
+          <view class="name">张三三<text style="margin-left:20rpx;font-size: 28rpx; corlor:#999;">（尾号9900）</text></view>
           <view class="date">12.09  13:23</view>
         </view>
         <view class="data_item_top_num">

From 589c2cf823b1e0216e840db9fec2a4864120e8a1 Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Fri, 17 Mar 2023 10:13:35 +0800
Subject: [PATCH 08/83] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/login/index.js                          |   2 +
 Pages/login/index.wxss                        |   4 +-
 Pages/mobile_login/index.js                   |   3 +
 Pages/mobile_login/index.json                 |   3 +-
 Pages/mobile_login/index.wxml                 |   2 +-
 Pages/webpage/index.js                        |  18 +
 Pages/webpage/index.json                      |   3 +
 Pages/webpage/index.wxml                      |   2 +
 Pages/webpage/index.wxss                      |   1 +
 .../yaoshi/authentication/authentication.wxml |  20 +-
 Pages/yaoshi/info/info.wxml                   |  18 +-
 Pages/yaoshi/my/my.wxml                       |   2 +-
 Pages/yaoshi/prescription/prescription.wxml   |   2 +-
 Pages/yishi/attestation/index.wxml            |   4 +-
 Pages/yishi/bankcard/index.js                 |   2 +-
 Pages/yishi/bankcard/index.json               |   2 +-
 Pages/yishi/bankcard/index.wxml               |   8 +-
 Pages/yishi/bindcard/index.js                 |   6 +-
 Pages/yishi/bindcard/index.wxml               |   8 +-
 Pages/yishi/case/index.wxml                   |   8 +-
 Pages/yishi/cash/index.js                     |  21 +-
 Pages/yishi/cash/index.json                   |   3 +-
 Pages/yishi/cash/index.wxml                   |  14 +-
 Pages/yishi/cashrecord/index.json             |   2 +-
 Pages/yishi/cashrecord/index.wxml             |   4 +-
 Pages/yishi/chat/index.js                     |   7 +-
 Pages/yishi/chat/index.wxml                   |   2 +-
 Pages/yishi/identity/index.js                 |  82 ++--
 Pages/yishi/identity/index.wxml               |  21 +-
 Pages/yishi/identity/index.wxss               |  10 +-
 Pages/yishi/index/index.js                    | 401 +++++++++++-------
 Pages/yishi/index/index.json                  |   2 -
 Pages/yishi/index/index.wxml                  |  45 +-
 Pages/yishi/index/index.wxss                  |  19 +-
 Pages/yishi/kuaisusetup/index.js              |   2 +-
 Pages/yishi/kuaisusetup/index.wxml            |   2 +-
 Pages/yishi/manual/index.wxml                 |   2 +-
 Pages/yishi/my/index.js                       |   3 +-
 Pages/yishi/my/index.wxml                     |  10 +-
 Pages/yishi/myaccount/index.json              |   2 +-
 Pages/yishi/myaccount/index.wxml              |   4 +-
 Pages/yishi/mycard/index.js                   |  21 +-
 Pages/yishi/mycard/index.json                 |   2 +-
 Pages/yishi/mycard/index.wxml                 |   6 +-
 Pages/yishi/myinfo/index.js                   |   2 +-
 Pages/yishi/myinfo/index.wxml                 |   8 +-
 Pages/yishi/myprofile/index.wxss              |   3 +
 Pages/yishi/onlinesetup/index.js              |   2 +-
 Pages/yishi/onlinesetup/index.wxml            |   2 +-
 Pages/yishi/quickreply/index.wxml             |   4 +-
 Pages/yishi/quickreply_data/index.wxml        |   6 +-
 Pages/yishi/service_notice/index.json         |   2 +-
 Pages/yishi/service_notice/index.wxml         |   8 +-
 Pages/yishi/signcanvas/index.js               |  11 +-
 Pages/yishi/system_notice/index.json          |   2 +-
 Pages/yishi/system_notice/index.wxml          |  10 +-
 Pages/yishi/wenzhen/wenzhen.json              |   2 +-
 Pages/yishi/wenzhen/wenzhen.wxml              |   7 +-
 Pages/yishi/wenzhen_v2/wenzhen.js             |  63 +--
 Pages/yishi/wenzhen_v2/wenzhen.json           |   4 +-
 Pages/yishi/wenzhen_v2/wenzhen.wxml           |  74 ++--
 Pages/yishi/yizhensetup/index.js              |   6 +-
 Pages/yishi/yizhensetup/index.wxml            |   4 +-
 Pages/yishi/zhiye_identity/index.js           |  50 ++-
 Pages/yishi/zhiye_identity/index.wxml         |  71 ++--
 .../TUIChat/components/MessageInput/index.js  |   8 +-
 .../TUIChat/components/MessageList/index.js   |  15 +-
 TUIKit/components/TUIChat/index.js            |   4 +
 TUIKit/components/TUIChat/index.wxml          |   4 +-
 app.js                                        | 100 +++--
 app.json                                      |   3 +-
 commpents/mynavbar/index.wxss                 |   4 +-
 commpents/myprofile/index.js                  |  24 +-
 commpents/myprofile/index.json                |   3 +-
 commpents/myprofile/index.wxml                |  15 +-
 commpents/myprofile/index.wxss                |   8 +
 commpents/wenzhen_data/index.js               |  10 +-
 commpents/wenzhen_data/index.wxml             |   2 +-
 custom-tab-bar/index.js                       |  58 ++-
 utils/network/api.js                          |  12 +-
 utils/util.js                                 |   2 +-
 81 files changed, 894 insertions(+), 524 deletions(-)
 create mode 100644 Pages/webpage/index.js
 create mode 100644 Pages/webpage/index.json
 create mode 100644 Pages/webpage/index.wxml
 create mode 100644 Pages/webpage/index.wxss

diff --git a/Pages/login/index.js b/Pages/login/index.js
index 97f11c1..1bd4d75 100644
--- a/Pages/login/index.js
+++ b/Pages/login/index.js
@@ -42,6 +42,8 @@ Page({
           wx.setStorageSync('AUTH_TOKEN', response.data.token);
           wx.setStorageSync('user_id', response.data.user_id);
           wx.setStorageSync('client_user_id', response.data.client_user_id);
+          app.globalData.config.userID = response.data.user_id;
+          app.imInit();
           //跳转页面
           wx.switchTab({
             url: next_url
diff --git a/Pages/login/index.wxss b/Pages/login/index.wxss
index 01c5e71..c1bbc34 100644
--- a/Pages/login/index.wxss
+++ b/Pages/login/index.wxss
@@ -7,7 +7,7 @@
   top: 0;
   width: 750rpx;
   height: 170rpx;
-  background-color: #bae46b;
+  background-color: #69d85f;
   z-index: 99;
 }
 .tui-navigatorbar-back{
@@ -23,7 +23,7 @@
   height: 88rpx;
   line-height: 56rpx;
   font-size: 36rpx;
-  color: #e68080;
+  color: #000000;
   bottom: 0;
   left: 200rpx;
   display: flex;
diff --git a/Pages/mobile_login/index.js b/Pages/mobile_login/index.js
index 8f9d448..c35cb02 100644
--- a/Pages/mobile_login/index.js
+++ b/Pages/mobile_login/index.js
@@ -1,5 +1,6 @@
 import { API } from './../../utils/network/api'
 const api = new API()
+const app = getApp()
 Page({
   data: {
     navbarData: {
@@ -64,6 +65,8 @@ Page({
       wx.setStorageSync('AUTH_TOKEN', response.data.token);
       wx.setStorageSync('user_id', response.data.user_id);
       wx.setStorageSync('client_user_id', response.data.client_user_id);
+      app.globalData.config.userID = response.data.user_id;
+      app.imInit();
       wx.switchTab({
         url:  wx.getStorageSync('next_url')
       })
diff --git a/Pages/mobile_login/index.json b/Pages/mobile_login/index.json
index 57d5f40..aeeb6c8 100644
--- a/Pages/mobile_login/index.json
+++ b/Pages/mobile_login/index.json
@@ -5,6 +5,7 @@
     "van-field": "@vant/weapp/field/index",
     "van-button": "@vant/weapp/button/index",
     "van-checkbox": "@vant/weapp/checkbox/index",
-    "van-checkbox-group": "@vant/weapp/checkbox-group/index"
+    "van-checkbox-group": "@vant/weapp/checkbox-group/index",
+    "van-image": "@vant/weapp/image/index"
   }
 }
\ No newline at end of file
diff --git a/Pages/mobile_login/index.wxml b/Pages/mobile_login/index.wxml
index 7e1d9d8..3dfcddc 100644
--- a/Pages/mobile_login/index.wxml
+++ b/Pages/mobile_login/index.wxml
@@ -1,6 +1,6 @@
 <m-nav-bar navbarData="{{navbarData}}">
   <view class="logo">
-    <image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/logo2.png" mode="heightFix" style="height: 196rpx;"></image>
+    <van-image height="196rpx" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/logo2.png" fit="heightFix" />
   </view>
   <view class="fields">
       <van-field
diff --git a/Pages/webpage/index.js b/Pages/webpage/index.js
new file mode 100644
index 0000000..9422bb5
--- /dev/null
+++ b/Pages/webpage/index.js
@@ -0,0 +1,18 @@
+// Pages/webpage/index.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    src: ""
+  },
+
+  onLoad(options) {
+    console.log(options.src)
+    this.setData({
+      src: options.src
+    })
+  },
+
+})
\ No newline at end of file
diff --git a/Pages/webpage/index.json b/Pages/webpage/index.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/Pages/webpage/index.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/Pages/webpage/index.wxml b/Pages/webpage/index.wxml
new file mode 100644
index 0000000..22a9b46
--- /dev/null
+++ b/Pages/webpage/index.wxml
@@ -0,0 +1,2 @@
+<!--Pages/webpage/index.wxml-->
+<web-view src="{{src}}"/>
diff --git a/Pages/webpage/index.wxss b/Pages/webpage/index.wxss
new file mode 100644
index 0000000..12b229e
--- /dev/null
+++ b/Pages/webpage/index.wxss
@@ -0,0 +1 @@
+/* Pages/webpage/index.wxss */
\ No newline at end of file
diff --git a/Pages/yaoshi/authentication/authentication.wxml b/Pages/yaoshi/authentication/authentication.wxml
index 10e9244..2c4f3db 100644
--- a/Pages/yaoshi/authentication/authentication.wxml
+++ b/Pages/yaoshi/authentication/authentication.wxml
@@ -1,16 +1,16 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container">
   <van-cell-group>
-    <van-cell title="真实姓名" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-    <van-cell title="身份证号" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-    <van-cell title="联系邮箱" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-    <van-cell title="手机号码" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-    <van-cell title="所在医疗机构" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-    <van-cell title="所在科室" title-width="120rpx" is-link required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-    <van-cell title="职称" title-width="120rpx" is-link required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-    <van-cell title="医龄" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-    <van-cell title="执业经历" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-    <van-cell title="擅长" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
+    <van-cell size="large" title="真实姓名" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
+    <van-cell size="large" title="身份证号" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
+    <van-cell size="large" title="联系邮箱" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
+    <van-cell size="large" title="手机号码" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
+    <van-cell size="large" title="所在医疗机构" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
+    <van-cell size="large" title="所在科室" title-width="120rpx" is-link required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
+    <van-cell size="large" title="职称" title-width="120rpx" is-link required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
+    <van-cell size="large" title="医龄" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
+    <van-cell size="large" title="执业经历" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
+    <van-cell size="large" title="擅长" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
   </van-cell-group>
   <view class="submit">
     <van-button color="linear-gradient(to right, #4CABEA, #64CFE9)" block round type="info">下一步</van-button>
diff --git a/Pages/yaoshi/info/info.wxml b/Pages/yaoshi/info/info.wxml
index ab98404..01a1be7 100644
--- a/Pages/yaoshi/info/info.wxml
+++ b/Pages/yaoshi/info/info.wxml
@@ -1,19 +1,19 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container">
   <view class="top">
-    <t-avatar class="avatar" size="large" image="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/default_photo.png" />
+    <t-avatar class="avatar" size="large" image="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/yaoshi_default_photo.png" />
     <text class="name">李四</text>
   </view>
   <view class="content">
     <van-cell-group>
-      <van-cell title="姓名" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="李四" />
-      <van-cell title="性别" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-      <van-cell title="年龄" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-      <van-cell title="身份证号" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-      <van-cell title="手机号码" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-      <van-cell title="我的地址" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-      <van-cell title="科室" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-      <van-cell title="职称" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
+      <van-cell size="large" title="姓名" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="李四" />
+      <van-cell size="large" title="性别" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
+      <van-cell size="large" title="年龄" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
+      <van-cell size="large" title="身份证号" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
+      <van-cell size="large" title="手机号码" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
+      <van-cell size="large" title="我的地址" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
+      <van-cell size="large" title="科室" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
+      <van-cell size="large" title="职称" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
     </van-cell-group>
   </view>
 </view>
\ No newline at end of file
diff --git a/Pages/yaoshi/my/my.wxml b/Pages/yaoshi/my/my.wxml
index de38384..97df817 100644
--- a/Pages/yaoshi/my/my.wxml
+++ b/Pages/yaoshi/my/my.wxml
@@ -1,7 +1,7 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container">
   <view class="top">
-    <t-avatar class="avatar" size="large" image="/static/images/default_photo.png" />
+    <t-avatar class="avatar" size="large" image="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/yaoshi_default_photo.png" />
     <text class="name">李四</text>
   </view>
   <view class="content">
diff --git a/Pages/yaoshi/prescription/prescription.wxml b/Pages/yaoshi/prescription/prescription.wxml
index b1af226..7a75c57 100644
--- a/Pages/yaoshi/prescription/prescription.wxml
+++ b/Pages/yaoshi/prescription/prescription.wxml
@@ -23,7 +23,7 @@
 
   <van-popup show="{{ bohuishow }}" bind:close="onClose">
     <view class="pop">
-      <van-cell title="驳回理由:" is-link value="{{ resonText }}" bind:click="showReasonPopup"/>
+      <van-cell size="large" title="驳回理由:" is-link value="{{ resonText }}" bind:click="showReasonPopup"/>
       <view class="pop_button">
         <view class="pop_button_txt" bindtap="closePopup">取消</view>
         <view class="pop_button_txt" bindtap="submitBohui">确认驳回</view>
diff --git a/Pages/yishi/attestation/index.wxml b/Pages/yishi/attestation/index.wxml
index 80c7612..5b7f341 100644
--- a/Pages/yishi/attestation/index.wxml
+++ b/Pages/yishi/attestation/index.wxml
@@ -1,6 +1,6 @@
 <!-- 实名认证结果页面 -->
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
-  <van-cell title="真实姓名" value="{{card_name}}" />
-  <van-cell title="身份证号" value="{{card_num_mask}}" />
+  <van-cell size="large" title="真实姓名" value="{{card_name}}" />
+  <van-cell size="large" title="身份证号" value="{{card_num_mask}}" />
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/bankcard/index.js b/Pages/yishi/bankcard/index.js
index bc1aca1..85b2f81 100644
--- a/Pages/yishi/bankcard/index.js
+++ b/Pages/yishi/bankcard/index.js
@@ -17,7 +17,7 @@ Page({
   onShow(){
 
     api.getDoctorBank().then(response => {
-      if(response.data.total > 0){
+      if(response.data.bank_card_id){
         this.setData({
           banklist_empty: false,
           bank_card_code_mask: response.data.bank_card_code_mask,
diff --git a/Pages/yishi/bankcard/index.json b/Pages/yishi/bankcard/index.json
index 02f0ecb..e4c1b31 100644
--- a/Pages/yishi/bankcard/index.json
+++ b/Pages/yishi/bankcard/index.json
@@ -2,7 +2,7 @@
   "component": true,
   "usingComponents": {
     "te-nav-bar": "/commpents/te_navbar",
-    "t-image": "tdesign-miniprogram/image/image",
+    "van-image": "@vant/weapp/image/index",
     "t-icon": "tdesign-miniprogram/icon/icon",
     "van-button": "@vant/weapp/button/index"
   }
diff --git a/Pages/yishi/bankcard/index.wxml b/Pages/yishi/bankcard/index.wxml
index 8931661..d554abe 100644
--- a/Pages/yishi/bankcard/index.wxml
+++ b/Pages/yishi/bankcard/index.wxml
@@ -11,24 +11,24 @@
   </view>
   <view class="bankcard_empty_box" wx:if="{{ banklist_empty }}">
     <view class="bankcard_empty">
-      <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/bankcard_empty.png" mode="heightFix" width="200rpx" aria-label="空" />
+      <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/bankcard_empty.png" fit="heightFix" width="200rpx" aria-label="空" />
     </view>
       <van-button data-url="/Pages/yishi/bindcard/index" bind:click="go" custom-style="font-size: 30rpx;border-radius: 10rpx;background-color:#3CC7C0;border: none;width: 92vw;margin: 50rpx auto;" type="primary" block>添加结算银行卡</van-button>
     <view class="note">提示：每人只能绑定一张银行卡，银行卡绑定成功后每月只能修改结算银行卡一次，请谨慎绑定。</view>
   </view>
   <view class="bankcard_list" wx:if="{{ !banklist_empty }}">
     <view class="bankcard_list_item">
-      <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/bankcard/gs.png" mode="widthFix" width="100%" aria-label="空" />
+      <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/bankcard/gs.png" fit="widthFix" width="100%" aria-label="空" />
       <view class="bankcard_list_item_name">{{bank_name}}</view>
       <view class="bankcard_list_item_num">{{bank_card_code_mask}}</view>
     </view>
     <!-- <view class="bankcard_list_item">
-      <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/bankcard/ny.png" mode="widthFix" width="100%" aria-label="空" />
+      <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/bankcard/ny.png" fit="widthFix" width="100%" aria-label="空" />
       <view class="bankcard_list_item_name">中国农业银行</view>
       <view class="bankcard_list_item_num">3034 **** **** **** 2698</view>
     </view> -->
    <!--  <view class="bankcard_list_item">
-      <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/bankcard/js.png" mode="widthFix" width="100%" aria-label="空" />
+      <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/bankcard/js.png" fit="widthFix" width="100%" aria-label="空" />
       <view class="bankcard_list_item_name">中国建设银行</view>
       <view class="bankcard_list_item_num">3034 **** **** **** 2698</view>
     </view> -->
diff --git a/Pages/yishi/bindcard/index.js b/Pages/yishi/bindcard/index.js
index 20aa6b1..21828c2 100644
--- a/Pages/yishi/bindcard/index.js
+++ b/Pages/yishi/bindcard/index.js
@@ -32,8 +32,8 @@ Page({
   onLoad(options){
     console.log("options: ", options);
     let bank_card_id = options.bank_card_id;
-    console.log("options bank_card_id: ", bank_card_id);
-    if(bank_card_id){
+    if(bank_card_id && bank_card_id != "undefined"){
+      console.log("options bank_card_id: ", bank_card_id);
       this.setData({
         bank_card_id: bank_card_id
       })
@@ -218,6 +218,7 @@ Page({
           title: '更换成功',
           icon: "success"
         })
+        wx.navigateBack();
       }).catch(errors => {console.error(errors); })
     }else{
       //绑定医生银行卡
@@ -227,6 +228,7 @@ Page({
           title: '绑定成功',
           icon: "success"
         })
+        wx.navigateBack();
       }).catch(errors => {console.error(errors); })
     }
   }
diff --git a/Pages/yishi/bindcard/index.wxml b/Pages/yishi/bindcard/index.wxml
index c2c3859..a513bca 100644
--- a/Pages/yishi/bindcard/index.wxml
+++ b/Pages/yishi/bindcard/index.wxml
@@ -6,15 +6,15 @@
   </view>
   <view class="info">
     <van-cell-group>
-      <van-cell title="姓名" value="{{realname}}" />
-      <van-cell title="身份证号" value="{{idcard}}" border="{{ false }}" />
+      <van-cell size="large" title="姓名" value="{{realname}}" />
+      <van-cell size="large" title="身份证号" value="{{idcard}}" border="{{ false }}" />
     </van-cell-group>
   </view>
 
   <view class="bankcard">
     <van-cell-group>
-      <van-cell title="所在城市" value="{{city_note}}" is-link bindtap="onCityShow"/>
-      <van-cell title="开户行" value="{{bank_note}}" is-link bindtap="onBankShow"/>
+      <van-cell size="large" title="所在城市" value="{{city_note}}" is-link bindtap="onCityShow"/>
+      <van-cell size="large" title="开户行" value="{{bank_note}}" is-link bindtap="onBankShow"/>
       <van-field 
         label="银行卡号"
         placeholder="请输入卡号"
diff --git a/Pages/yishi/case/index.wxml b/Pages/yishi/case/index.wxml
index b8790ce..739505b 100644
--- a/Pages/yishi/case/index.wxml
+++ b/Pages/yishi/case/index.wxml
@@ -11,7 +11,7 @@
       <view class="weight info_item"><text class="info_title">体重：</text><text class="info_val">{{case_detail.weight}}KG</text></view>
       <view class="minzu info_item"><text class="info_title">民族：</text><text class="info_val">{{case_detail.nation_name}}</text></view>
       <view class="zhiye info_item"><text class="info_title">职业：</text><text class="info_val">{{case_detail.job_name}}</text></view>
-      <view class="hunyin info_item"><text class="info_title">婚姻：</text><text class="info_val">{{case_detail.nation_name}}</text></view>
+      <view class="hunyin info_item"><text class="info_title">婚姻：</text><text class="info_val">{{case_detail.marital_status==0?'未婚':case_detail.marital_status==1?'已婚':case_detail.marital_status==2?'离异':'未知'}}</text></view>
     </view>
     <view class="disease_box">
       <view class="disease_box_item">
@@ -32,10 +32,10 @@
       </view>
       <view class="disease_box_item">
         <view class="title">正在服用的药品信息：</view>
-        <view class="conent">{{case_detail.disease_class_name}}</view>
+        <view class="conent">{{case_detail.drugs_name==''?'无':''}}</view>
       </view>
-      <view class="disease_info">
-        详细描述：阿托伐他汀钙片8片 （用法用量：常用的起始剂量为10mg每日一次
+      <view class="disease_info" wx:if="{{case_detail.drugs_name != ''}}">
+        详细描述：{{case_detail.drugs_name}}
       </view>
       <view class="disease_box_item">
         <view class="title">病情描述：</view>
diff --git a/Pages/yishi/cash/index.js b/Pages/yishi/cash/index.js
index 467c097..7b0b7a4 100644
--- a/Pages/yishi/cash/index.js
+++ b/Pages/yishi/cash/index.js
@@ -15,7 +15,8 @@ Page({
     bank_name	: "招商银行",
     bank_card_code_mask: "2233 9988 9989 9900",
     withdrawal_amount: "987",
-    income_tax: "12"
+    income_tax: "12",
+    contactKeFu: false
   },
   onLoad(options){
     //获取提现数据
@@ -34,5 +35,21 @@ Page({
     }).catch(errors => {
       console.error(errors);
     })
-  }
+  },
+  contactKeFu(e){
+    let _this = this;
+
+    console.log("concatKeFu");
+    wx.requestSubscribeMessage({
+      tmplIds: ['JMPmlYGh1HcUSuEfJCVQUIsZv4H5ar3QvXZfrNYNFuc'],
+      success (res) {
+        console.log(res);
+        _this.setData({
+          contactKeFu: true
+        })
+
+      }
+    })
+
+  },
 })
\ No newline at end of file
diff --git a/Pages/yishi/cash/index.json b/Pages/yishi/cash/index.json
index 7095cf3..c3b0e34 100644
--- a/Pages/yishi/cash/index.json
+++ b/Pages/yishi/cash/index.json
@@ -4,6 +4,7 @@
     "te-nav-bar": "/commpents/te_navbar",
     "t-image": "tdesign-miniprogram/image/image",
     "van-icon": "@vant/weapp/icon/index",
-    "van-button": "@vant/weapp/button/index"
+    "van-button": "@vant/weapp/button/index",
+    "van-dialog": "@vant/weapp/dialog/index"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/cash/index.wxml b/Pages/yishi/cash/index.wxml
index 5e79139..e626c74 100644
--- a/Pages/yishi/cash/index.wxml
+++ b/Pages/yishi/cash/index.wxml
@@ -41,18 +41,26 @@
     </view>
   </view>
 
-  <view class="note">
+  <!-- <view class="note">
     <text>
       说明：1、每月只可提取一次，提现金额大于300元才可提现，限额1万元；
       2、平台会在24小时内自动结算至您绑定的银行卡内，请注意查收银行信息；
       3、平台代扣个人所得税，根据公式：
     </text>
-  </view>
+  </view> -->
 
   <view class="bottom">
     <van-button custom-style="border-radius: 10rpx;" block color="#3CC7C0">提取</van-button>
-    <view class="kefu">
+    <view class="kefu" bindtap="contactKeFu">
       <text>联系客服</text>
     </view>
   </view>
+
+  <van-dialog
+    title="立即联系客服"
+    show="{{ contactKeFu }}"
+    show-cancel-button
+    confirm-button-color="#3CC7C0"
+    confirm-button-open-type="contact"
+  />
 </view>
diff --git a/Pages/yishi/cashrecord/index.json b/Pages/yishi/cashrecord/index.json
index acbbb5d..69e4702 100644
--- a/Pages/yishi/cashrecord/index.json
+++ b/Pages/yishi/cashrecord/index.json
@@ -4,7 +4,7 @@
     "te-nav-bar": "/commpents/te_navbar",
     "van-icon": "@vant/weapp/icon/index",
     "van-empty": "@vant/weapp/empty/index",
-    "t-image": "tdesign-miniprogram/image/image",
+    "van-image": "@vant/weapp/image/index",
     "t-picker": "tdesign-miniprogram/picker/picker",
     "t-picker-item": "tdesign-miniprogram/picker-item/picker-item"
   }
diff --git a/Pages/yishi/cashrecord/index.wxml b/Pages/yishi/cashrecord/index.wxml
index 71c87ec..6995638 100644
--- a/Pages/yishi/cashrecord/index.wxml
+++ b/Pages/yishi/cashrecord/index.wxml
@@ -11,7 +11,7 @@
     <view class="data_item" wx:for="{{record_list}}">
       <view class="data_item_top">
         <view class="data_item_top_icon">
-          <t-image custom-style="" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/bankcard/js_icon.png" mode="heightFix" height="50rpx" aria-label="role" />
+          <van-image custom-style="" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/bankcard/js_icon.png" fit="heightFix" height="50rpx" aria-label="role" />
         </view>
         <view class="data_item_top_content">
           <view class="name">{{item.account_name}}<text style="margin-left:20rpx;font-size: 28rpx;corlor:#999;">（尾号{{item.bank_card_code_four}}）</text></view>
@@ -31,7 +31,7 @@
     <view class="data_item">
       <view class="data_item_top">
         <view class="data_item_top_icon">
-          <t-image custom-style="" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/bankcard/js_icon.png" mode="heightFix" height="50rpx" aria-label="role" />
+          <van-image custom-style="" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/bankcard/js_icon.png" fit="heightFix" height="50rpx" aria-label="role" />
         </view>
         <view class="data_item_top_content">
           <view class="name">张三三<text style="margin-left:20rpx;font-size: 28rpx; corlor:#999;">（尾号9900）</text></view>
diff --git a/Pages/yishi/chat/index.js b/Pages/yishi/chat/index.js
index c278fca..cc8a0df 100644
--- a/Pages/yishi/chat/index.js
+++ b/Pages/yishi/chat/index.js
@@ -4,15 +4,18 @@ Page({
     patient_account: "10000",
     title: '患者姓名',
     height: app.globalData.height,
-    order_inquiry_id: ""
+    order_inquiry_id: "",
+    inquiry_type: "",
   },
   onLoad(option) {
-    console.log("chat onload");
+    console.log("chat onload", option);
     let from_account = option.from_account;
     let order_inquiry_id = option.order_inquiry_id;
+    let inquiry_type = option.inquiry_type;
     this.setData({
       patient_account: from_account,
       order_inquiry_id: order_inquiry_id,
+      inquiry_type: inquiry_type,
     })
   },
   onUnload() {
diff --git a/Pages/yishi/chat/index.wxml b/Pages/yishi/chat/index.wxml
index a441fac..36e8586 100644
--- a/Pages/yishi/chat/index.wxml
+++ b/Pages/yishi/chat/index.wxml
@@ -1,5 +1,5 @@
 <!-- 一对一聊天  不带会话列表 -->
 <view>
-    <TUIChat id="TUIChat" currentConversationID="C2C{{patient_account}}" order_inquiry_id="{{order_inquiry_id}}"
+    <TUIChat id="TUIChat" currentConversationID="C2C{{patient_account}}" inquiry_type="{{inquiry_type}}" order_inquiry_id="{{order_inquiry_id}}"
     hasCallKit="{{ true }}" bind:handleCall="handleCall"></TUIChat>
 </view>
diff --git a/Pages/yishi/identity/index.js b/Pages/yishi/identity/index.js
index 751b8c4..59639ab 100644
--- a/Pages/yishi/identity/index.js
+++ b/Pages/yishi/identity/index.js
@@ -10,26 +10,57 @@ Page({
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '医师身份认证', //导航栏 中间的标题
     },
+    navHeight: 0,
+    stateHeight: 0,
     height: app.globalData.height,  
     //选项卡
     stickyProps: {
-      zIndex: 2,
+      zIndex: 999999,
+      offsetTop: (app.globalData.height * 2)
     },
-   
+    selected_tab: 0,
+    panel_2_disabled: true,
+    next_btn_disabled: false,
+    next_btn_txt: "下一步",
+    realname: "",
+    idcard: ""
+  },
+  getMenuButtonBound() {
+    let stateHeight = 0; //  接收状态栏高度
+    const navHeight = wx.getMenuButtonBoundingClientRect().height; //  获取胶囊高度
+    let top = 0;
+    wx.getSystemInfo({
+      success(res) {
+        stateHeight = res.statusBarHeight;
+      },
+    });
+    top = wx.getMenuButtonBoundingClientRect().top - stateHeight; //  获取top值
+    console.log('navHeight', navHeight);
+    console.log('top', top);
+    this.setData({
+      // navHeight: navHeight + top * 2, //  导航栏高度
+      navHeight, //  导航栏高度
+      stateHeight: stateHeight + top, //  状态栏高度
+    });
+    this.setData({
+      "stickyProps.offsetTop": this.data.stateHeight + this.data.navHeight + 10
+    })
   },
   onLoad(){
     let _this = this;
     //获取实名认证信息
     api.getDoctorAuthReal().then(response => {
       console.log(response);
-      if(response.data){
-        this.setData({
-          realname:response.data.card_name,
-          idcard:response.data.card_num,
-          next_btn_txt: "已认证，不可修改",
-          next_btn_disabled: true,
-        });
+      if(response.data.length == 0){
+        return;
       }
+      this.setData({
+        realname:response.data.card_name,
+        idcard:response.data.card_num,
+        next_btn_txt: "已认证，不可修改",
+        next_btn_disabled: true,
+        panel_2_disabled: false,
+      });
     }).catch(errors => {
       console.error(errors);
     })
@@ -229,7 +260,7 @@ Page({
   },
   onShow(){
     console.log("onshow()....");
-    
+    this.getMenuButtonBound();
   },
   doUploadFile(event) {
     console.log("index douploadFIle: ", event);
@@ -308,6 +339,7 @@ Page({
   //新增实名认证信息
   postDoctorAuthReal(){
 
+    let _this = this;
     const realname = this.data.realname.trim();
     const idcard = this.data.idcard.trim();
 
@@ -335,25 +367,27 @@ Page({
       return false;
     }
 
-    wx.requestSubscribeMessage({
-      tmplIds: ['kUy70xHlr7ADo4aIHiictM4Te7MSec3E5kHsYvFQu40'],
-      success (res) {
-        console.log(res)
-        var params = {
-          card_name: realname,
-          card_num: idcard,
-        }
-        api.postDoctorAuthReal(params).then(response => {
-          console.log(response);
-        }).catch(errors => {
-          console.error(errors);
-        })
-      }
+    var params = {
+      card_name: realname,
+      card_num: idcard,
+    }
+    api.postDoctorAuthReal(params).then(response => {
+      console.log(response);
+      _this.setData({
+        panel_2_disabled: false,
+        selected_tab: 1
+      })
+    }).catch(errors => {
+      console.error(errors);
     })
     
   },
   onTabsChange(event) {
     console.log(`Change tab, tab-panel value is ${event.detail.value}.`);
+    this.setData({
+      selected_tab: event.detail.value
+    })
+
   },
   onTabsClick(event) {
     console.log(`Click tab, tab-panel value is ${event.detail.value}.`);
diff --git a/Pages/yishi/identity/index.wxml b/Pages/yishi/identity/index.wxml
index f1597b7..0bbe9c7 100644
--- a/Pages/yishi/identity/index.wxml
+++ b/Pages/yishi/identity/index.wxml
@@ -1,10 +1,11 @@
 <!-- <nav-bar navbar-data='{{navbarData}}' style="margin-bottom: {{height*2 + 20}}px;"></nav-bar> -->
 <te-nav-bar navbar-data='{{navbarData}}'></te-nav-bar>
-<view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
+<view class="container">
   <view class="tabs">
     <t-tabs
-      defaultValue="{{0}}"
-      sticky
+      defaultValue="{{ selected_tab }}"
+      value="{{selected_tab}}"
+      sticky="{{true}}"
       stickyProps="{{stickyProps}}"
       bind:change="onTabsChange"
       bind:click="onTabsClick"
@@ -14,7 +15,7 @@
       custom-style="font-size: 32rpx"
     >
       <!-- 实名认证tab -->
-      <t-tab-panel label="实名认证" value="0" style="{{tabPanelstyle}}">
+      <t-tab-panel label="实名认证" value="0" style="{{tabPanelstyle}}" catchtouchmove='true'>
         
         <van-cell-group>
           <van-field
@@ -38,7 +39,6 @@
             required
             clearable
             custom-style="font-size:30rpx;"
-            border="{{ false }}"
           />
         </van-cell-group>
 
@@ -57,10 +57,15 @@
       </t-tab-panel>
 
       <!-- 医师身份认证 -->
-      <t-tab-panel label="医师身份认证" value="1" style="{{tabPanelstyle}}">
-        <myprofile />
-
+      <t-tab-panel label="医师身份认证" value="1" disabled style="{{tabPanelstyle}}" wx:if="{{panel_2_disabled}}">
+        <myprofile wx:if="{{selected_tab == 1}}" />
       </t-tab-panel>
+
+      <t-tab-panel label="医师身份认证" value="1" style="{{tabPanelstyle}}" wx:if="{{!panel_2_disabled}}">
+        <myprofile wx:if="{{selected_tab == 1}}" />
+      </t-tab-panel>
+
+
     </t-tabs>
   </view>
   <van-toast id="van-toast" />
diff --git a/Pages/yishi/identity/index.wxss b/Pages/yishi/identity/index.wxss
index 1a9fd97..2031194 100644
--- a/Pages/yishi/identity/index.wxss
+++ b/Pages/yishi/identity/index.wxss
@@ -85,7 +85,7 @@
 }
 .bottom_next{
   width: 95vw;
-  margin: 530rpx auto;
+  margin: 530rpx auto 0 auto;
 }
 .sub_button{
   width: 95vw;
@@ -167,4 +167,12 @@
 
 .zhuanchang_btn--confirm {
   color: #3cc7c0;
+}
+.van-picker__columns {
+  height: 264px !important;
+  top: 40px !important;
+}
+.van-search {
+  top: -270px !important;
+  position: relative !important;
 }
\ No newline at end of file
diff --git a/Pages/yishi/index/index.js b/Pages/yishi/index/index.js
index 4874348..23eb0d3 100644
--- a/Pages/yishi/index/index.js
+++ b/Pages/yishi/index/index.js
@@ -25,8 +25,6 @@ Page({
     shiming_status_url: "",
     iden_auth_status_url: "/Pages/yishi/identity/index",
     multi_point_status_url: "/Pages/yishi/zhiye_identity/index",
-    current: 0,
-    autoplay: true,
     duration: 500,
     interval: 5000,
     swiperList: [
@@ -34,6 +32,8 @@ Page({
       `https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/ad2.jpg`,
       `https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/ad3.jpg`,
     ],
+    banner: [],
+    default_dialog_show: false,//只弹框一次
     dialog_visible: false,
     dialog_content: "请您先实名认证",
     /*
@@ -114,7 +114,15 @@ Page({
   onLoad(){
     
   },
-
+  onUnload(){
+    console.log("index onUnload() onUnload() ");
+  },
+  onHide(){
+    console.log("index onHide() onHide() ");
+    this.setData({
+      swiperList: []
+    })
+  },
   onShow: function () {
     if (typeof this.getTabBar === 'function' && this.getTabBar()) {
       this.getTabBar().setData({
@@ -182,7 +190,8 @@ Page({
       if(reject_prescription_number){
         this.setData({"info.reject_prescription_number": reject_prescription_number});
       }
-      
+      //格式化广告轮播
+      this.formatAD(response.data.banner);
       this.checkStatus();
       
       this.setData({
@@ -192,12 +201,232 @@ Page({
       console.error(errors);
     })
   },
-
-  onADChange(){
-    // console.log("onADChange");
+  formatAD(banner){
+    let swiperList = [];
+    banner.forEach(item => {
+      swiperList.push(item.banner_path);
+    })
+    this.setData({
+      banner: banner,
+      swiperList: swiperList
+    })
+  },
+  onTapAD(e) {
+    const { index } = e.detail;
+    console.log(index);
+    let item = this.data.banner[index];
+    console.log(item);
+    let open_with = item.open_with;
+    let banner_link = item.banner_link;
+    if(open_with == 1){//小程序页面
+      app.go(banner_link);
+    }else if(open_with == 2){//webview 页面
+      app.go("/Pages/webpage/index?src="+banner_link);
+    }
+  },
+  onChangeAD(e) {
+    // const { current, source } = e.detail;
+    // console.log(current, source);
   },
-
   go(e){
+    let checkDialog = this.checkDialog(e);
+    if(checkDialog){
+      let url = e.currentTarget.dataset.url;
+      console.log(url);
+      if(url.indexOf("wenzhen") > -1){
+        wx.switchTab({
+          url: url,
+        })
+      }
+      app.go(e.currentTarget.dataset.url)
+    }
+  },
+  confirmDialog(){
+    this.setData({
+      dialog_visible: false
+    })
+    app.go(this.data.shiming_status_url);
+  },
+  cancelDialog(){
+    this.setData({
+      dialog_visible: false
+    })
+  },
+  checkStatus(){
+     //实名认证
+     let idcard_status = this.data.info.idcard_status;
+     //医师身份认证
+     let iden_auth_status = this.data.info.iden_auth_status;
+     //多点执业认证
+     let multi_point_status = this.data.info.multi_point_status;
+
+     wx.setStorageSync('idcard_status', idcard_status);
+     wx.setStorageSync('iden_auth_status', iden_auth_status);
+
+    if(idcard_status == 0){
+      if(!this.data.default_dialog_show){
+        this.setData({
+          dialog_content: "请您先实名认证",
+          dialog_visible: true,
+          shiming_status_url: "/Pages/yishi/identity/index",
+          default_dialog_show: true
+        });
+      }
+      return false;
+    }
+
+    if(idcard_status == 2){
+      if(!this.data.default_dialog_show){
+        this.setData({
+          "info.info_shiming_status_txt": "认证失败",
+          "info.info_shiming_status": "info_shiming_status_yes",
+          shiming_status_url: "/Pages/yishi/identity/index",
+          dialog_content: "实名认证失败",
+          dialog_visible: true,
+          default_dialog_show: true
+        });
+      }
+      return false;;
+    }
+    
+    if(iden_auth_status == 0){
+      if(!this.data.default_dialog_show){
+        this.setData({
+          "info.info_shiming_status_txt": "前往医师身份认证",
+          "info.info_shiming_status": "info_shiming_status_yes",
+          shiming_status_url: "/Pages/yishi/identity/index",
+          dialog_content: "请您前往医师身份认证",
+          dialog_visible: true,
+          default_dialog_show: true
+        });
+      }
+      return false;
+    }
+    if(iden_auth_status == 2){
+      if(!this.data.default_dialog_show){
+        this.setData({
+          "info.info_shiming_status_txt": "审核中",
+          "info.info_shiming_status": "info_shiming_status_yes",
+          shiming_status_url: "/Pages/yishi/identity/index",
+          dialog_content: "您的医师身份认证正在审核中",
+          dialog_visible: true,
+          default_dialog_show: true
+        });
+      }
+      return false;
+    }
+    if(iden_auth_status == 3){
+      if(!this.data.default_dialog_show){
+        this.setData({
+          "info.info_shiming_status_txt": "认证失败",
+          "info.info_shiming_status": "info_shiming_status_yes",
+          dialog_content: "您的医师身份认证失败",
+          dialog_visible: true,
+          default_dialog_show: true
+      });
+    }
+      return false;
+    }
+
+    //多点执业认证
+    if(multi_point_status == 0){
+      if(!this.data.default_dialog_show){
+        this.setData({
+          "info.info_shiming_status_txt": "前往多点执业认证",
+          "info.info_shiming_status": "info_shiming_status_yes",
+          shiming_status_url: "/Pages/yishi/zhiye_identity/index",
+          dialog_content: "请您先进行多点执业认证",
+          dialog_visible: true,
+          default_dialog_show: true
+        });
+      }
+      return false;
+    }
+    if(multi_point_status == 2){
+      if(!this.data.default_dialog_show){
+        this.setData({
+          "info.info_shiming_status_txt": "审核中",
+          "info.info_shiming_status": "info_shiming_status_yes",
+          shiming_status_url: "/Pages/yishi/zhiye_identity/index",
+          dialog_content: "您的多点执业认证正在审核中",
+          dialog_visible: true,
+          default_dialog_show: true
+      });
+    }
+      return false;
+    }
+    if(multi_point_status == 3){
+      if(!this.data.default_dialog_show){
+        this.setData({
+          "info.info_shiming_status_txt": "认证失败",
+          "info.info_shiming_status": "info_shiming_status_yes",
+          shiming_status_url: "/Pages/yishi/zhiye_identity/index",
+          dialog_content: "您的多点执业认证失败",
+          dialog_visible: true,
+          default_dialog_show: true
+      });
+    }
+      return false;
+    }
+
+
+    //绑定结算银行卡
+    var is_bind_bank = this.data.info.is_bind_bank;
+    if(is_bind_bank == 0){
+      if(!this.data.default_dialog_show){
+        this.setData({
+          "info.info_shiming_status_txt": "绑定结算银行卡",
+          "info.info_shiming_status": "info_shiming_status_yes",
+          shiming_status_url: "/Pages/yishi/bankcard/index",
+          dialog_content: "请您先绑定结算银行卡",
+          dialog_visible: true,
+          default_dialog_show: true
+      });
+    }
+      return false;
+    }
+    //开启在线问诊
+    var is_img_expert_reception = this.data.info.is_img_expert_reception;
+    if(is_img_expert_reception == 0 ){
+      if(!this.data.default_dialog_show){
+        this.setData({
+          "info.info_shiming_status_txt": "开启在线问诊",
+          "info.info_shiming_status": "info_shiming_status_yes",
+          shiming_status_url: "/Pages/yishi/onlinesetup/index",
+          dialog_content: "请您先前往在线问诊管理中开通在线问诊",
+          dialog_visible: true,
+          default_dialog_show: true
+      });
+    }
+      return false;
+    }
+    this.setData({
+      "info.info_shiming_status_txt": "去接诊",
+      shiming_status_url: "/Pages/yishi/wenzhen_v2/wenzhen",
+    });
+    this.setData({"info.info_shiming_status": "info_shiming_status_yes"});
+    return true;
+  },
+  contactKeFu(e){
+    let _this = this;
+
+    let checkDialog = this.checkDialog(e);
+    if(checkDialog){
+      console.log("concatKeFu");
+      wx.requestSubscribeMessage({
+        tmplIds: ['JMPmlYGh1HcUSuEfJCVQUIsZv4H5ar3QvXZfrNYNFuc'],
+        success (res) {
+          console.log(res);
+          _this.setData({
+            contactKeFu: true
+          })
+  
+        }
+      })
+
+    }
+  },
+  checkDialog(e){
     //实名认证
     let idcard_status = this.data.info.idcard_status;
     //医师身份认证
@@ -248,164 +477,10 @@ Page({
           dialog_content: now_case.case_text,
           dialog_visible: true
         });
-        return;
+        return false;
       }
     }
-    let url = e.currentTarget.dataset.url;
-    console.log(url);
-    if(url.indexOf("wenzhen") > -1){
-      wx.switchTab({
-        url: url,
-      })
-    }
-    app.go(e.currentTarget.dataset.url)
 
-  },
-  confirmDialog(){
-    this.setData({
-      dialog_visible: false
-    })
-  },
-  cancelDialog(){
-    this.setData({
-      dialog_visible: false
-    })
-  },
-  checkStatus(){
-     //实名认证
-     let idcard_status = this.data.info.idcard_status;
-     //医师身份认证
-     let iden_auth_status = this.data.info.iden_auth_status;
-     //多点执业认证
-     let multi_point_status = this.data.info.multi_point_status;
-
-    if(idcard_status == 0){
-      this.setData({
-        dialog_content: "请您先实名认证",
-        dialog_visible: true
-      });
-      return false;
-    }
-
-    if(idcard_status == 2){
-      this.setData({
-        "info.info_shiming_status_txt": "认证失败",
-        "info.info_shiming_status": "info_shiming_status_yes",
-        shiming_status_url: "/Pages/yishi/identity/index",
-        dialog_content: "实名认证失败",
-        dialog_visible: true
-      });
-      this.setData({
-      });
-      return false;;
-    }
-    
-    if(iden_auth_status == 0){
-      this.setData({
-        "info.info_shiming_status_txt": "前往医师身份认证",
-        "info.info_shiming_status": "info_shiming_status_yes",
-        shiming_status_url: "/Pages/yishi/identity/index",
-        dialog_content: "请您前往医师身份认证",
-        dialog_visible: true
-      });
-      return false;
-    }
-    if(iden_auth_status == 2){
-      this.setData({
-        "info.info_shiming_status_txt": "审核中",
-        "info.info_shiming_status": "info_shiming_status_yes",
-        shiming_status_url: "/Pages/yishi/identity/index",
-        dialog_content: "您的医师身份认证正在审核中",
-        dialog_visible: true
-    });
-      return false;
-    }
-    if(iden_auth_status == 3){
-      this.setData({
-        "info.info_shiming_status_txt": "认证失败",
-        "info.info_shiming_status": "info_shiming_status_yes",
-        dialog_content: "您的医师身份认证失败",
-        dialog_visible: true
-    });
-      return false;
-    }
-
-    //多点执业认证
-    if(multi_point_status == 0){
-      this.setData({
-        "info.info_shiming_status_txt": "前往多点执业认证",
-        "info.info_shiming_status": "info_shiming_status_yes",
-        shiming_status_url: "/Pages/yishi/zhiye_identity/index",
-        dialog_content: "请您先进行多点执业认证",
-        dialog_visible: true
-      });
-      return false;
-    }
-    if(multi_point_status == 2){
-      this.setData({
-        "info.info_shiming_status_txt": "审核中",
-        "info.info_shiming_status": "info_shiming_status_yes",
-        shiming_status_url: "/Pages/yishi/zhiye_identity/index",
-        dialog_content: "您的多点执业认证正在审核中",
-        dialog_visible: true
-    });
-      return false;
-    }
-    if(multi_point_status == 3){
-      this.setData({
-        "info.info_shiming_status_txt": "认证失败",
-        "info.info_shiming_status": "info_shiming_status_yes",
-        shiming_status_url: "/Pages/yishi/zhiye_identity/index",
-        dialog_content: "您的多点执业认证失败",
-        dialog_visible: true
-    });
-      return false;
-    }
-
-
-    //绑定结算银行卡
-    var is_bind_bank = this.data.info.is_bind_bank;
-    if(is_bind_bank == 0){
-      this.setData({
-        "info.info_shiming_status_txt": "绑定结算银行卡",
-        "info.info_shiming_status": "info_shiming_status_yes",
-        shiming_status_url: "/Pages/yishi/bankcard/index",
-        dialog_content: "请您先绑定结算银行卡",
-        dialog_visible: true
-    });
-      return false;
-    }
-    //开启在线问诊
-    var is_img_expert_reception = this.data.info.is_img_expert_reception;
-    if(is_img_expert_reception == 0){
-      this.setData({
-        "info.info_shiming_status_txt": "开启在线问诊",
-        "info.info_shiming_status": "info_shiming_status_yes",
-        shiming_status_url: "/Pages/yishi/onlinesetup/index",
-        dialog_content: "请您先前往在线问诊管理中开通在线问诊",
-        dialog_visible: true
-    });
-      return false;
-    }
-    this.setData({
-      "info.info_shiming_status_txt": "去接诊",
-      shiming_status_url: "/Pages/yishi/wenzhen_v2/wenzhen",
-    });
-    this.setData({"info.info_shiming_status": "info_shiming_status_yes"});
     return true;
-  },
-  contactKeFu(){
-    let _this = this;
-    console.log("concatKeFu");
-    wx.requestSubscribeMessage({
-      tmplIds: ['JMPmlYGh1HcUSuEfJCVQUIsZv4H5ar3QvXZfrNYNFuc'],
-      success (res) {
-        console.log(res);
-        _this.setData({
-          contactKeFu: true
-        })
-
-      }
-    })
   }
 })
\ No newline at end of file
diff --git a/Pages/yishi/index/index.json b/Pages/yishi/index/index.json
index 4f6315d..2408ea5 100644
--- a/Pages/yishi/index/index.json
+++ b/Pages/yishi/index/index.json
@@ -2,11 +2,9 @@
   "component": true,
   "usingComponents": {
     "t-avatar": "tdesign-miniprogram/avatar/avatar",
-    "van-image": "@vant/weapp/image/index",
     "van-button": "@vant/weapp/button/index",
     "van-dialog": "@vant/weapp/dialog/index",
     "t-swiper": "tdesign-miniprogram/swiper/swiper",
-    "t-swiper-nav": "tdesign-miniprogram/swiper-nav/swiper-nav",
     "t-badge": "tdesign-miniprogram/badge/badge",
     "t-dialog": "tdesign-miniprogram/dialog/dialog"
   }
diff --git a/Pages/yishi/index/index.wxml b/Pages/yishi/index/index.wxml
index a74188e..fcfcd55 100644
--- a/Pages/yishi/index/index.wxml
+++ b/Pages/yishi/index/index.wxml
@@ -9,22 +9,21 @@
   <!-- 用户信息 -->
   <view class="info_box" style="margin-top: {{stateHeight+navHeight+10}}px;">
     <view class="info">
-      <view class="info_photo">
-        <!-- 跳转我的信息 -->
-        <navigator url="/Pages/yishi/myinfo/index" open-type="navigate" hover-class="other-navigator-hover">
-          <t-avatar alt="头像" class="avatar" size="large" image="{{info.avatar}}" />
-        </navigator>
-      </view>
-      <view class="info_content">
-        <view class="info_mobile">{{info.user_name}}</view>
-        <view class="info_wenzhen">
-          <view bindtap="go" data-moudle="0">新问诊：{{info.not_accepted_inquiry_num}}</view>
-          <view bindtap="go" data-moudle="1">接诊中：{{info.accepting_inquiry_num}}</view>
+      <view class="info_top">
+        <view class="info_photo" bindtap="go" data-url="/Pages/yishi/myinfo/index">
+          <!-- 跳转我的信息 -->
+            <t-avatar alt="头像" class="avatar" size="large" image="{{info.avatar}}" />
+        </view>
+        <view class="info_content">
+          <view class="info_mobile">{{info.user_name}}</view>
+        </view>
+        <view class="info_shiming" bindtap="go" data-url="{{shiming_status_url}}">
+          <view class="info_shiming_status {{info.info_shiming_status}}">{{info.info_shiming_status_txt}}</view>
         </view>
-        
       </view>
-      <view class="info_shiming" bindtap="go" data-url="{{shiming_status_url}}">
-        <view class="info_shiming_status {{info.info_shiming_status}}">{{info.info_shiming_status_txt}}</view>
+      <view class="info_wenzhen">
+        <view class="info_wenzhen_new" bindtap="go" data-moudle="0">新问诊：{{info.not_accepted_inquiry_num}}</view>
+        <view class="info_wenzhen_ing" bindtap="go" data-moudle="1">接诊中：{{info.accepting_inquiry_num}}</view>
       </view>
     </view>
     <view class="info_note" wx:if="{{info.show_info_note}}">
@@ -41,11 +40,11 @@
   </view>
   <!-- 认证信息 -->
   <view class="renzhen">
-    <view class="renzheng_left">
+    <view class="renzheng_left" bindtap="go" data-url="/Pages/yishi/identity/index">
       <view class="renzheng_content_left">
         <view class="renzheng_content_name">医师身份认证</view>
         <view class="renzheng_content_status">
-          <van-button round plain bind:click="go" data-url="/Pages/yishi/identity/index"
+          <van-button round plain 
           custom-style="background-color: #E0FFFE; height: 45rpx; letter-spacing: 3rpx; font-size: 26rpx;"
           color="#3CC7C0" type="info" size="small">{{ iden_auth_status_txt }}></van-button>
         </view>
@@ -58,11 +57,11 @@
       </view>
     </view>
 
-    <view class="renzheng_right">
+    <view class="renzheng_right" bindtap="go" data-url="/Pages/yishi/zhiye_identity/index">
       <view class="renzheng_content_left">
         <view class="renzheng_content_name">多点执业认证</view>
         <view class="renzheng_content_status">
-          <van-button round plain bind:click="go"  data-moudle="2" data-url="/Pages/yishi/zhiye_identity/index"
+          <van-button round plain  data-moudle="2"
           custom-style="background-color: #FFF5E0; height: 45rpx; letter-spacing: 3rpx; font-size: 26rpx;"
           color="#FC7E00" type="info" size="small">{{ multi_point_status_txt }}></van-button>
         </view>
@@ -79,16 +78,15 @@
   <view class="ad">
     <t-swiper
       height="110rpx"
-      current="{{current}}"
-      autoplay="{{autoplay}}"
       duration="{{duration}}"
       interval="{{interval}}"
       navigation="{{ { type: 'dots' } }}"
       list="{{swiperList}}"
-      bind:click="onTap"
-      bind:change="onADChange" 
+      bind:click="onTapAD"
+      bind:change="onChangeAD"
+      data-url="123"
     >
-</t-swiper>
+    </t-swiper>
   </view>
   <!-- 功能模块 -->
   <view class="fun_box">
@@ -152,7 +150,6 @@
     确定
   </view>
   </t-dialog>
-
   <van-dialog
     title="立即联系客服"
     show="{{ contactKeFu }}"
diff --git a/Pages/yishi/index/index.wxss b/Pages/yishi/index/index.wxss
index 02e951b..3dd9d85 100644
--- a/Pages/yishi/index/index.wxss
+++ b/Pages/yishi/index/index.wxss
@@ -33,6 +33,10 @@
   box-shadow: 0px 2px 4px 0px rgba(0,0,0,0.06);
 }
 .info{
+  display: flex;
+  flex-direction: column;
+}
+.info_top{
   display: flex;
   align-items: center;
   justify-content: space-around;
@@ -43,7 +47,7 @@
 }
 .info_content{
   color: #000;
-  flex: 4;
+  flex: 2;
   display: flex;
   flex-direction: column;
   justify-content: space-between;
@@ -54,15 +58,22 @@
   letter-spacing: 3rpx;
 }
 .info_wenzhen{
-  margin-top: 10rpx;
+  margin: 20rpx 0 0 30rpx;
   font-size: 28rpx;
   color: #666666;
   display: flex;
 }
+.info_wenzhen_new{
+  flex: 1;
+}
+.info_wenzhen_ing{
+  flex: 3;
+}
 .info_shiming{
-  flex: 2;
+  flex: 3;
   display: flex;
-  justify-content: center;
+  justify-content: flex-end;
+  margin-right: 20rpx;
 }
 .info_shiming_status{
   padding: 15rpx 20rpx 15rpx 20rpx;
diff --git a/Pages/yishi/kuaisusetup/index.js b/Pages/yishi/kuaisusetup/index.js
index f8c3e6f..2a2dd6c 100644
--- a/Pages/yishi/kuaisusetup/index.js
+++ b/Pages/yishi/kuaisusetup/index.js
@@ -72,7 +72,7 @@ Page({
   },
   putDoctorInquiryConfig(){
     wx.switchTab({
-      url: "/Pages/yishi/wenzhen/wenzhen"
+      url: "/Pages/yishi/wenzhen_v2/wenzhen"
     })
   },
   onStepperChange(event) {
diff --git a/Pages/yishi/kuaisusetup/index.wxml b/Pages/yishi/kuaisusetup/index.wxml
index 4621ea8..0be0a2b 100644
--- a/Pages/yishi/kuaisusetup/index.wxml
+++ b/Pages/yishi/kuaisusetup/index.wxml
@@ -16,7 +16,7 @@
       <view class="switch_box_note">{{ note }}</view>
     </view>
     <view class="help">
-      <van-cell url="/Pages/yishi/manual/index" custom-style="font-size:32rpx;" title="图文问诊操作手册" is-link border="{{false}}" />
+      <van-cell size="large" url="/Pages/yishi/manual/index" custom-style="font-size:32rpx;" title="图文问诊操作手册" is-link border="{{false}}" />
     </view>
   </view>
 
diff --git a/Pages/yishi/manual/index.wxml b/Pages/yishi/manual/index.wxml
index a325693..54875a3 100644
--- a/Pages/yishi/manual/index.wxml
+++ b/Pages/yishi/manual/index.wxml
@@ -2,6 +2,6 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container">
   <view class="item_list">
-    <van-cell url="/Pages/yishi/manual_detail/index?manual_id={{item.manual_id}}" custom-style="border-radius: 20rpx;margin-bottom: 20rpx;" title="{{item.title}}" is-link wx:for="{{list}}" />
+    <van-cell size="large" url="/Pages/yishi/manual_detail/index?manual_id={{item.manual_id}}" custom-style="border-radius: 20rpx;margin-bottom: 20rpx;" title="{{item.title}}" is-link wx:for="{{list}}" />
   </view>
 </view>
diff --git a/Pages/yishi/my/index.js b/Pages/yishi/my/index.js
index b14c5ef..c683bad 100644
--- a/Pages/yishi/my/index.js
+++ b/Pages/yishi/my/index.js
@@ -10,7 +10,7 @@ Page({
     iden_auth_status: "",
     idcard_status: "",
     multi_point_status: "",
-    avatar: "",
+    avatar: "https://img.applets.igandanyiyuan.com/applet/doctor/static/images/default_photo.png",
     balance_account: "",
     estimate_income: "",
     doctor_id: ""
@@ -46,6 +46,7 @@ Page({
     this.getMenuButtonBound();
   },
   onLoad(){
+    console.log("my onLoad");
     //获取个人中心数据
     api.getDoctorCenter().then(response => {
       this.setData({
diff --git a/Pages/yishi/my/index.wxml b/Pages/yishi/my/index.wxml
index 1b373d3..dc34f43 100644
--- a/Pages/yishi/my/index.wxml
+++ b/Pages/yishi/my/index.wxml
@@ -48,10 +48,10 @@
   </view>
 
   <view class="content" style="top: calc(20rpx + {{stateHeight}}px);">
-    <van-cell url="/Pages/yishi/myaccount/index" link-type="navigateTo" title-style="font-size: 30rpx;" title="我的账户" is-link />
-    <van-cell url="/Pages/yishi/bankcard/index" link-type="navigateTo" title-style="font-size: 30rpx;" title="我的银行卡" is-link />
-    <van-cell url="/Pages/yishi/mycard/index" link-type="navigateTo" title-style="font-size: 30rpx;" title="我的名片" is-link   />
-    <van-cell url="/Pages/yishi/appraise/index?doctor_id={{doctor_id}}" link-type="navigateTo" title-style="font-size: 30rpx;" title="患者评价" is-link />
-    <van-cell url="/Pages/yishi/quickreply/index" link-type="navigateTo" title-style="font-size: 30rpx;" title="常用语" is-link border="{{ false }}"/>
+    <van-cell size="large" url="/Pages/yishi/myaccount/index" link-type="navigateTo" title-style="font-size: 30rpx;" title="我的账户" is-link />
+    <van-cell size="large" url="/Pages/yishi/bankcard/index" link-type="navigateTo" title-style="font-size: 30rpx;" title="我的银行卡" is-link />
+    <van-cell size="large" url="/Pages/yishi/mycard/index" link-type="navigateTo" title-style="font-size: 30rpx;" title="我的名片" is-link   />
+    <van-cell size="large" url="/Pages/yishi/appraise/index?doctor_id={{doctor_id}}" link-type="navigateTo" title-style="font-size: 30rpx;" title="患者评价" is-link />
+    <van-cell size="large" url="/Pages/yishi/quickreply/index" link-type="navigateTo" title-style="font-size: 30rpx;" title="常用语" is-link border="{{ false }}"/>
   </view>
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/myaccount/index.json b/Pages/yishi/myaccount/index.json
index dba4393..1ae5130 100644
--- a/Pages/yishi/myaccount/index.json
+++ b/Pages/yishi/myaccount/index.json
@@ -2,7 +2,7 @@
   "component": true,
   "usingComponents": {
     "te-nav-bar": "/commpents/te_navbar",
-    "t-image": "tdesign-miniprogram/image/image",
+    "van-image": "@vant/weapp/image/index",
     "t-picker": "tdesign-miniprogram/picker/picker",
     "t-picker-item": "tdesign-miniprogram/picker-item/picker-item",
     "van-icon": "@vant/weapp/icon/index",
diff --git a/Pages/yishi/myaccount/index.wxml b/Pages/yishi/myaccount/index.wxml
index 065be45..002d371 100644
--- a/Pages/yishi/myaccount/index.wxml
+++ b/Pages/yishi/myaccount/index.wxml
@@ -19,11 +19,11 @@
   </view>
   <view class="txt_title">账单</view>
   <view class="content">
-    <van-cell bindtap="goDetail" data-url="/Pages/yishi/orderdetail/index" data-md="{{item.month}}-{{item.day}}" title-style="font-size: 30rpx;" title="{{item.month}}月{{item.day}}日" value="+{{item.total_amount}}元"  is-link wx:for="{{bill}}" />
+    <van-cell size="large" bindtap="goDetail" data-url="/Pages/yishi/orderdetail/index" data-md="{{item.month}}-{{item.day}}" title-style="font-size: 30rpx;" title="{{item.month}}月{{item.day}}日" value="+{{item.total_amount}}元"  is-link wx:for="{{bill}}" />
     <van-empty description="暂无账单" wx:if="{{ bill }}" />
   </view>
 
-  <t-image custom-style="position: fixed; right: 0;bottom: 262rpx;" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/account_rule.png" mode="heightFix" height="84rpx" aria-label="role" />
+  <van-image style="position: fixed; right: 0;bottom: 262rpx;" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/account_rule.png" fit="heightFix" height="84rpx" aria-label="role" />
 
     <t-picker
       visible="{{dateVisible}}"
diff --git a/Pages/yishi/mycard/index.js b/Pages/yishi/mycard/index.js
index eb13f40..ce78eed 100644
--- a/Pages/yishi/mycard/index.js
+++ b/Pages/yishi/mycard/index.js
@@ -1,5 +1,4 @@
 import { API } from './../../../utils/network/api'
-const util = require('./../../../utils/util')
 let api = new API()
 const app = getApp()
 Page({
@@ -13,7 +12,7 @@ Page({
     showText: false,
     saveImgPath: "",
     info: {},
-    //https://github.com/Kujiale-Mobile/Painter
+    //  https://github.com/Kujiale-Mobile/Painter
     template: {
       width: '750px',
       height: '1200px',
@@ -152,9 +151,10 @@ Page({
           },
         },
       ],
-    }
+    },
+    painter_ready: false
   },
-  onShow(){
+  onLoad(){
     //获取医生名片
     api.getDoctorInfoCard().then(response => {
       console.log(response);
@@ -167,6 +167,10 @@ Page({
        "template.views[8].text" : response.data.department_custom_name,
        "template.views[9].text" : response.data.hospital_name,
       })
+    }).then(res => {
+      this.setData({
+        painter_ready: true
+      })
     }).catch(errors => {console.error(errors);})
   },
   onImgOK(e){
@@ -231,10 +235,15 @@ Page({
       visible: e.detail.visible,
     });
   },
-
   showVisible(){
     this.setData({
       visible: !this.data.visible,
     });
-  }
+  },
+  // onShareAppMessage(e) {
+  //   return {
+  //     title: '自定义转发标题',
+  //     path: '/Pages/yishi/mycard/index',
+  //   }
+  // }
 })
\ No newline at end of file
diff --git a/Pages/yishi/mycard/index.json b/Pages/yishi/mycard/index.json
index 8782e70..203cb1b 100644
--- a/Pages/yishi/mycard/index.json
+++ b/Pages/yishi/mycard/index.json
@@ -4,7 +4,7 @@
     "te-nav-bar": "/commpents/te_navbar",
     "painter":"/commpents/painter/painter",
     "t-avatar": "tdesign-miniprogram/avatar/avatar",
-    "t-image": "tdesign-miniprogram/image/image",
+    "van-image": "@vant/weapp/image/index",
     "t-icon": "tdesign-miniprogram/icon/icon",
     "van-cell": "@vant/weapp/cell/index",
     "van-cell-group": "@vant/weapp/cell-group/index",
diff --git a/Pages/yishi/mycard/index.wxml b/Pages/yishi/mycard/index.wxml
index 5c75851..2567aaf 100644
--- a/Pages/yishi/mycard/index.wxml
+++ b/Pages/yishi/mycard/index.wxml
@@ -14,13 +14,13 @@
     <t-avatar class="avatar" size="large" image="{{info.avatar}}" />
   </view>
   <view class="qrcode">
-    <t-image bindtap="showVisible" src="{{info.qr_code_url}}" mode="heightFix" width="150" height="150" aria-label="qrcode" />
+    <van-image bindtap="showVisible" src="{{info.qr_code_url}}" fit="heightFix" width="150" height="150" aria-label="qrcode" />
     <text>微信长按或扫描二维码查看我的更多信息</text>
   </view>
 
 
 
-  <view class="block">
+  <view class="block" wx:if="{{painter_ready}}">
     <view class="header">
       <view class="title">分享我的名片到</view>
     </view>
@@ -56,4 +56,4 @@
 />
 
 </view>
-<painter palette="{{template}}" customStyle="position:fixed;top:-9999rpx;" bind:imgOK="onImgOK"/>
\ No newline at end of file
+<painter palette="{{template}}" customStyle="position:fixed;top:-9999rpx;" bind:imgOK="onImgOK" wx:if="{{painter_ready}}"/>
\ No newline at end of file
diff --git a/Pages/yishi/myinfo/index.js b/Pages/yishi/myinfo/index.js
index 438aabc..ec564ba 100644
--- a/Pages/yishi/myinfo/index.js
+++ b/Pages/yishi/myinfo/index.js
@@ -22,7 +22,7 @@ Page({
       console.log(response);
       this.setData({
         doctor_id: response.data.doctor_id,
-        brief_introduction:response.data.brief_introduction,
+        brief_introduction: response.data.brief_introduction==null?this.data.brief_introduction:response.data.brief_introduction,
         idcard_status:response.data.idcard_status,
         iden_auth_status:response.data.iden_auth_status,
         card_name:response.data.card_name,
diff --git a/Pages/yishi/myinfo/index.wxml b/Pages/yishi/myinfo/index.wxml
index 4e7d9a7..7831e02 100644
--- a/Pages/yishi/myinfo/index.wxml
+++ b/Pages/yishi/myinfo/index.wxml
@@ -1,11 +1,11 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
   <van-cell-group>
-    <van-cell url="/Pages/yishi/mycard/index" title="我的名片" value="分享名片" is-link />
-    <van-cell title="我的简介" value="{{brief_introduction}}" is-link />
-    <van-cell url="/Pages/yishi/attestation/index?card_name={{card_name}}&card_num_mask={{card_num_mask}}" link-type="navigateTo" title="实名认证" 
+    <van-cell size="large" url="/Pages/yishi/mycard/index" title="我的名片" value="分享名片" is-link />
+    <van-cell size="large" url="/Pages/yishi/myprofile/index" title="我的简介" value="{{brief_introduction}}" is-link />
+    <van-cell size="large" url="/Pages/yishi/attestation/index?card_name={{card_name}}&card_num_mask={{card_num_mask}}" link-type="navigateTo" title="实名认证" 
     value="{{idcard_status==0?'未认证':idcard_status==1?'认证通过':'认证失败'}}" is-link />
-    <van-cell url="/Pages/yishi/practicing/index" link-type="navigateTo" title="医师认证" 
+    <van-cell size="large" url="/Pages/yishi/practicing/index" link-type="navigateTo" title="医师认证" 
     value="{{iden_auth_status==0?'未认证':iden_auth_status==1?'认证通过':iden_auth_status==2?'审核中':'认证失败'}}" is-link />
   </van-cell-group>
 
diff --git a/Pages/yishi/myprofile/index.wxss b/Pages/yishi/myprofile/index.wxss
index 093c13b..68b5268 100644
--- a/Pages/yishi/myprofile/index.wxss
+++ b/Pages/yishi/myprofile/index.wxss
@@ -44,3 +44,6 @@
   justify-content: center;
   align-items: center;
 }
+.van-cell--required::before {
+  left: 4.7rem !important;
+}
\ No newline at end of file
diff --git a/Pages/yishi/onlinesetup/index.js b/Pages/yishi/onlinesetup/index.js
index a9bcbc5..57a7680 100644
--- a/Pages/yishi/onlinesetup/index.js
+++ b/Pages/yishi/onlinesetup/index.js
@@ -79,7 +79,7 @@ Page({
      console.log(response);
      Toast.success("修改成功");
      wx.switchTab({
-      url: "/Pages/yishi/wenzhen/wenzhen"
+      url: "/Pages/yishi/wenzhen_v2/wenzhen"
      })
    }).catch(errors => {console.error(errors);})
   },
diff --git a/Pages/yishi/onlinesetup/index.wxml b/Pages/yishi/onlinesetup/index.wxml
index 86b7b3d..a13375b 100644
--- a/Pages/yishi/onlinesetup/index.wxml
+++ b/Pages/yishi/onlinesetup/index.wxml
@@ -16,7 +16,7 @@
       <view class="switch_box_note">{{ note }}</view>
     </view>
     <view class="help">
-      <van-cell url="/Pages/yishi/manual/index" custom-style="font-size:32rpx;" title="图文问诊操作手册" is-link border="{{false}}" />
+      <van-cell size="large" url="/Pages/yishi/manual/index" custom-style="font-size:32rpx;" title="图文问诊操作手册" is-link border="{{false}}" />
     </view>
   </view>
 
diff --git a/Pages/yishi/quickreply/index.wxml b/Pages/yishi/quickreply/index.wxml
index 7f39966..5ad237e 100644
--- a/Pages/yishi/quickreply/index.wxml
+++ b/Pages/yishi/quickreply/index.wxml
@@ -12,7 +12,7 @@
     >
       <t-tab-panel label="问诊" value="1">
         <view class="item_list">
-          <van-cell custom-style="border-radius: 20rpx;margin-bottom: 20rpx;" title="{{index + 1}}、{{item.words}}" wx:for="{{list_1}}" />
+          <van-cell size="large" custom-style="border-radius: 20rpx;margin-bottom: 20rpx;" title="{{index + 1}}、{{item.words}}" wx:for="{{list_1}}" />
         </view>
         <view class="btn">
           <van-button bind:click="showAdd" class="addbtn" custom-style="border-radius: 20rpx;margin: 0 auto;width: 92%;position: relative;top: 50%;  transform: translateY(-50%);"  type="primary" color="#3CC7C0" block>添加常用语</van-button>
@@ -23,7 +23,7 @@
       </t-tab-panel>
       <t-tab-panel label="处方" value="2">
         <view class="item_list">
-          <van-cell custom-style="border-radius: 20rpx;margin-bottom: 20rpx;" title="{{index+1}}、{{item.words}}" wx:for="{{list_2}}" />
+          <van-cell size="large" custom-style="border-radius: 20rpx;margin-bottom: 20rpx;" title="{{index+1}}、{{item.words}}" wx:for="{{list_2}}" />
         </view>
         <view class="btn">
           <van-button bind:click="showAdd" class="addbtn" custom-style="border-radius: 20rpx;margin: 0 auto;width: 92%;position: relative;top: 50%;  transform: translateY(-50%);"  type="primary" color="#3CC7C0" block>添加常用语</van-button>
diff --git a/Pages/yishi/quickreply_data/index.wxml b/Pages/yishi/quickreply_data/index.wxml
index 902aed2..07d3fac 100644
--- a/Pages/yishi/quickreply_data/index.wxml
+++ b/Pages/yishi/quickreply_data/index.wxml
@@ -1,9 +1,9 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
   <view class="item_list">
-    <van-cell custom-style="border-radius: 20rpx;margin-bottom: 20rpx;" title="身体怎么样" />
-    <van-cell custom-style="border-radius: 20rpx;margin-bottom: 20rpx;" title="按时吃药" />
-    <van-cell custom-style="border-radius: 20rpx;margin-bottom: 20rpx;" title="多运动" />
+    <van-cell size="large" custom-style="border-radius: 20rpx;margin-bottom: 20rpx;" title="身体怎么样" />
+    <van-cell size="large" custom-style="border-radius: 20rpx;margin-bottom: 20rpx;" title="按时吃药" />
+    <van-cell size="large" custom-style="border-radius: 20rpx;margin-bottom: 20rpx;" title="多运动" />
   </view>
   <van-button color="#3CC7C0" 
   custom-style="border-radius: 20rpx;font-size:30rpx;width:92vw;position:fixed;bottom:50rpx;left:50%;  transform: translateX(-50%);" 
diff --git a/Pages/yishi/service_notice/index.json b/Pages/yishi/service_notice/index.json
index ee34b87..f84f19a 100644
--- a/Pages/yishi/service_notice/index.json
+++ b/Pages/yishi/service_notice/index.json
@@ -2,6 +2,6 @@
   "component": true,
   "usingComponents": {
     "te-nav-bar": "/commpents/te_navbar",
-    "t-image": "tdesign-miniprogram/image/image"
+    "van-image": "@vant/weapp/image/index"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/service_notice/index.wxml b/Pages/yishi/service_notice/index.wxml
index bf81a96..a24bd49 100644
--- a/Pages/yishi/service_notice/index.wxml
+++ b/Pages/yishi/service_notice/index.wxml
@@ -6,7 +6,7 @@
       <view class="item_top">
         <view class="item_img">
           <text style="margin-left: 10rpx;">快速问诊</text> 
-          <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" mode="heightFix" height="54rpx" aria-label="qrcode" />
+          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
         <view class="item_date">2023-1-02 12:22</view>
       </view>
@@ -17,7 +17,7 @@
       <view class="item_top">
         <view class="item_img">
           <text style="margin-left: 10rpx;">在线问诊</text> 
-          <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/online.png" mode="heightFix" height="54rpx" aria-label="qrcode" />
+          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/online.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
         <view class="item_date">2023-1-02 12:22</view>
       </view>
@@ -28,7 +28,7 @@
       <view class="item_top">
         <view class="item_img">
           <text style="margin-left: 10rpx;">义诊</text> 
-          <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/yizhen.png" mode="heightFix" height="54rpx" aria-label="qrcode" />
+          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/yizhen.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
         <view class="item_date">2023-1-02 12:22</view>
       </view>
@@ -39,7 +39,7 @@
       <view class="item_top">
         <view class="item_img">
           <text style="margin-left: 10rpx;">问诊购药</text> 
-          <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/drug.png" mode="heightFix" height="54rpx" aria-label="qrcode" />
+          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/drug.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
         <view class="item_date">2023-1-02 12:22</view>
       </view>
diff --git a/Pages/yishi/signcanvas/index.js b/Pages/yishi/signcanvas/index.js
index 0fa1b90..2f7f8dc 100644
--- a/Pages/yishi/signcanvas/index.js
+++ b/Pages/yishi/signcanvas/index.js
@@ -33,23 +33,30 @@ Page({
           canvas: canvas
         });
 
+        console.log("onReady onReady start")
+        console.log(ctx)
+        console.log(canvas)
+        console.log("onReady onReady end")
       })
   },
 
   ontouchmove(e){
+    console.log("ontouchmove ontouchmove ontouchmove");
+    console.log(e);
     this.data.ctx.lineWidth = 5;
     this.data.ctx.lineCap="round";
     this.data.ctx.lineJoin ="round";
-    this.data.ctx.lineTo(e.changedTouches[0].pageX,e.changedTouches[0].pageY);
+    this.data.ctx.lineTo(e.touches[0].x,e.touches[0].y);
     this.data.ctx.stroke();
   },
   ontouchstart(e){
+    console.log("ontouchstart ontouchstart ontouchstart")
     this.setData({
       txt_show: false
     });
     console.log(this.data.ctx);
     this.data.ctx.beginPath();
-    this.data.ctx.moveTo(e.changedTouches[0].pageX,e.changedTouches[0].pageY);
+    this.data.ctx.moveTo(e.touches[0].x,e.touches[0].y);
   },
 
   toClear() {
diff --git a/Pages/yishi/system_notice/index.json b/Pages/yishi/system_notice/index.json
index ee34b87..f84f19a 100644
--- a/Pages/yishi/system_notice/index.json
+++ b/Pages/yishi/system_notice/index.json
@@ -2,6 +2,6 @@
   "component": true,
   "usingComponents": {
     "te-nav-bar": "/commpents/te_navbar",
-    "t-image": "tdesign-miniprogram/image/image"
+    "van-image": "@vant/weapp/image/index"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/system_notice/index.wxml b/Pages/yishi/system_notice/index.wxml
index eabc117..e3723fc 100644
--- a/Pages/yishi/system_notice/index.wxml
+++ b/Pages/yishi/system_notice/index.wxml
@@ -5,19 +5,19 @@
     <view class="item" bindtap="go" data-url="/Pages/yishi/notice_deatil/index">
       <view class="item_top">
         <view class="item_img">
-          <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" mode="heightFix" height="54rpx" aria-label="qrcode" />
+          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
         <view class="item_content">9月份的服务费结算通知</view>
       </view>
       <view class="hongdian">
-        <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/honhdian.png" mode="heightFix" height="20rpx" aria-label="qrcode" />
+        <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/honhdian.png" fit="heightFix" height="20rpx" aria-label="qrcode" />
       </view>
     </view>
 
     <view class="item" bindtap="go" data-url="/Pages/yishi/notice_deatil/index">
       <view class="item_top">
         <view class="item_img">
-          <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" mode="heightFix" height="54rpx" aria-label="qrcode" />
+          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
         <view class="item_content">8月份的服务费结算通知</view>
       </view>
@@ -26,7 +26,7 @@
     <view class="item" bindtap="go" data-url="/Pages/yishi/notice_deatil/index">
       <view class="item_top">
         <view class="item_img">
-          <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" mode="heightFix" height="54rpx" aria-label="qrcode" />
+          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
         <view class="item_content">7月份的服务费结算通知</view>
       </view>
@@ -35,7 +35,7 @@
     <view class="item" bindtap="go" data-url="/Pages/yishi/notice_deatil/index">
       <view class="item_top">
         <view class="item_img">
-          <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" mode="heightFix" height="54rpx" aria-label="qrcode" />
+          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
         <view class="item_content">6月份的服务费结算通知</view>
       </view>
diff --git a/Pages/yishi/wenzhen/wenzhen.json b/Pages/yishi/wenzhen/wenzhen.json
index b988581..f31787c 100644
--- a/Pages/yishi/wenzhen/wenzhen.json
+++ b/Pages/yishi/wenzhen/wenzhen.json
@@ -3,7 +3,7 @@
   "usingComponents": {
     "te-nav-bar": "/commpents/te_navbar",
     "wenzhen-data": "/commpents/wenzhen_data/index",
-    "t-image": "tdesign-miniprogram/image/image",
+    "van-image": "@vant/weapp/image/index",
     "t-tabs": "tdesign-miniprogram/tabs/tabs",
     "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel",
     "t-badge": "tdesign-miniprogram/badge/badge",
diff --git a/Pages/yishi/wenzhen/wenzhen.wxml b/Pages/yishi/wenzhen/wenzhen.wxml
index c2f0b92..dfaa341 100644
--- a/Pages/yishi/wenzhen/wenzhen.wxml
+++ b/Pages/yishi/wenzhen/wenzhen.wxml
@@ -4,21 +4,20 @@
   <view class="top">
       <view class="top_left" bindtap="go" data-url="/Pages/yishi/service_notice/index">
         <t-badge dot offset="{{ [1, 1] }}" class="wrapper">
-          <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice.png" mode="heightFix" height="108rpx" aria-label="notice" />
+          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice.png" fit="heightFix" height="108rpx" aria-label="notice" />
         </t-badge>
-        
         服务通知
       </view>
       <view class="top_right" bindtap="go" data-url="/Pages/yishi/system_notice/index">
         <t-badge count="8" offset="{{ [1, 1] }}" class="wrapper">
-          <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/system_notice.png" mode="heightFix" height="108rpx" aria-label="notice" />
+          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/system_notice.png" fit="heightFix" height="108rpx" aria-label="notice" />
         </t-badge>
         系统公告
       </view>
   </view>
 
   <view class="empty" wx:if="{{ !has_data }}" >
-    <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/wnzhen_empty.png" mode="heightFix" height="108rpx" aria-label="empty" />
+    <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/wnzhen_empty.png" fit="heightFix" height="108rpx" aria-label="empty" />
     <view class="empty_note">您还未设置在线问诊价格</view>
   </view>
   <van-button color="#3CC7C0" custom-style="width: 92vw;margin: 0 auto;border-radius: 10rpx;" block wx:if="{{ !has_data }}">开通图文问诊</van-button>
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index 128b573..cb702ac 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -17,11 +17,21 @@ Page({
     data_list_4: [],
     data_list_5: [],
     conversationList: [],
-    message_inquiry_type: 2,
+    message_inquiry_type: 1,
+    system_notice_unreadnnum: "",
+    service_notice_unreadnnum: ""
   },
   onLoad() {
     console.log("wenzhen onload");
-    
+    let userID = wx.getStorageSync('user_id');
+    setInterval(() => {
+      let system_notice_unreadnnum = wx.getStorageSync(userID+"_system_notice_unreadnnum");
+      let service_notice_unreadnnum = wx.getStorageSync(userID+"_service_notice_unreadnnum");
+      this.setData({
+        system_notice_unreadnnum: system_notice_unreadnnum,
+        service_notice_unreadnnum: service_notice_unreadnnum,
+      })
+    }, 500);
   },
   onShow: function () {
     console.log("onShow from wenzhen V2")
@@ -45,22 +55,10 @@ Page({
     });
   },
   go(e){
-    wx.navigateTo({
-      url: e.currentTarget.dataset.url,
-      events: {
-        // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
-        acceptDataFromOpenedPage: function(data) {
-          console.log(data)
-        },
-        someEvent: function(data) {
-          console.log(data)
-        }
-      },
-      success: function(res) {
-        // 通过 eventChannel 向被打开页面传送数据
-        res.eventChannel.emit('acceptDataFromOpenerPage', { data: 'test' })
-      }
-    })
+    let url = e.currentTarget.dataset.url;
+    let name = e.currentTarget.dataset.name;
+    wx.setStorageSync(name, 0);
+    app.go(url);
   },
   $onMessageReceived(value) {
     const message = value.data[0];
@@ -157,10 +155,8 @@ Page({
 
   },
   formatStatus(){
-    
-
     let order_inquiry_id_list = [];
-
+    order_inquiry_id_list.push("a");//初始化一个，防止失败
     this.data.conversationList.forEach(item => {
       let conversationID = item.conversationID;
       if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过
@@ -168,11 +164,16 @@ Page({
       if(!lastMessage) return;
       let cloudCustomData = lastMessage.cloudCustomData;
       if(!cloudCustomData) return;
-      let cloudCustomDataJson = JSON.parse(cloudCustomData);
+      let cloudCustomDataJson;
+      try {
+        cloudCustomDataJson = JSON.parse(cloudCustomData);
+      } catch (error) {
+        console.log(error);
+        return;
+      }
       let order_inquiry_id = cloudCustomDataJson.order_inquiry_id;
       order_inquiry_id_list.push(order_inquiry_id);//准备去请求后端那订单状态
     })
-
     let conversationList =  this.data.conversationList;
     //获取医生问诊消息用户属性
     api.getDoctorInquiryMessageAttr({order_inquiry_ids: order_inquiry_id_list.join(",")}).then(response => {
@@ -185,14 +186,24 @@ Page({
           if(!lastMessage) return;
           let cloudCustomData = lastMessage.cloudCustomData;
           if(!cloudCustomData) return;
-          let cloudCustomDataJson = JSON.parse(item.lastMessage.cloudCustomData);
+          let cloudCustomDataJson;
+          try {
+            cloudCustomDataJson = JSON.parse(item.lastMessage.cloudCustomData);
+          } catch (error) {
+            return;
+          }
           let order_inquiry_id = cloudCustomDataJson.order_inquiry_id;
           let order = response.data.find(attr_item => {
             return attr_item.order_inquiry_id == order_inquiry_id;
           })
           if(!order) return;
 
-          item.inquiry_status = order.inquiry_status;
+          let inquiry_status = order.inquiry_status;
+          //inquiry_status 状态
+          if(inquiry_status !=3 && inquiry_status != 4){
+            return;
+          }
+          item.inquiry_status = inquiry_status;
           item.patient_age = order.patient_age;
           item.patient_name = order.patient_name;
           item.patient_sex = order.patient_sex;
@@ -234,6 +245,7 @@ Page({
       let order_inquiry_id = cloudCustomDataJson.order_inquiry_id;
       if(!order_inquiry_id) return;
       let inquiry_type = cloudCustomDataJson.inquiry_type;
+      if(!inquiry_type) return;
       let session_item = {};
       session_item.inquiry_status = item.inquiry_status;//订单状态暂无
       let txt = {};
@@ -242,6 +254,7 @@ Page({
       session_item.message_send_time = getTimeAgo(lastMessage.lastTime);
       session_item.message_type = type;
       session_item.order_inquiry_id = order_inquiry_id;
+      session_item.inquiry_type = inquiry_type;
       session_item.patient_age = item.patient_age;//暂无
       session_item.patient_name = userProfile.nick;
       session_item.from_account = userProfile.userID;
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.json b/Pages/yishi/wenzhen_v2/wenzhen.json
index b988581..f8632d5 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.json
+++ b/Pages/yishi/wenzhen_v2/wenzhen.json
@@ -3,11 +3,11 @@
   "usingComponents": {
     "te-nav-bar": "/commpents/te_navbar",
     "wenzhen-data": "/commpents/wenzhen_data/index",
-    "t-image": "tdesign-miniprogram/image/image",
     "t-tabs": "tdesign-miniprogram/tabs/tabs",
     "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel",
     "t-badge": "tdesign-miniprogram/badge/badge",
     "van-button": "@vant/weapp/button/index",
-    "van-empty": "@vant/weapp/empty/index"
+    "van-empty": "@vant/weapp/empty/index",
+    "van-image": "@vant/weapp/image/index"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml
index 38f81c4..c84bc76 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxml
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml
@@ -2,23 +2,26 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
   <view class="top">
-      <view class="top_left" bindtap="go" data-url="/Pages/yishi/service_notice/index">
-        <t-badge dot offset="{{ [1, 1] }}" class="wrapper">
-          <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice.png" mode="heightFix" height="108rpx" aria-label="notice" />
+      <view class="top_left" bindtap="go" data-name="service_notice_unreadnnum" data-url="/Pages/yishi/service_notice/index">
+        <t-badge dot="{{service_notice_unreadnnum > 0}}" offset="{{ [1, 1] }}" class="wrapper">
+          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice.png" fit="heightFix" height="108rpx" aria-label="notice" />
         </t-badge>
-        
         服务通知
       </view>
-      <view class="top_right" bindtap="go" data-url="/Pages/yishi/system_notice/index">
-        <t-badge count="8" offset="{{ [1, 1] }}" class="wrapper">
-          <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/system_notice.png" mode="heightFix" height="108rpx" aria-label="notice" />
+      <view class="top_right" bindtap="go" data-name="system_notice_unreadnnum" data-url="/Pages/yishi/system_notice/index">
+        <t-badge offset="{{ [1, 1] }}" class="wrapper" wx:if="{{system_notice_unreadnnum == ''}}">
+          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/system_notice.png" fit="heightFix" height="108rpx" aria-label="notice" />
+        </t-badge>
+
+        <t-badge count="{{system_notice_unreadnnum}}" offset="{{ [1, 1] }}" class="wrapper" wx:else>
+          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/system_notice.png" fit="heightFix" height="108rpx" aria-label="notice" />
         </t-badge>
         系统公告
       </view>
   </view>
 
   <view class="empty" wx:if="{{ !has_data }}" >
-    <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/wnzhen_empty.png" mode="heightFix" height="108rpx" aria-label="empty" />
+    <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/wnzhen_empty.png" fit="heightFix" height="108rpx" aria-label="empty" />
     <view class="empty_note">您还未设置在线问诊价格</view>
   </view>
   <van-button color="#3CC7C0" custom-style="width: 92vw;margin: 0 auto;border-radius: 10rpx;" block wx:if="{{ !has_data }}">开通图文问诊</van-button>
@@ -34,25 +37,7 @@
       custom-style="font-size: 32rpx"
 
     >
-      <t-tab-panel label="快速问诊" value="1">
-        <wenzhen-data 
-        name="李四"
-        sex="女"
-        age="19"
-        desc="VVVVVVVV"
-        status="0"
-        status_text="待接诊"
-        note="xxx"
-         />
-
-        <wenzhen-data 
-        name="李放四"
-        sex="女"
-        age="199"
-        desc="VVVVVVVV"
-        status="1"
-        status_text="接诊中"
-        />
+      <t-tab-panel label="在线问诊" value="1">
 
         <wenzhen-data 
           name="{{ item.patient_name }}"
@@ -61,6 +46,9 @@
           date="{{ item.message_send_time }}"
           desc="{{ item.last_message_content.Text }}"
           status="{{ item.inquiry_status }}"
+          order_inquiry_id="{{ item.order_inquiry_id }}"
+          inquiry_type="{{item.inquiry_type}}"
+          from_account="{{item.from_account}}"
           status_text="{{ 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?'已取消':'其他' }}"
           note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
           message_dot="{{item.message_dot}}"
@@ -70,7 +58,7 @@
          <van-empty description="暂无数据" wx:if="{{data_list_1.length == 0}}" />
       </t-tab-panel>
 
-      <t-tab-panel label="问诊购药" value="2">
+      <t-tab-panel label="快速问诊" value="2">
         <!-- 1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消 -->
         <wenzhen-data 
           name="{{ item.patient_name }}"
@@ -80,6 +68,8 @@
           desc="{{ item.last_message_content.Text }}"
           status="{{ item.inquiry_status }}"
           order_inquiry_id="{{ item.order_inquiry_id }}"
+          inquiry_type="{{item.inquiry_type}}"
+          from_account="{{item.from_account}}"
           status_text="{{ 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?'已取消':'其他' }}"
           note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
           message_dot="{{item.message_dot}}"
@@ -90,7 +80,7 @@
          <van-empty description="暂无数据" wx:if="{{data_list_2.length == 0}}" />
 
       </t-tab-panel>
-      <t-tab-panel label="在线问诊" value="3">
+      <t-tab-panel label="公益问诊" value="3">
         <!-- <wenzhen-data 
         name="王五"
         sex="女"
@@ -108,6 +98,9 @@
           date="{{ item.message_send_time }}"
           desc="{{ item.last_message_content.Text }}"
           status="{{ item.inquiry_status }}"
+          order_inquiry_id="{{ item.order_inquiry_id }}"
+          inquiry_type="{{item.inquiry_type}}"
+          from_account="{{item.from_account}}"
           status_text="{{ 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?'已取消':'其他' }}"
           note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
           message_dot="{{item.message_dot}}"
@@ -117,16 +110,7 @@
          <van-empty description="暂无数据" wx:if="{{data_list_3.length == 0}}" />
 
       </t-tab-panel>
-      <t-tab-panel label="公益问诊" value="4">
-        <wenzhen-data 
-        name="赵柳"
-        sex="女"
-        age="19"
-        desc="VVVVVVVV"
-        status="0"
-        status_text="待接诊"
-        note="xxx"
-         />
+      <t-tab-panel label="问诊购药" value="4">
 
          <wenzhen-data 
           name="{{ item.patient_name }}"
@@ -135,6 +119,9 @@
           date="{{ item.message_send_time }}"
           desc="{{ item.last_message_content.Text }}"
           status="{{ item.inquiry_status }}"
+          order_inquiry_id="{{ item.order_inquiry_id }}"
+          inquiry_type="{{item.inquiry_type}}"
+          from_account="{{item.from_account}}"
           status_text="{{ 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?'已取消':'其他' }}"
           note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
           message_dot="{{item.message_dot}}"
@@ -144,15 +131,6 @@
          <van-empty description="暂无数据" wx:if="{{data_list_4.length == 0}}" />
       </t-tab-panel>
       <t-tab-panel label="问诊结束" value="5">
-        <wenzhen-data 
-        name="谢广坤"
-        sex="女"
-        age="199"
-        desc="VVVVVVVV"
-        status="2"
-        status_class="status_end"
-        status_text="快速问诊"
-        />
 
         <wenzhen-data 
           name="{{ item.patient_name }}"
diff --git a/Pages/yishi/yizhensetup/index.js b/Pages/yishi/yizhensetup/index.js
index e75881d..1443d0b 100644
--- a/Pages/yishi/yizhensetup/index.js
+++ b/Pages/yishi/yizhensetup/index.js
@@ -105,13 +105,9 @@ Page({
      console.log(response);
      Toast.success("修改成功");
      wx.switchTab({
-      url: "/Pages/yishi/wenzhen/wenzhen"
+      url: "/Pages/yishi/wenzhen_v2/wenzhen"
      })
    }).catch(errors => {console.error(errors);})
-
-   
-
-
   },
   onStepperChange(event) {
     console.log(event.detail);
diff --git a/Pages/yishi/yizhensetup/index.wxml b/Pages/yishi/yizhensetup/index.wxml
index 673e6e4..0073e7a 100644
--- a/Pages/yishi/yizhensetup/index.wxml
+++ b/Pages/yishi/yizhensetup/index.wxml
@@ -16,7 +16,7 @@
       <view class="switch_box_note">{{ note }}</view>
     </view>
     <view class="help">
-      <van-cell url="/Pages/yishi/manual/index" custom-style="font-size:32rpx;" title="图文问诊操作手册" is-link border="{{false}}" />
+      <van-cell size="large" url="/Pages/yishi/manual/index" custom-style="font-size:32rpx;" title="图文问诊操作手册" is-link border="{{false}}" />
     </view>
   </view>
 
@@ -30,7 +30,7 @@
         </view>
       </view>
       <view class="price_steup_box_bottom">
-        <van-cell custom-style="font-size:32rpx;border-radius: 20rpx;" 
+        <van-cell size="large" custom-style="font-size:32rpx;border-radius: 20rpx;" 
         title="问诊单价（元）" is-link 
         border="{{false}}" 
         value="{{ amountText }}"
diff --git a/Pages/yishi/zhiye_identity/index.js b/Pages/yishi/zhiye_identity/index.js
index 66d1b05..b43f5f0 100644
--- a/Pages/yishi/zhiye_identity/index.js
+++ b/Pages/yishi/zhiye_identity/index.js
@@ -11,7 +11,11 @@ Page({
     height: app.globalData.height,
     id_card_front: [],
     id_card_back: [],
-    sign_image: ""
+    sign_image: "",
+    btn_txt: "提交",
+    multi_point_status: "",
+    btn_disabled: true
+
   },
 
   onLoad(){
@@ -20,6 +24,29 @@ Page({
     //获得多点执业信息
     api.getDoctorAuthMulti().then(response => {
       console.log("getDoctorAuthMulti: ",response);
+      let multi_point_status = Number(response.data.multi_point_status);
+      let btn_txt = this.data.btn_txt;
+      let btn_disabled = this.data.btn_disabled;
+      switch (multi_point_status) {
+        case 0:
+          btn_txt = "提交";
+          btn_disabled = false;
+          break;
+        case 1:
+          btn_txt = "审核通过";
+          break;
+        case 2:
+          btn_txt = "审核中";
+          break;
+        case 3:
+          btn_txt = "认证失败，再次提交";
+          btn_disabled = false;
+          break;
+        default:
+          btn_txt = "提交";
+          btn_disabled = false;
+          break;
+      }
       if(response.data.id_card_front){
         let id_card_front_img = {};
         id_card_front_img.url = response.data.id_card_front;
@@ -44,8 +71,9 @@ Page({
       this.setData({
         id_card_front: this.data.id_card_front,
         id_card_back: this.data.id_card_back,
+        btn_disabled: btn_disabled,
+        btn_txt: btn_txt
       })
-
       
     }).catch(errors => {
       console.error(errors);
@@ -187,6 +215,13 @@ Page({
     })
   },
   doDeleteFile(event){
+    if(this.data.btn_disabled){
+      wx.showToast({
+        title: '不能修改',
+        icon: "error"
+      })
+      return;
+    }
     console.log(event);
     let url = event.detail.file.url;
     let file_name = event.currentTarget.dataset.field_name;
@@ -200,5 +235,16 @@ Page({
   },
   onshowIdCardBackNote(){
     console.log("onshowIdCardBackNote");
+  },
+  go(e){
+    // if(this.data.btn_disabled){
+    //   wx.showToast({
+    //     title: '不能修改',
+    //     icon: "error"
+    //   })
+    //   return;
+    // }
+    let url = e.currentTarget.dataset.url;
+    app.go(url)
   }
 })
\ No newline at end of file
diff --git a/Pages/yishi/zhiye_identity/index.wxml b/Pages/yishi/zhiye_identity/index.wxml
index a06e626..a3cf461 100644
--- a/Pages/yishi/zhiye_identity/index.wxml
+++ b/Pages/yishi/zhiye_identity/index.wxml
@@ -1,37 +1,37 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
   <m-upload-cell
-        upload_cell_name="上传身份证正面照片" 
-        t_icon_name="view-module" 
-        bind:showNote="onshowIdCardFrontNote"
-        upload_cell_desc="" 
-        upload_cell_note="查看示例" 
-        fileList="{{ id_card_front }}"
-        max_count="1"
-        data-scene="2" 
-        data-field_name="id_card_front" 
-        data-file_multiple="true"
-        bindUploadFile="doUploadFile"
-        bindDeleteFile="doDeleteFile"
-        />
+    upload_cell_name="上传身份证正面照片" 
+    t_icon_name="view-module" 
+    bind:showNote="onshowIdCardFrontNote"
+    upload_cell_desc="" 
+    upload_cell_note="查看示例" 
+    fileList="{{ id_card_front }}"
+    max_count="1"
+    data-scene="2" 
+    data-field_name="id_card_front" 
+    data-file_multiple="true"
+    bindUploadFile="doUploadFile"
+    bindDeleteFile="doDeleteFile"
+    />
 
   <m-upload-cell
-        upload_cell_name="上传身份证反面照片" 
-        t_icon_name="view-module" 
-        bind:showNote="onshowIdCardBackNote"
-        upload_cell_desc="" 
-        upload_cell_note="查看示例" 
-        fileList="{{ id_card_back }}"
-        max_count="1"
-        data-scene="2" 
-        data-field_name="id_card_back" 
-        data-file_multiple="true"
-        bindUploadFile="doUploadFile"
-        bindDeleteFile="doDeleteFile"
-        />
+    upload_cell_name="上传身份证反面照片" 
+    t_icon_name="view-module" 
+    bind:showNote="onshowIdCardBackNote"
+    upload_cell_desc="" 
+    upload_cell_note="查看示例" 
+    fileList="{{ id_card_back }}"
+    max_count="1"
+    data-scene="2" 
+    data-field_name="id_card_back" 
+    data-file_multiple="true"
+    bindUploadFile="doUploadFile"
+    bindDeleteFile="doDeleteFile"
+    />
   
   <van-cell-group border="{{ false }}">
-    <van-cell 
+    <van-cell size="large" 
     url="/Pages/yishi/manual/index"
     title="多点执业认证流程" 
     border="{{ false }}"
@@ -44,20 +44,17 @@
 
     <view class="sign_box">
       <view class="sign_title">医生手写签名 *</view>
-      <view class="sign" wx:if="{{sign_image == ''}}">
-        <navigator url="/Pages/yishi/signcanvas/index" open-type="navigate" hover-class="other-navigator-hover">
-          <van-button custom-style="height:130rpx;margin-top:20rpx;border-radius: 20rpx;border: 1px dashed #999;width:100%;font-size:30rpx;background-color: #fff;color: #3CC7C0;" icon="edit">点击签名</van-button>
-        </navigator>
+      <view class="sign" wx:if="{{sign_image == ''}}" data-url="/Pages/yishi/signcanvas/index" bindtap="go">
+        <van-button custom-style="height:130rpx;margin-top:20rpx;border-radius: 20rpx;border: 1px dashed #999;width:100%;font-size:30rpx;background-color: #fff;color: #3CC7C0;" icon="edit">点击签名</van-button>
+      </view>
+      <view class="sign_img" wx:if="{{sign_image != ''}}" data-url="/Pages/yishi/signcanvas/index" bindtap="go">
+        <image mode="heightFix" style="transform: rotate(-90deg);width: 100%;" src="{{sign_image}}"></image>
       </view>
-      <navigator url="/Pages/yishi/signcanvas/index" open-type="navigate" hover-class="other-navigator-hover">
-        <view class="sign_img" wx:if="{{sign_image != ''}}">
-          <image mode="heightFix" style="transform: rotate(-90deg);width: 100%;" src="{{sign_image}}"></image>
-        </view>
-      </navigator>
       <view class="sign_note">提示：平台会在1~3天内审核您提交的资料，审核结果会第一时间通知您。</view>
 
       <!-- <van-button custom-style="font-size:30rpx; color:#fff; border-radius: 20rpx; background-color: #999"  block>资料未填写完</van-button> -->
-      <van-button bind:click="add" custom-style="font-size:30rpx; color:#fff; border-radius: 20rpx; background-color: #3CC7C0"  block>提交</van-button>
+      <van-button bind:click="add" 
+      custom-style="font-size:30rpx; color:#fff; border-radius: 20rpx; background-color: #3CC7C0" disabled="{{btn_disabled}}"  block>{{btn_txt}}</van-button>
     </view>
     <view style="height: 50rpx;"> 
       
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js
index 6c50b87..b39dd2b 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.js
@@ -20,6 +20,10 @@ Component({
       type: String,
       value: {},
     },
+    inquiry_type: {
+      type: String,
+      value: {},
+    },
     hasCallKit: {
       type: Boolean,
       value: false,
@@ -493,8 +497,8 @@ Component({
           text,
         },
         cloudCustomData: JSON.stringify({
-          order_inquiry_id: "AA",
-          inquiry_type: "BB",
+          order_inquiry_id: this.data.order_inquiry_id,
+          inquiry_type: this.data.inquiry_type,
           message_type: 0,
           is_system: 0
         }),
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index 11834d0..ece384b 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -147,8 +147,19 @@ Component({
           nextReqMessageID: this.data.nextReqMessageID,
           count: 15,
         }).then((res) => {
-          this.showMoreHistoryMessageTime(res.data.messageList);
-          const { messageList } = res.data; // 消息列表。
+          let HMM_data = res.data;//HMM
+          let HMM_messageList_del = [];
+          console.log("HMM getMessageList: ", HMM_data);
+          let HMM_messageList = HMM_data.messageList;
+          HMM_messageList.forEach(item => {
+            let HMM_type = item.type;
+            if(HMM_type == "TIMCustomElem") return;
+            HMM_messageList_del.push(item);
+          })
+          HMM_data.messageList = HMM_messageList_del;
+
+          this.showMoreHistoryMessageTime(HMM_messageList_del);
+          const { messageList } = HMM_data; // 消息列表。
           this.data.nextReqMessageID = res.data.nextReqMessageID; // 用于续拉，分页续拉时需传入该字段。
           this.data.isCompleted = res.data.isCompleted; // 表示是否已经拉完所有消息。
           this.data.messageList = [...messageList, ...this.data.messageList];
diff --git a/TUIKit/components/TUIChat/index.js b/TUIKit/components/TUIChat/index.js
index aedd762..9bb6b4f 100644
--- a/TUIKit/components/TUIChat/index.js
+++ b/TUIKit/components/TUIChat/index.js
@@ -35,6 +35,10 @@ Component({
       type: String,
       value: ''
     },
+    inquiry_type: {
+      type: String,
+      value: ''
+    },
     unreadCount: {
       type: Number,
       value: '',
diff --git a/TUIKit/components/TUIChat/index.wxml b/TUIKit/components/TUIChat/index.wxml
index f28a852..19aa985 100644
--- a/TUIKit/components/TUIChat/index.wxml
+++ b/TUIKit/components/TUIChat/index.wxml
@@ -4,7 +4,7 @@
      <image class="tui-navigatorbar-back" bindtap="goBack" src="../../static/assets/ic_back_white.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'}}  ">
+  <view class="list-box {{ showTips && 'list-box-notips'}} || {{ showGroupTips && 'list-box-group'}}  || {{ showAll && 'list-box-group-notips'}}  ">
     <view wx:if="{{showTips}}" class="safetytips-box">
     <!-- <view class="safetytips">
       <text>【安全提示】本 APP 仅用于体验腾讯云即时通信 IM 产品功能，不可用于业务洽谈与拓展。请勿轻信汇款、中奖等涉及钱款等信息，勿轻易拨打陌生电话，谨防上当受骗。</text>
@@ -20,7 +20,7 @@
   </view>
   <view class="input-area">
   <view class="message-input" style="{{viewData.style}}" wx:if="{{showChat}}">
-    <MessageInput id="MessageInput" order_inquiry_id="{{order_inquiry_id}}" conversation="{{conversation}}" hasCallKit="{{hasCallKit}}" bind:sendMessage="sendMessage" bind:downKeysBoards="downKeysBoards" bind:pullKeysBoards="pullKeysBoards" bind:showMessageErrorImage="showMessageErrorImage" 
+    <MessageInput id="MessageInput" inquiry_type="{{inquiry_type}}" 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>
diff --git a/app.js b/app.js
index 34010e1..c7650ff 100644
--- a/app.js
+++ b/app.js
@@ -2,6 +2,8 @@ import Aegis from './TUIKit/lib/aegis';
 import TIM from './TUIKit/lib/tim-wx-sdk';
 import { genTestUserSig }  from './TUIKit/debug/GenerateTestUserSig';
 import TIMUploadPlugin from './TUIKit/lib/tim-upload-plugin';
+import { API } from './utils/network/api'
+const api = new API()
 App({
   onLaunch: function (options) {
     // 判断是否由分享进入小程序
@@ -44,58 +46,92 @@ App({
     this.aegisInit()
     console.warn("app.js  wx.aegis: ", wx.aegis);
 
-    //初始化tab-bar角标
-    let index_info = wx.getStorageSync('index_info');
-    let wenzhen_info = wx.getStorageSync('wenzhen_info');
-    let my_info = wx.getStorageSync('my_info');
-    if(!index_info) wx.setStorageSync('index_info',"");
-    if(!wenzhen_info) wx.setStorageSync('wenzhen_info', "");
-    if(!my_info) wx.setStorageSync('my_info', "");
+
   },
   onShow(){
-    this.imInit(this.onSDKReady, this);
+    this.imInit();
   },
-  imInit(onSDKReady, obj){
+  imInit(){
+
+    let userID = wx.getStorageSync('user_id');
+    if(userID == ""){
+      return;
+    }
+    this.globalData.config.userID = userID;
     let sign = genTestUserSig(this.globalData.config);
     console.log("sign: ", sign);
-    const userSig = sign.userSig;
-    console.log("userSig: ", userSig);
-    wx.$TUIKit = TIM.create({
-      SDKAppID: this.globalData.config.SDKAPPID
-    });
+    // const userSig = sign.userSig;
+
+    //获取im签名数据
+    api.getSignIM().then(response => {
+      return response.data;
+    }).then((userSig) => {
+      console.log("userSig: ", userSig);
+      wx.$TUIKit = TIM.create({
+        SDKAppID: this.globalData.config.SDKAPPID
+      });
+      
+      wx.$chat_userID = this.globalData.config.userID;
+      wx.$chat_SDKAppID = this.globalData.config.SDKAPPID;
+      wx.$chat_userSig = userSig;
+      wx.$TUIKitTIM = TIM;
+      wx.$TUIKit.registerPlugin({ 'tim-upload-plugin': TIMUploadPlugin });            
+      let login_promise = wx.$TUIKit.login({
+          userID: this.globalData.config.userID,
+          userSig
+      });
+
+      login_promise.then(function(imResponse) {
+        console.log(imResponse.data); // 登录成功
+        
+      }).catch(function(imError) {
+        console.warn('login error:', imError); // 登录失败的相关信息
+  
+      });
+  
+      wx.$TUIKit.setLogLevel(3);//设置日志级别
+      wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady, this);
+    }).then(()=>{
+      //初始化tab-bar角标
+      let index_info = wx.getStorageSync(userID+'_index_info');
+      let wenzhen_info = wx.getStorageSync(userID+'_wenzhen_info');
+      let my_info = wx.getStorageSync(userID+'_my_info');
+      if(!index_info) wx.setStorageSync(userID+'_index_info',"");
+      if(!wenzhen_info) wx.setStorageSync(userID+'_wenzhen_info', "");
+      if(!my_info) wx.setStorageSync(userID+'_my_info', "");
+    }).catch(errors => {console.error(errors);})
+
     
-    wx.$chat_SDKAppID = this.globalData.config.SDKAPPID;
-    wx.$chat_userID = this.globalData.config.userID;
-    wx.$chat_userSig = userSig;
-    wx.$TUIKitTIM = TIM;
-    wx.$TUIKit.registerPlugin({ 'tim-upload-plugin': TIMUploadPlugin });            
-    wx.$TUIKit.login({
-        userID: this.globalData.config.userID,
-        userSig
-    });
-    wx.$TUIKit.setLogLevel(3);//设置日志级别
-    wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.SDK_READY, onSDKReady, obj);
   },
   onSDKReady(){
     console.log("onSDKReady from app.js");
     this.globalData.chat_sdk_ready = true;
-    
+
     wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onSystemPushReceived, this);
   },
   $onSystemPushReceived(e){
     console.log("onSystemPushReceived from app.js");
     console.log(e)
+    let userID = wx.getStorageSync('user_id');
     let message = e.data[0];
     console.log(message)
 
     let type = message.type;
     console.log(type);
-    
-   
-    this.formatTabBarNum("wenzhen_info");
-
+    let unread_name = "";
+    if(type == TIM.TYPES.MSG_CUSTOM){
+      let payload = message.payload;
+      let payloadData = payload.data;
+      let payloadDataJson = JSON.parse(payloadData);
+      let message_type = payloadDataJson.message_type;
+      if(message_type == 3) unread_name = userID+"_system_notice_unreadnnum"; //医生端系统通知
+      if(message_type == 4) unread_name = userID+"_service_notice_unreadnnum"; //医生端服务通知
+    }else{
+      unread_name = userID+"_wenzhen_info";//tabbar 问诊角标
+    }
+    this.formatUnReadNum(unread_name);
   },
-  formatTabBarNum(name){
+  formatUnReadNum(name){
     let val = wx.getStorageSync(name);
     if(val == "") val = 0;
     if(val == "+99") val = 100;
@@ -117,7 +153,7 @@ App({
     login_url: "/Pages/login/index",
     chat_sdk_ready: false,
     config: {
-      userID: "123456", //User ID
+      userID: "",
       SDKAPPID: 1400796919, // Your SDKAppID
       SECRETKEY: "a5bcd8c583181cf004e9d91a47687d719d4b5d2a10ce33fbee95d587889447d8", // Your secretKey
       EXPIRETIME: 604800,
diff --git a/app.json b/app.json
index fff176f..4d4bc5c 100644
--- a/app.json
+++ b/app.json
@@ -49,7 +49,8 @@
     "Pages/mobile_login/index",
     "Pages/yishi/manual_detail/index",
     "Pages/yishi/addzhenduan/index",
-    "Pages/yishi/wenzhen_v2/wenzhen"
+    "Pages/yishi/wenzhen_v2/wenzhen",
+    "Pages/webpage/index"
   ],
   "window": {
     "navigationBarBackgroundColor": "#ffffff",
diff --git a/commpents/mynavbar/index.wxss b/commpents/mynavbar/index.wxss
index baca7f2..261410f 100644
--- a/commpents/mynavbar/index.wxss
+++ b/commpents/mynavbar/index.wxss
@@ -7,7 +7,7 @@
   top: 0;
   width: 750rpx;
   height: 170rpx;
-  background-color: #bae46b;
+  background-color: #e94d4d;
   z-index: 99;
 }
 .tui-navigatorbar-back{
@@ -23,7 +23,7 @@
   height: 88rpx;
   line-height: 56rpx;
   font-size: 36rpx;
-  color: #e68080;
+  color: #000000;
   bottom: 0;
   left: 200rpx;
   display: flex;
diff --git a/commpents/myprofile/index.js b/commpents/myprofile/index.js
index 560f0fd..09c0439 100644
--- a/commpents/myprofile/index.js
+++ b/commpents/myprofile/index.js
@@ -104,6 +104,8 @@ Component({
   },
   lifetimes: {
     attached(){
+
+      console.log("myprofile attached")
       let _this = this;
       console.log(_this.data.zhicheng_columns);
       _this.setData({
@@ -317,15 +319,33 @@ Component({
         console.log("keshi_huixian: ", keshi_huixian)
         console.log("zhicheng_huixian: ", zhicheng_huixian)
         console.log("area_huixian: ", area_huixian)
-        if((keshi_huixian && zhicheng_huixian && area_huixian) || huixian_try_count > 100){
+        if((keshi_huixian && zhicheng_huixian && area_huixian) || huixian_try_count > 50){
           clearInterval(data_replay);
         }
         console.log("计时器");
-      }, 100);
+      }, 500);
     },
   },
 
   methods: {
+    hospitalSearch(e){
+      console.log(e.detail)
+    },
+    hospitalSearchChange(e){
+      console.log(e.detail);
+      let params = {
+        hospital_name: e.detail.trim(),
+        province_id: this.data.select_province_id,
+        city_id: this.data.select_city_id,
+        county_id: this.data.select_county_id,
+      }
+      api.getBasicHospital(params).then(response => {// 请求医院列表】
+        this.setData({
+          yiyuan_columns: this.formatYiYuan(response),
+          yiyuan_show: true
+        })
+      }).catch(errors => {console.error(errors); })
+    },
     onCityShow(e) {
       console.log("onCityShow");
       this.setData({ city_show: true });
diff --git a/commpents/myprofile/index.json b/commpents/myprofile/index.json
index e2dc8bd..dd3b01c 100644
--- a/commpents/myprofile/index.json
+++ b/commpents/myprofile/index.json
@@ -18,6 +18,7 @@
     "van-picker": "@vant/weapp/picker/index",
     "van-toast": "@vant/weapp/toast/index",
     "van-button": "@vant/weapp/button/index",
-    "van-icon": "@vant/weapp/icon/index"
+    "van-icon": "@vant/weapp/icon/index",
+    "van-search": "@vant/weapp/search/index"
   }
 }
diff --git a/commpents/myprofile/index.wxml b/commpents/myprofile/index.wxml
index f417f7f..1f943bd 100644
--- a/commpents/myprofile/index.wxml
+++ b/commpents/myprofile/index.wxml
@@ -38,6 +38,8 @@
           bind:close="onYiYuanClose"
           round
         >
+
+        
         <van-picker 
           show-toolbar
           title="请选择医院"
@@ -46,6 +48,15 @@
           bind:cancel="onYiYuanCancel"
           bind:confirm="onYiYuanConfirm" 
           bind:change="onYiYuanChange" />
+       
+        <van-search
+          value="{{ hospital_search_val }}"
+          shape="round"
+          placeholder="请输入搜索关键词"
+          clearable
+          bind:change="hospitalSearchChange"
+          bind:search="hospitalSearch"
+        />
         </van-popup>
         <t-cell title="科室" hover required arrow note="{{keshi_note}}" bindtap="onKeshiShow" bordered="{{ select_keshi_id == '' }}"/>
 
@@ -200,7 +211,7 @@
         bind:showNote="onshowJianJieNote"
         textarea_cell_content_placeholder="您的从业经历，职称，所获荣誉等信息（10~1000字）" 
         textarea_val="{{textarea_jianjie}}"
-        has_error_content="{{ be_good_at_reason }}"
+        has_error_content="{{ brief_introduction_reason }}"
         data-textarea_name="textarea_jianjie" bindTextAreaBlur="getTextAreaVal" />
 
         <m-textarea-cell 
@@ -208,7 +219,7 @@
         t_icon_name="view-module" 
         bind:showNote="onshowShanChangNote"
         textarea_val="{{textarea_shanchang}}"
-        has_error_content="{{ brief_introduction_reason }}"
+        has_error_content="{{ be_good_at_reason }}"
         textarea_cell_content_placeholder="您的专业领域、擅长疾病、研究方法等信息（10~1000字）" 
         textarea_cell_note="查看示例" data-textarea_name="textarea_shanchang" bindTextAreaBlur="getTextAreaVal" />
 
diff --git a/commpents/myprofile/index.wxss b/commpents/myprofile/index.wxss
index ff80501..70dd2b1 100644
--- a/commpents/myprofile/index.wxss
+++ b/commpents/myprofile/index.wxss
@@ -212,4 +212,12 @@
   margin-left: 32rpx;
   padding-bottom: 20rpx;
   border-bottom: 1rpx solid #e7e7e7;
+}
+.van-picker__columns {
+  height: 264px !important;
+  top: 40px !important;
+}
+.van-search {
+  top: -270px !important;
+  position: relative !important;
 }
\ No newline at end of file
diff --git a/commpents/wenzhen_data/index.js b/commpents/wenzhen_data/index.js
index fa8b97e..837b185 100644
--- a/commpents/wenzhen_data/index.js
+++ b/commpents/wenzhen_data/index.js
@@ -48,6 +48,10 @@ Component({
       type: String,
       value: '',
     },
+    inquiry_type: {
+      type: String,
+      value: '',
+    },
     note: {
       type: String,
       value: '不接诊24小时后自动取消',
@@ -80,14 +84,18 @@ Component({
       })
     },
     goChat(e){
+      this.setData({
+        show: false
+      })
       wx.requestSubscribeMessage({
         tmplIds: ['jhYUf91ULCTX_f69hazqAYwImdFf8ELasRAwB6X-MTM'],
         success (res) {
           console.log(res);
           let from_account = e.currentTarget.dataset.from_account;
           let order_inquiry_id = e.currentTarget.dataset.order_inquiry_id;
+          let inquiry_type = e.currentTarget.dataset.inquiry_type;
           wx.navigateTo({
-            url: e.currentTarget.dataset.url+"?from_account="+from_account+"&order_inquiry_id="+order_inquiry_id
+            url: e.currentTarget.dataset.url+"?from_account="+from_account+"&order_inquiry_id="+order_inquiry_id+"&inquiry_type="+inquiry_type
           })
         }
       })
diff --git a/commpents/wenzhen_data/index.wxml b/commpents/wenzhen_data/index.wxml
index 6347815..753f406 100644
--- a/commpents/wenzhen_data/index.wxml
+++ b/commpents/wenzhen_data/index.wxml
@@ -27,7 +27,7 @@
     <view class="pop_note">为保障服务质量，请您查看患者病历信息在选择是否接诊。</view>
     <view class="pop_btn">
       <view class="pop_btn_left" bindtap="go" data-from_account="{{from_account}}" data-url="/Pages/yishi/case/index?order_inquiry_id={{order_inquiry_id}}" >去查看</view>
-      <view class="pop_btn_right" bindtap="goChat" data-from_account="{{from_account}}" data-order_inquiry_id="{{order_inquiry_id}}" data-url="/Pages/yishi/chat/index" >去接诊</view>
+      <view class="pop_btn_right" bindtap="goChat" data-from_account="{{from_account}}" data-inquiry_type="{{inquiry_type}}" data-order_inquiry_id="{{order_inquiry_id}}" data-url="/Pages/yishi/chat/index" >去接诊</view>
     </view>
   </view>
 </van-popup>
\ No newline at end of file
diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js
index 720aaa5..52db41a 100644
--- a/custom-tab-bar/index.js
+++ b/custom-tab-bar/index.js
@@ -72,10 +72,11 @@ Component({
       })
     }
     let _this = this;
+    let userID = wx.getStorageSync('user_id');
     setInterval(() => {
-      let index_info = wx.getStorageSync('index_info');
-      let wenzhen_info = wx.getStorageSync('wenzhen_info');
-      let my_info = wx.getStorageSync('my_info');
+      let index_info = wx.getStorageSync(userID+'_index_info');
+      let wenzhen_info = wx.getStorageSync(userID+'_wenzhen_info');
+      let my_info = wx.getStorageSync(userID+'_my_info');
       _this.setData({
         index_info: index_info,
         wenzhen_info: wenzhen_info,
@@ -100,28 +101,45 @@ Component({
     //   }
     // },
     onChange(e) {
-      // this.setData({
-      //   dialog_visible: true,
-      //   dialog_content: "测试"
-      // })
       console.log("custom tab bar onChange");
-      // return;
+
+      let idcard_status = wx.getStorageSync('idcard_status');
+      let iden_auth_status = wx.getStorageSync('iden_auth_status');
+
+      console.log("idcard_status: ", idcard_status);
+      console.log("iden_auth_status: ", iden_auth_status);
+      if(idcard_status != 1){
+        this.setData({
+          dialog_visible: true,
+          dialog_content: "请您先实名认证"
+        })
+        return;
+      }
+      if(iden_auth_status != 1){
+        this.setData({
+          dialog_visible: true,
+          dialog_content: "请您先医师身份认证"
+        })
+        return;
+      }
+      
       let url = this.data.items[e.detail].pagePath;
       console.log(url);
       wx.switchTab({
         url: url,
       })
-      },
-      confirmDialog(){
-        this.setData({
-          dialog_visible: false
-        })
-      },
-      cancelDialog(){
-        this.setData({
-          dialog_visible: false
-        })
-      },
-    }
+    },
+    confirmDialog(){
+      this.setData({
+        dialog_visible: false
+      })
+      app.go("/Pages/yishi/identity/index");
+    },
+    cancelDialog(){
+      this.setData({
+        dialog_visible: false
+      })
+    },
+  }
   
 })
\ No newline at end of file
diff --git a/utils/network/api.js b/utils/network/api.js
index fc23408..033c7a7 100644
--- a/utils/network/api.js
+++ b/utils/network/api.js
@@ -7,7 +7,7 @@ class API extends HTTP {
   //获取oss签名数据
   getOssSign(params) {
     return this.request({
-      url: `${this.baseUrl}/oss/sign`,
+      url: `${this.baseUrl}/sign/oss`,
       method: 'GET',
       data: {
         ...params
@@ -464,6 +464,16 @@ class API extends HTTP {
       ...params
     }
   })
+}
+ //获取im签名数据
+ getSignIM(params) {
+  return this.request({
+    url: `${this.baseUrl}/sign/im`,
+    method: 'GET',
+    data: {
+      ...params
+    }
+  })
 }
 }
 
diff --git a/utils/util.js b/utils/util.js
index cc63f42..ab1dc18 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -17,7 +17,7 @@ const formatChatTime = date => {
   const minute = date.getMinutes()
   const second = date.getSeconds()
 
-  return `${[year, month, day].map(formatNumber).join('-')} ${[hour, minute].map(formatNumber).join(':')}`
+  return `${[month, day].map(formatNumber).join('-')} ${[hour, minute].map(formatNumber).join(':')}`
 }
 
 const getDateArr = date => {

From cfa69efd1560723bce26286d8cf989742bdb5bf6 Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Wed, 22 Mar 2023 09:01:58 +0800
Subject: [PATCH 09/83] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/index/index.js                          |  63 +----
 Pages/index/index.wxml                        |   4 -
 Pages/login/index.js                          |  11 +-
 Pages/login/index.wxml                        |   5 +
 Pages/mobile_login/index.js                   |  49 ++--
 Pages/yaoshi/authentication/authentication.js |  17 +-
 .../yaoshi/authentication/authentication.wxml |  22 +-
 Pages/yaoshi/home/home.js                     |  80 +++++-
 Pages/yaoshi/home/home.wxml                   | 116 +++++----
 Pages/yaoshi/home/home.wxss                   |   9 +-
 Pages/yaoshi/info/info.js                     |  23 +-
 Pages/yaoshi/info/info.wxml                   |  20 +-
 Pages/yaoshi/info/info.wxss                   |   1 -
 Pages/yaoshi/medicalrecord/medicalrecord.js   |  38 ++-
 Pages/yaoshi/medicalrecord/medicalrecord.wxml |  31 ++-
 Pages/yaoshi/medicalrecord/medicalrecord.wxss |   5 +-
 Pages/yaoshi/my/my.js                         |  28 +-
 Pages/yaoshi/my/my.json                       |   1 -
 Pages/yaoshi/my/my.wxml                       |   5 +-
 Pages/yaoshi/my/my.wxss                       |   1 -
 Pages/yaoshi/prescription/prescription.js     |  49 ++--
 Pages/yaoshi/prescription/prescription.wxml   |   7 +-
 Pages/yaoshi/prescription/prescription.wxss   |   4 +-
 Pages/yishi/bankcard/index.wxml               |   6 +-
 Pages/yishi/bankcard/index.wxss               |   5 +-
 Pages/yishi/bindcard/index.wxml               |   6 +-
 Pages/yishi/bindcard/index.wxss               |   2 +-
 Pages/yishi/case/index.wxml                   |  12 +-
 Pages/yishi/cash/index.js                     |   8 +-
 Pages/yishi/cash/index.json                   |   2 +-
 Pages/yishi/cash/index.wxml                   |   2 +-
 Pages/yishi/identity/index.js                 |  17 +-
 Pages/yishi/identity/index.wxml               |  19 +-
 Pages/yishi/identity/index.wxss               |   6 +-
 Pages/yishi/index/index.js                    | 231 ++++++++++-------
 Pages/yishi/index/index.wxml                  |  16 +-
 Pages/yishi/kuaisusetup/index.wxml            |   6 +-
 Pages/yishi/myinfo/index.js                   |  54 +++-
 Pages/yishi/myinfo/index.json                 |   3 +-
 Pages/yishi/myinfo/index.wxml                 |  21 +-
 Pages/yishi/myinfo/index.wxss                 |   5 +
 Pages/yishi/myprofile/index.wxml              |   2 +-
 Pages/yishi/onlinechufang/index.js            |  65 ++++-
 Pages/yishi/onlinechufang/index.wxml          |  22 +-
 Pages/yishi/onlinechufang/index.wxss          |   3 +-
 Pages/yishi/onlinesetup/index.js              |  42 ++-
 Pages/yishi/onlinesetup/index.json            |   2 +-
 Pages/yishi/onlinesetup/index.wxml            |  10 +-
 Pages/yishi/onlinesetup/index.wxss            |   2 +-
 Pages/yishi/practicing/index.wxml             |   2 +-
 Pages/yishi/practicing/index.wxss             |   1 +
 Pages/yishi/signcanvas/index.js               |  46 +++-
 Pages/yishi/signcanvas/index.json             |   6 +-
 Pages/yishi/signcanvas/index.wxml             |   3 +-
 Pages/yishi/wenzhen_v2/wenzhen.js             |   9 +-
 Pages/yishi/wenzhen_v2/wenzhen.wxml           |  16 +-
 Pages/yishi/yizhensetup/index.wxml            |   4 +-
 Pages/yishi/zhiye_identity/index.js           |  75 +++---
 Pages/yishi/zhiye_identity/index.wxml         |  30 ++-
 .../TUIChat/components/MessageInput/index.js  |   2 +-
 commpents/myprofile/index.js                  | 240 ++++++++++++++----
 commpents/myprofile/index.wxml                |  38 ++-
 commpents/myprofile/index.wxss                |  15 +-
 commpents/upload-cell/index.js                |   8 +
 commpents/upload-cell/index.wxml              |   4 +-
 commpents/wenzhen_data/index.js               |  22 ++
 commpents/wenzhen_data/index.wxml             |   4 +-
 custom-tab-bar/index.js                       |  45 +++-
 static/images/123.png                         | Bin 0 -> 4362 bytes
 utils/network/api.js                          | 132 +++++++++-
 utils/network/request.js                      |  28 +-
 71 files changed, 1300 insertions(+), 588 deletions(-)
 create mode 100644 static/images/123.png

diff --git a/Pages/index/index.js b/Pages/index/index.js
index af9f44f..ade1a4f 100644
--- a/Pages/index/index.js
+++ b/Pages/index/index.js
@@ -21,72 +21,15 @@ Page({
     let url = e.currentTarget.dataset.url;
     wx.setStorageSync('usertype', usertype);
     wx.setStorageSync('next_url', url);
-    let user_uuid = wx.getStorageSync('user_id');
-    console.log(user_uuid);
-    if(user_uuid){
+    let token = wx.getStorageSync('AUTH_TOKEN_'+usertype);
+    console.log(token);
+    if(token){
       wx.switchTab({
         url: url
       })
     }else{
       app.go(app.globalData.login_url);
     }
-  },
-  bindGetUserInfo(){
-    wx.getUserInfo({
-      success: function(res) {
-        var userInfo = res.userInfo
-        var nickName = userInfo.nickName
-        var avatarUrl = userInfo.avatarUrl
-        var gender = userInfo.gender //性别 0：未知、1：男、2：女
-        var province = userInfo.province
-        var city = userInfo.city
-        var country = userInfo.country
-        console.log(res.userInfo)
-      }
-    })
-  },
-  shenfang(){
-    wx.requestSubscribeMessage({
-      tmplIds: [
-        "5Tl-xmaWXrKP5BB8E6b3oTdPHbHa7WYWbmvZiuz4TLs",
-        "kUy70xHlr7ADo4aIHiictM4Te7MSec3E5kHsYvFQu40"
-      ],
-      success(res){
-        console.log(res)
-      },
-      fail(res){
-        console.log(res)
-      },
-      complete(res){
-        console.log(res)
-      }
-    })
-  },
-  yici(){
-    wx.requestSubscribeMessage({
-      tmplIds: [
-        "jhYUf91ULCTX_f69hazqAYwImdFf8ELasRAwB6X-MTM",
-        "JMPmlYGh1HcUSuEfJCVQUIsZv4H5ar3QvXZfrNYNFuc"
-      ],
-      success(res){
-        console.log(res)
-      },
-      fail(res){
-        console.log(res)
-      },
-      complete(res){
-        console.log(res)
-      }
-    })
-  },
-  check(){
-    wx.getSetting({
-      withSubscriptions: true,
-      success (res) {
-        console.log(res.authSetting)
-        console.log(res.subscriptionsSetting)
-      }
-    })
   }
   
 })
\ No newline at end of file
diff --git a/Pages/index/index.wxml b/Pages/index/index.wxml
index 35b36ca..789a18c 100644
--- a/Pages/index/index.wxml
+++ b/Pages/index/index.wxml
@@ -26,10 +26,6 @@
         <t-loading slot="loading" theme="circular" size="40rpx" loading />
       </t-image>
   </view>
-
-  <!-- <button bindtap="shenfang">审方提醒(长期)</button>
-  <button bindtap="yici">患者回复通知(一次)</button>
-  <button bindtap="check">获取订阅状态</button> -->
   
 </view>
 
diff --git a/Pages/login/index.js b/Pages/login/index.js
index 1bd4d75..9407e64 100644
--- a/Pages/login/index.js
+++ b/Pages/login/index.js
@@ -9,7 +9,7 @@ Page({
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '登录', //导航栏 中间的标题
     },
-    checked: true
+    checked: false
   },
   onChange(event) {
     this.setData({
@@ -26,6 +26,13 @@ Page({
   getPhoneNumber (e) {
     console.log(e);
     console.log(e.detail.code);
+    if(!this.data.checked){
+      wx.showToast({
+        title: '请同意协议',
+        icon: "error"
+      })
+      return;
+    }
     let usertype =  wx.getStorageSync('usertype');
     let next_url =  wx.getStorageSync('next_url');
     wx.login({
@@ -39,7 +46,7 @@ Page({
         }
         api.wechatMobileLogin(params).then(response => {
           console.log(response);
-          wx.setStorageSync('AUTH_TOKEN', response.data.token);
+          wx.setStorageSync('AUTH_TOKEN_'+usertype, response.data.token);
           wx.setStorageSync('user_id', response.data.user_id);
           wx.setStorageSync('client_user_id', response.data.client_user_id);
           app.globalData.config.userID = response.data.user_id;
diff --git a/Pages/login/index.wxml b/Pages/login/index.wxml
index 2292bab..625cfb6 100644
--- a/Pages/login/index.wxml
+++ b/Pages/login/index.wxml
@@ -15,9 +15,14 @@
 
     <view class="btn">
       <van-button 
+        wx:if="{{ checked }}"
         open-type="getPhoneNumber" 
         bindgetphonenumber="getPhoneNumber"
         color="#09BB07" custom-style="font-size: 36rpx;" type="primary" round block>微信授权手机号登录</van-button>
+      <van-button 
+        wx:else
+        bindtap="getPhoneNumber"
+        color="#09BB07" custom-style="font-size: 36rpx;" type="primary" round block>微信授权手机号登录</van-button>
       <van-checkbox value="{{ checked }}" bind:change="onChange">我已阅读并同意协议<text style="color: #4384FE;">《肝胆相照用户服务协议》</text></van-checkbox>
     </view>
 
diff --git a/Pages/mobile_login/index.js b/Pages/mobile_login/index.js
index c35cb02..1463245 100644
--- a/Pages/mobile_login/index.js
+++ b/Pages/mobile_login/index.js
@@ -7,7 +7,7 @@ Page({
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '手机号登录', //导航栏 中间的标题
     },
-    checked: true,
+    checked: false,
     phone: "",
     sms: "",
     btn_msg: "获取验证码",
@@ -55,22 +55,37 @@ Page({
       })
       return;
     }
-    var params = {};
-    params.phone = this.data.phone;
-    params.code = this.data.sms;
-    params.user_type = wx.getStorageSync('usertype');
-
-    api.mobileLogin(params).then(response => {
-      console.log(response);
-      wx.setStorageSync('AUTH_TOKEN', response.data.token);
-      wx.setStorageSync('user_id', response.data.user_id);
-      wx.setStorageSync('client_user_id', response.data.client_user_id);
-      app.globalData.config.userID = response.data.user_id;
-      app.imInit();
-      wx.switchTab({
-        url:  wx.getStorageSync('next_url')
-      })
-    }).catch(errors => {console.error(errors);})
+    let usertype = wx.getStorageSync('usertype');
+    wx.login({
+      success: (res) => {
+        console.log(res)
+        if (res.code) {
+          var params = {};
+          params.phone = this.data.phone;
+          params.code = this.data.sms;
+          params.user_type = usertype;
+          params.wx_code = res.code;
+      
+          api.mobileLogin(params).then(response => {
+            console.log(response);
+            wx.setStorageSync('AUTH_TOKEN_'+usertype, response.data.token);
+            wx.setStorageSync('user_id', response.data.user_id);
+            wx.setStorageSync('client_user_id', response.data.client_user_id);
+            app.globalData.config.userID = response.data.user_id;
+            app.imInit();
+            wx.switchTab({
+              url:  wx.getStorageSync('next_url')
+            })
+          }).catch(errors => {console.error(errors);})
+        } else {
+          wx.showToast({
+            title: '登录失败',
+            icon: "error"
+          })
+        }
+      },
+    })
+   
   },
   beginDaoJiShi(){
     console.log("开始倒计时")
diff --git a/Pages/yaoshi/authentication/authentication.js b/Pages/yaoshi/authentication/authentication.js
index 9f2ffdf..1e25c6b 100644
--- a/Pages/yaoshi/authentication/authentication.js
+++ b/Pages/yaoshi/authentication/authentication.js
@@ -1,4 +1,5 @@
-// Pages/authentication/authentication.js
+import { API } from './../../../utils/network/api'
+const api = new API()
 const app = getApp()
 Page({
   data: {
@@ -8,9 +9,8 @@ Page({
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '实名认证', //导航栏 中间的标题
     },
-
-    // 此页面 页面内容距最顶部的距离
-    height: app.globalData.height,   
+    height: app.globalData.height,
+    info: {}
   },
   onLoad() {
     console.log(this.data.height)
@@ -19,5 +19,14 @@ Page({
     this.setData({
       nbLoading: false,
     })
+
+    api.getPharmacistInfo().then(response => {
+      console.log(response.data);
+      this.setData({
+        info: response.data
+      })
+    }).catch(errors => {
+      console.error(errors);
+    })
   }
 })
\ No newline at end of file
diff --git a/Pages/yaoshi/authentication/authentication.wxml b/Pages/yaoshi/authentication/authentication.wxml
index 2c4f3db..51a5e6f 100644
--- a/Pages/yaoshi/authentication/authentication.wxml
+++ b/Pages/yaoshi/authentication/authentication.wxml
@@ -1,18 +1,18 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container">
   <van-cell-group>
-    <van-cell size="large" title="真实姓名" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-    <van-cell size="large" title="身份证号" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-    <van-cell size="large" title="联系邮箱" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-    <van-cell size="large" title="手机号码" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-    <van-cell size="large" title="所在医疗机构" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-    <van-cell size="large" title="所在科室" title-width="120rpx" is-link required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-    <van-cell size="large" title="职称" title-width="120rpx" is-link required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-    <van-cell size="large" title="医龄" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-    <van-cell size="large" title="执业经历" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-    <van-cell size="large" title="擅长" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
+    <van-cell size="large" title="真实姓名" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="{{info.card_name}}" />
+    <van-cell size="large" title="身份证号" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="{{info.card_num}}" />
+    <van-cell size="large" title="联系邮箱" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="缺少字段" />
+    <van-cell size="large" title="手机号码" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="缺少字段" />
+    <van-cell size="large" title="所在医疗机构" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="缺少字段" />
+    <van-cell size="large" title="所在科室" title-width="120rpx"  required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="{{info.department_custom_name}}" />
+    <van-cell size="large" title="职称" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="{{info.pharmacist_title}}" />
+    <van-cell size="large" title="医龄" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="缺少字段" />
+    <van-cell size="large" title="执业经历" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="缺少字段" />
+    <van-cell size="large" title="擅长" title-width="120rpx" required title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="缺少字段" />
   </van-cell-group>
   <view class="submit">
-    <van-button color="linear-gradient(to right, #4CABEA, #64CFE9)" block round type="info">下一步</van-button>
+    <van-button color="linear-gradient(to right, #4CABEA, #64CFE9)" block round type="info">下一步（去干啥？）</van-button>
   </view>
 </view>
\ No newline at end of file
diff --git a/Pages/yaoshi/home/home.js b/Pages/yaoshi/home/home.js
index 30226a9..0bc357c 100644
--- a/Pages/yaoshi/home/home.js
+++ b/Pages/yaoshi/home/home.js
@@ -1,4 +1,5 @@
-// Pages/home.js
+import { API } from './../../../utils/network/api'
+const api = new API()
 const app = getApp()
 Page({
   /**
@@ -12,7 +13,13 @@ Page({
       title: '药师端', //导航栏 中间的标题
     },
     // 此页面 页面内容距最顶部的距离
-    height: app.globalData.height  
+    height: app.globalData.height,
+    pharmacist: {},
+    audit_number: 0,
+    data_list_0: [],
+    data_list_1: [],
+    data_list_2: [],
+    data_list_3: [],
   },
 
   onLoad() {
@@ -28,5 +35,74 @@ Page({
         active: 0,  //数字是当前页面在tabbar的索引,如我的查询页索引是2，因此这边为2，同理首页就为0，审批页面为1
       })
     }
+    api.getPharmacistIndex().then(response => {
+      this.setData({
+        pharmacist: response.data.pharmacist,
+        audit_number: response.data.audit_number
+      })
+    }).catch(errors => {
+      console.error(errors);
+    })
+
+   this.getPharmacistPrescription();
+  },
+  getPharmacistPrescription(){
+    let params = {};
+    let active = this.data.active;
+    let pharmacist_audit_status = 0;
+    let platform_audit_status = 1;
+
+    if(active == 0){
+      pharmacist_audit_status = 0;
+      platform_audit_status = 0;
+    }
+    if(active == 1){
+      pharmacist_audit_status = 1;
+      platform_audit_status = 1;
+    }
+    if(active == 2){
+      pharmacist_audit_status = 2;
+      platform_audit_status = 0;
+    }
+    if(active == 3){
+      pharmacist_audit_status = 1;
+      platform_audit_status = 2;
+    }
+    params.pharmacist_audit_status = pharmacist_audit_status;
+    params.platform_audit_status = platform_audit_status;
+    let data_name = "data_list_"+active;
+    api.getPharmacistPrescription(params).then(response => {
+      this.setData({
+        [data_name]: response.data.data
+      })
+    }).catch(errors => {
+      console.error(errors);
+    })
+  },
+  onChange(e){
+    console.log(e)
+    this.setData({
+      active: e.detail.index
+    })
+    this.getPharmacistPrescription();
+  },
+  go(e){
+    let url = e.currentTarget.dataset.url;
+    app.go(url)
+  },
+  switchStatus(){
+    let is_online = this.data.pharmacist.is_online;
+    if(is_online == 0){
+      is_online = 1
+    }else if(is_online == 1){
+      is_online = 0
+    }
+    api.putPharmacistOnOff({is_online: is_online}).then(response => {
+      this.setData({
+        "pharmacist.is_online": is_online
+      })
+    }).catch(errors => {console.error(errors);})
   }
+
+
 })
\ No newline at end of file
diff --git a/Pages/yaoshi/home/home.wxml b/Pages/yaoshi/home/home.wxml
index 0487f1d..c13413b 100644
--- a/Pages/yaoshi/home/home.wxml
+++ b/Pages/yaoshi/home/home.wxml
@@ -2,100 +2,114 @@
 <view class="container">
   <view class="main title">
     <view class="photo">
-      <t-avatar class="avatar-example" width="20" image="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/default_photo.png" />
+      <t-avatar class="avatar-example" width="20" image="{{pharmacist.avatar}}" />
     </view>
     <view class="name">
-      <view class="realname">李四</view>
-      <view class="today_num">今日审方  9</view>
+      <view class="realname">{{pharmacist.user_name}}</view>
+      <view class="today_num">今日审方  {{audit_number}}</view>
     </view>
-    <view class="status">
-      <view class="status_text status_offline">离线</view>
+    <view class="status" bindtap="switchStatus">
+      <view class="status_text {{pharmacist.is_online==1?'status_online':'status_offline'}}">{{pharmacist.is_online==1?'在线':'离线'}}</view>
     </view>
   </view>
   <view class="main content">
     <van-tabs active="{{ active }}" color="{{ active_color }}" bind:change="onChange">
       <van-tab title="待审核处方">
-        <view class="item">
+        <view class="item" wx:for="{{data_list_0}}">
           <view class="item_txt">
-            <view class="pre_content">处方订单号：2023010510324649</view>
+            <view class="pre_content">处方订单号：{{item.prescription_code}}</view>
             <view class="end_content">
-              <navigator url="/Pages/yaoshi/medicalrecord/medicalrecord" open-type="navigate" hover-class="other-navigator-hover">
+              <!-- <navigator url="/Pages/yaoshi/medicalrecord/medicalrecord" open-type="navigate" hover-class="other-navigator-hover">
                 <van-button type="primary" size="small">查看病例</van-button>
-              </navigator>
+              </navigator> -->
             </view>
           </view>
 
           <view class="item_txt">
-            <view class="pre_content">开方时间：2023-01-16 08:52</view>
-            <view class="end_content">
-              <navigator url="/Pages/yaoshi/medicalrecord/medicalrecord" open-type="navigate" hover-class="other-navigator-hover">
-                <van-button type="primary" size="small">查看病例</van-button>
-              </navigator>
+            <view class="pre_content">开方时间：{{item.created_at}}</view>
+            <view class="end_content" bindtap="go" data-url="/Pages/yaoshi/medicalrecord/medicalrecord?order_inquiry_id={{item.order_inquiry_id	}}&order_prescription_id={{item.order_prescription_id}}">
+              <van-button type="primary" color="#ec871e" size="small">查看病例</van-button>
             </view>
           </view>
 
           <view class="item_txt">
-            <view class="pre_content">张三/男/45岁</view>
-            <view class="end_content">
+            <view class="pre_content">{{item.patient_name}}/{{item.patient_sex==1?'男':'女'}}/{{item.patient_age}}岁</view>
+            <view class="end_content" bindtap="go" data-url="/Pages/yaoshi/prescription/prescription?order_prescription_id={{item.order_prescription_id}}">
               <van-button type="primary" color="linear-gradient(to bottom, #5EA8D5, #63CFEA)" size="small">去审方</van-button>
             </view>
           </view>
         </view>
 
-        <view class="item">
-          <view class="item_txt">
-            <view class="pre_content">处方订单号：2023010510324649</view>
-            <view class="end_content">
-              <van-button type="primary" size="small">查看病例</van-button>
-            </view>
-          </view>
-
-          <view class="item_txt">
-            <view class="pre_content">开方时间：2023-01-16 08:52</view>
-            <view class="end_content">
-              <van-button type="primary" size="small">查看病例</van-button>
-            </view>
-          </view>
-
-          <view class="item_txt">
-            <view class="pre_content">张三/男/45岁</view>
-            <view class="end_content">
-              <van-button type="primary" color="linear-gradient(to bottom, #5EA8D5, #63CFEA)" size="small">去审方</van-button>
-            </view>
-          </view>
-        </view>
-        
       </van-tab>
       <van-tab title="已审核处方">
         <view class="item">
-          <view class="pre_content">
-          处方订单号 2023010510324649
+          <view class="item_txt">
+            <view class="pre_content">处方订单号：2023010510324649</view>
+            <view class="end_content">
+              <van-button type="primary" size="small">查看病例</van-button>
+            </view>
           </view>
-          <view class="end_content">
-            <van-button type="primary" size="mini">迷你按钮</van-button>
+
+          <view class="item_txt">
+            <view class="pre_content">开方时间：2023-01-16 08:52</view>
+            <view class="end_content" style="color: #2196f3;">通过</view>
+          </view>
+
+          <view class="item_txt">
+            <view class="pre_content">张三/男/45岁</view>
+            <view class="end_content">
+              <!-- <van-button type="primary" color="linear-gradient(to bottom, #5EA8D5, #63CFEA)" size="small">去审方</van-button> -->
+            </view>
           </view>
         </view>
       </van-tab>
       <van-tab title="驳回处方">
         <view class="item">
-          <view class="pre_content">
-          处方订单号 2023010510324649
+          <view class="item_txt">
+            <view class="pre_content">处方订单号：2023010510324649</view>
+            <view class="end_content">
+              <van-button type="primary" size="small">查看病例</van-button>
+            </view>
           </view>
-          <view class="end_content">
-            <van-button type="primary" size="mini">迷你按钮</van-button>
+
+          <view class="item_txt">
+            <view class="pre_content">开方时间：2023-01-16 08:52</view>
+            <view class="end_content" style="color: red;">驳回</view>
+          </view>
+
+          <view class="item_txt">
+            <view class="pre_content">张三/男/45岁</view>
+            <view class="end_content">
+              <!-- <van-button type="primary" color="linear-gradient(to bottom, #5EA8D5, #63CFEA)" size="small">去审方</van-button> -->
+            </view>
           </view>
         </view>
       </van-tab>
       <van-tab title="不通过">
         <view class="item">
-          <view class="pre_content">
-          处方订单号 2023010510324649
+          <view class="item_txt">
+            <view class="pre_content">处方订单号：2023010510324649</view>
+            <view class="end_content">
+              <van-button type="primary" size="small">查看病例</van-button>
+            </view>
           </view>
-          <view class="end_content">
-            <van-button type="primary" size="mini">迷你按钮</van-button>
+
+          <view class="item_txt">
+            <view class="pre_content">开方时间：2023-01-16 08:52</view>
+            <view class="end_content" style="color: red;">驳回</view>
+          </view>
+
+          <view class="item_txt">
+            <view class="pre_content">张三/男/45岁</view>
+            <view class="end_content">
+              <!-- <van-button type="primary" color="linear-gradient(to bottom, #5EA8D5, #63CFEA)" size="small">去审方</van-button> -->
+            </view>
           </view>
         </view>
       </van-tab>
     </van-tabs>
   </view>
+  <view style="height: 60px;">
+    <!-- 适配底部tabbar -->
+  </view>
 </view>
\ No newline at end of file
diff --git a/Pages/yaoshi/home/home.wxss b/Pages/yaoshi/home/home.wxss
index 0628c84..7aa8dee 100644
--- a/Pages/yaoshi/home/home.wxss
+++ b/Pages/yaoshi/home/home.wxss
@@ -40,15 +40,18 @@ page{
 .status_offline{
   background-color: #BFBFBF;
 }
+.status_online{
+  background-color: rgb(124, 231, 124);
+}
 .status_text{
-  display: inline-block;
   padding: 10rpx 20rpx;
   border-radius: 20rpx;
-  word-spacing: 10rpx;
-  letter-spacing: 10rpx;
   float: right;
   margin-right: 25rpx;
   font-size: 20rpx;
+  display: flex;
+  width: 50rpx;
+  justify-content: space-evenly;
 }
 .custom-tabs {
   margin-bottom: 32rpx;
diff --git a/Pages/yaoshi/info/info.js b/Pages/yaoshi/info/info.js
index b8bc702..8079ebf 100644
--- a/Pages/yaoshi/info/info.js
+++ b/Pages/yaoshi/info/info.js
@@ -1,7 +1,6 @@
-//index.js
-//获取应用实例
+import { API } from './../../../utils/network/api'
+const api = new API()
 const app = getApp()
-
 Page({
   data: {
   // 组件所需的参数
@@ -11,9 +10,21 @@ Page({
     },
 
     // 此页面 页面内容距最顶部的距离
-    height: app.globalData.height ,   
+    height: app.globalData.height,
+    info: ""
   },
-  onLoad() {
-    console.log(this.data.height)
+  onLoad(options) {
+    
+  },
+  onShow(){
+        
+    api.getPharmacistInfo().then(response => {
+      console.log(response.data);
+      this.setData({
+        info: response.data
+      })
+    }).catch(errors => {
+      console.error(errors);
+    })
   }
 })
diff --git a/Pages/yaoshi/info/info.wxml b/Pages/yaoshi/info/info.wxml
index 01a1be7..531713a 100644
--- a/Pages/yaoshi/info/info.wxml
+++ b/Pages/yaoshi/info/info.wxml
@@ -1,19 +1,19 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container">
   <view class="top">
-    <t-avatar class="avatar" size="large" image="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/yaoshi_default_photo.png" />
-    <text class="name">李四</text>
+    <t-avatar class="avatar" size="large" image="{{info.avatar}}" />
+    <text class="name">{{info.user_name}}</text>
   </view>
   <view class="content">
     <van-cell-group>
-      <van-cell size="large" title="姓名" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="李四" />
-      <van-cell size="large" title="性别" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-      <van-cell size="large" title="年龄" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-      <van-cell size="large" title="身份证号" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-      <van-cell size="large" title="手机号码" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-      <van-cell size="large" title="我的地址" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-      <van-cell size="large" title="科室" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
-      <van-cell size="large" title="职称" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="内容" />
+      <van-cell size="large" title="姓名" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="{{info.user_name}}" />
+      <van-cell size="large" title="性别" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="{{info.sex==1?'男':'女'}}" />
+      <van-cell size="large" title="年龄" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="{{info.age}}" />
+      <van-cell size="large" title="身份证号" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="{{info.card_num}}" />
+      <!-- <van-cell size="large" title="手机号码" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="{{info.user_name}}" /> -->
+      <!-- <van-cell size="large" title="我的地址" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="{{info.user_name}}" /> -->
+      <van-cell size="large" title="科室" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="{{info.department_custom_name}}" />
+      <van-cell size="large" title="职称" title-width="120rpx" title-style="text-align: justify;text-justify:distribute-all-lines; text-align-last: justify;" value="{{info.pharmacist_title}}" />
     </van-cell-group>
   </view>
 </view>
\ No newline at end of file
diff --git a/Pages/yaoshi/info/info.wxss b/Pages/yaoshi/info/info.wxss
index f40053f..cb7329f 100644
--- a/Pages/yaoshi/info/info.wxss
+++ b/Pages/yaoshi/info/info.wxss
@@ -14,6 +14,5 @@
   text-align: justify;
   text-justify:distribute-all-lines; 
   text-align-last: justify;
-  width: 60rpx;
   font-size: 28rpx;
 }
diff --git a/Pages/yaoshi/medicalrecord/medicalrecord.js b/Pages/yaoshi/medicalrecord/medicalrecord.js
index 70ad975..54df78b 100644
--- a/Pages/yaoshi/medicalrecord/medicalrecord.js
+++ b/Pages/yaoshi/medicalrecord/medicalrecord.js
@@ -1,7 +1,6 @@
-//index.js
-//获取应用实例
+import { API } from './../../../utils/network/api'
+const api = new API()
 const app = getApp()
-
 Page({
   data: {
   // 组件所需的参数
@@ -9,11 +8,34 @@ Page({
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '患者病历', //导航栏 中间的标题
     },
-
     // 此页面 页面内容距最顶部的距离
-    height: app.globalData.height ,   
+    height: app.globalData.height,
+    order_inquiry_id: "",
+    order_prescription_id: "",
+    case_detail: {}
+  },
+  onLoad(options) {
+    let order_inquiry_id = options.order_inquiry_id;
+    let order_prescription_id = options.order_prescription_id;
+    console.log("order_inquiry_id: ", order_inquiry_id);
+    this.setData({
+      order_inquiry_id: order_inquiry_id,
+      order_prescription_id: order_prescription_id,
+    })
+  },
+  onShow(){
+    
+    api.getCase({order_inquiry_id: this.data.order_inquiry_id}).then(response => {
+      console.log(response.data);
+      this.setData({
+        case_detail: response.data
+      })
+    }).catch(errors => {
+      console.error(errors);
+    })
+  },
+  go(e){
+    let url = e.currentTarget.dataset.url;
+    app.go(url)
   },
-  onLoad() {
-    console.log(this.data.height)
-  }
 })
diff --git a/Pages/yaoshi/medicalrecord/medicalrecord.wxml b/Pages/yaoshi/medicalrecord/medicalrecord.wxml
index e1a0a73..6a8eb72 100644
--- a/Pages/yaoshi/medicalrecord/medicalrecord.wxml
+++ b/Pages/yaoshi/medicalrecord/medicalrecord.wxml
@@ -3,27 +3,26 @@
   <view class="user_info">
     <view class="user_item">患者信息</view>
     <view class="user_item">
-      <text class="item_title">姓名：</text>张三
-      <text class="item_title">性别：</text>男
-      <text class="item_title">年龄：</text>30岁
+      <text class="item_title">姓名：</text>{{case_detail.name}}
+      <text class="item_title">性别：</text>{{case_detail.sex==1?'男':'女'}}
+      <text class="item_title">年龄：</text>{{case_detail.age}}岁
     </view>
   </view>
   <view class="case_info">
     <view class="item">疾病资料</view>
-    <view class="item"><text class="item_title">病情主要述：</text>我问问</view>
-    <view class="item"><text class="item_title">用药意向：</text>【未匹配】连花清瘟胶囊*1</view>
-    <view class="item"><text class="item_title">体重：</text>56KG</view>
-    <view class="item"><text class="item_title">本次用药已相关确认病症：</text>无</view>
-    <view class="item"><text class="item_title">是否服用过您想购买的药品且无相关禁忌症：</text>是</view>
-    <view class="item"><text class="item_title">是否有药物过敏史：</text>否</view>
-    <view class="item"><text class="item_title">您的肝功能、肾功能是否存在异常：</text>否</view>
-    <view class="item"><text class="item_title">您是否处于备孕、妊娠、哺乳期：</text>否</view>
+    <view class="item"><text class="item_title">病情主要述：</text>{{case_detail.disease_desc}}</view>
+    <view class="item">
+    <text class="item_title">用药意向：</text>
+      <text wx:for="{{case_detail.product}}">{{item}}</text>
+    </view>
+    <view class="item"><text class="item_title">体重：</text>{{case_detail.weight}}KG</view>
+    <view class="item"><text class="item_title">是否服用过您想购买的药品且无相关禁忌症：</text>{{case_detail.is_taboo==0?'否':'是'}}</view>
+    <view class="item"><text class="item_title">是否有药物过敏史：</text>{{case_detail.is_allergy_history==0?'否':'是'}}</view>
+    <view class="item"><text class="item_title">您是否处于备孕、妊娠、哺乳期：</text>{{case_detail.is_pregnant==0?'否':'是'}}</view>
     <view class="item"><text class="item_title">复诊凭证</text></view>
   </view>
-  <view class="go_check">
-    <navigator url="/Pages/yaoshi/prescription/prescription" open-type="navigate" hover-class="other-navigator-hover">
-      <van-button color="linear-gradient(to right, #4CABEA, #64CFE9)" block round type="info">前往审方</van-button>
-    </navigator>
+  <view class="go_check" bindtap="go" data-url="/Pages/yaoshi/prescription/prescription?order_prescription_id={{order_prescription_id}}">
+    <van-button color="linear-gradient(to right, #4CABEA, #64CFE9)" block round type="info">前往审方</van-button>
   </view>
-  <view class="bottom">肝胆相照提供技术支持</view>
+  <view class="bottom"></view>
 </view>
\ No newline at end of file
diff --git a/Pages/yaoshi/medicalrecord/medicalrecord.wxss b/Pages/yaoshi/medicalrecord/medicalrecord.wxss
index aa32373..4e53343 100644
--- a/Pages/yaoshi/medicalrecord/medicalrecord.wxss
+++ b/Pages/yaoshi/medicalrecord/medicalrecord.wxss
@@ -1,7 +1,8 @@
+page{
+  background-color: #F3F5F7;
+}
 .container{
   letter-spacing: 3rpx;
-  background-color: #F3F5F7;
-  height: 100vh;
 }
 .user_info{
   background-color: #fff;
diff --git a/Pages/yaoshi/my/my.js b/Pages/yaoshi/my/my.js
index 3d1a988..b1feb40 100644
--- a/Pages/yaoshi/my/my.js
+++ b/Pages/yaoshi/my/my.js
@@ -1,31 +1,29 @@
-// Pages/my/my.js
+import { API } from './../../../utils/network/api'
+const api = new API()
 const app = getApp()
 Page({
-
-  /**
-   * 页面的初始数据
-   */
   data: {
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '个人中心', //导航栏 中间的标题
     },
-
-    // 此页面 页面内容距最顶部的距离
-    height: app.globalData.height,   
+    height: app.globalData.height,
+    info:{}
   },
-  onLoad() {
-    console.log(this.data.height)
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
   onShow() {
     if (typeof this.getTabBar === 'function' && this.getTabBar()) {
       this.getTabBar().setData({
         active: 1,  //数字是当前页面在tabbar的索引,如我的查询页索引是2，因此这边为2，同理首页就为0，审批页面为1
       })
     }
+
+    api.getPharmacistInfo().then(response => {
+      console.log(response.data);
+      this.setData({
+        info: response.data
+      })
+    }).catch(errors => {
+      console.error(errors);
+    })
   }
 })
\ No newline at end of file
diff --git a/Pages/yaoshi/my/my.json b/Pages/yaoshi/my/my.json
index bc00c53..b6f232d 100644
--- a/Pages/yaoshi/my/my.json
+++ b/Pages/yaoshi/my/my.json
@@ -1,7 +1,6 @@
 {
   "component": true,
   "usingComponents": {
-    "te-nav-bar": "/commpents/te_navbar",
     "t-avatar": "tdesign-miniprogram/avatar/avatar",
     "van-icon": "@vant/weapp/icon/index"
   },
diff --git a/Pages/yaoshi/my/my.wxml b/Pages/yaoshi/my/my.wxml
index 97df817..ac21aba 100644
--- a/Pages/yaoshi/my/my.wxml
+++ b/Pages/yaoshi/my/my.wxml
@@ -1,8 +1,7 @@
-<te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container">
   <view class="top">
-    <t-avatar class="avatar" size="large" image="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/yaoshi_default_photo.png" />
-    <text class="name">李四</text>
+    <t-avatar class="avatar" size="large" image="{{info.avatar}}" />
+    <text class="name">{{info.user_name}}</text>
   </view>
   <view class="content">
     <navigator url="/Pages/yaoshi/info/info" open-type="navigate" hover-class="other-navigator-hover">
diff --git a/Pages/yaoshi/my/my.wxss b/Pages/yaoshi/my/my.wxss
index 2f0075c..7b6c197 100644
--- a/Pages/yaoshi/my/my.wxss
+++ b/Pages/yaoshi/my/my.wxss
@@ -14,7 +14,6 @@
   text-align: justify;
   text-justify:distribute-all-lines; 
   text-align-last: justify;
-  width: 60rpx;
   font-size: 28rpx;
 }
 .my{
diff --git a/Pages/yaoshi/prescription/prescription.js b/Pages/yaoshi/prescription/prescription.js
index dd73300..1ef80dd 100644
--- a/Pages/yaoshi/prescription/prescription.js
+++ b/Pages/yaoshi/prescription/prescription.js
@@ -1,4 +1,6 @@
-import Toast from '@vant/weapp/toast/toast';
+import Toast from '@vant/weapp/toast/toast'
+import { API } from './../../../utils/network/api'
+const api = new API()
 const app = getApp()
 Page({
   data: {
@@ -12,10 +14,15 @@ Page({
     },
 
     // 此页面 页面内容距最顶部的距离
-    height: app.globalData.height,   
+    height: app.globalData.height,
+    order_prescription_id: ""
   },
-  onLoad() {
-    console.log(this.data.height)
+  onLoad(options) {
+    let order_prescription_id = options.order_prescription_id;
+    console.log("order_prescription_id: ", order_prescription_id)
+    this.setData({
+      order_prescription_id: order_prescription_id
+    })
   },
 
   onConfirmReason(event) {
@@ -27,7 +34,6 @@ Page({
   },
 
   onCancelReason() {
-    Toast('取消');
     this.setData({ reasonshow: false });
   },
 
@@ -53,21 +59,34 @@ Page({
     this.setData({ bohuishow: false });
   },
 
-  submitBohui() {
+  submitBohui(e) {
     console.log(444);
-    Toast.loading({
-      message: '加载中...',
-      forbidClick: true,
-      onClose: () => {
-        console.log('执行OnClose函数');
-        this.setData({ bohuishow: false });
-      },
-    });
-    
+    this.putPharmacistPrescriptionVerify(e);
   },
 
   submit(){
     console.log(555);
+  },
+  onShow(){
+    api.getPharmacistPrescriptioninfo({order_prescription_id: this.data.order_prescription_id}).then(response => {
+      console.log(response.data);
+    }).catch(errors => {console.error(errors);})
+  },
+  putPharmacistPrescriptionVerify(e){
+    console.log(e)
+    let params = {};
+    params.pharmacist_audit_status = e.currentTarget.dataset.pharmacist_audit_status;
+    if(params.pharmacist_audit_status == 2){
+      params.pharmacist_fail_reason = this.data.resonText;
+    }
+    params.order_prescription_id = this.data.order_prescription_id;
+    api.putPharmacistPrescriptionVerify(params).then(response => {
+      console.log(response.data);
+      Toast.success("处理成功");
+      setTimeout(() => {
+        wx.navigateBack();
+      }, 1000);
+    }).catch(errors => {console.error(errors);})
   }
 
 })
\ No newline at end of file
diff --git a/Pages/yaoshi/prescription/prescription.wxml b/Pages/yaoshi/prescription/prescription.wxml
index 7a75c57..5758fd6 100644
--- a/Pages/yaoshi/prescription/prescription.wxml
+++ b/Pages/yaoshi/prescription/prescription.wxml
@@ -14,19 +14,22 @@
         <text decode="true">&nbsp;&nbsp;&nbsp;&nbsp;驳回&nbsp;&nbsp;&nbsp;&nbsp;</text>
       </van-button>
     </view>
-    <view class="button_item">
+    <view class="button_item" bindtap="putPharmacistPrescriptionVerify" data-pharmacist_audit_status="1">
       <van-button round type="primary" bind:click="submit">
         <text decode="true">&nbsp;&nbsp;&nbsp;&nbsp;通过&nbsp;&nbsp;&nbsp;&nbsp;</text>
       </van-button>
     </view>
   </view>
+  <view style="height: 20rpx;">
+    
+  </view>
 
   <van-popup show="{{ bohuishow }}" bind:close="onClose">
     <view class="pop">
       <van-cell size="large" title="驳回理由:" is-link value="{{ resonText }}" bind:click="showReasonPopup"/>
       <view class="pop_button">
         <view class="pop_button_txt" bindtap="closePopup">取消</view>
-        <view class="pop_button_txt" bindtap="submitBohui">确认驳回</view>
+        <view class="pop_button_txt" bindtap="submitBohui" data-pharmacist_audit_status="2">确认驳回</view>
       </view>
     </view>
   </van-popup>
diff --git a/Pages/yaoshi/prescription/prescription.wxss b/Pages/yaoshi/prescription/prescription.wxss
index 314155b..4ac2e02 100644
--- a/Pages/yaoshi/prescription/prescription.wxss
+++ b/Pages/yaoshi/prescription/prescription.wxss
@@ -1,6 +1,8 @@
-.container{
+page{
+
   background-color: #F3F5F7;
 }
+
 .img_box{
   width: 90vw;
   margin: 20rpx auto;
diff --git a/Pages/yishi/bankcard/index.wxml b/Pages/yishi/bankcard/index.wxml
index d554abe..9ab18a4 100644
--- a/Pages/yishi/bankcard/index.wxml
+++ b/Pages/yishi/bankcard/index.wxml
@@ -1,6 +1,6 @@
 <!-- 我的银行卡页面 -->
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
-<view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
+<view class="container">
   <view class="help">
     <view class="help_title">
       <text wx:if="{{ !banklist_empty }}">我的银行卡</text>
@@ -11,14 +11,14 @@
   </view>
   <view class="bankcard_empty_box" wx:if="{{ banklist_empty }}">
     <view class="bankcard_empty">
-      <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/bankcard_empty.png" fit="heightFix" width="200rpx" aria-label="空" />
+      <van-image src="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/yishi/bankcard_empty.png" fit="widthFix" width="500rpx" aria-label="空" />
     </view>
       <van-button data-url="/Pages/yishi/bindcard/index" bind:click="go" custom-style="font-size: 30rpx;border-radius: 10rpx;background-color:#3CC7C0;border: none;width: 92vw;margin: 50rpx auto;" type="primary" block>添加结算银行卡</van-button>
     <view class="note">提示：每人只能绑定一张银行卡，银行卡绑定成功后每月只能修改结算银行卡一次，请谨慎绑定。</view>
   </view>
   <view class="bankcard_list" wx:if="{{ !banklist_empty }}">
     <view class="bankcard_list_item">
-      <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/bankcard/gs.png" fit="widthFix" width="100%" aria-label="空" />
+      <van-image src="{{bank_img_path}}" fit="widthFix" width="100%" aria-label="空" />
       <view class="bankcard_list_item_name">{{bank_name}}</view>
       <view class="bankcard_list_item_num">{{bank_card_code_mask}}</view>
     </view>
diff --git a/Pages/yishi/bankcard/index.wxss b/Pages/yishi/bankcard/index.wxss
index 0b61e2c..0b5e953 100644
--- a/Pages/yishi/bankcard/index.wxss
+++ b/Pages/yishi/bankcard/index.wxss
@@ -1,7 +1,8 @@
+page{
+  background-color: #F4F4F4;
+}
 .container{
   width: 100vw;
-  height: 100vh;
-  background-color: #F4F4F4;
 }
 .help{
   display: flex;
diff --git a/Pages/yishi/bindcard/index.wxml b/Pages/yishi/bindcard/index.wxml
index a513bca..4d4a855 100644
--- a/Pages/yishi/bindcard/index.wxml
+++ b/Pages/yishi/bindcard/index.wxml
@@ -16,11 +16,13 @@
       <van-cell size="large" title="所在城市" value="{{city_note}}" is-link bindtap="onCityShow"/>
       <van-cell size="large" title="开户行" value="{{bank_note}}" is-link bindtap="onBankShow"/>
       <van-field 
-        label="银行卡号"
         placeholder="请输入卡号"
         model:value="{{ bankcard }}"
         input-align="right"
-      />
+        placeholder-style="font-size: 16px;"
+      >
+      <text slot="label" style="font-size: 30rpx;">银行卡号</text>
+      </van-field>
     </van-cell-group>
   </view>
 
diff --git a/Pages/yishi/bindcard/index.wxss b/Pages/yishi/bindcard/index.wxss
index 47c8a6c..f979002 100644
--- a/Pages/yishi/bindcard/index.wxss
+++ b/Pages/yishi/bindcard/index.wxss
@@ -12,7 +12,7 @@
   font-size: 30rpx;
 }
 .bankcard{
-  margin-top: 50rpx;
+  margin-top: 20rpx;
 }
 .note{
   font-size: 28rpx;
diff --git a/Pages/yishi/case/index.wxml b/Pages/yishi/case/index.wxml
index 739505b..85ce54d 100644
--- a/Pages/yishi/case/index.wxml
+++ b/Pages/yishi/case/index.wxml
@@ -7,10 +7,10 @@
       <view class="sex">{{case_detail.sex==1?'男':case_detail.sex==2?'女':'未知'}}｜{{case_detail.age}}岁 </view>
     </view>
     <view class="info">
-      <view class="height info_item"><text class="info_title">身高：</text><text class="info_val">{{case_detail.height}}cm</text></view>
-      <view class="weight info_item"><text class="info_title">体重：</text><text class="info_val">{{case_detail.weight}}KG</text></view>
-      <view class="minzu info_item"><text class="info_title">民族：</text><text class="info_val">{{case_detail.nation_name}}</text></view>
-      <view class="zhiye info_item"><text class="info_title">职业：</text><text class="info_val">{{case_detail.job_name}}</text></view>
+      <view class="height info_item"><text class="info_title">身高：</text><text class="info_val">{{case_detail.height==null?'未知':case_detail.height}}cm</text></view>
+      <view class="weight info_item"><text class="info_title">体重：</text><text class="info_val">{{case_detail.weight==null?'未知':case_detail.weight}}KG</text></view>
+      <view class="minzu info_item"><text class="info_title">民族：</text><text class="info_val">{{case_detail.nation_name==''?'未知':case_detail.nation_name}}</text></view>
+      <view class="zhiye info_item"><text class="info_title">职业：</text><text class="info_val">{{case_detail.job_name==''?'未知':case_detail.job_name}}</text></view>
       <view class="hunyin info_item"><text class="info_title">婚姻：</text><text class="info_val">{{case_detail.marital_status==0?'未婚':case_detail.marital_status==1?'已婚':case_detail.marital_status==2?'离异':'未知'}}</text></view>
     </view>
     <view class="disease_box">
@@ -26,7 +26,7 @@
         <view class="title">医生诊断：</view>
         <view class="conent">{{case_detail.disease_class_name}}</view>
       </view> -->
-      <view class="disease_box_item">
+      <view class="disease_box_item" wx:if="{{case_detail.diagnosis_hospital != ''}}">
         <view class="title">确诊医院：</view>
         <view class="conent">{{case_detail.diagnosis_hospital}}</view>
       </view>
@@ -41,7 +41,7 @@
         <view class="title">病情描述：</view>
         <view class="conent">{{case_detail.disease_desc}}</view>
       </view>
-      <view class="disease_box_item">
+      <view class="disease_box_item" wx:if="{{case_detail.product.length > 0}}">
         <view class="title">用药意向：</view>
         <view class="conent">
           <text wx:for="{{case_detail.product}}">{{item}};</text>
diff --git a/Pages/yishi/cash/index.js b/Pages/yishi/cash/index.js
index 7b0b7a4..782805a 100644
--- a/Pages/yishi/cash/index.js
+++ b/Pages/yishi/cash/index.js
@@ -12,10 +12,10 @@ Page({
     bank_card_id: "",
     bank_icon_path: "https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/bankcard/js_icon.png",
     realname: "默认姓名",
-    bank_name	: "招商银行",
-    bank_card_code_mask: "2233 9988 9989 9900",
-    withdrawal_amount: "987",
-    income_tax: "12",
+    bank_name	: "xx银行",
+    bank_card_code_mask: "888 xxxx xxxx 888",
+    withdrawal_amount: "xxxx",
+    income_tax: "xx",
     contactKeFu: false
   },
   onLoad(options){
diff --git a/Pages/yishi/cash/index.json b/Pages/yishi/cash/index.json
index c3b0e34..c1f968d 100644
--- a/Pages/yishi/cash/index.json
+++ b/Pages/yishi/cash/index.json
@@ -2,7 +2,7 @@
   "component": true,
   "usingComponents": {
     "te-nav-bar": "/commpents/te_navbar",
-    "t-image": "tdesign-miniprogram/image/image",
+    "van-image": "@vant/weapp/image/index",
     "van-icon": "@vant/weapp/icon/index",
     "van-button": "@vant/weapp/button/index",
     "van-dialog": "@vant/weapp/dialog/index"
diff --git a/Pages/yishi/cash/index.wxml b/Pages/yishi/cash/index.wxml
index e626c74..7db1ca9 100644
--- a/Pages/yishi/cash/index.wxml
+++ b/Pages/yishi/cash/index.wxml
@@ -7,7 +7,7 @@
   </view>
   <view class="bankcard">
     <view class="bankcard_icon">
-      <t-image custom-style="" src="{{bank_icon_path}}" mode="heightFix" height="50rpx" aria-label="role" />
+      <van-image custom-style="" src="{{bank_icon_path}}" fit="heightFix" height="50rpx" aria-label="role" />
     </view>
     <view class="bankcard_info">
       <view class="bankcard_info_top">{{realname}}<text style="margin-left: 20rpx; font-size: 28rpx;color: #999999;">{{bank_name}}</text></view>
diff --git a/Pages/yishi/identity/index.js b/Pages/yishi/identity/index.js
index 59639ab..542115a 100644
--- a/Pages/yishi/identity/index.js
+++ b/Pages/yishi/identity/index.js
@@ -46,7 +46,13 @@ Page({
       "stickyProps.offsetTop": this.data.stateHeight + this.data.navHeight + 10
     })
   },
-  onLoad(){
+  onLoad(options){
+    let selected_tab = options.selected_tab;
+    if(selected_tab){
+      this.setData({
+        selected_tab: selected_tab
+      })
+    }
     let _this = this;
     //获取实名认证信息
     api.getDoctorAuthReal().then(response => {
@@ -373,9 +379,16 @@ Page({
     }
     api.postDoctorAuthReal(params).then(response => {
       console.log(response);
+      wx.showToast({
+        title: '认证成功',
+        icon: 'none',
+        duration: 2000
+      })
       _this.setData({
         panel_2_disabled: false,
-        selected_tab: 1
+        selected_tab: 1,
+        next_btn_disabled: true,
+        next_btn_txt: '已认证，不可修改'
       })
     }).catch(errors => {
       console.error(errors);
diff --git a/Pages/yishi/identity/index.wxml b/Pages/yishi/identity/index.wxml
index 0bbe9c7..3784610 100644
--- a/Pages/yishi/identity/index.wxml
+++ b/Pages/yishi/identity/index.wxml
@@ -20,26 +20,29 @@
         <van-cell-group>
           <van-field
           model:value="{{ realname }}"
-            label="真实姓名"
+            
             type="text"
             placeholder="请填写真实姓名，提交后不能修改"
             placeholder-style="font-size:28rpx; color: #C5C8CB;"
             input-align="right"
-            required
             clearable
             custom-style="font-size:30rpx;"
-          />
+            disabled="{{next_btn_disabled}}"
+          >
+          <text slot="label">真实姓名 <text style="color: #e34d59;">*</text> </text>
+          </van-field>
           <van-field
             model:value="{{ idcard }}"
             type="idcard"
-            label="身份证号"
             placeholder="请填写身份证号"
             placeholder-style="font-size:28rpx; color: #C5C8CB;"
             input-align="right"
-            required
             clearable
             custom-style="font-size:30rpx;"
-          />
+            disabled="{{next_btn_disabled}}"
+          >
+          <text slot="label">身份证号 <text style="color: #e34d59;">*</text> </text>
+          </van-field>
         </van-cell-group>
 
         <!-- <t-cell title="真实姓名" hover required arrow note="请填写真实姓名，提交后不能修改"/> -->
@@ -59,14 +62,16 @@
       <!-- 医师身份认证 -->
       <t-tab-panel label="医师身份认证" value="1" disabled style="{{tabPanelstyle}}" wx:if="{{panel_2_disabled}}">
         <myprofile wx:if="{{selected_tab == 1}}" />
+        <view style="height: 50rpx;"></view>
       </t-tab-panel>
 
       <t-tab-panel label="医师身份认证" value="1" style="{{tabPanelstyle}}" wx:if="{{!panel_2_disabled}}">
         <myprofile wx:if="{{selected_tab == 1}}" />
+        <view style="height: 50rpx;"></view>
       </t-tab-panel>
 
 
     </t-tabs>
   </view>
-  <van-toast id="van-toast" />
+  <!-- <van-toast id="van-toast" /> -->
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/identity/index.wxss b/Pages/yishi/identity/index.wxss
index 2031194..a97e304 100644
--- a/Pages/yishi/identity/index.wxss
+++ b/Pages/yishi/identity/index.wxss
@@ -109,10 +109,7 @@
   height: 300rpx;
   background-color: cadetblue;
 }
-/* 自定义 vant required 小红点位置 */
-.van-cell--required::before {
-  left: 4.7rem !important;
-}
+
 .zhuanchang_box{
   display: flex;
   flex-wrap: wrap;
@@ -132,7 +129,6 @@
 }
 .zhuanchang_block {
   width: 100vw;
-  height: 240px;
   background: #fff;
   border-top-left-radius: 16rpx;
   border-top-right-radius: 16rpx;
diff --git a/Pages/yishi/index/index.js b/Pages/yishi/index/index.js
index 23eb0d3..7613934 100644
--- a/Pages/yishi/index/index.js
+++ b/Pages/yishi/index/index.js
@@ -8,15 +8,15 @@ Page({
     navHeight: 0,
     stateHeight: 0,
     info:{
-      user_name: "手机号后四位",
-      not_accepted_inquiry_num: 6,
-      accepting_inquiry_num: 12,
+      user_name: "xxx",
+      not_accepted_inquiry_num: 0,
+      accepting_inquiry_num: 0,
       info_shiming_status_txt: "未认证",
       info_shiming_status: "info_shiming_status_no",
       show_info_note: false,
-      praise_rate: "99%",
-      avg_response_time: 125,
-      number_of_fans: 9254,
+      praise_rate: "100%",
+      avg_response_time: 0,
+      number_of_fans: 0,
       avatar: "https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/default_photo.png",
       reject_prescription_number: false,//处方管理小红点
     },
@@ -27,11 +27,7 @@ Page({
     multi_point_status_url: "/Pages/yishi/zhiye_identity/index",
     duration: 500,
     interval: 5000,
-    swiperList: [
-      `https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/ad1.jpg`,
-      `https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/ad2.jpg`,
-      `https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/ad3.jpg`,
-    ],
+    swiperList: [],
     banner: [],
     default_dialog_show: false,//只弹框一次
     dialog_visible: false,
@@ -60,17 +56,17 @@ Page({
       {
         case_status: 0,
         case_module: [0,1,2,3,4,5,6,7,8],
-        case_text: "未实名认证"
+        case_text: "请您先实名认证"
       },
       {
         case_status: 1,
         case_module: [0,1,2,3,4,5,6,7,8],
-        case_text: "未医师身份认证"
+        case_text: "请您先医师身份认证"
       },
       {
         case_status: 2,
         case_module: [0,1,4,5,6],
-        case_text: "未绑定结算银行卡"
+        case_text: "请您先绑定结算银行卡"
       },
       {
         case_status: 3,
@@ -116,6 +112,9 @@ Page({
   },
   onUnload(){
     console.log("index onUnload() onUnload() ");
+    this.setData({
+      swiperList: []
+    })
   },
   onHide(){
     console.log("index onHide() onHide() ");
@@ -170,13 +169,13 @@ Page({
 
       //iden_auth_status 0:未认证 1:认证通过 2:审核中 3:认证失败
       if(iden_auth_status == 0) this.setData({iden_auth_status_txt: "未认证"});
-      if(iden_auth_status == 1) this.setData({iden_auth_status_txt: "认证通过", iden_auth_status_url: "/Pages/yishi/attestation/index"});
+      if(iden_auth_status == 1) this.setData({iden_auth_status_txt: "已认证", iden_auth_status_url: "/Pages/yishi/attestation/index"});
       if(iden_auth_status == 2) this.setData({iden_auth_status_txt: "审核中"});
       if(iden_auth_status == 3) this.setData({iden_auth_status_txt: "认证失败"});
 
       //multi_point_status 0:未认证 1:认证通过 2:审核中 3:认证失败
       if(multi_point_status == 0) this.setData({multi_point_status_txt: "未认证"});
-      if(multi_point_status == 1) this.setData({multi_point_status_txt: "认证通过", multi_point_status_url: "/Pages/yishi/practicing/index"});
+      if(multi_point_status == 1) this.setData({multi_point_status_txt: "已认证", multi_point_status_url: "/Pages/yishi/practicing/index"});
       if(multi_point_status == 2) this.setData({multi_point_status_txt: "审核中"});
       if(multi_point_status == 3) this.setData({multi_point_status_txt: "认证失败"});
 
@@ -241,6 +240,27 @@ Page({
       app.go(e.currentTarget.dataset.url)
     }
   },
+  gozhiye(e){
+    let idcard_status = this.data.info.idcard_status;
+    let iden_auth_status = this.data.info.iden_auth_status;
+    if(idcard_status != 1){
+      this.setData({
+        dialog_content: "请您先实名认证",
+        shiming_status_url: "/Pages/yishi/identity/index",
+        dialog_visible: true,
+      });
+      return;
+    }
+    if(iden_auth_status != 1){
+      this.setData({
+        dialog_content: "请您先医师身份认证",
+        shiming_status_url: "/Pages/yishi/identity/index?selected_tab=1",
+        dialog_visible: true,
+      });
+      return;
+    }
+    app.go(e.currentTarget.dataset.url);
+  },
   confirmDialog(){
     this.setData({
       dialog_visible: false
@@ -259,145 +279,170 @@ Page({
      let iden_auth_status = this.data.info.iden_auth_status;
      //多点执业认证
      let multi_point_status = this.data.info.multi_point_status;
-
-     wx.setStorageSync('idcard_status', idcard_status);
-     wx.setStorageSync('iden_auth_status', iden_auth_status);
+      //绑定结算银行卡
+    var is_bind_bank = this.data.info.is_bind_bank;
+     
+     let userID = wx.getStorageSync('user_id');
+     wx.setStorageSync(userID+'_idcard_status', idcard_status);
+     wx.setStorageSync(userID+'_iden_auth_status', iden_auth_status);
+     wx.setStorageSync(userID+'_multi_point_status', multi_point_status);
+     wx.setStorageSync(userID+'_is_bind_bank', is_bind_bank);
 
     if(idcard_status == 0){
       if(!this.data.default_dialog_show){
         this.setData({
-          dialog_content: "请您先实名认证",
           dialog_visible: true,
-          shiming_status_url: "/Pages/yishi/identity/index",
-          default_dialog_show: true
         });
       }
+      this.setData({
+        dialog_content: "请您先实名认证",
+        shiming_status_url: "/Pages/yishi/identity/index",
+        default_dialog_show: true
+      });
       return false;
     }
 
     if(idcard_status == 2){
       if(!this.data.default_dialog_show){
         this.setData({
-          "info.info_shiming_status_txt": "认证失败",
-          "info.info_shiming_status": "info_shiming_status_yes",
-          shiming_status_url: "/Pages/yishi/identity/index",
-          dialog_content: "实名认证失败",
           dialog_visible: true,
-          default_dialog_show: true
         });
       }
+      this.setData({
+        "info.info_shiming_status_txt": "认证失败",
+        "info.info_shiming_status": "info_shiming_status_yes",
+        shiming_status_url: "/Pages/yishi/identity/index",
+        dialog_content: "实名认证失败",
+        default_dialog_show: true
+      });
       return false;;
     }
     
     if(iden_auth_status == 0){
       if(!this.data.default_dialog_show){
         this.setData({
-          "info.info_shiming_status_txt": "前往医师身份认证",
-          "info.info_shiming_status": "info_shiming_status_yes",
-          shiming_status_url: "/Pages/yishi/identity/index",
-          dialog_content: "请您前往医师身份认证",
           dialog_visible: true,
-          default_dialog_show: true
         });
       }
+      this.setData({
+        "info.info_shiming_status_txt": "前往医师身份认证",
+        "info.info_shiming_status": "info_shiming_status_yes",
+        shiming_status_url: "/Pages/yishi/identity/index?selected_tab=1",
+        dialog_content: "请您先医师身份认证",
+        default_dialog_show: true
+      });
       return false;
     }
     if(iden_auth_status == 2){
       if(!this.data.default_dialog_show){
         this.setData({
-          "info.info_shiming_status_txt": "审核中",
-          "info.info_shiming_status": "info_shiming_status_yes",
-          shiming_status_url: "/Pages/yishi/identity/index",
-          dialog_content: "您的医师身份认证正在审核中",
-          dialog_visible: true,
-          default_dialog_show: true
+          // dialog_visible: true,
         });
       }
+      this.setData({
+        "info.info_shiming_status_txt": "审核中",
+        "info.info_shiming_status": "info_shiming_status_yes",
+        shiming_status_url: "/Pages/yishi/identity/index?selected_tab=1",
+        dialog_content: "您的医师身份认证正在审核中",
+        // default_dialog_show: true
+      });
       return false;
     }
     if(iden_auth_status == 3){
       if(!this.data.default_dialog_show){
         this.setData({
-          "info.info_shiming_status_txt": "认证失败",
-          "info.info_shiming_status": "info_shiming_status_yes",
-          dialog_content: "您的医师身份认证失败",
-          dialog_visible: true,
-          default_dialog_show: true
+          // dialog_visible: true,
+        });
+      }
+      this.setData({
+        "info.info_shiming_status_txt": "认证失败",
+        "info.info_shiming_status": "info_shiming_status_yes",
+        shiming_status_url: "/Pages/yishi/identity/index?selected_tab=1",
+        dialog_content: "您的医师身份认证失败",
+        // default_dialog_show: true
       });
-    }
       return false;
     }
 
+   
+    if(is_bind_bank == 0){
+      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
+  });
+      return false;
+    }
+    
     //多点执业认证
     if(multi_point_status == 0){
       if(!this.data.default_dialog_show){
         this.setData({
-          "info.info_shiming_status_txt": "前往多点执业认证",
-          "info.info_shiming_status": "info_shiming_status_yes",
-          shiming_status_url: "/Pages/yishi/zhiye_identity/index",
-          dialog_content: "请您先进行多点执业认证",
           dialog_visible: true,
-          default_dialog_show: true
         });
       }
-      return false;
+      this.setData({
+        "info.info_shiming_status_txt": "前往多点执业认证",
+        "info.info_shiming_status": "info_shiming_status_yes",
+        shiming_status_url: "/Pages/yishi/zhiye_identity/index",
+        dialog_content: "请您先进行多点执业认证",
+        default_dialog_show: true
+      });
+      // return false;
     }
     if(multi_point_status == 2){
       if(!this.data.default_dialog_show){
         this.setData({
-          "info.info_shiming_status_txt": "审核中",
-          "info.info_shiming_status": "info_shiming_status_yes",
-          shiming_status_url: "/Pages/yishi/zhiye_identity/index",
-          dialog_content: "您的多点执业认证正在审核中",
           dialog_visible: true,
-          default_dialog_show: true
       });
     }
-      return false;
+    this.setData({
+      "info.info_shiming_status_txt": "审核中",
+      "info.info_shiming_status": "info_shiming_status_yes",
+      shiming_status_url: "/Pages/yishi/zhiye_identity/index",
+      dialog_content: "您的多点执业认证正在审核中",
+      default_dialog_show: true
+  });
+      // return false;
     }
     if(multi_point_status == 3){
       if(!this.data.default_dialog_show){
         this.setData({
-          "info.info_shiming_status_txt": "认证失败",
-          "info.info_shiming_status": "info_shiming_status_yes",
-          shiming_status_url: "/Pages/yishi/zhiye_identity/index",
-          dialog_content: "您的多点执业认证失败",
           dialog_visible: true,
-          default_dialog_show: true
       });
+      }
+      this.setData({
+        "info.info_shiming_status_txt": "认证失败",
+        "info.info_shiming_status": "info_shiming_status_yes",
+        shiming_status_url: "/Pages/yishi/zhiye_identity/index",
+        dialog_content: "您的多点执业认证失败",
+        default_dialog_show: true
+    });
+      // return false;
     }
-      return false;
-    }
-
-
-    //绑定结算银行卡
-    var is_bind_bank = this.data.info.is_bind_bank;
-    if(is_bind_bank == 0){
-      if(!this.data.default_dialog_show){
-        this.setData({
-          "info.info_shiming_status_txt": "绑定结算银行卡",
-          "info.info_shiming_status": "info_shiming_status_yes",
-          shiming_status_url: "/Pages/yishi/bankcard/index",
-          dialog_content: "请您先绑定结算银行卡",
-          dialog_visible: true,
-          default_dialog_show: true
-      });
-    }
-      return false;
-    }
+    
     //开启在线问诊
     var is_img_expert_reception = this.data.info.is_img_expert_reception;
     if(is_img_expert_reception == 0 ){
       if(!this.data.default_dialog_show){
-        this.setData({
-          "info.info_shiming_status_txt": "开启在线问诊",
-          "info.info_shiming_status": "info_shiming_status_yes",
-          shiming_status_url: "/Pages/yishi/onlinesetup/index",
-          dialog_content: "请您先前往在线问诊管理中开通在线问诊",
-          dialog_visible: true,
-          default_dialog_show: true
-      });
-    }
+          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/onlinesetup/index",
+        dialog_content: "请您先前往在线问诊管理中开通在线问诊",
+        default_dialog_show: true
+      })
       return false;
     }
     this.setData({
@@ -447,13 +492,13 @@ Page({
     // 已实名认证和医师身份认证且绑定结算银行卡，开通了在线问诊，已开通多点执业认证 5
     if(idcard_status == 0 && iden_auth_status == 0){
       status = 0;
-    }else if(idcard_status == 1 && iden_auth_status == 0){
+    }else if(idcard_status == 1 && iden_auth_status != 1){
       status = 1;
-    }else if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank == 0){
+    }else if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank != 1){
       status = 2;
-    }else if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank == 1 && is_img_expert_reception == 0){
+    }else if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank == 1 && is_img_expert_reception != 1){
       status = 3;
-    }else if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank == 1 && is_img_expert_reception == 1 && multi_point_status == 0){
+    }else if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank == 1 && is_img_expert_reception == 1 && multi_point_status != 1){
       status = 4;
     }else{
       status = 5;
diff --git a/Pages/yishi/index/index.wxml b/Pages/yishi/index/index.wxml
index fcfcd55..82147a0 100644
--- a/Pages/yishi/index/index.wxml
+++ b/Pages/yishi/index/index.wxml
@@ -57,7 +57,7 @@
       </view>
     </view>
 
-    <view class="renzheng_right" bindtap="go" data-url="/Pages/yishi/zhiye_identity/index">
+    <view class="renzheng_right" bindtap="gozhiye" data-url="/Pages/yishi/zhiye_identity/index">
       <view class="renzheng_content_left">
         <view class="renzheng_content_name">多点执业认证</view>
         <view class="renzheng_content_status">
@@ -75,7 +75,7 @@
     </view>
   </view>
   <!-- 广告版块 -->
-  <view class="ad">
+  <view class="ad" wx:if="{{swiperList.length > 0}}">
     <t-swiper
       height="110rpx"
       duration="{{duration}}"
@@ -97,28 +97,28 @@
           custom-style="width: 70rpx;"
           src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/jianjie.png"
         />
-      <text class="fun_box_item_txt">我的简介</text>
+      <text class="fun_box_item_txt">简介管理</text>
     </view>
     <view bindtap="go" data-moudle="4" data-url="/Pages/yishi/onlinesetup/index" class="fun_box_item">
       <image class="fun_box_item_img"
           mode="widthFix"
           src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/zaixian.png"
         />
-      <text class="fun_box_item_txt">在线问诊</text>
+      <text class="fun_box_item_txt">在线问诊管理</text>
     </view>
     <view bindtap="go" data-moudle="5" data-url="/Pages/yishi/kuaisusetup/index" class="fun_box_item">
       <image class="fun_box_item_img"
           mode="widthFix"
           src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/kuaisu.png"
         />
-      <text class="fun_box_item_txt">快速问诊</text>
+      <text class="fun_box_item_txt">快速问诊管理</text>
     </view>
     <view bindtap="go" data-moudle="6" data-url="/Pages/yishi/yizhensetup/index" class="fun_box_item">
       <image class="fun_box_item_img"
           mode="widthFix"
           src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/yizhen.png"
         />
-      <text class="fun_box_item_txt">公益问诊</text>
+      <text class="fun_box_item_txt">公益问诊管理</text>
     </view>
     <view bindtap="go" data-moudle="7" data-url="/Pages/yishi/chufangsetup/index" class="fun_box_item">
       <image class="fun_box_item_img"
@@ -137,7 +137,9 @@
       <text class="fun_box_item_txt">联系客服</text>
     </view>
   </view>
-
+  <view style="width: 100%;height: 55px;">
+    <!-- 处理底部tabbar遮挡 50px -->
+  </view>
   <t-dialog
     visible="{{ dialog_visible }}"
     title="温馨提示"
diff --git a/Pages/yishi/kuaisusetup/index.wxml b/Pages/yishi/kuaisusetup/index.wxml
index 0be0a2b..34aacee 100644
--- a/Pages/yishi/kuaisusetup/index.wxml
+++ b/Pages/yishi/kuaisusetup/index.wxml
@@ -20,7 +20,7 @@
     </view>
   </view>
 
-  <view wx:if="{{ info.is_open==1  }}" class="checked_box">
+  <view class="checked_box">
     <view class="price_title">价格设置</view>
     <view class="price_steup_box">
       <view class="price_steup_box_bottom">
@@ -41,8 +41,8 @@
     </text>
   </view>
 
-  <view class="go" wx:if="{{ info.is_open==1 }}">
-    <van-button bind:click="putDoctorInquiryConfig" color="#3CC7C0" custom-style="border-radius: 20rpx;font-size:30rpx;" type="primary" block>去接诊</van-button>
+  <view class="go">
+    <van-button disabled="{{info.is_open!=1}}" bind:click="putDoctorInquiryConfig" color="#3CC7C0" custom-style="border-radius: 20rpx;font-size:30rpx;" type="primary" block>去接诊</van-button>
   </view>
 
   <van-toast id="van-toast" />
diff --git a/Pages/yishi/myinfo/index.js b/Pages/yishi/myinfo/index.js
index ec564ba..076d713 100644
--- a/Pages/yishi/myinfo/index.js
+++ b/Pages/yishi/myinfo/index.js
@@ -7,14 +7,17 @@ Page({
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '我的信息', //导航栏 中间的标题
     },
-    height: app.globalData.height, 
+    height: app.globalData.height,
     card_name: "",
     card_num_mask: "",
     doctor_id: "",
     idcard_status: 0,
     iden_auth_status: 0,
     user_name: "",
-    brief_introduction: "我的简介"
+    brief_introduction: "我的简介",
+    v_show: false,
+    v_message: "",
+    next_url: "/Pages/yishi/identity/index"
   },
   onLoad(){
     //获取医生我的账户数据
@@ -32,13 +35,14 @@ Page({
   },
   logOut(){
     console.log("退出登录");
+    let usertype =  wx.getStorageSync('usertype');
     wx.showModal({
       title: '确认退出登录',
       content: '退出登录后您需要重新登录',
       success (res) {
         if (res.confirm) {
           console.log('用户点击确定')
-          wx.setStorageSync('AUTH_TOKEN', "");
+          wx.setStorageSync('AUTH_TOKEN_'+usertype, "");
           wx.setStorageSync('user_id', "");
           wx.setStorageSync('client_user_id', "");
           app.go("/Pages/index/index");
@@ -47,6 +51,50 @@ Page({
         }
       }
     })
+  },
+  go(e){
+    if(this.data.idcard_status != 1){
+      this.setData({
+        v_show: true,
+        v_message: "请先进行实名认证",
+        next_url: "/Pages/yishi/identity/index"
+      })
+      return;
+    }
+    if(this.data.iden_auth_status != 1){
+      this.setData({
+        v_show: true,
+        v_message: "请先进行医师身份认证",
+        next_url: "/Pages/yishi/identity/index?selected_tab=1",
+      })
+      return;
+    }
+    app.go(e.currentTarget.dataset.url)
+  },
+  go1(e){
+    if(this.data.idcard_status != 1){
+      this.setData({
+        v_show: true,
+        v_message: "请先进行实名认证",
+        next_url: "/Pages/yishi/identity/index"
+      })
+      return;
+    }
+    app.go(e.currentTarget.dataset.url)
+  },
+  go2(e){
+    if(this.data.iden_auth_status != 1){
+      this.setData({
+        v_show: true,
+        v_message: "请先进行医师身份认证",
+        next_url: "/Pages/yishi/identity/index?selected_tab=1",
+      })
+      return;
+    }
+    app.go(e.currentTarget.dataset.url)
+  },
+  goIn(){
+    app.go(this.data.next_url)
   }
   
 })
\ No newline at end of file
diff --git a/Pages/yishi/myinfo/index.json b/Pages/yishi/myinfo/index.json
index c97fb39..cd86b08 100644
--- a/Pages/yishi/myinfo/index.json
+++ b/Pages/yishi/myinfo/index.json
@@ -4,6 +4,7 @@
     "te-nav-bar": "/commpents/te_navbar",
     "van-cell": "@vant/weapp/cell/index",
     "van-cell-group": "@vant/weapp/cell-group/index",
-    "van-button": "@vant/weapp/button/index"
+    "van-button": "@vant/weapp/button/index",
+    "van-dialog": "@vant/weapp/dialog/index"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/myinfo/index.wxml b/Pages/yishi/myinfo/index.wxml
index 7831e02..0013b44 100644
--- a/Pages/yishi/myinfo/index.wxml
+++ b/Pages/yishi/myinfo/index.wxml
@@ -1,13 +1,22 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
   <van-cell-group>
-    <van-cell size="large" url="/Pages/yishi/mycard/index" title="我的名片" value="分享名片" is-link />
-    <van-cell size="large" url="/Pages/yishi/myprofile/index" title="我的简介" value="{{brief_introduction}}" is-link />
-    <van-cell size="large" url="/Pages/yishi/attestation/index?card_name={{card_name}}&card_num_mask={{card_num_mask}}" link-type="navigateTo" title="实名认证" 
-    value="{{idcard_status==0?'未认证':idcard_status==1?'认证通过':'认证失败'}}" is-link />
-    <van-cell size="large" url="/Pages/yishi/practicing/index" link-type="navigateTo" title="医师认证" 
-    value="{{iden_auth_status==0?'未认证':iden_auth_status==1?'认证通过':iden_auth_status==2?'审核中':'认证失败'}}" is-link />
+    <van-cell size="large" bindtap="go" data-url="/Pages/yishi/mycard/index" title="我的名片" value="分享名片" is-link />
+    <van-cell size="large" bindtap="go" data-url="/Pages/yishi/myprofile/index" title="我的简介" value="{{brief_introduction}}" is-link />
+    <van-cell size="large" bindtap="go1" data-url="/Pages/yishi/attestation/index?card_name={{card_name}}&card_num_mask={{card_num_mask}}" link-type="navigateTo" title="实名认证" 
+    value="{{idcard_status==0?'未认证':idcard_status==1?'已认证':'认证失败'}}" is-link />
+    <van-cell size="large" bindtap="go" data-url="/Pages/yishi/practicing/index" link-type="navigateTo" title="医师认证" 
+    value="{{iden_auth_status==0?'未认证':iden_auth_status==1?'已认证':iden_auth_status==2?'审核中':'认证失败'}}" is-link />
   </van-cell-group>
 
   <van-button bind:click="logOut" custom-style="width: 92vw;margin: 50rpx auto;border-radius: 10rpx;" type="primary" color="#3CC7C0" block>退出登录</van-button>
+
+  <van-dialog
+    title="温馨提示"
+    message="{{v_message}}"
+    show="{{ v_show }}"
+    show-cancel-button
+    confirm-button-color="#3CC7C0"
+    bind:confirm="goIn"
+  />
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/myinfo/index.wxss b/Pages/yishi/myinfo/index.wxss
index e69de29..1b690af 100644
--- a/Pages/yishi/myinfo/index.wxss
+++ b/Pages/yishi/myinfo/index.wxss
@@ -0,0 +1,5 @@
+.van-cell__value {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
\ No newline at end of file
diff --git a/Pages/yishi/myprofile/index.wxml b/Pages/yishi/myprofile/index.wxml
index 7b691fc..b3b7e70 100644
--- a/Pages/yishi/myprofile/index.wxml
+++ b/Pages/yishi/myprofile/index.wxml
@@ -1,5 +1,5 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
   <myprofile indentity="{{false}}" />
-  
+  <view style="height: 50rpx;"></view>
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/onlinechufang/index.js b/Pages/yishi/onlinechufang/index.js
index 3e455d7..982245f 100644
--- a/Pages/yishi/onlinechufang/index.js
+++ b/Pages/yishi/onlinechufang/index.js
@@ -1,6 +1,5 @@
 import Toast from '@vant/weapp/toast/toast';
 import { API } from './../../../utils/network/api'
-
 const api = new API()
 const app = getApp()
 Page({
@@ -29,9 +28,30 @@ Page({
     save_durg_single_use: "",
     save_durg_packaging_unit: "",
     save_durg_frequency_use: "",
-    save_durg_available_days: ""
+    save_durg_available_days: "",
+    order_inquiry_id: "",
+    doctor_advice: "",
+    doctors_advice_focus: false,
+    case_detail: {}
+  },
+  onDoctorsAdviceFocus(){
+    this.setData({
+      doctors_advice_focus: true
+    })
+  },
+  onLoad(options){
+    let order_inquiry_id = options.order_inquiry_id;
+    //获取患者问诊病例
+    api.getDoctorInquiryCase({order_inquiry_id: order_inquiry_id}).then(response => {
+      console.log(response);
+      this.setData({
+        case_detail: response.data
+      })
+    }).catch(errors => {console.error(errors);})
+    this.setData({
+      order_inquiry_id: order_inquiry_id
+    })
   },
-
   select_drug(e){
     this.setData({
       drug_content_show: true,
@@ -253,5 +273,44 @@ Page({
         drugs_box_item_list: list
       })
     }
+  },
+  getAdvice(e){
+    console.log(e.detail.value)
+    this.setData({
+      doctor_advice: e.detail.value
+    })
+  },
+  postDoctorPrescription(){//新增处方
+    console.log("postDoctorPrescription postDoctorPrescription");
+    let params = {};
+    params.order_inquiry_id = this.data.order_inquiry_id;
+    params.doctor_advice = this.data.doctor_advice;
+    let prescription_icd = [];
+    this.data.zhenduan_list.forEach(item => {
+      prescription_icd.push(item.disease_class_id);
+    })
+    params.prescription_icd = prescription_icd;
+    params.prescription_product = this.data.drugs_box_item_list;
+
+    console.log(params);
+
+    api.postDoctorPrescription(params).then(response => {
+      console.log(response);
+      
+    }).catch(errors => {console.error(errors);})
+  },
+  putDoctorPrescription(){//修改处方
+    let params = {};
+    api.putDoctorPrescription(params).then(response => {
+      console.log(response);
+      
+    }).catch(errors => {console.error(errors);})
+  },
+  getDoctorPrescriptionInfo(){//获取处方详情
+    let params = {};
+    api.getDoctorPrescriptionInfo(params).then(response => {
+      console.log(response);
+      
+    }).catch(errors => {console.error(errors);})
   }
 })
\ No newline at end of file
diff --git a/Pages/yishi/onlinechufang/index.wxml b/Pages/yishi/onlinechufang/index.wxml
index 64ecba7..32a9bf2 100644
--- a/Pages/yishi/onlinechufang/index.wxml
+++ b/Pages/yishi/onlinechufang/index.wxml
@@ -1,21 +1,21 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
-<view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
+<view class="container">
   <view class="item">
     <!-- 头部 -->
     <view class="item_top">
-      <view class="item_top_name">张三三</view>
-      <view class="item_top_sex">男 | 30岁</view>
-      <view class="check">查看病历</view>
+      <view class="item_top_name">{{case_detail.name}}</view>
+      <view class="item_top_sex">{{case_detail.sex==1?'男':case_detail.sex==2?'女':'未知'}}｜{{case_detail.age}}岁 </view>
+      <view class="check" bindtap="go" data-url="/Pages/yishi/case/index?order_inquiry_id={{order_inquiry_id}}">查看病历</view>
     </view>
     <!-- 中间内容部分 -->
     <view class="item_content">
       <view class="item_content_li">
         <view class="item_content_li_title">病情主诉：</view>
-        <view class="item_content_li_txt">头疼，腰疼、肩膀酸、等症状已经困，头疼，腰疼、肩膀酸、等症状已经困</view>
+        <view class="item_content_li_txt">{{case_detail.disease_desc}}</view>
       </view>
       <view class="item_content_li">
         <view class="item_content_li_title">用药意向：</view>
-        <view class="item_content_li_txt">肝功能异常</view>
+        <view class="item_content_li_txt"><text wx:for="{{case_detail.product}}">{{item}};</text></view>
       </view>
       <!-- <view class="item_content_li">
         <view class="item_content_li_title">处方时间：</view>
@@ -60,13 +60,13 @@
   </view>
 
   <view class="txt_title">医嘱</view>
-  <view class="doctors_advice">
-    <textarea maxlength="1000" style="width: 100%;" placeholder-style="font-size:24rpx; color:#999" placeholder="请选择常用于"></textarea>
+  <view class="doctors_advice" bindtap="onDoctorsAdviceFocus">
+    <textarea auto-height focus="{{doctors_advice_focus}}" maxlength="1000" bindblur="getAdvice" style="width: 100%;" placeholder-style="font-size:24rpx; color:#999" placeholder="请输入医嘱"></textarea>
+  </view>
+  <view class="sub_btn">
+    <van-button bind:click="postDoctorPrescription" color="#3CC7C0; font-size:30rpx; border-radius: 10rpx;" type="primary" block>提交审核</van-button>
   </view>
 
-  <view class="sub_btn">
-    <van-button color="#3CC7C0; font-size:30rpx; border-radius: 10rpx;" type="primary" block>提交审核</van-button>
-  </view>
 
   <van-popup
     show="{{ drugs_popshow }}"
diff --git a/Pages/yishi/onlinechufang/index.wxss b/Pages/yishi/onlinechufang/index.wxss
index acd0f86..7e9b85b 100644
--- a/Pages/yishi/onlinechufang/index.wxss
+++ b/Pages/yishi/onlinechufang/index.wxss
@@ -3,7 +3,6 @@ page{
 }
 .container{
   width: 100vw;
-  height: 100vh;
   background-color: #F6F6F6;
   letter-spacing: 3rpx;
 }
@@ -104,7 +103,7 @@ page{
 .doctors_advice{
   position: relative;
   width: calc(92vw - 40rpx);
-  height: 100rpx;
+  min-height: 100rpx;
   margin: 20rpx auto;
   background-color: rgb(255, 255, 255);
   border-radius: 20rpx;
diff --git a/Pages/yishi/onlinesetup/index.js b/Pages/yishi/onlinesetup/index.js
index 57a7680..c6d682c 100644
--- a/Pages/yishi/onlinesetup/index.js
+++ b/Pages/yishi/onlinesetup/index.js
@@ -1,5 +1,5 @@
 import { API } from './../../../utils/network/api'
-import Toast from '@vant/weapp/toast/toast';
+import Toast from 'tdesign-miniprogram/toast/index';
 let api = new API()
 const app = getApp()
 Page({
@@ -19,6 +19,7 @@ Page({
       inquiry_price: 0,
       work_num_day: 0
     },
+    myprice: "",
     config:{
       "max_work_num_day": 30,
       "min_inquiry_price": 0,
@@ -34,7 +35,7 @@ Page({
     }
   },
   onLoad(){
-    this.setData({ note: this.data.open_note });
+    
   },
   onShow(){
     let params = {};
@@ -46,12 +47,17 @@ Page({
       this.setData({
         info: response.data.info,
         config: response.data.config,
+        note: response.data.info.is_open == 1? this.data.open_note : this.data.close_note
       })
     }).catch(errors => {console.error(errors);})
   },
   onChange({ detail }) {
     console.log("onChange: ", detail);
+
     if(detail){
+      let inquiry_price = this.data.info.inquiry_price;
+      let check = this.checkPrice(inquiry_price);
+      if(!check) return;
       this.setData({ note: this.data.open_note });
     }else{
       this.setData({ note: this.data.close_note });
@@ -61,7 +67,7 @@ Page({
      //修改开关
      let params = {};
      params.inquiry_type = this.data.inquiry_type;//接诊类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药）
-    params.inquiry_mode = this.data.inquiry_mode;//接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员）
+     params.inquiry_mode = this.data.inquiry_mode;//接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员）
      params.is_open = detail?1:0;
      api.putDoctorInquiryOpen(params).then(response => {
       console.log(response);
@@ -91,20 +97,36 @@ Page({
   },
   onPriceChange(e){
     console.log(e.detail);
-    let value = Number(e.detail.value);
+    this.checkPrice(e.detail.value)
+    this.setData({
+      "info.inquiry_price": e.detail.value
+    })
+  },
+  myToast(message){
+    Toast({
+      context: this,
+      selector: '#t-toast',
+      message: message,
+      theme: 'warning',
+      direction: 'column',
+    });
+  },
+  checkPrice(price){
+    let value = Number(price);
     let min = Number(this.data.config.min_inquiry_price);
     let max = Number(this.data.config.max_inquiry_price);
     if(value < min){
       value = min;
-      Toast.fail('价格不能低于' + min + '元');
+      let message = '价格不能低于' + min + '元';
+      this.myToast(message);
+      return false;
     }else if(value >= min && value <=max ){
-      value = value;
+      return true;
     }else{
       value = max;
-      Toast.fail('价格不能高于' + max + '元');
+      let message = '价格不能高于' + max + '元';
+      this.myToast(message);
+      return false;
     }
-    this.setData({
-      "info.inquiry_price": value
-    })
   }
 })
\ No newline at end of file
diff --git a/Pages/yishi/onlinesetup/index.json b/Pages/yishi/onlinesetup/index.json
index 71178ef..fb84336 100644
--- a/Pages/yishi/onlinesetup/index.json
+++ b/Pages/yishi/onlinesetup/index.json
@@ -7,6 +7,6 @@
     "van-stepper": "@vant/weapp/stepper/index",
     "van-switch": "@vant/weapp/switch/index",
     "van-button": "@vant/weapp/button/index",
-    "van-toast": "@vant/weapp/toast/index"
+    "t-toast": "tdesign-miniprogram/toast/toast"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/onlinesetup/index.wxml b/Pages/yishi/onlinesetup/index.wxml
index a13375b..d9646a2 100644
--- a/Pages/yishi/onlinesetup/index.wxml
+++ b/Pages/yishi/onlinesetup/index.wxml
@@ -20,7 +20,7 @@
     </view>
   </view>
 
-  <view wx:if="{{ info.is_open==1 }}" class="checked_box">
+  <view class="checked_box">
     <view class="price_title">价格设置</view>
     <view class="price_steup_box">
       <view class="price_steup_box_top">
@@ -32,7 +32,7 @@
       <view class="price_steup_box_bottom">
         <view class="price_steup_box_bottom_title">问诊单价（元）</view>
         <view class="price_steup_box_bottom_num"> 
-          <input class="weui-input" bindblur="onPriceChange" type="digit" value="{{ info.inquiry_price }}" placeholder="请输入问诊单价" />
+          <input class="weui-input" bindinput="onPriceChange" type="digit" value="{{ info.inquiry_price }}" placeholder="请输入问诊单价" />
           <text class="price">元</text>
         </view>
       </view>
@@ -49,9 +49,9 @@
     </text>
   </view>
 
-  <view class="go" wx:if="{{ info.is_open==1 }}">
-    <van-button bind:click="putDoctorInquiryConfig" color="#3CC7C0" custom-style="border-radius: 20rpx;font-size:30rpx;" type="primary" block>去接诊</van-button>
+  <view class="go">
+    <van-button disabled="{{info.is_open!=1}}" bind:click="putDoctorInquiryConfig" color="#3CC7C0" custom-style="border-radius: 20rpx;font-size:30rpx;" type="primary" block>去接诊</van-button>
   </view>
 
-  <van-toast id="van-toast" />
+  <t-toast id="t-toast" />
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/onlinesetup/index.wxss b/Pages/yishi/onlinesetup/index.wxss
index c71917e..f611f85 100644
--- a/Pages/yishi/onlinesetup/index.wxss
+++ b/Pages/yishi/onlinesetup/index.wxss
@@ -52,7 +52,7 @@
 }
 .price_title{
   width: 90vw;
-  margin: 0 auto;
+  margin: 20rpx auto 0 auto;
   font-size: 32rpx;
   margin-bottom: 20rpx;
   font-family: "AlibabaPuHuiTi-2-55-Regular";
diff --git a/Pages/yishi/practicing/index.wxml b/Pages/yishi/practicing/index.wxml
index e568bbc..570cc6c 100644
--- a/Pages/yishi/practicing/index.wxml
+++ b/Pages/yishi/practicing/index.wxml
@@ -34,7 +34,7 @@
           id="loading-img" 
           shape="round" src="{{item}}" 
           mode="heightFix" 
-          style="margin: 0 50rpx 0 20rpx;" 
+          style="margin: 0 50rpx 20rpx 20rpx;" 
           width="220rpx" height="220rpx" 
           aria-label="img" wx:for="{{work_cert}}" />
       </view>
diff --git a/Pages/yishi/practicing/index.wxss b/Pages/yishi/practicing/index.wxss
index b024d33..6ab4ed9 100644
--- a/Pages/yishi/practicing/index.wxss
+++ b/Pages/yishi/practicing/index.wxss
@@ -10,6 +10,7 @@
 }
 .imgbox{
   display: flex;
+  flex-wrap: wrap;
 }
 .imgbox_title{
   padding: 20rpx;
diff --git a/Pages/yishi/signcanvas/index.js b/Pages/yishi/signcanvas/index.js
index 2f7f8dc..44f6f4b 100644
--- a/Pages/yishi/signcanvas/index.js
+++ b/Pages/yishi/signcanvas/index.js
@@ -11,7 +11,14 @@ Page({
     height: app.globalData.height,
     ctx: null,
     canvas: null,
-    txt_show: true
+    txt_show: true,
+    template:{
+      width: '676rpx',
+      height: '414rpx',
+      views: [
+      {}
+      ],
+    },
   },
 
   onReady() {
@@ -39,7 +46,6 @@ Page({
         console.log("onReady onReady end")
       })
   },
-
   ontouchmove(e){
     console.log("ontouchmove ontouchmove ontouchmove");
     console.log(e);
@@ -58,17 +64,19 @@ Page({
     this.data.ctx.beginPath();
     this.data.ctx.moveTo(e.touches[0].x,e.touches[0].y);
   },
-
   toClear() {
     this.setData({
       txt_show: true
     });
     this.data.ctx.clearRect(0,0,this.data.canvas.width,this.data.canvas.height)
   },
-
+  rotate(){
+    let ctx = this.data.ctx;
+    ctx.rotate(90);
+  },
   toSave(event) {
     let _this = this;
-    let base64Img = _this.data.canvas.toDataURL()
+    let base64Img = _this.data.canvas.toDataURL();
     console.log("sign: ", base64Img);
     wx.canvasToTempFilePath({
       canvasId: "sign_panels",
@@ -78,11 +86,32 @@ Page({
       success(res) {
         console.log(res.tempFilePath)
         let filePath = res.tempFilePath;
-        _this.doUploadFile(event, 2, filePath);
+        console.log(_this.data.canvas)
+        console.log(_this.data.canvas.width)
+        console.log(_this.data.canvas.height)
+        let cs = (_this.data.canvas.height - _this.data.canvas.width)/2;
+        _this.setData({
+          "template.width": _this.data.canvas.height+"rpx",
+          "template.height": _this.data.canvas.width+"rpx",
+          "template.views[0].css.width": _this.data.canvas.width+"rpx",
+          "template.views[0].css.left": cs+"rpx",
+          "template.views[0].css.top": "-"+cs+"rpx",
+          "template.views[0].url": filePath,
+          "template.views[0].type": "image",
+          "template.views[0].css.rotate": "-90",
+        })
+        // _this.doUploadFile(event, 2, filePath);
       }
     })
   },
-
+  onImgOK(e){
+    console.log("onImgOK onImgOK onImgOK onImgOK");
+    console.log(e.detail.path);
+    let txt_show = this.data.txt_show;
+    if(!txt_show){
+      this.doUploadFile(e, 2, e.detail.path);
+    }
+  },
   doUploadFile(event, scene, filePath) {
     console.log("index douploadFIle: ", event);
     console.log("scene: ", scene);
@@ -128,5 +157,4 @@ Page({
       console.error(errors);
     })
   }
-
-})
\ No newline at end of file
+})
diff --git a/Pages/yishi/signcanvas/index.json b/Pages/yishi/signcanvas/index.json
index dd1d0fe..ddc82d0 100644
--- a/Pages/yishi/signcanvas/index.json
+++ b/Pages/yishi/signcanvas/index.json
@@ -2,6 +2,8 @@
   "component": true,
   "usingComponents": {
     "te-nav-bar": "/commpents/te_navbar",
-    "van-button": "@vant/weapp/button/index"
-  }
+    "van-button": "@vant/weapp/button/index",
+    "painter":"/commpents/painter/painter"
+  },
+  "disableScroll": true
 }
\ No newline at end of file
diff --git a/Pages/yishi/signcanvas/index.wxml b/Pages/yishi/signcanvas/index.wxml
index adf2a30..33d7d12 100644
--- a/Pages/yishi/signcanvas/index.wxml
+++ b/Pages/yishi/signcanvas/index.wxml
@@ -7,4 +7,5 @@
     <van-button bindtap="toClear" custom-style="height: 70rpx;border-radius: 10rpx;color:#000;width: 230rpx;">清空</van-button>
     <van-button bindtap="toSave" custom-style="height: 70rpx;border-radius: 10rpx;color:#fff;width: 230rpx;background: linear-gradient(315deg, #33BFB8 0%, #34BFB8 0%, #3CC7C0 100%);">确认</van-button>
   </view>
-</view>
\ No newline at end of file
+</view>
+<painter palette="{{template}}" style="position: absolute;top: 999999999999999999999999999999999900px;left: 999999999999999999999999999999999px;" bind:imgOK="onImgOK" />
\ No newline at end of file
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index cb702ac..4c4717b 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -267,15 +267,18 @@ Page({
       }
       session_list[inquiry_type - 1].push(session_item);
     })
-
-
-
     this.setData({
       data_list_1: session_data_list_1,
       data_list_2: session_data_list_2,
       data_list_3: session_data_list_3,
       data_list_4: session_data_list_4,
     })
+
+    if(session_data_list_1.length > 0 && session_data_list_2.length > 0 && session_data_list_3.length > 0 && session_data_list_4.length > 0 && session_data_list_5.length > 0){
+      this.setData({has_data: false})
+    }else{
+      this.setData({has_data: true})
+    }
   },
   onTabsChange(e){
     console.log(e);
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml
index c84bc76..4083d25 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxml
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml
@@ -1,6 +1,6 @@
 <!-- 问诊页面 -->
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
-<view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
+<view class="container">
   <view class="top">
       <view class="top_left" bindtap="go" data-name="service_notice_unreadnnum" data-url="/Pages/yishi/service_notice/index">
         <t-badge dot="{{service_notice_unreadnnum > 0}}" offset="{{ [1, 1] }}" class="wrapper">
@@ -22,9 +22,9 @@
 
   <view class="empty" wx:if="{{ !has_data }}" >
     <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/wnzhen_empty.png" fit="heightFix" height="108rpx" aria-label="empty" />
-    <view class="empty_note">您还未设置在线问诊价格</view>
+    <view class="empty_note">未收到任何消息</view>
   </view>
-  <van-button color="#3CC7C0" custom-style="width: 92vw;margin: 0 auto;border-radius: 10rpx;" block wx:if="{{ !has_data }}">开通图文问诊</van-button>
+  <!-- <van-button color="#3CC7C0" custom-style="width: 92vw;margin: 0 auto;border-radius: 10rpx;" block wx:if="{{ !has_data }}">开通图文问诊</van-button> -->
 
   <view class="tabs" wx:if="{{ has_data }}" >
     <t-tabs
@@ -37,7 +37,7 @@
       custom-style="font-size: 32rpx"
 
     >
-      <t-tab-panel label="在线问诊" value="1">
+      <t-tab-panel label="在线问诊" value="1" wx:if="{{data_list_1.length > 0}}">
 
         <wenzhen-data 
           name="{{ item.patient_name }}"
@@ -58,7 +58,7 @@
          <van-empty description="暂无数据" wx:if="{{data_list_1.length == 0}}" />
       </t-tab-panel>
 
-      <t-tab-panel label="快速问诊" value="2">
+      <t-tab-panel label="快速问诊" value="2" wx:if="{{data_list_2.length > 0}}">
         <!-- 1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消 -->
         <wenzhen-data 
           name="{{ item.patient_name }}"
@@ -80,7 +80,7 @@
          <van-empty description="暂无数据" wx:if="{{data_list_2.length == 0}}" />
 
       </t-tab-panel>
-      <t-tab-panel label="公益问诊" value="3">
+      <t-tab-panel label="公益问诊" value="3" wx:if="{{data_list_3.length > 0}}">
         <!-- <wenzhen-data 
         name="王五"
         sex="女"
@@ -110,7 +110,7 @@
          <van-empty description="暂无数据" wx:if="{{data_list_3.length == 0}}" />
 
       </t-tab-panel>
-      <t-tab-panel label="问诊购药" value="4">
+      <t-tab-panel label="问诊购药" value="4" wx:if="{{data_list_4.length > 0}}">
 
          <wenzhen-data 
           name="{{ item.patient_name }}"
@@ -130,7 +130,7 @@
 
          <van-empty description="暂无数据" wx:if="{{data_list_4.length == 0}}" />
       </t-tab-panel>
-      <t-tab-panel label="问诊结束" value="5">
+      <t-tab-panel label="问诊结束" value="5" wx:if="{{data_list_5.length > 0}}">
 
         <wenzhen-data 
           name="{{ item.patient_name }}"
diff --git a/Pages/yishi/yizhensetup/index.wxml b/Pages/yishi/yizhensetup/index.wxml
index 0073e7a..6794dca 100644
--- a/Pages/yishi/yizhensetup/index.wxml
+++ b/Pages/yishi/yizhensetup/index.wxml
@@ -20,7 +20,7 @@
     </view>
   </view>
 
-  <view wx:if="{{ info.is_open==1 }}" class="checked_box">
+  <view class="checked_box">
     <view class="price_title">价格设置</view>
     <view class="price_steup_box">
       <view class="price_steup_box_top">
@@ -48,7 +48,7 @@
     </text>
   </view>
 
-  <view class="go" wx:if="{{ info.is_open==1 }}">
+  <view class="go">
     <van-button bind:click="putDoctorInquiryConfig" color="#3CC7C0" custom-style="border-radius: 20rpx;font-size:30rpx;" type="primary" block>去接诊</van-button>
   </view>
 
diff --git a/Pages/yishi/zhiye_identity/index.js b/Pages/yishi/zhiye_identity/index.js
index b43f5f0..9cb4dfb 100644
--- a/Pages/yishi/zhiye_identity/index.js
+++ b/Pages/yishi/zhiye_identity/index.js
@@ -11,15 +11,13 @@ Page({
     height: app.globalData.height,
     id_card_front: [],
     id_card_back: [],
-    sign_image: "",
+    sign_image: [],
     btn_txt: "提交",
     multi_point_status: "",
     btn_disabled: true
-
   },
 
   onLoad(){
-
     console.log("onlosd");
     //获得多点执业信息
     api.getDoctorAuthMulti().then(response => {
@@ -62,9 +60,15 @@ Page({
       }
 
       let sign_image = response.data.sign_image;
+
       if(sign_image){
+        let arr = [];
+        let item = {};
+        item.isImg = true;
+        item.url = sign_image;
+        arr.push(item);
         this.setData({
-          sign_image: sign_image
+          sign_image: arr
         })
       }
 
@@ -75,18 +79,20 @@ Page({
         btn_txt: btn_txt
       })
       
-    }).catch(errors => {
-      console.error(errors);
-    })
-
+    }).catch(errors => {console.error(errors);})
   },
   onShow(){
     console.log("onshow")
     let sign_image = wx.getStorageSync("sign_image");
     console.log("sign_image: ",sign_image);
     if(sign_image){
+      let arr = [];
+      let item = {};
+      item.isImg = true;
+      item.url = sign_image;
+      arr.push(item);
       this.setData({
-        sign_image: sign_image
+        sign_image: arr
       })
     }
   },
@@ -96,29 +102,33 @@ Page({
       tmplIds: ['kUy70xHlr7ADo4aIHiictM4Te7MSec3E5kHsYvFQu40'],
       success (res) { 
         console.log(res);
+        console.log(_this.data.id_card_front);
+        console.log(_this.data.id_card_back);
+        
+        if(_this.data.id_card_front.length == 0){
+          wx.showToast({
+            title: '身份证正面为空',
+            icon: "error"
+          })
+          return;
+        }
+        
+        if(_this.data.id_card_back.length == 0){
+          wx.showToast({
+            title: '身份证反面为空',
+            icon: "error"
+          })
+          return;
+        }
         let id_card_front = _this.data.id_card_front[0].url;
-        console.log("id_card_front: ", id_card_front);
-        if(id_card_front == ""){
-          wx.showToast({
-            title: '请上传身份证',
-            icon: "error"
-          })
-          return;
-        }
         let id_card_back = _this.data.id_card_back[0].url;
+        let sign_image = _this.data.sign_image[0].url;
+        console.log("id_card_front: ", id_card_front);
         console.log("id_card_back: ", id_card_back);
-        if(id_card_back == ""){
-          wx.showToast({
-            title: '请上传身份证',
-            icon: "error"
-          })
-          return;
-        }
-        let sign_image = _this.data.sign_image;
         console.log("sign_image: ", sign_image);
         if(sign_image == ""){
           wx.showToast({
-            title: '请上传签名',
+            title: '手写签名为空',
             icon: "error"
           })
           return;
@@ -133,15 +143,10 @@ Page({
             title: '提交成功',
             icon: "success"
           })
-
-          
-          // 订阅处方审核结果通知（长期）
-          wx.requestSubscribeMessage({
-            tmplIds: ['kUy70xHlr7ADo4aIHiictM4Te7MSec3E5kHsYvFQu40'],
-            success (res) { console.log(res); }
+          _this.setData({
+            btn_txt: "审核中",
+            btn_disabled: true
           })
-
-
         }).catch(errors => {
           console.error(errors);
         })
@@ -192,7 +197,7 @@ Page({
               img.isImg = true;
 
               
-              let img_list = _this.data[field_name];
+              let img_list = [];
 
               console.log("img_list: ", img_list);
               img_list.push(img);
diff --git a/Pages/yishi/zhiye_identity/index.wxml b/Pages/yishi/zhiye_identity/index.wxml
index a3cf461..3b33b48 100644
--- a/Pages/yishi/zhiye_identity/index.wxml
+++ b/Pages/yishi/zhiye_identity/index.wxml
@@ -44,20 +44,34 @@
 
     <view class="sign_box">
       <view class="sign_title">医生手写签名 *</view>
-      <view class="sign" wx:if="{{sign_image == ''}}" data-url="/Pages/yishi/signcanvas/index" bindtap="go">
+      <view class="sign" wx:if="{{sign_image.length == 0}}" data-url="/Pages/yishi/signcanvas/index" bindtap="go">
         <van-button custom-style="height:130rpx;margin-top:20rpx;border-radius: 20rpx;border: 1px dashed #999;width:100%;font-size:30rpx;background-color: #fff;color: #3CC7C0;" icon="edit">点击签名</van-button>
       </view>
-      <view class="sign_img" wx:if="{{sign_image != ''}}" data-url="/Pages/yishi/signcanvas/index" bindtap="go">
-        <image mode="heightFix" style="transform: rotate(-90deg);width: 100%;" src="{{sign_image}}"></image>
+      <view style="margin-top:20rpx;border-radius: 20rpx;border: 1px dashed #999;" class="sign_img" wx:if="{{sign_image.length > 0}}" data-url="/Pages/yishi/signcanvas/index" bindtap="go">
+        <image mode="heightFix" style="transform: rotate(-0deg);width: 100%;" src="{{sign_image[0].url}}"></image>
       </view>
-      <view class="sign_note">提示：平台会在1~3天内审核您提交的资料，审核结果会第一时间通知您。</view>
+    </view>
 
-      <!-- <van-button custom-style="font-size:30rpx; color:#fff; border-radius: 20rpx; background-color: #999"  block>资料未填写完</van-button> -->
+    <m-upload-cell
+      upload_cell_name="或选择上传" 
+      t_icon_name="view-module" 
+      bind:showNote="onShowSignImage"
+      upload_cell_desc="" 
+      upload_cell_note="" 
+      required="{{false}}"
+      disabled="{{btn_disabled}}"
+      max_count="1"
+      data-scene="2" 
+      data-field_name="sign_image" 
+      data-file_multiple="true"
+      bindUploadFile="doUploadFile"
+      bindDeleteFile="doDeleteFile"
+      />
+    <view class="sign_box">
+      <view class="sign_note">提示：平台会在1~3天内审核您提交的资料，审核结果会第一时间通知您。</view>
       <van-button bind:click="add" 
       custom-style="font-size:30rpx; color:#fff; border-radius: 20rpx; background-color: #3CC7C0" disabled="{{btn_disabled}}"  block>{{btn_txt}}</van-button>
     </view>
-    <view style="height: 50rpx;"> 
-      
-    </view>
+    <view style="height: 50rpx;"></view>
   </van-cell-group>
 </view>
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js
index b39dd2b..63becfd 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.js
@@ -342,7 +342,7 @@ Component({
           app.go("/Pages/yishi/case/index?order_inquiry_id="+this.data.order_inquiry_id)
           break;
         case '11'://在线开方
-          app.go("/Pages/yishi/onlinechufang/index")
+          app.go("/Pages/yishi/onlinechufang/index?order_inquiry_id="+this.data.order_inquiry_id)
           break;
         default:
           break;
diff --git a/commpents/myprofile/index.js b/commpents/myprofile/index.js
index 09c0439..c19e37d 100644
--- a/commpents/myprofile/index.js
+++ b/commpents/myprofile/index.js
@@ -96,6 +96,7 @@ Component({
     license_cert_reason: "",
     qualification_cert_reason: "",
     work_cert_reason: "",
+    department_custom_name_reason: ''
   },
 
   options: {
@@ -108,15 +109,14 @@ Component({
       console.log("myprofile attached")
       let _this = this;
       console.log(_this.data.zhicheng_columns);
-      _this.setData({
-        "zhicheng_columns[0].text": "AAA"
-      })
       console.log(_this.data.zhicheng_columns);
+
+
       //获得医师身份认证
-      api.getDoctorAuthIden().then(response => {
+      api.getDoctorAuthIden({source: this.data.indentity?1:2}).then(response => {
         console.log("getDoctorAuthIden: ",response);
         this.setData({
-          is_avatar: true,
+         
           doctorauthiden_data_ready: true,
           textarea_jianjie: response.data.brief_introduction,
           textarea_shanchang: response.data.be_good_at,
@@ -137,12 +137,13 @@ Component({
           license_cert_reason: response.data.license_cert_reason,
           qualification_cert_reason: response.data.qualification_cert_reason,
           work_cert_reason: response.data.work_cert_reason,
+          department_custom_name_reason: response.data.department_custom_name_reason,
         });
         let iden_auth_status = response.data.iden_auth_status;
         console.log("iden_auth_status: ",iden_auth_status)
         let iden_auth_status_txt = iden_auth_status == 0?'请完善资料后提交':iden_auth_status == 1?'认证通过': iden_auth_status==2?'资料已提交，审核中':iden_auth_status==3?'认证失败':'未认证';
 
-        let iden_auth_disabled = iden_auth_status == 0?false:iden_auth_status == 1?false: iden_auth_status==2?true:iden_auth_status==3?false:true;
+        let iden_auth_disabled = iden_auth_status == 0?false:iden_auth_status == 1?true: iden_auth_status==2?true:iden_auth_status==3?false:true;
         console.log("iden_auth_disabled: ",iden_auth_disabled)
         this.setData({
           iden_auth_status_txt: iden_auth_status_txt,
@@ -182,12 +183,12 @@ Component({
           })
         }
         let avatar = response.data.avatar;
-        if(avatar && (avatar.indexOf("http") == -1)){
-          avatar = api.getStaticHost() + avatar;
+        if(avatar){
+          this.setData({
+            "avatar": avatar,
+            is_avatar: true,
+          })
         }
-        this.setData({
-          "avatar": avatar
-        })
       }).catch(errors => {console.error(errors);})
 
       //加载省份列表
@@ -471,7 +472,18 @@ Component({
     },
     onYiYuanShow(e) {
       console.log("onYiYuanShow");
-      this.setData({ yiyuan_show: true });
+      let select_province_id = this.data.select_province_id;
+      let select_city_id = this.data.select_city_id;
+      let select_county_id = this.data.select_county_id;
+      if(select_province_id && select_city_id && select_county_id){
+        this.setData({ yiyuan_show: true });
+      }else{
+        wx.showToast({
+          title: '请先选择省市',
+          icon: "error"
+        })
+      }
+        
     },
     onYiYuanClose(e) {
       console.log("onYiYuanClose");
@@ -490,11 +502,19 @@ Component({
       console.log("onYiYuanConfirm");
       const { picker, value, index } = event.detail;
       console.log(event.detail);
-      this.setData({ 
-        yiyuan_show: false,
-        select_yiyuan_id: `${value.value}`,
-        yiyuan_note: `${value.text}`
-      });
+      if(value.value){
+        this.setData({ 
+          yiyuan_show: false,
+          select_yiyuan_id: `${value.value}`,
+          yiyuan_note: `${value.text}`
+        });
+      }else{
+        wx.showToast({
+          title: '请先选择医院',
+          icon: "error"
+        })
+      }
+      
     },
     onYiYuanChange(event) {
       console.log("onYiYuanChange");
@@ -598,29 +618,48 @@ Component({
       console.log("onZhiChengClose");
       this.setData({ zhicheng_img_show: false });
     },
-    getTextAreaVal(e){
-      console.log("myindex: ", e);
-      let textarea_name = e.currentTarget.dataset.textarea_name;
+    onCustomKeshiChange(){
       this.setData({
-        [textarea_name]: e.detail.value
+        department_custom_name_reason: ""
+      })
+    },
+    getTextAreaVal(e){
+      console.log("myindex: ", e);//textarea_jianjie
+      let textarea_name = e.currentTarget.dataset.textarea_name;
+      if(textarea_name == "textarea_jianjie"){
+        this.setData({
+          brief_introduction_reason: ""
+        })
+      }
+      if(textarea_name == "textarea_shanchang"){
+        this.setData({
+          be_good_at_reason: ""
+        })
+      }
+      let reason_name = textarea_name+"_reason";
+      this.setData({
+        [textarea_name]: e.detail.value,
       })
     },
     select_zhuanchang(e){
       console.log(e);
       let count = 0
       this.data.zhuanchang_columns.forEach(item => {
-        count = count + 1;
+        if(item.is_selected == 1){
+          count = count + 1;
+        }
       })
-      if(count < 10){
-        let is_selected = e.currentTarget.dataset.is_selected;
-        let index = e.currentTarget.dataset.index;
-        let data = "zhuanchang_columns["+index+"].is_selected";
-        this.setData({[data]: is_selected==1?0:1})
-      }else{
+      
+      if(count >= 10 && e.currentTarget.dataset.is_selected==0){
         wx.showToast({
           title: '最多10个专长',
           icon: "error"
         })
+      }else{
+        let is_selected = e.currentTarget.dataset.is_selected;
+        let index = e.currentTarget.dataset.index;
+        let data = "zhuanchang_columns["+index+"].is_selected";
+        this.setData({[data]: is_selected==1?0:1})
       }
     },
     zhuanchangConfirm(e){
@@ -629,9 +668,14 @@ Component({
     zhuanchangConcle(e){
       this.setData({ zhuanchang_show: false });
     },
-    addDoctorAuthIden(){
-      let params = {};
+    addDoctorAuthIden(e){
+      console.log("addDoctorAuthIden addDoctorAuthIden")
   
+      let from = e.currentTarget.dataset.from;
+      console.log("from: ", from);
+      let params = {};
+
+      params.source = from=="myinfo"?2:1;
       if(!this.data.is_avatar){wx.showToast({title: '请上传头像',icon: "error"});return}
       params.avatar = this.data.avatar;
       if(!this.data.select_county_id){wx.showToast({title: '请选择城市',icon: "error"});return}
@@ -639,7 +683,7 @@ Component({
       params.hospital_id = this.data.select_yiyuan_id;//医院id
       if(!this.data.select_keshi_id){wx.showToast({title: '请选择科室',icon: "error"});return}
       params.department_custom_id = this.data.select_keshi_id;//科室id
-      if(!this.data.custom_keshi){wx.showToast({title: '请输入科室',icon: "error"});return}
+      // if(!this.data.custom_keshi){wx.showToast({title: '请输入科室',icon: "error"});return}
       params.department_custom_name = this.data.custom_keshi;//自定义科室名称
       if(!this.data.office_phone){wx.showToast({title: '请输入科室电话',icon: "error"});return}
       params.department_custom_mobile = this.data.office_phone;//科室电话
@@ -652,34 +696,112 @@ Component({
       if(!this.data.textarea_shanchang){wx.showToast({title: '请输入擅长',icon: "error"});return}
       params.be_good_at = this.data.textarea_shanchang;//擅长
       
-      if(this.data.zhiye_file_list.length == 0){wx.showToast({title: '请上传医师执业证',icon: "error"});return}
-      params.license_cert = this.data.zhiye_file_list.map(e => e.url);//医师执业证
-      if(this.data.zige_file_list.length == 0){wx.showToast({title: '请上传医师资格证',icon: "error"});return}
-      params.qualification_cert = this.data.zige_file_list.map(e => e.url);//医生资格证
-      if(this.data.zhicheng_file_list.length == 0){wx.showToast({title: '请上传职称证',icon: "error"});return}
-      params.work_cert = this.data.zhicheng_file_list.map(e => e.url);//工作证，职称证
+      if(from == "doctorauthiden"){//只有在医师身份认证模块才去修改证件
+        if(this.data.zhiye_file_list.length == 0){wx.showToast({title: '请上传医师执业证',icon: "error"});return}
+        if(this.data.zhiye_file_list.length < 2){wx.showToast({title: '医师执业证至少2张',icon: "error"});return}
+        params.license_cert = this.data.zhiye_file_list.map(e => e.url);//医师执业证
+        if(this.data.zige_file_list.length == 0){wx.showToast({title: '请上传医师资格证',icon: "error"});return}
+        params.qualification_cert = this.data.zige_file_list.map(e => e.url);//医生资格证
+        if(this.data.zhicheng_file_list.length == 0){wx.showToast({title: '请上传职称证',icon: "error"});return}
+        params.work_cert = this.data.zhicheng_file_list.map(e => e.url);//工作证，职称证
+      }
       console.log(params);
   
       let _this = this;
-      wx.requestSubscribeMessage({
-        tmplIds: ['kUy70xHlr7ADo4aIHiictM4Te7MSec3E5kHsYvFQu40'],
-        success (res) {
-          console.log(res);
-          api.postDoctorAuthIden(params).then(response => {
-            console.log(response);
-            wx.showToast({
-              title: '提交成功',
-              icon: "success"
-            })
-            _this.setData({
-              iden_auth_status_txt: "审核中",
-              iden_auth_disabled: true
-            })
-          }).catch(errors => {console.error(errors);})
-        }
+      api.postDoctorAuthIden(params).then(response => {
+        console.log(response);
+        wx.showToast({
+          title: '提交成功',
+          icon: "success"
+        })
+        _this.setData({
+          iden_auth_status_txt: "资料已提交，审核中",
+          iden_auth_disabled: true,
+          iden_auth_status: 2,
+        })
+      }).catch(errors => {console.error(errors);})
+    },
+    onOfficePhoneChange(){
+      this.setData({
+        department_custom_mobile_reason: ""
       })
     },
     doUploadFile(event) {
+      console.log("index douploadFIle: ", event);
+      const scene = event.currentTarget.dataset.scene;
+      const field_name = event.currentTarget.dataset.field_name;
+      const file_multiple = event.currentTarget.dataset.file_multiple;//是否为多张图
+      console.log("scene: ", scene);
+      console.log("field_name: ", field_name);
+      console.log("file_multiple: ", file_multiple);
+      let _this = this;
+      api.getOssSign({user_type:2,scene:scene}).then(response => {
+        console.log(response);
+        const { file } = event.detail;
+
+        file.forEach(item => {
+          console.log("file: ", item);
+          const filename = FileUtil.getFileName(item);
+          const host = response.data.host;
+          const signature = response.data.signature;
+          const ossAccessKeyId = response.data.accessid;
+          const policy = response.data.policy;
+          const key = response.data.dir+filename;
+          const filePath = item.url; // 待上传文件的文件路径。
+          wx.uploadFile({
+            url: host, // 开发者服务器的URL。
+            filePath: filePath,
+            name: 'file', // 必须填file。
+            formData: {
+              key,
+              policy,
+              OSSAccessKeyId: ossAccessKeyId,
+              signature,
+            },
+            success: (res) => {
+              console.log("upload: ", res);
+              let reason_name = field_name + "_reason";//错误原因置空
+              if (res.statusCode === 204) {
+                if(scene == 1){
+                  this.setData({
+                    is_avatar: true
+                  })
+                }
+                wx.showToast({title: '上传成功'})
+                if(file_multiple == "true"){//多张图
+                  let img = {}
+                  img.url = host+"/"+key;
+                  img.isImg = true;
+    
+                  let img_list = _this.data[field_name];
+                  console.log("img_list: ", img_list);
+                  img_list.push(img);
+                  console.log("img_list: ", img_list);
+                  
+                  reason_name = field_name=='zhiye_file_list'?'license_cert_reason':field_name=='zige_file_list'?'qualification_cert_reason':'work_cert_reason';
+                  this.setData({
+                    [field_name]: img_list,
+                    [reason_name]: ""
+                  });
+                }else{
+                  this.setData({
+                    [field_name]: host+"/"+key,
+                    [reason_name]: ""
+                  });
+                }
+              }
+            },
+            fail: err => {
+              console.log(err);
+            }
+          });
+        })
+
+      }).catch(errors => {
+        console.error(errors);
+      })
+    },
+    doUploadPhoto(event) {
       console.log("index douploadFIle: ", event);
       const scene = event.currentTarget.dataset.scene;
       const field_name = event.currentTarget.dataset.field_name;
@@ -711,6 +833,7 @@ Component({
           },
           success: (res) => {
             console.log("upload: ", res);
+            let reason_name = field_name + "_reason";//错误原因置空
             if (res.statusCode === 204) {
               if(scene == 1){
                 this.setData({
@@ -727,12 +850,17 @@ Component({
                 console.log("img_list: ", img_list);
                 img_list.push(img);
                 console.log("img_list: ", img_list);
-  
+                
+                reason_name = field_name=='zhiye_file_list'?'license_cert_reason':field_name=='zige_file_list'?'qualification_cert_reason':'work_cert_reason';
                 this.setData({
-                  [field_name]: img_list
+                  [field_name]: img_list,
+                  [reason_name]: ""
                 });
               }else{
-                this.setData({[field_name]: host+"/"+key});
+                this.setData({
+                  [field_name]: host+"/"+key,
+                  [reason_name]: ""
+                });
               }
             }
           },
diff --git a/commpents/myprofile/index.wxml b/commpents/myprofile/index.wxml
index 1f943bd..d4eff7f 100644
--- a/commpents/myprofile/index.wxml
+++ b/commpents/myprofile/index.wxml
@@ -1,6 +1,6 @@
         <view class="photo" style="border-bottom: {{avatar_reason==''?'1px solid var(--td-cell-border-color, var(--td-gray-color-3, #e7e7e7));':'unset'}}">
           <view class="title">头像 <text class="required"> *</text></view>
-          <van-uploader bind:after-read="doUploadFile" data-scene="1" data-field_name="avatar" data-file_multiple="false">
+          <van-uploader bind:after-read="doUploadPhoto" data-scene="1" data-field_name="avatar" data-file_multiple="false">
             <view class="right">
               <view class="note">真人正脸</view>
               <t-avatar image="{{ avatar }}" />
@@ -39,7 +39,6 @@
           round
         >
 
-        
         <van-picker 
           show-toolbar
           title="请选择医院"
@@ -52,7 +51,7 @@
         <van-search
           value="{{ hospital_search_val }}"
           shape="round"
-          placeholder="请输入搜索关键词"
+          placeholder="搜索医院"
           clearable
           bind:change="hospitalSearchChange"
           bind:search="hospitalSearch"
@@ -61,7 +60,14 @@
         <t-cell title="科室" hover required arrow note="{{keshi_note}}" bindtap="onKeshiShow" bordered="{{ select_keshi_id == '' }}"/>
 
         <view class="custom_keshi" wx:if="{{ select_keshi_id != ''}}">
-          <van-field model:value="{{custom_keshi}}" label="" placeholder="请输入科室"/>
+          <van-field bind:change="onCustomKeshiChange" model:value="{{custom_keshi}}" label="" placeholder="请输入科室" border="{{department_custom_name_reason == ''}}" />
+        </view>
+
+        <view class="has_error" wx:if="{{ department_custom_name_reason != '' }}" >
+          <view class="error_box">
+            <t-icon color="red" name="close-circle-filled" size="48rpx" data-name="close-circle-filled" />
+            <text class="error_msg">{{ department_custom_name_reason }}</text>
+          </view>
         </view>
 
         <van-popup
@@ -156,6 +162,9 @@
                 {{data.expertise_name}}
               </view>
               
+            </view>
+            <view style="height: 60rpx;">
+              
             </view>
           </view>
         </t-popup>
@@ -172,15 +181,16 @@
 
           <van-field
             model:value="{{ office_phone }}"
-            label="科室电话"
+            bind:change="onOfficePhoneChange"
             placeholder="请输入科室电话"
             placeholder-style="font-size:25rpx;letter-spacing: 2rpx;color:rgba(0, 0, 0, 0.4);"
             input-align="right"
-            required
             clearable
             border="{{ department_custom_mobile_reason == '' }}"
             custom-style="font-size:30rpx;"
-          />
+          >
+          <text slot="label">科室电话 <text style="color: #e34d59;">*</text> </text>
+          </van-field>
 
         <view class="has_error" wx:if="{{ department_custom_mobile_reason != '' }}" >
           <view class="error_box">
@@ -238,6 +248,7 @@
         upload_cell_note="查看示例"
         has_error_content="{{ license_cert_reason }}"
         wx:if="{{indentity}}"
+        is_multiple="true"
         />
 
         <m-upload-cell
@@ -255,6 +266,7 @@
         upload_cell_note="查看示例"
         has_error_content="{{ qualification_cert_reason }}"
         wx:if="{{indentity}}"
+        is_multiple="true"
          />
 
         <m-upload-cell
@@ -272,9 +284,15 @@
         upload_cell_note="查看示例"
         has_error_content="{{ work_cert_reason }}"
         wx:if="{{indentity}}"
+        is_multiple="true"
          />
         
         <view class="sub_button" wx:if="{{indentity}}">
-          <!-- <van-button color="#D3D3D3" disabled custom-style="border-radius: 20rpx;" type="primary" block>资料未填写完</van-button> -->
-          <van-button disabled="{{iden_auth_disabled}}" color="#3CC7C0" custom-style="border-radius: 20rpx;" type="primary" block bind:click="addDoctorAuthIden">{{iden_auth_status_txt}}</van-button>
-        </view>
\ No newline at end of file
+          <van-button data-from="doctorauthiden" disabled="{{iden_auth_disabled}}" color="#3CC7C0" custom-style="border-radius: 20rpx;" type="primary" block bind:click="addDoctorAuthIden">{{iden_auth_status_txt}}</van-button>
+        </view>
+        <view class="sub_button" wx:else>
+          <van-button color="#3CC7C0" data-from="myinfo" disabled="{{iden_auth_status == 2}}" custom-style="border-radius: 20rpx;" type="primary" block bind:click="addDoctorAuthIden">{{iden_auth_status_txt}}</van-button>
+        </view>
+
+
+        <van-toast id="van-toast" />
\ No newline at end of file
diff --git a/commpents/myprofile/index.wxss b/commpents/myprofile/index.wxss
index 70dd2b1..6a38235 100644
--- a/commpents/myprofile/index.wxss
+++ b/commpents/myprofile/index.wxss
@@ -1,6 +1,4 @@
-.required{
-  color: #e34d59;
-}
+
 .photo{
   position: relative;
   padding: 32rpx 32rpx 32rpx 0;
@@ -67,6 +65,9 @@
   margin: 20rpx 10rpx 20rpx 0;
   font-size: 28rpx;
 }
+.t-radio__icon--checked {
+  color: #49B9AD !important;
+}
 .t-tabs__item--active{
   color: #49B9AD !important;
 }
@@ -119,10 +120,6 @@
   height: 300rpx;
   background-color: cadetblue;
 }
-/* 自定义 vant required 小红点位置 */
-.van-cell--required::before {
-  left: 4.7rem !important;
-}
 .zhuanchang_box{
   display: flex;
   flex-wrap: wrap;
@@ -142,7 +139,6 @@
 }
 .zhuanchang_block {
   width: 100vw;
-  height: 240px;
   background: #fff;
   border-top-left-radius: 16rpx;
   border-top-right-radius: 16rpx;
@@ -220,4 +216,7 @@
 .van-search {
   top: -270px !important;
   position: relative !important;
+}
+.custom_keshi_error{
+  display: none;
 }
\ No newline at end of file
diff --git a/commpents/upload-cell/index.js b/commpents/upload-cell/index.js
index afdf91e..bc98b18 100644
--- a/commpents/upload-cell/index.js
+++ b/commpents/upload-cell/index.js
@@ -12,6 +12,10 @@ Component({
       type: Boolean,
       value: true,
     },
+    disabled: {
+      type: Boolean,
+      value: false,
+    },
     upload_cell_note: {
       type: String,
       value: '示例备注',
@@ -39,6 +43,10 @@ Component({
     max_count:{
       type: Number,
       value: 1
+    },
+    is_multiple:{
+      type: Boolean,
+      value: false,
     }
   },
 
diff --git a/commpents/upload-cell/index.wxml b/commpents/upload-cell/index.wxml
index a423d5c..2a90ff0 100644
--- a/commpents/upload-cell/index.wxml
+++ b/commpents/upload-cell/index.wxml
@@ -1,7 +1,7 @@
 <view class="upload-cell">
   <view class="upload-cell-top">
     <view class="upload-cell-name">{{ upload_cell_name }}<text wx:if="{{ required }}" class="required"> *</text></view>
-    <view class="upload-cell-note t-cell__note" bindtap="onshowNote">
+    <view class="upload-cell-note t-cell__note" bindtap="onshowNote" wx:if="{{upload_cell_note != ''}}">
       <view><t-icon name="{{ t_icon_name }}" size="{{ t_icon_size}}" data-name="{{ t_icon_name }}" /></view>
       <text>{{ upload_cell_note }}</text>
     </view>
@@ -10,7 +10,7 @@
     <text>{{ upload_cell_desc }}</text>
   </view>
   <view class="upload-cell-input">
-    <van-uploader preview-full-image="{{false}}" file-list="{{ fileList }}" max-count="{{max_count}}" deletable="{{ true }}" bind:after-read="afterRead" bind:delete="delete" >
+    <van-uploader disabled="{{disabled}}" multiple="{{is_multiple}}" preview-full-image="{{false}}" file-list="{{ fileList }}" max-count="{{max_count}}" deletable="{{ true }}" bind:after-read="afterRead" bind:delete="delete" >
       <van-image width="100" height="100" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/upload_button.png" />
     </van-uploader>
   </view>
diff --git a/commpents/wenzhen_data/index.js b/commpents/wenzhen_data/index.js
index 837b185..34528c0 100644
--- a/commpents/wenzhen_data/index.js
+++ b/commpents/wenzhen_data/index.js
@@ -1,3 +1,5 @@
+import { API } from "../../utils/network/api";
+const api = new API()
 // commpents/wenzhen_data/index.js
 Component({
   /**
@@ -87,6 +89,8 @@ Component({
       this.setData({
         show: false
       })
+
+      console.log("开始订阅消息");
       wx.requestSubscribeMessage({
         tmplIds: ['jhYUf91ULCTX_f69hazqAYwImdFf8ELasRAwB6X-MTM'],
         success (res) {
@@ -100,6 +104,24 @@ Component({
         }
       })
     },
+    postDoctorInquiry(e){
+      this.setData({
+        show: false
+      })
+      console.log("order_inquiry_id: ", e.currentTarget.dataset.order_inquiry_id);
+      let params = {};
+      params.order_inquiry_id = e.currentTarget.dataset.order_inquiry_id;
+      console.log("params: ",params)
+      api.postDoctorInquiry(params).then(response => {
+        console.log("开始接诊");
+        console.log(response);
+      }).then(() => {
+        this.goChat(e);
+      }).catch(errors => {
+        console.error(errors);
+      })
+
+    },
     tabShow(){
       this.setData({
         show: true
diff --git a/commpents/wenzhen_data/index.wxml b/commpents/wenzhen_data/index.wxml
index 753f406..1e4d7b3 100644
--- a/commpents/wenzhen_data/index.wxml
+++ b/commpents/wenzhen_data/index.wxml
@@ -14,7 +14,7 @@
       <van-button type="default" bindtap="tabShow" custom-style="width:200rpx;  border-radius: 10rpx;margin-left:20rpx;" color="#3CC7C0">去接诊</van-button>
     </view>
     <view class="btn" wx:if="{{ status >= 4 }}">
-      <van-button bind:click="goChat" data-from_account="{{from_account}}" data-url="/Pages/yishi/chat/index" plain custom-style="width:200rpx;  border-radius: 10rpx;" color="#3CC7C0">问诊详情</van-button>
+      <van-button bind:click="goChat" data-from_account="{{from_account}}" data-inquiry_type="{{inquiry_type}}" data-order_inquiry_id="{{order_inquiry_id}}" data-url="/Pages/yishi/chat/index" plain custom-style="width:200rpx;  border-radius: 10rpx;" color="#3CC7C0">问诊详情</van-button>
       <!-- <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>
@@ -27,7 +27,7 @@
     <view class="pop_note">为保障服务质量，请您查看患者病历信息在选择是否接诊。</view>
     <view class="pop_btn">
       <view class="pop_btn_left" bindtap="go" data-from_account="{{from_account}}" data-url="/Pages/yishi/case/index?order_inquiry_id={{order_inquiry_id}}" >去查看</view>
-      <view class="pop_btn_right" bindtap="goChat" data-from_account="{{from_account}}" data-inquiry_type="{{inquiry_type}}" data-order_inquiry_id="{{order_inquiry_id}}" data-url="/Pages/yishi/chat/index" >去接诊</view>
+      <view class="pop_btn_right" bindtap="postDoctorInquiry" data-from_account="{{from_account}}" data-inquiry_type="{{inquiry_type}}" data-order_inquiry_id="{{order_inquiry_id}}" data-url="/Pages/yishi/chat/index" >去接诊</view>
     </view>
   </view>
 </van-popup>
\ No newline at end of file
diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js
index 52db41a..e99326d 100644
--- a/custom-tab-bar/index.js
+++ b/custom-tab-bar/index.js
@@ -29,21 +29,21 @@ Component({
       "list2":[
         {
         "pagePath": "/Pages/yishi/index/index",
-        "text": "首页(Y)",
+        "text": "首页",
         "iconPath": "/static/images/yishi/tabbar_icon/index.png",
         "selectedIconPath": "/static/images/yishi/tabbar_icon/index_select.png",
         "info": ""
       },
       {
         "pagePath": "/Pages/yishi/wenzhen_v2/wenzhen",
-        "text": "问诊(Z)",
+        "text": "问诊",
         "iconPath": "/static/images/yishi/tabbar_icon/wenzhen.png",
         "selectedIconPath": "/static/images/yishi/tabbar_icon/wenzhen_select.png",
         "info": "99"
       },
       {
         "pagePath": "/Pages/yishi/my/index",
-        "text": "我的(Y)",
+        "text": "我的",
         "iconPath": "/static/images/yishi/tabbar_icon/my.png",
         "selectedIconPath": "/static/images/yishi/tabbar_icon/my_select.png",
         "info": ""
@@ -56,6 +56,7 @@ Component({
     index_info: "",
     wenzhen_info: "",
     my_info: "",
+    next_url: "/Pages/yishi/identity/index"
   },
   attached() {
     const usertype = wx.getStorageSync('usertype')
@@ -102,27 +103,45 @@ Component({
     // },
     onChange(e) {
       console.log("custom tab bar onChange");
-
-      let idcard_status = wx.getStorageSync('idcard_status');
-      let iden_auth_status = wx.getStorageSync('iden_auth_status');
+      let userID = wx.getStorageSync('user_id');
+      let idcard_status = wx.getStorageSync(userID+'_idcard_status');
+      let iden_auth_status = wx.getStorageSync(userID+'_iden_auth_status');
+      let multi_point_status = wx.getStorageSync(userID+'_multi_point_status');
+      let is_bind_bank = wx.getStorageSync(userID+'_is_bind_bank');
+      const usertype = wx.getStorageSync('usertype');
 
       console.log("idcard_status: ", idcard_status);
       console.log("iden_auth_status: ", iden_auth_status);
-      if(idcard_status != 1){
+      console.log("multi_point_status: ", iden_auth_status);
+      console.log("is_bind_bank: ", is_bind_bank);
+
+      if(idcard_status != 1 && usertype != 3){
         this.setData({
           dialog_visible: true,
-          dialog_content: "请您先实名认证"
+          dialog_content: "请您先实名认证",
+          next_url: "/Pages/yishi/identity/index",
         })
         return;
       }
-      if(iden_auth_status != 1){
+      console.log(111);
+      if(iden_auth_status != 1 && usertype != 3){
         this.setData({
           dialog_visible: true,
-          dialog_content: "请您先医师身份认证"
+          dialog_content: "请您先医师身份认证",
+          next_url: "/Pages/yishi/identity/index?selected_tab=1",
         })
         return;
       }
-      
+      console.log(222);
+      if(is_bind_bank != 1 && usertype != 3){
+        this.setData({
+          dialog_visible: true,
+          dialog_content: "请您先绑定结算银行卡",
+          next_url: "/Pages/yishi/bankcard/index"
+        })
+        return;
+      }
+      console.log(333);
       let url = this.data.items[e.detail].pagePath;
       console.log(url);
       wx.switchTab({
@@ -133,7 +152,9 @@ Component({
       this.setData({
         dialog_visible: false
       })
-      app.go("/Pages/yishi/identity/index");
+      console.log("next_url: ", this.data.next_url);
+      let next_url = this.data.next_url;
+      app.go(next_url);
     },
     cancelDialog(){
       this.setData({
diff --git a/static/images/123.png b/static/images/123.png
new file mode 100644
index 0000000000000000000000000000000000000000..028473ac6e69a07bf8ba0dff951a6ca53d606b84
GIT binary patch
literal 4362
zcmeI0d0dj&8pmNQYcjN%nyip)Q)^sD3v&U>7DY|Rr5x9^6ePtZcTusN^0uj0TvAhW
z1h-rRRNOFabQGaPCB>8)az$Lj9lbAe@4xr&@pC`-kN5Mw=bY#4=lMRr^FI37+6=Pi
z$Q}>~1VNc!wgZ8{xggLtq}|^DISfU%Jn#Ys+nJeyD%eVsKw<~x;<bw)P<4{rhUZQo
z{cWJRQ!oewOOQU`q|teA5NKZ>>heX02zSviBY6KLtRo02vw2wVwu{I593+|4Fk@&@
zuRiIcd+En6hmh3C)01`_TaL;PqoIx*TV3J_VkaS4jT?XRXiE)=M%!Ew=X}t4=~lki
zcZ8x|{^bEdGKY^_T)efo)atj$oQk5b>`~A_cjSyoM03!qC9LP?`7T~jd;-f*ErKxa
z-ZY*O93g3cRX&U!eMkk5|JH{I6gijod~t(D);BxNZuK`R`RS`C5#cW_18SDLY_GH4
zjb~Q)UZH<jo~miAi)e+DArsvRP3z?IG=!PG?sAmxKpFf=3PsHq>djP%Wc?Pzkqtp_
zWYToW7kgo4Ii+W*bn<cB1<XTB%Yx#xUJklvC(ycHK}8zYpAi8V7e2hki#v7B&#g!#
zVs93V_CIn@Oa?5ZIk>L}Mi&0O6}<i}3Fvk{RGB5B93tf1piJzL);u^7J=V#)x)`V?
zt-uo3!`P%*jPzT3*U-5uIqU-&n-<W0=DfHI9N8Ty@MFnT@I4Y__bJ?kV_2DQP=9C9
zT2@Vbf=CmD;WDW(<BjE!m{6HQZU<F@iC9T8k<d4IALRqDA`o}h$3H8>XkhzASLnXt
zO03NDd)sFc+hi^OSBBxDtzm^^9gGXwO!(S*pybF-f34nVmG_sLui-!66`OvVFyX(n
zLVcRh<7ahy9jGG~(dAr0{IC}d&UHtv79V`q&6fRp5A}B6h@Z&I;WG$+T_^y-R^vkB
z89^FNF}rpvY<-5GU~={*)Ev4WUyIkN{4Ga^P#0@IeO?u3HQlpthlOGky`AagwciX7
zr5@BL?EDi2-LGzTRYj?dOvVV~Bd-fSG$aIsFEJhM{uD2=(rlU5xv!lK;<Y+L7{ik4
z!6T8RXZ!a5UJ<f7xrU}&Qog%o4z0GJy9Yp+`J*=a>Asxith;yJ5(QaC-(TR>eGd@)
z5Ue*XT~k|&TNRVrCe(MAuVEUpn(7)!&t4UK&CGW>Lx#rBbmE(Xgl!`dw71qttYB(Q
zG?O$M5(+>aH`KG+RTe8KRUgl<tO?6j7h8PVTxck_*`<)3M%N%gO7(~EEID}-zH1Qq
z4;2;M+ym9X(Gc24PT8d`6g0YR;`NsRYlG0x3Lb$Y%U|+e_Nb#e;FtP0KCfMybr9)c
z<7d~Z!neNYcQ*quBRpS?1W{d#@;x8h^vAl<a@G$MGT8V>X$5paZOP{A`VkGX0tr%R
zE6=@(RR`i#7$ucXgg@u>idj6kO}#jY`X&_#Gd7MrIRyZplDe7#f9_r~bQ<TKb)`E)
z0@f?>B-Z3sn|P?6^W$*!mUeZMfVdIWz8RO<SA}wUH=yhqRayJ6z{W+Lk<Qn*d^c3=
z>zy@}sl6W0EMNUc;uFU10%R3c{8aMhV<RJYcD22HOn}3@0QPRomhBSbffXKJkDqB8
z91+5QDPjZXA~Gh<S+a*zj+s_4T=JZaHBc|x8rJs8EyH!s#~&9e9>*bW6W&+fwfJSL
zG7k<MgVzfU!|`aj3`+^qTsoi^Ug<?`6|G4J4iUa9aC#d(s7#D(pb*}?JK@HOY<$h#
z=p8*g>uhkwKVA1G2Y%Sih}pf|St%D7tupL0wsJz2e-cNGG#IGhvmI~i=E@6i1gqp!
zh>6rUJEZ%VMJ@Q&2nj>*?HYMJ+(9=(jx1(DINT=4OZZuJ!2`FUv3@JoFE;oN-}5>d
z(j1uX_}I?Iv?DKo9v3c1f84)ootxS;7cJld!JO5^Hs^hkQwzsM2K}_&aZJgCxDpaW
zaq6Sz%x>)v3NqJ}U8UuXb`I9&Oe~fX`#ij1R{_Hh6-}9Vnibq_UAUt*G8K>>bA-{$
z4P#y@Pm)b$Oiqh4>wP*L!#|iPBSPr&MNp>r9q|JY?X{H{J6D9tPYKo;Wf{1{T%J+v
zL{D298@aim*Vbj_ppTVlp7X*L)O`7#y+kA1s*oWott$%cjHmYUk}kd}FOEBC(o9a!
zTRU%um9Y+wwl&Z6*A`~4b<v0@=v%`ip^g@Fw2LE~*`7qH&$9dq-;0gEpvFkR*3(_{
zb{@m+^I2I%Sd|2XBhsiBUkZG0R-!-b0Za<QTNAb7>$0{5$AV~$BS((9GpgVJo+^@V
za*d6RIn=Q=Ae^9Ki+^2XOX(Yq9%$ejAB;JMJB4qc@cVz_Ew|ruF+o8)0l7uHaC<Sr
zTh#le4b4KO-EQgO9@VUbKLPym<X|z<J6%!HvIl_57IGus31g_dtlW1^d&Q>DY-vxY
zMGw0YS)iGL^)FJG{vjo;jhd1x^^_&+r}Z}q={d+MM-L0BBU&!)v6@`*TbAVDStrJ<
zc^(!Wj-3c+_s~!mzB$yYM5*i<=SHE@n<lBO)G_18_Tp=h#W<r<7fPxD;NqRxq9z`^
zQtj)b95AI6aB*a{p2rPo%W7e=-KBtwuf1j0{j4~5@c{bq8KY4#w`$M{<5+tF7jp~a
zdfH7W>Rwnw5C2LPKgtQpzZ!r&i+JHQf^pVAE;VQ=yE8y4x0&Ai{5m9CYVzOvh;!-(
zFp@WLSm)IdI99mdNCthqP4%xvtla%ZD*iLHD1jTW@;w^fi2%&bj?k=QPat5xJO%*d
z<yHi6ODCPRQBVhfME22VpZw*mTTk=ca$`cuYe~=4^M@3`FfC1li*n--!sqCN&187R
zuX<rD+h6u#1s3O-32{iLq4%^y+fJ=+3y0V?+Wr5l@wZ>7R2RcATRjU?!g9}Ge5E;5
zC-XCh)7si9y)FJb&7t+2tzCXh1rtj=jVxRYG!c!l1)Hm{&OFHt_y{N$!p4l^C0<--
zpTDNYhL~$D8O8?BKO@3Dbk8}O+0^#)b8ua2z&(=1Wj~TOlD}pQXr<MVxhf~j7uM1U
zAligcc|`!*05o%_Ur@pOSL(K2s!sWI-5aP3SI7=+UJ4Ze?C|GKrc=R10HC*68FK8{
z`%a0|QdTs;SW=-BYIq9QGTA&x0|1Mr*{8Jt_=F8hGWx}6Yyt^#-p#-eD)x!a3S}27
zmG!UZjo-_b4#z3$bIS1DMmW#Z;J#6jx+w|ryt~)}kUa1FH(Eq5Dt7-9m<bI<Y3i98
zTzlz18a<NuBd*2kPBPlkWgd;M^!FLNMvGmM5WwT)Le0`k_w<4P7a-IX>&q3U9{2wR
D0|s3T

literal 0
HcmV?d00001

diff --git a/utils/network/api.js b/utils/network/api.js
index 033c7a7..4111e8c 100644
--- a/utils/network/api.js
+++ b/utils/network/api.js
@@ -362,6 +362,38 @@ class API extends HTTP {
       ...params
     }
   })
+}
+ //获取处方详情
+ getDoctorPrescriptionInfo(params) {
+  return this.request({
+    url: `${this.baseUrl}/doctor/prescription/info`,
+    method: 'GET',
+    data: {
+      ...params
+    }
+  })
+}
+ //修改处方
+ putDoctorPrescription(params) {
+  return this.request({
+    url: `${this.baseUrl}/doctor/prescription`,
+    method: 'PUT',
+    contentType: 'application/json',
+    data: {
+      ...params
+    }
+  })
+}
+ //新增处方
+ postDoctorPrescription(params) {
+  return this.request({
+    url: `${this.baseUrl}/doctor/prescription`,
+    method: 'POST',
+    contentType: 'application/json',
+    data: {
+      ...params
+    }
+  })
 }
  //获取操作手册列表
  getBasicOperationManual(params) {
@@ -458,7 +490,17 @@ class API extends HTTP {
  //获取患者问诊病例
  getDoctorInquiryCase(params) {
   return this.request({
-    url: `${this.baseUrl}/doctor/inquiry/case`,
+    url: `${this.baseUrl}/case`,
+    method: 'GET',
+    data: {
+      ...params
+    }
+  })
+}
+ //获取患者问诊病例
+ getCase(params) {
+  return this.request({
+    url: `${this.baseUrl}/case`,
     method: 'GET',
     data: {
       ...params
@@ -474,6 +516,94 @@ class API extends HTTP {
       ...params
     }
   })
+}
+ //药师基本资料
+ getPharmacistInfo(params) {
+  return this.request({
+    url: `${this.baseUrl}/pharmacist/info`,
+    method: 'GET',
+    data: {
+      ...params
+    }
+  })
+}
+ //药师端-首页
+ getPharmacistIndex(params) {
+  return this.request({
+    url: `${this.baseUrl}/pharmacist/index`,
+    method: 'GET',
+    data: {
+      ...params
+    }
+  })
+}
+ //获取药师审核处方列表
+ getPharmacistPrescription(params) {
+  return this.request({
+    url: `${this.baseUrl}/pharmacist/prescription`,
+    method: 'GET',
+    data: {
+      ...params
+    }
+  })
+}
+ //获取处方详情
+ getPharmacistPrescriptioninfo(params) {
+  let order_prescription_id = params.order_prescription_id;
+  params = {}
+  return this.request({
+    url: `${this.baseUrl}/pharmacist/prescription/info/`+order_prescription_id,
+    method: 'GET',
+    data: {
+      ...params
+    }
+  })
+}
+ //设置上下线 药师端
+ putPharmacistOnOff(params) {
+  return this.request({
+    url: `${this.baseUrl}/pharmacist/on-off`,
+    method: 'PUT',
+    data: {
+      ...params
+    }
+  })
+}
+ //药师基本资料
+ getPharmacistInfo(params) {
+  return this.request({
+    url: `${this.baseUrl}/pharmacist/info`,
+    method: 'GET',
+    data: {
+      ...params
+    }
+  })
+}
+ //审核处方
+ putPharmacistPrescriptionVerify(params) {
+  let order_prescription_id = params.order_prescription_id;
+  delete params['order_prescription_id']; 
+  return this.request({
+    url: `${this.baseUrl}/pharmacist/prescription/verify/`+order_prescription_id,
+    method: 'PUT',
+    data: {
+      ...params
+    }
+  })
+}
+ //医生接诊
+ postDoctorInquiry(params) {
+   console.log("params from api: ", params);
+   let order_inquiry_id = params.order_inquiry_id;
+   console.log("order_inquiry_id: ", order_inquiry_id);
+  delete params['order_inquiry_id']; 
+  return this.request({
+    url: `${this.baseUrl}/doctor/inquiry/`+order_inquiry_id,
+    method: 'POST',
+    data: {
+      ...params
+    }
+  })
 }
 }
 
diff --git a/utils/network/request.js b/utils/network/request.js
index e0c1d2d..cf4b2c1 100644
--- a/utils/network/request.js
+++ b/utils/network/request.js
@@ -1,5 +1,5 @@
 const env = require('./config').dev
-
+const app = getApp()
 class HTTP {
   constructor() {
     this.baseUrl = env.baseUrl,
@@ -21,6 +21,7 @@ class HTTP {
 
   _request(url, resolve, reject, data = {}, method = 'GET', contentType = 'application/x-www-form-urlencoded', showLoading = true) {
     if(showLoading) wx.showLoading();
+    let usertype =  wx.getStorageSync('usertype');
     wx.request({
       url: url,
       method: method,
@@ -28,13 +29,13 @@ class HTTP {
       header: {
         'content-type': contentType,
         'appId': this.appId,
-        'Authorization': "Bearer " + wx.getStorageSync('AUTH_TOKEN')
+        'Authorization': "Bearer " + wx.getStorageSync('AUTH_TOKEN_'+usertype)
       },
       success: (res) => {
         console.log("header Authorization: ", res.header.Authorization);
         var Authorization_token = res.header.Authorization;
         if(Authorization_token){
-          wx.setStorageSync('AUTH_TOKEN', Authorization_token);//当token快过期时，服务器会返回新token，本地刷新
+          wx.setStorageSync('AUTH_TOKEN_'+usertype, Authorization_token);//当token快过期时，服务器会返回新token，本地刷新
         }
         if (res.data) {
             const code = res.data.code;
@@ -42,33 +43,38 @@ class HTTP {
               resolve(res.data)
             } else if(code == 401 || code == 403 || code == 405 || code == 406){
               wx.navigateTo({
-                url: "/Pages/index/index"
+                url: app.globalData.login_url
               })
             } else {
               reject(res.data.message)
-              this._show_error(res.data.message)
+              this._show_error(showLoading, res.data.message)
             }
         } else {
-            resolve(res.data)
+          reject(res.data)
+          this._show_error(showLoading, err.data.message)
         }
       },
       fail: (err) => {
           reject()
-          this._show_error(err.data.message)
+          this._show_error(showLoading, err.data.message)
       },
-      complete: () => {
-        if(showLoading) wx.hideLoading();
+      complete: (res) => {
+        console.log("res from cmplete： ",res)
+        const code = res.data.code;
+        if (code == 200) {
+          if(showLoading) wx.hideLoading();
+        }
       }
     })
   }
 
-  _show_error(_message) {
+  _show_error(showLoading, _message) {
+    if(showLoading) wx.hideLoading();
     wx.showToast({
       title: `${_message}`,
       icon: 'none',
       duration: 2000
     })
-
   }
 }
 

From 12e4984a95f8b53ab06d354a06ea9c4a74f80319 Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Thu, 23 Mar 2023 15:52:15 +0800
Subject: [PATCH 10/83] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/login/index.wxml                        |   2 +-
 Pages/login/index.wxss                        |   2 +-
 Pages/mobile_login/index.wxml                 |   2 +
 Pages/yishi/bindcard/index.js                 |  17 +++
 Pages/yishi/bindcard/index.json               |   1 +
 Pages/yishi/bindcard/index.wxml               |   5 +-
 Pages/yishi/bindcard/index.wxss               |  14 ++
 Pages/yishi/identity/index.js                 |   2 +-
 Pages/yishi/identity/index.wxml               |   1 +
 Pages/yishi/identity/index.wxss               |   8 +-
 Pages/yishi/index/index.js                    | 120 ++++++++++++------
 Pages/yishi/index/index.json                  |   3 +-
 Pages/yishi/index/index.wxml                  |  60 ++++++---
 Pages/yishi/index/index.wxss                  |   4 +
 Pages/yishi/kuaisusetup/index.js              |  45 +++----
 Pages/yishi/my/index.js                       |  12 +-
 Pages/yishi/my/index.wxml                     |  12 +-
 Pages/yishi/my/index.wxss                     |   4 +-
 Pages/yishi/myinfo/index.js                   |  34 ++++-
 Pages/yishi/myinfo/index.json                 |   2 +-
 Pages/yishi/myinfo/index.wxml                 |  22 +++-
 Pages/yishi/myinfo/index.wxss                 |  14 ++
 Pages/yishi/myprofile/index.js                |   2 +-
 Pages/yishi/myprofile/index.wxss              |  15 +++
 Pages/yishi/onlinechufang/index.wxml          |   6 +
 Pages/yishi/onlinesetup/index.js              |  81 +++++++++---
 Pages/yishi/onlinesetup/index.wxml            |   4 +-
 Pages/yishi/quickreply/index.js               |  79 ++++++++++--
 Pages/yishi/quickreply/index.json             |   4 +-
 Pages/yishi/quickreply/index.wxml             |  31 ++++-
 Pages/yishi/quickreply/index.wxss             |   9 ++
 Pages/yishi/wenzhen_v2/wenzhen.js             |   4 +-
 Pages/yishi/yizhensetup/index.js              |  32 ++++-
 Pages/yishi/yizhensetup/index.wxml            |   2 +-
 Pages/yishi/yizhensetup/index.wxss            |   6 +-
 Pages/yishi/zhiye_identity/index.wxml         |   2 +-
 .../MessageElements/TextMessage/index.wxss    |   8 +-
 .../TUIChat/components/MessageInput/index.js  |  22 ++++
 .../components/MessageInput/index.wxml        |   3 +-
 TUIKit/static/assets/ic_back_black.svg        |  12 ++
 app.js                                        |   7 +-
 commpents/mynavbar/index.wxml                 |   2 +-
 commpents/mynavbar/index.wxss                 |   2 +-
 commpents/myprofile/index.js                  |  52 ++++++--
 commpents/myprofile/index.wxml                |  34 +++--
 commpents/myprofile/index.wxss                |   2 +-
 commpents/te_navbar/index.wxml                |  15 ++-
 commpents/te_navbar/index.wxss                |   3 +
 commpents/textarea-cell/index.js              |   4 +
 commpents/textarea-cell/index.wxml            |   2 +-
 custom-tab-bar/index.wxml                     |   2 +-
 utils/network/api.js                          |  12 ++
 utils/network/request.js                      |   9 +-
 53 files changed, 661 insertions(+), 193 deletions(-)
 create mode 100644 TUIKit/static/assets/ic_back_black.svg

diff --git a/Pages/login/index.wxml b/Pages/login/index.wxml
index 625cfb6..71911e1 100644
--- a/Pages/login/index.wxml
+++ b/Pages/login/index.wxml
@@ -1,6 +1,6 @@
 <view class="container">
   <view class="tui-navigatorbar">
-    <image wx:if="{{ navbarData.showCapsule==1 }}" class="tui-navigatorbar-back" bindtap="_navback" src="../../TUIKit/static/assets/ic_back_white.svg" />
+    <image wx:if="{{ navbarData.showCapsule==1 }}" class="tui-navigatorbar-back" bindtap="_navback" src="../../TUIKit/static/assets/ic_back_black.svg" />
     <view class="conversation-title">{{ navbarData.title }}</view>
   </view>
   <view class="box">
diff --git a/Pages/login/index.wxss b/Pages/login/index.wxss
index c1bbc34..3a3756a 100644
--- a/Pages/login/index.wxss
+++ b/Pages/login/index.wxss
@@ -7,7 +7,7 @@
   top: 0;
   width: 750rpx;
   height: 170rpx;
-  background-color: #69d85f;
+  background-color: #ffffff;
   z-index: 99;
 }
 .tui-navigatorbar-back{
diff --git a/Pages/mobile_login/index.wxml b/Pages/mobile_login/index.wxml
index 3dfcddc..12c0ed4 100644
--- a/Pages/mobile_login/index.wxml
+++ b/Pages/mobile_login/index.wxml
@@ -7,12 +7,14 @@
         model:value="{{ phone }}"
         label="+86"
         placeholder="请输入手机号"
+        type="number"
         input-align="left"
       />
       <van-field
         model:value="{{ sms }}"
         center
         clearable
+        type="number"
         label="短信验证码"
         placeholder="请输入短信验证码"
         use-button-slot
diff --git a/Pages/yishi/bindcard/index.js b/Pages/yishi/bindcard/index.js
index 21828c2..88d3f4c 100644
--- a/Pages/yishi/bindcard/index.js
+++ b/Pages/yishi/bindcard/index.js
@@ -81,6 +81,13 @@ Page({
   },
   onBankShow(e) {
     console.log("onBankShow");
+    if(this.data.select_county_id == ""){
+      wx.showToast({
+        title: '请选择城市',
+        icon: "error"
+      })
+      return;
+    }
     this.setData({ bank_show: true });
   },
   onBankClose(e) {
@@ -200,6 +207,8 @@ Page({
   },
   addBank(e){
     console.log("addbank, ", e);
+
+    
     //绑定医生银行卡
     let params = {};
     params.county_id = this.data.select_county_id;
@@ -207,6 +216,14 @@ Page({
     params.province_id = this.data.select_province_id;
     params.bank_card_code = this.data.bankcard;
     params.bank_id = this.data.select_bank_id;
+    console.log("params.county_id: ", params.county_id)
+    if(params.county_id == ""){
+      wx.showToast({
+        title: '请选择城市',
+        icon: "error"
+      })
+      return;
+    }
     console.log(params);
     let bank_card_id = this.data.bank_card_id;
     if(bank_card_id){
diff --git a/Pages/yishi/bindcard/index.json b/Pages/yishi/bindcard/index.json
index aaf5106..99aed26 100644
--- a/Pages/yishi/bindcard/index.json
+++ b/Pages/yishi/bindcard/index.json
@@ -9,6 +9,7 @@
     "van-popup": "@vant/weapp/popup/index",
     "van-picker": "@vant/weapp/picker/index",
     "van-toast": "@vant/weapp/toast/index",
+    "van-image": "@vant/weapp/image/index",
     "t-cascader": "tdesign-miniprogram/cascader/cascader"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/bindcard/index.wxml b/Pages/yishi/bindcard/index.wxml
index 4d4a855..cd01bc2 100644
--- a/Pages/yishi/bindcard/index.wxml
+++ b/Pages/yishi/bindcard/index.wxml
@@ -2,7 +2,8 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
   <view class="top_note">
-    请确定开户人姓名与账户医生的姓名一致
+    <van-image style="display: flex;align-items: center;margin-right: 10rpx;" src="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/bell.png" fit="widthFix" width="45rpx" aria-label="qrcode" />
+    <text>请确定开户人姓名与账户医生的姓名一致</text>
   </view>
   <view class="info">
     <van-cell-group>
@@ -19,6 +20,8 @@
         placeholder="请输入卡号"
         model:value="{{ bankcard }}"
         input-align="right"
+        type="number"
+        clearable
         placeholder-style="font-size: 16px;"
       >
       <text slot="label" style="font-size: 30rpx;">银行卡号</text>
diff --git a/Pages/yishi/bindcard/index.wxss b/Pages/yishi/bindcard/index.wxss
index f979002..50c7748 100644
--- a/Pages/yishi/bindcard/index.wxss
+++ b/Pages/yishi/bindcard/index.wxss
@@ -10,6 +10,8 @@
   color: #3CC7C0;
   background-color: #F0FFFB;
   font-size: 30rpx;
+  display: flex;
+  align-items: center;
 }
 .bankcard{
   margin-top: 20rpx;
@@ -20,4 +22,16 @@
   width: 92vw;
   margin: 50rpx auto;
   line-height: 50rpx;
+}
+.t-tabs__item--active{
+  color: #49B9AD !important;
+}
+.t-tabs__track{
+  background-color: #49B9AD !important;
+}
+.t-icon-check{
+  color: #49B9AD !important;
+}
+.van-picker__confirm{
+  color: #3cc7c0 !important;
 }
\ No newline at end of file
diff --git a/Pages/yishi/identity/index.js b/Pages/yishi/identity/index.js
index 542115a..6154f39 100644
--- a/Pages/yishi/identity/index.js
+++ b/Pages/yishi/identity/index.js
@@ -15,7 +15,7 @@ Page({
     height: app.globalData.height,  
     //选项卡
     stickyProps: {
-      zIndex: 999999,
+      zIndex: 9,
       offsetTop: (app.globalData.height * 2)
     },
     selected_tab: 0,
diff --git a/Pages/yishi/identity/index.wxml b/Pages/yishi/identity/index.wxml
index 3784610..8b0f92e 100644
--- a/Pages/yishi/identity/index.wxml
+++ b/Pages/yishi/identity/index.wxml
@@ -26,6 +26,7 @@
             placeholder-style="font-size:28rpx; color: #C5C8CB;"
             input-align="right"
             clearable
+            type="text"
             custom-style="font-size:30rpx;"
             disabled="{{next_btn_disabled}}"
           >
diff --git a/Pages/yishi/identity/index.wxss b/Pages/yishi/identity/index.wxss
index a97e304..6d9a117 100644
--- a/Pages/yishi/identity/index.wxss
+++ b/Pages/yishi/identity/index.wxss
@@ -61,7 +61,10 @@
   color: #49B9AD !important;
 }
 .t-tabs__track{
-  background-color: var(--td-tab-track-color, var(--td-primary-color, #49B9AD)) !important;
+  background-color: #49B9AD !important;
+}
+.t-icon-check{
+  color: #49B9AD !important;
 }
 .t-cell__note {
   font-size: 25rpx !important;
@@ -171,4 +174,7 @@
 .van-search {
   top: -270px !important;
   position: relative !important;
+}
+.van-picker__confirm{
+  color: #3cc7c0 !important;
 }
\ No newline at end of file
diff --git a/Pages/yishi/index/index.js b/Pages/yishi/index/index.js
index 7613934..db5a047 100644
--- a/Pages/yishi/index/index.js
+++ b/Pages/yishi/index/index.js
@@ -8,7 +8,7 @@ Page({
     navHeight: 0,
     stateHeight: 0,
     info:{
-      user_name: "xxx",
+      user_name: "医师姓名",
       not_accepted_inquiry_num: 0,
       accepting_inquiry_num: 0,
       info_shiming_status_txt: "未认证",
@@ -76,16 +76,23 @@ Page({
       {
         case_status: 4,
         case_module: [7],
-        case_text: "请您先进行多点执业认证证"
+        case_text: "请您先多点执业认证"
       },
       {
         case_status: 5,
         case_module: [],
         case_text: "已全部通过"
       },
+      {
+        case_status: 6,
+        case_module: [7],
+        case_text: "请您先多点执业认证"
+      },
     ],
     skeleton_loading: true,
-    contactKeFu: false
+    contactKeFu: false,
+    jiesuan_dialog_show: false,
+    jiesuan_dialog_visible: false
   },
   //  获取状态栏信息
   getMenuButtonBound() {
@@ -106,7 +113,16 @@ Page({
       stateHeight: stateHeight + top, //  状态栏高度
     });
   },
-
+  confirmJieSuanDialog(){
+    this.setData({
+      jiesuan_dialog_visible: false
+    })
+  },
+  cancelJieSuanDialog(){
+    this.setData({
+      jiesuan_dialog_visible: false
+    })
+  },
   onLoad(){
     
   },
@@ -229,6 +245,7 @@ Page({
   },
   go(e){
     let checkDialog = this.checkDialog(e);
+    console.log("checkDialog: ", checkDialog);
     if(checkDialog){
       let url = e.currentTarget.dataset.url;
       console.log(url);
@@ -343,7 +360,7 @@ Page({
         "info.info_shiming_status_txt": "审核中",
         "info.info_shiming_status": "info_shiming_status_yes",
         shiming_status_url: "/Pages/yishi/identity/index?selected_tab=1",
-        dialog_content: "您的医师身份认证正在审核中",
+        // dialog_content: "您的医师身份认证正在审核中",
         // default_dialog_show: true
       });
       return false;
@@ -385,7 +402,7 @@ Page({
     if(multi_point_status == 0){
       if(!this.data.default_dialog_show){
         this.setData({
-          dialog_visible: true,
+          // dialog_visible: true,
         });
       }
       this.setData({
@@ -400,7 +417,7 @@ Page({
     if(multi_point_status == 2){
       if(!this.data.default_dialog_show){
         this.setData({
-          dialog_visible: true,
+          // dialog_visible: true,
       });
     }
     this.setData({
@@ -415,7 +432,7 @@ Page({
     if(multi_point_status == 3){
       if(!this.data.default_dialog_show){
         this.setData({
-          dialog_visible: true,
+          // dialog_visible: true,
       });
       }
       this.setData({
@@ -445,6 +462,14 @@ Page({
       })
       return false;
     }
+
+    if(!app.globalData.jiesuan_dialog_show){
+      this.setData({
+        jiesuan_dialog_visible: true,
+      });
+      app.globalData.jiesuan_dialog_show = true
+    }
+
     this.setData({
       "info.info_shiming_status_txt": "去接诊",
       shiming_status_url: "/Pages/yishi/wenzhen_v2/wenzhen",
@@ -482,8 +507,8 @@ Page({
     let is_bind_bank = this.data.info.is_bind_bank;
     //是否参加专家图文接诊（0:否 1:是）
     let is_img_expert_reception = this.data.info.is_img_expert_reception;
-    let status = 0;
-
+    let statusArr = [];
+    
     // 未实名认证和医师身份认证 0
     // 已实名认证，未医师身份认证 1
     // 已实名认证和医师身份认证，未绑定结算银行卡 2
@@ -491,41 +516,52 @@ Page({
     // 已实名认证和医师身份认证且绑定结算银行卡，开通了在线问诊，未开通多点执业认证 4
     // 已实名认证和医师身份认证且绑定结算银行卡，开通了在线问诊，已开通多点执业认证 5
     if(idcard_status == 0 && iden_auth_status == 0){
-      status = 0;
-    }else if(idcard_status == 1 && iden_auth_status != 1){
-      status = 1;
-    }else if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank != 1){
-      status = 2;
-    }else if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank == 1 && is_img_expert_reception != 1){
-      status = 3;
-    }else if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank == 1 && is_img_expert_reception == 1 && multi_point_status != 1){
-      status = 4;
-    }else{
-      status = 5;
+      statusArr.push(0);
+    }
+    if(idcard_status == 1 && iden_auth_status != 1){
+      statusArr.push(1);
+    }
+    if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank != 1){
+      statusArr.push(2);
+    }
+    if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank == 1 && is_img_expert_reception != 1){
+      statusArr.push(3);
+    }
+    if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank == 1 && is_img_expert_reception == 1 && multi_point_status != 1){
+      statusArr.push(4);
+    }
+    if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank == 1 && is_img_expert_reception == 1 && multi_point_status == 1){
+      statusArr.push(5);
+    }
+    if(idcard_status == 1 && iden_auth_status == 1 && multi_point_status != 1){
+      statusArr.push(6);
     }
 
-    let now_case = this.data.mycase.find(item => {
-      return item.case_status == status;
-    });
-
-    console.log("now_case: ", now_case);
-    //所属模块
-    let moudle = e.currentTarget.dataset.moudle;
-    console.log("moudle: ", moudle);
-    if(now_case){
-      let now_moudle = now_case.case_module.find(item => {
-        return item == moudle;
-      })
-      console.log("now_moudle: ", now_moudle);
-      if(now_moudle != undefined){
-        this.setData({
-          dialog_content: now_case.case_text,
-          dialog_visible: true
-        });
-        return false;
+    let retult = true;
+    statusArr.forEach(status => {
+      let now_case = this.data.mycase.find(item => {
+        return item.case_status == status;
+      });
+      console.log("now_case: ", now_case);
+      //所属模块
+      let moudle = e.currentTarget.dataset.moudle;
+      console.log("moudle: ", moudle);
+      if(now_case){
+        let now_moudle = now_case.case_module.find(item => {
+          return item == moudle;
+        })
+        console.log("now_moudle: ", now_moudle);
+        if(now_moudle != undefined){
+          this.setData({
+            dialog_content: now_case.case_text,
+            dialog_visible: true
+          });
+          retult = false;
+          return;
+        }
       }
-    }
+    })
 
-    return true;
+    return retult;
   }
 })
\ No newline at end of file
diff --git a/Pages/yishi/index/index.json b/Pages/yishi/index/index.json
index 2408ea5..73081fe 100644
--- a/Pages/yishi/index/index.json
+++ b/Pages/yishi/index/index.json
@@ -6,6 +6,7 @@
     "van-dialog": "@vant/weapp/dialog/index",
     "t-swiper": "tdesign-miniprogram/swiper/swiper",
     "t-badge": "tdesign-miniprogram/badge/badge",
-    "t-dialog": "tdesign-miniprogram/dialog/dialog"
+    "t-dialog": "tdesign-miniprogram/dialog/dialog",
+    "van-image": "@vant/weapp/image/index"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/index/index.wxml b/Pages/yishi/index/index.wxml
index 82147a0..4edc999 100644
--- a/Pages/yishi/index/index.wxml
+++ b/Pages/yishi/index/index.wxml
@@ -22,8 +22,8 @@
         </view>
       </view>
       <view class="info_wenzhen">
-        <view class="info_wenzhen_new" bindtap="go" data-moudle="0">新问诊：{{info.not_accepted_inquiry_num}}</view>
-        <view class="info_wenzhen_ing" bindtap="go" data-moudle="1">接诊中：{{info.accepting_inquiry_num}}</view>
+        <view class="info_wenzhen_new" bindtap="go" data-url="/Pages/yishi/wenzhen_v2/wenzhen" data-moudle="0">新问诊：{{info.not_accepted_inquiry_num}}</view>
+        <view class="info_wenzhen_ing" bindtap="go" data-url="/Pages/yishi/wenzhen_v2/wenzhen" data-moudle="1">接诊中：{{info.accepting_inquiry_num}}</view>
       </view>
     </view>
     <view class="info_note" wx:if="{{info.show_info_note}}">
@@ -50,8 +50,8 @@
         </view>
       </view>
       <view class="renzheng_content_right">
-        <image class="renzheng_content_right_img"
-          mode="widthFix"
+        <van-image class="renzheng_content_right_img" width="100%" 
+          fit="widthFix"
           src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/yishirenzheng.png"
         />
       </view>
@@ -67,8 +67,8 @@
         </view>
       </view>
       <view class="renzheng_content_right">
-        <image class="renzheng_content_right_img"
-          mode="widthFix"
+        <van-image class="renzheng_content_right_img" width="100%" 
+          fit="widthFix"
           src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/zhiyerenzheng.png"
         />
       </view>
@@ -91,38 +91,41 @@
   <!-- 功能模块 -->
   <view class="fun_box">
     <view bindtap="go" data-moudle="3" data-url="/Pages/yishi/myprofile/index" class="fun_box_item">
-      <image class="fun_box_item_img"
-          mode="widthFix"
-          width="70rpx"
-          custom-style="width: 70rpx;"
+      <van-image class="fun_box_item_img"
+          fit="heightFix"
+          height="70rpx"
           src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/jianjie.png"
         />
       <text class="fun_box_item_txt">简介管理</text>
     </view>
     <view bindtap="go" data-moudle="4" data-url="/Pages/yishi/onlinesetup/index" class="fun_box_item">
-      <image class="fun_box_item_img"
-          mode="widthFix"
+      <van-image class="fun_box_item_img"
+      fit="widthFix"
+      width="70rpx"
           src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/zaixian.png"
         />
       <text class="fun_box_item_txt">在线问诊管理</text>
     </view>
     <view bindtap="go" data-moudle="5" data-url="/Pages/yishi/kuaisusetup/index" class="fun_box_item">
-      <image class="fun_box_item_img"
-          mode="widthFix"
+      <van-image class="fun_box_item_img"
+      fit="widthFix"
+      width="70rpx"
           src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/kuaisu.png"
         />
       <text class="fun_box_item_txt">快速问诊管理</text>
     </view>
     <view bindtap="go" data-moudle="6" data-url="/Pages/yishi/yizhensetup/index" class="fun_box_item">
-      <image class="fun_box_item_img"
-          mode="widthFix"
+      <van-image class="fun_box_item_img"
+      fit="widthFix"
+      width="70rpx"
           src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/yizhen.png"
         />
       <text class="fun_box_item_txt">公益问诊管理</text>
     </view>
     <view bindtap="go" data-moudle="7" data-url="/Pages/yishi/chufangsetup/index" class="fun_box_item">
-      <image class="fun_box_item_img"
-          mode="widthFix"
+      <van-image class="fun_box_item_img"
+      fit="widthFix"
+      width="70rpx"
           src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/chufang.png"
         />
       <view class="fun_box_item_txt">
@@ -130,8 +133,9 @@
       </view>
     </view>
     <view class="fun_box_item" data-moudle="8" bindtap="contactKeFu">
-      <image class="fun_box_item_img"
-          mode="widthFix"
+      <van-image class="fun_box_item_img"
+          fit="widthFix"
+          width="70rpx"
           src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/kefu.png"
         />
       <text class="fun_box_item_txt">联系客服</text>
@@ -140,6 +144,7 @@
   <view style="width: 100%;height: 55px;">
     <!-- 处理底部tabbar遮挡 50px -->
   </view>
+
   <t-dialog
     visible="{{ dialog_visible }}"
     title="温馨提示"
@@ -152,6 +157,21 @@
     确定
   </view>
   </t-dialog>
+
+  <t-dialog
+    visible="{{ jiesuan_dialog_visible }}"
+    title="温馨提示"
+    content="您是否了解费用结算规则？"
+  >
+  <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="cancelJieSuanDialog">
+    已了解
+  </view>
+  <view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="confirmJieSuanDialog">
+    不了解
+  </view>
+  </t-dialog>
+
+
   <van-dialog
     title="立即联系客服"
     show="{{ contactKeFu }}"
diff --git a/Pages/yishi/index/index.wxss b/Pages/yishi/index/index.wxss
index 3dd9d85..e4ab867 100644
--- a/Pages/yishi/index/index.wxss
+++ b/Pages/yishi/index/index.wxss
@@ -190,11 +190,15 @@
 }
 .fun_box_item_img{
   flex: 1;
+  display: flex;
+  justify-content: center;
 }
 .fun_box_item_txt{
   flex: 2;
   font-size: 30rpx;
   color: #333333;
+  height: 70rpx;
+  line-height: 70rpx;
 }
 .t-class-cancel{
   color: #3CC7C0 !important;
diff --git a/Pages/yishi/kuaisusetup/index.js b/Pages/yishi/kuaisusetup/index.js
index 2a2dd6c..898de51 100644
--- a/Pages/yishi/kuaisusetup/index.js
+++ b/Pages/yishi/kuaisusetup/index.js
@@ -36,7 +36,7 @@ Page({
   },
 
   onLoad(){
-    this.setData({ note: this.data.open_note });
+  
   },
   onShow(){
     let params = {};
@@ -49,6 +49,15 @@ Page({
         info: response.data.info,
         config: response.data.config,
       })
+    }).then(re => {
+      let is_open = this.data.info.is_open;
+      let note = this.data.note;
+      if(is_open == 1) note = this.data.open_note;
+      if(is_open == 0) note = this.data.close_note;
+      this.setData({
+        note: note
+      })
+
     }).catch(errors => {console.error(errors);})
   },
   onChange({ detail }) {
@@ -67,6 +76,15 @@ Page({
      params.is_open = detail?1:0;
      api.putDoctorInquiryOpen(params).then(response => {
       console.log(response);
+    }).then(()=>{
+      if(detail){
+        wx.requestSubscribeMessage({
+          tmplIds: ['G1RIs0RYqsTQ2CuPQWalIGVet9sd_d371YtDVhfBsFg'],
+          success (res) {
+            console.log(res);//同意授权
+          }
+        })
+      }
     }).catch(errors => {console.error(errors);})
 
   },
@@ -75,29 +93,6 @@ Page({
       url: "/Pages/yishi/wenzhen_v2/wenzhen"
     })
   },
-  onStepperChange(event) {
-    console.log(event.detail);
-    this.setData({ 
-      "info.work_num_day": event.detail 
-    });
-  },
-  onPriceChange(e){
-    console.log(e.detail);
-    let value = e.detail.value;
-    let min = this.data.config.min_inquiry_price;
-    let max = this.data.config.max_inquiry_price;
-    if(value < min){
-      value = min;
-      Toast.fail('价格不能低于' + min + '元');
-    }else if(value >= min && value <=max ){
-      value = value;
-    }else{
-      value = max;
-      Toast.fail('价格不能高于' + max + '元');
-    }
-    this.setData({
-      "info.inquiry_price": value
-    })
-  }
+ 
 
 })
\ No newline at end of file
diff --git a/Pages/yishi/my/index.js b/Pages/yishi/my/index.js
index c683bad..da2eba8 100644
--- a/Pages/yishi/my/index.js
+++ b/Pages/yishi/my/index.js
@@ -6,13 +6,13 @@ Page({
     title: "个人中心",
     navHeight: 0,
     stateHeight: 0,
-    user_name: "",
-    iden_auth_status: "",
-    idcard_status: "",
-    multi_point_status: "",
+    user_name: "医师姓名",
+    iden_auth_status: "0",
+    idcard_status: "0",
+    multi_point_status: "0",
     avatar: "https://img.applets.igandanyiyuan.com/applet/doctor/static/images/default_photo.png",
-    balance_account: "",
-    estimate_income: "",
+    balance_account: "0",
+    estimate_income: "0",
     doctor_id: ""
   },
 
diff --git a/Pages/yishi/my/index.wxml b/Pages/yishi/my/index.wxml
index dc34f43..6303acb 100644
--- a/Pages/yishi/my/index.wxml
+++ b/Pages/yishi/my/index.wxml
@@ -1,19 +1,19 @@
 <view class="container">
   <view class="top"></view>
   <view class="title" style="top: {{stateHeight}}px;height: {{navHeight}}px;line-height: {{navHeight}}px;">{{ title }}</view>
-  <view bindtap="go" data-url="/Pages/yishi/myinfo/index" class="info_box" style="top: {{stateHeight}}px;">
+  <view class="info_box" style="top: {{stateHeight}}px;">
     <!-- 跳转我的信息 -->
-    <view class="photo">
+    <view class="photo" bindtap="go" data-url="/Pages/yishi/myinfo/index">
       <t-avatar class="avatar" size="large" image="{{avatar}}" />
     </view>
     <view class="info">
-      <view class="name">{{user_name}}</view>
+      <view class="name" bindtap="go" data-url="/Pages/yishi/myinfo/index">{{user_name}}</view>
       <view class="renzheng">
-        <view class="yishi">{{iden_auth_status==1?'已医师认证':'未医师认证'}}></view>
-        <view class="zhiye">{{multi_point_status==1?'已多点执业认证':'未多点执业认证'}}></view>
+        <view class="yishi" bindtap="go" data-url="/Pages/yishi/identity/index">{{iden_auth_status==1?'已医师认证':'未医师认证'}}></view>
+        <view class="zhiye" bindtap="go" data-url="/Pages/yishi/zhiye_identity/index">{{multi_point_status==1?'已多点执业认证':'未多点执业认证'}}></view>
       </view>
     </view>
-    <view class="icon">
+    <view class="icon" bindtap="go" data-url="/Pages/yishi/myinfo/index">
       <van-icon name="arrow" />
     </view>
   </view>
diff --git a/Pages/yishi/my/index.wxss b/Pages/yishi/my/index.wxss
index 50b3661..4584c3e 100644
--- a/Pages/yishi/my/index.wxss
+++ b/Pages/yishi/my/index.wxss
@@ -108,7 +108,9 @@
   border-radius: 20rpx;
   padding: 20rpx 0;
 }
-
+.t-badge__content-text {
+  line-height: 70rpx !important;
+}
 
 
 
diff --git a/Pages/yishi/myinfo/index.js b/Pages/yishi/myinfo/index.js
index 076d713..3cbd0b3 100644
--- a/Pages/yishi/myinfo/index.js
+++ b/Pages/yishi/myinfo/index.js
@@ -13,8 +13,9 @@ Page({
     doctor_id: "",
     idcard_status: 0,
     iden_auth_status: 0,
+    is_bind_bank: 0,
     user_name: "",
-    brief_introduction: "我的简介",
+    brief_introduction: "点击编辑",
     v_show: false,
     v_message: "",
     next_url: "/Pages/yishi/identity/index"
@@ -33,6 +34,13 @@ Page({
       })
     }).catch(errors => {console.error(errors);})
   },
+  onShow(){
+    let user_id = wx.getStorageSync("user_id");
+    let is_bind_bank = wx.getStorageSync(user_id+'_is_bind_bank');
+    this.setData({
+      is_bind_bank: is_bind_bank
+    })
+  },
   logOut(){
     console.log("退出登录");
     let usertype =  wx.getStorageSync('usertype');
@@ -69,6 +77,14 @@ Page({
       })
       return;
     }
+    if(this.data.is_bind_bank != 1){
+      this.setData({
+        v_show: true,
+        v_message: "请您先绑定结算银行卡",
+        next_url: "/Pages/yishi/bankcard/index",
+      })
+      return;
+    }
     app.go(e.currentTarget.dataset.url)
   },
   go1(e){
@@ -83,6 +99,14 @@ Page({
     app.go(e.currentTarget.dataset.url)
   },
   go2(e){
+    if(this.data.idcard_status != 1){
+      this.setData({
+        v_show: true,
+        v_message: "请先进行实名认证",
+        next_url: "/Pages/yishi/identity/index"
+      })
+      return;
+    }
     if(this.data.iden_auth_status != 1){
       this.setData({
         v_show: true,
@@ -94,7 +118,15 @@ Page({
     app.go(e.currentTarget.dataset.url)
   },
   goIn(){
+    this.setData({
+      v_show: false
+    })
     app.go(this.data.next_url)
+  },
+  cancelDialog(){
+    this.setData({
+      v_show: false
+    })
   }
   
 })
\ No newline at end of file
diff --git a/Pages/yishi/myinfo/index.json b/Pages/yishi/myinfo/index.json
index cd86b08..50f4f38 100644
--- a/Pages/yishi/myinfo/index.json
+++ b/Pages/yishi/myinfo/index.json
@@ -5,6 +5,6 @@
     "van-cell": "@vant/weapp/cell/index",
     "van-cell-group": "@vant/weapp/cell-group/index",
     "van-button": "@vant/weapp/button/index",
-    "van-dialog": "@vant/weapp/dialog/index"
+    "t-dialog": "tdesign-miniprogram/dialog/dialog"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/myinfo/index.wxml b/Pages/yishi/myinfo/index.wxml
index 0013b44..20f2995 100644
--- a/Pages/yishi/myinfo/index.wxml
+++ b/Pages/yishi/myinfo/index.wxml
@@ -2,21 +2,35 @@
 <view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
   <van-cell-group>
     <van-cell size="large" bindtap="go" data-url="/Pages/yishi/mycard/index" title="我的名片" value="分享名片" is-link />
-    <van-cell size="large" bindtap="go" data-url="/Pages/yishi/myprofile/index" title="我的简介" value="{{brief_introduction}}" is-link />
+    <van-cell size="large" bindtap="go" data-url="/Pages/yishi/myprofile/index" title="我的简介" value="{{brief_introduction == ''?'点击编辑':brief_introduction}}" is-link />
     <van-cell size="large" bindtap="go1" data-url="/Pages/yishi/attestation/index?card_name={{card_name}}&card_num_mask={{card_num_mask}}" link-type="navigateTo" title="实名认证" 
     value="{{idcard_status==0?'未认证':idcard_status==1?'已认证':'认证失败'}}" is-link />
-    <van-cell size="large" bindtap="go" data-url="/Pages/yishi/practicing/index" link-type="navigateTo" title="医师认证" 
+    <van-cell size="large" bindtap="go2" data-url="/Pages/yishi/practicing/index" link-type="navigateTo" title="医师认证" 
     value="{{iden_auth_status==0?'未认证':iden_auth_status==1?'已认证':iden_auth_status==2?'审核中':'认证失败'}}" is-link />
   </van-cell-group>
 
   <van-button bind:click="logOut" custom-style="width: 92vw;margin: 50rpx auto;border-radius: 10rpx;" type="primary" color="#3CC7C0" block>退出登录</van-button>
 
-  <van-dialog
+  <!-- <van-dialog
     title="温馨提示"
     message="{{v_message}}"
     show="{{ v_show }}"
     show-cancel-button
     confirm-button-color="#3CC7C0"
     bind:confirm="goIn"
-  />
+  /> -->
+
+  <t-dialog
+    visible="{{ v_show }}"
+    title="温馨提示"
+    content="{{v_message}}"
+  >
+  <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="cancelDialog">
+    取消
+  </view>
+  <view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="goIn">
+    确定
+  </view>
+  </t-dialog>
+
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/myinfo/index.wxss b/Pages/yishi/myinfo/index.wxss
index 1b690af..c1bc9b2 100644
--- a/Pages/yishi/myinfo/index.wxss
+++ b/Pages/yishi/myinfo/index.wxss
@@ -2,4 +2,18 @@
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+}
+.dialog{
+  width: 50%;
+  text-align: center;
+  height: 100rpx;
+  line-height: 100rpx;
+}
+.dialog_cancel_btn{
+  border-top: 1px solid #E9E9E9;
+  border-right: 1px solid #E9E9E9;
+}
+.dialog_confirm_btn{
+  border-top: 1px solid #E9E9E9;
+  color: #3CC7C0;
 }
\ No newline at end of file
diff --git a/Pages/yishi/myprofile/index.js b/Pages/yishi/myprofile/index.js
index a296466..d2f2349 100644
--- a/Pages/yishi/myprofile/index.js
+++ b/Pages/yishi/myprofile/index.js
@@ -2,7 +2,7 @@ const app = getApp()
 Page({
   data: {
     navbarData: {
-      showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
+      showCapsule: 2, //是否显示左上角图标   1表示显示    0表示不显示
       title: '我的简介', //导航栏 中间的标题
     },
   },
diff --git a/Pages/yishi/myprofile/index.wxss b/Pages/yishi/myprofile/index.wxss
index 68b5268..ba4595b 100644
--- a/Pages/yishi/myprofile/index.wxss
+++ b/Pages/yishi/myprofile/index.wxss
@@ -46,4 +46,19 @@
 }
 .van-cell--required::before {
   left: 4.7rem !important;
+}
+.required{
+  color: #e34d59;
+}
+.van-picker__confirm{
+  color: #3cc7c0 !important;
+}
+.t-tabs__item--active{
+  color: #49B9AD !important;
+}
+.t-tabs__track{
+  background-color: #49B9AD !important;
+}
+.t-icon-check{
+  color: #49B9AD !important;
 }
\ No newline at end of file
diff --git a/Pages/yishi/onlinechufang/index.wxml b/Pages/yishi/onlinechufang/index.wxml
index 32a9bf2..3fd8665 100644
--- a/Pages/yishi/onlinechufang/index.wxml
+++ b/Pages/yishi/onlinechufang/index.wxml
@@ -116,6 +116,7 @@
     <van-cell-group wx:if="{{ drug_content_show }}">
       <van-field
         label="用法"
+        type="text"
         model:value="{{save_durg_single_use}}"
         input-align="left"
         placeholder="请输入用法（口服）"
@@ -124,6 +125,7 @@
       />
       <van-field
         label="用次"
+        type="text"
         model:value="{{save_durg_frequency_use}}"
         input-align="left"
         placeholder="请输入服用次（一日1次）"
@@ -132,6 +134,7 @@
       />
       <van-field
         label="用量"
+        type="text"
         model:value="{{save_durg_single_unit}}"
         input-align="left"
         placeholder="请输入用量（一次3粒）"
@@ -140,6 +143,7 @@
       />
       <van-field
         label="用药天数"
+        type="text"
         model:value="{{save_durg_available_days}}"
         input-align="left"
         placeholder="请输入时长"
@@ -148,6 +152,7 @@
       />
       <van-field
         label="药品数量"
+        type="text"
         model:value="{{save_durg_prescription_product_num}}"
         input-align="left"
         placeholder="请输入数量"
@@ -156,6 +161,7 @@
       />
       <van-field
         label="单位"
+        type="text"
         model:value="{{save_durg_packaging_unit}}"
         input-align="left"
         placeholder="盒/袋"
diff --git a/Pages/yishi/onlinesetup/index.js b/Pages/yishi/onlinesetup/index.js
index c6d682c..b8e17e7 100644
--- a/Pages/yishi/onlinesetup/index.js
+++ b/Pages/yishi/onlinesetup/index.js
@@ -54,6 +54,8 @@ Page({
   onChange({ detail }) {
     console.log("onChange: ", detail);
 
+
+
     if(detail){
       let inquiry_price = this.data.info.inquiry_price;
       let check = this.checkPrice(inquiry_price);
@@ -71,35 +73,63 @@ Page({
      params.is_open = detail?1:0;
      api.putDoctorInquiryOpen(params).then(response => {
       console.log(response);
+    }).then(()=>{
+      if(detail){
+        wx.requestSubscribeMessage({
+          tmplIds: ['G1RIs0RYqsTQ2CuPQWalIGVet9sd_d371YtDVhfBsFg'],
+          success (res) {
+            console.log(res);//同意授权
+          }
+        })
+      }
     }).catch(errors => {console.error(errors);})
 
   },
   putDoctorInquiryConfig(){
     //修改医生问诊配置
-    let params = {};
-    params.inquiry_type = this.data.inquiry_type;//接诊类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药）
-    params.inquiry_mode = this.data.inquiry_mode;//接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员）
-    params.inquiry_price = this.data.info.inquiry_price;
-    params.work_num_day = this.data.info.work_num_day;
-    api.putDoctorInquiryConfig(params).then(response => {
-     console.log(response);
-     Toast.success("修改成功");
-     wx.switchTab({
-      url: "/Pages/yishi/wenzhen_v2/wenzhen"
-     })
-   }).catch(errors => {console.error(errors);})
+    // let params = {};
+    // params.inquiry_type = this.data.inquiry_type;//接诊类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药）
+    // params.inquiry_mode = this.data.inquiry_mode;//接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员）
+    // params.inquiry_price = this.data.info.inquiry_price;
+    // params.work_num_day = this.data.info.work_num_day;
+    // api.putDoctorInquiryConfig(params).then(response => {
+    //  console.log(response);
+    //  Toast.success("修改成功");
+    //  wx.switchTab({
+    //   url: "/Pages/yishi/wenzhen_v2/wenzhen"
+    //  })
+    // }).catch(errors => {console.error(errors);})
+
+    wx.switchTab({
+     url: "/Pages/yishi/wenzhen_v2/wenzhen"
+    })
+
   },
   onStepperChange(event) {
     console.log(event.detail);
     this.setData({ 
       "info.work_num_day": event.detail 
     });
+
+    this.updateConfig();
+
   },
   onPriceChange(e){
     console.log(e.detail);
-    this.checkPrice(e.detail.value)
-    this.setData({
-      "info.inquiry_price": e.detail.value
+    let price = e.detail.value;
+    let check = this.checkPrice(price);
+    if(!check){
+      price = this.data.info.inquiry_price
+      return
+    }
+    let result = this.updateConfig(price);
+    console.log("result result result:", result);
+    result.then((res)=>{
+      console.log(res)
+      if(!res) price = this.data.info.inquiry_price
+      this.setData({
+        "info.inquiry_price": price
+      })
     })
   },
   myToast(message){
@@ -107,7 +137,7 @@ Page({
       context: this,
       selector: '#t-toast',
       message: message,
-      theme: 'warning',
+      theme: 'success',
       direction: 'column',
     });
   },
@@ -128,5 +158,24 @@ Page({
       this.myToast(message);
       return false;
     }
+  },
+  async updateConfig(price){
+    //修改医生问诊配置
+    let params = {};
+    params.inquiry_type = this.data.inquiry_type;//接诊类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药）
+    params.inquiry_mode = this.data.inquiry_mode;//接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员）
+    params.inquiry_price = price;
+    params.work_num_day = this.data.info.work_num_day;
+    const result = await api.putDoctorInquiryConfig(params).then(response => {
+     console.log(response);
+     this.myToast("修改成功");
+     return true;
+    }).catch(errors => {
+      console.error(errors);
+      return false;
+    })
+
+    console.log("updateConfig result result: ", result);
+    return result;
   }
 })
\ No newline at end of file
diff --git a/Pages/yishi/onlinesetup/index.wxml b/Pages/yishi/onlinesetup/index.wxml
index d9646a2..fb84dd1 100644
--- a/Pages/yishi/onlinesetup/index.wxml
+++ b/Pages/yishi/onlinesetup/index.wxml
@@ -26,13 +26,13 @@
       <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 }}" max="{{config.max_work_num_day}}" integer  bind:change="onStepperChange" />
+          <van-stepper value="{{ info.work_num_day }}" min="1" max="{{config.max_work_num_day}}" integer  bind:change="onStepperChange" />
         </view>
       </view>
       <view class="price_steup_box_bottom">
         <view class="price_steup_box_bottom_title">问诊单价（元）</view>
         <view class="price_steup_box_bottom_num"> 
-          <input class="weui-input" bindinput="onPriceChange" type="digit" value="{{ info.inquiry_price }}" placeholder="请输入问诊单价" />
+          <input class="weui-input" bindblur="onPriceChange" type="digit" value="{{ info.inquiry_price }}" placeholder="请输入问诊单价" />
           <text class="price">元</text>
         </view>
       </view>
diff --git a/Pages/yishi/quickreply/index.js b/Pages/yishi/quickreply/index.js
index bec4627..55c2cb0 100644
--- a/Pages/yishi/quickreply/index.js
+++ b/Pages/yishi/quickreply/index.js
@@ -1,11 +1,12 @@
 import { API } from './../../../utils/network/api'
+import Toast from 'tdesign-miniprogram/toast/index';
 const api = new API()
 const app = getApp()
 Page({
 
   data: {
     navbarData: {
-      showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
+      showCapsule: 2, //是否显示左上角图标   1表示显示    0表示不显示
       title: '常用语', //导航栏 中间的标题
     },
     height: app.globalData.height, 
@@ -18,7 +19,17 @@ Page({
     show: false,
     add_message: "",
     current_words_type: 1,
-    focus: true
+    focus: true,
+    words_css: "border-radius: 20rpx;margin-bottom: 20rpx;",
+    from: ""
+  },
+  onLoad(options){
+    let from = options.from;
+    if(from) {
+      this.setData({
+        from: from
+      })
+    }
   },
   onTabChange(e){
     this.setData({
@@ -45,17 +56,33 @@ Page({
     
     api.postDoctorWords({words_type: words_type, words: words}).then(response => {
       console.log(response);
-      let list_name = "list_" + words_type;
-      let list = this.data[list_name];
-      let obj = {};
-      obj.words = words;
-      list.push(obj);
-      console.log(list_name);
       this.setData({
-        [list_name]: list,
         add_message: "",
         show: false
       })
+    }).then(()=>{
+      this.getList(words_type)
+    }).catch(errors => {console.error(errors);})
+  },
+  delWords(e){
+    console.log(e);
+    let words_type = this.data.current_words_type;
+    let doctor_words_id = e.currentTarget.dataset.doctor_words_id;
+    if(doctor_words_id == ""){
+      Toast({
+        context: this,
+        selector: '#t-toast',
+        message: '系统常用语,无法删除',
+        theme: 'warning',
+        direction: 'column',
+      });
+      return
+    }
+    api.delDoctorWords({doctor_words_id: doctor_words_id}).then(response => {
+      console.log(response);
+      
+    }).then(()=>{
+      this.getList(words_type)
     }).catch(errors => {console.error(errors);})
   },
   showAdd(){
@@ -63,7 +90,6 @@ Page({
       show: true,
     });
   },
-
   onClose() {
     this.setData({
       show: false,
@@ -73,5 +99,38 @@ Page({
     this.setData({
       focus: true
     })
+  },
+  wordsClose(e){
+    console.log(e);
+    const { position, instance } = e.detail;
+    console.log(position)
+    console.log(instance)
+    switch (position) {
+      case 'left':
+      case 'cell':
+        instance.close();
+        break;
+      case 'right':
+        Dialog.confirm({
+          message: '确定删除吗？',
+        }).then(() => {
+          instance.close();
+        });
+        break;
+    }
+  },
+  wordsOpen(e){
+    console.log("open")
+    console.log(e);
+  },
+  wordsClick(e){
+    console.log("click")
+    console.log(e);
+    let words = e.currentTarget.dataset.words;
+    let from = this.data.from;
+    if(from){
+      wx.setStorageSync('words', words);
+      wx.navigateBack()
+    }
   }
 })
\ No newline at end of file
diff --git a/Pages/yishi/quickreply/index.json b/Pages/yishi/quickreply/index.json
index 41f9533..cfe5079 100644
--- a/Pages/yishi/quickreply/index.json
+++ b/Pages/yishi/quickreply/index.json
@@ -7,6 +7,8 @@
     "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel",
     "van-button": "@vant/weapp/button/index",
     "van-popup": "@vant/weapp/popup/index",
-    "van-field": "@vant/weapp/field/index"
+    "van-field": "@vant/weapp/field/index",
+    "van-swipe-cell": "@vant/weapp/swipe-cell/index",
+    "t-toast": "tdesign-miniprogram/toast/toast"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/quickreply/index.wxml b/Pages/yishi/quickreply/index.wxml
index 5ad237e..8f92b0e 100644
--- a/Pages/yishi/quickreply/index.wxml
+++ b/Pages/yishi/quickreply/index.wxml
@@ -4,6 +4,7 @@
   <t-tabs
       defaultValue="{{ current_words_type }}"
       sticky
+      swipeable="{{false}}"
       stickyProps="{{stickyProps}}"
       t-class="custom-tabs"
       bind:change="onTabChange"
@@ -12,18 +13,35 @@
     >
       <t-tab-panel label="问诊" value="1">
         <view class="item_list">
-          <van-cell size="large" custom-style="border-radius: 20rpx;margin-bottom: 20rpx;" title="{{index + 1}}、{{item.words}}" wx:for="{{list_1}}" />
+          <van-swipe-cell right-width="{{ 65 }}" 
+          bind:close="wordsClose"
+          bind:open="wordsOpen" 
+          bind:click="wordsClick"
+          data-words="{{item.words}}"
+          wx:for="{{list_1}}">
+            <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>
+          </van-swipe-cell>
         </view>
         <view class="btn">
           <van-button bind:click="showAdd" class="addbtn" custom-style="border-radius: 20rpx;margin: 0 auto;width: 92%;position: relative;top: 50%;  transform: translateY(-50%);"  type="primary" color="#3CC7C0" block>添加常用语</van-button>
         </view>
-        
-
-
       </t-tab-panel>
       <t-tab-panel label="处方" value="2">
         <view class="item_list">
-          <van-cell size="large" custom-style="border-radius: 20rpx;margin-bottom: 20rpx;" title="{{index+1}}、{{item.words}}" wx:for="{{list_2}}" />
+          <van-swipe-cell right-width="{{ 65 }}" 
+          bind:close="wordsClose"
+          bind:open="wordsOpen" 
+          bind:click="wordsClick"
+          data-words="{{item.words}}"
+          wx:for="{{list_2}}">
+            <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>
+          </van-swipe-cell>
         </view>
         <view class="btn">
           <van-button bind:click="showAdd" class="addbtn" custom-style="border-radius: 20rpx;margin: 0 auto;width: 92%;position: relative;top: 50%;  transform: translateY(-50%);"  type="primary" color="#3CC7C0" block>添加常用语</van-button>
@@ -59,4 +77,5 @@
     <van-cell url="/Pages/yishi/quickreply_data/index?title=快速问诊快捷回复" custom-style="border-radius: 20rpx;margin-bottom: 20rpx;" title="2、设置处方的快捷回复" is-link />
     <van-cell url="/Pages/yishi/quickreply_data/index?title=义诊快捷回复" custom-style="border-radius: 20rpx;margin-bottom: 20rpx;" title="3、设置处方的快捷回复" is-link />
   </view> -->
-</view>
\ No newline at end of file
+</view>
+<t-toast id="t-toast" />
\ No newline at end of file
diff --git a/Pages/yishi/quickreply/index.wxss b/Pages/yishi/quickreply/index.wxss
index 08c4d3f..a0f9d85 100644
--- a/Pages/yishi/quickreply/index.wxss
+++ b/Pages/yishi/quickreply/index.wxss
@@ -55,4 +55,13 @@ page{
 }
 .popup_box_content{
   flex: 5;
+}
+.delWords{
+  background-color: red;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  width: 65px;
+  justify-content: center;
+  color: #fff;
 }
\ No newline at end of file
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index 4c4717b..6093403 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -227,10 +227,12 @@ Page({
     let session_data_list_2 = [];
     let session_data_list_3 = [];
     let session_data_list_4 = [];
+    let session_data_list_5 = [];
     session_list.push(session_data_list_1);
     session_list.push(session_data_list_2);
     session_list.push(session_data_list_3);
     session_list.push(session_data_list_4);
+    session_list.push(session_data_list_5);
 
     this.data.conversationList.forEach(item => {
       let conversationID = item.conversationID;
@@ -274,7 +276,7 @@ Page({
       data_list_4: session_data_list_4,
     })
 
-    if(session_data_list_1.length > 0 && session_data_list_2.length > 0 && session_data_list_3.length > 0 && session_data_list_4.length > 0 && session_data_list_5.length > 0){
+    if(session_data_list_1.length == 0 && session_data_list_2.length == 0 && session_data_list_3.length == 0 && session_data_list_4.length == 0 && session_data_list_5.length == 0){
       this.setData({has_data: false})
     }else{
       this.setData({has_data: true})
diff --git a/Pages/yishi/yizhensetup/index.js b/Pages/yishi/yizhensetup/index.js
index 1443d0b..134c366 100644
--- a/Pages/yishi/yizhensetup/index.js
+++ b/Pages/yishi/yizhensetup/index.js
@@ -39,7 +39,7 @@ Page({
   },
 
   onLoad(){
-    this.setData({ note: this.data.open_note });
+
   },
   onShow(){
     let params = {};
@@ -54,6 +54,14 @@ Page({
       })
       this.formatAmounts();
       this.formatAmountValue();
+    }).then(re =>{
+      let is_open = this.data.info.is_open;
+      let note = this.data.note;
+      if(is_open == 1) note = this.data.open_note;
+      if(is_open == 0) note = this.data.close_note;
+      this.setData({
+        note: note
+      })
     }).catch(errors => {console.error(errors);})
   },
   formatAmounts(){
@@ -91,6 +99,15 @@ Page({
      params.is_open = detail?1:0;
      api.putDoctorInquiryOpen(params).then(response => {
       console.log(response);
+    }).then(()=>{
+      if(detail){
+        wx.requestSubscribeMessage({
+          tmplIds: ['G1RIs0RYqsTQ2CuPQWalIGVet9sd_d371YtDVhfBsFg'],
+          success (res) {
+            console.log(res);//同意授权
+          }
+        })
+      }
     }).catch(errors => {console.error(errors);})
   },
 
@@ -104,9 +121,6 @@ Page({
     api.putDoctorInquiryConfig(params).then(response => {
      console.log(response);
      Toast.success("修改成功");
-     wx.switchTab({
-      url: "/Pages/yishi/wenzhen_v2/wenzhen"
-     })
    }).catch(errors => {console.error(errors);})
   },
   onStepperChange(event) {
@@ -114,6 +128,7 @@ Page({
     this.setData({ 
       "info.work_num_day": event.detail 
     });
+    this.putDoctorInquiryConfig()
   },
 
   onAmountPicker() {
@@ -135,6 +150,8 @@ Page({
       [`${key}Text`]: value+' 元',
       "info.inquiry_price": value[0]
     });
+
+    this.putDoctorInquiryConfig()
   },
 
   onPickerCancel(e) {
@@ -145,5 +162,10 @@ Page({
       [`${key}Visible`]: false,
     });
   },
-
+  go(e){
+    let url = e.currentTarget.dataset.url;
+    wx.switchTab({
+      url: url
+    })
+  }
 })
\ No newline at end of file
diff --git a/Pages/yishi/yizhensetup/index.wxml b/Pages/yishi/yizhensetup/index.wxml
index 6794dca..2a3f793 100644
--- a/Pages/yishi/yizhensetup/index.wxml
+++ b/Pages/yishi/yizhensetup/index.wxml
@@ -49,7 +49,7 @@
   </view>
 
   <view class="go">
-    <van-button bind:click="putDoctorInquiryConfig" color="#3CC7C0" custom-style="border-radius: 20rpx;font-size:30rpx;" type="primary" block>去接诊</van-button>
+    <van-button 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
diff --git a/Pages/yishi/yizhensetup/index.wxss b/Pages/yishi/yizhensetup/index.wxss
index 44ef568..1e7d0ff 100644
--- a/Pages/yishi/yizhensetup/index.wxss
+++ b/Pages/yishi/yizhensetup/index.wxss
@@ -111,4 +111,8 @@ page{
   transform: translateX(-50%);
   bottom: 100rpx;
   width: 90vw;
-}
\ No newline at end of file
+}
+
+.t-picker__confirm,.t-class-confirm{
+  color: #49B9AD !important;
+}
diff --git a/Pages/yishi/zhiye_identity/index.wxml b/Pages/yishi/zhiye_identity/index.wxml
index 3b33b48..d48d6df 100644
--- a/Pages/yishi/zhiye_identity/index.wxml
+++ b/Pages/yishi/zhiye_identity/index.wxml
@@ -43,7 +43,7 @@
     <van-divider customStyle="color: #999; width:95vw; margin: 20rpx auto;" />
 
     <view class="sign_box">
-      <view class="sign_title">医生手写签名 *</view>
+      <view class="sign_title">医生手写签名 <text style="color: #e34d59;">*</text></view>
       <view class="sign" wx:if="{{sign_image.length == 0}}" data-url="/Pages/yishi/signcanvas/index" bindtap="go">
         <van-button custom-style="height:130rpx;margin-top:20rpx;border-radius: 20rpx;border: 1px dashed #999;width:100%;font-size:30rpx;background-color: #fff;color: #3CC7C0;" icon="edit">点击签名</van-button>
       </view>
diff --git a/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxss b/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxss
index 3bb26d7..ff371b8 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxss
@@ -1,7 +1,7 @@
 .text-message {
   max-width: 60vw;
-  min-height: 80rpx;
-  line-height: 80rpx;
+  min-height: 50rpx;
+  line-height: 50rpx;
   padding: 10rpx 24rpx;
   background: #F8F8F8;
   border: 1rpx solid #D9D9D9;
@@ -20,7 +20,7 @@
 .my-text::after{
   content:'';
   position: absolute;
-  top: 45rpx;
+  top: 35rpx;
   right: -19rpx;
   transform: translate(-50%,-50%) rotate(-135deg);
   width: 16rpx;
@@ -38,7 +38,7 @@
 .your-text::after{
   content:'';
   position: absolute;
-  top: 45rpx;
+  top: 35rpx;
   left: 0;
   transform: translate(-50%,-50%) rotate(45deg);
   width: 16rpx;
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js
index 63becfd..eddcb4c 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.js
@@ -75,6 +75,8 @@ Component({
     isEmoji: false,
     fileList: [],
     hasCallKit: false,
+    showChangYongYu: false,
+    ChangYongYu: []
   },
 
   lifetimes: {
@@ -111,6 +113,21 @@ Component({
         });
       });
     },
+    
+  },
+  pageLifetimes:{
+    show(){
+      //获得常用语
+      let words = wx.getStorageSync('words');
+      console.log("words from chat: ", words);
+      if(words){
+        this.setData({
+          message: words,
+          sendMessageBtn: true
+        })
+        wx.setStorageSync('words', "");
+      }
+    }
   },
 
   /**
@@ -730,5 +747,10 @@ Component({
         displayServiceEvaluation: true,
       });
     },
+
+    showChangYongYu(){
+      app.go("/Pages/yishi/quickreply/index?from=chat")
+    },
+
   },
 });
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxml b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
index 7ecbbb1..03fcbe7 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
@@ -45,7 +45,7 @@
             <image mode="widthFix" class="TUI-Extension-icon MY-TUI-Extension-icon" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/chat/picture.png" />
             <view class="TUI-Extension-slot-name MY-TUI-Extension-slot-name">照片</view>
         </view>
-        <view class="TUI-Extension-slot MY-TUI-Extension-slot" bindtap="handleSendImage">
+        <view class="TUI-Extension-slot MY-TUI-Extension-slot" bindtap="showChangYongYu">
             <image mode="widthFix" class="TUI-Extension-icon MY-TUI-Extension-icon" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/chat/wenzi.png" />
             <view class="TUI-Extension-slot-name MY-TUI-Extension-slot-name">常用语</view>
         </view>
@@ -101,3 +101,4 @@
     {{title}}
     </view>
 </view>
+
diff --git a/TUIKit/static/assets/ic_back_black.svg b/TUIKit/static/assets/ic_back_black.svg
new file mode 100644
index 0000000..7e22047
--- /dev/null
+++ b/TUIKit/static/assets/ic_back_black.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
+    <title>ic_back_white</title>
+    <desc>Created with Sketch.</desc>
+    <g id="ic_back_white" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="ic_back_black">
+            <rect id="Rectangle" x="0" y="0" width="24" height="24"></rect>
+            <polygon id="Path-2" fill="#000000" fill-rule="nonzero" points="4.75615536 12 12 19.616973 10.5591221 21 2 12 10.5591221 3 12 4.38302701"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/app.js b/app.js
index c7650ff..f07d216 100644
--- a/app.js
+++ b/app.js
@@ -46,7 +46,11 @@ App({
     this.aegisInit()
     console.warn("app.js  wx.aegis: ", wx.aegis);
 
-
+    //监听网络状态变化事件
+    wx.onNetworkStatusChange(function (res) {
+      console.log(res.isConnected)
+      console.log(res.networkType)
+    })
   },
   onShow(){
     this.imInit();
@@ -152,6 +156,7 @@ App({
     height: 0,
     login_url: "/Pages/login/index",
     chat_sdk_ready: false,
+    jiesuan_dialog_show: false,
     config: {
       userID: "",
       SDKAPPID: 1400796919, // Your SDKAppID
diff --git a/commpents/mynavbar/index.wxml b/commpents/mynavbar/index.wxml
index ee5f9c8..e131b2b 100644
--- a/commpents/mynavbar/index.wxml
+++ b/commpents/mynavbar/index.wxml
@@ -1,6 +1,6 @@
 <view class="container">
   <view class="tui-navigatorbar">
-    <image wx:if="{{ navbarData.showCapsule==1 }}" class="tui-navigatorbar-back" bindtap="_navback" src="/TUIKit/static/assets/ic_back_white.svg" />
+    <image wx:if="{{ navbarData.showCapsule==1 }}" class="tui-navigatorbar-back" bindtap="_navback" src="/TUIKit/static/assets/ic_back_black.svg" />
     <view class="conversation-title">{{ navbarData.title }}</view>
   </view>
   <view class="box">
diff --git a/commpents/mynavbar/index.wxss b/commpents/mynavbar/index.wxss
index 261410f..3de4ad5 100644
--- a/commpents/mynavbar/index.wxss
+++ b/commpents/mynavbar/index.wxss
@@ -7,7 +7,7 @@
   top: 0;
   width: 750rpx;
   height: 170rpx;
-  background-color: #e94d4d;
+  background-color: #ffffff;
   z-index: 99;
 }
 .tui-navigatorbar-back{
diff --git a/commpents/myprofile/index.js b/commpents/myprofile/index.js
index c19e37d..685eba9 100644
--- a/commpents/myprofile/index.js
+++ b/commpents/myprofile/index.js
@@ -20,7 +20,7 @@ Component({
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '医师身份认证', //导航栏 中间的标题
     },
-    height: app.globalData.height,  
+    height: app.globalData.height,
     //选项卡
     stickyProps: {
       zIndex: 2,
@@ -96,7 +96,8 @@ Component({
     license_cert_reason: "",
     qualification_cert_reason: "",
     work_cert_reason: "",
-    department_custom_name_reason: ''
+    department_custom_name_reason: '',
+    zhuanchang_note: '请选择专长',
   },
 
   options: {
@@ -108,15 +109,11 @@ Component({
 
       console.log("myprofile attached")
       let _this = this;
-      console.log(_this.data.zhicheng_columns);
-      console.log(_this.data.zhicheng_columns);
-
 
       //获得医师身份认证
       api.getDoctorAuthIden({source: this.data.indentity?1:2}).then(response => {
         console.log("getDoctorAuthIden: ",response);
         this.setData({
-         
           doctorauthiden_data_ready: true,
           textarea_jianjie: response.data.brief_introduction,
           textarea_shanchang: response.data.be_good_at,
@@ -217,6 +214,15 @@ Component({
         _this.setData({
           zhuanchang_columns: response.data
         })
+      }).then(()=>{
+        let index = this.data.zhuanchang_columns.findIndex(item => {
+          return item.is_selected == 1
+        })
+        if(index) {
+          this.setData({
+            zhuanchang_note: ""
+          })
+        }
       }).catch(errors => {console.error(errors); })
 
       let keshi_huixian = false;
@@ -235,10 +241,13 @@ Component({
             console.log("select_keshi_id: ", _this.data.select_keshi_id);
             return item.value == _this.data.select_keshi_id
           })
-          if(index){
+          console.log("科室：", index)
+          let keshi_note = _this.data.keshi_columns[index].text;
+          console.log("科室 keshi_note：", keshi_note);
+          if(index != undefined){
             _this.setData({
               select_keshi_index: index,
-              keshi_note: _this.data.keshi_columns[index].text
+              keshi_note: keshi_note
             })
           }
           keshi_huixian = true;
@@ -479,7 +488,7 @@ Component({
         this.setData({ yiyuan_show: true });
       }else{
         wx.showToast({
-          title: '请先选择省市',
+          title: '请先选择城市',
           icon: "error"
         })
       }
@@ -650,6 +659,7 @@ Component({
         }
       })
       
+      console.log("countcountcountcount: ",count)
       if(count >= 10 && e.currentTarget.dataset.is_selected==0){
         wx.showToast({
           title: '最多10个专长',
@@ -661,6 +671,27 @@ Component({
         let data = "zhuanchang_columns["+index+"].is_selected";
         this.setData({[data]: is_selected==1?0:1})
       }
+
+      this.checkZhuanchangNote()
+    },
+    checkZhuanchangNote(){
+      let count = 0
+      this.data.zhuanchang_columns.forEach(item => {
+        if(item.is_selected == 1){
+          count = count + 1;
+        }
+      })
+
+      if(count > 0){
+        this.setData({
+          zhuanchang_note: ""
+        })
+      }
+      if(count == 0){
+        this.setData({
+          zhuanchang_note: "请选择专长"
+        })
+      }
     },
     zhuanchangConfirm(e){
       this.setData({ zhuanchang_show: false });
@@ -881,5 +912,8 @@ Component({
         [file_name]: img_list
       })
     },
+    moveZhuanChang(){
+      
+    }
   }
 })
diff --git a/commpents/myprofile/index.wxml b/commpents/myprofile/index.wxml
index d4eff7f..b4a08ed 100644
--- a/commpents/myprofile/index.wxml
+++ b/commpents/myprofile/index.wxml
@@ -1,6 +1,6 @@
         <view class="photo" style="border-bottom: {{avatar_reason==''?'1px solid var(--td-cell-border-color, var(--td-gray-color-3, #e7e7e7));':'unset'}}">
           <view class="title">头像 <text class="required"> *</text></view>
-          <van-uploader bind:after-read="doUploadPhoto" data-scene="1" data-field_name="avatar" data-file_multiple="false">
+          <van-uploader disabled="{{ indentity && iden_auth_disabled }}" bind:after-read="doUploadPhoto" data-scene="1" data-field_name="avatar" data-file_multiple="false">
             <view class="right">
               <view class="note">真人正脸</view>
               <t-avatar image="{{ avatar }}" />
@@ -19,7 +19,7 @@
         </view>
 
         <!-- <t-cell title="头像" hover required arrow note="真人正脸" /> -->
-        <t-cell title="城市" hover required arrow note="{{ city_note }}" bindtap="onCityShow"/>
+        <t-cell title="城市" hover required arrow note="{{ city_note }}" bindtap="{{(indentity && iden_auth_disabled)?'':'onCityShow'}}"/>
         
         <t-cascader
           visible="{{ city_show }}"
@@ -31,7 +31,7 @@
           bind:change="onChangeCity"
         ></t-cascader>
 
-        <t-cell title="医院" hover required arrow note="{{ yiyuan_note }}" bindtap="onYiYuanShow"/>
+        <t-cell title="医院" hover required arrow note="{{ yiyuan_note }}" bindtap="{{(indentity && iden_auth_disabled)?'':'onYiYuanShow'}}"/>
         <van-popup
           show="{{ yiyuan_show }}"
           position="bottom"
@@ -57,10 +57,14 @@
           bind:search="hospitalSearch"
         />
         </van-popup>
-        <t-cell title="科室" hover required arrow note="{{keshi_note}}" bindtap="onKeshiShow" bordered="{{ select_keshi_id == '' }}"/>
+        <t-cell title="科室" hover required arrow note="{{keshi_note}}" 
+        bindtap="{{(indentity && iden_auth_disabled)?'':'onKeshiShow'}}" bordered="{{ select_keshi_id == '' }}"/>
 
         <view class="custom_keshi" wx:if="{{ select_keshi_id != ''}}">
-          <van-field bind:change="onCustomKeshiChange" model:value="{{custom_keshi}}" label="" placeholder="请输入科室" border="{{department_custom_name_reason == ''}}" />
+          <van-field bind:change="onCustomKeshiChange" 
+          disabled="{{(indentity && iden_auth_disabled)}}"
+          type="text" model:value="{{custom_keshi}}" label="" 
+          placeholder="请输入科室" border="{{department_custom_name_reason == ''}}" />
         </view>
 
         <view class="has_error" wx:if="{{ department_custom_name_reason != '' }}" >
@@ -142,8 +146,10 @@
         </view>
         </van-popup>
 
-        <t-popup visible="{{zhuanchang_show}}" bind:visible-change="onZhuanChangVisibleChange" placement="bottom">
-          <view class="zhuanchang_block">
+        <t-popup visible="{{zhuanchang_show}}" 
+        prevent-scroll-through
+        bind:visible-change="onZhuanChangVisibleChange" placement="bottom">
+          <view class="zhuanchang_block" catchtouchmove="moveZhuanChang">
             <view class="zhuanchang_header">
               <view class="zhuanchang_btn zhuanchang_btn--cancel" aria-role="button" bindtap="zhuanchangConcle">取消</view>
               <view class="zhuanchang_title">选择专长</view>
@@ -169,7 +175,8 @@
           </view>
         </t-popup>
 
-        <t-cell title="职称" hover required arrow note="{{zhicheng_note}}" bindtap="onZhiChengShow" />
+        <t-cell title="职称" hover required arrow note="{{zhicheng_note}}"
+        bindtap="{{(indentity && iden_auth_disabled)?'':'onZhiChengShow'}}" />
         <!-- <t-input 
         label="科室电话" 
         placeholder="请输入科室电话" 
@@ -185,7 +192,9 @@
             placeholder="请输入科室电话"
             placeholder-style="font-size:25rpx;letter-spacing: 2rpx;color:rgba(0, 0, 0, 0.4);"
             input-align="right"
+            type="number"
             clearable
+            disabled="{{(indentity && iden_auth_disabled)}}"
             border="{{ department_custom_mobile_reason == '' }}"
             custom-style="font-size:30rpx;"
           >
@@ -199,7 +208,7 @@
           </view>
         </view>
 
-        <view class="zhuanchang" bindtap="onZhuanChangShow">
+        <view class="zhuanchang" bindtap="{{(indentity && iden_auth_disabled)?'':'onZhuanChangShow'}}">
           <view class="title">专长 <text class="required"> *</text></view>
           <view class="content">
             <view class="content_item" wx:key="expertise_name" wx:if="{{data.is_selected == 1}}" wx:for="{{ zhuanchang_columns }}" wx:for-item="data">
@@ -208,7 +217,7 @@
           </view>
           
           <view class="right">
-            <view class="note">请选择专长</view>
+            <view class="note">{{zhuanchang_note}}</view>
             <view class="icon">
               <t-icon name="chevron-right" size="48rpx" data-name="chevron-right" />
             </view>
@@ -221,6 +230,7 @@
         bind:showNote="onshowJianJieNote"
         textarea_cell_content_placeholder="您的从业经历，职称，所获荣誉等信息（10~1000字）" 
         textarea_val="{{textarea_jianjie}}"
+        disabled="{{(indentity && iden_auth_disabled)}}"
         has_error_content="{{ brief_introduction_reason }}"
         data-textarea_name="textarea_jianjie" bindTextAreaBlur="getTextAreaVal" />
 
@@ -228,6 +238,7 @@
         textarea_cell_name="擅长领域" 
         t_icon_name="view-module" 
         bind:showNote="onshowShanChangNote"
+        disabled="{{(indentity && iden_auth_disabled)}}"
         textarea_val="{{textarea_shanchang}}"
         has_error_content="{{ be_good_at_reason }}"
         textarea_cell_content_placeholder="您的专业领域、擅长疾病、研究方法等信息（10~1000字）" 
@@ -248,6 +259,7 @@
         upload_cell_note="查看示例"
         has_error_content="{{ license_cert_reason }}"
         wx:if="{{indentity}}"
+        disabled="{{(indentity && iden_auth_disabled)}}"
         is_multiple="true"
         />
 
@@ -266,6 +278,7 @@
         upload_cell_note="查看示例"
         has_error_content="{{ qualification_cert_reason }}"
         wx:if="{{indentity}}"
+        disabled="{{(indentity && iden_auth_disabled)}}"
         is_multiple="true"
          />
 
@@ -284,6 +297,7 @@
         upload_cell_note="查看示例"
         has_error_content="{{ work_cert_reason }}"
         wx:if="{{indentity}}"
+        disabled="{{(indentity && iden_auth_disabled)}}"
         is_multiple="true"
          />
         
diff --git a/commpents/myprofile/index.wxss b/commpents/myprofile/index.wxss
index 6a38235..8127405 100644
--- a/commpents/myprofile/index.wxss
+++ b/commpents/myprofile/index.wxss
@@ -219,4 +219,4 @@
 }
 .custom_keshi_error{
   display: none;
-}
\ No newline at end of file
+}
diff --git a/commpents/te_navbar/index.wxml b/commpents/te_navbar/index.wxml
index b2f3f45..964d314 100644
--- a/commpents/te_navbar/index.wxml
+++ b/commpents/te_navbar/index.wxml
@@ -24,9 +24,18 @@
   <t-navbar class="block" title="{{navbarData.title}}" left-arrow bind:go-back="onBack" />
 </view>
 <!-- 仅显示home -->
-<view class="block" wx:if="{{navbarData.showCapsule == 3}}">
-  <t-navbar class="block" title="{{navbarData.title}}" home bind:go-back="onGoHome" />
-</view>
+<t-navbar title="{{navbarData.title}}" wx:if="{{navbarData.showCapsule == 3}}">
+  <view slot="left" class="custom-capsule-home">
+    <t-icon
+      size="20"
+      bind:tap="onGoHome"
+      aria-role="button"
+      aria-label="首页"  
+      name="home"
+      class="custom-capsule__icon"
+    />
+  </view>
+</t-navbar>
 <!-- 都不显示 -->
 <view class="block" wx:if="{{navbarData.showCapsule == 0}}">
   <t-navbar class="block" title="{{navbarData.title}}" />
diff --git a/commpents/te_navbar/index.wxss b/commpents/te_navbar/index.wxss
index 78c64df..de4d259 100644
--- a/commpents/te_navbar/index.wxss
+++ b/commpents/te_navbar/index.wxss
@@ -20,4 +20,7 @@
   width: 1px;
   height: 36rpx;
   background: #e7e7e7;
+}
+.custom-capsule-home{
+  margin-left: 36rpx;
 }
\ No newline at end of file
diff --git a/commpents/textarea-cell/index.js b/commpents/textarea-cell/index.js
index 0ab622b..ae77c03 100644
--- a/commpents/textarea-cell/index.js
+++ b/commpents/textarea-cell/index.js
@@ -12,6 +12,10 @@ Component({
       type: Boolean,
       value: true,
     },
+    disabled: {
+      type: Boolean,
+      value: false,
+    },
     textarea_cell_note: {
       type: String,
       value: '示例备注',
diff --git a/commpents/textarea-cell/index.wxml b/commpents/textarea-cell/index.wxml
index dbc67b3..08fde3c 100644
--- a/commpents/textarea-cell/index.wxml
+++ b/commpents/textarea-cell/index.wxml
@@ -7,7 +7,7 @@
     </view>
   </view>
   <view class="textarea-cell-content">
-    <textarea bindblur="bindTextAreaBlur" maxlength="1000" style="margin: 32rpx 32rpx 0 32rpx; width: 100%; height: 90%; background-color: #FAFAFA;" name="" id="" placeholder="{{ textarea_cell_content_placeholder }}" value="{{textarea_val}}"></textarea>
+    <textarea disabled="{{disabled}}" bindblur="bindTextAreaBlur" maxlength="1000" style="margin: 32rpx 32rpx 0 32rpx; width: 100%; height: 90%; background-color: #FAFAFA;" name="" id="" placeholder="{{ textarea_cell_content_placeholder }}" value="{{textarea_val}}"></textarea>
   </view>
   <view class="error_box" wx:if="{{ has_error_content != '' }}" >
     <t-icon color="red" name="close-circle-filled" size="48rpx" data-name="close-circle-filled" />
diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml
index 3576289..1bca8fc 100644
--- a/custom-tab-bar/index.wxml
+++ b/custom-tab-bar/index.wxml
@@ -105,4 +105,4 @@ active-color="#74A2FA" inactive-color="#999999" wx:if="{{usertype == 3}}" >
   <view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="confirmDialog">
     确定
   </view>
-  </t-dialog>
\ No newline at end of file
+</t-dialog>
diff --git a/utils/network/api.js b/utils/network/api.js
index 4111e8c..1d98035 100644
--- a/utils/network/api.js
+++ b/utils/network/api.js
@@ -436,6 +436,18 @@ class API extends HTTP {
       ...params
     }
   })
+}
+ //删除常用语列表
+ delDoctorWords(params) {
+   let doctor_words_id = params.doctor_words_id;
+   params = {};
+  return this.request({
+    url: `${this.baseUrl}/doctor/words/`+doctor_words_id,
+    method: 'DELETE',
+    data: {
+      ...params
+    }
+  })
 }
  //搜索疾病分类-系统
  getBasicDiseaseSearch(params) {
diff --git a/utils/network/request.js b/utils/network/request.js
index cf4b2c1..7918d56 100644
--- a/utils/network/request.js
+++ b/utils/network/request.js
@@ -46,16 +46,16 @@ class HTTP {
                 url: app.globalData.login_url
               })
             } else {
-              reject(res.data.message)
+              reject(res.data.message);//向后传递错误信息，catch会拿到
               this._show_error(showLoading, res.data.message)
             }
         } else {
-          reject(res.data)
+          reject(res.data)//向后传递错误信息，catch会拿到
           this._show_error(showLoading, err.data.message)
         }
       },
       fail: (err) => {
-          reject()
+          reject(err)//向后传递错误信息，catch会拿到
           this._show_error(showLoading, err.data.message)
       },
       complete: (res) => {
@@ -70,6 +70,9 @@ class HTTP {
 
   _show_error(showLoading, _message) {
     if(showLoading) wx.hideLoading();
+    if(_message == undefined){
+      _message = "网络错误";
+    }
     wx.showToast({
       title: `${_message}`,
       icon: 'none',

From 69df3bf6b3eda6a4ef5041d25e39b0c217e368cd Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Fri, 24 Mar 2023 15:29:41 +0800
Subject: [PATCH 11/83] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/index/index.wxss                |  2 +-
 Pages/mobile_login/index.js           | 38 +++++++++++
 Pages/mobile_login/index.wxml         | 41 ++++++------
 Pages/mobile_login/index.wxss         |  2 +-
 Pages/yaoshi/home/home.wxml           |  6 +-
 Pages/yaoshi/info/info.wxss           |  7 +-
 Pages/yaoshi/my/my.js                 | 27 +++++++-
 Pages/yaoshi/my/my.json               |  4 +-
 Pages/yaoshi/my/my.wxml               | 15 ++---
 Pages/yaoshi/my/my.wxss               |  3 +-
 Pages/yishi/bankcard/index.wxss       |  2 +-
 Pages/yishi/bindcard/index.wxss       |  5 +-
 Pages/yishi/cash/index.wxml           |  2 +-
 Pages/yishi/cash/index.wxss           |  3 +-
 Pages/yishi/identity/index.wxml       |  1 +
 Pages/yishi/identity/index.wxss       | 32 ++++++++-
 Pages/yishi/index/index.wxml          |  4 +-
 Pages/yishi/index/index.wxss          | 11 ++--
 Pages/yishi/kuaisusetup/index.wxss    |  4 +-
 Pages/yishi/my/index.wxml             |  2 +-
 Pages/yishi/my/index.wxss             |  4 +-
 Pages/yishi/myinfo/index.wxss         |  3 +
 Pages/yishi/myprofile/index.js        |  2 +-
 Pages/yishi/myprofile/index.wxss      | 70 +++++---------------
 Pages/yishi/notice_deatil/index.wxss  |  2 +-
 Pages/yishi/onlinesetup/index.wxss    |  8 +--
 Pages/yishi/quickreply/index.wxss     |  6 ++
 Pages/yishi/service_notice/index.wxml | 10 +--
 Pages/yishi/service_notice/index.wxss |  6 +-
 Pages/yishi/system_notice/index.wxml  |  8 +--
 Pages/yishi/system_notice/index.wxss  |  4 ++
 Pages/yishi/wenzhen_v2/wenzhen.wxss   |  2 +-
 Pages/yishi/wenzhenorder/index.wxss   |  3 +
 Pages/yishi/yizhensetup/index.wxss    |  4 +-
 Pages/yishi/zhiye_identity/index.wxss |  2 +-
 app.js                                | 32 ++++-----
 app.wxss                              |  4 +-
 commpents/myprofile/index.js          |  4 +-
 commpents/myprofile/index.wxml        |  2 +-
 commpents/myprofile/index.wxss        | 93 +++++++++++++++------------
 commpents/textarea-cell/index.wxml    |  4 +-
 commpents/textarea-cell/index.wxss    |  2 +-
 commpents/upload-cell/index.wxml      |  2 +-
 commpents/upload-cell/index.wxss      |  1 +
 commpents/wenzhen_data/index.wxml     |  6 +-
 commpents/wenzhen_data/index.wxss     |  2 +-
 46 files changed, 300 insertions(+), 197 deletions(-)

diff --git a/Pages/index/index.wxss b/Pages/index/index.wxss
index 8f99577..a665326 100644
--- a/Pages/index/index.wxss
+++ b/Pages/index/index.wxss
@@ -4,7 +4,7 @@
   margin-left: 50rpx;
   margin-bottom: 100rpx;
   font-size: 50rpx;
-  font-family: "AlibabaPuHuiTi-2-75-SemiBold";
+  /* font-family: "AlibabaPuHuiTi-2-75-SemiBold"; */
   color: #333;
 }
 .item{
diff --git a/Pages/mobile_login/index.js b/Pages/mobile_login/index.js
index 1463245..ac6fef6 100644
--- a/Pages/mobile_login/index.js
+++ b/Pages/mobile_login/index.js
@@ -13,13 +13,33 @@ Page({
     btn_msg: "获取验证码",
     btn_disabled: false,
     login_disabled: true,
+    btn_color: "#ccc"
   },
   onChange(event) {
     this.setData({
       checked: event.detail,
     });
   },
+  phone_change(e){
+    let phone = this.data.phone;
+    if(phone != ""){
+      this.setData({
+        btn_color: "#3CC7C0"
+      })
+    }
+  },
   getCodePhone(e){
+    let phone_reg = /^1[3-9]\d{9}$/;
+    let phone = this.data.phone;
+    //判断用户输入的真实姓名是否为空
+    if(phone.length == 0){
+      wx.showToast({title: '手机号不能为空', icon:'error'})
+      return false;
+    }else if(!phone_reg.test(phone)){//检测姓名的格式是否匹配
+      wx.showToast({title: '手机号输入有误', icon:'error'})
+      return false;
+    }
+
     if(!this.data.checked){
       wx.showToast({
         title: '请同意协议',
@@ -48,6 +68,24 @@ Page({
     })
   },
   mobileLogin(e){
+
+    let phone_reg = /^1[3-9]\d{9}$/;
+    let phone = this.data.phone;
+    let sms = this.data.sms;
+    //判断用户输入的真实姓名是否为空
+    if(phone.length == 0){
+      wx.showToast({title: '手机号不能为空', icon:'error'})
+      return false;
+    }else if(!phone_reg.test(phone)){//检测姓名的格式是否匹配
+      wx.showToast({title: '手机号输入有误', icon:'error'})
+      return false;
+    }
+
+    if(sms.length == 0){
+      wx.showToast({title: '验证码不能为空', icon:'error'})
+      return false;
+    }
+
     if(!this.data.checked){
       wx.showToast({
         title: '请同意协议',
diff --git a/Pages/mobile_login/index.wxml b/Pages/mobile_login/index.wxml
index 12c0ed4..2a0684a 100644
--- a/Pages/mobile_login/index.wxml
+++ b/Pages/mobile_login/index.wxml
@@ -3,26 +3,27 @@
     <van-image height="196rpx" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/logo2.png" fit="heightFix" />
   </view>
   <view class="fields">
-      <van-field
-        model:value="{{ phone }}"
-        label="+86"
-        placeholder="请输入手机号"
-        type="number"
-        input-align="left"
-      />
-      <van-field
-        model:value="{{ sms }}"
-        center
-        clearable
-        type="number"
-        label="短信验证码"
-        placeholder="请输入短信验证码"
-        use-button-slot
-      >
-        <van-button disabled="{{btn_disabled}}" color="#3CC7C0" slot="button" size="small" round plain  type="primary" bind:click="getCodePhone">
-          {{btn_msg}}
-        </van-button>
-      </van-field>
+    <van-field
+      model:value="{{ phone }}"
+      label="+86"
+      placeholder="请输入手机号"
+      type="number"
+      bind:input="phone_change"
+      input-align="left"
+    />
+    <van-field
+      model:value="{{ sms }}"
+      center
+      clearable
+      type="number"
+      label="短信验证码"
+      placeholder="请输入短信验证码"
+      use-button-slot
+    >
+      <van-button disabled="{{btn_disabled}}" color="{{btn_color}}" slot="button" size="small" round plain  type="primary" bind:click="getCodePhone">
+        {{btn_msg}}
+      </van-button>
+    </van-field>
   </view>
   <view class="btn">
     <van-button color="#3CC7C0" disabled="{{login_disabled}}" custom-style="font-size: 36rpx;margin-bottom:30rpx;" type="primary" round block bind:click="mobileLogin">登录</van-button>
diff --git a/Pages/mobile_login/index.wxss b/Pages/mobile_login/index.wxss
index 2dee842..ec68852 100644
--- a/Pages/mobile_login/index.wxss
+++ b/Pages/mobile_login/index.wxss
@@ -1,5 +1,5 @@
 .logo{
-  height: 500rpx;
+  margin-top: 150rpx;
   display: flex;
   align-items: center;
   justify-content: center;
diff --git a/Pages/yaoshi/home/home.wxml b/Pages/yaoshi/home/home.wxml
index c13413b..f4164e1 100644
--- a/Pages/yaoshi/home/home.wxml
+++ b/Pages/yaoshi/home/home.wxml
@@ -46,7 +46,7 @@
           <view class="item_txt">
             <view class="pre_content">处方订单号：2023010510324649</view>
             <view class="end_content">
-              <van-button type="primary" size="small">查看病例</van-button>
+              <van-button type="primary" color="#ec871e" size="small">查看病例</van-button>
             </view>
           </view>
 
@@ -68,7 +68,7 @@
           <view class="item_txt">
             <view class="pre_content">处方订单号：2023010510324649</view>
             <view class="end_content">
-              <van-button type="primary" size="small">查看病例</van-button>
+              <van-button type="primary" color="#ec871e" size="small">查看病例</van-button>
             </view>
           </view>
 
@@ -90,7 +90,7 @@
           <view class="item_txt">
             <view class="pre_content">处方订单号：2023010510324649</view>
             <view class="end_content">
-              <van-button type="primary" size="small">查看病例</van-button>
+              <van-button type="primary" color="#ec871e" size="small">查看病例</van-button>
             </view>
           </view>
 
diff --git a/Pages/yaoshi/info/info.wxss b/Pages/yaoshi/info/info.wxss
index cb7329f..9149bd9 100644
--- a/Pages/yaoshi/info/info.wxss
+++ b/Pages/yaoshi/info/info.wxss
@@ -1,12 +1,16 @@
+page{
+  background-color: #F4F4F4;
+}
 .top{
   width: 100vw;
-  background-color: cornflowerblue;
+  background-color: rgb(255, 255, 255);
   height: 370rpx;
   display: flex;
   justify-content: center;
   align-items: center;
   align-content: center;
   flex-direction: column;
+  margin-bottom: 20rpx;
 }
 .name{
   color: white;
@@ -15,4 +19,5 @@
   text-justify:distribute-all-lines; 
   text-align-last: justify;
   font-size: 28rpx;
+  width: 180rpx;
 }
diff --git a/Pages/yaoshi/my/my.js b/Pages/yaoshi/my/my.js
index b1feb40..a140602 100644
--- a/Pages/yaoshi/my/my.js
+++ b/Pages/yaoshi/my/my.js
@@ -4,7 +4,7 @@ const app = getApp()
 Page({
   data: {
     navbarData: {
-      showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
+      showCapsule: 0, //是否显示左上角图标   1表示显示    0表示不显示
       title: '个人中心', //导航栏 中间的标题
     },
     height: app.globalData.height,
@@ -25,5 +25,30 @@ Page({
     }).catch(errors => {
       console.error(errors);
     })
+  },
+  logOut(){
+    console.log("退出登录");
+    let usertype =  wx.getStorageSync('usertype');
+    wx.showModal({
+      title: '确认退出登录',
+      content: '退出登录后您需要重新登录',
+      success (res) {
+        if (res.confirm) {
+          console.log('用户点击确定')
+          wx.setStorageSync('AUTH_TOKEN_'+usertype, "");
+          wx.setStorageSync('user_id', "");
+          wx.setStorageSync('client_user_id', "");
+          app.go("/Pages/index/index");
+        } else if (res.cancel) {
+          console.log('用户点击取消')
+        }
+      }
+    })
+  },
+  go(e){
+    console.log(e)
+    let url = e.currentTarget.dataset.url;
+    app.go(url);
   }
+  
 })
\ No newline at end of file
diff --git a/Pages/yaoshi/my/my.json b/Pages/yaoshi/my/my.json
index b6f232d..35d8a0c 100644
--- a/Pages/yaoshi/my/my.json
+++ b/Pages/yaoshi/my/my.json
@@ -2,7 +2,9 @@
   "component": true,
   "usingComponents": {
     "t-avatar": "tdesign-miniprogram/avatar/avatar",
-    "van-icon": "@vant/weapp/icon/index"
+    "van-icon": "@vant/weapp/icon/index",
+    "van-button": "@vant/weapp/button/index",
+    "te-nav-bar": "/commpents/te_navbar"
   },
   "navigationBarBackgroundColor": "#ffffff",
   "navigationBarTextStyle": "black",
diff --git a/Pages/yaoshi/my/my.wxml b/Pages/yaoshi/my/my.wxml
index ac21aba..66155ea 100644
--- a/Pages/yaoshi/my/my.wxml
+++ b/Pages/yaoshi/my/my.wxml
@@ -1,19 +1,18 @@
+<te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container">
   <view class="top">
     <t-avatar class="avatar" size="large" image="{{info.avatar}}" />
     <text class="name">{{info.user_name}}</text>
   </view>
   <view class="content">
-    <navigator url="/Pages/yaoshi/info/info" open-type="navigate" hover-class="other-navigator-hover">
-      <view class="my">个人中心</view>
-    </navigator>
+    <view class="my" bindtap="go" data-url="/Pages/yaoshi/info/info">个人中心</view>
     <view class="item_list">
-      <view class="item">
-        <navigator url="/Pages/yaoshi/authentication/authentication" open-type="navigate" hover-class="other-navigator-hover">
-          <van-icon name="user-o" size="50rpx" color="#55B0E5"/>
-          <text class="item_name">实名认证</text>
-        </navigator>
+      <view class="item" bindtap="go" data-url="/Pages/yaoshi/authentication/authentication">
+        <van-icon name="user-o" size="50rpx" color="#55B0E5"/>
+        <text class="item_name">实名认证</text>
       </view>
     </view>
+
+    <van-button type="primary" block bindtap="logOut">退出登录</van-button>
   </view>
 </view>
\ No newline at end of file
diff --git a/Pages/yaoshi/my/my.wxss b/Pages/yaoshi/my/my.wxss
index 7b6c197..b182a9f 100644
--- a/Pages/yaoshi/my/my.wxss
+++ b/Pages/yaoshi/my/my.wxss
@@ -12,9 +12,10 @@
   color: white;
   margin-top: 30rpx;
   text-align: justify;
-  text-justify:distribute-all-lines; 
+  text-justify: inter-word; 
   text-align-last: justify;
   font-size: 28rpx;
+  width: 180rpx;
 }
 .my{
   display: flex;
diff --git a/Pages/yishi/bankcard/index.wxss b/Pages/yishi/bankcard/index.wxss
index 0b5e953..a1f2acf 100644
--- a/Pages/yishi/bankcard/index.wxss
+++ b/Pages/yishi/bankcard/index.wxss
@@ -32,7 +32,7 @@ page{
   font-size: 28rpx;
   color: #999999;
   width: 92vw;
-  margin: 0 auto;
+  margin: -20rpx auto;
   line-height: 50rpx;
 }
 .bankcard_list{
diff --git a/Pages/yishi/bindcard/index.wxss b/Pages/yishi/bindcard/index.wxss
index 50c7748..7036ca0 100644
--- a/Pages/yishi/bindcard/index.wxss
+++ b/Pages/yishi/bindcard/index.wxss
@@ -20,7 +20,7 @@
   font-size: 28rpx;
   color: #999999;
   width: 92vw;
-  margin: 50rpx auto;
+  margin: 20rpx auto;
   line-height: 50rpx;
 }
 .t-tabs__item--active{
@@ -34,4 +34,7 @@
 }
 .van-picker__confirm{
   color: #3cc7c0 !important;
+}
+.van-cell {
+  padding: 32rpx !important;
 }
\ No newline at end of file
diff --git a/Pages/yishi/cash/index.wxml b/Pages/yishi/cash/index.wxml
index 7db1ca9..ea973f1 100644
--- a/Pages/yishi/cash/index.wxml
+++ b/Pages/yishi/cash/index.wxml
@@ -50,7 +50,7 @@
   </view> -->
 
   <view class="bottom">
-    <van-button custom-style="border-radius: 10rpx;" block color="#3CC7C0">提取</van-button>
+    <van-button custom-style="border-radius: 10rpx;font-size: 30rpx;" block color="#3CC7C0">提取</van-button>
     <view class="kefu" bindtap="contactKeFu">
       <text>联系客服</text>
     </view>
diff --git a/Pages/yishi/cash/index.wxss b/Pages/yishi/cash/index.wxss
index 44d5df4..90b1ddb 100644
--- a/Pages/yishi/cash/index.wxss
+++ b/Pages/yishi/cash/index.wxss
@@ -58,12 +58,13 @@ page{
   flex-direction: column;
 }
 .cash_top{
+  margin-top: 20rpx;
   display: flex;
   flex: 3;
 }
 .cash_bottom{
   border-top: 1px solid #E5E5E5;
-  flex: 1;
+  flex: 1.2;
   color: #3CC7C0;
   font-size: 32rpx;
   display: flex;
diff --git a/Pages/yishi/identity/index.wxml b/Pages/yishi/identity/index.wxml
index 8b0f92e..72916cd 100644
--- a/Pages/yishi/identity/index.wxml
+++ b/Pages/yishi/identity/index.wxml
@@ -13,6 +13,7 @@
       t-class="custom-tabs"
       theme="line"
       custom-style="font-size: 32rpx"
+      swipeable="{{false}}"
     >
       <!-- 实名认证tab -->
       <t-tab-panel label="实名认证" value="0" style="{{tabPanelstyle}}" catchtouchmove='true'>
diff --git a/Pages/yishi/identity/index.wxss b/Pages/yishi/identity/index.wxss
index 6d9a117..29d8b6f 100644
--- a/Pages/yishi/identity/index.wxss
+++ b/Pages/yishi/identity/index.wxss
@@ -71,7 +71,7 @@
   letter-spacing: 2rpx;
 }
 .t-cell__title-text{
-  font-size: 30rpx !important;
+  font-size: 32rpx !important;
 }
 .t-input__wrap--suffix-icon{
   padding-left: var(--td-spacer-1, 8rpx) !important;
@@ -177,4 +177,34 @@
 }
 .van-picker__confirm{
   color: #3cc7c0 !important;
+}
+.van-cell:after {
+  border-bottom: 1px solid var(--td-cell-border-color, var(--td-gray-color-3, #e7e7e7));
+  bottom: 0;
+  box-sizing: border-box;
+  content: " ";
+  pointer-events: none;
+  position: absolute;
+  width: calc(100vw - 32rpx);
+  transform: scaleY(.5);
+  transform-origin: center;
+  border-bottom-width: 1px;
+  border-bottom-style: solid;
+  border-bottom-color: var(--td-cell-border-color, var(--td-gray-color-3, #e7e7e7));
+}
+.t-cell__note,.t-class-note,.note{
+  font-size: 30rpx !important;
+}
+.van-cell {
+  padding: 32rpx !important;
+}
+.van-picker__cancel{
+  font-size: 32rpx !important;
+}
+.van-picker__confirm{
+  color: #3cc7c0 !important;
+  font-size: 32rpx !important;
+}
+.van-picker__title {
+  font-size: 34rpx !important;
 }
\ No newline at end of file
diff --git a/Pages/yishi/index/index.wxml b/Pages/yishi/index/index.wxml
index 4edc999..1844c43 100644
--- a/Pages/yishi/index/index.wxml
+++ b/Pages/yishi/index/index.wxml
@@ -75,7 +75,7 @@
     </view>
   </view>
   <!-- 广告版块 -->
-  <view class="ad" wx:if="{{swiperList.length > 0}}">
+  <view class="ad">
     <t-swiper
       height="110rpx"
       duration="{{duration}}"
@@ -129,7 +129,7 @@
           src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/chufang.png"
         />
       <view class="fun_box_item_txt">
-      <t-badge dot="{{info.reject_prescription_number ? true : false}}" offset="{{ ['-14rpx', '10rpx'] }}" class="wrapper" content="处方管理" />
+      <t-badge style="display: flex;align-items: center;" dot="{{info.reject_prescription_number ? true : false}}" offset="{{ ['-14rpx', '10rpx'] }}" class="wrapper" content="处方管理" />
       </view>
     </view>
     <view class="fun_box_item" data-moudle="8" bindtap="contactKeFu">
diff --git a/Pages/yishi/index/index.wxss b/Pages/yishi/index/index.wxss
index e4ab867..175dfca 100644
--- a/Pages/yishi/index/index.wxss
+++ b/Pages/yishi/index/index.wxss
@@ -172,11 +172,12 @@
 .fun_box{
   width: 90vw;
   margin: 30rpx auto 0 auto;
-  padding: 20rpx 0;
+  padding: 30rpx 0;
   box-shadow: 0px 2px 10px 0px rgba(0,0,0,0.1);
   display: flex;
   flex-wrap: wrap;
-  justify-content: space-around;
+  justify-content: space-evenly;
+  border-radius: 10rpx;
 }
 .fun_box_item{
   width: 40vw;
@@ -186,7 +187,6 @@
   margin: 10rpx 0;
   display: flex;
   align-items: center;
-  padding-left: 20rpx;
 }
 .fun_box_item_img{
   flex: 1;
@@ -194,11 +194,12 @@
   justify-content: center;
 }
 .fun_box_item_txt{
-  flex: 2;
-  font-size: 30rpx;
+  flex: 2.5;
+  font-size: 34rpx;
   color: #333333;
   height: 70rpx;
   line-height: 70rpx;
+  display: flex;
 }
 .t-class-cancel{
   color: #3CC7C0 !important;
diff --git a/Pages/yishi/kuaisusetup/index.wxss b/Pages/yishi/kuaisusetup/index.wxss
index 8aa348a..d556c43 100644
--- a/Pages/yishi/kuaisusetup/index.wxss
+++ b/Pages/yishi/kuaisusetup/index.wxss
@@ -70,7 +70,7 @@ page{
   position: relative;
   display: flex;
   justify-content: space-between;
-  margin: 20rpx;
+  margin: 20rpx 20rpx 20rpx 30rpx;
   align-items: center;
 }
 .price_steup_box_bottom_num{
@@ -101,7 +101,7 @@ page{
 }
 .bottom{
   width: 90vw;
-  margin: 0 auto;
+  margin: -20rpx auto;
   color: #999;
   letter-spacing: 2rpx;
   font-size: 28rpx;
diff --git a/Pages/yishi/my/index.wxml b/Pages/yishi/my/index.wxml
index 6303acb..c31887b 100644
--- a/Pages/yishi/my/index.wxml
+++ b/Pages/yishi/my/index.wxml
@@ -35,7 +35,7 @@
       </view>
       <view class="account_top_right">
         <navigator url="/Pages/yishi/cash/index" open-type="navigate" hover-class="other-navigator-hover">
-          <van-button custom-style="text-indent: 20rpx;letter-spacing: 20rpx;text-align: center;border-radius: 10rpx;padding: 20rpx 50rpx;" color="linear-gradient(310deg, #FF931A 0%, #FF931A 0%, #FCB75D 100%);">
+          <van-button custom-style="text-indent: 20rpx;letter-spacing: 20rpx;text-align: center;border-radius: 10rpx;padding: 20rpx 50rpx;" color="linear-gradient(310deg, #FF931A 0%, #FF931A 0%, #FCB75D 100%);font-size: 32rpx;">
             提现
           </van-button>
         </navigator>
diff --git a/Pages/yishi/my/index.wxss b/Pages/yishi/my/index.wxss
index 4584c3e..398d140 100644
--- a/Pages/yishi/my/index.wxss
+++ b/Pages/yishi/my/index.wxss
@@ -111,7 +111,9 @@
 .t-badge__content-text {
   line-height: 70rpx !important;
 }
-
+.van-cell {
+  padding: 32rpx !important;
+}
 
 
 
diff --git a/Pages/yishi/myinfo/index.wxss b/Pages/yishi/myinfo/index.wxss
index c1bc9b2..da60a2d 100644
--- a/Pages/yishi/myinfo/index.wxss
+++ b/Pages/yishi/myinfo/index.wxss
@@ -16,4 +16,7 @@
 .dialog_confirm_btn{
   border-top: 1px solid #E9E9E9;
   color: #3CC7C0;
+}
+.van-cell {
+  padding: 32rpx !important;
 }
\ No newline at end of file
diff --git a/Pages/yishi/myprofile/index.js b/Pages/yishi/myprofile/index.js
index d2f2349..a296466 100644
--- a/Pages/yishi/myprofile/index.js
+++ b/Pages/yishi/myprofile/index.js
@@ -2,7 +2,7 @@ const app = getApp()
 Page({
   data: {
     navbarData: {
-      showCapsule: 2, //是否显示左上角图标   1表示显示    0表示不显示
+      showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '我的简介', //导航栏 中间的标题
     },
   },
diff --git a/Pages/yishi/myprofile/index.wxss b/Pages/yishi/myprofile/index.wxss
index ba4595b..30adba9 100644
--- a/Pages/yishi/myprofile/index.wxss
+++ b/Pages/yishi/myprofile/index.wxss
@@ -1,58 +1,6 @@
-/* .container{
-  padding-bottom: 50rpx;
-} */
-.t-cell__note {
-  font-size: 25rpx !important;
-  letter-spacing: 2rpx;
-}
-.t-cell__title-text{
+.t-cell__note,.t-class-note,.note{
   font-size: 30rpx !important;
 }
-.t-input__wrap--suffix-icon{
-  padding-left: var(--td-spacer-1, 8rpx) !important;
-}
-
-.container {
-  width: 100vw;
-  background-color: #ffffff;
-}
-.tui-navigatorbar{
-  position: fixed;
-  top: 0;
-  width: 750rpx;
-  height: 170rpx;
-  background-color: #bae46b;
-  z-index: 99;
-}
-.tui-navigatorbar-back{
-  position: absolute;
-  width: 48rpx;
-  height: 48rpx;
-  left: 40rpx;
-  bottom: 20rpx;
-}
-.conversation-title {
-  position:absolute;
-  width: 350rpx;
-  height: 88rpx;
-  line-height: 56rpx;
-  font-size: 36rpx;
-  color: #e68080;
-  bottom: 0;
-  left: 200rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-.van-cell--required::before {
-  left: 4.7rem !important;
-}
-.required{
-  color: #e34d59;
-}
-.van-picker__confirm{
-  color: #3cc7c0 !important;
-}
 .t-tabs__item--active{
   color: #49B9AD !important;
 }
@@ -61,4 +9,20 @@
 }
 .t-icon-check{
   color: #49B9AD !important;
+}
+.zhuanchang_btn--confirm {
+  color: #3cc7c0;
+}
+.van-picker__cancel{
+  font-size: 32rpx !important;
+}
+.van-picker__confirm{
+  color: #3cc7c0 !important;
+  font-size: 32rpx !important;
+}
+.van-picker__title {
+  font-size: 34rpx !important;
+}
+.van-cell {
+  padding: 32rpx !important;
 }
\ No newline at end of file
diff --git a/Pages/yishi/notice_deatil/index.wxss b/Pages/yishi/notice_deatil/index.wxss
index c4c450c..87657d4 100644
--- a/Pages/yishi/notice_deatil/index.wxss
+++ b/Pages/yishi/notice_deatil/index.wxss
@@ -11,7 +11,7 @@ page{
 }
 .item{
   display: flex;
-  margin-bottom: 30rpx;
+  margin-bottom: 40rpx;
 }
 .title{
   flex: 1;
diff --git a/Pages/yishi/onlinesetup/index.wxss b/Pages/yishi/onlinesetup/index.wxss
index f611f85..4aeee3c 100644
--- a/Pages/yishi/onlinesetup/index.wxss
+++ b/Pages/yishi/onlinesetup/index.wxss
@@ -55,7 +55,7 @@
   margin: 20rpx auto 0 auto;
   font-size: 32rpx;
   margin-bottom: 20rpx;
-  font-family: "AlibabaPuHuiTi-2-55-Regular";
+  /* font-family: "AlibabaPuHuiTi-2-55-Regular"; */
   color: #333333;
 }
 .price_steup_box{
@@ -71,7 +71,7 @@
   position: relative;
   display: flex;
   justify-content: space-between;
-  margin: 20rpx;
+  margin: 20rpx 20rpx 20rpx 30rpx;
   align-items: center;
   padding-bottom: 20rpx;
 }
@@ -79,7 +79,7 @@
   position: relative;
   display: flex;
   justify-content: space-between;
-  margin: 0rpx 20rpx 0rpx 20rpx;
+  margin: 0rpx 20rpx 0rpx 30rpx;
   align-items: center;
 }
 .price_steup_box_top_title, .price_steup_box_bottom_title{
@@ -110,7 +110,7 @@
 }
 .bottom{
   width: 90vw;
-  margin: 0 auto;
+  margin: -20rpx auto;
   color: #999;
   letter-spacing: 2rpx;
   font-size: 28rpx;
diff --git a/Pages/yishi/quickreply/index.wxss b/Pages/yishi/quickreply/index.wxss
index a0f9d85..e2ce446 100644
--- a/Pages/yishi/quickreply/index.wxss
+++ b/Pages/yishi/quickreply/index.wxss
@@ -64,4 +64,10 @@ page{
   width: 65px;
   justify-content: center;
   color: #fff;
+}
+.van-cell {
+  padding: 32rpx !important;
+  font-size: 34rpx !important;
+  color: #333 !important;
+  font-weight: bolder !important;
 }
\ No newline at end of file
diff --git a/Pages/yishi/service_notice/index.wxml b/Pages/yishi/service_notice/index.wxml
index a24bd49..5ce3c76 100644
--- a/Pages/yishi/service_notice/index.wxml
+++ b/Pages/yishi/service_notice/index.wxml
@@ -6,7 +6,7 @@
       <view class="item_top">
         <view class="item_img">
           <text style="margin-left: 10rpx;">快速问诊</text> 
-          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
+          <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
         <view class="item_date">2023-1-02 12:22</view>
       </view>
@@ -17,7 +17,7 @@
       <view class="item_top">
         <view class="item_img">
           <text style="margin-left: 10rpx;">在线问诊</text> 
-          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/online.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
+          <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/online.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
         <view class="item_date">2023-1-02 12:22</view>
       </view>
@@ -27,8 +27,8 @@
     <view class="item">
       <view class="item_top">
         <view class="item_img">
-          <text style="margin-left: 10rpx;">义诊</text> 
-          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/yizhen.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
+          <text style="margin-left: 10rpx;">公益问诊</text> 
+          <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/yizhen.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
         <view class="item_date">2023-1-02 12:22</view>
       </view>
@@ -39,7 +39,7 @@
       <view class="item_top">
         <view class="item_img">
           <text style="margin-left: 10rpx;">问诊购药</text> 
-          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/drug.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
+          <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/drug.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
         <view class="item_date">2023-1-02 12:22</view>
       </view>
diff --git a/Pages/yishi/service_notice/index.wxss b/Pages/yishi/service_notice/index.wxss
index 47c4885..594dcad 100644
--- a/Pages/yishi/service_notice/index.wxss
+++ b/Pages/yishi/service_notice/index.wxss
@@ -35,6 +35,10 @@ page{
 }
 .item_content{
   margin-top: 20rpx;
-  font-size: 24rpx;
+  font-size: 30rpx;
   color: #666666;
+}
+.van_img{
+  display: flex;
+  justify-content: center;
 }
\ No newline at end of file
diff --git a/Pages/yishi/system_notice/index.wxml b/Pages/yishi/system_notice/index.wxml
index e3723fc..93a9f34 100644
--- a/Pages/yishi/system_notice/index.wxml
+++ b/Pages/yishi/system_notice/index.wxml
@@ -5,7 +5,7 @@
     <view class="item" bindtap="go" data-url="/Pages/yishi/notice_deatil/index">
       <view class="item_top">
         <view class="item_img">
-          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
+          <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
         <view class="item_content">9月份的服务费结算通知</view>
       </view>
@@ -17,7 +17,7 @@
     <view class="item" bindtap="go" data-url="/Pages/yishi/notice_deatil/index">
       <view class="item_top">
         <view class="item_img">
-          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
+          <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
         <view class="item_content">8月份的服务费结算通知</view>
       </view>
@@ -26,7 +26,7 @@
     <view class="item" bindtap="go" data-url="/Pages/yishi/notice_deatil/index">
       <view class="item_top">
         <view class="item_img">
-          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
+          <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
         <view class="item_content">7月份的服务费结算通知</view>
       </view>
@@ -35,7 +35,7 @@
     <view class="item" bindtap="go" data-url="/Pages/yishi/notice_deatil/index">
       <view class="item_top">
         <view class="item_img">
-          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
+          <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
         <view class="item_content">6月份的服务费结算通知</view>
       </view>
diff --git a/Pages/yishi/system_notice/index.wxss b/Pages/yishi/system_notice/index.wxss
index 4547adb..4a648bf 100644
--- a/Pages/yishi/system_notice/index.wxss
+++ b/Pages/yishi/system_notice/index.wxss
@@ -23,6 +23,10 @@ page{
   display: flex;
   align-items: center;
 }
+.van_img{
+  display: flex;
+  justify-content: center;
+}
 .item_content{
   font-size: 34rpx;
   color: #333333;
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxss b/Pages/yishi/wenzhen_v2/wenzhen.wxss
index d418242..8814706 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxss
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxss
@@ -17,7 +17,7 @@ page{
   display: flex;
   flex-direction: column;
   color: #666666;
-  font-size: 20rpx;
+  font-size: 28rpx;
 }
 .top_left{
   border-right: 1px solid #F4F4F4;
diff --git a/Pages/yishi/wenzhenorder/index.wxss b/Pages/yishi/wenzhenorder/index.wxss
index 9c2a7c5..4f81925 100644
--- a/Pages/yishi/wenzhenorder/index.wxss
+++ b/Pages/yishi/wenzhenorder/index.wxss
@@ -53,10 +53,13 @@
   background-color: #fff;
   align-items: center;
   z-index: 99;  
+  padding-bottom: 50rpx;
 }
 .bottom_checkbox{
   flex: 2;
   font-size: 30rpx;
+  display: flex;
+  justify-content: center;
 }
 .bottom_content{
   flex: 6;
diff --git a/Pages/yishi/yizhensetup/index.wxss b/Pages/yishi/yizhensetup/index.wxss
index 1e7d0ff..50f6015 100644
--- a/Pages/yishi/yizhensetup/index.wxss
+++ b/Pages/yishi/yizhensetup/index.wxss
@@ -56,7 +56,7 @@ page{
   margin: 0 auto;
   font-size: 32rpx;
   margin-bottom: 20rpx;
-  font-family: "AlibabaPuHuiTi-2-55-Regular";
+  /* font-family: "AlibabaPuHuiTi-2-55-Regular"; */
   color: #333333;
 }
 .price_steup_box{
@@ -98,7 +98,7 @@ page{
 }
 .bottom{
   width: 90vw;
-  margin: 0 auto;
+  margin: -20rpx auto;
   color: #999;
   letter-spacing: 2rpx;
   font-size: 28rpx;
diff --git a/Pages/yishi/zhiye_identity/index.wxss b/Pages/yishi/zhiye_identity/index.wxss
index 3c2740e..f7b6729 100644
--- a/Pages/yishi/zhiye_identity/index.wxss
+++ b/Pages/yishi/zhiye_identity/index.wxss
@@ -7,7 +7,7 @@
   line-height: 80rpx;
   height: 80rpx;
   color: #ED7B2F;
-  font-size: 20rpx;
+  font-size: 28rpx;
   padding-left: 20rpx;
 }
 .notice::after{
diff --git a/app.js b/app.js
index f07d216..238b2fb 100644
--- a/app.js
+++ b/app.js
@@ -25,22 +25,22 @@ App({
     console.log("download fonts from oss ");
     let loadStatus = false;
     if (!loadStatus) {
-      wx.loadFontFace({
-        global: true,
-        family: 'AlibabaPuHuiTi',
-        // source: 'url("https://oss.igandan.com/app/fonts/AlibabaPuHuiTi/STXINGKA.TTF")',
-        source: 'url("https://docwebsite.oss-cn-beijing.aliyuncs.com/app/fonts/AlibabaPuHuiTi/AlibabaPuHuiTi-2-65-Medium/AlibabaPuHuiTi-2-65-Medium.ttf")',
-        success() {
-            loadStatus = true;
-            console.log("download fonts from oss success");
-        },
-        fail(){
-          console.log("download fonts from oss error");
-        },
-        complete(){
-          console.log("download fonts from oss complete");
-        }
-      });
+      // wx.loadFontFace({
+      //   global: true,
+      //   family: 'AlibabaPuHuiTi',
+      //   // source: 'url("https://oss.igandan.com/app/fonts/AlibabaPuHuiTi/STXINGKA.TTF")',
+      //   source: 'url("https://docwebsite.oss-cn-beijing.aliyuncs.com/app/fonts/AlibabaPuHuiTi/AlibabaPuHuiTi-2-65-Medium/AlibabaPuHuiTi-2-65-Medium.ttf")',
+      //   success() {
+      //     loadStatus = true;
+      //     console.log("download fonts from oss success");
+      //   },
+      //   fail(){
+      //     console.log("download fonts from oss error");
+      //   },
+      //   complete(){
+      //     console.log("download fonts from oss complete");
+      //   }
+      // });
     }
 
     this.aegisInit()
diff --git a/app.wxss b/app.wxss
index 25ecd8f..12c22d3 100644
--- a/app.wxss
+++ b/app.wxss
@@ -1,5 +1,5 @@
 /**app.wxss**/
-@font-face{
+/* @font-face{
   font-family:AlibabaPuHuiTi-2-55-Regular;
   src:url('https://oss.igandan.com/app/fonts/AlibabaPuHuiTi/AlibabaPuHuiTi-2-55-Regular/AlibabaPuHuiTi-2-55-Regular.ttf')format('TrueType');
   font-display:swap;
@@ -16,4 +16,4 @@
 }
 page{
   font-family:AlibabaPuHuiTi-2-65-Medium;
-}
+} */
diff --git a/commpents/myprofile/index.js b/commpents/myprofile/index.js
index 685eba9..bc99575 100644
--- a/commpents/myprofile/index.js
+++ b/commpents/myprofile/index.js
@@ -216,9 +216,9 @@ Component({
         })
       }).then(()=>{
         let index = this.data.zhuanchang_columns.findIndex(item => {
-          return item.is_selected == 1
+          return item.is_selected == 1;
         })
-        if(index) {
+        if(index != undefined) {
           this.setData({
             zhuanchang_note: ""
           })
diff --git a/commpents/myprofile/index.wxml b/commpents/myprofile/index.wxml
index b4a08ed..fca0589 100644
--- a/commpents/myprofile/index.wxml
+++ b/commpents/myprofile/index.wxml
@@ -1,4 +1,4 @@
-        <view class="photo" style="border-bottom: {{avatar_reason==''?'1px solid var(--td-cell-border-color, var(--td-gray-color-3, #e7e7e7));':'unset'}}">
+        <view class="{{avatar_reason!=''?'photo':'photo_reason'}}">
           <view class="title">头像 <text class="required"> *</text></view>
           <van-uploader disabled="{{ indentity && iden_auth_disabled }}" bind:after-read="doUploadPhoto" data-scene="1" data-field_name="avatar" data-file_multiple="false">
             <view class="right">
diff --git a/commpents/myprofile/index.wxss b/commpents/myprofile/index.wxss
index 8127405..99a1b8c 100644
--- a/commpents/myprofile/index.wxss
+++ b/commpents/myprofile/index.wxss
@@ -9,6 +9,31 @@
   font-weight: 400;
   align-items: center;
 }
+.photo_reason{
+  position: relative;
+  padding: 32rpx 32rpx 32rpx 0;
+  margin-left: 32rpx;
+  display: flex;
+  justify-content: space-between;
+  font-size: 32rpx;
+  font-weight: 400;
+  align-items: center;
+}
+.photo_reason::after{
+  position: absolute;
+  box-sizing: border-box;
+  content: ' ';
+  pointer-events: none;
+  right: 0;
+  bottom: 0;
+  border-bottom: 1px solid var(--td-cell-border-color, var(--td-gray-color-3, #e7e7e7));
+  transform: scaleY(0.5);
+  left: 0rpx;
+}
+
+.required{
+  color: #e34d59;
+}
 
 .title{
   font-size: 30rpx;
@@ -65,14 +90,14 @@
   margin: 20rpx 10rpx 20rpx 0;
   font-size: 28rpx;
 }
-.t-radio__icon--checked {
-  color: #49B9AD !important;
-}
 .t-tabs__item--active{
   color: #49B9AD !important;
 }
 .t-tabs__track{
-  background-color: var(--td-tab-track-color, var(--td-primary-color, #49B9AD)) !important;
+  background-color: #49B9AD !important;
+}
+.t-icon-check{
+  color: #49B9AD !important;
 }
 .t-cell__note {
   font-size: 25rpx !important;
@@ -96,7 +121,7 @@
 }
 .bottom_next{
   width: 95vw;
-  margin: 530rpx auto;
+  margin: 530rpx auto 0 auto;
 }
 .sub_button{
   width: 95vw;
@@ -120,6 +145,7 @@
   height: 300rpx;
   background-color: cadetblue;
 }
+
 .zhuanchang_box{
   display: flex;
   flex-wrap: wrap;
@@ -174,41 +200,6 @@
 .zhuanchang_btn--confirm {
   color: #3cc7c0;
 }
-.error_box{
-  position: relative;
-  display: flex;
-  background-color: #FEF1F1;
-  width: calc(95vw - 64rpx);
-  height: 100rpx;
-  margin: 30rpx auto 0 auto;
-  align-items: center;
-  padding-left: 32rpx;
-  border-radius: 10rpx;
-}
-.error_box::after{
-  border-radius: 5rpx;
-  position: absolute;
-  width: 0px;
-  height: 0px;
-  border-width: 16rpx;
-  border-style: solid;
-  border-color: transparent transparent #FEF1F1 transparent;
-  content: ' ';
-  left: 50rpx;
-  top: -30rpx;
-}
-.error_msg{
-  position: relative;
-  margin-left: 10rpx;
-  color: #FF0000;
-  letter-spacing: 3rpx;
-  font-weight: 600;
-}
-.has_error{
-  margin-left: 32rpx;
-  padding-bottom: 20rpx;
-  border-bottom: 1rpx solid #e7e7e7;
-}
 .van-picker__columns {
   height: 264px !important;
   top: 40px !important;
@@ -217,6 +208,24 @@
   top: -270px !important;
   position: relative !important;
 }
-.custom_keshi_error{
-  display: none;
+.van-picker__confirm{
+  color: #3cc7c0 !important;
 }
+.van-cell:after {
+  border-bottom: 1px solid var(--td-cell-border-color, var(--td-gray-color-3, #e7e7e7));
+  bottom: 0;
+  box-sizing: border-box;
+  content: " ";
+  pointer-events: none;
+  position: absolute;
+  width: calc(100vw - 32rpx);
+  transform: scaleY(.5);
+  transform-origin: center;
+  border-bottom-width: 1px;
+  border-bottom-style: solid;
+  border-bottom-color: var(--td-cell-border-color, var(--td-gray-color-3, #e7e7e7));
+}
+
+.van-cell {
+  padding: 32rpx !important;
+}
\ No newline at end of file
diff --git a/commpents/textarea-cell/index.wxml b/commpents/textarea-cell/index.wxml
index 08fde3c..f767d84 100644
--- a/commpents/textarea-cell/index.wxml
+++ b/commpents/textarea-cell/index.wxml
@@ -3,11 +3,11 @@
     <view class="textarea-cell-name">{{ textarea_cell_name }}<text wx:if="{{ required }}" class="required"> *</text></view>
     <view class="textarea-cell-note t-cell__note" bindtap="onshowNote">
       <view><t-icon name="{{ t_icon_name }}" size="{{ t_icon_size}}" data-name="{{ t_icon_name }}" /></view>
-      <text>{{ textarea_cell_note }}</text>
+      <text style="font-size: 28rpx;">{{ textarea_cell_note }}</text>
     </view>
   </view>
   <view class="textarea-cell-content">
-    <textarea disabled="{{disabled}}" bindblur="bindTextAreaBlur" maxlength="1000" style="margin: 32rpx 32rpx 0 32rpx; width: 100%; height: 90%; background-color: #FAFAFA;" name="" id="" placeholder="{{ textarea_cell_content_placeholder }}" value="{{textarea_val}}"></textarea>
+    <textarea disabled="{{disabled}}" bindblur="bindTextAreaBlur" maxlength="1000" style="margin: 20rpx 20rpx 0 20rpx; width: 100%; height: 90%; background-color: #FAFAFA;" name="" id="" placeholder="{{ textarea_cell_content_placeholder }}" value="{{textarea_val}}"></textarea>
   </view>
   <view class="error_box" wx:if="{{ has_error_content != '' }}" >
     <t-icon color="red" name="close-circle-filled" size="48rpx" data-name="close-circle-filled" />
diff --git a/commpents/textarea-cell/index.wxss b/commpents/textarea-cell/index.wxss
index 2883557..e21d928 100644
--- a/commpents/textarea-cell/index.wxss
+++ b/commpents/textarea-cell/index.wxss
@@ -25,7 +25,7 @@
 .textarea-cell-content{
   background-color: #FAFAFA;
   width: 95%;
-  height: 500rpx;
+  height: 310rpx;
   display: flex;
   margin: 30rpx auto 0 auto;
 }
diff --git a/commpents/upload-cell/index.wxml b/commpents/upload-cell/index.wxml
index 2a90ff0..85f4a78 100644
--- a/commpents/upload-cell/index.wxml
+++ b/commpents/upload-cell/index.wxml
@@ -3,7 +3,7 @@
     <view class="upload-cell-name">{{ upload_cell_name }}<text wx:if="{{ required }}" class="required"> *</text></view>
     <view class="upload-cell-note t-cell__note" bindtap="onshowNote" wx:if="{{upload_cell_note != ''}}">
       <view><t-icon name="{{ t_icon_name }}" size="{{ t_icon_size}}" data-name="{{ t_icon_name }}" /></view>
-      <text>{{ upload_cell_note }}</text>
+      <text style="font-size: 28rpx;">{{ upload_cell_note }}</text>
     </view>
   </view>
   <view class="upload-cell-desc">
diff --git a/commpents/upload-cell/index.wxss b/commpents/upload-cell/index.wxss
index 8ad4f31..bc772ad 100644
--- a/commpents/upload-cell/index.wxss
+++ b/commpents/upload-cell/index.wxss
@@ -37,6 +37,7 @@
 .upload-cell-desc{
   color: #999999;
   margin: 20rpx 0;
+  font-size: 30rpx;
 }
 .error_box{
   position: relative;
diff --git a/commpents/wenzhen_data/index.wxml b/commpents/wenzhen_data/index.wxml
index 1e4d7b3..136f992 100644
--- a/commpents/wenzhen_data/index.wxml
+++ b/commpents/wenzhen_data/index.wxml
@@ -10,11 +10,11 @@
   <view class="content_3">
     <view class="status {{ status_class }}">{{ status_text }}</view>
     <view class="btn" wx:if="{{ status == 3 }}">
-      <van-button bind:click="go" data-url="/Pages/yishi/case/index?order_inquiry_id={{order_inquiry_id}}" plain custom-style="width:200rpx;  border-radius: 10rpx;" color="#3CC7C0">查看病历</van-button>
-      <van-button type="default" bindtap="tabShow" custom-style="width:200rpx;  border-radius: 10rpx;margin-left:20rpx;" color="#3CC7C0">去接诊</van-button>
+      <van-button bind:click="go" data-url="/Pages/yishi/case/index?order_inquiry_id={{order_inquiry_id}}" plain custom-style="width:200rpx; height:67rpx;  border-radius: 10rpx;" color="#3CC7C0">查看病历</van-button>
+      <van-button type="default" bindtap="tabShow" custom-style="width:200rpx; height:67rpx; border-radius: 10rpx;margin-left:20rpx;" color="#3CC7C0">去接诊</van-button>
     </view>
     <view class="btn" wx:if="{{ status >= 4 }}">
-      <van-button bind:click="goChat" data-from_account="{{from_account}}" data-inquiry_type="{{inquiry_type}}" data-order_inquiry_id="{{order_inquiry_id}}" data-url="/Pages/yishi/chat/index" plain custom-style="width:200rpx;  border-radius: 10rpx;" color="#3CC7C0">问诊详情</van-button>
+      <van-button bind:click="goChat" data-from_account="{{from_account}}" data-inquiry_type="{{inquiry_type}}" data-order_inquiry_id="{{order_inquiry_id}}" data-url="/Pages/yishi/chat/index" plain custom-style="width:200rpx; height:67rpx;  border-radius: 10rpx;" color="#3CC7C0">问诊详情</van-button>
       <!-- <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>
diff --git a/commpents/wenzhen_data/index.wxss b/commpents/wenzhen_data/index.wxss
index 1fad6c2..111551c 100644
--- a/commpents/wenzhen_data/index.wxss
+++ b/commpents/wenzhen_data/index.wxss
@@ -52,7 +52,7 @@
   border-top: 1px solid #E3E4E5;
   align-items: center;
   margin: 0 30rpx;
-  min-height: 50rpx;
+  min-height: 70rpx;
 }
 .pop_content{
   text-align: center;

From 5ba50e4e617f42ac19159d244e182247e3f8cfe1 Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Tue, 28 Mar 2023 20:52:22 +0800
Subject: [PATCH 12/83] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/mobile_login/index.js                   |  14 +-
 Pages/mobile_login/index.wxml                 |  17 +-
 Pages/mobile_login/index.wxss                 |  40 ++++
 Pages/yishi/case/index.js                     |  26 ++-
 Pages/yishi/case/index.json                   |   2 +-
 Pages/yishi/case/index.wxml                   |  23 ++-
 Pages/yishi/case/index.wxss                   |  20 +-
 Pages/yishi/cashrecord/index.wxml             |   8 +-
 Pages/yishi/chat/index.js                     |   4 +-
 Pages/yishi/chat/index.json                   |   3 +-
 Pages/yishi/chufangsetup/index.js             |   7 +-
 Pages/yishi/chufangsetup/index.wxml           |  53 +----
 Pages/yishi/identity/index.wxss               |  15 ++
 Pages/yishi/index/index.js                    |  32 ++-
 Pages/yishi/index/index.wxml                  |  16 +-
 Pages/yishi/index/index.wxss                  |   2 +-
 Pages/yishi/myaccount/index.wxml              |   2 +-
 Pages/yishi/myaccount/index.wxss              |   3 +
 Pages/yishi/myprofile/index.wxss              |  22 ++
 Pages/yishi/notice_deatil/index.js            |  22 +-
 Pages/yishi/notice_deatil/index.wxml          |  14 +-
 Pages/yishi/onlinechufang/index.js            | 194 +++++++++++++++---
 Pages/yishi/onlinechufang/index.wxml          |  31 +--
 Pages/yishi/quickreply/index.js               |   2 +-
 Pages/yishi/quickreply/index.wxml             |   5 +-
 Pages/yishi/quickreply/index.wxss             |   7 +-
 Pages/yishi/service_notice/index.js           |  40 ++++
 Pages/yishi/service_notice/index.json         |   8 +-
 Pages/yishi/service_notice/index.wxml         |  45 +++-
 Pages/yishi/system_notice/index.js            |  86 ++++++--
 Pages/yishi/system_notice/index.json          |   8 +-
 Pages/yishi/system_notice/index.wxml          |  43 +---
 Pages/yishi/wenzhen_v2/wenzhen.js             |  14 +-
 Pages/yishi/wenzhenorder/index.wxml           |   4 +-
 Pages/yishi/yizhensetup/index.wxss            |   4 +
 .../TUIChat/components/MessageInput/index.js  | 101 ++++++++-
 .../components/MessageInput/index.json        |   3 +-
 .../components/MessageInput/index.wxml        |  13 +-
 .../components/MessageInput/index.wxss        |  72 ++++---
 .../TUIChat/components/MessageList/index.js   |  30 +++
 .../TUIChat/components/MessageList/index.json |   3 +-
 .../TUIChat/components/MessageList/index.wxml |  24 ++-
 .../TUIChat/components/MessageList/index.wxss |  52 ++---
 TUIKit/components/TUIChat/index.js            |  48 ++++-
 TUIKit/components/TUIChat/index.json          |   6 +-
 TUIKit/components/TUIChat/index.wxml          |  29 ++-
 TUIKit/components/TUIChat/index.wxss          |  62 +++++-
 app.js                                        |   5 +
 commpents/myprofile/index.js                  |  26 ++-
 commpents/myprofile/index.json                |   3 +-
 commpents/myprofile/index.wxml                |  34 ++-
 commpents/myprofile/index.wxss                |  10 +-
 commpents/textarea-cell/index.js              |   6 +-
 .../tdesign-miniprogram/navbar/navbar.js      |   4 +
 project.private.config.json                   |   2 +-
 static/images/123.png                         | Bin 4362 -> 0 bytes
 utils/network/api.js                          |  93 ++++++++-
 utils/util.js                                 |   7 +
 58 files changed, 1122 insertions(+), 347 deletions(-)
 delete mode 100644 static/images/123.png

diff --git a/Pages/mobile_login/index.js b/Pages/mobile_login/index.js
index ac6fef6..0b9409c 100644
--- a/Pages/mobile_login/index.js
+++ b/Pages/mobile_login/index.js
@@ -21,11 +21,19 @@ Page({
     });
   },
   phone_change(e){
-    let phone = this.data.phone;
-    if(phone != ""){
+    let phone = e.detail.value;
+    this.setData({
+      phone: e.detail.value
+    })
+    let phone_reg = /^1[3-9]\d{9}$/;
+    if(phone_reg.test(phone)){
       this.setData({
         btn_color: "#3CC7C0"
       })
+    }else{
+      this.setData({
+        btn_color: "#ccc"
+      })
     }
   },
   getCodePhone(e){
@@ -139,7 +147,7 @@ Page({
         })
       }else{
         _this.setData({
-          btn_msg: "获取验证码",
+          btn_msg: "重新获取验证码",
           btn_disabled: false
         })
         clearInterval(time_index);
diff --git a/Pages/mobile_login/index.wxml b/Pages/mobile_login/index.wxml
index 2a0684a..1c9f1ee 100644
--- a/Pages/mobile_login/index.wxml
+++ b/Pages/mobile_login/index.wxml
@@ -3,22 +3,21 @@
     <van-image height="196rpx" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/logo2.png" fit="heightFix" />
   </view>
   <view class="fields">
-    <van-field
-      model:value="{{ phone }}"
-      label="+86"
-      placeholder="请输入手机号"
-      type="number"
-      bind:input="phone_change"
-      input-align="left"
-    />
+    <view class="phone_box">
+      <view class="country">+86</view>
+      <view class="phone">
+        <input placeholder-style="color:#c8c9cc;font-size:34rpx;" type="number" confirm-type="next" bindinput="phone_change" auto-focus placeholder="请输入手机号"/>
+      </view>
+    </view>
     <van-field
       model:value="{{ sms }}"
       center
       clearable
       type="number"
-      label="短信验证码"
+      label=""
       placeholder="请输入短信验证码"
       use-button-slot
+      placeholder-style="color:#c8c9cc;font-size:30rpx;"
     >
       <van-button disabled="{{btn_disabled}}" color="{{btn_color}}" slot="button" size="small" round plain  type="primary" bind:click="getCodePhone">
         {{btn_msg}}
diff --git a/Pages/mobile_login/index.wxss b/Pages/mobile_login/index.wxss
index ec68852..5f9ba0d 100644
--- a/Pages/mobile_login/index.wxss
+++ b/Pages/mobile_login/index.wxss
@@ -10,4 +10,44 @@
 .btn{
   font-size: 28rpx;
   color: #666666;
+}
+.van-cell {
+  padding: 32rpx !important;
+  font-size: 34rpx !important;
+}
+.mylabel{
+  background-color: red;
+  width: 100rpx !important;
+}
+.label-class{
+  background-color: royalblue !important;
+}
+.phone_box{
+  display: flex;
+  padding: 32rpx;
+  position: relative;
+}
+.country{
+  flex: 1;
+  height: 24px;
+  line-height: 24px;
+}
+.phone{
+  flex: 7;
+  height: 24px;
+}
+.phone_box:after {
+  border-bottom: 1px solid #ebedf0;
+  bottom: 0;
+  box-sizing: border-box;
+  content: " ";
+  left: 16px;
+  pointer-events: none;
+  position: absolute;
+  right: 16px;
+  transform: scaleY(.5);
+  transform-origin: center;
+  border-bottom-width: 1px;
+  border-bottom-style: solid;
+  border-bottom-color: rgb(235, 237, 240);
 }
\ No newline at end of file
diff --git a/Pages/yishi/case/index.js b/Pages/yishi/case/index.js
index e73cfb4..da1e13b 100644
--- a/Pages/yishi/case/index.js
+++ b/Pages/yishi/case/index.js
@@ -9,20 +9,38 @@ Page({
     },
     height: app.globalData.height,
     order_inquiry_id: "",
-    case_detail: {}
+    case_detail: {},
+    imglist: []
   },
   onLoad(options){
     this.setData({
       order_inquiry_id: options.order_inquiry_id
     })
-  },
-  onShow(){
     //获取患者问诊病例
     api.getDoctorInquiryCase({order_inquiry_id: this.data.order_inquiry_id}).then(response => {
       console.log(response);
       this.setData({
         case_detail: response.data
       })
+    }).then(res => {
+      this.formatImgList();
     }).catch(errors => {console.error(errors);})
-  }
+  },
+  formatImgList(){
+    let diagnose_images = this.data.case_detail.diagnose_images;
+    let img_list = [];
+    diagnose_images.forEach(item => {
+      let img = {};
+      img.isImage = true;
+      img.url = item;
+      img_list.push(img);
+    })
+    this.setData({
+      imglist: img_list
+    })
+  },
+  onShow(){
+
+  },
+
 })
\ No newline at end of file
diff --git a/Pages/yishi/case/index.json b/Pages/yishi/case/index.json
index ee34b87..3e38f1a 100644
--- a/Pages/yishi/case/index.json
+++ b/Pages/yishi/case/index.json
@@ -2,6 +2,6 @@
   "component": true,
   "usingComponents": {
     "te-nav-bar": "/commpents/te_navbar",
-    "t-image": "tdesign-miniprogram/image/image"
+    "van-uploader": "@vant/weapp/uploader/index"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/case/index.wxml b/Pages/yishi/case/index.wxml
index 85ce54d..2fdb5b4 100644
--- a/Pages/yishi/case/index.wxml
+++ b/Pages/yishi/case/index.wxml
@@ -48,46 +48,47 @@
         </view>
       </view>
       <view class="disease_box_item">
-        <view class="title">问诊本人复诊凭证(病例/处方单/检查报告/住院单可任选其一)：</view>
-        <view class="conent">无</view>
+        <view class="title">复诊凭证(病例/处方单/检查报告/住院单)：</view>
+        <view class="conent" wx:if="{{case_detail.diagnose_images.length == 0}}">无</view>
       </view>
       <view class="img_box">
-        <t-image id="loading-img" shape="round" src="{{item.url}}" width="72" height="72" wx:for="{{case_detail.diagnose_images}}"/>
+        <van-uploader image-fit="aspectFit" file-list="{{ imglist }}" show-upload="{{false}}" deletable="{{false}}" />
       </view>
+
     </view>
   </view>
   <view class="main_title">其他信息</view>
   <view class="data_box orther">
     <view class="disease_box">
-      <view class="disease_box_item">
+      <view class="disease_box_item" wx:if="{{case_detail.is_allergy_history != 0}}">
         <view class="title">过敏史：</view>
         <view class="conent">{{case_detail.is_allergy_history==0?'否':case_detail.allergy_history}}</view>
       </view>
-      <view class="disease_box_item">
+      <view class="disease_box_item" wx:if="{{case_detail.is_family_history != 0}}">
         <view class="title">家族史：</view>
         <view class="conent">{{case_detail.is_family_history==0?'否':case_detail.family_history}}</view>
       </view>
-      <view class="disease_box_item">
+      <view class="disease_box_item" wx:if="{{case_detail.is_pregnant != 0}}">
         <view class="title">是否备孕、妊娠或者哺乳期：</view>
         <view class="conent">{{case_detail.is_pregnant==0?'否':case_detail.pregnant}}</view>
       </view>
-      <view class="disease_box_item">
+      <view class="disease_box_item" wx:if="{{case_detail.drink_wine_status != 0}}">
         <view class="title">饮酒史：</view>
         <view class="conent">{{case_detail.drink_wine_status==1?'从不':case_detail.drink_wine_status==2?'偶尔':case_detail.drink_wine_status==3?'经常':case_detail.drink_wine_status==4?'每天':case_detail.drink_wine_status==5?'已戒酒':'其他'}}</view>
       </view>
-      <view class="disease_box_item">
+      <view class="disease_box_item" wx:if="{{case_detail.smoke_status != 0}}">
         <view class="title">吸烟史：</view>
         <view class="conent">{{case_detail.smoke_status==1?'从不':case_detail.smoke_status==2?'偶尔':case_detail.smoke_status==3?'经常':case_detail.smoke_status==4?'每天':case_detail.smoke_status==5?'已戒烟':'其他'}}</view>
       </view>
-      <view class="disease_box_item">
+      <view class="disease_box_item" wx:if="{{case_detail.is_operation != 0}}">
         <view class="title">手术史：</view>
         <view class="conent">{{case_detail.is_operation==0?'否':case_detail.operation}}</view>
       </view>
-      <view class="disease_box_item">
+      <view class="disease_box_item" wx:if="{{case_detail.chemical_compound_status != 0}}">
         <view class="title">接触化学物：</view>
         <view class="conent">{{case_detail.chemical_compound_status==1?'从不':case_detail.chemical_compound_status==2?'偶尔':case_detail.chemical_compound_status==3?'经常':case_detail.chemical_compound_status==4?'每天':'其他'}}</view>
       </view>
-      <view class="disease_info" wx:if="{{case_detail.chemical_compound_status > 1}}">
+      <view class="disease_info" wx:if="{{case_detail.chemical_compound_status != 1}}">
         详细描述:{{case_detail.chemical_compound_describe}}
       </view>
     </view>
diff --git a/Pages/yishi/case/index.wxss b/Pages/yishi/case/index.wxss
index e04e7a1..91cb70e 100644
--- a/Pages/yishi/case/index.wxss
+++ b/Pages/yishi/case/index.wxss
@@ -2,7 +2,7 @@ page{
   background-color: #F6F6F6;
 }
 .container{
-  width: 100vw;
+  /* width: 100vw; */
   padding: 0 4vw;
 }
 .main_title{
@@ -38,14 +38,14 @@ page{
 }
 .info_item{
   text-align: center;
-  width: 180rpx;
+  /* width: 180rpx; */
   height: 60rpx;
   display: flex;
   align-items: center;
   margin-left: 20rpx;
 }
 .info_title{
-  font-size: 30rpx;
+  font-size: 28rpx;
   color: #333333;
 }
 .info_val{
@@ -77,7 +77,19 @@ page{
   margin-bottom: 20rpx;
 }
 .img_box{
-
+  display: flex;
+  flex-wrap: wrap;
+}
+.van-uploader__wrapper{
+  display: flex !important;
+}
+.van-uploader__preview{
+  padding: 20rpx 15rpx !important;
+  background-color: #E4E4E4 !important;
+  border-radius: 15rpx;
+  width: 150rpx;
+  display: flex;
+  justify-content: center;
 }
 .orther{
   margin-bottom: 50rpx;
diff --git a/Pages/yishi/cashrecord/index.wxml b/Pages/yishi/cashrecord/index.wxml
index 6995638..2cf1161 100644
--- a/Pages/yishi/cashrecord/index.wxml
+++ b/Pages/yishi/cashrecord/index.wxml
@@ -14,7 +14,7 @@
           <van-image custom-style="" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/bankcard/js_icon.png" fit="heightFix" height="50rpx" aria-label="role" />
         </view>
         <view class="data_item_top_content">
-          <view class="name">{{item.account_name}}<text style="margin-left:20rpx;font-size: 28rpx;corlor:#999;">（尾号{{item.bank_card_code_four}}）</text></view>
+          <view class="name">{{item.account_name}}<text style="margin-left:20rpx;font-size: 28rpx;color:#999;">（尾号{{item.bank_card_code_four}}）</text></view>
           <view class="date">{{item.examine_time}}</view>
         </view>
         <view class="data_item_top_num">
@@ -28,13 +28,13 @@
       <view class="data_item_bottom">个人所得税：￥{{item.income_tax}}</view>
     </view>
 
-    <view class="data_item">
+    <!-- <view class="data_item">
       <view class="data_item_top">
         <view class="data_item_top_icon">
           <van-image custom-style="" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/bankcard/js_icon.png" fit="heightFix" height="50rpx" aria-label="role" />
         </view>
         <view class="data_item_top_content">
-          <view class="name">张三三<text style="margin-left:20rpx;font-size: 28rpx; corlor:#999;">（尾号9900）</text></view>
+          <view class="name">张三三<text style="margin-left:20rpx;font-size: 28rpx;color:#999;">（尾号9900）</text></view>
           <view class="date">12.09  13:23</view>
         </view>
         <view class="data_item_top_num">
@@ -45,7 +45,7 @@
         </view>
       </view>
       <view class="data_item_bottom">个人所得税：￥12.00</view>
-    </view>
+    </view> -->
 
     
     <van-empty description="暂无数据" wx:if="{{record_list.length == 0}}" />
diff --git a/Pages/yishi/chat/index.js b/Pages/yishi/chat/index.js
index cc8a0df..d958605 100644
--- a/Pages/yishi/chat/index.js
+++ b/Pages/yishi/chat/index.js
@@ -1,8 +1,8 @@
 const app = getApp()
 Page({
   data: {
-    patient_account: "10000",
-    title: '患者姓名',
+    patient_account: "",
+    title: '',
     height: app.globalData.height,
     order_inquiry_id: "",
     inquiry_type: "",
diff --git a/Pages/yishi/chat/index.json b/Pages/yishi/chat/index.json
index cc86b23..adfc67f 100644
--- a/Pages/yishi/chat/index.json
+++ b/Pages/yishi/chat/index.json
@@ -2,5 +2,6 @@
   "usingComponents": {
     "TUIChat": "../../../TUIKit/components/TUIChat/index"
   },
-    "navigationStyle": "custom"
+  "navigationStyle": "custom",
+  "disableScroll":true
 }
\ No newline at end of file
diff --git a/Pages/yishi/chufangsetup/index.js b/Pages/yishi/chufangsetup/index.js
index 351f298..86eb7f4 100644
--- a/Pages/yishi/chufangsetup/index.js
+++ b/Pages/yishi/chufangsetup/index.js
@@ -78,5 +78,10 @@ Page({
         })
       }
     }).catch(errors => {console.error(errors);})
-  }
+  },
+  go(e){
+    let url = e.currentTarget.dataset.url;
+    console.log(url);
+    app.go(url);
+  },
 })
\ No newline at end of file
diff --git a/Pages/yishi/chufangsetup/index.wxml b/Pages/yishi/chufangsetup/index.wxml
index 00f5fb3..23bcd32 100644
--- a/Pages/yishi/chufangsetup/index.wxml
+++ b/Pages/yishi/chufangsetup/index.wxml
@@ -68,7 +68,7 @@
               <view class="item_top_status_box">
                 <!-- 药师审核状态（0:审核中 1:审核成功 2:审核驳回） -->
                 <view class="item_top_status item_top_status_no">
-                {{item.pharmacist_audit_status==0?'审核中':item.pharmacist_audit_status==1?'审核成功':'审核驳回'}}
+                {{item.pharmacist_audit_status==0?'审核中':item.pharmacist_audit_status==1?'审核成功':'驳回'}}
                 </view>
               </view>
             </view>
@@ -92,63 +92,20 @@
               </view>
               <view class="item_content_li">
                 <view class="item_content_li_title">驳回原因：</view>
-                <view class="item_content_li_txt">{{item.platform_fail_reason}}</view>
+                <view class="item_content_li_txt">{{item.pharmacist_fail_reason}}</view>
               </view>
             </view>
             <!-- 底部按钮 -->
             <view class="item_bottom">
               <view class="item_bottom_btn">问诊记录</view>
-              <view class="item_bottom_btn item_bottom_btn_repeat">
-                <navigator url="/Pages/yishi/onlinechufang/index" open-type="navigate" hover-class="other-navigator-hover">
+              <view class="item_bottom_btn item_bottom_btn_repeat" bindtap="go" data-url="/Pages/yishi/onlinechufang/index?order_inquiry_id={{item.order_inquiry_id}}&order_prescription_id={{item.order_prescription_id}}">
                   重开处方
-                </navigator>
-              </view>
-            </view>
-          </view>
-          
-          <view class="item">
-            <!-- 头部 -->
-            <view class="item_top">
-              <view class="item_top_name">张三三4</view>
-              <view class="item_top_sex">男 | 30岁</view>
-              <view class="item_top_status_box">
-                <view class="item_top_status item_top_status_no">驳回</view>
-              </view>
-            </view>
-            <!-- 中间内容部分 -->
-            <view class="item_content">
-              <view class="item_content_li">
-                <view class="item_content_li_title">病情诊断：</view>
-                <view class="item_content_li_txt">4年</view>
-              </view>
-              <view class="item_content_li">
-                <view class="item_content_li_title">病情诊断：</view>
-                <view class="item_content_li_txt">头疼，腰疼、肩膀酸、等症状已经困</view>
-              </view>
-              <view class="item_content_li">
-                <view class="item_content_li_title">病情诊断：</view>
-                <view class="item_content_li_txt">新冠病毒</view>
-              </view>
-              <view class="item_content_li">
-                <view class="item_content_li_title">处方时间：</view>
-                <view class="item_content_li_txt">2022年12月23日  12：45</view>
-              </view>
-              <view class="item_content_li">
-                <view class="item_content_li_title">驳回原因：</view>
-                <view class="item_content_li_txt">图片不清晰</view>
-              </view>
-            </view>
-            <!-- 底部按钮 -->
-            <view class="item_bottom">
-              <view class="item_bottom_btn">问诊记录</view>
-              <view class="item_bottom_btn item_bottom_btn_repeat">
-                <navigator url="/Pages/yishi/onlinechufang/index" open-type="navigate" hover-class="other-navigator-hover">
-                  重开处方
-                </navigator>
               </view>
             </view>
           </view>
         </view>
+
+        <van-empty description="暂无数据" wx:if="{{chufang_list_2.length == 0}}" />
       </t-tab-panel>
     </t-tabs>
   </view>
diff --git a/Pages/yishi/identity/index.wxss b/Pages/yishi/identity/index.wxss
index 29d8b6f..fa5afd1 100644
--- a/Pages/yishi/identity/index.wxss
+++ b/Pages/yishi/identity/index.wxss
@@ -167,6 +167,11 @@
 .zhuanchang_btn--confirm {
   color: #3cc7c0;
 }
+
+/* 自定义医院搜索框样式   */
+.van-search__field .van-cell{
+  padding: 10rpx !important;
+}
 .van-picker__columns {
   height: 264px !important;
   top: 40px !important;
@@ -175,6 +180,7 @@
   top: -270px !important;
   position: relative !important;
 }
+
 .van-picker__confirm{
   color: #3cc7c0 !important;
 }
@@ -207,4 +213,13 @@
 }
 .van-picker__title {
   font-size: 34rpx !important;
+}
+.van-empty{
+  position: absolute;
+  width: 100%;
+  left: 50%;
+  top: 180rpx;
+  transform: translateX(-50%);
+  z-index: 9999999;
+  background: rgb(255, 255, 255);
 }
\ No newline at end of file
diff --git a/Pages/yishi/index/index.js b/Pages/yishi/index/index.js
index db5a047..0fa641b 100644
--- a/Pages/yishi/index/index.js
+++ b/Pages/yishi/index/index.js
@@ -1,5 +1,6 @@
 // Pages/yishi/index/index.js
 import { API } from './../../../utils/network/api'
+import { rpxTopx } from './../../../utils/util'
 const api = new API()
 const app = getApp()
 Page({
@@ -92,27 +93,44 @@ Page({
     skeleton_loading: true,
     contactKeFu: false,
     jiesuan_dialog_show: false,
-    jiesuan_dialog_visible: false
+    jiesuan_dialog_visible: false,
+    aa: 0
   },
   //  获取状态栏信息
   getMenuButtonBound() {
+    
     let stateHeight = 0; //  接收状态栏高度
     const navHeight = wx.getMenuButtonBoundingClientRect().height; //  获取胶囊高度
     let top = 0;
-    wx.getSystemInfo({
-      success(res) {
-        stateHeight = res.statusBarHeight;
-      },
-    });
+
     top = wx.getMenuButtonBoundingClientRect().top - stateHeight; //  获取top值
     console.log('navHeight', navHeight);
     console.log('top', top);
+ 
     this.setData({
       // navHeight: navHeight + top * 2, //  导航栏高度
       navHeight, //  导航栏高度
       stateHeight: stateHeight + top, //  状态栏高度
     });
   },
+  getFunboxHeight(){
+    console.log("109: ", rpxTopx(109))
+    console.log("113: ", rpxTopx(113))
+    const { statusBarHeight } = wx.getSystemInfoSync();
+    console.log("statusBarHeight: ", rpxTopx(statusBarHeight));
+    let funbox_height = wx.getSystemInfoSync().windowHeight - (this.data.stateHeight + this.data.navHeight + 10) - 55;//减去底部空白
+    funbox_height = rpxTopx(funbox_height);
+    // 147 userinfo的高度
+    // 155 认证部分的高度
+    // 150 广告部分的高度
+    // 40 自定义适配
+    funbox_height = funbox_height - 147 - 20 - 30 - 20 - 155 - 30 - 150 - 20 - 30 - 30 - 30 - 30 - 40;
+    funbox_height = funbox_height / 3;
+    if(funbox_height > 150) funbox_height = 150
+    this.setData({
+      funbox_height: funbox_height
+    })
+  },
   confirmJieSuanDialog(){
     this.setData({
       jiesuan_dialog_visible: false
@@ -145,7 +163,7 @@ Page({
       })
     }
     this.getMenuButtonBound();
-
+    this.getFunboxHeight();
     api.yiShiIndex().then(response => {
       console.log(response);
       let avatar = response.data.info.avatar;
diff --git a/Pages/yishi/index/index.wxml b/Pages/yishi/index/index.wxml
index 1844c43..8849dbd 100644
--- a/Pages/yishi/index/index.wxml
+++ b/Pages/yishi/index/index.wxml
@@ -1,6 +1,6 @@
 
 
-<view class="container">
+<view class="container" id="container">
   <!-- 顶部背景 -->
   <view class="top_bk"></view>
   <!-- 顶部标题 -->
@@ -12,7 +12,7 @@
       <view class="info_top">
         <view class="info_photo" bindtap="go" data-url="/Pages/yishi/myinfo/index">
           <!-- 跳转我的信息 -->
-            <t-avatar alt="头像" class="avatar" size="large" image="{{info.avatar}}" />
+            <t-avatar alt="头像" class="avatar" size="medium" image="{{info.avatar}}" />
         </view>
         <view class="info_content">
           <view class="info_mobile">{{info.user_name}}</view>
@@ -90,7 +90,7 @@
   </view>
   <!-- 功能模块 -->
   <view class="fun_box">
-    <view bindtap="go" data-moudle="3" data-url="/Pages/yishi/myprofile/index" class="fun_box_item">
+    <view bindtap="go" data-moudle="3" data-url="/Pages/yishi/myprofile/index" class="fun_box_item" style="height: {{funbox_height}}rpx;">
       <van-image class="fun_box_item_img"
           fit="heightFix"
           height="70rpx"
@@ -98,7 +98,7 @@
         />
       <text class="fun_box_item_txt">简介管理</text>
     </view>
-    <view bindtap="go" data-moudle="4" data-url="/Pages/yishi/onlinesetup/index" class="fun_box_item">
+    <view bindtap="go" data-moudle="4" data-url="/Pages/yishi/onlinesetup/index" class="fun_box_item" style="height: {{funbox_height}}rpx;">
       <van-image class="fun_box_item_img"
       fit="widthFix"
       width="70rpx"
@@ -106,7 +106,7 @@
         />
       <text class="fun_box_item_txt">在线问诊管理</text>
     </view>
-    <view bindtap="go" data-moudle="5" data-url="/Pages/yishi/kuaisusetup/index" class="fun_box_item">
+    <view bindtap="go" data-moudle="5" data-url="/Pages/yishi/kuaisusetup/index" class="fun_box_item" style="height: {{funbox_height}}rpx;">
       <van-image class="fun_box_item_img"
       fit="widthFix"
       width="70rpx"
@@ -114,7 +114,7 @@
         />
       <text class="fun_box_item_txt">快速问诊管理</text>
     </view>
-    <view bindtap="go" data-moudle="6" data-url="/Pages/yishi/yizhensetup/index" class="fun_box_item">
+    <view bindtap="go" data-moudle="6" data-url="/Pages/yishi/yizhensetup/index" class="fun_box_item" style="height: {{funbox_height}}rpx;">
       <van-image class="fun_box_item_img"
       fit="widthFix"
       width="70rpx"
@@ -122,7 +122,7 @@
         />
       <text class="fun_box_item_txt">公益问诊管理</text>
     </view>
-    <view bindtap="go" data-moudle="7" data-url="/Pages/yishi/chufangsetup/index" class="fun_box_item">
+    <view bindtap="go" data-moudle="7" data-url="/Pages/yishi/chufangsetup/index" class="fun_box_item" style="height: {{funbox_height}}rpx;">
       <van-image class="fun_box_item_img"
       fit="widthFix"
       width="70rpx"
@@ -132,7 +132,7 @@
       <t-badge style="display: flex;align-items: center;" dot="{{info.reject_prescription_number ? true : false}}" offset="{{ ['-14rpx', '10rpx'] }}" class="wrapper" content="处方管理" />
       </view>
     </view>
-    <view class="fun_box_item" data-moudle="8" bindtap="contactKeFu">
+    <view class="fun_box_item" data-moudle="8" bindtap="contactKeFu" style="height: {{funbox_height}}rpx;">
       <van-image class="fun_box_item_img"
           fit="widthFix"
           width="70rpx"
diff --git a/Pages/yishi/index/index.wxss b/Pages/yishi/index/index.wxss
index 175dfca..a7c0ef8 100644
--- a/Pages/yishi/index/index.wxss
+++ b/Pages/yishi/index/index.wxss
@@ -181,7 +181,7 @@
 }
 .fun_box_item{
   width: 40vw;
-  height: 150rpx;
+  height: 110rpx;
   background-color: #FAFAFA;
   border-radius: 10rpx;
   margin: 10rpx 0;
diff --git a/Pages/yishi/myaccount/index.wxml b/Pages/yishi/myaccount/index.wxml
index 002d371..f675229 100644
--- a/Pages/yishi/myaccount/index.wxml
+++ b/Pages/yishi/myaccount/index.wxml
@@ -13,7 +13,7 @@
   <view class="monthbox">
     <view class="month" bindtap="showPop">{{dateText}}<van-icon name="arrow-down" color="#999" size="40rpx" /></view>
     <view class="account">
-      <view class="account_left">预计收入：￥{{amount_total_month}}</view>
+      <view class="account_left">当月收益：￥{{amount_total_month}}</view>
       <view class="account_right">当月已提取：￥{{withdrawal_amount_month}}</view>
     </view>
   </view>
diff --git a/Pages/yishi/myaccount/index.wxss b/Pages/yishi/myaccount/index.wxss
index f84c243..3b5f6cb 100644
--- a/Pages/yishi/myaccount/index.wxss
+++ b/Pages/yishi/myaccount/index.wxss
@@ -44,10 +44,13 @@ page{
 .account_left{
   flex: 1;
   text-align: center;
+  text-align: left;
+  margin-left: 20rpx;
 }
 .account_right{
   flex: 1;
   text-align: center;
+  text-align: left;
 }
 .txt_title{
   font-size: 30rpx;
diff --git a/Pages/yishi/myprofile/index.wxss b/Pages/yishi/myprofile/index.wxss
index 30adba9..4ad7c06 100644
--- a/Pages/yishi/myprofile/index.wxss
+++ b/Pages/yishi/myprofile/index.wxss
@@ -25,4 +25,26 @@
 }
 .van-cell {
   padding: 32rpx !important;
+}
+
+/* 自定义医院搜索框样式   */
+.van-search__field .van-cell{
+  padding: 10rpx !important;
+}
+.van-picker__columns {
+  height: 264px !important;
+  top: 40px !important;
+}
+.van-search {
+  top: -270px !important;
+  position: relative !important;
+}
+.van-empty{
+  position: absolute;
+  width: 100%;
+  left: 50%;
+  top: 180rpx;
+  transform: translateX(-50%);
+  z-index: 9999999;
+  background: rgb(255, 255, 255);
 }
\ No newline at end of file
diff --git a/Pages/yishi/notice_deatil/index.js b/Pages/yishi/notice_deatil/index.js
index efef67f..e73a51c 100644
--- a/Pages/yishi/notice_deatil/index.js
+++ b/Pages/yishi/notice_deatil/index.js
@@ -1,3 +1,5 @@
+import { API } from './../../../utils/network/api'
+const api = new API()
 const app = getApp()
 Page({
   data: {
@@ -5,7 +7,25 @@ Page({
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '公告详情', //导航栏 中间的标题
     },
-    height: app.globalData.height, 
+    height: app.globalData.height,
+    notice: {}
+  },
+  onLoad(options){
+    let notice_id = options.notice_id;
+    api.getDoctorMessageSystemDetail({notice_id: notice_id}).then(response => {
+      console.log(response);
+      this.setData({
+        notice: response.data
+      })
+    }).catch(errors => {console.error(errors);})
+  },
+  go(e){
+    let link_type = this.data.notice.link_type;
+    let link_params = this.data.notice.link_params;
+    wx.showToast({
+      title: '无数据，不能调试',
+      icon: "error"
+    })
   }
 
 })
\ No newline at end of file
diff --git a/Pages/yishi/notice_deatil/index.wxml b/Pages/yishi/notice_deatil/index.wxml
index f0020fe..7000760 100644
--- a/Pages/yishi/notice_deatil/index.wxml
+++ b/Pages/yishi/notice_deatil/index.wxml
@@ -3,20 +3,24 @@
   <view class="data">
     <view class="item">
       <view class="title">发信人</view><text>：</text>
-      <view class="conent">肝胆小秘书</view>
+      <view class="conent">{{notice.from_name}}</view>
     </view>
     <view class="item">
       <view class="title">标题</view><text>：</text>
-      <view class="conent">9月份的服务费结算</view>
+      <view class="conent">{{notice.notice_title}}</view>
     </view>
     <view class="item">
       <view class="title">时间</view><text>：</text>
-      <view class="conent">2022-11-02 12:22:11</view>
+      <view class="conent">{{notice.notice_send_time}}</view>
     </view>
     <view class="item">
       <view class="title">内容</view><text>：</text>
-      <view class="conent">XX医生您好，您9月份的服务费已结算至您的银行卡，请注意查收。</view>
+      <view class="conent">{{notice.notice_content}}</view>
     </view>
-    <van-button color="#3CC7C0" custom-style="border-radius: 10rpx;margin: 30rpx 0;" block>我的账户</van-button>
+    <van-button bind:click="go" color="#3CC7C0" custom-style="border-radius: 10rpx;margin: 30rpx 0;" block wx:if="{{notice.button_type == 1}}">我的账户</van-button>
+    <van-button bind:click="go" color="#3CC7C0" custom-style="border-radius: 10rpx;margin: 30rpx 0;" block wx:if="{{notice.button_type == 2}}">联系客服</van-button>
+    <van-button bind:click="go" color="#3CC7C0" custom-style="border-radius: 10rpx;margin: 30rpx 0;" block wx:if="{{notice.button_type == 3}}">查看协议</van-button>
+    <van-button bind:click="go" color="#3CC7C0" custom-style="border-radius: 10rpx;margin: 30rpx 0;" block wx:if="{{notice.button_type == 4}}">订单详情</van-button>
+    <van-button bind:click="go" color="#3CC7C0" custom-style="border-radius: 10rpx;margin: 30rpx 0;" block wx:if="{{notice.button_type == 5}}">查看处方</van-button>
   </view>
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/onlinechufang/index.js b/Pages/yishi/onlinechufang/index.js
index 982245f..e9d32dc 100644
--- a/Pages/yishi/onlinechufang/index.js
+++ b/Pages/yishi/onlinechufang/index.js
@@ -20,7 +20,7 @@ Page({
     drug_content_show: false,
     search_drug_list_empty: true,
     search_drug_list: [],
-    select_drug_name: "",
+    product_name: "",
     select_drug_id: "",
     save_durg_product_id: "",
     save_durg_prescription_product_num: "",
@@ -30,9 +30,11 @@ Page({
     save_durg_frequency_use: "",
     save_durg_available_days: "",
     order_inquiry_id: "",
+    order_prescription_id: "",
     doctor_advice: "",
     doctors_advice_focus: false,
-    case_detail: {}
+    case_detail: {},
+    sub_disabled: false,
   },
   onDoctorsAdviceFocus(){
     this.setData({
@@ -41,21 +43,28 @@ Page({
   },
   onLoad(options){
     let order_inquiry_id = options.order_inquiry_id;
+    let order_prescription_id	 = options.order_prescription_id	;
     //获取患者问诊病例
     api.getDoctorInquiryCase({order_inquiry_id: order_inquiry_id}).then(response => {
       console.log(response);
       this.setData({
         case_detail: response.data
       })
+    }).then(res => {
+      //有处方id，才去请求详情
+      if(order_prescription_id){
+        this.getDoctorPrescriptionInfo(order_inquiry_id, order_prescription_id);
+      }
     }).catch(errors => {console.error(errors);})
     this.setData({
-      order_inquiry_id: order_inquiry_id
+      order_inquiry_id: order_inquiry_id,
+      order_prescription_id: order_prescription_id,
     })
   },
   select_drug(e){
     this.setData({
       drug_content_show: true,
-      select_drug_name: e.currentTarget.dataset.product_name,
+      product_name: e.currentTarget.dataset.product_name,
       select_drug_id: e.currentTarget.dataset.product_id,
       save_durg_product_id: e.currentTarget.dataset.product_id
     });
@@ -110,7 +119,7 @@ Page({
     this.delDrugBox(product_id);
 
     let save_durg = {};
-    save_durg.select_drug_name = this.data.select_drug_name;
+    save_durg.product_name = this.data.product_name;
     save_durg.product_id = this.data.save_durg_product_id;
     save_durg.prescription_product_num = this.data.save_durg_prescription_product_num;
     save_durg.single_unit = this.data.save_durg_single_unit;
@@ -123,7 +132,7 @@ Page({
     this.setData({
       drugs_box_item_list: list,
       drugs_popshow: false,
-      select_drug_name: "",
+      product_name: "",
       drug_content_show: false,
       search_drug_list: [],
       save_durg_product_id: "",
@@ -154,8 +163,8 @@ Page({
   search(){
     //搜索诊断
     let params = {};
-    params.disease_class_name = this.data.disease_class_name;
-    api.getBasicDiseaseSearch(params).then(response => {
+    params.icd_keyword = this.data.disease_class_name;
+    api.getBasicIcdSearch(params).then(response => {
       console.log(response);
       this.setData({
         zhenduan_search_list: response.data
@@ -167,7 +176,7 @@ Page({
   searchDrug(){
     //搜索药品
     let params = {};
-    params.product_keyword = this.data.select_drug_name;
+    params.product_keyword = this.data.product_name;
     api.getBasicProductSearch(params).then(response => {
       console.log(response);
       if(response.data.length > 0){
@@ -197,17 +206,17 @@ Page({
     })
   },
   addZhenDuan(e){
-    let disease_class_name = e.currentTarget.dataset.disease_class_name;
-    let disease_class_id = e.currentTarget.dataset.disease_class_id;
-    console.log("disease_class_name: ", disease_class_name);
-    console.log("disease_class_id: ", disease_class_id);
+    let icd_name = e.currentTarget.dataset.icd_name;
+    let icd_id = e.currentTarget.dataset.icd_id;
+    console.log("icd_name: ", icd_name);
+    console.log("icd_id: ", icd_id);
 
     let disease_obj = {};
-    disease_obj.disease_class_name = disease_class_name;
-    disease_obj.disease_class_id = disease_class_id;
+    disease_obj.icd_name = icd_name;
+    disease_obj.icd_id = icd_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 == icd_id
     });
     if(find_index == -1){
       list.push(disease_obj);
@@ -245,7 +254,7 @@ Page({
     console.log(drug);
     this.setData({
       drugs_popshow: true,
-      select_drug_name: drug.select_drug_name,
+      product_name: drug.product_name,
       drug_content_show: true,
       save_durg_product_id: drug.product_id,
       save_durg_prescription_product_num: drug.prescription_product_num,
@@ -280,37 +289,172 @@ Page({
       doctor_advice: e.detail.value
     })
   },
-  postDoctorPrescription(){//新增处方
+  postDoctorPrescription(e){//新增处方
+    
+    let sub_disabled = this.data.sub_disabled;
+    if(sub_disabled) return
+
     console.log("postDoctorPrescription postDoctorPrescription");
+    //先置灰，避免重复提交
+    this.setData({
+      sub_disabled: true
+    })
+
     let params = {};
     params.order_inquiry_id = this.data.order_inquiry_id;
     params.doctor_advice = this.data.doctor_advice;
     let prescription_icd = [];
     this.data.zhenduan_list.forEach(item => {
-      prescription_icd.push(item.disease_class_id);
+      prescription_icd.push(item.icd_id);
     })
     params.prescription_icd = prescription_icd;
     params.prescription_product = this.data.drugs_box_item_list;
 
     console.log(params);
 
+    if(prescription_icd.length == 0){
+      wx.showToast({
+        title: '请选择诊断',
+        icon: "error"
+      })
+      this.setData({
+        sub_disabled: false
+      })
+      return;
+    }
+    if(params.prescription_product.length == 0){
+      wx.showToast({
+        title: '请选择药品',
+        icon: "error"
+      })
+      this.setData({
+        sub_disabled: false
+      })
+      return;
+    }
+    if(this.data.doctor_advice == ""){
+      wx.showToast({
+        title: '请填写医嘱',
+        icon: "error"
+      })
+      this.setData({
+        sub_disabled: false
+      })
+      return;
+    }
+    if(this.data.doctor_advice.length < 5 || this.data.doctor_advice.length > 200){
+      wx.showToast({
+        title: '医嘱字数5-20',
+        icon: "error"
+      })
+      this.setData({
+        sub_disabled: false
+      })
+      return;
+    }
+
+
     api.postDoctorPrescription(params).then(response => {
       console.log(response);
-      
-    }).catch(errors => {console.error(errors);})
+      wx.showToast({
+        title: '提交成功',
+        icon: "success"
+      })
+    }).catch(errors => {
+      console.error(errors);
+      this.setData({
+        sub_disabled: false
+      })
+    })
   },
   putDoctorPrescription(){//修改处方
+    let sub_disabled = this.data.sub_disabled;
+    if(sub_disabled) return
+
+    console.log("putDoctorPrescription putDoctorPrescription");
+    //先置灰，避免重复提交
+    this.setData({
+      sub_disabled: true
+    })
+
     let params = {};
+    params.order_prescription_id = this.data.order_prescription_id;
+    params.doctor_advice = this.data.doctor_advice;
+    let prescription_icd = [];
+    this.data.zhenduan_list.forEach(item => {
+      prescription_icd.push(item.icd_id);
+    })
+    params.prescription_icd = prescription_icd;
+    params.prescription_product = this.data.drugs_box_item_list;
+
+    console.log(params);
+
+    if(prescription_icd.length == 0){
+      wx.showToast({
+        title: '请选择诊断',
+        icon: "error"
+      })
+      this.setData({
+        sub_disabled: false
+      })
+      return;
+    }
+    if(params.prescription_product.length == 0){
+      wx.showToast({
+        title: '请选择药品',
+        icon: "error"
+      })
+      this.setData({
+        sub_disabled: false
+      })
+      return;
+    }
+    if(this.data.doctor_advice == ""){
+      wx.showToast({
+        title: '请填写医嘱',
+        icon: "error"
+      })
+      this.setData({
+        sub_disabled: false
+      })
+      return;
+    }
+    if(this.data.doctor_advice.length < 5 || this.data.doctor_advice.length > 200){
+      wx.showToast({
+        title: '医嘱字数5-20',
+        icon: "error"
+      })
+      this.setData({
+        sub_disabled: false
+      })
+      return;
+    }
+
+
     api.putDoctorPrescription(params).then(response => {
       console.log(response);
-      
-    }).catch(errors => {console.error(errors);})
+      wx.showToast({
+        title: '提交成功',
+        icon: "success"
+      })
+    }).catch(errors => {
+      console.error(errors);
+      this.setData({
+        sub_disabled: false
+      })
+    })
   },
-  getDoctorPrescriptionInfo(){//获取处方详情
+  getDoctorPrescriptionInfo(order_inquiry_id, order_prescription_id){//获取处方详情
     let params = {};
+    params.order_inquiry_id = order_inquiry_id;
+    params.order_prescription_id = order_prescription_id;
     api.getDoctorPrescriptionInfo(params).then(response => {
       console.log(response);
-      
+      this.setData({
+        doctor_advice: response.data.prescription.doctor_advice,
+        zhenduan_list: response.data.prescription_icd,
+        drugs_box_item_list: response.data.prescription_product,
+      })
     }).catch(errors => {console.error(errors);})
   }
 })
\ No newline at end of file
diff --git a/Pages/yishi/onlinechufang/index.wxml b/Pages/yishi/onlinechufang/index.wxml
index 3fd8665..347fd9e 100644
--- a/Pages/yishi/onlinechufang/index.wxml
+++ b/Pages/yishi/onlinechufang/index.wxml
@@ -33,7 +33,7 @@
       <view class="addzhenduan">+添加诊断</view>
       <view slot="label">
         <view style="margin-top: 20rpx;" class="label_item" wx:for="{{zhenduan_list}}">
-          <van-icon name="delete" catchtap="delZhenDuan" color="red" data-disease_class_id="{{item.disease_class_id}}" /><text style="margin-left: 10rpx;">{{item.disease_class_name}}</text>
+          <van-icon name="delete" catchtap="delZhenDuan" color="red" data-disease_class_id="{{item.icd_id}}" /><text style="margin-left: 10rpx;">{{item.icd_name}}</text>
         </view>
       </view>
     </van-cell>
@@ -45,7 +45,7 @@
   <view class="drugs_box">
 
     <view class="drugs_box_item" wx:for="{{ drugs_box_item_list }}" wx:for-item="drugs">
-      <view class="drugs_name">{{ drugs.select_drug_name }}(数量{{ drugs.prescription_product_num}})</view>
+      <view class="drugs_name">{{ drugs.product_name }}(数量{{ drugs.prescription_product_num}})</view>
       <view class="drugs_guige">用法用量：{{ drugs.single_use }}；{{ drugs.frequency_use }}；{{ drugs.single_unit }}</view>
       <!-- <view class="drugs_dosage">备注：{{ drugs.drugs_dosage }}</view> -->
       <view class="btn">
@@ -56,16 +56,18 @@
   </view>
 
   <view class="adddrugs_btn">
-    <van-button bind:click="showPopup" color="rgba(35,209,215,0.28); font-size:30rpx; border-radius: 10rpx;" type="primary" block>+添加药品</van-button>
+    <van-button bind:click="showPopup" color="rgba(44,241,248,0.28);" custom-style="color:#3CC7C0; font-size:30rpx; border-radius: 10rpx;" type="primary" block>+添加药品</van-button>
   </view>
+  <form bindsubmit="{{ order_prescription_id == ''?'postDoctorPrescription':'putDoctorPrescription' }}">
+    <view class="txt_title">医嘱</view>
+    <view class="doctors_advice" bindtap="onDoctorsAdviceFocus">
+      <textarea auto-height focus="{{doctors_advice_focus}}" maxlength="1000" bindblur="getAdvice" style="width: 100%;" placeholder-style="font-size:24rpx; color:#999" placeholder="请输入医嘱（5-200字）" name="doctors_advice" value="{{doctor_advice}}"></textarea>
+    </view>
+    <view class="sub_btn">
+      <van-button disabled="{{sub_disabled}}" form-type="submit" color="#3CC7C0; font-size:30rpx; border-radius: 10rpx;" type="primary" block>{{ order_prescription_id == ''?'提交审核':'重开处方' }}</van-button>
+    </view>
 
-  <view class="txt_title">医嘱</view>
-  <view class="doctors_advice" bindtap="onDoctorsAdviceFocus">
-    <textarea auto-height focus="{{doctors_advice_focus}}" maxlength="1000" bindblur="getAdvice" style="width: 100%;" placeholder-style="font-size:24rpx; color:#999" placeholder="请输入医嘱"></textarea>
-  </view>
-  <view class="sub_btn">
-    <van-button bind:click="postDoctorPrescription" color="#3CC7C0; font-size:30rpx; border-radius: 10rpx;" type="primary" block>提交审核</van-button>
-  </view>
+  </form>
 
 
   <van-popup
@@ -81,7 +83,7 @@
     <view class="search_drug">
       <view class="search_drug_btn">
         <text class="search_drug_btn_title">药品名称</text>
-        <van-search model:value="{{ select_drug_name }}" 
+        <van-search model:value="{{ product_name }}" 
         class="search_drug_btn_input" 
         clearable shape="round" 
         placeholder="请输入药品名称或拼音码搜索"
@@ -206,10 +208,13 @@
       bind:change="onZhenDuanChange"
     />
     <view class="zhenduan_data_list">
-      <view bindtap="addZhenDuan" class="zhenduan_item" data-disease_class_name="{{item.disease_class_name}}" data-disease_class_id="{{item.disease_class_id}}" wx:for="{{zhenduan_search_list}}">
-        {{item.disease_class_name}}
+      <view bindtap="addZhenDuan" class="zhenduan_item" data-icd_name="{{item.icd_name}}" data-icd_id="{{item.icd_id}}" wx:for="{{zhenduan_search_list}}">
+        {{item.icd_name}}
       </view>
     </view>
   </van-popup>
   <van-toast id="van-toast" />
 </view>
+<view style="height: 50rpx;">
+  
+</view>
\ No newline at end of file
diff --git a/Pages/yishi/quickreply/index.js b/Pages/yishi/quickreply/index.js
index 55c2cb0..f5617fb 100644
--- a/Pages/yishi/quickreply/index.js
+++ b/Pages/yishi/quickreply/index.js
@@ -6,7 +6,7 @@ Page({
 
   data: {
     navbarData: {
-      showCapsule: 2, //是否显示左上角图标   1表示显示    0表示不显示
+      showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '常用语', //导航栏 中间的标题
     },
     height: app.globalData.height, 
diff --git a/Pages/yishi/quickreply/index.wxml b/Pages/yishi/quickreply/index.wxml
index 8f92b0e..a9d8d89 100644
--- a/Pages/yishi/quickreply/index.wxml
+++ b/Pages/yishi/quickreply/index.wxml
@@ -26,7 +26,7 @@
           </van-swipe-cell>
         </view>
         <view class="btn">
-          <van-button bind:click="showAdd" class="addbtn" custom-style="border-radius: 20rpx;margin: 0 auto;width: 92%;position: relative;top: 50%;  transform: translateY(-50%);"  type="primary" color="#3CC7C0" block>添加常用语</van-button>
+          <van-button bind:click="showAdd" class="addbtn" custom-style="border-radius: 10rpx;margin: 0 auto;width: 92%;position: relative;top: 50%;  transform: translateY(-50%);font-size: 34rpx;"  type="primary" color="#3CC7C0" block>添加常用语</van-button>
         </view>
       </t-tab-panel>
       <t-tab-panel label="处方" value="2">
@@ -44,7 +44,7 @@
           </van-swipe-cell>
         </view>
         <view class="btn">
-          <van-button bind:click="showAdd" class="addbtn" custom-style="border-radius: 20rpx;margin: 0 auto;width: 92%;position: relative;top: 50%;  transform: translateY(-50%);"  type="primary" color="#3CC7C0" block>添加常用语</van-button>
+          <van-button bind:click="showAdd" class="addbtn" custom-style="border-radius: 10rpx;margin: 0 auto;width: 92%;position: relative;top: 50%;  transform: translateY(-50%);font-size: 34rpx;"  type="primary" color="#3CC7C0" block>添加常用语</van-button>
         </view>
       </t-tab-panel>
   </t-tabs>
@@ -62,6 +62,7 @@
           model:value="{{ add_message }}"
           type="textarea"
           placeholder="请输入文字"
+          placeholder-style="font-size: 32rpx;font-weight: 400;"
           autosize
           maxlength="500"
           custom-style="height: 100%;"
diff --git a/Pages/yishi/quickreply/index.wxss b/Pages/yishi/quickreply/index.wxss
index e2ce446..d410237 100644
--- a/Pages/yishi/quickreply/index.wxss
+++ b/Pages/yishi/quickreply/index.wxss
@@ -13,10 +13,10 @@ page{
 }
 .t-tabs__item--active{
   color: #49B9AD !important;
-  font-size: 32rpx !important;
+  font-size: 36rpx !important;
 }
 .t-tabs__item-inner--line{
-  font-size: 28rpx !important;
+  font-size: 32rpx !important;
 }
 .t-tabs__track{
   background-color: var(--td-tab-track-color, var(--td-primary-color, #49B9AD)) !important;
@@ -25,7 +25,7 @@ page{
   height: 130rpx;
   background-color: #fff;
   position: fixed;
-  bottom: 0;
+  bottom: 50rpx;
   width: 100%;
 }
 .popup_box{
@@ -69,5 +69,4 @@ page{
   padding: 32rpx !important;
   font-size: 34rpx !important;
   color: #333 !important;
-  font-weight: bolder !important;
 }
\ No newline at end of file
diff --git a/Pages/yishi/service_notice/index.js b/Pages/yishi/service_notice/index.js
index 6bb080b..c37c0f1 100644
--- a/Pages/yishi/service_notice/index.js
+++ b/Pages/yishi/service_notice/index.js
@@ -1,3 +1,5 @@
+import { API } from './../../../utils/network/api'
+const api = new API()
 const app = getApp()
 Page({
   data: {
@@ -7,5 +9,43 @@ Page({
     },
     height: app.globalData.height, 
     visible: false,
+    list: [],
+    current_page: 0,
+    total: 0,
+    per_page: 0,
+    last_page: 0,
+  },
+  onShow(){
+    this.getList();
+    
+  },
+  getList(){
+    let current_page = this.data.current_page;
+    current_page = current_page + 1;
+    this.setData({
+      current_page: current_page
+    })
+    let list = this.data.list;
+    api.getDoctorMessageService({page: current_page}).then(response => {
+      console.log(response);
+      this.setData({
+        list: list.concat(response.data.data),
+        current_page: response.data.current_page,
+        total: response.data.total,
+        per_page: response.data.per_page,
+        last_page: response.data.last_page,
+      })
+    }).catch(errors => {console.error(errors);})
+  },
+  onReachBottom() {
+    console.log('===触底了！！===');
+    if(this.data.current_page < this.data.last_page){//最后一页时停止分页
+      this.getList()
+    }
+  },
+  putMessageReadNoticeAll(){
+    api.putMessageReadNoticeAll({notice_type: 1}).then(response => {
+      console.log(response);
+    }).catch(errors => {console.error(errors);})
   }
 })
\ No newline at end of file
diff --git a/Pages/yishi/service_notice/index.json b/Pages/yishi/service_notice/index.json
index f84f19a..c57d952 100644
--- a/Pages/yishi/service_notice/index.json
+++ b/Pages/yishi/service_notice/index.json
@@ -2,6 +2,10 @@
   "component": true,
   "usingComponents": {
     "te-nav-bar": "/commpents/te_navbar",
-    "van-image": "@vant/weapp/image/index"
-  }
+    "van-image": "@vant/weapp/image/index",
+    "van-divider": "@vant/weapp/divider/index",
+    "van-empty": "@vant/weapp/empty/index"
+  },
+  "enablePullDownRefresh": false,
+  "onReachBottomDistance": 50
 }
\ No newline at end of file
diff --git a/Pages/yishi/service_notice/index.wxml b/Pages/yishi/service_notice/index.wxml
index 5ce3c76..dc9084a 100644
--- a/Pages/yishi/service_notice/index.wxml
+++ b/Pages/yishi/service_notice/index.wxml
@@ -2,7 +2,30 @@
 <view class="container">
   <view class="list">
 
-    <view class="item">
+    <view class="item" wx:for="{{list}}">
+      <view class="item_top">
+        <view class="item_img" wx:if="{{item.inquiry_type == 1}}">
+          <text style="margin-left: 10rpx;">快速问诊</text> 
+          <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
+        </view>
+        <view class="item_img" wx:if="{{item.inquiry_type == 2}}">
+          <text style="margin-left: 10rpx;">快速问诊</text> 
+          <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
+        </view>
+        <view class="item_img" wx:if="{{item.inquiry_type == 3}}">
+          <text style="margin-left: 10rpx;">公益问诊</text> 
+          <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/yizhen.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
+        </view>
+        <view class="item_img" wx:if="{{item.inquiry_type == 4}}">
+          <text style="margin-left: 10rpx;">问诊购药</text> 
+          <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/drug.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
+        </view>
+        <view class="item_date">{{item.notice_send_time}}</view>
+      </view>
+      <view class="item_content">{{item.notice_title}}</view>
+    </view>
+
+    <!-- <view class="item">
       <view class="item_top">
         <view class="item_img">
           <text style="margin-left: 10rpx;">快速问诊</text> 
@@ -11,9 +34,9 @@
         <view class="item_date">2023-1-02 12:22</view>
       </view>
       <view class="item_content">您有新的图文问诊咨询，请注意查看。</view>
-    </view>
+    </view> -->
 
-    <view class="item">
+    <!-- <view class="item">
       <view class="item_top">
         <view class="item_img">
           <text style="margin-left: 10rpx;">在线问诊</text> 
@@ -22,9 +45,9 @@
         <view class="item_date">2023-1-02 12:22</view>
       </view>
       <view class="item_content">您有新的图文问诊咨询，请注意查看。</view>
-    </view>
+    </view> -->
 
-    <view class="item">
+    <!-- <view class="item">
       <view class="item_top">
         <view class="item_img">
           <text style="margin-left: 10rpx;">公益问诊</text> 
@@ -33,9 +56,9 @@
         <view class="item_date">2023-1-02 12:22</view>
       </view>
       <view class="item_content">您有新的图文问诊咨询，请注意查看。</view>
-    </view>
+    </view> -->
 
-    <view class="item">
+    <!-- <view class="item">
       <view class="item_top">
         <view class="item_img">
           <text style="margin-left: 10rpx;">问诊购药</text> 
@@ -44,8 +67,14 @@
         <view class="item_date">2023-1-02 12:22</view>
       </view>
       <view class="item_content">您有新的图文问诊咨询，请注意查看。</view>
-    </view>
+    </view> -->
 
 
+  </view>
+  <van-empty description="暂无数据" wx:if="{{list.length == 0}}" />
+  <van-divider contentPosition="center" wx:if="{{list.length > 0 && current_page == last_page}}">到底了~</van-divider>
+  <van-image bind:click="putMessageReadNoticeAll" style="position: fixed; right: 0;bottom: 262rpx;" src="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/yishi/service_notice/readall.png" fit="heightFix" height="84rpx" aria-label="role" />
+  <view style="height: 50rpx;">
+    
   </view>
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/system_notice/index.js b/Pages/yishi/system_notice/index.js
index b362c1a..f341cad 100644
--- a/Pages/yishi/system_notice/index.js
+++ b/Pages/yishi/system_notice/index.js
@@ -1,3 +1,5 @@
+import { API } from './../../../utils/network/api'
+const api = new API()
 const app = getApp()
 Page({
   data: {
@@ -7,23 +9,77 @@ Page({
     },
     height: app.globalData.height, 
     visible: false,
+    list: [],
+    current_page: 0,
+    total: 0,
+    per_page: 0,
+    last_page: 0,
   },
   go(e){
-    wx.navigateTo({
-      url: e.currentTarget.dataset.url,
-      events: {
-        // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
-        acceptDataFromOpenedPage: function(data) {
-          console.log(data)
-        },
-        someEvent: function(data) {
-          console.log(data)
-        }
-      },
-      success: function(res) {
-        // 通过 eventChannel 向被打开页面传送数据
-        res.eventChannel.emit('acceptDataFromOpenerPage', { data: 'test' })
-      }
+    this.putMessageReadNotice(e);
+    app.go(e.currentTarget.dataset.url);
+  },
+  onShow(){
+    this.setData({
+      list: [],
+      current_page: 0,
+      total: 0,
+      per_page: 0,
+      last_page: 0,
     })
+    let ap = this.getList();
+    ap.then(res => {
+      this.check()
+    })
+  },
+  check(){
+    // 不满一页自动加载下一页
+    wx.createSelectorQuery().select('#list').boundingClientRect(res2 => {
+      console.log(res2.height)
+      console.log(wx.getSystemInfoSync().windowHeight)
+      if (res2.height < wx.getSystemInfoSync().windowHeight) {
+        this.getList().then(res => {
+          if(this.data.current_page < this.data.last_page){
+            this.check()
+          }
+        });
+      }
+    }).exec()
+  },
+  getList(){
+    let current_page = this.data.current_page;
+    current_page = current_page + 1;
+    this.setData({
+      current_page: current_page
+    })
+    let list = this.data.list;
+    return api.getDoctorMessageSystem({page: current_page}).then(response => {
+      console.log(response);
+      this.setData({
+        list: list.concat(response.data.data),
+        current_page: response.data.current_page,
+        total: response.data.total,
+        per_page: response.data.per_page,
+        last_page: response.data.last_page,
+      })
+    }).catch(errors => {console.error(errors);})
+  },
+  onReachBottom() {
+    console.log('===触底了！！===');
+    if(this.data.current_page < this.data.last_page){//最后一页时停止分页
+      this.getList()
+    }
+  },
+  putMessageReadNotice(e){
+    let notice_id = e.currentTarget.dataset.notice_id;
+    api.putMessageReadNotice({notice_id: notice_id}).then(response => {
+      console.log(response);
+      
+    }).catch(errors => {console.error(errors);})
+  },
+  putMessageReadNoticeAll(){
+    api.putMessageReadNoticeAll({notice_type: 2}).then(response => {
+      console.log(response);
+    }).catch(errors => {console.error(errors);})
   }
 })
\ No newline at end of file
diff --git a/Pages/yishi/system_notice/index.json b/Pages/yishi/system_notice/index.json
index f84f19a..c57d952 100644
--- a/Pages/yishi/system_notice/index.json
+++ b/Pages/yishi/system_notice/index.json
@@ -2,6 +2,10 @@
   "component": true,
   "usingComponents": {
     "te-nav-bar": "/commpents/te_navbar",
-    "van-image": "@vant/weapp/image/index"
-  }
+    "van-image": "@vant/weapp/image/index",
+    "van-divider": "@vant/weapp/divider/index",
+    "van-empty": "@vant/weapp/empty/index"
+  },
+  "enablePullDownRefresh": false,
+  "onReachBottomDistance": 50
 }
\ No newline at end of file
diff --git a/Pages/yishi/system_notice/index.wxml b/Pages/yishi/system_notice/index.wxml
index 93a9f34..9189956 100644
--- a/Pages/yishi/system_notice/index.wxml
+++ b/Pages/yishi/system_notice/index.wxml
@@ -1,45 +1,22 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container">
-  <view class="list">
-
-    <view class="item" bindtap="go" data-url="/Pages/yishi/notice_deatil/index">
+  <view class="list" id="list">
+    <view class="item" bindtap="go" data-notice_id="{{item.notice_id}}" data-url="/Pages/yishi/notice_deatil/index?notice_id={{item.notice_id}}" wx:for="{{list}}">
       <view class="item_top">
         <view class="item_img">
           <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
-        <view class="item_content">9月份的服务费结算通知</view>
+        <view class="item_content">{{item.notice_title}}</view>
       </view>
-      <view class="hongdian">
+      <view class="hongdian" wx:if="{{item.read_status == 0}}">
         <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/honhdian.png" fit="heightFix" height="20rpx" aria-label="qrcode" />
       </view>
     </view>
-
-    <view class="item" bindtap="go" data-url="/Pages/yishi/notice_deatil/index">
-      <view class="item_top">
-        <view class="item_img">
-          <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
-        </view>
-        <view class="item_content">8月份的服务费结算通知</view>
-      </view>
-    </view>
-
-    <view class="item" bindtap="go" data-url="/Pages/yishi/notice_deatil/index">
-      <view class="item_top">
-        <view class="item_img">
-          <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
-        </view>
-        <view class="item_content">7月份的服务费结算通知</view>
-      </view>
-    </view>
-
-    <view class="item" bindtap="go" data-url="/Pages/yishi/notice_deatil/index">
-      <view class="item_top">
-        <view class="item_img">
-          <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
-        </view>
-        <view class="item_content">6月份的服务费结算通知</view>
-      </view>
-    </view>
-
+  </view>
+  <van-empty description="暂无数据" wx:if="{{list.length == 0}}" />
+  <van-divider contentPosition="center" wx:if="{{list.length > 0 && current_page == last_page}}">到底了~</van-divider>
+  <van-image bind:click="putMessageReadNoticeAll" style="position: fixed; right: 0;bottom: 262rpx;" src="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/yishi/service_notice/readall.png" fit="heightFix" height="84rpx" aria-label="role" />
+  <view style="height: 50rpx;">
+    
   </view>
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index 6093403..2d5039b 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -10,7 +10,7 @@ Page({
       title: '问诊消息', //导航栏 中间的标题
     },
     height: app.globalData.height, 
-    has_data: true,
+    has_data: false,
     data_list_1: [],
     data_list_2: [],
     data_list_3: [],
@@ -248,6 +248,10 @@ Page({
       if(!order_inquiry_id) return;
       let inquiry_type = cloudCustomDataJson.inquiry_type;
       if(!inquiry_type) return;
+      if(inquiry_type > 4) return;
+      let patient_family_data = cloudCustomDataJson.patient_family_data;
+      if(!patient_family_data) return;
+      console.log("patient_family_data: ", patient_family_data);
       let session_item = {};
       session_item.inquiry_status = item.inquiry_status;//订单状态暂无
       let txt = {};
@@ -257,10 +261,10 @@ Page({
       session_item.message_type = type;
       session_item.order_inquiry_id = order_inquiry_id;
       session_item.inquiry_type = inquiry_type;
-      session_item.patient_age = item.patient_age;//暂无
-      session_item.patient_name = userProfile.nick;
+      session_item.patient_age = patient_family_data.patient_age;
+      session_item.patient_name = patient_family_data.patient_name;
+      session_item.patient_sex = patient_family_data.patient_sex;
       session_item.from_account = userProfile.userID;
-      session_item.patient_sex = item.patient_sex;//暂无
       let unreadCount = item.unreadCount;
       if(unreadCount > 0){
         session_item.message_dot = true;
@@ -276,7 +280,7 @@ Page({
       data_list_4: session_data_list_4,
     })
 
-    if(session_data_list_1.length == 0 && session_data_list_2.length == 0 && session_data_list_3.length == 0 && session_data_list_4.length == 0 && session_data_list_5.length == 0){
+    if(this.data.data_list_1.length == 0 && this.data.data_list_2.length == 0 && this.data.data_list_3.length == 0 && this.data.data_list_4.length == 0 && this.data.data_list_5.length == 0){
       this.setData({has_data: false})
     }else{
       this.setData({has_data: true})
diff --git a/Pages/yishi/wenzhenorder/index.wxml b/Pages/yishi/wenzhenorder/index.wxml
index d0372f4..fd82797 100644
--- a/Pages/yishi/wenzhenorder/index.wxml
+++ b/Pages/yishi/wenzhenorder/index.wxml
@@ -3,7 +3,7 @@
 <view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
   <van-checkbox-group value="{{ result }}" bind:change="onChange">
     <view class="order_list">
-        <view class="order_item">
+        <!-- <view class="order_item">
           <view class="order_item_checkbox">
             <van-checkbox name="a"></van-checkbox>
           </view>
@@ -18,7 +18,7 @@
               <view class="order_id">预计收入：<text style="font-size: 30rpx;color: #666666;">￥112.00元</text></view>
             </view>
           </view>
-        </view>
+        </view> -->
 
         <view class="order_item" wx:for="{{order_list}}" wx:for-index="idx">
           <view class="order_item_checkbox">
diff --git a/Pages/yishi/yizhensetup/index.wxss b/Pages/yishi/yizhensetup/index.wxss
index 50f6015..0e38bb0 100644
--- a/Pages/yishi/yizhensetup/index.wxss
+++ b/Pages/yishi/yizhensetup/index.wxss
@@ -116,3 +116,7 @@ page{
 .t-picker__confirm,.t-class-confirm{
   color: #49B9AD !important;
 }
+.van-cell__value{
+  font-size: 32rpx !important;
+  color: red !important;
+}
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js
index eddcb4c..e0348d3 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.js
@@ -63,8 +63,8 @@ Component({
     notShow: false,
     isShow: true,
     commonFunction: [
-      { name: '查看病例', key: '10' },
-      { name: '开处方', key: '11' },
+      { name: '查看完整病例', key: '10' },
+      { name: '在线开处方', key: '11' },
     ],
     displayServiceEvaluation: false,
     showErrorImageFlag: 0,
@@ -296,12 +296,45 @@ Component({
 
     // 发送图片消息
     handleSendImageMessage(file) {
+
+      //获取最后一条消息
+      let message_length = this.data.messageList.length;
+      let last_message = {};
+      if(message_length > 0){
+        last_message = this.data.messageList[message_length - 1];
+      }
+      console.log("last_message: ", last_message);
+      let cloudCustomData = "";
+      let cloudCustomDataJson = "";
+      if(last_message.cloudCustomData){
+        cloudCustomData = last_message.cloudCustomData;
+      }
+      if(cloudCustomData){
+        cloudCustomDataJson = JSON.parse(cloudCustomData);
+      }
+      let message_rounds = 0;
+      let patient_family_data = "";
+      if(cloudCustomDataJson){
+        message_rounds = cloudCustomDataJson.message_rounds;
+        patient_family_data = cloudCustomDataJson.patient_family_data
+      }
+
+      const mycloudCustomData = JSON.stringify({
+        order_inquiry_id: this.data.order_inquiry_id,
+        inquiry_type: this.data.inquiry_type,
+        message_type: 0,
+        is_system: 0,
+        message_rounds: message_rounds,
+        patient_family_data: patient_family_data
+      });
+      
       const message = wx.$TUIKit.createImageMessage({
         to: this.getToAccount(),
         conversationType: this.data.conversation.type,
         payload: {
           file,
         },
+        cloudCustomData: mycloudCustomData,
         onProgress: (percent) => {
           message.percent = percent;
         },
@@ -359,13 +392,31 @@ Component({
           app.go("/Pages/yishi/case/index?order_inquiry_id="+this.data.order_inquiry_id)
           break;
         case '11'://在线开方
-          app.go("/Pages/yishi/onlinechufang/index?order_inquiry_id="+this.data.order_inquiry_id)
+          let userID = wx.getStorageSync('user_id');
+          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;
       }
     },
-
+    cancelDialog(){
+      this.setData({
+        dialog_visible: false
+      })
+    },
+    confirmDialog(){
+      app.go("/Pages/yishi/zhiye_identity/index")
+      this.setData({
+        dialog_visible: false
+      })
+    },
     handleSendOrder() {
       this.setData({
         displayOrderList: true,
@@ -504,21 +555,51 @@ Component({
         ext2: wx.$chat_reportType,
         ext3: wx.$chat_SDKAppID,
       });
+
+      //获取最后一条消息
+      let message_length = this.data.messageList.length;
+      let last_message = {};
+      if(message_length > 0){
+        last_message = this.data.messageList[message_length - 1];
+      }
+      console.log("last_message: ", last_message);
+      let cloudCustomData = "";
+      let cloudCustomDataJson = "";
+      if(last_message.cloudCustomData){
+        cloudCustomData = last_message.cloudCustomData;
+      }
+      if(cloudCustomData){
+        cloudCustomDataJson = JSON.parse(cloudCustomData);
+      }
+      let message_rounds = 0;
+      let patient_family_data = "";
+      if(cloudCustomDataJson){
+        message_rounds = cloudCustomDataJson.message_rounds;
+        patient_family_data = cloudCustomDataJson.patient_family_data
+      }
+      
       const to = this.getToAccount();
       const text = flag ? msg : this.data.message;
+
       const { FEAT_NATIVE_CODE } = constant;
+      const mycloudCustomData = JSON.stringify({
+        order_inquiry_id: this.data.order_inquiry_id,
+        inquiry_type: this.data.inquiry_type,
+        message_type: 0,
+        is_system: 0,
+        message_rounds: message_rounds,
+        patient_family_data: patient_family_data
+      });
+
+      console.log("mycloudCustomData: ", mycloudCustomData);
+      console.log("text: ", text);
       const message = wx.$TUIKit.createTextMessage({
         to, 
         conversationType: this.data.conversation.type,
         payload: {
           text,
         },
-        cloudCustomData: JSON.stringify({
-          order_inquiry_id: this.data.order_inquiry_id,
-          inquiry_type: this.data.inquiry_type,
-          message_type: 0,
-          is_system: 0
-        }),
+        cloudCustomData: mycloudCustomData
       });
       this.setData({
         message: '',
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.json b/TUIKit/components/TUIChat/components/MessageInput/index.json
index 10d10cc..9e27a6f 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.json
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.json
@@ -4,6 +4,7 @@
     "Emoji": "../MessageElements/Emoji/index",
     "CommonWords": "../MessagePrivate/CommonWords/index",
     "OrderList": "../MessagePrivate/OrderList/index",
-    "ServiceEvaluation": "../MessagePrivate/ServiceEvaluation/index"
+    "ServiceEvaluation": "../MessagePrivate/ServiceEvaluation/index",
+    "t-dialog": "tdesign-miniprogram/dialog/dialog"
   }
 }
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxml b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
index 03fcbe7..f97004c 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
@@ -101,4 +101,15 @@
     {{title}}
     </view>
 </view>
-
+<t-dialog
+    visible="{{ dialog_visible }}"
+    title="温馨提示"
+    content="请您先多点执业认证"
+  >
+  <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="cancelDialog">
+    取消
+  </view>
+  <view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="confirmDialog">
+    确定
+  </view>
+  </t-dialog>
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxss b/TUIKit/components/TUIChat/components/MessageInput/index.wxss
index 16393b2..f40509b 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxss
@@ -1,40 +1,43 @@
 .TUI-message-input-container {
-    background-color: #fff;
+  background-color: #fff;
+  width: 100vw;
+  z-index: 9999;
 }
 
 .TUI-message-input {
-    display: flex;
-    padding-bottom: 16rpx;
-    background-color: #fff;
-    width: 95vw;
-    overflow: scroll;
-    margin: 0 auto;
+  display: flex;
+  padding-bottom: 16rpx;
+  background-color: #fff;
+  width: 95vw;
+  overflow: scroll;
+  margin: 0 auto;
 }
 .TUI-commom-function {
-    background-color: blueviolet;
-    display: flex;
-    flex-wrap: nowrap;
-    width: 750rpx;
-    height: 106rpx;
-    background-color: #FFF;
-    align-items: center;
+  background-color: blueviolet;
+  display: flex;
+  flex-wrap: nowrap;
+  width: 95vw;
+  height: 106rpx;
+  background-color: #FFF;
+  align-items: center;
+  margin: 0 auto;
 }
 .TUI-commom-function-item {
-  background-color: brown;
-    display: flex;
-    width: 136rpx;
-    justify-content: center;
-    align-items: center;
-    font-size: 28rpx;
-    color: #3CC7C0;
-    height: 48rpx;
-    margin-left: 16rpx;
-    border-radius: 10rpx;
-    background-color: #fff;
-    border: 1px solid #3CC7C0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 28rpx;
+  color: #3CC7C0;
+  height: 48rpx;
+  margin-left: 16rpx;
+  border-radius: 10rpx;
+  background-color: #fff;
+  border: 1px solid #3CC7C0;
+  padding: 0 20rpx;
 }
 .TUI-commom-function-item:first-child{
-    margin-left: 48rpx;
+  border: 1px solid #999;
+  color: #999;
 }
 .TUI-message-input-functions {
   flex: 2;
@@ -63,7 +66,6 @@
 }
 .TUI-message-input-area {
     width: 100%;
-    height: 100%;
     max-height: 300rpx;
     /* 最多显示10行 */
     line-height: 30rpx;
@@ -185,4 +187,18 @@
   background-color: #fff;
   font-size: 30rpx;
   color: #666666;
+}
+.dialog{
+  width: 50%;
+  text-align: center;
+  height: 100rpx;
+  line-height: 100rpx;
+}
+.dialog_cancel_btn{
+  border-top: 1px solid #E9E9E9;
+  border-right: 1px solid #E9E9E9;
+}
+.dialog_confirm_btn{
+  border-top: 1px solid #E9E9E9;
+  color: #3CC7C0;
 }
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index ece384b..c700ff8 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -1,6 +1,8 @@
 import dayjs from '../../../../utils/dayjs';
 import logger from '../../../../utils/logger';
 import constant from '../../../../utils/constant';
+import { API } from './../../../../../utils/network/api'
+const api = new API()
 // eslint-disable-next-line no-undef
 const app = getApp();
 Component({
@@ -20,6 +22,10 @@ Component({
         });
       },
     },
+    order_inquiry_id:{
+      type: String,
+      value: "",
+    },
     unreadCount: {
       type: Number,
       value: '',
@@ -81,10 +87,13 @@ Component({
     errorMessage: {},
     errorMessageID: '',
     typingMessage: {},
+    dialog_visible: false,
+
   },
 
   lifetimes: {
     attached() {
+     
     },
     ready() {
       if (this.data.unreadCount > 12) {
@@ -112,6 +121,7 @@ Component({
       wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
       wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_READ_BY_PEER, this.$onMessageReadByPeer, this);
       wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_REVOKED, this.$onMessageRevoked, this);
+
     },
 
     detached() {
@@ -123,6 +133,26 @@ Component({
   },
 
   methods: {
+    //结束问诊
+    putDoctorInquiryFinish() {
+      this.setData({
+        dialog_visible: true
+      })
+    },
+    cancelDialog(){
+      this.setData({
+        dialog_visible: false
+      })
+    },
+    confirmDialog(){
+      api.putDoctorInquiryFinish({order_inquiry_id: this.data.order_inquiry_id}).then(response => {
+        console.log(response);
+        
+      }).catch(errors => {console.error(errors);})
+      this.setData({
+        dialog_visible: false
+      })
+    },
     // 刷新消息列表
     refresh() {
       if (this.data.isCompleted) {
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.json b/TUIKit/components/TUIChat/components/MessageList/index.json
index 2bd9367..097c754 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.json
+++ b/TUIKit/components/TUIChat/components/MessageList/index.json
@@ -12,6 +12,7 @@
     "FaceMessage": "../MessageElements/FaceMessage/index",
     "FileMessage": "../MessageElements/FileMessage/index",
     "MergerMessage": "../MessageElements/MergerMessage/index",
-    "RevokeMessage": "../MessageElements/RevokeMessage/index"
+    "RevokeMessage": "../MessageElements/RevokeMessage/index",
+    "t-dialog": "tdesign-miniprogram/dialog/dialog"
   }
 }
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxml b/TUIKit/components/TUIChat/components/MessageList/index.wxml
index 7ce6171..5a18336 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageList/index.wxml
@@ -1,14 +1,5 @@
 <view class="container">
-<view class="info" wx:if="{{ true }}">
-  <view class="left">
-    <view class="name">张三三</view>
-    <view class="age">男｜30岁</view>
-    <view class="status">接诊中</view>
-  </view>
-  <view class="right">
-    <text class="right_txt">结束问诊</text>
-  </view>
-</view>
+
 <scroll-view  class="message-list-container" scroll-y="true"   scroll-into-view="{{jumpAim}}" refresher-enabled="{{true}}" bindrefresherrefresh="refresh" refresher-triggered="{{triggered}}" lower-threshold="200"  bindscrolltolower="scrollHandler">
     <view class="no-message" wx:if="{{isCompleted}}">没有更多啦</view>
     <view class="t-message" wx:if="{{conversation.type !== '@TIM#SYSTEM'}}" wx:for="{{messageList}}" wx:key="index"  data-index ='{{index}}'  >
@@ -88,3 +79,16 @@
     </view>
 </view>
 <wxs src = './concat.wxs' module = 'concat'/>
+
+<t-dialog
+    visible="{{ dialog_visible }}"
+    title="温馨提示"
+    content="您确认结束问诊？"
+  >
+  <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="cancelDialog">
+    取消
+  </view>
+  <view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="confirmDialog">
+    确定
+  </view>
+  </t-dialog>
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxss b/TUIKit/components/TUIChat/components/MessageList/index.wxss
index c6a7137..fea4021 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageList/index.wxss
@@ -4,8 +4,9 @@
   background-color: #F4F4F4;
 }
 .message-list-container {
+  /* margin-top: 20rpx; */
   width: 100%;
-  height: calc(100% - 120rpx);
+  height: calc(100%);
   background-color: #F4F4F4;
 }
 .t-message-item {
@@ -13,7 +14,8 @@
   padding: 14rpx 0;
 }
 .t-message{
-  position: relative
+  position: relative;
+  z-index: -9;
 }
 .t-recieve-message {
   display: flex;
@@ -250,45 +252,17 @@
   padding-left: 5px;
   color: blue;
 }
-.info{
+.dialog{
+  width: 50%;
+  text-align: center;
   height: 100rpx;
-  background-color: #fff;
-  display: flex;
-  justify-content: space-around;
-  align-items: center;
-  box-shadow: 0px 2px 4px 0px rgba(0,0,0,0.08);
+  line-height: 100rpx;
 }
-.left{
-  display: flex;
-  justify-content: space-around;
-  align-items: center;
-  flex: 2;
+.dialog_cancel_btn{
+  border-top: 1px solid #E9E9E9;
+  border-right: 1px solid #E9E9E9;
 }
-.right{
-  flex: 1;
-  text-align: right;
-  font-size: 28rpx;
-  color: #FFFFFF;
-  padding-right: 20rpx;
-}
-.right_txt{
-  background: #3CC7C0;
-  border-radius: 29rpx;
-  padding: 10rpx 20rpx;
-}
-.name{
-  font-size: 34rpx;
+.dialog_confirm_btn{
+  border-top: 1px solid #E9E9E9;
   color: #3CC7C0;
-}
-.age{
-  font-size: 34rpx;
-  color: #666666;
-}
-.status{
-  background: #FFF2E8;
-  box-shadow: 0px 2px 4px 0px rgba(0,0,0,0.08);
-  border-radius: 10rpx;
-  font-size: 24rpx;
-  color: #FA541C;
-  padding: 10rpx 20rpx;
 }
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/index.js b/TUIKit/components/TUIChat/index.js
index 9bb6b4f..60cf663 100644
--- a/TUIKit/components/TUIChat/index.js
+++ b/TUIKit/components/TUIChat/index.js
@@ -1,11 +1,14 @@
 // TUIKit-WChat/Chat/index.js
 import logger from '../../utils/logger';
 import constant from '../../utils/constant';
+import { API } from './../../../utils/network/api'
+const api = new API()
 // eslint-disable-next-line no-undef
 const app = getApp();
 
 const inputStyle = `
-  --padding: 25px
+  --padding: 0px;
+  z-index: 9999999;
 `;
 
 let newInputStyle =  `
@@ -66,7 +69,31 @@ Component({
           showTips: true,
         });
       }
+
+      let rect = null;
+      if (wx.getMenuButtonBoundingClientRect) {
+          rect = wx.getMenuButtonBoundingClientRect();
+      }
+      console.log("rect: ", rect)
+      wx.getSystemInfo({
+        success: (res) => {
+            const { statusBarHeight } = wx.getSystemInfoSync();
+            console.log("statusBarHeight: ", statusBarHeight);
+            console.log("${rect.height}px: ", `${rect.height}`);
+            let height = Number.parseInt(statusBarHeight) + Number.parseInt(`${rect.height}`) + 50;
+           this.setData({
+            navbar_height: height
+           })
+        },
+        fail: (err) => {
+            console.error('navbar 获取系统信息失败', err);
+        },
+    });
+
     },
+    ready() {
+      this.getInquiryMessageBasic()
+    }
   },
   /**
    * 组件的初始数据
@@ -95,16 +122,31 @@ Component({
     showTips: false,
     showGroupTips: false,
     showAll: false,
+    navbarData: {
+      showCapsule: 2, //是否显示左上角图标   1表示显示    0表示不显示
+      title: '', //导航栏 中间的标题
+    },
+    baseInfo: {},
+    navbar_height: 0
   },
 
   /**
    * 组件的方法列表
    */
   methods: {
+    //获取问诊订单消息内页基础数据
+    getInquiryMessageBasic() {
+      console.log("order_inquiry_id: ", this.data.order_inquiry_id);
+      api.getInquiryMessageBasic({order_inquiry_id: this.data.order_inquiry_id}).then(response => {
+        console.log(response);
+        this.setData({
+          baseInfo: response.data,
+          "navbarData.title": response.data.patient_name
+        })
+      }).catch(errors => {console.error(errors);})
+    },
     init() {
-
       console.warn("TUIChat js: init", this.data.conversationID)
-
       wx.$TUIKit.setMessageRead({ conversationID: this.data.conversationID }).then(() => {
         logger.log('| TUI-chat | setMessageRead | ok');
       });
diff --git a/TUIKit/components/TUIChat/index.json b/TUIKit/components/TUIChat/index.json
index c0873f0..664d8ba 100644
--- a/TUIKit/components/TUIChat/index.json
+++ b/TUIKit/components/TUIChat/index.json
@@ -3,6 +3,8 @@
   "usingComponents": {
     "MessageList": "./components/MessageList/index",
     "MessageInput": "./components/MessageInput/index",
-    "TUIGroup": "../TUIGroup/index"
-  }
+    "TUIGroup": "../TUIGroup/index",
+    "te-nav-bar": "/commpents/te_navbar"
+  },
+  "disableScroll":true
 }
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/index.wxml b/TUIKit/components/TUIChat/index.wxml
index 19aa985..8c5557a 100644
--- a/TUIKit/components/TUIChat/index.wxml
+++ b/TUIKit/components/TUIChat/index.wxml
@@ -1,18 +1,30 @@
 <!--TUIKit-WChat/Chat/index.wxml-->
+<te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container">
-   <view class="tui-navigatorbar">
-     <image class="tui-navigatorbar-back" bindtap="goBack" src="../../static/assets/ic_back_white.svg" />
+  <view class="info" wx:if="{{ true }}">
+  <view class="left">
+    <view class="name">{{baseInfo.patient_name}}</view>
+    <view class="age">{{baseInfo.patient_sex==1?'男':'女'}}｜{{baseInfo.patient_age}}岁</view>
+    <view class="status">{{baseInfo.inquiry_status==1?'待支付':baseInfo.inquiry_status==2?'待分配':baseInfo.inquiry_status==3?'待接诊':baseInfo.inquiry_status==4?'已接诊':baseInfo.inquiry_status==5?'已完成':baseInfo.inquiry_status==6?'已结束':baseInfo.inquiry_status==7?'已取消':'未知'}}</view>
+  </view>
+  <view class="right">
+    <text class="right_txt" bindtap="putDoctorInquiryFinish">结束问诊</text>
+  </view>
+</view>
+
+   <!-- <view class="tui-navigatorbar">
+     <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'}}  ">
-    <view wx:if="{{showTips}}" class="safetytips-box">
+    </view> -->
+  <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);">
+    <!-- <view wx:if="{{showTips}}" class="safetytips-box"> -->
     <!-- <view class="safetytips">
       <text>【安全提示】本 APP 仅用于体验腾讯云即时通信 IM 产品功能，不可用于业务洽谈与拓展。请勿轻信汇款、中奖等涉及钱款等信息，勿轻易拨打陌生电话，谨防上当受骗。</text>
       <span class="report" bindtap="handleReport">点此投诉</span>
     </view> -->
-  </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"></MessageList>
+    <MessageList 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">
@@ -24,4 +36,7 @@
     bind:handleCall="handleCall" ></MessageInput>
   </view>
   </view>
+  <view style="height: 30px;position: fixed;bottom: 0;width: 100%;background-color: #fff;">
+    
+  </view>
 </view>
diff --git a/TUIKit/components/TUIChat/index.wxss b/TUIKit/components/TUIChat/index.wxss
index 098291a..070f9ca 100644
--- a/TUIKit/components/TUIChat/index.wxss
+++ b/TUIKit/components/TUIChat/index.wxss
@@ -1,7 +1,7 @@
 .container {
   width: 100vw;
-  /* height: 100vh; */
-  background-color: #dcaceb;
+  height: 100vh;
+  background-color: #F4F4F4;
 }
 .safetytips-box{
   background: rgba(255, 149, 0, 0.1);
@@ -25,7 +25,7 @@
   top: 0;
   width: 750rpx;
   height: 172rpx;
-  background-color: #bae46b;
+  background-color: #ffffff;
 }
 
 .tui-navigatorbar-back{
@@ -80,10 +80,9 @@
   align-items: center;
 }
 .list-box {
-  position: absolute;
+  /* position: absolute; */
   width: 100vw;
-  height: calc(100vh - 210px);
-  top: 172rpx;
+  /* position: fixed; */
 }
 .list-box-notips {
   height: calc(100vh - 284px);
@@ -98,8 +97,10 @@
 }
 .input-area {
   position: absolute;
-  bottom: 0;
-  }
+  bottom: 20px;
+  z-index: 999999;
+  /* height: 200rpx; */
+}
 .message-list {
   width: 100%;
   height: 100%;
@@ -110,6 +111,7 @@
   width: 100%;
   padding-bottom: var(--padding);
   background-color: #ffffff;
+  z-index: 999999;
 }
 .calling {
   position: fixed;
@@ -124,3 +126,47 @@
     z-index: 8;
     position: absolute;
 }
+.info{
+  /* position: relative; */
+  z-index: 9;
+  height: 100rpx;
+  background-color: rgb(255, 255, 255);
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  box-shadow: 0px 2px 4px 0px rgba(0,0,0,0.08);
+}
+.left{
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex: 2;
+}
+.right{
+  flex: 1;
+  text-align: right;
+  font-size: 28rpx;
+  color: #FFFFFF;
+  padding-right: 20rpx;
+}
+.right_txt{
+  background: #3CC7C0;
+  border-radius: 29rpx;
+  padding: 10rpx 20rpx;
+}
+.name{
+  font-size: 34rpx;
+  color: #3CC7C0;
+}
+.age{
+  font-size: 34rpx;
+  color: #666666;
+}
+.status{
+  background: #FFF2E8;
+  box-shadow: 0px 2px 4px 0px rgba(0,0,0,0.08);
+  border-radius: 10rpx;
+  font-size: 24rpx;
+  color: #FA541C;
+  padding: 10rpx 20rpx;
+}
\ No newline at end of file
diff --git a/app.js b/app.js
index 238b2fb..1441b59 100644
--- a/app.js
+++ b/app.js
@@ -58,6 +58,11 @@ App({
   imInit(){
 
     let userID = wx.getStorageSync('user_id');
+    let usertype = wx.getStorageSync('usertype');
+    if(usertype != 2){//只登录医师端
+      return;
+    }
+    
     if(userID == ""){
       return;
     }
diff --git a/commpents/myprofile/index.js b/commpents/myprofile/index.js
index bc99575..d101a08 100644
--- a/commpents/myprofile/index.js
+++ b/commpents/myprofile/index.js
@@ -98,6 +98,8 @@ Component({
     work_cert_reason: "",
     department_custom_name_reason: '',
     zhuanchang_note: '请选择专长',
+    jianjie_show: false,
+    shanchang_show: false,
   },
 
   options: {
@@ -363,7 +365,9 @@ Component({
     onChangeCity(e) {
       this.setData({
         select_county_id: "",
-        select_yiyuan_id: ""
+        select_yiyuan_id: "",
+        yiyuan_note: "请选择医院",
+        city_note: "请选择城市",
       })
       console.log("onChangeCity");
       const { selectedOptions } = e.detail;
@@ -595,10 +599,30 @@ Component({
     onshowJianJieNote(e){
       e.detail // 自定义组件触发事件时提供的 detail 对象
       console.log("onshowJianJieNote");
+      this.setData({
+        jianjie_show: true,
+      });
+    },
+    onJianjieClose(e){
+      e.detail // 自定义组件触发事件时提供的 detail 对象
+      console.log("onshowJianJieNote");
+      this.setData({
+        jianjie_show: false,
+      });
     },
     onshowShanChangNote(e){
       e.detail // 自定义组件触发事件时提供的 detail 对象
       console.log("onshowShanChangNote");
+      this.setData({
+        shanchang_show: true,
+      });
+    },
+    onshowShanChangNoteClose(e){
+      e.detail // 自定义组件触发事件时提供的 detail 对象
+      console.log("onshowShanChangNote");
+      this.setData({
+        shanchang_show: false,
+      });
     },
     onshowZhiYeNote(e){
       e.detail // 自定义组件触发事件时提供的 detail 对象
diff --git a/commpents/myprofile/index.json b/commpents/myprofile/index.json
index dd3b01c..e03f7ea 100644
--- a/commpents/myprofile/index.json
+++ b/commpents/myprofile/index.json
@@ -19,6 +19,7 @@
     "van-toast": "@vant/weapp/toast/index",
     "van-button": "@vant/weapp/button/index",
     "van-icon": "@vant/weapp/icon/index",
-    "van-search": "@vant/weapp/search/index"
+    "van-search": "@vant/weapp/search/index",
+    "van-empty": "@vant/weapp/empty/index"
   }
 }
diff --git a/commpents/myprofile/index.wxml b/commpents/myprofile/index.wxml
index fca0589..a0b74af 100644
--- a/commpents/myprofile/index.wxml
+++ b/commpents/myprofile/index.wxml
@@ -46,7 +46,8 @@
           default-index="{{select_yiyuan_index}}"
           bind:cancel="onYiYuanCancel"
           bind:confirm="onYiYuanConfirm" 
-          bind:change="onYiYuanChange" />
+          bind:change="onYiYuanChange"
+          />
        
         <van-search
           value="{{ hospital_search_val }}"
@@ -56,6 +57,9 @@
           bind:change="hospitalSearchChange"
           bind:search="hospitalSearch"
         />
+
+        <van-empty description="暂无医院" wx:if="{{yiyuan_columns.length == 0}}"/>
+
         </van-popup>
         <t-cell title="科室" hover required arrow note="{{keshi_note}}" 
         bindtap="{{(indentity && iden_auth_disabled)?'':'onKeshiShow'}}" bordered="{{ select_keshi_id == '' }}"/>
@@ -146,6 +150,30 @@
         </view>
         </van-popup>
 
+        <van-popup
+          show="{{ jianjie_show }}"
+          closeable
+          round
+          position="bottom"
+          bind:close="onJianjieClose"
+        >
+        <view class="jianjie_popup">
+          博士，xxxx医院肝病科副主任医师，硕士研究生导师；中华医学会肝病学分会青年委员，北京医学会感染病学分会委员；2015首都十大杰出青年医生，2020年中华医学会抗击新冠优秀个人；作为主要研究者参与各级科研课题10项，发表学术论文10余篇，其中SCI文章2篇
+        </view>
+        </van-popup>
+
+        <van-popup
+          show="{{ shanchang_show }}"
+          closeable
+          round
+          position="bottom"
+          bind:close="onshowShanChangNoteClose"
+        >
+        <view class="jianjie_popup">
+          肝病的个体化治疗、致力于各种肝病尤其肝衰竭的临床诊治，尤其专注于终末期肝病营养相关临床和基础研究。
+        </view>
+        </van-popup>
+
         <t-popup visible="{{zhuanchang_show}}" 
         prevent-scroll-through
         bind:visible-change="onZhuanChangVisibleChange" placement="bottom">
@@ -190,7 +218,7 @@
             model:value="{{ office_phone }}"
             bind:change="onOfficePhoneChange"
             placeholder="请输入科室电话"
-            placeholder-style="font-size:25rpx;letter-spacing: 2rpx;color:rgba(0, 0, 0, 0.4);"
+            placeholder-style="font-size:30rpx;letter-spacing: 2rpx;color:rgba(0, 0, 0, 0.4);"
             input-align="right"
             type="number"
             clearable
@@ -242,7 +270,7 @@
         textarea_val="{{textarea_shanchang}}"
         has_error_content="{{ be_good_at_reason }}"
         textarea_cell_content_placeholder="您的专业领域、擅长疾病、研究方法等信息（10~1000字）" 
-        textarea_cell_note="查看示例" data-textarea_name="textarea_shanchang" bindTextAreaBlur="getTextAreaVal" />
+        data-textarea_name="textarea_shanchang" bindTextAreaBlur="getTextAreaVal" />
 
         <m-upload-cell
         upload_cell_name="医师执业证" 
diff --git a/commpents/myprofile/index.wxss b/commpents/myprofile/index.wxss
index 99a1b8c..f713044 100644
--- a/commpents/myprofile/index.wxss
+++ b/commpents/myprofile/index.wxss
@@ -5,7 +5,7 @@
   margin-left: 32rpx;
   display: flex;
   justify-content: space-between;
-  font-size: 32rpx;
+  font-size: 34rpx;
   font-weight: 400;
   align-items: center;
 }
@@ -15,7 +15,7 @@
   margin-left: 32rpx;
   display: flex;
   justify-content: space-between;
-  font-size: 32rpx;
+  font-size: 34rpx;
   font-weight: 400;
   align-items: center;
 }
@@ -36,7 +36,7 @@
 }
 
 .title{
-  font-size: 30rpx;
+  font-size: 32rpx;
   color: #1C2023;
 }
 .right{
@@ -225,7 +225,9 @@
   border-bottom-style: solid;
   border-bottom-color: var(--td-cell-border-color, var(--td-gray-color-3, #e7e7e7));
 }
-
 .van-cell {
   padding: 32rpx !important;
+}
+.jianjie_popup{
+  margin: 100rpx 20rpx;
 }
\ No newline at end of file
diff --git a/commpents/textarea-cell/index.js b/commpents/textarea-cell/index.js
index ae77c03..da8a4b6 100644
--- a/commpents/textarea-cell/index.js
+++ b/commpents/textarea-cell/index.js
@@ -6,7 +6,7 @@ Component({
   properties: {
     textarea_cell_name: {
       type: String,
-      value: '示例标题',
+      value: '标题',
     },
     required: {
       type: Boolean,
@@ -18,11 +18,11 @@ Component({
     },
     textarea_cell_note: {
       type: String,
-      value: '示例备注',
+      value: '查看示例',
     },
     textarea_cell_content_placeholder: {
       type: String,
-      value: '示例placeholder',
+      value: '请输入文字',
     },
     t_icon_name: {
       type: String,
diff --git a/miniprogram_npm/tdesign-miniprogram/navbar/navbar.js b/miniprogram_npm/tdesign-miniprogram/navbar/navbar.js
index fb8e0f9..8fe1721 100644
--- a/miniprogram_npm/tdesign-miniprogram/navbar/navbar.js
+++ b/miniprogram_npm/tdesign-miniprogram/navbar/navbar.js
@@ -103,6 +103,10 @@ let Navbar = class Navbar extends SuperComponent {
                     boxStyleList.push(`--td-navbar-right:${res.windowWidth - rect.left}px`);
                 }
                 boxStyleList.push(`--td-navbar-capsule-height: ${rect.height}px`);
+
+                console.log("statusBarHeight: ", statusBarHeight);
+                console.log("${rect.height}: ", `${rect.height}`);
+                
                 boxStyleList.push(`--td-navbar-capsule-width:${rect.width}px`);
                 this.setData({
                     boxStyle: `${boxStyleList.join('; ')}`,
diff --git a/project.private.config.json b/project.private.config.json
index b4e92c7..922bbc7 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -2,7 +2,7 @@
   "projectname": "miniprogram-doctor",
   "setting": {
     "compileHotReLoad": true,
-    "urlCheck": false
+    "urlCheck": true
   },
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "condition": {
diff --git a/static/images/123.png b/static/images/123.png
deleted file mode 100644
index 028473ac6e69a07bf8ba0dff951a6ca53d606b84..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4362
zcmeI0d0dj&8pmNQYcjN%nyip)Q)^sD3v&U>7DY|Rr5x9^6ePtZcTusN^0uj0TvAhW
z1h-rRRNOFabQGaPCB>8)az$Lj9lbAe@4xr&@pC`-kN5Mw=bY#4=lMRr^FI37+6=Pi
z$Q}>~1VNc!wgZ8{xggLtq}|^DISfU%Jn#Ys+nJeyD%eVsKw<~x;<bw)P<4{rhUZQo
z{cWJRQ!oewOOQU`q|teA5NKZ>>heX02zSviBY6KLtRo02vw2wVwu{I593+|4Fk@&@
zuRiIcd+En6hmh3C)01`_TaL;PqoIx*TV3J_VkaS4jT?XRXiE)=M%!Ew=X}t4=~lki
zcZ8x|{^bEdGKY^_T)efo)atj$oQk5b>`~A_cjSyoM03!qC9LP?`7T~jd;-f*ErKxa
z-ZY*O93g3cRX&U!eMkk5|JH{I6gijod~t(D);BxNZuK`R`RS`C5#cW_18SDLY_GH4
zjb~Q)UZH<jo~miAi)e+DArsvRP3z?IG=!PG?sAmxKpFf=3PsHq>djP%Wc?Pzkqtp_
zWYToW7kgo4Ii+W*bn<cB1<XTB%Yx#xUJklvC(ycHK}8zYpAi8V7e2hki#v7B&#g!#
zVs93V_CIn@Oa?5ZIk>L}Mi&0O6}<i}3Fvk{RGB5B93tf1piJzL);u^7J=V#)x)`V?
zt-uo3!`P%*jPzT3*U-5uIqU-&n-<W0=DfHI9N8Ty@MFnT@I4Y__bJ?kV_2DQP=9C9
zT2@Vbf=CmD;WDW(<BjE!m{6HQZU<F@iC9T8k<d4IALRqDA`o}h$3H8>XkhzASLnXt
zO03NDd)sFc+hi^OSBBxDtzm^^9gGXwO!(S*pybF-f34nVmG_sLui-!66`OvVFyX(n
zLVcRh<7ahy9jGG~(dAr0{IC}d&UHtv79V`q&6fRp5A}B6h@Z&I;WG$+T_^y-R^vkB
z89^FNF}rpvY<-5GU~={*)Ev4WUyIkN{4Ga^P#0@IeO?u3HQlpthlOGky`AagwciX7
zr5@BL?EDi2-LGzTRYj?dOvVV~Bd-fSG$aIsFEJhM{uD2=(rlU5xv!lK;<Y+L7{ik4
z!6T8RXZ!a5UJ<f7xrU}&Qog%o4z0GJy9Yp+`J*=a>Asxith;yJ5(QaC-(TR>eGd@)
z5Ue*XT~k|&TNRVrCe(MAuVEUpn(7)!&t4UK&CGW>Lx#rBbmE(Xgl!`dw71qttYB(Q
zG?O$M5(+>aH`KG+RTe8KRUgl<tO?6j7h8PVTxck_*`<)3M%N%gO7(~EEID}-zH1Qq
z4;2;M+ym9X(Gc24PT8d`6g0YR;`NsRYlG0x3Lb$Y%U|+e_Nb#e;FtP0KCfMybr9)c
z<7d~Z!neNYcQ*quBRpS?1W{d#@;x8h^vAl<a@G$MGT8V>X$5paZOP{A`VkGX0tr%R
zE6=@(RR`i#7$ucXgg@u>idj6kO}#jY`X&_#Gd7MrIRyZplDe7#f9_r~bQ<TKb)`E)
z0@f?>B-Z3sn|P?6^W$*!mUeZMfVdIWz8RO<SA}wUH=yhqRayJ6z{W+Lk<Qn*d^c3=
z>zy@}sl6W0EMNUc;uFU10%R3c{8aMhV<RJYcD22HOn}3@0QPRomhBSbffXKJkDqB8
z91+5QDPjZXA~Gh<S+a*zj+s_4T=JZaHBc|x8rJs8EyH!s#~&9e9>*bW6W&+fwfJSL
zG7k<MgVzfU!|`aj3`+^qTsoi^Ug<?`6|G4J4iUa9aC#d(s7#D(pb*}?JK@HOY<$h#
z=p8*g>uhkwKVA1G2Y%Sih}pf|St%D7tupL0wsJz2e-cNGG#IGhvmI~i=E@6i1gqp!
zh>6rUJEZ%VMJ@Q&2nj>*?HYMJ+(9=(jx1(DINT=4OZZuJ!2`FUv3@JoFE;oN-}5>d
z(j1uX_}I?Iv?DKo9v3c1f84)ootxS;7cJld!JO5^Hs^hkQwzsM2K}_&aZJgCxDpaW
zaq6Sz%x>)v3NqJ}U8UuXb`I9&Oe~fX`#ij1R{_Hh6-}9Vnibq_UAUt*G8K>>bA-{$
z4P#y@Pm)b$Oiqh4>wP*L!#|iPBSPr&MNp>r9q|JY?X{H{J6D9tPYKo;Wf{1{T%J+v
zL{D298@aim*Vbj_ppTVlp7X*L)O`7#y+kA1s*oWott$%cjHmYUk}kd}FOEBC(o9a!
zTRU%um9Y+wwl&Z6*A`~4b<v0@=v%`ip^g@Fw2LE~*`7qH&$9dq-;0gEpvFkR*3(_{
zb{@m+^I2I%Sd|2XBhsiBUkZG0R-!-b0Za<QTNAb7>$0{5$AV~$BS((9GpgVJo+^@V
za*d6RIn=Q=Ae^9Ki+^2XOX(Yq9%$ejAB;JMJB4qc@cVz_Ew|ruF+o8)0l7uHaC<Sr
zTh#le4b4KO-EQgO9@VUbKLPym<X|z<J6%!HvIl_57IGus31g_dtlW1^d&Q>DY-vxY
zMGw0YS)iGL^)FJG{vjo;jhd1x^^_&+r}Z}q={d+MM-L0BBU&!)v6@`*TbAVDStrJ<
zc^(!Wj-3c+_s~!mzB$yYM5*i<=SHE@n<lBO)G_18_Tp=h#W<r<7fPxD;NqRxq9z`^
zQtj)b95AI6aB*a{p2rPo%W7e=-KBtwuf1j0{j4~5@c{bq8KY4#w`$M{<5+tF7jp~a
zdfH7W>Rwnw5C2LPKgtQpzZ!r&i+JHQf^pVAE;VQ=yE8y4x0&Ai{5m9CYVzOvh;!-(
zFp@WLSm)IdI99mdNCthqP4%xvtla%ZD*iLHD1jTW@;w^fi2%&bj?k=QPat5xJO%*d
z<yHi6ODCPRQBVhfME22VpZw*mTTk=ca$`cuYe~=4^M@3`FfC1li*n--!sqCN&187R
zuX<rD+h6u#1s3O-32{iLq4%^y+fJ=+3y0V?+Wr5l@wZ>7R2RcATRjU?!g9}Ge5E;5
zC-XCh)7si9y)FJb&7t+2tzCXh1rtj=jVxRYG!c!l1)Hm{&OFHt_y{N$!p4l^C0<--
zpTDNYhL~$D8O8?BKO@3Dbk8}O+0^#)b8ua2z&(=1Wj~TOlD}pQXr<MVxhf~j7uM1U
zAligcc|`!*05o%_Ur@pOSL(K2s!sWI-5aP3SI7=+UJ4Ze?C|GKrc=R10HC*68FK8{
z`%a0|QdTs;SW=-BYIq9QGTA&x0|1Mr*{8Jt_=F8hGWx}6Yyt^#-p#-eD)x!a3S}27
zmG!UZjo-_b4#z3$bIS1DMmW#Z;J#6jx+w|ryt~)}kUa1FH(Eq5Dt7-9m<bI<Y3i98
zTzlz18a<NuBd*2kPBPlkWgd;M^!FLNMvGmM5WwT)Le0`k_w<4P7a-IX>&q3U9{2wR
D0|s3T

diff --git a/utils/network/api.js b/utils/network/api.js
index 1d98035..03217ac 100644
--- a/utils/network/api.js
+++ b/utils/network/api.js
@@ -458,6 +458,16 @@ class API extends HTTP {
       ...params
     }
   })
+}
+ //搜索疾病分类-平台
+ getBasicIcdSearch(params) {
+  return this.request({
+    url: `${this.baseUrl}/basic/icd/search`,
+    method: 'GET',
+    data: {
+      ...params
+    }
+  })
 }
  //搜索药品
  getBasicProductSearch(params) {
@@ -496,7 +506,8 @@ class API extends HTTP {
     method: 'POST',
     data: {
       ...params
-    }
+    },
+    showLoading: false
   })
 }
  //获取患者问诊病例
@@ -616,6 +627,86 @@ class API extends HTTP {
       ...params
     }
   })
+}
+ //结束问诊
+ putDoctorInquiryFinish(params) {
+  let order_inquiry_id = params.order_inquiry_id;
+  console.log("order_inquiry_id: ", order_inquiry_id);
+  params = {}
+  return this.request({
+    url: `${this.baseUrl}/doctor/inquiry/finish/`+order_inquiry_id,
+    method: 'PUT',
+    data: {
+      ...params
+    }
+  })
+}
+ //获取问诊订单消息内页基础数据
+ getInquiryMessageBasic(params) {
+  let order_inquiry_id = params.order_inquiry_id;
+  console.log("order_inquiry_id: ", order_inquiry_id);
+  params = {}
+  return this.request({
+    url: `${this.baseUrl}/inquiry/message/basic/`+order_inquiry_id,
+    method: 'GET',
+    data: {
+      ...params
+    }
+  })
+}
+ //获取医生服务消息列表-分页
+ getDoctorMessageService(params) {
+  return this.request({
+    url: `${this.baseUrl}/doctor/message/service`,
+    method: 'GET',
+    data: {
+      ...params
+    }
+  })
+}
+ //获取医生系统公告列表-分页
+ getDoctorMessageSystem(params) {
+  return this.request({
+    url: `${this.baseUrl}/doctor/message/system`,
+    method: 'GET',
+    data: {
+      ...params
+    }
+  })
+}
+ //获取医生系统公告详情
+ getDoctorMessageSystemDetail(params) {
+  let notice_id = params.notice_id;
+  params = {}
+  return this.request({
+    url: `${this.baseUrl}/doctor/message/system/`+notice_id,
+    method: 'GET',
+    data: {
+      ...params
+    }
+  })
+}
+ //消息已读
+ putMessageReadNotice(params) {
+  let notice_id = params.notice_id;
+  params = {}
+  return this.request({
+    url: `${this.baseUrl}/message/notice/read/`+notice_id,
+    method: 'PUT',
+    data: {
+      ...params
+    }
+  })
+}
+ //一键消息已读
+ putMessageReadNoticeAll(params) {
+  return this.request({
+    url: `${this.baseUrl}/message/notice/read`,
+    method: 'PUT',
+    data: {
+      ...params
+    }
+  })
 }
 }
 
diff --git a/utils/util.js b/utils/util.js
index ab1dc18..fa8bd1c 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -63,10 +63,17 @@ const getTimeAgo = stringTime =>{
   }
   return result;
 }
+// px 转换为 rpx ，传参类型是数字（Number）
+const rpxTopx = px => {
+  let deviceWidth = wx.getSystemInfoSync().windowWidth; //获取设备屏幕宽度
+  let rpx = (750 / deviceWidth) * Number(px)
+  return Math.floor(rpx);
+}
 
 module.exports = {
   formatTime,
   getDateArr,
   formatNumber,
   getTimeAgo,
+  rpxTopx
 }

From 9859b0cbeaa972e9e8c134edf81c41a31449d725 Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Thu, 30 Mar 2023 08:49:38 +0800
Subject: [PATCH 13/83] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=81=8A=E5=A4=A9?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/login/index.js                          |   4 +-
 Pages/mobile_login/index.js                   |   6 +-
 Pages/yaoshi/my/my.js                         |   4 +-
 Pages/yishi/index/index.js                    |   8 +-
 Pages/yishi/index/index.json                  |   3 +-
 Pages/yishi/index/index.wxml                  |  49 +++++---
 Pages/yishi/my/index.js                       |   8 +-
 Pages/yishi/myinfo/index.js                   |  13 +-
 Pages/yishi/wenzhen_v2/wenzhen.js             |  40 ++++++-
 .../MessageElements/CustomMessage/index.js    |  31 +++++
 .../MessageElements/CustomMessage/index.json  |   4 +-
 .../MessageElements/CustomMessage/index.wxml  |  28 +++++
 .../MessageElements/CustomMessage/index.wxss  | 113 ++++++++++++++++++
 .../TUIChat/components/MessageInput/index.js  |   7 +-
 .../components/MessageInput/index.wxss        |   3 +
 .../TUIChat/components/MessageList/index.js   |  50 ++++----
 .../TUIChat/components/MessageList/index.json |   3 +-
 .../TUIChat/components/MessageList/index.wxml |  17 +--
 .../TUIChat/components/MessageList/index.wxss |  14 ---
 TUIKit/components/TUIChat/index.js            |  58 ++++++++-
 TUIKit/components/TUIChat/index.json          |   3 +-
 TUIKit/components/TUIChat/index.wxml          |  22 +++-
 TUIKit/components/TUIChat/index.wxss          |  23 +++-
 TUIKit/utils/constant.js                      |   9 ++
 app.js                                        |   5 +-
 commpents/wenzhen_data/index.wxml             |   6 +-
 custom-tab-bar/index.js                       |   9 +-
 utils/network/api.js                          |   6 +-
 28 files changed, 422 insertions(+), 124 deletions(-)

diff --git a/Pages/login/index.js b/Pages/login/index.js
index 9407e64..f0c734b 100644
--- a/Pages/login/index.js
+++ b/Pages/login/index.js
@@ -47,8 +47,8 @@ Page({
         api.wechatMobileLogin(params).then(response => {
           console.log(response);
           wx.setStorageSync('AUTH_TOKEN_'+usertype, response.data.token);
-          wx.setStorageSync('user_id', response.data.user_id);
-          wx.setStorageSync('client_user_id', response.data.client_user_id);
+          wx.setStorageSync('user_id_'+usertype, response.data.user_id);
+          wx.setStorageSync('client_user_id_'+usertype, response.data.client_user_id);
           app.globalData.config.userID = response.data.user_id;
           app.imInit();
           //跳转页面
diff --git a/Pages/mobile_login/index.js b/Pages/mobile_login/index.js
index 0b9409c..9641266 100644
--- a/Pages/mobile_login/index.js
+++ b/Pages/mobile_login/index.js
@@ -12,7 +12,7 @@ Page({
     sms: "",
     btn_msg: "获取验证码",
     btn_disabled: false,
-    login_disabled: true,
+    login_disabled: false,
     btn_color: "#ccc"
   },
   onChange(event) {
@@ -115,8 +115,8 @@ Page({
           api.mobileLogin(params).then(response => {
             console.log(response);
             wx.setStorageSync('AUTH_TOKEN_'+usertype, response.data.token);
-            wx.setStorageSync('user_id', response.data.user_id);
-            wx.setStorageSync('client_user_id', response.data.client_user_id);
+            wx.setStorageSync('user_id_'+usertype, response.data.user_id);
+            wx.setStorageSync('client_user_id_'+usertype, response.data.client_user_id);
             app.globalData.config.userID = response.data.user_id;
             app.imInit();
             wx.switchTab({
diff --git a/Pages/yaoshi/my/my.js b/Pages/yaoshi/my/my.js
index a140602..df59c91 100644
--- a/Pages/yaoshi/my/my.js
+++ b/Pages/yaoshi/my/my.js
@@ -36,8 +36,8 @@ Page({
         if (res.confirm) {
           console.log('用户点击确定')
           wx.setStorageSync('AUTH_TOKEN_'+usertype, "");
-          wx.setStorageSync('user_id', "");
-          wx.setStorageSync('client_user_id', "");
+          wx.setStorageSync('user_id_'+usertype, "");
+          wx.setStorageSync('client_user_id_'+usertype, "");
           app.go("/Pages/index/index");
         } else if (res.cancel) {
           console.log('用户点击取消')
diff --git a/Pages/yishi/index/index.js b/Pages/yishi/index/index.js
index 0fa641b..44a7b2c 100644
--- a/Pages/yishi/index/index.js
+++ b/Pages/yishi/index/index.js
@@ -90,11 +90,11 @@ Page({
         case_text: "请您先多点执业认证"
       },
     ],
-    skeleton_loading: true,
     contactKeFu: false,
     jiesuan_dialog_show: false,
     jiesuan_dialog_visible: false,
-    aa: 0
+    funbox_height: 100,
+    skeleton_loading: true
   },
   //  获取状态栏信息
   getMenuButtonBound() {
@@ -316,8 +316,8 @@ Page({
      let multi_point_status = this.data.info.multi_point_status;
       //绑定结算银行卡
     var is_bind_bank = this.data.info.is_bind_bank;
-     
-     let userID = wx.getStorageSync('user_id');
+    let usertype =  wx.getStorageSync('usertype');
+     let userID = wx.getStorageSync('user_id_'+usertype);
      wx.setStorageSync(userID+'_idcard_status', idcard_status);
      wx.setStorageSync(userID+'_iden_auth_status', iden_auth_status);
      wx.setStorageSync(userID+'_multi_point_status', multi_point_status);
diff --git a/Pages/yishi/index/index.json b/Pages/yishi/index/index.json
index 73081fe..6ff3411 100644
--- a/Pages/yishi/index/index.json
+++ b/Pages/yishi/index/index.json
@@ -7,6 +7,7 @@
     "t-swiper": "tdesign-miniprogram/swiper/swiper",
     "t-badge": "tdesign-miniprogram/badge/badge",
     "t-dialog": "tdesign-miniprogram/dialog/dialog",
-    "van-image": "@vant/weapp/image/index"
+    "van-image": "@vant/weapp/image/index",
+    "t-skeleton": "tdesign-miniprogram/skeleton/skeleton"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/index/index.wxml b/Pages/yishi/index/index.wxml
index 8849dbd..e89bb69 100644
--- a/Pages/yishi/index/index.wxml
+++ b/Pages/yishi/index/index.wxml
@@ -1,5 +1,3 @@
-
-
 <view class="container" id="container">
   <!-- 顶部背景 -->
   <view class="top_bk"></view>
@@ -8,39 +6,57 @@
    style="top:0;padding-top: {{stateHeight}}px;height: {{navHeight + 10}}px;line-height: {{navHeight}}px;">{{ title }}</view>
   <!-- 用户信息 -->
   <view class="info_box" style="margin-top: {{stateHeight+navHeight+10}}px;">
+
+    
     <view class="info">
       <view class="info_top">
         <view class="info_photo" bindtap="go" data-url="/Pages/yishi/myinfo/index">
           <!-- 跳转我的信息 -->
-            <t-avatar alt="头像" class="avatar" size="medium" image="{{info.avatar}}" />
+            <t-avatar alt="头像" class="avatar" size="medium" image="{{info.avatar}}"  wx:if="{{!skeleton_loading}}"/>
+            <!-- 骨架屏 -->
+            <t-skeleton theme="avatar" animation="gradient" loading="{{skeleton_loading}}" />
         </view>
         <view class="info_content">
-          <view class="info_mobile">{{info.user_name}}</view>
+          <view class="info_mobile" wx:if="{{!skeleton_loading}}">{{info.user_name}}</view>
+          <t-skeleton theme="text" row-col="{{[1]}}" animation="gradient" loading="{{skeleton_loading}}" />
         </view>
         <view class="info_shiming" bindtap="go" data-url="{{shiming_status_url}}">
-          <view class="info_shiming_status {{info.info_shiming_status}}">{{info.info_shiming_status_txt}}</view>
+          <view class="info_shiming_status {{info.info_shiming_status}}" wx:if="{{!skeleton_loading}}">{{info.info_shiming_status_txt}}</view>
+          <t-skeleton theme="text" row-col="{{[1]}}" animation="gradient" loading="{{skeleton_loading}}" />
         </view>
       </view>
       <view class="info_wenzhen">
-        <view class="info_wenzhen_new" bindtap="go" data-url="/Pages/yishi/wenzhen_v2/wenzhen" data-moudle="0">新问诊：{{info.not_accepted_inquiry_num}}</view>
-        <view class="info_wenzhen_ing" bindtap="go" data-url="/Pages/yishi/wenzhen_v2/wenzhen" data-moudle="1">接诊中：{{info.accepting_inquiry_num}}</view>
+        <view class="info_wenzhen_new" wx:if="{{skeleton_loading}}">
+          <t-skeleton theme="text" row-col="{{[{ width: '70%' }]}}" animation="gradient" loading="{{skeleton_loading}}" />
+        </view>
+        <view class="info_wenzhen_new" bindtap="go" data-url="/Pages/yishi/wenzhen_v2/wenzhen" data-moudle="0" wx:if="{{!skeleton_loading}}">
+        新问诊：{{info.not_accepted_inquiry_num}}
+        <t-skeleton theme="text" row-col="{{[1]}}" animation="gradient" loading="{{skeleton_loading}}" />
+        </view>
+        <view class="info_wenzhen_ing" bindtap="go" data-url="/Pages/yishi/wenzhen_v2/wenzhen" data-moudle="1" wx:if="{{!skeleton_loading}}">接诊中：{{info.accepting_inquiry_num}}</view>
       </view>
     </view>
     <view class="info_note" wx:if="{{info.show_info_note}}">
-      <view class="haoping info_note_item">
+      <view class="haoping info_note_item" wx:if="{{skeleton_loading}}">
+        <t-skeleton theme="text" row-col="{{[{ width: '90%' }]}}" animation="gradient" loading="{{skeleton_loading}}" />
+      </view>
+      <view class="haoping info_note_item" wx:if="{{!skeleton_loading}}">
         <text class="info_note_txt">好评率</text><text class="info_note_num"> {{info.praise_rate}}%</text>
       </view>
-      <view class="time info_note_item">
+      <view class="time info_note_item" wx:if="{{!skeleton_loading}}">
         <text class="info_note_txt">响应时间</text><text class="info_note_num"> {{info.avg_response_time}} </text><text class="info_note_txt">分钟</text>
       </view>
-      <view class="follow info_note_item">
+      <view class="follow info_note_item" wx:if="{{!skeleton_loading}}">
         <text class="info_note_txt">关注数</text><text class="info_note_num"> {{info.number_of_fans}}</text>
       </view>
     </view>
   </view>
   <!-- 认证信息 -->
   <view class="renzhen">
-    <view class="renzheng_left" bindtap="go" data-url="/Pages/yishi/identity/index">
+    <view class="renzheng_left" wx:if="{{skeleton_loading}}">
+      <t-skeleton theme="image" row-col="{{[1]}}" animation="gradient" loading="{{skeleton_loading}}" />
+    </view>
+    <view class="renzheng_left" bindtap="go" data-url="/Pages/yishi/identity/index" wx:if="{{!skeleton_loading}}">
       <view class="renzheng_content_left">
         <view class="renzheng_content_name">医师身份认证</view>
         <view class="renzheng_content_status">
@@ -56,8 +72,10 @@
         />
       </view>
     </view>
-
-    <view class="renzheng_right" bindtap="gozhiye" data-url="/Pages/yishi/zhiye_identity/index">
+    <view class="renzheng_right" wx:if="{{skeleton_loading}}">
+      <t-skeleton theme="image" row-col="{{[1,1,1]}}" animation="gradient" loading="{{skeleton_loading}}" />
+    </view>
+    <view class="renzheng_right" bindtap="gozhiye" data-url="/Pages/yishi/zhiye_identity/index" wx:if="{{!skeleton_loading}}">
       <view class="renzheng_content_left">
         <view class="renzheng_content_name">多点执业认证</view>
         <view class="renzheng_content_status">
@@ -85,6 +103,7 @@
       bind:click="onTapAD"
       bind:change="onChangeAD"
       data-url="123"
+      wx:if="{{!skeleton_loading}}"
     >
     </t-swiper>
   </view>
@@ -179,4 +198,6 @@
     confirm-button-color="#3CC7C0"
     confirm-button-open-type="contact"
   />
-</view>
\ No newline at end of file
+</view>
+
+
diff --git a/Pages/yishi/my/index.js b/Pages/yishi/my/index.js
index da2eba8..30bc02c 100644
--- a/Pages/yishi/my/index.js
+++ b/Pages/yishi/my/index.js
@@ -27,8 +27,8 @@ Page({
       },
     });
     top = wx.getMenuButtonBoundingClientRect().top - stateHeight; //  获取top值
-    console.log('navHeight', navHeight);
-    console.log('top', top);
+    // console.log('navHeight', navHeight);
+    // console.log('top', top);
     this.setData({
       // navHeight: navHeight + top * 2, //  导航栏高度
       navHeight, //  导航栏高度
@@ -37,7 +37,7 @@ Page({
   },
 
   onShow: function () {
-    console.log("onshow ");
+    // console.log("onshow ");
     if (typeof this.getTabBar === 'function' && this.getTabBar()) {
       this.getTabBar().setData({
         active: 2  //数字是当前页面在tabbar的索引,如我的查询页索引是2，因此这边为2，同理首页就为0，审批页面为1
@@ -46,7 +46,7 @@ Page({
     this.getMenuButtonBound();
   },
   onLoad(){
-    console.log("my onLoad");
+    // console.log("my onLoad");
     //获取个人中心数据
     api.getDoctorCenter().then(response => {
       this.setData({
diff --git a/Pages/yishi/myinfo/index.js b/Pages/yishi/myinfo/index.js
index 3cbd0b3..b39512e 100644
--- a/Pages/yishi/myinfo/index.js
+++ b/Pages/yishi/myinfo/index.js
@@ -35,7 +35,8 @@ Page({
     }).catch(errors => {console.error(errors);})
   },
   onShow(){
-    let user_id = wx.getStorageSync("user_id");
+    let usertype =  wx.getStorageSync('usertype');
+    let user_id = wx.getStorageSync("user_id_"+usertype);
     let is_bind_bank = wx.getStorageSync(user_id+'_is_bind_bank');
     this.setData({
       is_bind_bank: is_bind_bank
@@ -51,8 +52,14 @@ Page({
         if (res.confirm) {
           console.log('用户点击确定')
           wx.setStorageSync('AUTH_TOKEN_'+usertype, "");
-          wx.setStorageSync('user_id', "");
-          wx.setStorageSync('client_user_id', "");
+          wx.setStorageSync('user_id_'+usertype, "");
+          wx.setStorageSync('client_user_id_'+usertype, "");
+          let promise = wx.$TUIKit.logout();
+          promise.then(function(imResponse) {
+            console.log(imResponse.data); // 登出成功
+          }).catch(function(imError) {
+            console.warn('logout error:', imError);
+          });
           app.go("/Pages/index/index");
         } else if (res.cancel) {
           console.log('用户点击取消')
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index 2d5039b..08a9265 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -19,11 +19,14 @@ Page({
     conversationList: [],
     message_inquiry_type: 1,
     system_notice_unreadnnum: "",
-    service_notice_unreadnnum: ""
+    service_notice_unreadnnum: "",
+    hasOnShow: false
   },
   onLoad() {
     console.log("wenzhen onload");
-    let userID = wx.getStorageSync('user_id');
+    let usertype =  wx.getStorageSync('usertype');
+    let userID = wx.getStorageSync('user_id_'+usertype);
+    wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
     setInterval(() => {
       let system_notice_unreadnnum = wx.getStorageSync(userID+"_system_notice_unreadnnum");
       let service_notice_unreadnnum = wx.getStorageSync(userID+"_service_notice_unreadnnum");
@@ -35,13 +38,28 @@ Page({
   },
   onShow: function () {
     console.log("onShow from wenzhen V2")
+    if(this.data.hasOnShow){
+      return;
+    }
     if (typeof this.getTabBar === 'function' && this.getTabBar()) {
       this.getTabBar().setData({
         active: 1  //数字是当前页面在tabbar的索引,如我的查询页索引是2，因此这边为2，同理首页就为0，审批页面为1
       })
     }
     this.getConversationList();
-    wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
+    //避免onshow加载多次
+    this.setData({
+      hasOnShow: true
+    })
+  },
+  onHide(){
+    console.log("onHideonHide from wenzhen")
+    this.setData({hasOnShow: false})
+  },
+  onUnload(){
+    console.log("onUnload from wenzhen")
+    this.setData({hasOnShow: false})
+    // wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived);
   },
   getConversationList(){
     wx.$TUIKit.getConversationList().then((imResponse) => {
@@ -234,6 +252,11 @@ Page({
     session_list.push(session_data_list_4);
     session_list.push(session_data_list_5);
 
+    let usertype =  wx.getStorageSync('usertype');
+    let userID = wx.getStorageSync('user_id_'+usertype);
+    let wenzhen_info = 0;
+    let message_inquiry_type = this.data.message_inquiry_type;
+
     this.data.conversationList.forEach(item => {
       let conversationID = item.conversationID;
       if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过
@@ -249,8 +272,11 @@ Page({
       let inquiry_type = cloudCustomDataJson.inquiry_type;
       if(!inquiry_type) return;
       if(inquiry_type > 4) return;
+      if(inquiry_type < message_inquiry_type){
+        message_inquiry_type = inquiry_type;
+      }
       let patient_family_data = cloudCustomDataJson.patient_family_data;
-      if(!patient_family_data) return;
+      if(patient_family_data == undefined) return;
       console.log("patient_family_data: ", patient_family_data);
       let session_item = {};
       session_item.inquiry_status = item.inquiry_status;//订单状态暂无
@@ -267,17 +293,23 @@ Page({
       session_item.from_account = userProfile.userID;
       let unreadCount = item.unreadCount;
       if(unreadCount > 0){
+        wenzhen_info = wenzhen_info + unreadCount;
         session_item.message_dot = true;
       }else{
         session_item.message_dot = false;
       }
       session_list[inquiry_type - 1].push(session_item);
     })
+
+    if(wenzhen_info == 0) wenzhen_info = "";
+    wx.setStorageSync(userID+'_wenzhen_info', wenzhen_info);
+
     this.setData({
       data_list_1: session_data_list_1,
       data_list_2: session_data_list_2,
       data_list_3: session_data_list_3,
       data_list_4: session_data_list_4,
+      message_inquiry_type: message_inquiry_type
     })
 
     if(this.data.data_list_1.length == 0 && this.data.data_list_2.length == 0 && this.data.data_list_3.length == 0 && this.data.data_list_4.length == 0 && this.data.data_list_5.length == 0){
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
index ec64037..2775311 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
@@ -78,6 +78,7 @@ Component({
     },
     parseCustom(message) {
       const { BUSINESS_ID_TEXT } = constant;
+      const { GDXZ_CUSTOM_MSEEAGE } = constant;
       // 群消息解析
       if (message.payload.data === BUSINESS_ID_TEXT.CREATE_GROUP) {
         const renderDom = [{
@@ -118,6 +119,36 @@ Component({
           }];
           return renderDom;
         }
+        // 1:消息内页横条
+        if (customMessage.message_type === GDXZ_CUSTOM_MSEEAGE.TRABECULA) {
+          const renderDom = [{
+            type: 'trabecula',
+            title: customMessage.title,
+            desc: customMessage.desc,
+          }];
+          return renderDom;
+        }
+        // 2:订单结束评价弹出
+        if (customMessage.message_type === GDXZ_CUSTOM_MSEEAGE.ORDER_EVALUATION) {
+          let data = customMessage.data;
+          const renderDom = [{
+            type: 'order_evaluation',
+            order_inquiry_id: data.order_inquiry_id
+          }];
+          return renderDom;
+        }
+        // 6:处方开具成功
+        if (customMessage.message_type === GDXZ_CUSTOM_MSEEAGE.PRESCRIBE) {
+          console.log("处方");
+          let data = customMessage.data;
+          const renderDom = [{
+            type: 'prescribe',
+            product_name: data.product_name,
+            order_prescription_id: data.order_prescription_id,
+            pharmacist_verify_time: data.pharmacist_verify_time.substring(0,10),
+          }];
+          return renderDom;
+        }
       } catch (error) {
       }
       // 客服咨询
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.json b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.json
index e8cfaaf..785d068 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.json
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.json
@@ -1,4 +1,6 @@
 {
   "component": true,
-  "usingComponents": {}
+  "usingComponents": {
+    "van-rate": "@vant/weapp/rate/index"
+  }
 }
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
index 383a5c5..429e9f5 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
@@ -40,5 +40,33 @@
   <view wx:if="{{renderDom[0].type ==='notSupport'}}" class="message-body-span text-message" >
     <view class="message-body-span-text">{{renderDom[0].text}}</view>
   </view>
+  <!-- 自定义横条样式 -->
+  <view wx:if="{{renderDom[0].type==='trabecula'}}" class="gdxz_custom_trabecula_message">
+    <view class="gdxz_custom_message_title">{{renderDom[0].title}}</view>
+    <view class="gdxz_custom_message_desc">{{renderDom[0].desc}}</view>
+  </view>
+  <!-- 自定义评价样式 -->
+  <view wx:if="{{renderDom[0].type==='order_evaluation'}}" class="gdxz_custom_order_evaluation_message" bindtap="showPop">
+    <view class="evaluation_title">请您对本次问诊服务进行评价</view>
+    <view class="evaluation_ratebox">
+      <van-rate disabled value="{{0}}" size="40rpx" gutter="46rpx" color="#ffd21e" void-icon="star" void-color="#e7e7e7" readonlygutter="20"/>
+    </view>
+    <view class="evaluation_button">点击评价</view>
+  </view>
+  <!-- 自定义开处方样式 -->
+  <view wx:if="{{renderDom[0].type==='prescribe'}}" class="gdxz_custom_order_prescribe_message" bindtap="toBuy">
+    <view class="prescribe_title">
+      处方已开具
+    </view>
+    <view class="prescribe_box">
+      <view class="prescribe_box_top">
+        <view class="prescribe_box_top_product_name"><text style="color: #999;"> RP：</text>{{renderDom[0].product_name}}</view>
+        <view class="prescribe_box_top_pharmacist_verify_time"><text style="color: #999;">开方日期：</text> {{renderDom[0].pharmacist_verify_time}}</view>
+      </view>
+      <view class="prescribe_box_bottom" data-order_prescription_id="{{renderDom[0].order_prescription_id}}">
+        <view class="prescribe_box_buy">去查看</view>
+      </view>
+    </view>
+  </view>
 </view>
 
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss
index 135fe44..ad4da67 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss
@@ -120,3 +120,116 @@ line-height: 42rpx;
   letter-spacing: 0;
   margin-bottom: 12rpx;
 }
+
+/* 自定义评价样式 */
+/* 横条样式 */
+.gdxz_custom_trabecula_message{
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 100vw;
+}
+.gdxz_custom_message_title{
+  flex: 1;
+  display: flex;
+  max-width: 92vw;
+  justify-content: center;
+  background-color: #E1E1E1;
+  padding: 5rpx 40rpx;
+  font-size: 28rpx;
+  border-radius: 5rpx;
+}
+.gdxz_custom_message_desc{
+  margin-top: 30rpx;
+  display: flex;
+  max-width: 92vw;
+  letter-spacing: 2rpx;
+  justify-content: center;
+  color: #666666;
+  font-size: 24rpx;
+}
+/* 评价样式 */
+.gdxz_custom_order_evaluation_message{
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  width: 80vw;
+  margin-right: 10vw;
+  border-radius: 10px;
+  background-color: #ffffff;
+  height: 250rpx;
+  overflow: hidden;
+  box-shadow: 0 0 10px 10px rgba(143, 142, 142, 0.2);
+}
+.evaluation_title{
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 28rpx;
+}
+.evaluation_ratebox{
+  flex: 1;
+  display: flex;
+  justify-content: center;
+  align-items:baseline;
+}
+.evaluation_button{
+  flex: 1;
+  background-color: rgb(226, 247, 247);
+  color: #3CC7C0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 34rpx;
+}
+/* 开具处方样式 */
+.gdxz_custom_order_prescribe_message{
+  width: 60vw;
+  position: relative;
+  border-radius: 10px 10px 10px 10px;
+  background: rgb(212, 239, 241);
+  border: 1rpx solid #1ACAD3; 
+  /* background: rgb(255, 255, 255);
+  border: 1rpx solid #E7E7E7; */
+}
+.gdxz_custom_order_prescribe_message::after{
+  content:'';
+  position: absolute;
+  top: 35rpx;
+  right: -19rpx;
+  transform: translate(-50%,-50%) rotate(-135deg);
+  width: 16rpx;
+  height: 16rpx;
+  background: rgb(212, 239, 241); 
+  border: 1rpx solid #1ACAD3;
+  /* background: rgb(255, 255, 255);
+  border: 1rpx solid #E7E7E7; */
+  border-style: none none solid solid;
+}
+.prescribe_title{
+  font-size: 34rpx;
+  border-bottom: 1px solid #E7E7E7;
+  margin: 0 20rpx;
+  padding: 20rpx 0;
+}
+.prescribe_box{
+  margin: 0 20rpx;
+  padding: 20rpx 0;
+  font-size: 28rpx;
+}
+.prescribe_box_top_pharmacist_verify_time{
+  margin-top: 20rpx;
+}
+.prescribe_box_bottom{
+  display: flex;
+  justify-content: center;
+}
+.prescribe_box_buy{
+  margin: 20rpx 20rpx 0 20rpx;
+  background-color: #3CC7C0;
+  color: #fff;
+  padding: 15rpx 30rpx;
+  border-radius: 40rpx;
+  font-size: 30rpx;
+}
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js
index e0348d3..34e63f4 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.js
@@ -250,6 +250,10 @@ Component({
       this.setData({
         displayFlag: targetFlag,
       });
+      var myEventDetail = {} // detail对象，提供给事件监听函数
+      myEventDetail.displayFlag = targetFlag;
+      var myEventOption = {} // 触发事件的选项
+      this.triggerEvent('myhandleExtensions', myEventDetail, myEventOption)
     },
 
     error(e) {
@@ -392,7 +396,8 @@ Component({
           app.go("/Pages/yishi/case/index?order_inquiry_id="+this.data.order_inquiry_id)
           break;
         case '11'://在线开方
-          let userID = wx.getStorageSync('user_id');
+          let usertype =  wx.getStorageSync('usertype');
+          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)
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxss b/TUIKit/components/TUIChat/components/MessageInput/index.wxss
index f40509b..ecb46f7 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxss
@@ -43,6 +43,7 @@
   flex: 2;
   display: flex;
   justify-content: center;
+  align-items: center;
 }
 .TUI-message-input-main {
     min-height: 78rpx;
@@ -108,6 +109,8 @@
   justify-content: center;
   border-radius: 10rpx;
   color: #fff;
+  max-height: 200rpx;
+  padding: 20rpx 0;
 }
 .TUI-sendMessage-btn-input{
   background-color: #3CC7C0;
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index c700ff8..825afa2 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -1,8 +1,7 @@
 import dayjs from '../../../../utils/dayjs';
 import logger from '../../../../utils/logger';
 import constant from '../../../../utils/constant';
-import { API } from './../../../../../utils/network/api'
-const api = new API()
+const { GDXZ_CUSTOM_MSEEAGE } = constant;
 // eslint-disable-next-line no-undef
 const app = getApp();
 Component({
@@ -87,7 +86,6 @@ Component({
     errorMessage: {},
     errorMessageID: '',
     typingMessage: {},
-    dialog_visible: false,
 
   },
 
@@ -133,26 +131,7 @@ Component({
   },
 
   methods: {
-    //结束问诊
-    putDoctorInquiryFinish() {
-      this.setData({
-        dialog_visible: true
-      })
-    },
-    cancelDialog(){
-      this.setData({
-        dialog_visible: false
-      })
-    },
-    confirmDialog(){
-      api.putDoctorInquiryFinish({order_inquiry_id: this.data.order_inquiry_id}).then(response => {
-        console.log(response);
-        
-      }).catch(errors => {console.error(errors);})
-      this.setData({
-        dialog_visible: false
-      })
-    },
+
     // 刷新消息列表
     refresh() {
       if (this.data.isCompleted) {
@@ -171,6 +150,8 @@ Component({
     },
     // 获取消息列表
     getMessageList(conversation) {
+
+
       if (!this.data.isCompleted) {
         wx.$TUIKit.getMessageList({
           conversationID: conversation.conversationID,
@@ -183,7 +164,12 @@ Component({
           let HMM_messageList = HMM_data.messageList;
           HMM_messageList.forEach(item => {
             let HMM_type = item.type;
-            if(HMM_type == "TIMCustomElem") return;
+            console.log(item)
+            //去除自定义消息
+            // if(HMM_type == "TIMCustomElem") return;
+            let show_avatar = this.checkShowAvatar(item);
+            item.show_avatar = show_avatar;
+            
             HMM_messageList_del.push(item);
           })
           HMM_data.messageList = HMM_messageList_del;
@@ -200,6 +186,18 @@ Component({
         });
       }
     },
+    checkShowAvatar(message){
+
+      let type = message.type;
+      let show_avatar = true;
+      if(type == "TIMCustomElem"){
+        const customMessage = JSON.parse(message.payload.data);
+        if(customMessage.message_type != GDXZ_CUSTOM_MSEEAGE.PRESCRIBE){
+          show_avatar = false;
+        }
+      }
+      return show_avatar;
+    },
     // 历史消息渲染
     $handleMessageRender(messageList, currentMessageList) {
       this.showHistoryMessageTime(currentMessageList);
@@ -246,6 +244,7 @@ Component({
     // 收到的消息
     $onMessageReceived(value) {
       const message = value.data[0];
+      message.show_avatar = this.checkShowAvatar(message);
       wx.$TUIKit.setMessageRead({ conversationID: this.data.conversation.conversationID }).then(() => {
         logger.log('| MessageList | setMessageRead | ok');
       });
@@ -315,6 +314,9 @@ Component({
     },
     // 自己的消息上屏
     updateMessageList(message) {
+
+      //自己的消息有头像
+      message.show_avatar = this.checkShowAvatar(message);
       if (message.conversationID !== this.data.conversation.conversationID) return;
       wx.$TUIKit.setMessageRead({ conversationID: this.data.conversation.conversationID }).then(() => {
         logger.log('| MessageList | setMessageRead | ok');
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.json b/TUIKit/components/TUIChat/components/MessageList/index.json
index 097c754..2bd9367 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.json
+++ b/TUIKit/components/TUIChat/components/MessageList/index.json
@@ -12,7 +12,6 @@
     "FaceMessage": "../MessageElements/FaceMessage/index",
     "FileMessage": "../MessageElements/FileMessage/index",
     "MergerMessage": "../MessageElements/MergerMessage/index",
-    "RevokeMessage": "../MessageElements/RevokeMessage/index",
-    "t-dialog": "tdesign-miniprogram/dialog/dialog"
+    "RevokeMessage": "../MessageElements/RevokeMessage/index"
   }
 }
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxml b/TUIKit/components/TUIChat/components/MessageList/index.wxml
index 5a18336..4786f9f 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageList/index.wxml
@@ -34,7 +34,7 @@
             </view>
             <TipMessage  wx:if="{{item.type === 'TIMGroupTipElem'}}" message="{{item}}"/>
             <view  wx:if="{{item.type !== 'TIMGroupTipElem'}}"   class="{{item.flow === 'out' ? 't-self-message':'t-recieve-message'}}" >
-                <image class="t-message-avatar" wx:if="{{item.flow === 'in'}}" src="{{item.avatar || 'https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/default_photo.png'}}" data-value="{{item}}" bindtap="getMemberProfile" />
+                <image class="t-message-avatar" wx:if="{{item.flow === 'in' && item.show_avatar }}" src="{{item.avatar || 'https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/default_photo.png'}}" data-value="{{item}}" bindtap="getMemberProfile" />
                 <view class="read-receipts" wx:if="{{conversation.type === 'C2C' && item.flow==='out' }}">
                     <!-- <view wx:if="{{item.isPeerRead}}" >已读</view>
                     <view wx:else>未读</view> -->
@@ -52,7 +52,7 @@
                     <FileMessage wx:if="{{item.type === 'TIMFileElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}"/>
                     <MergerMessage wx:if="{{item.type === 'TIMRelayElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}"/>
                 </view>
-                <image class="t-message-avatar" wx:if="{{item.flow === 'out'}}"  src="{{item.avatar || 'https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/default_photo.png'}}"  data-value="{{item}}" bindtap="getMemberProfile"/>
+                <image class="t-message-avatar" wx:if="{{item.flow === 'out' && item.show_avatar }}"  src="{{item.avatar || 'https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/default_photo.png'}}"  data-value="{{item}}" bindtap="getMemberProfile"/>
             </view>
         </view>
     </view>
@@ -80,15 +80,4 @@
 </view>
 <wxs src = './concat.wxs' module = 'concat'/>
 
-<t-dialog
-    visible="{{ dialog_visible }}"
-    title="温馨提示"
-    content="您确认结束问诊？"
-  >
-  <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="cancelDialog">
-    取消
-  </view>
-  <view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="confirmDialog">
-    确定
-  </view>
-  </t-dialog>
+
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxss b/TUIKit/components/TUIChat/components/MessageList/index.wxss
index fea4021..3464198 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageList/index.wxss
@@ -252,17 +252,3 @@
   padding-left: 5px;
   color: blue;
 }
-.dialog{
-  width: 50%;
-  text-align: center;
-  height: 100rpx;
-  line-height: 100rpx;
-}
-.dialog_cancel_btn{
-  border-top: 1px solid #E9E9E9;
-  border-right: 1px solid #E9E9E9;
-}
-.dialog_confirm_btn{
-  border-top: 1px solid #E9E9E9;
-  color: #3CC7C0;
-}
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/index.js b/TUIKit/components/TUIChat/index.js
index 60cf663..50ca53d 100644
--- a/TUIKit/components/TUIChat/index.js
+++ b/TUIKit/components/TUIChat/index.js
@@ -8,11 +8,11 @@ const app = getApp();
 
 const inputStyle = `
   --padding: 0px;
-  z-index: 9999999;
 `;
 
 let newInputStyle =  `
---padding: 0px
+--padding: 0px;
+position: absolute;
 `;
 
 const setNewInputStyle = (number) => {
@@ -118,6 +118,7 @@ Component({
     viewData: {
       style: inputStyle,
     },
+    input_area_style:"",
     KeyboardHeight: 0,
     showTips: false,
     showGroupTips: false,
@@ -127,13 +128,35 @@ Component({
       title: '', //导航栏 中间的标题
     },
     baseInfo: {},
-    navbar_height: 0
+    navbar_height: 0,
+    dialog_visible: false,
+
   },
 
   /**
    * 组件的方法列表
    */
   methods: {
+    //结束问诊
+    putDoctorInquiryFinish() {
+      this.setData({
+        dialog_visible: true
+      })
+    },
+    cancelDialog(){
+      this.setData({
+        dialog_visible: false
+      })
+    },
+    confirmDialog(){
+      api.putDoctorInquiryFinish({order_inquiry_id: this.data.order_inquiry_id}).then(response => {
+        console.log(response);
+        
+      }).catch(errors => {console.error(errors);})
+      this.setData({
+        dialog_visible: false
+      })
+    },
     //获取问诊订单消息内页基础数据
     getInquiryMessageBasic() {
       console.log("order_inquiry_id: ", this.data.order_inquiry_id);
@@ -222,18 +245,41 @@ Component({
     resendMessage(event) {
       this.selectComponent('#MessageInput').onInputValueChange(event);
     },
+    myhandleExtensions(e){
+      console.log("myhandleExtensionsmyhandleExtensions: ", e);
+      let displayFlag = e.detail.displayFlag;
+      if(displayFlag){
+        this.setData({
+          input_area_style: "position: absolute;  bottom: 30px;"
+        })
+      }else{
+        this.setData({
+          input_area_style: ""
+        })
+      }
+    },
     // 监听键盘，获取焦点时将输入框推到键盘上方
     pullKeysBoards(event) {
       setNewInputStyle(event.detail.event.detail.height);
       this.setData({
         'viewData.style': newInputStyle,
+        input_area_style: "position: absolute;  bottom: 30px;"
       });
     },
     // 监听键盘，失去焦点时收起键盘
     downKeysBoards(event) {
-      this.setData({
-        'viewData.style': inputStyle,
-      });
+      console.log(event)
+      let value = event.detail.event.detail.value;
+      if(value){
+        this.setData({
+          'viewData.style': inputStyle,
+        });
+      }else{
+        this.setData({
+          'viewData.style': inputStyle,
+          input_area_style: ""
+        });
+      }
     },
     typing(event) {
       const { STRING_TEXT, FEAT_NATIVE_CODE } = constant;
diff --git a/TUIKit/components/TUIChat/index.json b/TUIKit/components/TUIChat/index.json
index 664d8ba..261ad03 100644
--- a/TUIKit/components/TUIChat/index.json
+++ b/TUIKit/components/TUIChat/index.json
@@ -4,7 +4,8 @@
     "MessageList": "./components/MessageList/index",
     "MessageInput": "./components/MessageInput/index",
     "TUIGroup": "../TUIGroup/index",
-    "te-nav-bar": "/commpents/te_navbar"
+    "te-nav-bar": "/commpents/te_navbar",
+    "t-dialog": "tdesign-miniprogram/dialog/dialog"
   },
   "disableScroll":true
 }
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/index.wxml b/TUIKit/components/TUIChat/index.wxml
index 8c5557a..943f9f6 100644
--- a/TUIKit/components/TUIChat/index.wxml
+++ b/TUIKit/components/TUIChat/index.wxml
@@ -23,20 +23,32 @@
       <span class="report" bindtap="handleReport">点此投诉</span>
     </view> -->
   <!-- </view> -->
-    <scroll-view  class="message-list" bindtap="triggerClose">
+    <!-- <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>
-  </scroll-view>
+  <!-- </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">
+  <view class="input-area" style="{{input_area_style}}">
   <view class="message-input" style="{{viewData.style}}" wx:if="{{showChat}}">
-    <MessageInput id="MessageInput" inquiry_type="{{inquiry_type}}" order_inquiry_id="{{order_inquiry_id}}" conversation="{{conversation}}" hasCallKit="{{hasCallKit}}" bind:sendMessage="sendMessage" bind:downKeysBoards="downKeysBoards" bind:pullKeysBoards="pullKeysBoards" bind:showMessageErrorImage="showMessageErrorImage" 
+    <MessageInput bind:myhandleExtensions="myhandleExtensions" id="MessageInput" inquiry_type="{{inquiry_type}}" 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: 30px;position: fixed;bottom: 0;width: 100%;background-color: #fff;">
+  <view style="height: 40px;position: fixed;bottom: 0;width: 100%;background-color: #fff;">
     
   </view>
 </view>
+<t-dialog
+  visible="{{ dialog_visible }}"
+  title="温馨提示"
+  content="您确认结束问诊？"
+>
+<view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="cancelDialog">
+  取消
+</view>
+<view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="confirmDialog">
+  确定
+</view>
+</t-dialog>
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/index.wxss b/TUIKit/components/TUIChat/index.wxss
index 070f9ca..8a9e3ac 100644
--- a/TUIKit/components/TUIChat/index.wxss
+++ b/TUIKit/components/TUIChat/index.wxss
@@ -96,10 +96,10 @@
     top: 246rpx;
 }
 .input-area {
-  position: absolute;
-  bottom: 20px;
+  position: relative;
   z-index: 999999;
-  /* height: 200rpx; */
+  /* position: absolute;
+  bottom: 20px; */
 }
 .message-list {
   width: 100%;
@@ -157,10 +157,13 @@
 .name{
   font-size: 34rpx;
   color: #3CC7C0;
+  flex: 1;
+  text-align: center;
 }
 .age{
   font-size: 34rpx;
   color: #666666;
+  flex: 1;
 }
 .status{
   background: #FFF2E8;
@@ -169,4 +172,18 @@
   font-size: 24rpx;
   color: #FA541C;
   padding: 10rpx 20rpx;
+}
+.dialog{
+  width: 50%;
+  text-align: center;
+  height: 100rpx;
+  line-height: 100rpx;
+}
+.dialog_cancel_btn{
+  border-top: 1px solid #E9E9E9;
+  border-right: 1px solid #E9E9E9;
+}
+.dialog_confirm_btn{
+  border-top: 1px solid #E9E9E9;
+  color: #3CC7C0;
 }
\ No newline at end of file
diff --git a/TUIKit/utils/constant.js b/TUIKit/utils/constant.js
index 5125093..e7dd6fc 100644
--- a/TUIKit/utils/constant.js
+++ b/TUIKit/utils/constant.js
@@ -39,6 +39,15 @@ const constant = {
     DIRTY_MEDIA: '您发送的消息包含违禁内容!',
     RESEND_SUCCESS: '重发成功',
   },
+  //自定义消息
+  GDXZ_CUSTOM_MSEEAGE: {
+    TRABECULA: 1,//1:消息内页横条
+    ORDER_EVALUATION: 2,//2:订单结束评价弹出
+    DOCTOR_SYSTEM_NOTIFICATION: 3,//3:医生端系统通知
+    DOCTOR_SERVICE_NOTIFICATION: 4,//4:医生端服务通知
+    PATIENT_SYSTEM_MESSAGES: 5,//5:患者端系统消息
+    PRESCRIBE: 6,//6:处方开具成功
+  },
 
   OPERATING_ENVIRONMENT: 'imWxTuikit'
 };
diff --git a/app.js b/app.js
index 1441b59..22e19d6 100644
--- a/app.js
+++ b/app.js
@@ -57,8 +57,8 @@ App({
   },
   imInit(){
 
-    let userID = wx.getStorageSync('user_id');
     let usertype = wx.getStorageSync('usertype');
+    let userID = wx.getStorageSync('user_id_'+usertype);
     if(usertype != 2){//只登录医师端
       return;
     }
@@ -121,7 +121,8 @@ App({
   $onSystemPushReceived(e){
     console.log("onSystemPushReceived from app.js");
     console.log(e)
-    let userID = wx.getStorageSync('user_id');
+    let usertype = wx.getStorageSync('usertype');
+    let userID = wx.getStorageSync('user_id_'+usertype);
     let message = e.data[0];
     console.log(message)
 
diff --git a/commpents/wenzhen_data/index.wxml b/commpents/wenzhen_data/index.wxml
index 136f992..cbc83b3 100644
--- a/commpents/wenzhen_data/index.wxml
+++ b/commpents/wenzhen_data/index.wxml
@@ -10,11 +10,11 @@
   <view class="content_3">
     <view class="status {{ status_class }}">{{ status_text }}</view>
     <view class="btn" wx:if="{{ status == 3 }}">
-      <van-button bind:click="go" data-url="/Pages/yishi/case/index?order_inquiry_id={{order_inquiry_id}}" plain custom-style="width:200rpx; height:67rpx;  border-radius: 10rpx;" color="#3CC7C0">查看病历</van-button>
-      <van-button type="default" bindtap="tabShow" custom-style="width:200rpx; height:67rpx; border-radius: 10rpx;margin-left:20rpx;" color="#3CC7C0">去接诊</van-button>
+      <van-button bind:click="go" data-url="/Pages/yishi/case/index?order_inquiry_id={{order_inquiry_id}}" plain custom-style="padding:0 35rpx; height:67rpx;  border-radius: 10rpx;" color="#3CC7C0">查看病历</van-button>
+      <van-button type="default" bindtap="tabShow" custom-style="padding:0 35rpx; height:67rpx; border-radius: 10rpx;margin-left:20rpx;" color="#3CC7C0">去接诊</van-button>
     </view>
     <view class="btn" wx:if="{{ status >= 4 }}">
-      <van-button bind:click="goChat" data-from_account="{{from_account}}" data-inquiry_type="{{inquiry_type}}" data-order_inquiry_id="{{order_inquiry_id}}" data-url="/Pages/yishi/chat/index" plain custom-style="width:200rpx; height:67rpx;  border-radius: 10rpx;" color="#3CC7C0">问诊详情</van-button>
+      <van-button bind:click="goChat" data-from_account="{{from_account}}" data-inquiry_type="{{inquiry_type}}" data-order_inquiry_id="{{order_inquiry_id}}" data-url="/Pages/yishi/chat/index" plain custom-style="padding:0 35rpx; height:67rpx;  border-radius: 10rpx;" color="#3CC7C0">问诊详情</van-button>
       <!-- <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>
diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js
index e99326d..fffb97a 100644
--- a/custom-tab-bar/index.js
+++ b/custom-tab-bar/index.js
@@ -73,7 +73,7 @@ Component({
       })
     }
     let _this = this;
-    let userID = wx.getStorageSync('user_id');
+    let userID = wx.getStorageSync('user_id_'+usertype);
     setInterval(() => {
       let index_info = wx.getStorageSync(userID+'_index_info');
       let wenzhen_info = wx.getStorageSync(userID+'_wenzhen_info');
@@ -103,12 +103,12 @@ Component({
     // },
     onChange(e) {
       console.log("custom tab bar onChange");
-      let userID = wx.getStorageSync('user_id');
+      const usertype = wx.getStorageSync('usertype');
+      let userID = wx.getStorageSync('user_id_'+usertype);
       let idcard_status = wx.getStorageSync(userID+'_idcard_status');
       let iden_auth_status = wx.getStorageSync(userID+'_iden_auth_status');
       let multi_point_status = wx.getStorageSync(userID+'_multi_point_status');
       let is_bind_bank = wx.getStorageSync(userID+'_is_bind_bank');
-      const usertype = wx.getStorageSync('usertype');
 
       console.log("idcard_status: ", idcard_status);
       console.log("iden_auth_status: ", iden_auth_status);
@@ -123,7 +123,6 @@ Component({
         })
         return;
       }
-      console.log(111);
       if(iden_auth_status != 1 && usertype != 3){
         this.setData({
           dialog_visible: true,
@@ -132,7 +131,6 @@ Component({
         })
         return;
       }
-      console.log(222);
       if(is_bind_bank != 1 && usertype != 3){
         this.setData({
           dialog_visible: true,
@@ -141,7 +139,6 @@ Component({
         })
         return;
       }
-      console.log(333);
       let url = this.data.items[e.detail].pagePath;
       console.log(url);
       wx.switchTab({
diff --git a/utils/network/api.js b/utils/network/api.js
index 03217ac..274933f 100644
--- a/utils/network/api.js
+++ b/utils/network/api.js
@@ -616,9 +616,7 @@ class API extends HTTP {
 }
  //医生接诊
  postDoctorInquiry(params) {
-   console.log("params from api: ", params);
-   let order_inquiry_id = params.order_inquiry_id;
-   console.log("order_inquiry_id: ", order_inquiry_id);
+  let order_inquiry_id = params.order_inquiry_id;
   delete params['order_inquiry_id']; 
   return this.request({
     url: `${this.baseUrl}/doctor/inquiry/`+order_inquiry_id,
@@ -631,7 +629,6 @@ class API extends HTTP {
  //结束问诊
  putDoctorInquiryFinish(params) {
   let order_inquiry_id = params.order_inquiry_id;
-  console.log("order_inquiry_id: ", order_inquiry_id);
   params = {}
   return this.request({
     url: `${this.baseUrl}/doctor/inquiry/finish/`+order_inquiry_id,
@@ -644,7 +641,6 @@ class API extends HTTP {
  //获取问诊订单消息内页基础数据
  getInquiryMessageBasic(params) {
   let order_inquiry_id = params.order_inquiry_id;
-  console.log("order_inquiry_id: ", order_inquiry_id);
   params = {}
   return this.request({
     url: `${this.baseUrl}/inquiry/message/basic/`+order_inquiry_id,

From 75c9d6cae26bf2cd4bbf05c865a50b7395c1369e Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Thu, 30 Mar 2023 11:33:45 +0800
Subject: [PATCH 14/83] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=81=8A=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yaoshi/home/home.json                   |  3 +-
 Pages/yaoshi/home/home.wxml                   | 36 ++++++------
 Pages/yishi/chat/index.js                     | 55 +++++++++++++------
 Pages/yishi/chat/index.wxml                   |  2 +-
 Pages/yishi/chufangsetup/index.js             |  6 +-
 Pages/yishi/chufangsetup/index.wxml           |  2 +-
 Pages/yishi/onlinechufang/index.js            | 10 +++-
 Pages/yishi/onlinechufang/index.wxml          |  9 +--
 Pages/yishi/wenzhen_v2/wenzhen.js             | 13 ++++-
 .../MessageElements/CustomMessage/index.js    |  6 ++
 .../MessageElements/CustomMessage/index.wxml  |  5 +-
 .../TUIChat/components/MessageList/index.js   |  1 -
 .../TUIChat/components/MessageList/index.wxss |  3 +-
 TUIKit/components/TUIChat/index.js            | 18 ++++--
 TUIKit/components/TUIChat/index.wxml          | 22 ++++----
 TUIKit/components/TUIChat/index.wxss          |  9 ++-
 commpents/wenzhen_data/index.js               | 10 ++--
 commpents/wenzhen_data/index.wxml             |  2 +-
 18 files changed, 140 insertions(+), 72 deletions(-)

diff --git a/Pages/yaoshi/home/home.json b/Pages/yaoshi/home/home.json
index 648cc19..a8a0021 100644
--- a/Pages/yaoshi/home/home.json
+++ b/Pages/yaoshi/home/home.json
@@ -5,6 +5,7 @@
     "van-tab": "@vant/weapp/tab/index",
     "van-tabs": "@vant/weapp/tabs/index",
     "t-avatar": "tdesign-miniprogram/avatar/avatar",
-    "van-button": "@vant/weapp/button/index"
+    "van-button": "@vant/weapp/button/index",
+    "van-empty": "@vant/weapp/empty/index"
   }
 }
\ No newline at end of file
diff --git a/Pages/yaoshi/home/home.wxml b/Pages/yaoshi/home/home.wxml
index f4164e1..bbb1af0 100644
--- a/Pages/yaoshi/home/home.wxml
+++ b/Pages/yaoshi/home/home.wxml
@@ -39,73 +39,77 @@
             </view>
           </view>
         </view>
-
+        <van-empty description="暂无数据" wx:if="{{data_list_0.length == 0}}" />
       </van-tab>
       <van-tab title="已审核处方">
-        <view class="item">
+        <view class="item" wx:for="{{data_list_1}}">
           <view class="item_txt">
-            <view class="pre_content">处方订单号：2023010510324649</view>
-            <view class="end_content">
+            <view class="pre_content">处方订单号：{{item.prescription_code}}</view>
+            <view class="end_content" bindtap="go" data-url="/Pages/yaoshi/medicalrecord/medicalrecord?order_inquiry_id={{item.order_inquiry_id	}}&order_prescription_id={{item.order_prescription_id}}">
               <van-button type="primary" color="#ec871e" size="small">查看病例</van-button>
             </view>
           </view>
 
           <view class="item_txt">
-            <view class="pre_content">开方时间：2023-01-16 08:52</view>
+            <view class="pre_content">开方时间：{{item.created_at}}</view>
             <view class="end_content" style="color: #2196f3;">通过</view>
           </view>
 
           <view class="item_txt">
-            <view class="pre_content">张三/男/45岁</view>
+            <view class="pre_content">{{item.patient_name}}/{{item.patient_sex==1?'男':'女'}}/{{item.patient_age}}岁</view>
             <view class="end_content">
               <!-- <van-button type="primary" color="linear-gradient(to bottom, #5EA8D5, #63CFEA)" size="small">去审方</van-button> -->
             </view>
           </view>
         </view>
+        <van-empty description="暂无数据" wx:if="{{data_list_1.length == 0}}" />
       </van-tab>
       <van-tab title="驳回处方">
-        <view class="item">
+        <view class="item" wx:for="{{data_list_2}}">
           <view class="item_txt">
-            <view class="pre_content">处方订单号：2023010510324649</view>
-            <view class="end_content">
+            <view class="pre_content">处方订单号：{{item.prescription_code}}</view>
+            <view class="end_content" bindtap="go" data-url="/Pages/yaoshi/medicalrecord/medicalrecord?order_inquiry_id={{item.order_inquiry_id	}}&order_prescription_id={{item.order_prescription_id}}">
               <van-button type="primary" color="#ec871e" size="small">查看病例</van-button>
             </view>
           </view>
 
           <view class="item_txt">
-            <view class="pre_content">开方时间：2023-01-16 08:52</view>
+            <view class="pre_content">开方时间：{{item.created_at}}</view>
             <view class="end_content" style="color: red;">驳回</view>
           </view>
 
           <view class="item_txt">
-            <view class="pre_content">张三/男/45岁</view>
+            <view class="pre_content">{{item.patient_name}}/{{item.patient_sex==1?'男':'女'}}/{{item.patient_age}}岁</view>
             <view class="end_content">
               <!-- <van-button type="primary" color="linear-gradient(to bottom, #5EA8D5, #63CFEA)" size="small">去审方</van-button> -->
             </view>
           </view>
         </view>
+
+        <van-empty description="暂无数据" wx:if="{{data_list_2.length == 0}}" />
       </van-tab>
       <van-tab title="不通过">
-        <view class="item">
+        <view class="item" wx:for="{{data_list_3}}">
           <view class="item_txt">
-            <view class="pre_content">处方订单号：2023010510324649</view>
-            <view class="end_content">
+            <view class="pre_content">处方订单号：{{item.prescription_code}}</view>
+            <view class="end_content" bindtap="go" data-url="/Pages/yaoshi/medicalrecord/medicalrecord?order_inquiry_id={{item.order_inquiry_id	}}&order_prescription_id={{item.order_prescription_id}}">
               <van-button type="primary" color="#ec871e" size="small">查看病例</van-button>
             </view>
           </view>
 
           <view class="item_txt">
-            <view class="pre_content">开方时间：2023-01-16 08:52</view>
+            <view class="pre_content">开方时间：{{item.created_at}}</view>
             <view class="end_content" style="color: red;">驳回</view>
           </view>
 
           <view class="item_txt">
-            <view class="pre_content">张三/男/45岁</view>
+            <view class="pre_content">{{item.patient_name}}/{{item.patient_sex==1?'男':'女'}}/{{item.patient_age}}岁</view>
             <view class="end_content">
               <!-- <van-button type="primary" color="linear-gradient(to bottom, #5EA8D5, #63CFEA)" size="small">去审方</van-button> -->
             </view>
           </view>
         </view>
+        <van-empty description="暂无数据" wx:if="{{data_list_3.length == 0}}" />
       </van-tab>
     </van-tabs>
   </view>
diff --git a/Pages/yishi/chat/index.js b/Pages/yishi/chat/index.js
index d958605..b240c87 100644
--- a/Pages/yishi/chat/index.js
+++ b/Pages/yishi/chat/index.js
@@ -1,41 +1,60 @@
+import { API } from './../../../utils/network/api'
+const api = new API()
 const app = getApp()
 Page({
   data: {
-    patient_account: "",
     title: '',
     height: app.globalData.height,
     order_inquiry_id: "",
-    inquiry_type: "",
+    baseInfo: {}
   },
   onLoad(option) {
     console.log("chat onload", option);
-    let from_account = option.from_account;
     let order_inquiry_id = option.order_inquiry_id;
-    let inquiry_type = option.inquiry_type;
     this.setData({
-      patient_account: from_account,
       order_inquiry_id: order_inquiry_id,
-      inquiry_type: inquiry_type,
     })
   },
   onUnload() {
     console.log("chat onUnload");
   },
   onShow(){
-    let _this = this;
-    let interval = setInterval(() => {
-      console.log("chat init ,");
-      console.log("app.globalData.chat_sdk_ready: ", app.globalData.chat_sdk_ready);
-      if(app.globalData.chat_sdk_ready){
-        const TUIChat = _this.selectComponent('#TUIChat');
-        TUIChat.init();
-        wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, _this.$onMessageReceived, _this);
-        clearInterval(interval);
-      }
-    }, 1000);
+    console.log("chat onShow");
+    this.getInquiryMessageBasic();
   },
   $onMessageReceived(value) {
     const message = value.data[0];
     console.log("message from chat: ",message)
-  }
+  },
+  initChat(){
+    let _this = this;
+    let count = 0;
+    let interval = setInterval(() => {
+      console.log("chat init count: ", count);
+      console.log("app.globalData.chat_sdk_ready: ", app.globalData.chat_sdk_ready);
+      if(app.globalData.chat_sdk_ready){
+        const TUIChat = _this.selectComponent('#TUIChat');
+        TUIChat.init();
+        // wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, _this.$onMessageReceived, _this);
+        clearInterval(interval);
+      }
+      count = count + 1;
+      if(count > 5){//如果尝试5次不成功就去主动调用IM初始化
+        app.imInit();
+        count = 0;
+      }
+    }, 1000);
+  },
+  //获取问诊订单消息内页基础数据
+  getInquiryMessageBasic() {
+    console.log("order_inquiry_id: ", this.data.order_inquiry_id);
+    api.getInquiryMessageBasic({order_inquiry_id: this.data.order_inquiry_id}).then(response => {
+      console.log(response);
+      this.setData({
+        baseInfo: response.data
+      })
+    }).then(res => {
+      this.initChat();
+    }).catch(errors => {console.error(errors);})
+  },
 })
diff --git a/Pages/yishi/chat/index.wxml b/Pages/yishi/chat/index.wxml
index 36e8586..d2bcb23 100644
--- a/Pages/yishi/chat/index.wxml
+++ b/Pages/yishi/chat/index.wxml
@@ -1,5 +1,5 @@
 <!-- 一对一聊天  不带会话列表 -->
 <view>
-    <TUIChat id="TUIChat" currentConversationID="C2C{{patient_account}}" inquiry_type="{{inquiry_type}}" order_inquiry_id="{{order_inquiry_id}}"
+    <TUIChat id="TUIChat" currentConversationID="C2C{{baseInfo.patient_user_id}}" inquiry_type="{{baseInfo.inquiry_type}}" order_inquiry_id="{{order_inquiry_id}}" baseInfo="{{baseInfo}}"
     hasCallKit="{{ true }}" bind:handleCall="handleCall"></TUIChat>
 </view>
diff --git a/Pages/yishi/chufangsetup/index.js b/Pages/yishi/chufangsetup/index.js
index 86eb7f4..e474089 100644
--- a/Pages/yishi/chufangsetup/index.js
+++ b/Pages/yishi/chufangsetup/index.js
@@ -1,5 +1,4 @@
 import { API } from './../../../utils/network/api'
-
 const api = new API()
 const app = getApp()
 Page({
@@ -84,4 +83,9 @@ Page({
     console.log(url);
     app.go(url);
   },
+  gochat(e){
+    let order_inquiry_id = e.currentTarget.dataset.order_inquiry_id;
+    let url = "/Pages/yishi/chat/index?order_inquiry_id="+order_inquiry_id;
+    app.go(url);
+  }
 })
\ No newline at end of file
diff --git a/Pages/yishi/chufangsetup/index.wxml b/Pages/yishi/chufangsetup/index.wxml
index 23bcd32..1a887c4 100644
--- a/Pages/yishi/chufangsetup/index.wxml
+++ b/Pages/yishi/chufangsetup/index.wxml
@@ -47,7 +47,7 @@
               </view>
             </view>
             <!-- 底部按钮 -->
-            <view class="item_bottom">
+            <view class="item_bottom" bindtap="gochat" data-order_inquiry_id="{{item.order_inquiry_id}}">
               <view class="item_bottom_btn">问诊记录</view>
             </view>
           </view>
diff --git a/Pages/yishi/onlinechufang/index.js b/Pages/yishi/onlinechufang/index.js
index e9d32dc..3725107 100644
--- a/Pages/yishi/onlinechufang/index.js
+++ b/Pages/yishi/onlinechufang/index.js
@@ -35,6 +35,7 @@ Page({
     doctors_advice_focus: false,
     case_detail: {},
     sub_disabled: false,
+    from: ""
   },
   onDoctorsAdviceFocus(){
     this.setData({
@@ -42,6 +43,7 @@ Page({
     })
   },
   onLoad(options){
+    let from = options.from;
     let order_inquiry_id = options.order_inquiry_id;
     let order_prescription_id	 = options.order_prescription_id	;
     //获取患者问诊病例
@@ -59,6 +61,7 @@ Page({
     this.setData({
       order_inquiry_id: order_inquiry_id,
       order_prescription_id: order_prescription_id,
+      from: from
     })
   },
   select_drug(e){
@@ -360,6 +363,9 @@ Page({
         title: '提交成功',
         icon: "success"
       })
+      setTimeout(() => {
+        wx.navigateBack();
+      }, 1000);
     }).catch(errors => {
       console.error(errors);
       this.setData({
@@ -430,13 +436,15 @@ Page({
       return;
     }
 
-
     api.putDoctorPrescription(params).then(response => {
       console.log(response);
       wx.showToast({
         title: '提交成功',
         icon: "success"
       })
+      setTimeout(() => {
+        wx.navigateBack();
+      }, 1000);
     }).catch(errors => {
       console.error(errors);
       this.setData({
diff --git a/Pages/yishi/onlinechufang/index.wxml b/Pages/yishi/onlinechufang/index.wxml
index 347fd9e..a479048 100644
--- a/Pages/yishi/onlinechufang/index.wxml
+++ b/Pages/yishi/onlinechufang/index.wxml
@@ -30,7 +30,7 @@
 
   <van-cell-group inset>
     <van-cell use-label-slot bind:click="showZhenDuan" custom-style="font-size:30rpx;color: #333;" title="诊断" >
-      <view class="addzhenduan">+添加诊断</view>
+      <view class="addzhenduan" wx:if="{{from != 'chat'}}">+添加诊断</view>
       <view slot="label">
         <view style="margin-top: 20rpx;" class="label_item" wx:for="{{zhenduan_list}}">
           <van-icon name="delete" catchtap="delZhenDuan" color="red" data-disease_class_id="{{item.icd_id}}" /><text style="margin-left: 10rpx;">{{item.icd_name}}</text>
@@ -48,14 +48,14 @@
       <view class="drugs_name">{{ drugs.product_name }}(数量{{ drugs.prescription_product_num}})</view>
       <view class="drugs_guige">用法用量：{{ drugs.single_use }}；{{ drugs.frequency_use }}；{{ drugs.single_unit }}</view>
       <!-- <view class="drugs_dosage">备注：{{ drugs.drugs_dosage }}</view> -->
-      <view class="btn">
+      <view class="btn" wx:if="{{from != 'chat'}}">
         <van-button bind:click="editDrug" size="small" custom-style="font-size:28rpx;" data-product_id="{{drugs.product_id}}" color="#666" plain round type="info">编辑</van-button>
         <van-button bind:click="delDrug" custom-style="margin-left: 20rpx;font-size:28rpx;" data-product_id="{{drugs.product_id}}" size="small" color="#666" plain round type="info">删除</van-button>
       </view>
     </view>
   </view>
 
-  <view class="adddrugs_btn">
+  <view class="adddrugs_btn" wx:if="{{from != 'chat'}}">
     <van-button bind:click="showPopup" color="rgba(44,241,248,0.28);" custom-style="color:#3CC7C0; font-size:30rpx; border-radius: 10rpx;" type="primary" block>+添加药品</van-button>
   </view>
   <form bindsubmit="{{ order_prescription_id == ''?'postDoctorPrescription':'putDoctorPrescription' }}">
@@ -63,7 +63,8 @@
     <view class="doctors_advice" bindtap="onDoctorsAdviceFocus">
       <textarea auto-height focus="{{doctors_advice_focus}}" maxlength="1000" bindblur="getAdvice" style="width: 100%;" placeholder-style="font-size:24rpx; color:#999" placeholder="请输入医嘱（5-200字）" name="doctors_advice" value="{{doctor_advice}}"></textarea>
     </view>
-    <view class="sub_btn">
+    <!-- 从聊天页面过来的不显示按钮 -->
+    <view class="sub_btn" wx:if="{{from != 'chat'}}">
       <van-button disabled="{{sub_disabled}}" form-type="submit" color="#3CC7C0; font-size:30rpx; border-radius: 10rpx;" type="primary" block>{{ order_prescription_id == ''?'提交审核':'重开处方' }}</van-button>
     </view>
 
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index 08a9265..6e422f2 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -26,7 +26,12 @@ Page({
     console.log("wenzhen onload");
     let usertype =  wx.getStorageSync('usertype');
     let userID = wx.getStorageSync('user_id_'+usertype);
-    wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
+    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);
+    }
     setInterval(() => {
       let system_notice_unreadnnum = wx.getStorageSync(userID+"_system_notice_unreadnnum");
       let service_notice_unreadnnum = wx.getStorageSync(userID+"_service_notice_unreadnnum");
@@ -70,6 +75,11 @@ Page({
     }).then(() => {
       console.log("开始查询订单状态")
       this.formatStatus();
+    }).catch(error => {
+      console.log(error)
+      // 补偿登录操作
+      app.imInit();
+      this.getConversationList();
     });
   },
   go(e){
@@ -302,6 +312,7 @@ Page({
     })
 
     if(wenzhen_info == 0) wenzhen_info = "";
+    if(wenzhen_info > 99) wenzhen_info = "99+";
     wx.setStorageSync(userID+'_wenzhen_info', wenzhen_info);
 
     this.setData({
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
index 2775311..9ea98bd 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
@@ -1,5 +1,6 @@
 import formateTime from '../../../../../utils/formate-time';
 import constant from '../../../../../utils/constant';
+const app = getApp()
 // eslint-disable-next-line no-undef
 Component({
   /**
@@ -144,6 +145,7 @@ Component({
           const renderDom = [{
             type: 'prescribe',
             product_name: data.product_name,
+            order_inquiry_id: data.order_inquiry_id,
             order_prescription_id: data.order_prescription_id,
             pharmacist_verify_time: data.pharmacist_verify_time.substring(0,10),
           }];
@@ -209,5 +211,9 @@ Component({
         });
       }
     },
+    go(e){
+      let url = e.currentTarget.dataset.url;
+      app.go(url);
+    }
   },
 });
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
index 429e9f5..11b5ad9 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
@@ -54,7 +54,10 @@
     <view class="evaluation_button">点击评价</view>
   </view>
   <!-- 自定义开处方样式 -->
-  <view wx:if="{{renderDom[0].type==='prescribe'}}" class="gdxz_custom_order_prescribe_message" bindtap="toBuy">
+  <view wx:if="{{renderDom[0].type==='prescribe'}}" 
+  class="gdxz_custom_order_prescribe_message" 
+  data-url="/Pages/yishi/onlinechufang/index?order_inquiry_id={{renderDom[0].order_inquiry_id}}&order_prescription_id={{renderDom[0].order_prescription_id}}&from=chat"
+  bindtap="go">
     <view class="prescribe_title">
       处方已开具
     </view>
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index 825afa2..e1e1aca 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -86,7 +86,6 @@ Component({
     errorMessage: {},
     errorMessageID: '',
     typingMessage: {},
-
   },
 
   lifetimes: {
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxss b/TUIKit/components/TUIChat/components/MessageList/index.wxss
index 3464198..34e0b61 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageList/index.wxss
@@ -16,6 +16,8 @@
 .t-message{
   position: relative;
   z-index: -9;
+  width: calc(100vw - 20rpx);
+  padding: 0 10rpx;
 }
 .t-recieve-message {
   display: flex;
@@ -35,7 +37,6 @@
   display: flex;
   flex-direction: row;
   justify-content: flex-end;
-  width: 100vw;
   word-break: break-all;
 }
 .t-self-message-body {
diff --git a/TUIKit/components/TUIChat/index.js b/TUIKit/components/TUIChat/index.js
index 50ca53d..eb913dd 100644
--- a/TUIKit/components/TUIChat/index.js
+++ b/TUIKit/components/TUIChat/index.js
@@ -60,6 +60,15 @@ Component({
         });
       },
     },
+    baseInfo: {
+      type: Object,
+      value: {},
+      observer(baseInfo) {
+        this.setData({
+          "navbarData.title": baseInfo.patient_family_name
+        });
+      },
+    }
   },
 
   lifetimes: {
@@ -92,7 +101,8 @@ Component({
 
     },
     ready() {
-      this.getInquiryMessageBasic()
+      //修改为组件传值
+      // this.getInquiryMessageBasic()
     }
   },
   /**
@@ -127,7 +137,6 @@ Component({
       showCapsule: 2, //是否显示左上角图标   1表示显示    0表示不显示
       title: '', //导航栏 中间的标题
     },
-    baseInfo: {},
     navbar_height: 0,
     dialog_visible: false,
 
@@ -151,7 +160,7 @@ Component({
     confirmDialog(){
       api.putDoctorInquiryFinish({order_inquiry_id: this.data.order_inquiry_id}).then(response => {
         console.log(response);
-        
+        this.getInquiryMessageBasic()
       }).catch(errors => {console.error(errors);})
       this.setData({
         dialog_visible: false
@@ -164,7 +173,6 @@ Component({
         console.log(response);
         this.setData({
           baseInfo: response.data,
-          "navbarData.title": response.data.patient_name
         })
       }).catch(errors => {console.error(errors);})
     },
@@ -263,7 +271,7 @@ Component({
       setNewInputStyle(event.detail.event.detail.height);
       this.setData({
         'viewData.style': newInputStyle,
-        input_area_style: "position: absolute;  bottom: 30px;"
+        input_area_style: "position: absolute;  bottom: 45rpx;"
       });
     },
     // 监听键盘，失去焦点时收起键盘
diff --git a/TUIKit/components/TUIChat/index.wxml b/TUIKit/components/TUIChat/index.wxml
index 943f9f6..34faedb 100644
--- a/TUIKit/components/TUIChat/index.wxml
+++ b/TUIKit/components/TUIChat/index.wxml
@@ -3,12 +3,12 @@
 <view class="container">
   <view class="info" wx:if="{{ true }}">
   <view class="left">
-    <view class="name">{{baseInfo.patient_name}}</view>
-    <view class="age">{{baseInfo.patient_sex==1?'男':'女'}}｜{{baseInfo.patient_age}}岁</view>
-    <view class="status">{{baseInfo.inquiry_status==1?'待支付':baseInfo.inquiry_status==2?'待分配':baseInfo.inquiry_status==3?'待接诊':baseInfo.inquiry_status==4?'已接诊':baseInfo.inquiry_status==5?'已完成':baseInfo.inquiry_status==6?'已结束':baseInfo.inquiry_status==7?'已取消':'未知'}}</view>
+    <view class="name">{{baseInfo.patient_family_name}}</view>
+    <view class="age">{{baseInfo.patient_family_sex==1?'男':'女'}}｜{{baseInfo.patient_family_age}}岁</view>
+    <view class="status {{baseInfo.inquiry_status==5?'status_complete':''}}">{{baseInfo.inquiry_status==1?'待支付':baseInfo.inquiry_status==2?'待分配':baseInfo.inquiry_status==3?'待接诊':baseInfo.inquiry_status==4?'已接诊':baseInfo.inquiry_status==5?'已完成':baseInfo.inquiry_status==6?'已结束':baseInfo.inquiry_status==7?'已取消':'未知'}}</view>
   </view>
   <view class="right">
-    <text class="right_txt" bindtap="putDoctorInquiryFinish">结束问诊</text>
+    <text class="right_txt" bindtap="putDoctorInquiryFinish" wx:if="{{baseInfo.inquiry_status==4}}">结束问诊</text>
   </view>
 </view>
 
@@ -30,20 +30,20 @@
   <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}}">
-  <view class="message-input" style="{{viewData.style}}" wx:if="{{showChat}}">
-    <MessageInput bind:myhandleExtensions="myhandleExtensions" id="MessageInput" inquiry_type="{{inquiry_type}}" 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 class="input-area" style="{{input_area_style}}" wx:if="{{baseInfo.inquiry_status == 4}}">
+    <view class="message-input" style="{{viewData.style}}" wx:if="{{showChat}}">
+      <MessageInput bind:myhandleExtensions="myhandleExtensions" id="MessageInput" inquiry_type="{{inquiry_type}}" 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>
-  <view style="height: 40px;position: fixed;bottom: 0;width: 100%;background-color: #fff;">
+  <view style="height: 40px;position: fixed;bottom: 0;width: 100%;background-color: #fff;z-index: 1;">
     
   </view>
 </view>
 <t-dialog
   visible="{{ dialog_visible }}"
   title="温馨提示"
-  content="您确认结束问诊？"
+  content="确定要结束问诊么？"
 >
 <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="cancelDialog">
   取消
diff --git a/TUIKit/components/TUIChat/index.wxss b/TUIKit/components/TUIChat/index.wxss
index 8a9e3ac..9dbc119 100644
--- a/TUIKit/components/TUIChat/index.wxss
+++ b/TUIKit/components/TUIChat/index.wxss
@@ -2,6 +2,7 @@
   width: 100vw;
   height: 100vh;
   background-color: #F4F4F4;
+  z-index: 0;
 }
 .safetytips-box{
   background: rgba(255, 149, 0, 0.1);
@@ -97,7 +98,8 @@
 }
 .input-area {
   position: relative;
-  z-index: 999999;
+  z-index: 2;
+  /* z-index: 999999; */
   /* position: absolute;
   bottom: 20px; */
 }
@@ -111,7 +113,7 @@
   width: 100%;
   padding-bottom: var(--padding);
   background-color: #ffffff;
-  z-index: 999999;
+  /* z-index: 999999; */
 }
 .calling {
   position: fixed;
@@ -173,6 +175,9 @@
   color: #FA541C;
   padding: 10rpx 20rpx;
 }
+.status_complete{
+  color: #C5C5C5;
+}
 .dialog{
   width: 50%;
   text-align: center;
diff --git a/commpents/wenzhen_data/index.js b/commpents/wenzhen_data/index.js
index 34528c0..c3118ed 100644
--- a/commpents/wenzhen_data/index.js
+++ b/commpents/wenzhen_data/index.js
@@ -1,5 +1,6 @@
 import { API } from "../../utils/network/api";
 const api = new API()
+const app = getApp()
 // commpents/wenzhen_data/index.js
 Component({
   /**
@@ -81,9 +82,7 @@ Component({
    */
   methods: {
     go(e){
-      wx.navigateTo({
-        url: e.currentTarget.dataset.url
-      })
+      app.go(e.currentTarget.dataset.url);
     },
     goChat(e){
       this.setData({
@@ -98,9 +97,8 @@ Component({
           let from_account = e.currentTarget.dataset.from_account;
           let order_inquiry_id = e.currentTarget.dataset.order_inquiry_id;
           let inquiry_type = e.currentTarget.dataset.inquiry_type;
-          wx.navigateTo({
-            url: e.currentTarget.dataset.url+"?from_account="+from_account+"&order_inquiry_id="+order_inquiry_id+"&inquiry_type="+inquiry_type
-          })
+          let url = e.currentTarget.dataset.url+"?from_account="+from_account+"&order_inquiry_id="+order_inquiry_id+"&inquiry_type="+inquiry_type;
+          app.go(url);
         }
       })
     },
diff --git a/commpents/wenzhen_data/index.wxml b/commpents/wenzhen_data/index.wxml
index cbc83b3..39f3739 100644
--- a/commpents/wenzhen_data/index.wxml
+++ b/commpents/wenzhen_data/index.wxml
@@ -24,7 +24,7 @@
 <van-popup show="{{ show }}" bind:close="onClose" round>
   <view class="pop_content">
     <view class="pop_title">温馨提示</view>
-    <view class="pop_note">为保障服务质量，请您查看患者病历信息在选择是否接诊。</view>
+    <view class="pop_note">为保障服务质量，请您查看患者病历信息再选择是否接诊。</view>
     <view class="pop_btn">
       <view class="pop_btn_left" bindtap="go" data-from_account="{{from_account}}" data-url="/Pages/yishi/case/index?order_inquiry_id={{order_inquiry_id}}" >去查看</view>
       <view class="pop_btn_right" bindtap="postDoctorInquiry" data-from_account="{{from_account}}" data-inquiry_type="{{inquiry_type}}" data-order_inquiry_id="{{order_inquiry_id}}" data-url="/Pages/yishi/chat/index" >去接诊</view>

From edff2d3c05519c81b9ab6aeda090d6d4def35783 Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Thu, 30 Mar 2023 17:14:12 +0800
Subject: [PATCH 15/83] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/login/index.js                          |  9 +++++-
 Pages/mobile_login/index.js                   |  8 +++++
 Pages/yishi/chat/index.js                     |  1 +
 Pages/yishi/chufangsetup/index.wxml           |  2 +-
 Pages/yishi/onlinechufang/index.js            |  9 +++++-
 Pages/yishi/onlinechufang/index.wxml          | 32 +++++++++++++++++--
 Pages/yishi/onlinechufang/index.wxss          |  4 ++-
 Pages/yishi/wenzhen_v2/wenzhen.js             |  2 +-
 Pages/yishi/wenzhen_v2/wenzhen.wxml           |  4 +--
 .../MessageElements/CustomMessage/index.wxss  |  3 +-
 .../TUIChat/components/MessageInput/index.js  |  2 +-
 .../TUIChat/components/MessageList/index.js   | 12 +++++--
 .../TUIChat/components/MessageList/index.wxml |  2 +-
 .../TUIChat/components/MessageList/index.wxss |  4 +--
 TUIKit/components/TUIChat/index.js            | 11 +++++++
 app.js                                        |  4 ++-
 utils/network/request.js                      |  2 +-
 17 files changed, 92 insertions(+), 19 deletions(-)

diff --git a/Pages/login/index.js b/Pages/login/index.js
index f0c734b..5a9b7ab 100644
--- a/Pages/login/index.js
+++ b/Pages/login/index.js
@@ -3,7 +3,6 @@ import { API } from './../../utils/network/api'
 const api = new API()
 const app = getApp()
 Page({
-
   data: {
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
@@ -11,6 +10,14 @@ Page({
     },
     checked: false
   },
+  onLoad(){
+    let usertype =  wx.getStorageSync('usertype');
+    if(!usertype){
+      wx.navigateTo({
+        url: "/Pages/index/index"
+      })
+    }
+  },
   onChange(event) {
     this.setData({
       checked: event.detail,
diff --git a/Pages/mobile_login/index.js b/Pages/mobile_login/index.js
index 9641266..98f456d 100644
--- a/Pages/mobile_login/index.js
+++ b/Pages/mobile_login/index.js
@@ -15,6 +15,14 @@ Page({
     login_disabled: false,
     btn_color: "#ccc"
   },
+  onLoad(){
+    let usertype =  wx.getStorageSync('usertype');
+    if(!usertype){
+      wx.navigateTo({
+        url: "/Pages/index/index"
+      })
+    }
+  },
   onChange(event) {
     this.setData({
       checked: event.detail,
diff --git a/Pages/yishi/chat/index.js b/Pages/yishi/chat/index.js
index b240c87..8d619b9 100644
--- a/Pages/yishi/chat/index.js
+++ b/Pages/yishi/chat/index.js
@@ -21,6 +21,7 @@ Page({
   onShow(){
     console.log("chat onShow");
     this.getInquiryMessageBasic();
+    console.log("app.globalData.scene from chat: ", app.globalData.scene);
   },
   $onMessageReceived(value) {
     const message = value.data[0];
diff --git a/Pages/yishi/chufangsetup/index.wxml b/Pages/yishi/chufangsetup/index.wxml
index 1a887c4..9aceb12 100644
--- a/Pages/yishi/chufangsetup/index.wxml
+++ b/Pages/yishi/chufangsetup/index.wxml
@@ -97,7 +97,7 @@
             </view>
             <!-- 底部按钮 -->
             <view class="item_bottom">
-              <view class="item_bottom_btn">问诊记录</view>
+              <view class="item_bottom_btn" bindtap="gochat" data-order_inquiry_id="{{item.order_inquiry_id}}">问诊记录</view>
               <view class="item_bottom_btn item_bottom_btn_repeat" bindtap="go" data-url="/Pages/yishi/onlinechufang/index?order_inquiry_id={{item.order_inquiry_id}}&order_prescription_id={{item.order_prescription_id}}">
                   重开处方
               </view>
diff --git a/Pages/yishi/onlinechufang/index.js b/Pages/yishi/onlinechufang/index.js
index 3725107..b20a3e1 100644
--- a/Pages/yishi/onlinechufang/index.js
+++ b/Pages/yishi/onlinechufang/index.js
@@ -35,7 +35,14 @@ Page({
     doctors_advice_focus: false,
     case_detail: {},
     sub_disabled: false,
-    from: ""
+    from: "",
+    now_filed_focus: 'save_durg_single_use'
+  },
+  changeFocus(e){
+    let next_filed_focus = e.currentTarget.dataset.next_filed_focus;
+    this.setData({
+      now_filed_focus: next_filed_focus
+    })
   },
   onDoctorsAdviceFocus(){
     this.setData({
diff --git a/Pages/yishi/onlinechufang/index.wxml b/Pages/yishi/onlinechufang/index.wxml
index a479048..5c0e90d 100644
--- a/Pages/yishi/onlinechufang/index.wxml
+++ b/Pages/yishi/onlinechufang/index.wxml
@@ -33,7 +33,8 @@
       <view class="addzhenduan" wx:if="{{from != 'chat'}}">+添加诊断</view>
       <view slot="label">
         <view style="margin-top: 20rpx;" class="label_item" wx:for="{{zhenduan_list}}">
-          <van-icon name="delete" catchtap="delZhenDuan" color="red" data-disease_class_id="{{item.icd_id}}" /><text style="margin-left: 10rpx;">{{item.icd_name}}</text>
+          <van-icon name="delete" catchtap="delZhenDuan" color="red" data-disease_class_id="{{item.icd_id}}" wx:if="{{from != 'chat'}}"/>
+          <text style="margin-left: 10rpx;">{{item.icd_name}}</text>
         </view>
       </view>
     </van-cell>
@@ -124,6 +125,11 @@
         input-align="left"
         placeholder="请输入用法（口服）"
         custom-style="font-size: 30rpx;"
+        clearable
+        confirm-type="next"
+        bind:confirm="changeFocus"
+        data-next_filed_focus="save_durg_frequency_use"
+        focus="{{now_filed_focus == 'save_durg_single_use'}}"
         border="{{ true }}"
       />
       <van-field
@@ -133,6 +139,11 @@
         input-align="left"
         placeholder="请输入服用次（一日1次）"
         custom-style="font-size: 30rpx;"
+        clearable
+        confirm-type="next"
+        bind:confirm="changeFocus"
+        data-next_filed_focus="save_durg_single_unit"
+        focus="{{now_filed_focus == 'save_durg_frequency_use'}}"
         border="{{ true }}"
       />
       <van-field
@@ -142,6 +153,11 @@
         input-align="left"
         placeholder="请输入用量（一次3粒）"
         custom-style="font-size: 30rpx;"
+        clearable
+        confirm-type="next"
+        bind:confirm="changeFocus"
+        data-next_filed_focus="save_durg_available_days"
+        focus="{{now_filed_focus == 'save_durg_single_unit'}}"
         border="{{ true }}"
       />
       <van-field
@@ -151,15 +167,25 @@
         input-align="left"
         placeholder="请输入时长"
         custom-style="font-size: 30rpx;"
+        clearable
+        confirm-type="next"
+        bind:confirm="changeFocus"
+        data-next_filed_focus="save_durg_prescription_product_num"
+        focus="{{now_filed_focus == 'save_durg_available_days'}}"
         border="{{ true }}"
       />
       <van-field
         label="药品数量"
-        type="text"
+        type="number"
         model:value="{{save_durg_prescription_product_num}}"
         input-align="left"
         placeholder="请输入数量"
         custom-style="font-size: 30rpx;"
+        clearable
+        confirm-type="next"
+        bind:confirm="changeFocus"
+        data-next_filed_focus="save_durg_packaging_unit"
+        focus="{{now_filed_focus == 'save_durg_prescription_product_num'}}"
         border="{{ true }}"
       />
       <van-field
@@ -169,6 +195,8 @@
         input-align="left"
         placeholder="盒/袋"
         custom-style="font-size: 30rpx;"
+        clearable
+        confirm-type="done"
         border="{{ true }}"
       />
  
diff --git a/Pages/yishi/onlinechufang/index.wxss b/Pages/yishi/onlinechufang/index.wxss
index 7e9b85b..5c73745 100644
--- a/Pages/yishi/onlinechufang/index.wxss
+++ b/Pages/yishi/onlinechufang/index.wxss
@@ -79,9 +79,11 @@ page{
   border-radius: 20rpx;
 }
 .drugs_box_item{
-  border-bottom: 1px solid red;
   padding: 20rpx 20rpx 20rpx 20rpx;
 }
+.drugs_box_item:not(:first-child){
+  border-top: 1px solid #E7E7E7;
+}
 .drugs_name{
   color: #333333;
   font-size: 32rpx;
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index 6e422f2..ae7c21d 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -17,7 +17,7 @@ Page({
     data_list_4: [],
     data_list_5: [],
     conversationList: [],
-    message_inquiry_type: 1,
+    message_inquiry_type: 99999,
     system_notice_unreadnnum: "",
     service_notice_unreadnnum: "",
     hasOnShow: false
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml
index 4083d25..85904ea 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxml
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml
@@ -28,14 +28,14 @@
 
   <view class="tabs" wx:if="{{ has_data }}" >
     <t-tabs
-      defaultValue="{{ message_inquiry_type }}"
+      default-value="{{ message_inquiry_type }}"
       sticky
       bind:change="onTabsChange"
       bind:scroll="onStickyScroll"
       t-class="custom-tabs"
       theme="line"
+      swipeable="{{false}}"
       custom-style="font-size: 32rpx"
-
     >
       <t-tab-panel label="在线问诊" value="1" wx:if="{{data_list_1.length > 0}}">
 
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss
index ad4da67..2ccc20b 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss
@@ -127,7 +127,8 @@ line-height: 42rpx;
   display: flex;
   flex-direction: column;
   align-items: center;
-  width: 100vw;
+  width: calc(100vw - 40rpx);
+  text-align: center;
 }
 .gdxz_custom_message_title{
   flex: 1;
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js
index 34e63f4..a0743cd 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.js
@@ -833,7 +833,7 @@ Component({
         displayServiceEvaluation: true,
       });
     },
-
+    //常用语
     showChangYongYu(){
       app.go("/Pages/yishi/quickreply/index?from=chat")
     },
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index e1e1aca..26ad364 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -186,10 +186,11 @@ Component({
       }
     },
     checkShowAvatar(message){
-
+      console.log("checkShowAvatar ");
       let type = message.type;
+      console.log("message type: ", type);
       let show_avatar = true;
-      if(type == "TIMCustomElem"){
+      if(type === "TIMCustomElem"){
         const customMessage = JSON.parse(message.payload.data);
         if(customMessage.message_type != GDXZ_CUSTOM_MSEEAGE.PRESCRIBE){
           show_avatar = false;
@@ -273,6 +274,8 @@ Component({
               showNewMessageCount: this.data.showNewMessageCount,
               showDownJump: true,
             });
+
+            
           }
         } else {
           this.setData({
@@ -310,10 +313,13 @@ Component({
           groupOptionsNumber: this.data.messageList.slice(-1)[0].payload.operationType,
         });
       }
+
+      //主动跳到 消息跳转到最新
+      // this.handleJumpNewMessage()
     },
     // 自己的消息上屏
     updateMessageList(message) {
-
+      console.log("自己的消息上屏 updateMessageList: ", message);
       //自己的消息有头像
       message.show_avatar = this.checkShowAvatar(message);
       if (message.conversationID !== this.data.conversation.conversationID) return;
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxml b/TUIKit/components/TUIChat/components/MessageList/index.wxml
index 4786f9f..1e077a3 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageList/index.wxml
@@ -64,7 +64,7 @@
 <view wx:if="{{showDownJump}}" bindtap="handleJumpNewMessage">
     <view class="new-message-item" > 
     <view class="new-message-box">
-    <image class="icon-left" src="../../../static/assets/down.svg"/>
+    <image class="icon-left" src="../../../../static/assets/down.svg"/>
     <text>{{showNewMessageCount.length}}条新消息</text>
     </view>
     </view>
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxss b/TUIKit/components/TUIChat/components/MessageList/index.wxss
index 34e0b61..fb4e32a 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageList/index.wxss
@@ -16,8 +16,8 @@
 .t-message{
   position: relative;
   z-index: -9;
-  width: calc(100vw - 20rpx);
-  padding: 0 10rpx;
+  width: calc(100vw - 40rpx);
+  padding: 10rpx 20rpx 20rpx 20rpx;
 }
 .t-recieve-message {
   display: flex;
diff --git a/TUIKit/components/TUIChat/index.js b/TUIKit/components/TUIChat/index.js
index eb913dd..059ab26 100644
--- a/TUIKit/components/TUIChat/index.js
+++ b/TUIKit/components/TUIChat/index.js
@@ -103,6 +103,17 @@ Component({
     ready() {
       //修改为组件传值
       // this.getInquiryMessageBasic()
+      console.log("app.globalData.scene from TUIchat ready: ", app.globalData.scene);
+      let pages = getCurrentPages();
+      console.log("pages:", pages)
+      console.log("pages.length:", pages.length)
+      console.log("pages:", pages[0])
+      if(pages.length == 1){
+        console.log("navbarData.showCapsule");
+        this.setData({
+          "navbarData.showCapsule": 3
+        })
+      }
     }
   },
   /**
diff --git a/app.js b/app.js
index 22e19d6..856e613 100644
--- a/app.js
+++ b/app.js
@@ -7,11 +7,12 @@ const api = new API()
 App({
   onLaunch: function (options) {
     // 判断是否由分享进入小程序
-    if (options.scene == 1007 || options.scene == 1008) {
+    if (options.scene != 1001) {
       this.globalData.share = true
     } else {
       this.globalData.share = false
     };
+    this.globalData.scene = options.scene
     //获取设备顶部窗口的高度（不同设备窗口高度不一样，根据这个来设置自定义导航栏的高度）
     //这个最初我是在组件中获取，但是出现了一个问题，当第一次进入小程序时导航栏会把
     //页面内容盖住一部分,当打开调试重新进入时就没有问题，这个问题弄得我是莫名其妙
@@ -160,6 +161,7 @@ App({
   globalData: {
     share: false,  // 分享默认为false
     height: 0,
+    scene: "",//场景值
     login_url: "/Pages/login/index",
     chat_sdk_ready: false,
     jiesuan_dialog_show: false,
diff --git a/utils/network/request.js b/utils/network/request.js
index 7918d56..4ffddc5 100644
--- a/utils/network/request.js
+++ b/utils/network/request.js
@@ -43,7 +43,7 @@ class HTTP {
               resolve(res.data)
             } else if(code == 401 || code == 403 || code == 405 || code == 406){
               wx.navigateTo({
-                url: app.globalData.login_url
+                url: "/Pages/login/index"
               })
             } else {
               reject(res.data.message);//向后传递错误信息，catch会拿到

From 52742fdbd9698dd53107f47ff2f4c2177695b938 Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Fri, 31 Mar 2023 13:48:32 +0800
Subject: [PATCH 16/83] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/identity/index.js                 | 15 +++++-
 Pages/yishi/identity/index.wxml               | 12 ++++-
 Pages/yishi/identity/index.wxss               | 13 +----
 Pages/yishi/index/index.js                    | 25 +++++++--
 Pages/yishi/myinfo/index.js                   | 14 ++---
 Pages/yishi/myprofile/index.js                | 14 ++++-
 Pages/yishi/myprofile/index.wxml              |  7 ++-
 TUIKit/components/TUIChat/index.wxss          |  3 +-
 app.js                                        |  4 ++
 commpents/myprofile/index.js                  | 53 ++++++++++++-------
 commpents/myprofile/index.json                |  3 +-
 commpents/myprofile/index.wxml                | 26 +++++++--
 commpents/myprofile/index.wxss                |  6 +--
 commpents/wenzhen_data/index.wxss             |  5 ++
 .../tdesign-miniprogram/cascader/cascader.js  |  7 ++-
 utils/network/request.js                      |  1 -
 16 files changed, 148 insertions(+), 60 deletions(-)

diff --git a/Pages/yishi/identity/index.js b/Pages/yishi/identity/index.js
index 6154f39..4343060 100644
--- a/Pages/yishi/identity/index.js
+++ b/Pages/yishi/identity/index.js
@@ -23,7 +23,8 @@ Page({
     next_btn_disabled: false,
     next_btn_txt: "下一步",
     realname: "",
-    idcard: ""
+    idcard: "",
+    page_meta_show: false
   },
   getMenuButtonBound() {
     let stateHeight = 0; //  接收状态栏高度
@@ -729,4 +730,16 @@ Page({
 
   //   }).catch(errors => {console.error(errors);})
   // }
+  showPageMeta(){
+    console.log("showPageMeta from indenity");
+    this.setData({
+      page_meta_show: true
+    })
+  },
+  hidePageMeta(){
+    console.log("hidePageMeta from indenity");
+    this.setData({
+      page_meta_show: false
+    })
+  }
 })
\ No newline at end of file
diff --git a/Pages/yishi/identity/index.wxml b/Pages/yishi/identity/index.wxml
index 72916cd..d16420f 100644
--- a/Pages/yishi/identity/index.wxml
+++ b/Pages/yishi/identity/index.wxml
@@ -1,4 +1,6 @@
 <!-- <nav-bar navbar-data='{{navbarData}}' style="margin-bottom: {{height*2 + 20}}px;"></nav-bar> -->
+<!-- 设置滚动穿透 -->
+<page-meta page-style="{{ page_meta_show ? 'overflow: hidden;' : '' }}" />
 <te-nav-bar navbar-data='{{navbarData}}'></te-nav-bar>
 <view class="container">
   <view class="tabs">
@@ -63,12 +65,18 @@
 
       <!-- 医师身份认证 -->
       <t-tab-panel label="医师身份认证" value="1" disabled style="{{tabPanelstyle}}" wx:if="{{panel_2_disabled}}">
-        <myprofile wx:if="{{selected_tab == 1}}" />
+        <myprofile wx:if="{{selected_tab == 1}}" 
+          bind:showPageMeta="showPageMeta"
+          bind:hidePageMeta="hidePageMeta"
+        />
         <view style="height: 50rpx;"></view>
       </t-tab-panel>
 
       <t-tab-panel label="医师身份认证" value="1" style="{{tabPanelstyle}}" wx:if="{{!panel_2_disabled}}">
-        <myprofile wx:if="{{selected_tab == 1}}" />
+        <myprofile wx:if="{{selected_tab == 1}}" 
+          bind:showPageMeta="showPageMeta"
+          bind:hidePageMeta="hidePageMeta"
+         />
         <view style="height: 50rpx;"></view>
       </t-tab-panel>
 
diff --git a/Pages/yishi/identity/index.wxss b/Pages/yishi/identity/index.wxss
index fa5afd1..4062958 100644
--- a/Pages/yishi/identity/index.wxss
+++ b/Pages/yishi/identity/index.wxss
@@ -94,24 +94,13 @@
   width: 95vw;
   margin: 0 auto 30rpx auto;
 }
-.zhiye_popup{
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  height: 600rpx;
-}
+
 .zhiye_popup_title{
   margin-top: 16px;
   font-size: 32rpx;
   font-weight: 600;
   letter-spacing: 5rpx;
 }
-.zhiye_popup_img{
-  margin-top: 30rpx;
-  width: 300rpx;
-  height: 300rpx;
-  background-color: cadetblue;
-}
 
 .zhuanchang_box{
   display: flex;
diff --git a/Pages/yishi/index/index.js b/Pages/yishi/index/index.js
index 44a7b2c..4e8cc93 100644
--- a/Pages/yishi/index/index.js
+++ b/Pages/yishi/index/index.js
@@ -155,8 +155,24 @@ Page({
     this.setData({
       swiperList: []
     })
+    wx.offCopyUrl(this.Copylistener) // 需传入与监听时同一个的函数对象
+  },
+  Copylistener(res){
+    setTimeout(()=>{
+      wx.setClipboardData({
+        data: '暂不支持分享',
+        success (res) {
+
+        },
+        complete(){
+          wx.hideToast()
+        }
+      })
+    },1000)
+    return
   },
   onShow: function () {
+    wx.onCopyUrl(this.Copylistener);
     if (typeof this.getTabBar === 'function' && this.getTabBar()) {
       this.getTabBar().setData({
         active: 0,  //数字是当前页面在tabbar的索引,如我的查询页索引是2，因此这边为2，同理首页就为0，审批页面为1
@@ -175,12 +191,11 @@ Page({
         "info.avg_response_time": response.data.info.avg_response_time,
         "info.number_of_fans": response.data.info.number_of_fans,
       })
-      if(avatar && (avatar.indexOf("http") == -1)){
-        avatar = api.getStaticHost() + avatar;
+      if(avatar){
+        this.setData({
+          "info.avatar": avatar
+        })
       }
-      this.setData({
-        "info.avatar": avatar
-      })
 
       //实名认证
       let idcard_status = response.data.info.idcard_status;
diff --git a/Pages/yishi/myinfo/index.js b/Pages/yishi/myinfo/index.js
index b39512e..580edf2 100644
--- a/Pages/yishi/myinfo/index.js
+++ b/Pages/yishi/myinfo/index.js
@@ -54,12 +54,14 @@ Page({
           wx.setStorageSync('AUTH_TOKEN_'+usertype, "");
           wx.setStorageSync('user_id_'+usertype, "");
           wx.setStorageSync('client_user_id_'+usertype, "");
-          let promise = wx.$TUIKit.logout();
-          promise.then(function(imResponse) {
-            console.log(imResponse.data); // 登出成功
-          }).catch(function(imError) {
-            console.warn('logout error:', imError);
-          });
+          if(wx.$TUIKit){
+            let promise = wx.$TUIKit.logout();
+            promise.then(function(imResponse) {
+              console.log(imResponse.data); // 登出成功
+            }).catch(function(imError) {
+              console.warn('logout error:', imError);
+            });
+          }
           app.go("/Pages/index/index");
         } else if (res.cancel) {
           console.log('用户点击取消')
diff --git a/Pages/yishi/myprofile/index.js b/Pages/yishi/myprofile/index.js
index a296466..d64b7a4 100644
--- a/Pages/yishi/myprofile/index.js
+++ b/Pages/yishi/myprofile/index.js
@@ -5,9 +5,21 @@ Page({
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '我的简介', //导航栏 中间的标题
     },
+    page_meta_show: false
   },
   goBack(){
     wx.navigateBack();
+  },
+  showPageMeta(){
+    console.log("showPageMeta from indenity");
+    this.setData({
+      page_meta_show: true
+    })
+  },
+  hidePageMeta(){
+    console.log("hidePageMeta from indenity");
+    this.setData({
+      page_meta_show: false
+    })
   }
-  
 })
\ No newline at end of file
diff --git a/Pages/yishi/myprofile/index.wxml b/Pages/yishi/myprofile/index.wxml
index b3b7e70..8956852 100644
--- a/Pages/yishi/myprofile/index.wxml
+++ b/Pages/yishi/myprofile/index.wxml
@@ -1,5 +1,10 @@
+<!-- 设置滚动穿透 -->
+<page-meta page-style="{{ page_meta_show ? 'overflow: hidden;' : '' }}" />
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
-  <myprofile indentity="{{false}}" />
+  <myprofile indentity="{{false}}" 
+    bind:showPageMeta="showPageMeta"
+    bind:hidePageMeta="hidePageMeta"
+  />
   <view style="height: 50rpx;"></view>
 </view>
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/index.wxss b/TUIKit/components/TUIChat/index.wxss
index 9dbc119..facc82e 100644
--- a/TUIKit/components/TUIChat/index.wxss
+++ b/TUIKit/components/TUIChat/index.wxss
@@ -176,7 +176,8 @@
   padding: 10rpx 20rpx;
 }
 .status_complete{
-  color: #C5C5C5;
+  color: #ffffff;
+  background-color: #c5c5c5;
 }
 .dialog{
   width: 50%;
diff --git a/app.js b/app.js
index 856e613..a7b18f8 100644
--- a/app.js
+++ b/app.js
@@ -49,8 +49,12 @@ App({
 
     //监听网络状态变化事件
     wx.onNetworkStatusChange(function (res) {
+      console.log("onNetworkStatusChange: ")
       console.log(res.isConnected)
       console.log(res.networkType)
+      wx.showToast({
+        title: '网络类型'+res.networkType,
+      })
     })
   },
   onShow(){
diff --git a/commpents/myprofile/index.js b/commpents/myprofile/index.js
index d101a08..2f4a19e 100644
--- a/commpents/myprofile/index.js
+++ b/commpents/myprofile/index.js
@@ -361,6 +361,11 @@ Component({
     onCityShow(e) {
       console.log("onCityShow");
       this.setData({ city_show: true });
+      this.triggerEvent('showPageMeta');
+    },
+    onCloseCity(e){
+      console.log("onCloseCity");
+      this.triggerEvent('hidePageMeta');
     },
     onChangeCity(e) {
       this.setData({
@@ -496,20 +501,19 @@ Component({
           icon: "error"
         })
       }
-        
+      this.triggerEvent('showPageMeta');
     },
     onYiYuanClose(e) {
       console.log("onYiYuanClose");
       this.setData({ yiyuan_show: false });
+      this.triggerEvent('hidePageMeta');
     },
     onYiYuanCancel(event) {
       console.log("onYiYuanCancel");
       const { picker, value, index } = event.detail;
       Toast(`当前值：${value}, 当前索引：${index}`);
-      this.setData({ 
-        yiyuan_show: false
-      });
-  
+      this.setData({yiyuan_show: false});
+      this.triggerEvent('hidePageMeta');
     },
     onYiYuanConfirm(event) {
       console.log("onYiYuanConfirm");
@@ -527,7 +531,7 @@ Component({
           icon: "error"
         })
       }
-      
+      this.triggerEvent('hidePageMeta');
     },
     onYiYuanChange(event) {
       console.log("onYiYuanChange");
@@ -537,12 +541,14 @@ Component({
     onKeshiShow(e) {
       console.log("onKeshiShow");
       this.setData({ keshi_show: true });
+      this.triggerEvent('showPageMeta');
     },
     onKeshiCancel(event) {
       console.log("onKeshiCancel");
       const { picker, value, index } = event.detail;
       Toast(`当前值：${value}, 当前索引：${index}`);
       this.setData({ keshi_show: false });
+      this.triggerEvent('hidePageMeta');
     },
     onKeshiConfirm(event) {
       console.log("onKeshiConfirm");
@@ -553,6 +559,7 @@ Component({
         select_keshi_id: `${value.value}`,
         keshi_note: `${value.text}`,
        });
+       this.triggerEvent('hidePageMeta');
     },
     onKeshiChange(event) {
       console.log("onKeshiChange");
@@ -560,16 +567,19 @@ Component({
     onKeshiClose(e) {
       console.log("onKeshiClose");
       this.setData({ keshi_show: false });
+      this.triggerEvent('hidePageMeta');
     },
     onZhiChengShow(e) {
       console.log("onKeshiShow");
       this.setData({ zhicheng_show: true });
+      this.triggerEvent('showPageMeta');
     },
     onZhiChengCancel(event) {
       console.log("onKeshiCancel");
       const { picker, value, index } = event.detail;
       Toast(`当前值：${value}, 当前索引：${index}`);
       this.setData({ zhicheng_show: false });
+      this.triggerEvent('hidePageMeta');
     },
     onZhiChengConfirm(event) {
       console.log("onZhiChengConfirm");
@@ -580,6 +590,7 @@ Component({
         select_zhicheng_id: `${value.value}`,
         zhicheng_note: `${value.text}`,
        });
+       this.triggerEvent('hidePageMeta');
     },
     onZhiChengChange(event) {
       console.log("onZhiChengChange");
@@ -587,9 +598,11 @@ Component({
     onZhiChengClose(e) {
       console.log("onZhiChengClose");
       this.setData({ zhicheng_show: false });
+      this.triggerEvent('hidePageMeta');
     },
     onZhuanChangShow(){
       this.setData({ zhuanchang_show: true });
+      this.triggerEvent('showPageMeta');
     },
     onZhuanChangVisibleChange(e) {
       this.setData({
@@ -599,57 +612,59 @@ Component({
     onshowJianJieNote(e){
       e.detail // 自定义组件触发事件时提供的 detail 对象
       console.log("onshowJianJieNote");
-      this.setData({
-        jianjie_show: true,
-      });
+      this.setData({jianjie_show: true});
+      this.triggerEvent('showPageMeta');
     },
     onJianjieClose(e){
       e.detail // 自定义组件触发事件时提供的 detail 对象
       console.log("onshowJianJieNote");
-      this.setData({
-        jianjie_show: false,
-      });
+      this.setData({jianjie_show: false});
+      this.triggerEvent('hidePageMeta');
     },
     onshowShanChangNote(e){
       e.detail // 自定义组件触发事件时提供的 detail 对象
       console.log("onshowShanChangNote");
-      this.setData({
-        shanchang_show: true,
-      });
+      this.setData({shanchang_show: true});
+      this.triggerEvent('showPageMeta');
     },
     onshowShanChangNoteClose(e){
       e.detail // 自定义组件触发事件时提供的 detail 对象
       console.log("onshowShanChangNote");
-      this.setData({
-        shanchang_show: false,
-      });
+      this.setData({shanchang_show: false});
+      this.triggerEvent('hidePageMeta');
     },
     onshowZhiYeNote(e){
       e.detail // 自定义组件触发事件时提供的 detail 对象
       console.log("onshowZhiYeNote");
       this.setData({ zhiye_show: true });
+      this.triggerEvent('showPageMeta');
     },
     onZhiYeClose(){
       console.log("onZhiYeClose");
       this.setData({ zhiye_show: false });
+      this.triggerEvent('hidePageMeta');
     },
     onshowZiGeNote(e){
       e.detail // 自定义组件触发事件时提供的 detail 对象
       console.log("onshowZiGeNote");
       this.setData({ zige_show: true });
+      this.triggerEvent('showPageMeta');
     },
     onZiGeClose(){
       console.log("onZhiYeClose");
       this.setData({ zige_show: false });
+      this.triggerEvent('hidePageMeta');
     },
     onshowZhiChengImgNote(e){
       e.detail // 自定义组件触发事件时提供的 detail 对象
       console.log("onshowZhiChengNote");
       this.setData({ zhicheng_img_show: true });
+      this.triggerEvent('showPageMeta');
     },
     onZhiChengImgClose(){
       console.log("onZhiChengClose");
       this.setData({ zhicheng_img_show: false });
+      this.triggerEvent('hidePageMeta');
     },
     onCustomKeshiChange(){
       this.setData({
@@ -719,9 +734,11 @@ Component({
     },
     zhuanchangConfirm(e){
       this.setData({ zhuanchang_show: false });
+      this.triggerEvent('hidePageMeta');
     },
     zhuanchangConcle(e){
       this.setData({ zhuanchang_show: false });
+      this.triggerEvent('hidePageMeta');
     },
     addDoctorAuthIden(e){
       console.log("addDoctorAuthIden addDoctorAuthIden")
diff --git a/commpents/myprofile/index.json b/commpents/myprofile/index.json
index e03f7ea..bda9cf1 100644
--- a/commpents/myprofile/index.json
+++ b/commpents/myprofile/index.json
@@ -20,6 +20,7 @@
     "van-button": "@vant/weapp/button/index",
     "van-icon": "@vant/weapp/icon/index",
     "van-search": "@vant/weapp/search/index",
-    "van-empty": "@vant/weapp/empty/index"
+    "van-empty": "@vant/weapp/empty/index",
+    "van-image": "@vant/weapp/image/index"
   }
 }
diff --git a/commpents/myprofile/index.wxml b/commpents/myprofile/index.wxml
index a0b74af..71f3914 100644
--- a/commpents/myprofile/index.wxml
+++ b/commpents/myprofile/index.wxml
@@ -1,3 +1,4 @@
+
         <view class="{{avatar_reason!=''?'photo':'photo_reason'}}">
           <view class="title">头像 <text class="required"> *</text></view>
           <van-uploader disabled="{{ indentity && iden_auth_disabled }}" bind:after-read="doUploadPhoto" data-scene="1" data-field_name="avatar" data-file_multiple="false">
@@ -28,7 +29,8 @@
           options="{{ areaList }}"
           title="请选择地址"
           sub-titles="{{area_sub_titles}}"
-          bind:change="onChangeCity"
+          bind:change="onChangeCity" 
+          bind:close="onCloseCity"
         ></t-cascader>
 
         <t-cell title="医院" hover required arrow note="{{ yiyuan_note }}" bindtap="{{(indentity && iden_auth_disabled)?'':'onYiYuanShow'}}"/>
@@ -114,13 +116,18 @@
           show="{{ zhiye_show }}"
           closeable
           round
+          lock-scroll
           position="bottom"
           bind:close="onZhiYeClose"
         >
         <view class="zhiye_popup">
           <view class="zhiye_popup_title">医师执业证示例</view>
-          <view class="zhiye_popup_img"></view>
-          <view class="zhiye_popup_img"></view>
+          <view class="zhiye_popup_img">
+            <van-image lazy-load slot="loading" type="spinner" fit="widthFix" width="420rpx" src="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/yishi/cert/zhiye1.png" />
+          </view>
+          <view class="zhiye_popup_img">
+            <van-image lazy-load slot="loading" type="spinner" fit="widthFix" width="420rpx" src="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/yishi/cert/zhiye2.png" />
+          </view>
         </view>
         </van-popup>
 
@@ -128,12 +135,18 @@
           show="{{ zige_show }}"
           closeable
           round
+          lock-scroll
           position="bottom"
           bind:close="onZiGeClose"
         >
         <view class="zhiye_popup">
           <view class="zhiye_popup_title">医师资格证示例</view>
-          <view class="zhiye_popup_img"></view>
+          <view class="zhiye_popup_img">
+            <van-image lazy-load slot="loading" type="spinner" fit="widthFix" width="420rpx" src="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/yishi/cert/zige1.png" />
+          </view>
+          <view class="zhiye_popup_img">
+            <van-image lazy-load slot="loading" type="spinner" fit="widthFix" width="420rpx" src="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/yishi/cert/zige2.png" />
+          </view>
         </view>
         </van-popup>
 
@@ -141,12 +154,15 @@
           show="{{ zhicheng_img_show }}"
           closeable
           round
+          lock-scroll
           position="bottom"
           bind:close="onZhiChengImgClose"
         >
         <view class="zhiye_popup">
           <view class="zhiye_popup_title">职称证示例</view>
-          <view class="zhiye_popup_img"></view>
+          <view class="zhiye_popup_img">
+            <van-image lazy-load slot="loading" type="spinner" fit="widthFix" width="420rpx" src="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/yishi/cert/zhicheng.png" />
+          </view>
         </view>
         </van-popup>
 
diff --git a/commpents/myprofile/index.wxss b/commpents/myprofile/index.wxss
index f713044..b3d7c84 100644
--- a/commpents/myprofile/index.wxss
+++ b/commpents/myprofile/index.wxss
@@ -131,7 +131,8 @@
   display: flex;
   flex-direction: column;
   align-items: center;
-  height: 600rpx;
+  padding-bottom: 20rpx;
+  min-height: 550rpx;
 }
 .zhiye_popup_title{
   margin-top: 16px;
@@ -141,9 +142,6 @@
 }
 .zhiye_popup_img{
   margin-top: 30rpx;
-  width: 300rpx;
-  height: 300rpx;
-  background-color: cadetblue;
 }
 
 .zhuanchang_box{
diff --git a/commpents/wenzhen_data/index.wxss b/commpents/wenzhen_data/index.wxss
index 111551c..6ed4379 100644
--- a/commpents/wenzhen_data/index.wxss
+++ b/commpents/wenzhen_data/index.wxss
@@ -27,6 +27,11 @@
   color: #999999;
   min-height: 70rpx;
   padding: 10rpx 20rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  display: block;
+  line-height: 70rpx;
 }
 .status{
   font-size: 26rpx;
diff --git a/miniprogram_npm/tdesign-miniprogram/cascader/cascader.js b/miniprogram_npm/tdesign-miniprogram/cascader/cascader.js
index 4943c45..f6fdc51 100644
--- a/miniprogram_npm/tdesign-miniprogram/cascader/cascader.js
+++ b/miniprogram_npm/tdesign-miniprogram/cascader/cascader.js
@@ -119,8 +119,11 @@ let Cascader = class Cascader extends SuperComponent {
                     });
                 }
             },
-            hide() {
+            hide(e) {
                 this.setData({ visible: false });
+                if(e != false){
+                  this.triggerEvent('close');
+                 }
             },
             onStepClick(e) {
                 const { index } = e.currentTarget.dataset;
@@ -157,7 +160,7 @@ let Cascader = class Cascader extends SuperComponent {
                             selectedOptions: items.map((item, index) => item[selectedIndexes[index]]),
                         });
                     });
-                    this.hide();
+                    this.hide(false);
                 }
             },
         };
diff --git a/utils/network/request.js b/utils/network/request.js
index 4ffddc5..8df9cab 100644
--- a/utils/network/request.js
+++ b/utils/network/request.js
@@ -1,5 +1,4 @@
 const env = require('./config').dev
-const app = getApp()
 class HTTP {
   constructor() {
     this.baseUrl = env.baseUrl,

From df9a526b7bca5c0a3fc6d1b9e3d3e6a486b64220 Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Fri, 31 Mar 2023 17:24:25 +0800
Subject: [PATCH 17/83] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/my/index.js                       |  7 ++++---
 Pages/yishi/onlinechufang/index.js            | 14 +++++++++++--
 Pages/yishi/onlinechufang/index.wxml          |  5 +++++
 Pages/yishi/wenzhen_v2/wenzhen.wxml           | 12 +++++------
 Pages/yishi/yizhensetup/index.wxml            |  2 +-
 Pages/yishi/zhiye_identity/index.js           | 15 +++++++++++++-
 Pages/yishi/zhiye_identity/index.json         |  4 +++-
 Pages/yishi/zhiye_identity/index.wxml         | 20 +++++++++++++++++++
 Pages/yishi/zhiye_identity/index.wxss         | 16 +++++++++++++++
 .../TUIChat/components/MessageList/index.js   | 12 +++++------
 TUIKit/components/TUIChat/index.js            | 12 ++++++-----
 TUIKit/components/TUIChat/index.wxml          |  6 +++---
 12 files changed, 97 insertions(+), 28 deletions(-)

diff --git a/Pages/yishi/my/index.js b/Pages/yishi/my/index.js
index 30bc02c..92f162e 100644
--- a/Pages/yishi/my/index.js
+++ b/Pages/yishi/my/index.js
@@ -35,7 +35,9 @@ Page({
       stateHeight: stateHeight + top, //  状态栏高度
     });
   },
-
+  onLoad(){
+    console.log("onLoad ");
+  },
   onShow: function () {
     // console.log("onshow ");
     if (typeof this.getTabBar === 'function' && this.getTabBar()) {
@@ -44,8 +46,7 @@ Page({
       })
     }
     this.getMenuButtonBound();
-  },
-  onLoad(){
+ 
     // console.log("my onLoad");
     //获取个人中心数据
     api.getDoctorCenter().then(response => {
diff --git a/Pages/yishi/onlinechufang/index.js b/Pages/yishi/onlinechufang/index.js
index b20a3e1..49321b2 100644
--- a/Pages/yishi/onlinechufang/index.js
+++ b/Pages/yishi/onlinechufang/index.js
@@ -36,7 +36,7 @@ Page({
     case_detail: {},
     sub_disabled: false,
     from: "",
-    now_filed_focus: 'save_durg_single_use'
+    now_filed_focus: 'save_durg_prescription_product_num'
   },
   changeFocus(e){
     let next_filed_focus = e.currentTarget.dataset.next_filed_focus;
@@ -70,13 +70,23 @@ Page({
       order_prescription_id: order_prescription_id,
       from: from
     })
+    if(from == 'chat'){
+      this.setData({
+        "navbarData.title": '处方详情'
+      })
+    }
   },
   select_drug(e){
     this.setData({
       drug_content_show: true,
       product_name: e.currentTarget.dataset.product_name,
       select_drug_id: e.currentTarget.dataset.product_id,
-      save_durg_product_id: e.currentTarget.dataset.product_id
+      save_durg_product_id: e.currentTarget.dataset.product_id,
+      save_durg_single_use: e.currentTarget.dataset.single_use,
+      save_durg_frequency_use: e.currentTarget.dataset.frequency_use,
+      save_durg_single_unit: e.currentTarget.dataset.single_unit,
+      save_durg_available_days: e.currentTarget.dataset.available_days,
+      save_durg_packaging_unit: e.currentTarget.dataset.packaging_unit,
     });
   },
   showPopup() {
diff --git a/Pages/yishi/onlinechufang/index.wxml b/Pages/yishi/onlinechufang/index.wxml
index 5c0e90d..4dcf76c 100644
--- a/Pages/yishi/onlinechufang/index.wxml
+++ b/Pages/yishi/onlinechufang/index.wxml
@@ -106,6 +106,11 @@
           <view class="search_drug_list_item" 
             data-product_name="{{item.product_name}}" 
             data-product_id="{{item.product_id}}" 
+            data-single_use="{{item.single_use}}" 
+            data-frequency_use="{{item.frequency_use}}" 
+            data-single_unit="{{item.single_unit}}" 
+            data-available_days="{{item.available_days}}" 
+            data-packaging_unit="{{item.packaging_unit}}" 
             bindtap="select_drug" 
             wx:for="{{search_drug_list}}">
           <view>{{item.product_name}}</view>
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml
index 85904ea..dc016d5 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxml
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml
@@ -49,7 +49,7 @@
           order_inquiry_id="{{ item.order_inquiry_id }}"
           inquiry_type="{{item.inquiry_type}}"
           from_account="{{item.from_account}}"
-          status_text="{{ 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?'已取消':'其他' }}"
+          status_text="{{ 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?'已取消':'其他' }}"
           note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
           message_dot="{{item.message_dot}}"
           wx:for="{{ data_list_1 }}"
@@ -59,7 +59,7 @@
       </t-tab-panel>
 
       <t-tab-panel label="快速问诊" value="2" wx:if="{{data_list_2.length > 0}}">
-        <!-- 1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消 -->
+        <!-- 1:待支付 2:待分配 3:待接诊 4:接诊中 5:已完成 6:已结束 7:已取消 -->
         <wenzhen-data 
           name="{{ item.patient_name }}"
           sex="{{ item.patient_sex==1?'男':'女' }}"
@@ -70,7 +70,7 @@
           order_inquiry_id="{{ item.order_inquiry_id }}"
           inquiry_type="{{item.inquiry_type}}"
           from_account="{{item.from_account}}"
-          status_text="{{ 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?'已取消':'其他' }}"
+          status_text="{{ 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?'已取消':'其他' }}"
           note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
           message_dot="{{item.message_dot}}"
           from_account="{{item.from_account}}"
@@ -101,7 +101,7 @@
           order_inquiry_id="{{ item.order_inquiry_id }}"
           inquiry_type="{{item.inquiry_type}}"
           from_account="{{item.from_account}}"
-          status_text="{{ 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?'已取消':'其他' }}"
+          status_text="{{ 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?'已取消':'其他' }}"
           note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
           message_dot="{{item.message_dot}}"
           wx:for="{{ data_list_3 }}"
@@ -122,7 +122,7 @@
           order_inquiry_id="{{ item.order_inquiry_id }}"
           inquiry_type="{{item.inquiry_type}}"
           from_account="{{item.from_account}}"
-          status_text="{{ 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?'已取消':'其他' }}"
+          status_text="{{ 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?'已取消':'其他' }}"
           note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
           message_dot="{{item.message_dot}}"
           wx:for="{{ data_list_4 }}"
@@ -139,7 +139,7 @@
           date="{{ item.message_send_time }}"
           desc="{{ item.last_message_content.Text }}"
           status="{{ item.inquiry_status }}"
-          status_text="{{ 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?'已取消':'其他' }}"
+          status_text="{{ 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?'已取消':'其他' }}"
           note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
           message_dot="{{item.message_dot}}"
           wx:for="{{ data_list_5 }}"
diff --git a/Pages/yishi/yizhensetup/index.wxml b/Pages/yishi/yizhensetup/index.wxml
index 2a3f793..91d3ff3 100644
--- a/Pages/yishi/yizhensetup/index.wxml
+++ b/Pages/yishi/yizhensetup/index.wxml
@@ -49,7 +49,7 @@
   </view>
 
   <view class="go">
-    <van-button 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}}" 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
diff --git a/Pages/yishi/zhiye_identity/index.js b/Pages/yishi/zhiye_identity/index.js
index 9cb4dfb..2cfa4bd 100644
--- a/Pages/yishi/zhiye_identity/index.js
+++ b/Pages/yishi/zhiye_identity/index.js
@@ -14,7 +14,8 @@ Page({
     sign_image: [],
     btn_txt: "提交",
     multi_point_status: "",
-    btn_disabled: true
+    btn_disabled: true,
+    sfz_show: false
   },
 
   onLoad(){
@@ -237,9 +238,21 @@ Page({
   },
   onshowIdCardFrontNote(){
     console.log("onshowIdCardFrontNote");
+    this.setData({
+      sfz_show: true
+    })
   },
   onshowIdCardBackNote(){
     console.log("onshowIdCardBackNote");
+    this.setData({
+      sfz_show: true
+    })
+  },
+  onsfzClose(){
+    console.log("onsfzClose");
+    this.setData({
+      sfz_show: false
+    })
   },
   go(e){
     // if(this.data.btn_disabled){
diff --git a/Pages/yishi/zhiye_identity/index.json b/Pages/yishi/zhiye_identity/index.json
index 375d8bb..42ec431 100644
--- a/Pages/yishi/zhiye_identity/index.json
+++ b/Pages/yishi/zhiye_identity/index.json
@@ -7,6 +7,8 @@
     "van-cell": "@vant/weapp/cell/index",
     "van-cell-group": "@vant/weapp/cell-group/index",
     "van-divider": "@vant/weapp/divider/index",
-    "van-button": "@vant/weapp/button/index"
+    "van-button": "@vant/weapp/button/index",
+    "van-popup": "@vant/weapp/popup/index",
+    "van-image": "@vant/weapp/image/index"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/zhiye_identity/index.wxml b/Pages/yishi/zhiye_identity/index.wxml
index d48d6df..2e0238a 100644
--- a/Pages/yishi/zhiye_identity/index.wxml
+++ b/Pages/yishi/zhiye_identity/index.wxml
@@ -74,4 +74,24 @@
     </view>
     <view style="height: 50rpx;"></view>
   </van-cell-group>
+
+  <van-popup
+    show="{{ sfz_show }}"
+    closeable
+    round
+    lock-scroll
+    position="bottom"
+    bind:close="onsfzClose"
+  >
+  <view class="zhiye_popup">
+    <view class="zhiye_popup_title">身份证示例</view>
+    <view class="zhiye_popup_img">
+      <van-image lazy-load slot="loading" type="spinner" fit="widthFix" width="420rpx" src="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/yishi/cert/sfz1.png" />
+    </view>
+    <view class="zhiye_popup_img">
+      <van-image lazy-load slot="loading" type="spinner" fit="widthFix" width="420rpx" src="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/yishi/cert/sfz2.png" />
+    </view>
+  </view>
+  </van-popup>
+
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/zhiye_identity/index.wxss b/Pages/yishi/zhiye_identity/index.wxss
index f7b6729..eb1d61d 100644
--- a/Pages/yishi/zhiye_identity/index.wxss
+++ b/Pages/yishi/zhiye_identity/index.wxss
@@ -38,4 +38,20 @@
   display: flex;
   justify-content: center;
   align-items: center;
+}
+.zhiye_popup{
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding-bottom: 20rpx;
+  min-height: 550rpx;
+}
+.zhiye_popup_title{
+  margin-top: 16px;
+  font-size: 32rpx;
+  font-weight: 600;
+  letter-spacing: 5rpx;
+}
+.zhiye_popup_img{
+  margin-top: 30rpx;
 }
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index 26ad364..b4154de 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -159,11 +159,11 @@ Component({
         }).then((res) => {
           let HMM_data = res.data;//HMM
           let HMM_messageList_del = [];
-          console.log("HMM getMessageList: ", HMM_data);
+          // console.log("HMM getMessageList: ", HMM_data);
           let HMM_messageList = HMM_data.messageList;
           HMM_messageList.forEach(item => {
-            let HMM_type = item.type;
-            console.log(item)
+            // let HMM_type = item.type;
+            // console.log(item)
             //去除自定义消息
             // if(HMM_type == "TIMCustomElem") return;
             let show_avatar = this.checkShowAvatar(item);
@@ -186,9 +186,9 @@ Component({
       }
     },
     checkShowAvatar(message){
-      console.log("checkShowAvatar ");
+      // console.log("checkShowAvatar ");
       let type = message.type;
-      console.log("message type: ", type);
+      // console.log("message type: ", type);
       let show_avatar = true;
       if(type === "TIMCustomElem"){
         const customMessage = JSON.parse(message.payload.data);
@@ -268,7 +268,7 @@ Component({
             });
           } catch (error) {
           }
-          if ((item.type === MESSAGE_TYPE_TEXT.TIM_CUSTOM_ELEM && this.data.typingMessage.businessID !== BUSINESS_ID_TEXT.USER_TYPING) || item.type !== MESSAGE_TYPE_TEXT.TIM_CUSTOM_ELEM) {
+          if ((item.type === MESSAGE_TYPE_TEXT.TIM_CUSTOM_ELEM && this.data.typingMessage.businessID !== BUSINESS_ID_TEXT.USER_TYPING)) {
             this.data.showNewMessageCount.push(message);
             this.setData({
               showNewMessageCount: this.data.showNewMessageCount,
diff --git a/TUIKit/components/TUIChat/index.js b/TUIKit/components/TUIChat/index.js
index 059ab26..2658ad2 100644
--- a/TUIKit/components/TUIChat/index.js
+++ b/TUIKit/components/TUIChat/index.js
@@ -103,11 +103,11 @@ Component({
     ready() {
       //修改为组件传值
       // this.getInquiryMessageBasic()
-      console.log("app.globalData.scene from TUIchat ready: ", app.globalData.scene);
+      // console.log("app.globalData.scene from TUIchat ready: ", app.globalData.scene);
       let pages = getCurrentPages();
-      console.log("pages:", pages)
-      console.log("pages.length:", pages.length)
-      console.log("pages:", pages[0])
+      // console.log("pages:", pages)
+      // console.log("pages.length:", pages.length)
+      // console.log("pages:", pages[0])
       if(pages.length == 1){
         console.log("navbarData.showCapsule");
         this.setData({
@@ -171,7 +171,9 @@ Component({
     confirmDialog(){
       api.putDoctorInquiryFinish({order_inquiry_id: this.data.order_inquiry_id}).then(response => {
         console.log(response);
-        this.getInquiryMessageBasic()
+        this.getInquiryMessageBasic();
+        //调用子组件中的跳到最新消息
+        this.selectComponent('#MessageList').handleJumpNewMessage();
       }).catch(errors => {console.error(errors);})
       this.setData({
         dialog_visible: false
diff --git a/TUIKit/components/TUIChat/index.wxml b/TUIKit/components/TUIChat/index.wxml
index 34faedb..ab2caac 100644
--- a/TUIKit/components/TUIChat/index.wxml
+++ b/TUIKit/components/TUIChat/index.wxml
@@ -5,7 +5,7 @@
   <view class="left">
     <view class="name">{{baseInfo.patient_family_name}}</view>
     <view class="age">{{baseInfo.patient_family_sex==1?'男':'女'}}｜{{baseInfo.patient_family_age}}岁</view>
-    <view class="status {{baseInfo.inquiry_status==5?'status_complete':''}}">{{baseInfo.inquiry_status==1?'待支付':baseInfo.inquiry_status==2?'待分配':baseInfo.inquiry_status==3?'待接诊':baseInfo.inquiry_status==4?'已接诊':baseInfo.inquiry_status==5?'已完成':baseInfo.inquiry_status==6?'已结束':baseInfo.inquiry_status==7?'已取消':'未知'}}</view>
+    <view class="status {{baseInfo.inquiry_status==5?'status_complete':''}}">{{baseInfo.inquiry_status==1?'待支付':baseInfo.inquiry_status==2?'待分配':baseInfo.inquiry_status==3?'待接诊':baseInfo.inquiry_status==4?'接诊中':baseInfo.inquiry_status==5?'已完成':baseInfo.inquiry_status==6?'已结束':baseInfo.inquiry_status==7?'已取消':'未知'}}</view>
   </view>
   <view class="right">
     <text class="right_txt" bindtap="putDoctorInquiryFinish" wx:if="{{baseInfo.inquiry_status==4}}">结束问诊</text>
@@ -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 - 197rpx - 100rpx - {{navbar_height}}px);">
+  <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 wx:if="{{showTips}}" class="safetytips-box"> -->
     <!-- <view class="safetytips">
       <text>【安全提示】本 APP 仅用于体验腾讯云即时通信 IM 产品功能，不可用于业务洽谈与拓展。请勿轻信汇款、中奖等涉及钱款等信息，勿轻易拨打陌生电话，谨防上当受骗。</text>
@@ -36,7 +36,7 @@
       bind:handleCall="handleCall" ></MessageInput>
     </view>
   </view>
-  <view style="height: 40px;position: fixed;bottom: 0;width: 100%;background-color: #fff;z-index: 1;">
+  <view style="height: 40px;position: fixed;bottom: 0;width: 100%;background-color: #fff;z-index: 1;" wx:if="{{baseInfo.inquiry_status==4}}">
     
   </view>
 </view>

From a1d691367ecbc25cf63c39a9ba9dec1bd6e27470 Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Tue, 4 Apr 2023 09:04:29 +0800
Subject: [PATCH 18/83] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/kickedout/index.js                      |  9 +++
 Pages/kickedout/index.json                    |  5 ++
 Pages/kickedout/index.wxml                    |  9 +++
 Pages/kickedout/index.wxss                    | 11 ++++
 Pages/yaoshi/prescription/prescription.js     |  9 ++-
 Pages/yaoshi/prescription/prescription.wxml   |  8 ++-
 Pages/yishi/case/index.wxss                   |  2 +-
 Pages/yishi/index/index.wxss                  | 11 ++++
 Pages/yishi/myinfo/index.js                   |  2 +-
 Pages/yishi/onlinechufang/index.js            |  3 +-
 Pages/yishi/onlinechufang/index.wxml          |  1 +
 Pages/yishi/onlinechufang/index.wxss          |  3 +-
 Pages/yishi/onlinesetup/index.js              |  4 +-
 Pages/yishi/quickreply/index.js               |  4 +-
 Pages/yishi/quickreply/index.wxml             |  6 +-
 Pages/yishi/quickreply/index.wxss             | 12 +++-
 Pages/yishi/wenzhen_v2/wenzhen.js             | 26 +++++----
 Pages/yishi/wenzhen_v2/wenzhen.wxml           |  3 +
 Pages/yishi/yizhensetup/index.wxml            |  2 +-
 .../MessageElements/CustomMessage/index.js    | 11 +++-
 .../MessageElements/CustomMessage/index.wxml  |  8 ++-
 .../MessageElements/CustomMessage/index.wxss  |  2 +-
 .../MessageElements/TextMessage/index.js      |  2 +
 .../TUIChat/components/MessageList/index.js   | 37 +++++++++----
 .../TUIChat/components/MessageList/index.wxml |  1 +
 TUIKit/utils/constant.js                      |  6 +-
 app.js                                        | 55 +++++++++++++++++--
 app.json                                      |  3 +-
 commpents/wenzhen_data/index.json             |  4 +-
 commpents/wenzhen_data/index.wxml             | 15 ++++-
 commpents/wenzhen_data/index.wxss             | 39 ++++---------
 project.private.config.json                   |  2 +-
 32 files changed, 228 insertions(+), 87 deletions(-)
 create mode 100644 Pages/kickedout/index.js
 create mode 100644 Pages/kickedout/index.json
 create mode 100644 Pages/kickedout/index.wxml
 create mode 100644 Pages/kickedout/index.wxss

diff --git a/Pages/kickedout/index.js b/Pages/kickedout/index.js
new file mode 100644
index 0000000..765d8c4
--- /dev/null
+++ b/Pages/kickedout/index.js
@@ -0,0 +1,9 @@
+const app = getApp()
+Page({
+  data: {
+
+  },
+  confirmJieSuanDialog(){
+    app.go("/Pages/index/index");
+  }
+})
\ No newline at end of file
diff --git a/Pages/kickedout/index.json b/Pages/kickedout/index.json
new file mode 100644
index 0000000..84ea31a
--- /dev/null
+++ b/Pages/kickedout/index.json
@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "t-dialog": "tdesign-miniprogram/dialog/dialog"
+  }
+}
\ No newline at end of file
diff --git a/Pages/kickedout/index.wxml b/Pages/kickedout/index.wxml
new file mode 100644
index 0000000..189be3e
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/Pages/kickedout/index.wxss b/Pages/kickedout/index.wxss
new file mode 100644
index 0000000..73af96f
--- /dev/null
+++ b/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%;
+}
\ No newline at end of file
diff --git a/Pages/yaoshi/prescription/prescription.js b/Pages/yaoshi/prescription/prescription.js
index 1ef80dd..ff957a0 100644
--- a/Pages/yaoshi/prescription/prescription.js
+++ b/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){
diff --git a/Pages/yaoshi/prescription/prescription.wxml b/Pages/yaoshi/prescription/prescription.wxml
index 5758fd6..8931b8b 100644
--- a/Pages/yaoshi/prescription/prescription.wxml
+++ b/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>
diff --git a/Pages/yishi/case/index.wxss b/Pages/yishi/case/index.wxss
index 91cb70e..a86b47e 100644
--- a/Pages/yishi/case/index.wxss
+++ b/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;
diff --git a/Pages/yishi/index/index.wxss b/Pages/yishi/index/index.wxss
index a7c0ef8..a7da0f9 100644
--- a/Pages/yishi/index/index.wxss
+++ b/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;
diff --git a/Pages/yishi/myinfo/index.js b/Pages/yishi/myinfo/index.js
index 580edf2..4bfbfce 100644
--- a/Pages/yishi/myinfo/index.js
+++ b/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, "");
diff --git a/Pages/yishi/onlinechufang/index.js b/Pages/yishi/onlinechufang/index.js
index 49321b2..f0f161b 100644
--- a/Pages/yishi/onlinechufang/index.js
+++ b/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;
diff --git a/Pages/yishi/onlinechufang/index.wxml b/Pages/yishi/onlinechufang/index.wxml
index 4dcf76c..603e3fc 100644
--- a/Pages/yishi/onlinechufang/index.wxml
+++ b/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">
diff --git a/Pages/yishi/onlinechufang/index.wxss b/Pages/yishi/onlinechufang/index.wxss
index 5c73745..beb4fba 100644
--- a/Pages/yishi/onlinechufang/index.wxss
+++ b/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;
diff --git a/Pages/yishi/onlinesetup/index.js b/Pages/yishi/onlinesetup/index.js
index b8e17e7..a71dbb7 100644
--- a/Pages/yishi/onlinesetup/index.js
+++ b/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){
diff --git a/Pages/yishi/quickreply/index.js b/Pages/yishi/quickreply/index.js
index f5617fb..8e02877 100644
--- a/Pages/yishi/quickreply/index.js
+++ b/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: ""
   },
diff --git a/Pages/yishi/quickreply/index.wxml b/Pages/yishi/quickreply/index.wxml
index a9d8d89..338ab61 100644
--- a/Pages/yishi/quickreply/index.wxml
+++ b/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" 
diff --git a/Pages/yishi/quickreply/index.wxss b/Pages/yishi/quickreply/index.wxss
index d410237..5b2fdbc 100644
--- a/Pages/yishi/quickreply/index.wxss
+++ b/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;
 }
\ No newline at end of file
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index ae7c21d..e94417d 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/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,
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml
index dc016d5..8de5732 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxml
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml
@@ -151,4 +151,7 @@
   </view>
 
   <view style="height: 200rpx;"></view>
+
+
+
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/yizhensetup/index.wxml b/Pages/yishi/yizhensetup/index.wxml
index 91d3ff3..1b0091f 100644
--- a/Pages/yishi/yizhensetup/index.wxml
+++ b/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
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
index 9ea98bd..87fdf49 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
@@ -120,7 +120,7 @@ Component({
           }];
           return renderDom;
         }
-        // 1:消息内页横条
+        // 1:消息内页横条(医生->患者)
         if (customMessage.message_type === GDXZ_CUSTOM_MSEEAGE.TRABECULA) {
           const renderDom = [{
             type: 'trabecula',
@@ -129,6 +129,15 @@ Component({
           }];
           return renderDom;
         }
+        //8:消息内页横条(患者->医生)
+        if (customMessage.message_type === GDXZ_CUSTOM_MSEEAGE.TRABECULA_PATIENT) {
+          const renderDom = [{
+            type: 'trabecula_patient',
+            title: customMessage.title,
+            desc: customMessage.desc,
+          }];
+          return renderDom;
+        }
         // 2:订单结束评价弹出
         if (customMessage.message_type === GDXZ_CUSTOM_MSEEAGE.ORDER_EVALUATION) {
           let data = customMessage.data;
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
index 11b5ad9..97e9cf8 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
@@ -37,14 +37,18 @@
   <view wx:if="{{renderDom[0].type ==='c2cCalling' || renderDom[0].type ==='groupCalling'}}" class="custom-message {{isMine?'my-custom':''}}" >
     <view class="custom-content-text">{{renderDom[0].text}}</view>
   </view>
-  <view wx:if="{{renderDom[0].type ==='notSupport'}}" class="message-body-span text-message" >
+  <!-- <view wx:if="{{renderDom[0].type ==='notSupport'}}" class="message-body-span text-message" >
     <view class="message-body-span-text">{{renderDom[0].text}}</view>
-  </view>
+  </view> -->
   <!-- 自定义横条样式 -->
   <view wx:if="{{renderDom[0].type==='trabecula'}}" class="gdxz_custom_trabecula_message">
     <view class="gdxz_custom_message_title">{{renderDom[0].title}}</view>
     <view class="gdxz_custom_message_desc">{{renderDom[0].desc}}</view>
   </view>
+  <!-- <view wx:if="{{renderDom[0].type==='trabecula_patient'}}" class="gdxz_custom_trabecula_message">
+    <view class="gdxz_custom_message_title">{{renderDom[0].title}}</view>
+    <view class="gdxz_custom_message_desc">{{renderDom[0].desc}}</view>
+  </view> -->
   <!-- 自定义评价样式 -->
   <view wx:if="{{renderDom[0].type==='order_evaluation'}}" class="gdxz_custom_order_evaluation_message" bindtap="showPop">
     <view class="evaluation_title">请您对本次问诊服务进行评价</view>
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss
index 2ccc20b..55f9fbb 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss
@@ -121,7 +121,7 @@ line-height: 42rpx;
   margin-bottom: 12rpx;
 }
 
-/* 自定义评价样式 */
+/* 自定义样式 */
 /* 横条样式 */
 .gdxz_custom_trabecula_message{
   display: flex;
diff --git a/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.js b/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.js
index 5fbe6ec..81beb78 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.js
+++ b/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.js
@@ -9,6 +9,8 @@ Component({
       type: Object,
       value: {},
       observer(newVal) {
+        console.log("observerobserverobserverobserver")
+        // console.log(newVal)
         this.setData({
           renderDom: parseText(newVal),
         });
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index b4154de..b942ae1 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -150,7 +150,7 @@ Component({
     // 获取消息列表
     getMessageList(conversation) {
 
-
+      console.log("getMessageListgetMessageListgetMessageList")
       if (!this.data.isCompleted) {
         wx.$TUIKit.getMessageList({
           conversationID: conversation.conversationID,
@@ -186,9 +186,9 @@ Component({
       }
     },
     checkShowAvatar(message){
-      // console.log("checkShowAvatar ");
+      console.log("checkShowAvatar ");
       let type = message.type;
-      // console.log("message type: ", type);
+      console.log("message type: ", type);
       let show_avatar = true;
       if(type === "TIMCustomElem"){
         const customMessage = JSON.parse(message.payload.data);
@@ -200,6 +200,7 @@ Component({
     },
     // 历史消息渲染
     $handleMessageRender(messageList, currentMessageList) {
+      console.log("handleMessageRenderhandleMessageRenderhandleMessageRender");
       this.showHistoryMessageTime(currentMessageList);
       if (messageList.length > 0) {
         if (this.data.conversation.type === '@TIM#SYSTEM') {
@@ -216,6 +217,7 @@ Component({
     },
     // 系统消息去重
     filterRepateSystemMessage(messageList) {
+      console.log("filterRepateSystemMessage")
       const noRepateMessage = [];
       for (let index = 0;  index < messageList.length; index++) {
         if (!noRepateMessage.some(item => item && item.ID === messageList[index].ID)) {
@@ -231,15 +233,16 @@ Component({
       this.updateReadByPeer(event);
     },
     // 更新已读更新
-    updateReadByPeer(event) {
-      event.data.forEach((item) => {
-        const index = this.data.messageList.findIndex(element => element.ID === item.ID);
-        this.data.messageList[index] = item;
-        this.setData({
-          messageList: this.data.messageList,
-        });
-      });
-    },
+    // updateReadByPeer(event) {
+    //   console.log("updateReadByPeerupdateReadByPeer")
+    //   event.data.forEach((item) => {
+    //     const index = this.data.messageList.findIndex(element => element.ID === item.ID);
+    //     this.data.messageList[index] = item;
+    //     this.setData({
+    //       messageList: this.data.messageList,
+    //     });
+    //   });
+    // },
 
     // 收到的消息
     $onMessageReceived(value) {
@@ -320,8 +323,11 @@ Component({
     // 自己的消息上屏
     updateMessageList(message) {
       console.log("自己的消息上屏 updateMessageList: ", message);
+      console.log(message);
       //自己的消息有头像
       message.show_avatar = this.checkShowAvatar(message);
+      console.log(message.show_avatar)
+      console.log(message.flow)
       if (message.conversationID !== this.data.conversation.conversationID) return;
       wx.$TUIKit.setMessageRead({ conversationID: this.data.conversation.conversationID }).then(() => {
         logger.log('| MessageList | setMessageRead | ok');
@@ -332,20 +338,26 @@ Component({
       if (message.type === MESSAGE_TYPE_TEXT.TIM_CUSTOM_ELEM) {
         const typingMessage = JSON.parse(message.payload.data);
         if (typingMessage.businessID === BUSINESS_ID_TEXT.USER_TYPING) {
+          console.log(1111111)
           this.setData({
             messageList: this.data.messageList,
           });
         } else {
+          console.log(44444)
           this.data.messageList.push(message);
         }
       } else {
+        console.log(55555)
+        console.log(message)
         this.data.messageList.push(message);
       }
+      console.log(222222)
       this.setData({
         lastMessageSequence: this.data.messageList.slice(-1)[0].sequence,
         messageList: this.data.messageList,
         jumpAim: `ID-${this.filterSystemMessageID(this.data.messageList[this.data.messageList.length - 1].ID)}`,
       }, () => {
+        console.log(333333)
         this.setData({
           messageList: this.data.messageList,
         });
@@ -378,6 +390,7 @@ Component({
     },
     // 更新 messagelist
     updateMessageByID(deleteMessageID) {
+      console.log("updateMessageByIDupdateMessageByIDupdateMessageByID")
       const { messageList } = this.data;
       const deleteMessageArr = messageList.filter(item => item.ID === deleteMessageID);
       this.setData({
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxml b/TUIKit/components/TUIChat/components/MessageList/index.wxml
index 1e077a3..11b4eeb 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageList/index.wxml
@@ -52,6 +52,7 @@
                     <FileMessage wx:if="{{item.type === 'TIMFileElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}"/>
                     <MergerMessage wx:if="{{item.type === 'TIMRelayElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}"/>
                 </view>
+                
                 <image class="t-message-avatar" wx:if="{{item.flow === 'out' && item.show_avatar }}"  src="{{item.avatar || 'https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/default_photo.png'}}"  data-value="{{item}}" bindtap="getMemberProfile"/>
             </view>
         </view>
diff --git a/TUIKit/utils/constant.js b/TUIKit/utils/constant.js
index e7dd6fc..1386bbf 100644
--- a/TUIKit/utils/constant.js
+++ b/TUIKit/utils/constant.js
@@ -41,12 +41,14 @@ const constant = {
   },
   //自定义消息
   GDXZ_CUSTOM_MSEEAGE: {
-    TRABECULA: 1,//1:消息内页横条
+    TRABECULA: 1,//1:消息内页横条(医生->患者)
     ORDER_EVALUATION: 2,//2:订单结束评价弹出
     DOCTOR_SYSTEM_NOTIFICATION: 3,//3:医生端系统通知
     DOCTOR_SERVICE_NOTIFICATION: 4,//4:医生端服务通知
     PATIENT_SYSTEM_MESSAGES: 5,//5:患者端系统消息
-    PRESCRIBE: 6,//6:处方开具成功
+    PRESCRIBE: 6,//6:处方开具成功（医生端）
+    PRESCRIBE_VERIFY: 7,//7:处方审核通过（患者端）
+    TRABECULA_PATIENT: 8,//8:消息内页横条(患者->医生)
   },
 
   OPERATING_ENVIRONMENT: 'imWxTuikit'
diff --git a/app.js b/app.js
index a7b18f8..a40bc9c 100644
--- a/app.js
+++ b/app.js
@@ -3,6 +3,8 @@ import TIM from './TUIKit/lib/tim-wx-sdk';
 import { genTestUserSig }  from './TUIKit/debug/GenerateTestUserSig';
 import TIMUploadPlugin from './TUIKit/lib/tim-upload-plugin';
 import { API } from './utils/network/api'
+import constant from './TUIKit/utils/constant';
+const { GDXZ_CUSTOM_MSEEAGE } = constant;
 const api = new API()
 App({
   onLaunch: function (options) {
@@ -77,7 +79,7 @@ App({
     // const userSig = sign.userSig;
 
     //获取im签名数据
-    api.getSignIM().then(response => {
+    return api.getSignIM().then(response => {
       return response.data;
     }).then((userSig) => {
       console.log("userSig: ", userSig);
@@ -121,7 +123,26 @@ App({
     console.log("onSDKReady from app.js");
     this.globalData.chat_sdk_ready = true;
 
+    
+    // let promise =  wx.$TUIKit.deleteConversation('C2C500318318078251008');
+    // promise.then(function(imResponse) {
+    //   // 删除会话成功
+    //   const { conversationID } = imResponse.data; // 被删除的会话 ID
+    // }).catch(function(imError) {
+    //   console.warn('deleteConversation error:', imError); // 删除会话失败的相关信息
+    // });
+
+
     wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onSystemPushReceived, this);
+    wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.KICKED_OUT, this.onKickedOut);
+  },
+  onKickedOut(){
+    console.log("onKickedOutonKickedOutonKickedOutonKickedOut");
+    let usertype =  wx.getStorageSync('usertype');
+    wx.setStorageSync('AUTH_TOKEN_'+usertype, "");
+    wx.setStorageSync('user_id_'+usertype, "");
+    wx.setStorageSync('client_user_id_'+usertype, "");
+    this.go("/Pages/kickedout/index");
   },
   $onSystemPushReceived(e){
     console.log("onSystemPushReceived from app.js");
@@ -139,19 +160,43 @@ App({
       let payloadData = payload.data;
       let payloadDataJson = JSON.parse(payloadData);
       let message_type = payloadDataJson.message_type;
-      if(message_type == 3) unread_name = userID+"_system_notice_unreadnnum"; //医生端系统通知
-      if(message_type == 4) unread_name = userID+"_service_notice_unreadnnum"; //医生端服务通知
+      console.log("message_type: ", message_type);
+      switch (message_type) {
+        case GDXZ_CUSTOM_MSEEAGE.TRABECULA:
+          unread_name = userID+"_wenzhen_info"; //1、消息内页横条
+          break;
+        case GDXZ_CUSTOM_MSEEAGE.ORDER_EVALUATION:
+          unread_name = userID+"_wenzhen_info"; //2、订单结束评价弹出
+          break;
+        case GDXZ_CUSTOM_MSEEAGE.DOCTOR_SYSTEM_NOTIFICATION:
+          unread_name = userID+"_system_notice_unreadnnum"; //3、医生端系统通知
+          break;
+        case GDXZ_CUSTOM_MSEEAGE.DOCTOR_SERVICE_NOTIFICATION:
+          unread_name = userID+"_service_notice_unreadnnum"; //4、医生端服务通知
+          break;
+        case GDXZ_CUSTOM_MSEEAGE.PRESCRIBE:
+          unread_name = userID+"_wenzhen_info"; //6、处方开具成功
+          break;
+        default:
+          break;
+      }
+
     }else{
       unread_name = userID+"_wenzhen_info";//tabbar 问诊角标
     }
     this.formatUnReadNum(unread_name);
   },
-  formatUnReadNum(name){
+  formatUnReadNum(name, increment=1){
     let val = wx.getStorageSync(name);
     if(val == "") val = 0;
+    if(increment > 0){
+      val = val + increment;
+    }else{
+      val = increment;
+    }
     if(val == "+99") val = 100;
-    val = val + 1;
     if(val > 99) val = '+99';
+    if(val == 0) val = '';
     wx.setStorageSync(name, val);
   },
   aegisInit() {
diff --git a/app.json b/app.json
index 4d4bc5c..a1bbedb 100644
--- a/app.json
+++ b/app.json
@@ -50,7 +50,8 @@
     "Pages/yishi/manual_detail/index",
     "Pages/yishi/addzhenduan/index",
     "Pages/yishi/wenzhen_v2/wenzhen",
-    "Pages/webpage/index"
+    "Pages/webpage/index",
+    "Pages/kickedout/index"
   ],
   "window": {
     "navigationBarBackgroundColor": "#ffffff",
diff --git a/commpents/wenzhen_data/index.json b/commpents/wenzhen_data/index.json
index 107984d..89103e5 100644
--- a/commpents/wenzhen_data/index.json
+++ b/commpents/wenzhen_data/index.json
@@ -2,7 +2,7 @@
   "component": true,
   "usingComponents": {
     "van-button": "@vant/weapp/button/index",
-    "van-popup": "@vant/weapp/popup/index",
-    "t-badge": "tdesign-miniprogram/badge/badge"
+    "t-badge": "tdesign-miniprogram/badge/badge",
+    "t-dialog": "tdesign-miniprogram/dialog/dialog"
   }
 }
\ No newline at end of file
diff --git a/commpents/wenzhen_data/index.wxml b/commpents/wenzhen_data/index.wxml
index 39f3739..b698566 100644
--- a/commpents/wenzhen_data/index.wxml
+++ b/commpents/wenzhen_data/index.wxml
@@ -21,7 +21,7 @@
   <view class="content_4" wx:if="{{ status == 3 }}">{{note}}</view>
 </view>
 
-<van-popup show="{{ show }}" bind:close="onClose" round>
+<!-- <van-popup show="{{ show }}" bind:close="onClose" round>
   <view class="pop_content">
     <view class="pop_title">温馨提示</view>
     <view class="pop_note">为保障服务质量，请您查看患者病历信息再选择是否接诊。</view>
@@ -30,4 +30,15 @@
       <view class="pop_btn_right" bindtap="postDoctorInquiry" data-from_account="{{from_account}}" data-inquiry_type="{{inquiry_type}}" data-order_inquiry_id="{{order_inquiry_id}}" data-url="/Pages/yishi/chat/index" >去接诊</view>
     </view>
   </view>
-</van-popup>
\ No newline at end of file
+</van-popup> -->
+
+<t-dialog
+    visible="{{ show }}"
+    title="温馨提示"
+    close-on-overlay-click
+    bind:close="onClose"
+    content="为保障服务质量，请您查看患者病历信息再选择是否接诊。"
+  >
+  <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="go" data-from_account="{{from_account}}" data-url="/Pages/yishi/case/index?order_inquiry_id={{order_inquiry_id}}" >去查看</view>
+  <view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="postDoctorInquiry" data-from_account="{{from_account}}" data-inquiry_type="{{inquiry_type}}" data-order_inquiry_id="{{order_inquiry_id}}" data-url="/Pages/yishi/chat/index" >去接诊</view>
+</t-dialog>
\ No newline at end of file
diff --git a/commpents/wenzhen_data/index.wxss b/commpents/wenzhen_data/index.wxss
index 6ed4379..dbcf891 100644
--- a/commpents/wenzhen_data/index.wxss
+++ b/commpents/wenzhen_data/index.wxss
@@ -59,34 +59,17 @@
   margin: 0 30rpx;
   min-height: 70rpx;
 }
-.pop_content{
+.dialog{
+  width: 50%;
   text-align: center;
-  display: flex;
-  flex-direction: column;
-  width: 80vw;
+  height: 100rpx;
+  line-height: 100rpx;
 }
-.pop_title{
-  font-size: 34rpx;
-  color: #333333;
-  padding: 30rpx 20rpx;
-}
-.pop_note{
-  font-size: 32rpx;
-  color: #999999;
-  padding: 0rpx 20rpx 30rpx 20rpx;
-}
-.pop_btn{
-  display: flex;
-  border-top: 1px solid #E3E4E5;
-}
-.pop_btn_left{
-  flex: 1;
-  border-right: 1px solid #E3E4E5;
-  padding: 30rpx 0rpx;
-  color: #999999;
-}
-.pop_btn_right{
-  flex: 1;
-  color: #49B9AD;
-  padding: 30rpx 0rpx;
+.dialog_cancel_btn{
+  border-top: 1px solid #E9E9E9;
+  border-right: 1px solid #E9E9E9;
 }
+.dialog_confirm_btn{
+  border-top: 1px solid #E9E9E9;
+  color: #3CC7C0;
+}
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 922bbc7..b983689 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -10,7 +10,7 @@
       "list": [
         {
           "name": "",
-          "pathName": "Pages/index/index",
+          "pathName": "Pages/kickedout/index",
           "query": "",
           "launchMode": "default",
           "scene": null

From 6fa2a5eaa904128bd4db7c60476e6ee90f82726d Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Thu, 6 Apr 2023 11:20:01 +0800
Subject: [PATCH 19/83] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/index/index.js                          |   5 +
 Pages/yaoshi/prescription/prescription.wxml   |   6 +-
 Pages/yaoshi/prescription/prescription.wxss   |  25 ++-
 Pages/yishi/cash/index.js                     |   4 +-
 Pages/yishi/cash/index.json                   |   3 +-
 Pages/yishi/cash/index.wxml                   |  14 +-
 Pages/yishi/cash/index.wxss                   |  16 ++
 Pages/yishi/chat/index.js                     |   2 +-
 Pages/yishi/onlinesetup/index.js              |  51 +-----
 Pages/yishi/onlinesetup/index.wxml            |  21 +--
 Pages/yishi/onlinesetup/index.wxss            |   8 +-
 Pages/yishi/onlinesetupprice/index.js         | 118 ++++++++++++
 Pages/yishi/onlinesetupprice/index.json       |   8 +
 Pages/yishi/onlinesetupprice/index.wxml       |  34 ++++
 Pages/yishi/onlinesetupprice/index.wxss       |  88 +++++++++
 Pages/yishi/wenzhen_v2/wenzhen.js             |   9 +
 Pages/yishi/wenzhen_v2/wenzhen.json           |   4 +-
 Pages/yishi/wenzhen_v2/wenzhen.wxml           |  91 ++++++++--
 Pages/yishi/wenzhen_v2/wenzhen.wxss           |   6 +-
 Pages/yishi/wenzhenorder/index.js             |  85 ++++++++-
 Pages/yishi/wenzhenorder/index.json           |   3 +-
 Pages/yishi/wenzhenorder/index.wxml           |  45 ++---
 Pages/yishi/wenzhenorder/index.wxss           |  15 +-
 Pages/yishi/yizhensetup/index.wxml            |  22 ++-
 Pages/yishi/yizhensetup/index.wxss            |   8 +-
 Pages/yishi/yizhensetupprice/index.js         | 169 ++++++++++++++++++
 Pages/yishi/yizhensetupprice/index.json       |  13 ++
 Pages/yishi/yizhensetupprice/index.wxml       |  49 +++++
 Pages/yishi/yizhensetupprice/index.wxss       | 123 +++++++++++++
 .../TUIChat/components/MessageInput/index.js  |  16 +-
 .../components/MessageInput/index.wxss        |   2 +-
 .../TUIChat/components/MessageList/index.js   |  19 +-
 .../TUIChat/components/MessageList/index.wxml |   4 +-
 TUIKit/components/TUIChat/index.js            |  53 +++---
 TUIKit/components/TUIChat/index.wxml          |   2 +-
 app.js                                        |   8 +-
 app.json                                      |   4 +-
 commpents/myprofile/index.js                  |   4 +
 commpents/wenzhen_data/index.wxss             |  14 +-
 project.private.config.json                   |   2 +-
 40 files changed, 987 insertions(+), 186 deletions(-)
 create mode 100644 Pages/yishi/onlinesetupprice/index.js
 create mode 100644 Pages/yishi/onlinesetupprice/index.json
 create mode 100644 Pages/yishi/onlinesetupprice/index.wxml
 create mode 100644 Pages/yishi/onlinesetupprice/index.wxss
 create mode 100644 Pages/yishi/yizhensetupprice/index.js
 create mode 100644 Pages/yishi/yizhensetupprice/index.json
 create mode 100644 Pages/yishi/yizhensetupprice/index.wxml
 create mode 100644 Pages/yishi/yizhensetupprice/index.wxss

diff --git a/Pages/index/index.js b/Pages/index/index.js
index ade1a4f..aa18410 100644
--- a/Pages/index/index.js
+++ b/Pages/index/index.js
@@ -18,6 +18,11 @@ Page({
   goCheck(e){
     console.log(e);
     let usertype = e.currentTarget.dataset.usertype;
+    if(usertype == 2){
+      app.imInit();
+    }else{
+      app.imLogout();
+    }
     let url = e.currentTarget.dataset.url;
     wx.setStorageSync('usertype', usertype);
     wx.setStorageSync('next_url', url);
diff --git a/Pages/yaoshi/prescription/prescription.wxml b/Pages/yaoshi/prescription/prescription.wxml
index 8931b8b..3b5b79f 100644
--- a/Pages/yaoshi/prescription/prescription.wxml
+++ b/Pages/yaoshi/prescription/prescription.wxml
@@ -1,6 +1,6 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container">
-  <view class="img_box">
+  <view class="img_box" wx:if="{{false}}">
     <view class="img_content">
       <image class="case_img"
         src="{{prescription_img}}"
@@ -12,6 +12,10 @@
       />
     </view>
   </view>
+  <view class="imgbox">
+    <image src="{{prescription_img}}" mode="widthFix" class="prescription"></image>
+    <image src="{{doctor_sign_image}}" mode="widthFix" class="doctorSign"></image>
+  </view>
   <view class="button_group">
     <view class="button_item">
       <van-button round plain type="danger" bind:click="showPopup">
diff --git a/Pages/yaoshi/prescription/prescription.wxss b/Pages/yaoshi/prescription/prescription.wxss
index 4ac2e02..4a325df 100644
--- a/Pages/yaoshi/prescription/prescription.wxss
+++ b/Pages/yaoshi/prescription/prescription.wxss
@@ -1,5 +1,4 @@
 page{
-
   background-color: #F3F5F7;
 }
 
@@ -12,7 +11,7 @@ page{
   width: 100%;
 }
 .img_content{
-  background-color: #F1F1F3;
+  background-color: #F3F5F7;
   padding: 20rpx;
   border-radius: 10rpx;
 }
@@ -35,4 +34,24 @@ page{
 }
 .pop_button_txt{
   color: red;
-}
\ No newline at end of file
+}
+.imgbox{
+  width:100%;
+  height:0;
+  position:relative;
+  padding-bottom:141%;
+}
+.prescription{
+  position:absolute;
+  top:0px;
+  height:100%;
+  bottom:0px;
+  width:100%;
+}
+.doctorSign{
+  position:absolute;
+  width:100rpx;
+  height:53rpx;
+  left:125rpx;
+  bottom:126rpx;
+}
diff --git a/Pages/yishi/cash/index.js b/Pages/yishi/cash/index.js
index 782805a..bd1434a 100644
--- a/Pages/yishi/cash/index.js
+++ b/Pages/yishi/cash/index.js
@@ -16,7 +16,8 @@ Page({
     bank_card_code_mask: "888 xxxx xxxx 888",
     withdrawal_amount: "xxxx",
     income_tax: "xx",
-    contactKeFu: false
+    contactKeFu: false,
+    skeleton_loading: true
   },
   onLoad(options){
     //获取提现数据
@@ -30,6 +31,7 @@ Page({
           bank_card_code_mask: response.data.bank_card_code_mask,
           withdrawal_amount: response.data.withdrawal_amount,
           income_tax: response.data.income_tax,
+          skeleton_loading: false
         })
       }
     }).catch(errors => {
diff --git a/Pages/yishi/cash/index.json b/Pages/yishi/cash/index.json
index c1f968d..ae3c221 100644
--- a/Pages/yishi/cash/index.json
+++ b/Pages/yishi/cash/index.json
@@ -5,6 +5,7 @@
     "van-image": "@vant/weapp/image/index",
     "van-icon": "@vant/weapp/icon/index",
     "van-button": "@vant/weapp/button/index",
-    "van-dialog": "@vant/weapp/dialog/index"
+    "van-dialog": "@vant/weapp/dialog/index",
+    "t-skeleton": "tdesign-miniprogram/skeleton/skeleton"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/cash/index.wxml b/Pages/yishi/cash/index.wxml
index ea973f1..68e9845 100644
--- a/Pages/yishi/cash/index.wxml
+++ b/Pages/yishi/cash/index.wxml
@@ -5,7 +5,7 @@
     <view class="txt_title">结算银行卡</view>
     <view class="rule">提现规则<van-icon name="warning-o" color="#FF9800" /></view>
   </view>
-  <view class="bankcard">
+  <view class="bankcard" wx:if="{{!skeleton_loading}}">
     <view class="bankcard_icon">
       <van-image custom-style="" src="{{bank_icon_path}}" fit="heightFix" height="50rpx" aria-label="role" />
     </view>
@@ -14,8 +14,11 @@
       <view class="bankcard_info_bottom">{{bank_card_code_mask}}</view>
     </view>
   </view>
+  <view class="bankcard_loading" wx:if="{{skeleton_loading}}">
+    <t-skeleton theme="text" row-col="{{[{width: '30%'},{width: '80%'}]}}" animation="gradient" loading="{{skeleton_loading}}" />
+  </view>
 
-  <view class="cash">
+  <view class="cash" wx:if="{{!skeleton_loading}}">
     <view class="cash_top">
       <view class="cash_left">
         <view class="cash_left_title">提现金额（元）</view>
@@ -24,7 +27,9 @@
             <text style="font-size: 42rpx;">￥</text>{{withdrawal_amount}}
           </view>
         </view>
-        <view class="shui">扣除个人所得税： <text style="color: red;">{{income_tax}}元</text> </view>
+        <view class="shui">扣除个人所得税： 
+          <text style="color: red;">{{income_tax}}元</text>
+        </view>
       </view>
       <view class="cash_right">
         <navigator url="/Pages/yishi/wenzhenorder/index" open-type="navigate" hover-class="other-navigator-hover">
@@ -40,6 +45,9 @@
       </navigator>
     </view>
   </view>
+  <view class="cash_loading" wx:if="{{skeleton_loading}}">
+    <t-skeleton theme="text" row-col="{{[{width: '30%'},{width: '80%'},{width: '50%'},{width: '30%'}]}}" animation="gradient" loading="{{skeleton_loading}}" />
+  </view>
 
   <!-- <view class="note">
     <text>
diff --git a/Pages/yishi/cash/index.wxss b/Pages/yishi/cash/index.wxss
index 90b1ddb..8f6696b 100644
--- a/Pages/yishi/cash/index.wxss
+++ b/Pages/yishi/cash/index.wxss
@@ -18,6 +18,13 @@ page{
   font-size: 30rpx;
   color: #333333;
 }
+.bankcard_loading{
+  width: calc(92vw - 40rpx);
+  margin: 0 auto;
+  background-color: #fff;
+  border-radius: 20rpx;
+  padding: 20rpx 20rpx;
+}
 .bankcard{
   width: 92vw;
   margin: 0 auto;
@@ -48,6 +55,15 @@ page{
   color: #333333;
   margin-top: 10rpx;
 }
+.cash_loading{
+  padding: 20rpx 20rpx;
+  width: calc(92vw - 40rpx);
+  margin: 20rpx auto;
+  background-color: #fff;
+  border-radius: 20rpx;
+  display: flex;
+  flex-direction: column;
+}
 .cash{
   width: 92vw;
   height: 300rpx;
diff --git a/Pages/yishi/chat/index.js b/Pages/yishi/chat/index.js
index 8d619b9..abdf7db 100644
--- a/Pages/yishi/chat/index.js
+++ b/Pages/yishi/chat/index.js
@@ -14,13 +14,13 @@ Page({
     this.setData({
       order_inquiry_id: order_inquiry_id,
     })
+    this.getInquiryMessageBasic();
   },
   onUnload() {
     console.log("chat onUnload");
   },
   onShow(){
     console.log("chat onShow");
-    this.getInquiryMessageBasic();
     console.log("app.globalData.scene from chat: ", app.globalData.scene);
   },
   $onMessageReceived(value) {
diff --git a/Pages/yishi/onlinesetup/index.js b/Pages/yishi/onlinesetup/index.js
index a71dbb7..58c5c32 100644
--- a/Pages/yishi/onlinesetup/index.js
+++ b/Pages/yishi/onlinesetup/index.js
@@ -53,9 +53,6 @@ Page({
   },
   onChange({ detail }) {
     console.log("onChange: ", detail);
-
-
-
     if(detail){
       let inquiry_price = this.data.info.inquiry_price;
       let check = this.checkPrice(inquiry_price);
@@ -105,39 +102,12 @@ Page({
     })
 
   },
-  onStepperChange(event) {
-    console.log(event.detail);
-    this.setData({ 
-      "info.work_num_day": event.detail 
-    });
-    let price = this.data.info.inquiry_price;
-    this.updateConfig(price);
-
-  },
-  onPriceChange(e){
-    console.log(e.detail);
-    let price = e.detail.value;
-    let check = this.checkPrice(price);
-    if(!check){
-      price = this.data.info.inquiry_price
-      return
-    }
-    let result = this.updateConfig(price);
-    console.log("result result result:", result);
-    result.then((res)=>{
-      console.log(res)
-      if(!res) price = this.data.info.inquiry_price
-      this.setData({
-        "info.inquiry_price": price
-      })
-    })
-  },
   myToast(message){
     Toast({
       context: this,
       selector: '#t-toast',
       message: message,
-      theme: 'success',
+      theme: 'error',
       direction: 'column',
     });
   },
@@ -159,23 +129,4 @@ Page({
       return false;
     }
   },
-  async updateConfig(price){
-    //修改医生问诊配置
-    let params = {};
-    params.inquiry_type = this.data.inquiry_type;//接诊类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药）
-    params.inquiry_mode = this.data.inquiry_mode;//接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员）
-    params.inquiry_price = price;
-    params.work_num_day = this.data.info.work_num_day;
-    const result = await api.putDoctorInquiryConfig(params).then(response => {
-     console.log(response);
-     this.myToast("修改成功");
-     return true;
-    }).catch(errors => {
-      console.error(errors);
-      return false;
-    })
-
-    console.log("updateConfig result result: ", result);
-    return result;
-  }
 })
\ No newline at end of file
diff --git a/Pages/yishi/onlinesetup/index.wxml b/Pages/yishi/onlinesetup/index.wxml
index fb84dd1..77a4a55 100644
--- a/Pages/yishi/onlinesetup/index.wxml
+++ b/Pages/yishi/onlinesetup/index.wxml
@@ -1,5 +1,5 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
-<view class="container" style="height: calc(100vh - 96rpx - 30rpx - {{height}}px);">
+<view class="container">
   <view class="switch_box">
     <view class="switch_box_top">
       <view class="switch_box_item">
@@ -23,19 +23,16 @@
   <view class="checked_box">
     <view class="price_title">价格设置</view>
     <view class="price_steup_box">
-      <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-cell size="large" url="/Pages/yishi/onlinesetupprice/index" custom-style="font-size:32rpx;" title="每日接诊数量" is-link border="{{true}}" >
+        <view class="cell_value">
+          {{info.work_num_day}}
         </view>
-      </view>
-      <view class="price_steup_box_bottom">
-        <view class="price_steup_box_bottom_title">问诊单价（元）</view>
-        <view class="price_steup_box_bottom_num"> 
-          <input class="weui-input" bindblur="onPriceChange" type="digit" value="{{ info.inquiry_price }}" placeholder="请输入问诊单价" />
-          <text class="price">元</text>
+      </van-cell>
+      <van-cell size="large" url="/Pages/yishi/onlinesetupprice/index" custom-style="font-size:32rpx;" title="问诊单价（元）" is-link border="{{false}}" >
+        <view class="cell_value">
+          {{info.inquiry_price}}元
         </view>
-      </view>
+      </van-cell>
     </view>
   </view>
 
diff --git a/Pages/yishi/onlinesetup/index.wxss b/Pages/yishi/onlinesetup/index.wxss
index 4aeee3c..17d1bd2 100644
--- a/Pages/yishi/onlinesetup/index.wxss
+++ b/Pages/yishi/onlinesetup/index.wxss
@@ -1,6 +1,8 @@
+page{
+  background-color: #F6F6F6;
+}
 .container{
   width: 100vw;
-  background-color: #F6F6F6;
   padding-top: 30rpx;
 }
 .switch_box{
@@ -59,6 +61,7 @@
   color: #333333;
 }
 .price_steup_box{
+  padding-top: 10rpx;
   display: flex;
   width: 90vw;
   height: 180rpx;
@@ -131,4 +134,7 @@
 .price{
   text-align: center;
   flex: 1;
+}
+.cell_value{
+  color: #000;
 }
\ No newline at end of file
diff --git a/Pages/yishi/onlinesetupprice/index.js b/Pages/yishi/onlinesetupprice/index.js
new file mode 100644
index 0000000..8ac15d0
--- /dev/null
+++ b/Pages/yishi/onlinesetupprice/index.js
@@ -0,0 +1,118 @@
+import { API } from './../../../utils/network/api'
+import Toast from 'tdesign-miniprogram/toast/index';
+let api = new API()
+const app = getApp()
+Page({
+
+  data: {
+    navbarData: {
+      showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
+      title: '价格设置', //导航栏 中间的标题
+    },
+    inquiry_type: 1,
+    inquiry_mode: 1,
+    info:{
+      is_open: false,
+      inquiry_price: 0,
+      work_num_day: 0
+    },
+    myprice: "",
+    config:{
+      "max_work_num_day": 30,
+      "min_inquiry_price": 0,
+      "max_inquiry_price": 0,
+      "default_inquiry_price": 0,
+      "times_number": 10,
+      "duration": 1440,
+      "system_inquiry_price": [
+        "0",
+        "5",
+        "10"
+      ]
+    }
+  },
+  onShow(){
+    let params = {};
+    params.inquiry_type = this.data.inquiry_type;//接诊类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药）
+    params.inquiry_mode = this.data.inquiry_mode;//接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员）
+    //获取医生我的账户数据
+    api.getDoctorInquiryConfig(params).then(response => {
+      console.log(response);
+      this.setData({
+        info: response.data.info,
+        config: response.data.config,
+        note: response.data.info.is_open == 1? this.data.open_note : this.data.close_note
+      })
+    }).catch(errors => {console.error(errors);})
+  },
+  onStepperChange(event) {
+    console.log(event.detail);
+    this.setData({ 
+      "info.work_num_day": event.detail 
+    });
+  },
+  onPriceChange(e){
+    console.log(e.detail);
+    let price = e.detail.value;
+    this.setData({
+      "info.inquiry_price": price
+    })
+
+  },
+  myToast(message){
+    Toast({
+      context: this,
+      selector: '#t-toast',
+      message: message,
+      theme: 'error',
+      direction: 'column',
+    });
+  },
+  checkPrice(price){
+    let value = Number(price);
+    let min = Number(this.data.config.min_inquiry_price);
+    let max = Number(this.data.config.max_inquiry_price);
+    if(value < min){
+      value = min;
+      let message = '价格不能低于' + min + '元';
+      this.myToast(message);
+      return false;
+    }else if(value >= min && value <=max ){
+      return true;
+    }else{
+      value = max;
+      let message = '价格不能高于' + max + '元';
+      this.myToast(message);
+      return false;
+    }
+  },
+  async updateConfig(){
+    let check = this.checkPrice(this.data.info.inquiry_price);
+    console.log("checkcheckcheck:", check);
+    if(!check){
+      return;
+    }
+    //修改医生问诊配置
+    let params = {};
+    params.inquiry_type = this.data.inquiry_type;//接诊类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药）
+    params.inquiry_mode = this.data.inquiry_mode;//接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员）
+    params.inquiry_price = this.data.info.inquiry_price;
+    params.work_num_day = this.data.info.work_num_day;
+    const result = await api.putDoctorInquiryConfig(params).then(response => {
+     console.log(response);
+     this.myToast("修改成功");
+     return true;
+    }).then(res => {
+      setTimeout(() => {
+        wx.navigateBack();
+        
+      }, 1000);
+    }).catch(errors => {
+      console.error(errors);
+      return false;
+    })
+
+    console.log("updateConfig result result: ", result);
+    return result;
+  }
+})
\ No newline at end of file
diff --git a/Pages/yishi/onlinesetupprice/index.json b/Pages/yishi/onlinesetupprice/index.json
new file mode 100644
index 0000000..5c24cfc
--- /dev/null
+++ b/Pages/yishi/onlinesetupprice/index.json
@@ -0,0 +1,8 @@
+{
+  "usingComponents": {
+    "te-nav-bar": "/commpents/te_navbar",
+    "van-stepper": "@vant/weapp/stepper/index",
+    "van-button": "@vant/weapp/button/index",
+    "t-toast": "tdesign-miniprogram/toast/toast"
+  }
+}
\ No newline at end of file
diff --git a/Pages/yishi/onlinesetupprice/index.wxml b/Pages/yishi/onlinesetupprice/index.wxml
new file mode 100644
index 0000000..c3bc297
--- /dev/null
+++ b/Pages/yishi/onlinesetupprice/index.wxml
@@ -0,0 +1,34 @@
+<te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
+<view class="checked_box">
+  <view class="price_steup_box">
+    <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" />
+      </view>
+    </view>
+    <view class="price_steup_box_bottom">
+      <view class="price_steup_box_bottom_title">问诊单价（元）</view>
+      <view class="price_steup_box_bottom_num"> 
+        <input class="weui-input" bindblur="onPriceChange" type="digit" value="{{ info.inquiry_price }}" placeholder="请输入问诊单价" />
+        <text class="price">元</text>
+      </view>
+    </view>
+  </view>
+</view>
+
+<view class="bottom">
+  <text class="bottom_txt">
+    提示：服务开通后，患者可以向您购买图文问诊进行问诊，接诊后需要与患者进行图文沟通
+    1、问诊价格每日仅限调整1次，每自然月仅限调整5次
+    2、单价修改后立即生效，不影响当日已生成的问诊订单
+    3、接诊后，患者可与您在{{config.duration/60}}小时内进行{{config.times_number}}个回合沟通
+    4、如有参加公益问诊活动，患者问诊订单价格以参加的公益问诊单价为准
+  </text>
+</view>
+
+<view class="go">
+  <van-button bind:click="updateConfig" color="#3CC7C0" custom-style="border-radius: 20rpx;font-size:30rpx;" type="primary" block>确定</van-button>
+</view>
+
+<t-toast id="t-toast" />
\ No newline at end of file
diff --git a/Pages/yishi/onlinesetupprice/index.wxss b/Pages/yishi/onlinesetupprice/index.wxss
new file mode 100644
index 0000000..abac331
--- /dev/null
+++ b/Pages/yishi/onlinesetupprice/index.wxss
@@ -0,0 +1,88 @@
+page{
+  background-color: #F6F6F6;
+}
+.checked_box{
+  margin-top: 30rpx;
+}
+.price_title{
+  width: 90vw;
+  margin: 20rpx auto 0 auto;
+  font-size: 32rpx;
+  margin-bottom: 20rpx;
+  /* font-family: "AlibabaPuHuiTi-2-55-Regular"; */
+  color: #333333;
+}
+.price_steup_box{
+  display: flex;
+  width: 90vw;
+  height: 180rpx;
+  margin: 0 auto;
+  border-radius: 20rpx;
+  flex-direction: column;
+  background-color: rgb(255, 255, 255);
+}
+.price_steup_box_top{
+  position: relative;
+  display: flex;
+  justify-content: space-between;
+  margin: 20rpx 20rpx 20rpx 30rpx;
+  align-items: center;
+  padding-bottom: 20rpx;
+}
+.price_steup_box_bottom{
+  position: relative;
+  display: flex;
+  justify-content: space-between;
+  margin: 0rpx 20rpx 0rpx 30rpx;
+  align-items: center;
+}
+.price_steup_box_top_title, .price_steup_box_bottom_title{
+  flex: 1;
+  font-size: 32rpx;
+  color: #333;
+}
+.price_steup_box_bottom_num{
+  flex: 1.5;
+  display: flex;
+  align-items: center;
+}
+.price_steup_box_top::after{
+  position: absolute;
+  box-sizing: border-box;
+  content: ' ';
+  pointer-events: none;
+  right: 0;
+  left: 0;
+  bottom: 0;
+  border-bottom: 1px solid var(--td-cell-border-color, var(--td-gray-color-3, #e7e7e7));
+  transform: scaleY(0.5);
+}
+.price_steup_box_top_stepper{
+  flex: 1;
+  text-align: right;
+  align-items: center;
+}
+.bottom{
+  width: 90vw;
+  margin: -20rpx auto;
+  color: #999;
+  letter-spacing: 2rpx;
+  font-size: 28rpx;
+  line-height: 40rpx;
+}
+.go{
+  position: fixed;
+  left: 50%;
+  transform: translateX(-50%);
+  bottom: 100rpx;
+  width: 90vw;
+}
+.weui-input{
+  color: red;
+  display: inline-block;
+  text-align: right;
+}
+.price{
+  text-align: center;
+  flex: 1;
+}
\ No newline at end of file
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index e94417d..1f94e02 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -291,6 +291,9 @@ Page({
       if(inquiry_type < message_inquiry_type){
         message_inquiry_type = inquiry_type;
       }
+      //去重order_inquiry_id
+      let index = this.checkOrderInquiryId(session_list[inquiry_type - 1], order_inquiry_id);
+      if(index > -1) return;
       let patient_family_data = cloudCustomDataJson.patient_family_data;
       if(patient_family_data == undefined) return;
       console.log("patient_family_data: ", patient_family_data);
@@ -335,6 +338,12 @@ Page({
       this.setData({has_data: true})
     }
   },
+  checkOrderInquiryId(list, order_inquiry_id){
+    let index = list.findIndex(item => {
+      return item.order_inquiry_id == order_inquiry_id;
+    })
+    return index;
+  },
   onTabsChange(e){
     console.log(e);
   }
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.json b/Pages/yishi/wenzhen_v2/wenzhen.json
index f8632d5..38cbf54 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.json
+++ b/Pages/yishi/wenzhen_v2/wenzhen.json
@@ -8,6 +8,8 @@
     "t-badge": "tdesign-miniprogram/badge/badge",
     "van-button": "@vant/weapp/button/index",
     "van-empty": "@vant/weapp/empty/index",
-    "van-image": "@vant/weapp/image/index"
+    "van-image": "@vant/weapp/image/index",
+    "van-tab": "@vant/weapp/tab/index",
+  "van-tabs": "@vant/weapp/tabs/index"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml
index 8de5732..ed94341 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxml
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml
@@ -26,7 +26,7 @@
   </view>
   <!-- <van-button color="#3CC7C0" custom-style="width: 92vw;margin: 0 auto;border-radius: 10rpx;" block wx:if="{{ !has_data }}">开通图文问诊</van-button> -->
 
-  <view class="tabs" wx:if="{{ has_data }}" >
+  <!-- <view class="tabs" wx:if="{{ has_data }}" >
     <t-tabs
       default-value="{{ message_inquiry_type }}"
       sticky
@@ -59,7 +59,7 @@
       </t-tab-panel>
 
       <t-tab-panel label="快速问诊" value="2" wx:if="{{data_list_2.length > 0}}">
-        <!-- 1:待支付 2:待分配 3:待接诊 4:接诊中 5:已完成 6:已结束 7:已取消 -->
+        
         <wenzhen-data 
           name="{{ item.patient_name }}"
           sex="{{ item.patient_sex==1?'男':'女' }}"
@@ -81,15 +81,6 @@
 
       </t-tab-panel>
       <t-tab-panel label="公益问诊" value="3" wx:if="{{data_list_3.length > 0}}">
-        <!-- <wenzhen-data 
-        name="王五"
-        sex="女"
-        age="19"
-        desc="VVVVVVVV"
-        status="0"
-        status_text="待接诊"
-        note="xxx"
-         /> -->
 
          <wenzhen-data 
           name="{{ item.patient_name }}"
@@ -148,8 +139,84 @@
          <van-empty description="暂无数据" wx:if="{{data_list_5.length == 0}}" />
       </t-tab-panel>
     </t-tabs>
-  </view>
+  </view> -->
 
+  <view class="tabs" wx:if="{{ has_data }}" >
+    <van-tabs active="{{ message_inquiry_type }}" 
+    color="#3CC7C0"
+    title-active-color="#3CC7C0"
+    border="{{true}}"
+    >
+      <van-tab title="在线问诊" name="1" wx:if="{{data_list_1.length > 0}}">
+        <wenzhen-data 
+          name="{{ item.patient_name }}"
+          sex="{{ item.patient_sex==1?'男':'女' }}"
+          age="{{ item.patient_age }}"
+          date="{{ item.message_send_time }}"
+          desc="{{ item.last_message_content.Text }}"
+          status="{{ item.inquiry_status }}"
+          order_inquiry_id="{{ item.order_inquiry_id }}"
+          inquiry_type="{{item.inquiry_type}}"
+          from_account="{{item.from_account}}"
+          status_text="{{ 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?'已取消':'其他' }}"
+          note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
+          message_dot="{{item.message_dot}}"
+          wx:for="{{ data_list_1 }}"
+         />
+      </van-tab>
+      <van-tab title="快速问诊" name="2" wx:if="{{data_list_2.length > 0}}">
+        <wenzhen-data 
+          name="{{ item.patient_name }}"
+          sex="{{ item.patient_sex==1?'男':'女' }}"
+          age="{{ item.patient_age }}"
+          date="{{ item.message_send_time }}"
+          desc="{{ item.last_message_content.Text }}"
+          status="{{ item.inquiry_status }}"
+          order_inquiry_id="{{ item.order_inquiry_id }}"
+          inquiry_type="{{item.inquiry_type}}"
+          from_account="{{item.from_account}}"
+          status_text="{{ 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?'已取消':'其他' }}"
+          note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
+          message_dot="{{item.message_dot}}"
+          wx:for="{{ data_list_2 }}"
+         />
+      </van-tab>
+      <van-tab title="公益问诊" name="3" wx:if="{{data_list_3.length > 0}}">
+        <wenzhen-data 
+          name="{{ item.patient_name }}"
+          sex="{{ item.patient_sex==1?'男':'女' }}"
+          age="{{ item.patient_age }}"
+          date="{{ item.message_send_time }}"
+          desc="{{ item.last_message_content.Text }}"
+          status="{{ item.inquiry_status }}"
+          order_inquiry_id="{{ item.order_inquiry_id }}"
+          inquiry_type="{{item.inquiry_type}}"
+          from_account="{{item.from_account}}"
+          status_text="{{ 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?'已取消':'其他' }}"
+          note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
+          message_dot="{{item.message_dot}}"
+          wx:for="{{ data_list_3 }}"
+         />
+      </van-tab>
+      <van-tab title="问诊购药" name="4" wx:if="{{data_list_4.length > 0}}">
+        <wenzhen-data 
+          name="{{ item.patient_name }}"
+          sex="{{ item.patient_sex==1?'男':'女' }}"
+          age="{{ item.patient_age }}"
+          date="{{ item.message_send_time }}"
+          desc="{{ item.last_message_content.Text }}"
+          status="{{ item.inquiry_status }}"
+          order_inquiry_id="{{ item.order_inquiry_id }}"
+          inquiry_type="{{item.inquiry_type}}"
+          from_account="{{item.from_account}}"
+          status_text="{{ 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?'已取消':'其他' }}"
+          note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
+          message_dot="{{item.message_dot}}"
+          wx:for="{{ data_list_4 }}"
+         />
+      </van-tab>
+    </van-tabs>
+  </view>
   <view style="height: 200rpx;"></view>
 
 
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxss b/Pages/yishi/wenzhen_v2/wenzhen.wxss
index 8814706..7dcd8a7 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxss
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxss
@@ -48,4 +48,8 @@ page{
   font-size: 24rpx;
   color: #999999;
   margin-top: 30rpx;
-}
\ No newline at end of file
+}
+.badge--t-badge {
+  vertical-align: baseline !important;
+}
+
diff --git a/Pages/yishi/wenzhenorder/index.js b/Pages/yishi/wenzhenorder/index.js
index a945e82..d547724 100644
--- a/Pages/yishi/wenzhenorder/index.js
+++ b/Pages/yishi/wenzhenorder/index.js
@@ -9,22 +9,70 @@ Page({
       title: '问诊订单', //导航栏 中间的标题
     },
     height: app.globalData.height, 
-    result: ['a'],
-    page: 1,
+    result: [],
+    order_list:[],
+    current_page: 0,
+    total: 0,
     per_page: 10,
-    order_list: [],
-    total: 0
+    last_page: 0,
+    allchecked: false,
+    select_order_length: 0,
+    select_order_amount: 0,
+    select_order_inquiry_id: []
   },
-
   onChange(event) {
+    console.log("onChange: ",event)
     this.setData({
       result: event.detail,
     });
+    this.resetSelectOrder();
+    this.setData({
+      allchecked: this.data.result.length == this.data.order_list.length
+    })
   },
-  onLoad(){
+  onAllChange(event) {
+    console.log("onAllChange: ",event)
+    this.setData({
+      allchecked: event.detail
+    })
+    if(event.detail == true){
+      this.data.order_list.forEach((item,index) => {
+        this.data.result.push(""+index);
+      })
+      this.setData({
+        result: this.data.result
+      })
+    }
+    if(event.detail == false){
+      this.setData({
+        result: []
+      })
+    }
+    this.resetSelectOrder();
+  },
+  resetSelectOrder(e){
+    let result = this.data.result;
+    let select_order_amount = 0;
+    let select_order_inquiry_id = [];
+    result.forEach(item => {
+      select_order_amount = Number(select_order_amount) + Number(this.data.order_list[item].payment_amount_total);
+      select_order_inquiry_id.push(this.data.order_list[item].order_inquiry_id);
+    })
+    this.setData({
+      select_order_length: result.length,
+      select_order_amount: select_order_amount,
+      select_order_inquiry_id: select_order_inquiry_id
+    })
+  },
+  selectOrder(e){
+    const { index } = e.currentTarget.dataset;
+    const checkbox = this.selectComponent(`.checkboxes-${index}`);
+    checkbox.toggle();
+  },
+  getDoctorWithdrawalOrder(){
     //可提现问诊订单列表
     let params = {};
-    params.page = this.data.page;
+    params.page = this.data.current_page + 1;
     params.per_page = this.data.per_page;
     api.getDoctorWithdrawalOrder(params).then(response => {
       console.log(response);
@@ -37,6 +85,27 @@ Page({
         })
       }
     }).catch(errors => {console.error(errors);})
-    
+  },
+  onShow(){
+    this.getDoctorWithdrawalOrder();
+    this.resetSelectOrder();
+  },
+  onReachBottom() {
+    console.log('===触底了！！===');
+    if(this.data.current_page < this.data.last_page){//最后一页时停止分页
+      this.getDoctorWithdrawalOrder()
+    }
+  },
+  confirmOrder(){
+    const select_order_inquiry_id = this.data.select_order_inquiry_id;
+    console.log(select_order_inquiry_id);
+    wx.showToast({
+      title: '缺少接口',
+      icon: "error",
+      duration: 1500
+    })
+    setTimeout(() => {
+      wx.navigateBack();
+    }, 2000);
   }
 })
\ No newline at end of file
diff --git a/Pages/yishi/wenzhenorder/index.json b/Pages/yishi/wenzhenorder/index.json
index 70a874f..cca90c7 100644
--- a/Pages/yishi/wenzhenorder/index.json
+++ b/Pages/yishi/wenzhenorder/index.json
@@ -6,5 +6,6 @@
     "van-checkbox-group": "@vant/weapp/checkbox-group/index",
     "van-button": "@vant/weapp/button/index",
     "van-empty": "@vant/weapp/empty/index"
-  }
+  },
+  "onReachBottomDistance": 100
 }
\ No newline at end of file
diff --git a/Pages/yishi/wenzhenorder/index.wxml b/Pages/yishi/wenzhenorder/index.wxml
index fd82797..3813818 100644
--- a/Pages/yishi/wenzhenorder/index.wxml
+++ b/Pages/yishi/wenzhenorder/index.wxml
@@ -1,35 +1,18 @@
 <!-- 问诊订单 -->
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
-<view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
+<view class="container">
   <van-checkbox-group value="{{ result }}" bind:change="onChange">
     <view class="order_list">
-        <!-- <view class="order_item">
+        <view class="order_item" wx:for="{{order_list}}">
           <view class="order_item_checkbox">
-            <van-checkbox name="a"></van-checkbox>
+            <van-checkbox name="{{index}}" class="checkboxes-{{index}}" checked-color="#3CC7C0"></van-checkbox>
           </view>
-          <view class="order_item_content">
-            <view class="order_item_content_top">快速问诊</view>
-            <view class="order_item_content_data">
-              <view class="order_id">订单编号：<text style="font-size: 30rpx;color: #666666;">2131231xxxx</text></view>
-              <view class="order_id">就诊患者：<text style="font-size: 30rpx;color: #666666;">张三三（女，25岁）</text></view>
-              <view class="order_id">接诊时间：<text style="font-size: 30rpx;color: #666666;">2022-12-30 11：23：23</text></view>
-              <view class="order_id">结束时间：<text style="font-size: 30rpx;color: #666666;">2022-12-12 11：23：23</text></view>
-              <view class="order_id">订单金额：<text style="font-size: 30rpx;color: #666666;">￥1212.00元</text></view>
-              <view class="order_id">预计收入：<text style="font-size: 30rpx;color: #666666;">￥112.00元</text></view>
-            </view>
-          </view>
-        </view> -->
-
-        <view class="order_item" wx:for="{{order_list}}" wx:for-index="idx">
-          <view class="order_item_checkbox">
-            <van-checkbox name="a{{idx}}"></van-checkbox>
-          </view>
-          <view class="order_item_content">
+          <view class="order_item_content" data-index="{{index}}" bindtap="selectOrder">
             <!-- （1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药） -->
-            <view class="order_item_content_top">{{item.inquiry_type}}</view>
+            <view class="order_item_content_top">{{item.inquiry_type==1?'专家问诊':item.inquiry_type==2?'快速问诊':item.inquiry_type==3?'公益问诊':item.inquiry_type==4?'问诊购药':'未知'}}</view>
             <view class="order_item_content_data">
-              <view class="order_id">订单编号：<text style="font-size: 30rpx;color: #666666;">{{item.inquiry_no	}}</text></view>
-              <view class="order_id">就诊患者：<text style="font-size: 30rpx;color: #666666;">{{item.patient_name}}（{{item.patient_sex}}，{{item.patient_age}}岁）</text></view>
+              <view class="order_id">订单编号：<text style="font-size: 30rpx;color: #666666;">{{item.order_inquiry_id	}}</text></view>
+              <view class="order_id">就诊患者：<text style="font-size: 30rpx;color: #666666;">{{item.patient_name}}（{{item.patient_sex==1?'男':'女'}}，{{item.patient_age}}岁）</text></view>
               <view class="order_id">接诊时间：<text style="font-size: 30rpx;color: #666666;">{{item.reception_time}}</text></view>
               <view class="order_id">结束时间：<text style="font-size: 30rpx;color: #666666;">{{item.finish_time}}</text></view>
               <view class="order_id">订单金额：<text style="font-size: 30rpx;color: #666666;">￥{{item.amount_total}}元</text></view>
@@ -37,19 +20,21 @@
             </view>
           </view>
         </view>
-        
-        <van-empty description="暂无数据" wx:if="{{order_list.length == 0}}" />
-        
     </view>
   </van-checkbox-group>
+  <van-empty description="暂无数据" wx:if="{{order_list.length == 0}}" />
 
   <view class="bottom"> 
     <view class="bottom_checkbox">
-      <van-checkbox value="{{ checked }}" bind:change="onChange">全选</van-checkbox>
+      <van-checkbox value="{{ allchecked }}" checked-color="#3CC7C0" bind:change="onAllChange">全{{allchecked?'不':''}}选</van-checkbox>
     </view>
-    <view class="bottom_content">共10个订单，金额： <text style="color: red;font-size: 30rpx;">￥302元  </text> </view>
+    <view class="bottom_content">共{{select_order_length}}个订单，金额： <text style="color: red;font-size: 30rpx;">￥{{select_order_amount}}元  </text> </view>
     <view class="bottom_btn">
-      <van-button block color="linear-gradient(310deg, #FF931A 0%, #FF931A 0%, #FCB75D 100%);">
+      <van-button 
+      bind:click="confirmOrder" 
+      disabled="{{result.length == 0}}" 
+      block 
+      color="{{result.length == 0?'#999':'linear-gradient(310deg, #FF931A 0%, #FF931A 0%, #FCB75D 100%)'}};">
         确定
       </van-button>
     </view>
diff --git a/Pages/yishi/wenzhenorder/index.wxss b/Pages/yishi/wenzhenorder/index.wxss
index 4f81925..8c2a298 100644
--- a/Pages/yishi/wenzhenorder/index.wxss
+++ b/Pages/yishi/wenzhenorder/index.wxss
@@ -1,13 +1,15 @@
-.container{
+page{
   background-color: #F4F4F4;
+}
+.container{
   width: 100vw;
-  height: 100vh;
 }
 .order_list{
   display: flex;
   width: 92vw;
   margin: 0 auto;
   flex-direction: column;
+  padding-bottom: 180rpx;
 }
 .order_item{
   display: flex;
@@ -50,16 +52,18 @@
   bottom: 0;
   width: 100vw;
   display: flex;
-  background-color: #fff;
+  background-color: rgb(255, 255, 255);
   align-items: center;
   z-index: 99;  
   padding-bottom: 50rpx;
+  height: 100rpx;
 }
 .bottom_checkbox{
-  flex: 2;
+  flex: 2.2;
   font-size: 30rpx;
   display: flex;
-  justify-content: center;
+  justify-content: left;
+  padding-left: 4vw;
 }
 .bottom_content{
   flex: 6;
@@ -71,7 +75,6 @@
   flex: 2;
   justify-content: flex-end;
   font-size: 34rpx;
-  background-color: limegreen;
 }
 
 
diff --git a/Pages/yishi/yizhensetup/index.wxml b/Pages/yishi/yizhensetup/index.wxml
index 1b0091f..f5668a6 100644
--- a/Pages/yishi/yizhensetup/index.wxml
+++ b/Pages/yishi/yizhensetup/index.wxml
@@ -23,19 +23,25 @@
   <view class="checked_box">
     <view class="price_title">价格设置</view>
     <view class="price_steup_box">
-      <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 }}" max="{{config.max_work_num_day}}" integer bind:change="onStepperChange" />
+      <van-cell size="large" custom-style="font-size:32rpx;border-radius: 20rpx;" 
+      title="每日接诊数量" is-link 
+      border="{{true}}" 
+      url="/Pages/yishi/yizhensetupprice/index"
+      >
+        <view class="num">
+          {{ info.work_num_day }}
         </view>
-      </view>
+      </van-cell>
       <view class="price_steup_box_bottom">
         <van-cell size="large" custom-style="font-size:32rpx;border-radius: 20rpx;" 
         title="问诊单价（元）" is-link 
         border="{{false}}" 
-        value="{{ amountText }}"
-        bindtap="onAmountPicker"
-        />
+        url="/Pages/yishi/yizhensetupprice/index"
+        >
+          <view class="price">
+            {{ amountText }}
+          </view>
+        </van-cell>
       </view>
     </view>
   </view>
diff --git a/Pages/yishi/yizhensetup/index.wxss b/Pages/yishi/yizhensetup/index.wxss
index 0e38bb0..592ac88 100644
--- a/Pages/yishi/yizhensetup/index.wxss
+++ b/Pages/yishi/yizhensetup/index.wxss
@@ -116,7 +116,9 @@ page{
 .t-picker__confirm,.t-class-confirm{
   color: #49B9AD !important;
 }
-.van-cell__value{
-  font-size: 32rpx !important;
-  color: red !important;
+.num{
+  color: #000;
+}
+.price{
+  color: red;
 }
\ No newline at end of file
diff --git a/Pages/yishi/yizhensetupprice/index.js b/Pages/yishi/yizhensetupprice/index.js
new file mode 100644
index 0000000..73ff6f2
--- /dev/null
+++ b/Pages/yishi/yizhensetupprice/index.js
@@ -0,0 +1,169 @@
+import { API } from './../../../utils/network/api'
+import Toast from '@vant/weapp/toast/toast';
+let api = new API()
+const app = getApp()
+Page({
+  data: {
+    navbarData: {
+      showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
+      title: '设置价格', //导航栏 中间的标题
+    },
+    height: app.globalData.height, 
+    checked: true,
+    open_note: "已开启，患者可以向您发起图文问诊",
+    close_note: "已关闭，暂不接收义诊订单",
+    note: "",
+    amountText: "选择金额（元）",
+    amountValue: "",
+    inquiry_type: 3,
+    inquiry_mode: 1,
+    amounts: [],
+    info:{
+      is_open: false,
+      inquiry_price: 0,
+      work_num_day: 0
+    },
+    config:{
+      "max_work_num_day": 30,
+      "min_inquiry_price": 0,
+      "max_inquiry_price": 0,
+      "default_inquiry_price": 0,
+      "times_number": 10,
+      "duration": 1440,
+      "system_inquiry_price": [
+        "0",
+        "5",
+        "10"
+      ]
+    }
+  },
+
+  onShow(){
+    let params = {};
+    params.inquiry_type = this.data.inquiry_type;//接诊类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药）
+    params.inquiry_mode = this.data.inquiry_mode;//接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员）
+    //获取医生我的账户数据
+    api.getDoctorInquiryConfig(params).then(response => {
+      console.log(response);
+      this.setData({
+        info: response.data.info,
+        config: response.data.config,
+      })
+      this.formatAmounts();
+      this.formatAmountValue();
+    }).then(re =>{
+      let is_open = this.data.info.is_open;
+      let note = this.data.note;
+      if(is_open == 1) note = this.data.open_note;
+      if(is_open == 0) note = this.data.close_note;
+      this.setData({
+        note: note
+      })
+    }).catch(errors => {console.error(errors);})
+  },
+  formatAmounts(){
+    let list = this.data.config.system_inquiry_price.map(item => {
+      let it = {};
+      it.label = item+" 元";
+      it.value = item;
+      return it;
+    });
+    this.setData({
+      amounts: list
+    })
+  },
+  formatAmountValue(){
+    let val = Math.trunc(this.data.info.inquiry_price);
+    let valarr = [''+val+'']
+    this.setData({
+      amountValue: valarr,
+      amountText: val+" 元"
+    })
+  },
+  onChange({ detail }) {
+    console.log("onChange: ", detail);
+    if(detail){
+      this.setData({ note: this.data.open_note });
+    }else{
+      this.setData({ note: this.data.close_note });
+    }
+    this.setData({ "info.is_open": detail });
+
+     //修改开关
+     let params = {};
+     params.inquiry_type = this.data.inquiry_type;//接诊类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药）
+     params.inquiry_mode = this.data.inquiry_mode;//接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员）
+     params.is_open = detail?1:0;
+     api.putDoctorInquiryOpen(params).then(response => {
+      console.log(response);
+    }).then(()=>{
+      if(detail){
+        wx.requestSubscribeMessage({
+          tmplIds: ['G1RIs0RYqsTQ2CuPQWalIGVet9sd_d371YtDVhfBsFg'],
+          success (res) {
+            console.log(res);//同意授权
+          }
+        })
+      }
+    }).catch(errors => {console.error(errors);})
+  },
+
+  putDoctorInquiryConfig(){
+    //修改医生问诊配置
+    let params = {};
+    params.inquiry_type = this.data.inquiry_type;//接诊类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药）
+    params.inquiry_mode = this.data.inquiry_mode;//接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员）
+    params.inquiry_price = this.data.info.inquiry_price;
+    params.work_num_day = this.data.info.work_num_day;
+    api.putDoctorInquiryConfig(params).then(response => {
+     console.log(response);
+     Toast.success("修改成功");
+     setTimeout(() => {
+      wx.navigateBack();
+     }, 1000);
+   }).catch(errors => {console.error(errors);})
+  },
+  onStepperChange(event) {
+    console.log(event.detail);
+    this.setData({ 
+      "info.work_num_day": event.detail 
+    });
+  },
+
+  onAmountPicker() {
+    this.setData({ amountVisible: true });
+  },
+
+  onColumnChange(e) {
+    console.log('picker pick:', e);
+  },
+
+  onPickerChange(e) {
+    console.log(e);
+    const { key } = e.currentTarget.dataset;
+    const { value } = e.detail;
+    console.log('picker change:', e.detail);
+    this.setData({
+      [`${key}Visible`]: false,
+      [`${key}Value`]: value,
+      [`${key}Text`]: value+' 元',
+      "info.inquiry_price": value[0]
+    });
+
+  },
+
+  onPickerCancel(e) {
+    const { key } = e.currentTarget.dataset;
+    console.log(e, '取消');
+    console.log('picker1 cancel:');
+    this.setData({
+      [`${key}Visible`]: false,
+    });
+  },
+  go(e){
+    let url = e.currentTarget.dataset.url;
+    wx.switchTab({
+      url: url
+    })
+  }
+})
\ No newline at end of file
diff --git a/Pages/yishi/yizhensetupprice/index.json b/Pages/yishi/yizhensetupprice/index.json
new file mode 100644
index 0000000..7ebfd9b
--- /dev/null
+++ b/Pages/yishi/yizhensetupprice/index.json
@@ -0,0 +1,13 @@
+{
+  "component": true,
+  "usingComponents": {
+    "te-nav-bar": "/commpents/te_navbar",
+    "t-picker": "tdesign-miniprogram/picker/picker",
+    "t-picker-item": "tdesign-miniprogram/picker-item/picker-item",
+    "van-cell": "@vant/weapp/cell/index",
+    "van-cell-group": "@vant/weapp/cell-group/index",
+    "van-stepper": "@vant/weapp/stepper/index",
+    "van-button": "@vant/weapp/button/index",
+    "van-toast": "@vant/weapp/toast/index"
+  }
+}
\ No newline at end of file
diff --git a/Pages/yishi/yizhensetupprice/index.wxml b/Pages/yishi/yizhensetupprice/index.wxml
new file mode 100644
index 0000000..6e335cc
--- /dev/null
+++ b/Pages/yishi/yizhensetupprice/index.wxml
@@ -0,0 +1,49 @@
+<te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
+<view class="container">
+  <view class="checked_box">
+    <view class="price_steup_box">
+      <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 }}" max="{{config.max_work_num_day}}" integer bind:change="onStepperChange" />
+        </view>
+      </view>
+      <view class="price_steup_box_bottom">
+        <van-cell size="large" custom-style="font-size:32rpx;border-radius: 20rpx;" 
+        title="问诊单价（元）" is-link 
+        border="{{false}}" 
+        value="{{ amountText }}"
+        bindtap="onAmountPicker"
+        />
+      </view>
+    </view>
+  </view>
+
+  <view class="bottom">
+    <text class="bottom_txt">
+      提示：服务开通后，患者可以通过公益问诊找到您，增加您的接诊量。
+      1、公益问诊价格为平台统一设定的几个，需要您自己选择单价；
+      2、接诊后{{config.duration/60}}小时内和患者{{config.times_number}}个回合沟通。
+    </text>
+  </view>
+
+  <view class="go">
+    <van-button color="#3CC7C0" bind:click="putDoctorInquiryConfig" custom-style="border-radius: 20rpx;font-size:30rpx;" type="primary" block>确定</van-button>
+  </view>
+
+  <t-picker
+  visible="{{amountVisible}}"
+  value="{{amountValue}}"
+  data-key="amount"
+  title="选择金额"
+  cancelBtn="取消"
+  confirmBtn="确认"
+  bindchange="onPickerChange"
+  bindpick="onColumnChange"
+  bindcancel="onPickerCancel"
+>
+  <t-picker-item options="{{amounts}}"></t-picker-item>
+</t-picker>
+
+<van-toast id="van-toast" />
+</view>
\ No newline at end of file
diff --git a/Pages/yishi/yizhensetupprice/index.wxss b/Pages/yishi/yizhensetupprice/index.wxss
new file mode 100644
index 0000000..8d256c4
--- /dev/null
+++ b/Pages/yishi/yizhensetupprice/index.wxss
@@ -0,0 +1,123 @@
+page{
+  background-color: #F6F6F6;
+}
+.container{
+  width: 100vw;
+  padding-top: 30rpx;
+}
+.switch_box{
+  display: flex;
+  flex-direction: column;
+  width: 90vw;
+  /* height: 500rpx; */
+  border-radius: 20rpx;
+  margin: 30rpx auto;
+  background-color: rgb(255, 255, 255);
+}
+.switch_box_top{
+  position: relative;
+  display: flex;
+  /* height: 300rpx; */
+  flex-direction: column;
+  padding: 30rpx 30rpx 20rpx 30rpx;
+}
+.switch_box_top::after{
+  position: absolute;
+  box-sizing: border-box;
+  content: ' ';
+  pointer-events: none;
+  right: 0;
+  left: 32rpx;
+  bottom: 0;
+  border-bottom: 1px solid var(--td-cell-border-color, var(--td-gray-color-3, #e7e7e7));
+  transform: scaleY(0.5);
+}
+.switch_box_item{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.switch_box_item_name{
+  flex: 1;
+  font-size: 32rpx;
+}
+.switch_box_item_btn{
+  flex: 1;
+  text-align: right;
+}
+.switch_box_note{
+  color: #999999;
+  font-size: 24rpx;
+}
+.help{
+  margin-bottom: 20rpx;
+}
+.price_title{
+  width: 90vw;
+  margin: 0 auto;
+  font-size: 32rpx;
+  margin-bottom: 20rpx;
+  /* font-family: "AlibabaPuHuiTi-2-55-Regular"; */
+  color: #333333;
+}
+.price_steup_box{
+  display: flex;
+  width: 90vw;
+  margin: 0 auto;
+  border-radius: 20rpx;
+  flex-direction: column;
+  background-color: rgb(255, 255, 255);
+}
+.price_steup_box_top{
+  position: relative;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: var(--cell-vertical-padding,20rpx) var(--cell-horizontal-padding,32rpx);
+}
+
+.price_steup_box_top_title, .price_steup_box_bottom_title{
+  flex: 1;
+  font-size: 32rpx;
+  color: #333;
+}
+.price_steup_box_top::after{
+  position: absolute;
+  box-sizing: border-box;
+  content: ' ';
+  pointer-events: none;
+  right: 0;
+  left: 0;
+  bottom: 0;
+  border-bottom: 1px solid var(--td-cell-border-color, var(--td-gray-color-3, #e7e7e7));
+  transform: scaleY(0.5);
+}
+.price_steup_box_top_stepper{
+  flex: 1;
+  text-align: right;
+  align-items: center;
+}
+.bottom{
+  width: 90vw;
+  margin: -20rpx auto;
+  color: #999;
+  letter-spacing: 2rpx;
+  font-size: 28rpx;
+  line-height: 40rpx;
+}
+
+.go{
+  position: fixed;
+  left: 50%;
+  transform: translateX(-50%);
+  bottom: 100rpx;
+  width: 90vw;
+}
+
+.t-picker__confirm,.t-class-confirm{
+  color: #49B9AD !important;
+}
+.van-cell__value{
+  font-size: 32rpx !important;
+  color: red !important;
+}
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js
index a0743cd..224013c 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.js
@@ -40,6 +40,10 @@ Component({
     has_emoji:{
       type: Boolean,
       value: false,
+    },
+    baseInfo: {
+      type: Object,
+      value: {}
     }
   },
 
@@ -317,10 +321,12 @@ Component({
         cloudCustomDataJson = JSON.parse(cloudCustomData);
       }
       let message_rounds = 0;
-      let patient_family_data = "";
+      let patient_family_data = {};
+      patient_family_data.patient_name = this.data.baseInfo.patient_family_name;
+      patient_family_data.patient_sex = this.data.baseInfo.patient_family_sex;
+      patient_family_data.patient_age = this.data.baseInfo.patient_family_age;
       if(cloudCustomDataJson){
         message_rounds = cloudCustomDataJson.message_rounds;
-        patient_family_data = cloudCustomDataJson.patient_family_data
       }
 
       const mycloudCustomData = JSON.stringify({
@@ -577,10 +583,12 @@ Component({
         cloudCustomDataJson = JSON.parse(cloudCustomData);
       }
       let message_rounds = 0;
-      let patient_family_data = "";
+      let patient_family_data = {};
+      patient_family_data.patient_name = this.data.baseInfo.patient_family_name;
+      patient_family_data.patient_sex = this.data.baseInfo.patient_family_sex;
+      patient_family_data.patient_age = this.data.baseInfo.patient_family_age;
       if(cloudCustomDataJson){
         message_rounds = cloudCustomDataJson.message_rounds;
-        patient_family_data = cloudCustomDataJson.patient_family_data
       }
       
       const to = this.getToAccount();
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxss b/TUIKit/components/TUIChat/components/MessageInput/index.wxss
index ecb46f7..9e3baa6 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxss
@@ -82,7 +82,7 @@
     display: flex;
     flex-wrap: wrap;
     width: 100vw;
-    /* height: 450rpx; */
+    height: 100px;
     margin-left: 14rpx;
     margin-right: 14rpx;
 }
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index b942ae1..5427cd5 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -149,7 +149,6 @@ Component({
     },
     // 获取消息列表
     getMessageList(conversation) {
-
       console.log("getMessageListgetMessageListgetMessageList")
       if (!this.data.isCompleted) {
         wx.$TUIKit.getMessageList({
@@ -166,8 +165,9 @@ Component({
             // console.log(item)
             //去除自定义消息
             // if(HMM_type == "TIMCustomElem") return;
-            let show_avatar = this.checkShowAvatar(item);
-            item.show_avatar = show_avatar;
+            if(!this.checkShowAvatar(item)){
+              item.no_avatar = true;
+            }
             
             HMM_messageList_del.push(item);
           })
@@ -182,6 +182,7 @@ Component({
             this.getMessageList(conversation);
           }
           this.$handleMessageRender(this.data.messageList, messageList);
+        }).then(res => {
         });
       }
     },
@@ -247,7 +248,9 @@ Component({
     // 收到的消息
     $onMessageReceived(value) {
       const message = value.data[0];
-      message.show_avatar = this.checkShowAvatar(message);
+      if(!this.checkShowAvatar(message)){
+        message.no_avatar = true;
+      }
       wx.$TUIKit.setMessageRead({ conversationID: this.data.conversation.conversationID }).then(() => {
         logger.log('| MessageList | setMessageRead | ok');
       });
@@ -271,7 +274,7 @@ Component({
             });
           } catch (error) {
           }
-          if ((item.type === MESSAGE_TYPE_TEXT.TIM_CUSTOM_ELEM && this.data.typingMessage.businessID !== BUSINESS_ID_TEXT.USER_TYPING)) {
+          if ((item.type === MESSAGE_TYPE_TEXT.TIM_CUSTOM_ELEM && this.data.typingMessage.businessID !== BUSINESS_ID_TEXT.USER_TYPING) || item.type !== MESSAGE_TYPE_TEXT.TIM_CUSTOM_ELEM) { 
             this.data.showNewMessageCount.push(message);
             this.setData({
               showNewMessageCount: this.data.showNewMessageCount,
@@ -325,9 +328,9 @@ Component({
       console.log("自己的消息上屏 updateMessageList: ", message);
       console.log(message);
       //自己的消息有头像
-      message.show_avatar = this.checkShowAvatar(message);
-      console.log(message.show_avatar)
-      console.log(message.flow)
+      if(!this.checkShowAvatar(message)){
+        message.no_avatar = true;
+      }
       if (message.conversationID !== this.data.conversation.conversationID) return;
       wx.$TUIKit.setMessageRead({ conversationID: this.data.conversation.conversationID }).then(() => {
         logger.log('| MessageList | setMessageRead | ok');
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxml b/TUIKit/components/TUIChat/components/MessageList/index.wxml
index 11b4eeb..5b271b1 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageList/index.wxml
@@ -34,7 +34,7 @@
             </view>
             <TipMessage  wx:if="{{item.type === 'TIMGroupTipElem'}}" message="{{item}}"/>
             <view  wx:if="{{item.type !== 'TIMGroupTipElem'}}"   class="{{item.flow === 'out' ? 't-self-message':'t-recieve-message'}}" >
-                <image class="t-message-avatar" wx:if="{{item.flow === 'in' && item.show_avatar }}" src="{{item.avatar || 'https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/default_photo.png'}}" data-value="{{item}}" bindtap="getMemberProfile" />
+                <image class="t-message-avatar" wx:if="{{item.flow === 'in' && !item.no_avatar }}" src="{{item.avatar || 'https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/default_photo.png'}}" data-value="{{item}}" bindtap="getMemberProfile" />
                 <view class="read-receipts" wx:if="{{conversation.type === 'C2C' && item.flow==='out' }}">
                     <!-- <view wx:if="{{item.isPeerRead}}" >已读</view>
                     <view wx:else>未读</view> -->
@@ -53,7 +53,7 @@
                     <MergerMessage wx:if="{{item.type === 'TIMRelayElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}"/>
                 </view>
                 
-                <image class="t-message-avatar" wx:if="{{item.flow === 'out' && item.show_avatar }}"  src="{{item.avatar || 'https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/default_photo.png'}}"  data-value="{{item}}" bindtap="getMemberProfile"/>
+                <image class="t-message-avatar" wx:if="{{item.flow === 'out' && !item.no_avatar }}"  src="{{item.avatar || 'https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/default_photo.png'}}"  data-value="{{item}}" bindtap="getMemberProfile"/>
             </view>
         </view>
     </view>
diff --git a/TUIKit/components/TUIChat/index.js b/TUIKit/components/TUIChat/index.js
index 2658ad2..da0ed79 100644
--- a/TUIKit/components/TUIChat/index.js
+++ b/TUIKit/components/TUIChat/index.js
@@ -78,28 +78,9 @@ Component({
           showTips: true,
         });
       }
-
-      let rect = null;
-      if (wx.getMenuButtonBoundingClientRect) {
-          rect = wx.getMenuButtonBoundingClientRect();
-      }
-      console.log("rect: ", rect)
-      wx.getSystemInfo({
-        success: (res) => {
-            const { statusBarHeight } = wx.getSystemInfoSync();
-            console.log("statusBarHeight: ", statusBarHeight);
-            console.log("${rect.height}px: ", `${rect.height}`);
-            let height = Number.parseInt(statusBarHeight) + Number.parseInt(`${rect.height}`) + 50;
-           this.setData({
-            navbar_height: height
-           })
-        },
-        fail: (err) => {
-            console.error('navbar 获取系统信息失败', err);
-        },
-    });
-
+      this.getNavbarHeight()
     },
+    
     ready() {
       //修改为组件传值
       // this.getInquiryMessageBasic()
@@ -157,6 +138,30 @@ Component({
    * 组件的方法列表
    */
   methods: {
+    getNavbarHeight(addHeight){
+      let rect = null;
+      if (wx.getMenuButtonBoundingClientRect) {
+          rect = wx.getMenuButtonBoundingClientRect();
+      }
+      console.log("rect: ", rect)
+      wx.getSystemInfo({
+        success: (res) => {
+            const { statusBarHeight } = wx.getSystemInfoSync();
+            console.log("statusBarHeight: ", statusBarHeight);
+            console.log("${rect.height}px: ", `${rect.height}`);
+            let height = Number.parseInt(statusBarHeight) + Number.parseInt(`${rect.height}`) + 50;
+            if(addHeight){
+              height = height + addHeight
+            }
+            this.setData({
+              navbar_height: height
+            })
+        },
+        fail: (err) => {
+            console.error('navbar 获取系统信息失败', err);
+        },
+      });
+    },
     //结束问诊
     putDoctorInquiryFinish() {
       this.setData({
@@ -230,6 +235,7 @@ Component({
     sendMessage(event) {
       // 将自己发送的消息写进消息列表里面
       this.selectComponent('#MessageList').updateMessageList(event.detail.message);
+      this.getNavbarHeight();
     },
     showMessageErrorImage(event) {
       this.selectComponent('#MessageList').sendMessageError(event);
@@ -273,10 +279,13 @@ Component({
         this.setData({
           input_area_style: "position: absolute;  bottom: 30px;"
         })
+        this.getNavbarHeight(100);
+        this.selectComponent('#MessageList').handleJumpNewMessage();
       }else{
         this.setData({
-          input_area_style: ""
+          input_area_style: "",
         })
+        this.getNavbarHeight();
       }
     },
     // 监听键盘，获取焦点时将输入框推到键盘上方
diff --git a/TUIKit/components/TUIChat/index.wxml b/TUIKit/components/TUIChat/index.wxml
index ab2caac..090e8c3 100644
--- a/TUIKit/components/TUIChat/index.wxml
+++ b/TUIKit/components/TUIChat/index.wxml
@@ -32,7 +32,7 @@
   </view>
   <view class="input-area" style="{{input_area_style}}" wx:if="{{baseInfo.inquiry_status == 4}}">
     <view class="message-input" style="{{viewData.style}}" wx:if="{{showChat}}">
-      <MessageInput bind:myhandleExtensions="myhandleExtensions" id="MessageInput" inquiry_type="{{inquiry_type}}" order_inquiry_id="{{order_inquiry_id}}" conversation="{{conversation}}" hasCallKit="{{hasCallKit}}" bind:sendMessage="sendMessage" bind:downKeysBoards="downKeysBoards" bind:pullKeysBoards="pullKeysBoards" bind:showMessageErrorImage="showMessageErrorImage" 
+      <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>
diff --git a/app.js b/app.js
index a40bc9c..a85b98d 100644
--- a/app.js
+++ b/app.js
@@ -105,6 +105,7 @@ App({
   
       });
   
+      wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady);
       wx.$TUIKit.setLogLevel(3);//设置日志级别
       wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady, this);
     }).then(()=>{
@@ -116,8 +117,11 @@ App({
       if(!wenzhen_info) wx.setStorageSync(userID+'_wenzhen_info', "");
       if(!my_info) wx.setStorageSync(userID+'_my_info', "");
     }).catch(errors => {console.error(errors);})
-
-    
+  },
+  imLogout(){
+    if(wx.$TUIKit){
+      wx.$TUIKit.logout();
+    }
   },
   onSDKReady(){
     console.log("onSDKReady from app.js");
diff --git a/app.json b/app.json
index a1bbedb..887ed38 100644
--- a/app.json
+++ b/app.json
@@ -51,7 +51,9 @@
     "Pages/yishi/addzhenduan/index",
     "Pages/yishi/wenzhen_v2/wenzhen",
     "Pages/webpage/index",
-    "Pages/kickedout/index"
+    "Pages/kickedout/index",
+    "Pages/yishi/onlinesetupprice/index",
+    "Pages/yishi/yizhensetupprice/index"
   ],
   "window": {
     "navigationBarBackgroundColor": "#ffffff",
diff --git a/commpents/myprofile/index.js b/commpents/myprofile/index.js
index 2f4a19e..ad33e7e 100644
--- a/commpents/myprofile/index.js
+++ b/commpents/myprofile/index.js
@@ -605,9 +605,13 @@ Component({
       this.triggerEvent('showPageMeta');
     },
     onZhuanChangVisibleChange(e) {
+      console.log("onZhuanChangVisibleChange:", e.detail.visible)
       this.setData({
         zhuanchang_show: e.detail.visible,
       });
+      if(e.detail.visible == false){
+        this.triggerEvent('hidePageMeta');
+      }
     },
     onshowJianJieNote(e){
       e.detail // 自定义组件触发事件时提供的 detail 对象
diff --git a/commpents/wenzhen_data/index.wxss b/commpents/wenzhen_data/index.wxss
index dbcf891..3b54795 100644
--- a/commpents/wenzhen_data/index.wxss
+++ b/commpents/wenzhen_data/index.wxss
@@ -2,7 +2,7 @@
   background-color: #fff;
   display: flex;
   flex-direction: column;
-  margin-top: 20rpx;
+  margin-bottom: 20rpx;
 }
 .content_1,.content_3,.content_2{
   display: flex;
@@ -16,6 +16,8 @@
 .name{
   font-size: 30rpx;
   color: #666666;
+  height: 50rpx;
+  line-height: 50rpx;
 }
 .date{
   font-size: 30rpx;
@@ -72,4 +74,14 @@
 .dialog_confirm_btn{
   border-top: 1px solid #E9E9E9;
   color: #3CC7C0;
+}
+.t-badge__content-text {
+  line-height: 70rpx !important;
+  background-color: #E34D59 !important;
+}
+.t-badge{
+  background-color: burlywood !important;
+}
+.t-badge__content,.t-class-content{
+  background-color: crimson !important;
 }
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index b983689..922bbc7 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -10,7 +10,7 @@
       "list": [
         {
           "name": "",
-          "pathName": "Pages/kickedout/index",
+          "pathName": "Pages/index/index",
           "query": "",
           "launchMode": "default",
           "scene": null

From 3f40c4c237741680103847f1a3cf1151b9d7fbda Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Sat, 8 Apr 2023 09:51:45 +0800
Subject: [PATCH 20/83] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/index/index.js                          |   6 +-
 Pages/yaoshi/home/home.wxml                   |  43 ++--
 Pages/yaoshi/home/home.wxss                   |  18 +-
 Pages/yaoshi/prescription/prescription.wxss   |   5 +-
 Pages/yishi/appraise/index.js                 |  11 +-
 Pages/yishi/appraise/index.json               |   8 +-
 Pages/yishi/appraise/index.wxml               |  63 +++++-
 Pages/yishi/appraise/index.wxss               |  51 +++--
 Pages/yishi/cash/index.js                     |  54 +++--
 Pages/yishi/cash/index.wxml                   |   2 +-
 Pages/yishi/chufangsetup/index.wxml           |   6 +-
 Pages/yishi/chufangsetup/index.wxss           |   2 +-
 Pages/yishi/identity/index.wxml               |   2 +-
 Pages/yishi/index/index.js                    |  36 +++-
 Pages/yishi/index/index.json                  |   5 +-
 Pages/yishi/index/index.wxml                  |  30 ++-
 Pages/yishi/index/index.wxss                  |   7 +-
 Pages/yishi/kuaisusetup/index.js              |   4 +-
 Pages/yishi/kuaisusetup/index.wxml            |   6 +-
 Pages/yishi/my/index.js                       |   7 +-
 Pages/yishi/my/index.json                     |   4 +-
 Pages/yishi/my/index.wxml                     |   2 +-
 Pages/yishi/my/index.wxss                     |   7 +-
 Pages/yishi/myinfo/index.js                   |   2 +
 Pages/yishi/onlinechufang/index.wxml          |   2 +-
 Pages/yishi/onlinechufang/index.wxss          |   7 +-
 Pages/yishi/onlinesetup/index.wxml            |  10 +-
 Pages/yishi/onlinesetupprice/index.wxml       |  10 +-
 Pages/yishi/orderdetail/index.wxml            |   6 +-
 Pages/yishi/service_notice/index.js           | 112 ++++++++++-
 Pages/yishi/service_notice/index.json         |   3 +-
 Pages/yishi/service_notice/index.wxml         |  82 +++-----
 Pages/yishi/service_notice/index.wxss         |  27 +++
 Pages/yishi/system_notice/index.js            |  15 ++
 Pages/yishi/system_notice/index.wxml          |   2 +-
 Pages/yishi/wenzhen_v2/wenzhen.js             | 170 +++++++++++++---
 Pages/yishi/wenzhen_v2/wenzhen.json           |   3 +-
 Pages/yishi/wenzhen_v2/wenzhen.wxml           | 139 ++++++++++++-
 Pages/yishi/wenzhen_v2/wenzhen.wxss           |  85 ++++++++
 Pages/yishi/wenzhenorder/index.js             |  12 +-
 Pages/yishi/wenzhenorder/index.wxml           |   6 +-
 Pages/yishi/wenzhenorderV2/index.js           | 105 ++++++++++
 Pages/yishi/wenzhenorderV2/index.json         |  11 +
 Pages/yishi/wenzhenorderV2/index.wxml         |  23 +++
 Pages/yishi/wenzhenorderV2/index.wxss         |  80 ++++++++
 Pages/yishi/yizhensetup/index.js              |   4 +-
 Pages/yishi/yizhensetup/index.wxml            |   6 +-
 Pages/yishi/yizhensetupprice/index.js         |   4 +-
 Pages/yishi/yizhensetupprice/index.wxml       |   6 +-
 Pages/yishi/zhiye_identity/index.wxml         |   6 +-
 .../MessageElements/CustomMessage/index.js    |   2 +-
 .../MessageElements/CustomMessage/index.wxml  |   2 +-
 .../MessageElements/TextMessage/index.wxss    |   2 +
 .../TUIChat/components/MessageInput/index.js  |  16 +-
 .../components/MessageInput/index.wxml        |   2 +-
 .../TUIChat/components/MessageList/index.js   |   2 +
 TUIKit/components/TUIChat/index.wxml          |   2 +-
 TUIKit/components/TUIChat/index.wxss          |   4 +-
 app.js                                        | 190 ++++++++++++++----
 app.json                                      |   3 +-
 commpents/appraise_data/index.wxml            |   2 +-
 commpents/appraise_data/index.wxss            |   4 +
 commpents/myprofile/index.js                  |   9 +-
 commpents/myprofile/index.wxml                |  12 +-
 commpents/te_navbar/index.js                  |  14 +-
 commpents/wenzhen_data/index.wxml             |   2 +-
 custom-tab-bar/index.js                       |  15 +-
 .../tdesign-miniprogram/navbar/navbar.js      |   6 -
 utils/network/api.js                          |   6 +-
 69 files changed, 1274 insertions(+), 338 deletions(-)
 create mode 100644 Pages/yishi/wenzhenorderV2/index.js
 create mode 100644 Pages/yishi/wenzhenorderV2/index.json
 create mode 100644 Pages/yishi/wenzhenorderV2/index.wxml
 create mode 100644 Pages/yishi/wenzhenorderV2/index.wxss

diff --git a/Pages/index/index.js b/Pages/index/index.js
index aa18410..0757550 100644
--- a/Pages/index/index.js
+++ b/Pages/index/index.js
@@ -18,14 +18,14 @@ Page({
   goCheck(e){
     console.log(e);
     let usertype = e.currentTarget.dataset.usertype;
+    let url = e.currentTarget.dataset.url;
+    wx.setStorageSync('usertype', usertype);
+    wx.setStorageSync('next_url', url);
     if(usertype == 2){
       app.imInit();
     }else{
       app.imLogout();
     }
-    let url = e.currentTarget.dataset.url;
-    wx.setStorageSync('usertype', usertype);
-    wx.setStorageSync('next_url', url);
     let token = wx.getStorageSync('AUTH_TOKEN_'+usertype);
     console.log(token);
     if(token){
diff --git a/Pages/yaoshi/home/home.wxml b/Pages/yaoshi/home/home.wxml
index bbb1af0..619ca77 100644
--- a/Pages/yaoshi/home/home.wxml
+++ b/Pages/yaoshi/home/home.wxml
@@ -15,33 +15,36 @@
   <view class="main content">
     <van-tabs active="{{ active }}" color="{{ active_color }}" bind:change="onChange">
       <van-tab title="待审核处方">
-        <view class="item" wx:for="{{data_list_0}}">
-          <view class="item_txt">
-            <view class="pre_content">处方订单号：{{item.prescription_code}}</view>
-            <view class="end_content">
-              <!-- <navigator url="/Pages/yaoshi/medicalrecord/medicalrecord" open-type="navigate" hover-class="other-navigator-hover">
-                <van-button type="primary" size="small">查看病例</van-button>
-              </navigator> -->
+        <view class="item_list" wx:if="{{data_list_0.length>0}}">
+          <view class="item" wx:for="{{data_list_0}}">
+            <view class="item_txt">
+              <view class="pre_content">处方订单号：{{item.prescription_code}}</view>
+              <view class="end_content">
+                <!-- <navigator url="/Pages/yaoshi/medicalrecord/medicalrecord" open-type="navigate" hover-class="other-navigator-hover">
+                  <van-button type="primary" size="small">查看病例</van-button>
+                </navigator> -->
+              </view>
             </view>
-          </view>
 
-          <view class="item_txt">
-            <view class="pre_content">开方时间：{{item.created_at}}</view>
-            <view class="end_content" bindtap="go" data-url="/Pages/yaoshi/medicalrecord/medicalrecord?order_inquiry_id={{item.order_inquiry_id	}}&order_prescription_id={{item.order_prescription_id}}">
-              <van-button type="primary" color="#ec871e" size="small">查看病例</van-button>
+            <view class="item_txt">
+              <view class="pre_content">开方时间：{{item.created_at}}</view>
+              <view class="end_content" bindtap="go" data-url="/Pages/yaoshi/medicalrecord/medicalrecord?order_inquiry_id={{item.order_inquiry_id	}}&order_prescription_id={{item.order_prescription_id}}">
+                <van-button type="primary" color="#ec871e" size="small">查看病例</van-button>
+              </view>
             </view>
-          </view>
 
-          <view class="item_txt">
-            <view class="pre_content">{{item.patient_name}}/{{item.patient_sex==1?'男':'女'}}/{{item.patient_age}}岁</view>
-            <view class="end_content" bindtap="go" data-url="/Pages/yaoshi/prescription/prescription?order_prescription_id={{item.order_prescription_id}}">
-              <van-button type="primary" color="linear-gradient(to bottom, #5EA8D5, #63CFEA)" size="small">去审方</van-button>
+            <view class="item_txt">
+              <view class="pre_content">{{item.patient_name}}/{{item.patient_sex==1?'男':'女'}}/{{item.patient_age}}岁</view>
+              <view class="end_content" bindtap="go" data-url="/Pages/yaoshi/prescription/prescription?order_prescription_id={{item.order_prescription_id}}">
+                <van-button type="primary" color="linear-gradient(to bottom, #5EA8D5, #63CFEA)" size="small">去审方</van-button>
+              </view>
             </view>
           </view>
         </view>
         <van-empty description="暂无数据" wx:if="{{data_list_0.length == 0}}" />
       </van-tab>
       <van-tab title="已审核处方">
+        <view class="item_list" wx:if="{{data_list_1.length>0}}">
         <view class="item" wx:for="{{data_list_1}}">
           <view class="item_txt">
             <view class="pre_content">处方订单号：{{item.prescription_code}}</view>
@@ -62,9 +65,11 @@
             </view>
           </view>
         </view>
+        </view>
         <van-empty description="暂无数据" wx:if="{{data_list_1.length == 0}}" />
       </van-tab>
       <van-tab title="驳回处方">
+        <view class="item_list" wx:if="{{data_list_2.length>0}}">
         <view class="item" wx:for="{{data_list_2}}">
           <view class="item_txt">
             <view class="pre_content">处方订单号：{{item.prescription_code}}</view>
@@ -85,10 +90,11 @@
             </view>
           </view>
         </view>
-
+        </view>
         <van-empty description="暂无数据" wx:if="{{data_list_2.length == 0}}" />
       </van-tab>
       <van-tab title="不通过">
+        <view class="item_list" wx:if="{{data_list_3.length>0}}">
         <view class="item" wx:for="{{data_list_3}}">
           <view class="item_txt">
             <view class="pre_content">处方订单号：{{item.prescription_code}}</view>
@@ -109,6 +115,7 @@
             </view>
           </view>
         </view>
+        </view>
         <van-empty description="暂无数据" wx:if="{{data_list_3.length == 0}}" />
       </van-tab>
     </van-tabs>
diff --git a/Pages/yaoshi/home/home.wxss b/Pages/yaoshi/home/home.wxss
index 7aa8dee..5203b44 100644
--- a/Pages/yaoshi/home/home.wxss
+++ b/Pages/yaoshi/home/home.wxss
@@ -69,10 +69,24 @@ page{
 .avatar-example--medium:not(:last-child) {
   margin-right: 96rpx;
 }
+.van-tabs__nav{
+  border-radius: 20rpx !important;
+}
+.item_list{
+  padding-bottom: 100rpx;
+  background-color: #F4F5F7;
+  border-radius: 20rpx;
+}
+.item:last-child{
+  border-bottom-left-radius: 20rpx;
+  border-bottom-right-radius: 20rpx;
+}
 .item{
   border-top: solid rgb(187, 185, 185) 1rpx;
-  width: 95%;
-  margin: 10rpx auto;
+  width: 100%;
+  margin: 0 auto;
+  background-color: #fff;
+  padding: 20rpx 0;
 }
 .item_txt{
   display: flex;
diff --git a/Pages/yaoshi/prescription/prescription.wxss b/Pages/yaoshi/prescription/prescription.wxss
index 4a325df..a4446ba 100644
--- a/Pages/yaoshi/prescription/prescription.wxss
+++ b/Pages/yaoshi/prescription/prescription.wxss
@@ -24,7 +24,7 @@ page{
   display:inline-block;
 }
 .pop{
-  width: 80vw;
+  width: 90vw;
   margin-bottom: 30rpx;
 }
 .pop_button{
@@ -55,3 +55,6 @@ page{
   left:125rpx;
   bottom:126rpx;
 }
+.van-cell__value{
+  flex: 1.2 !important;
+}
\ No newline at end of file
diff --git a/Pages/yishi/appraise/index.js b/Pages/yishi/appraise/index.js
index a52f6c5..9a0b2de 100644
--- a/Pages/yishi/appraise/index.js
+++ b/Pages/yishi/appraise/index.js
@@ -44,6 +44,7 @@ Page({
     this.setData({
       doctor_id: option.doctor_id
     })
+
   },
   onShow(){ 
     console.log("onShow");
@@ -51,21 +52,15 @@ Page({
   },
   onTabsChange(e){
     console.log(e);
-    let list_name = "appraise_list_" + e.detail.value;
+    let list_name = "appraise_list_" + e.detail.name;
     this.setData({
-      evaluation_type: e.detail.value,
+      evaluation_type: e.detail.name,
       current_page: 0,
       last_page: 0,
       [list_name]: []
     })
     this.getDoctorEvaluationList()
   },
-  onTabsClick(e){
-    console.log(e);
-  },
-  onStickyScroll(e){
-    return 1;
-  },
   getDoctorEvaluationList(){
     //获取评价列表
     let params = {};
diff --git a/Pages/yishi/appraise/index.json b/Pages/yishi/appraise/index.json
index 32a4098..01214cc 100644
--- a/Pages/yishi/appraise/index.json
+++ b/Pages/yishi/appraise/index.json
@@ -3,9 +3,11 @@
   "usingComponents": {
     "te-nav-bar": "/commpents/te_navbar",
     "appraise-data": "/commpents/appraise_data/index",
-    "t-tabs": "tdesign-miniprogram/tabs/tabs",
-    "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel",
-    "van-empty": "@vant/weapp/empty/index"
+    "van-empty": "@vant/weapp/empty/index",
+    "van-tab": "@vant/weapp/tab/index",
+    "van-tabs": "@vant/weapp/tabs/index",
+    "t-rate": "tdesign-miniprogram/rate/rate",
+    "van-divider": "@vant/weapp/divider/index"
   },
   "enablePullDownRefresh": true,
   "onReachBottomDistance": 100
diff --git a/Pages/yishi/appraise/index.wxml b/Pages/yishi/appraise/index.wxml
index 80226b2..4850809 100644
--- a/Pages/yishi/appraise/index.wxml
+++ b/Pages/yishi/appraise/index.wxml
@@ -1,6 +1,63 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
-<view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
-  <t-tabs
+<view class="container">
+
+  <van-tabs active="1" 
+    color="#3CC7C0"
+    title-active-color="#3CC7C0"
+    bind:change="onTabsChange"
+    border="{{true}}"
+    >
+      <van-tab title="全部（{{total_quantity}}）" name="1">
+        <view class="item_list">
+          <view class="item" wx:for="{{appraise_list_1}}">
+            <view class="top">
+              <view class="name">{{item.name_mask}}</view>
+              <view class="start">
+                <t-rate value="{{item.avg_score}}" count="{{item.avg_score}}" color="#ED9C00"/>
+              </view>
+            </view>
+            <view class="content">{{item.content}}</view>
+            <view class="date">{{item.created_at}}</view>
+          </view>
+        </view>
+        <van-empty description="暂无数据" wx:if="{{appraise_list_1.length == 0}}" />
+        <van-divider contentPosition="center" wx:if="{{appraise_list_1.length > 0 && current_page == last_page}}">到底了~</van-divider>
+      </van-tab>
+      <van-tab title="好评（{{good_quantity}}）" name="2">
+        <view class="item_list">
+          <view class="item" wx:for="{{appraise_list_2}}">
+            <view class="top">
+              <view class="name">{{item.name_mask}}</view>
+              <view class="start">
+                <t-rate value="{{item.avg_score}}" count="{{item.avg_score}}" color="#ED9C00"/>
+              </view>
+            </view>
+            <view class="content">{{item.content}}</view>
+            <view class="date">{{item.created_at}}</view>
+          </view>
+        </view>
+        <van-empty description="暂无数据" wx:if="{{appraise_list_2.length == 0}}" />
+        <van-divider contentPosition="center" wx:if="{{appraise_list_2.length > 0 && current_page == last_page}}">到底了~</van-divider>
+      </van-tab>
+      <van-tab title="中/差评（{{bad_quantity}}）" name="3">
+        <view class="item_list">
+          <view class="item" wx:for="{{appraise_list_3}}">
+            <view class="top">
+              <view class="name">{{item.name_mask}}</view>
+              <view class="start">
+                <t-rate value="{{item.avg_score}}" count="{{item.avg_score}}" color="#ED9C00"/>
+              </view>
+            </view>
+            <view class="content">{{item.content}}</view>
+            <view class="date">{{item.created_at}}</view>
+          </view>
+        </view>
+        <van-empty description="暂无数据" wx:if="{{appraise_list_3.length == 0}}" />
+        <van-divider contentPosition="center" wx:if="{{appraise_list_3.length > 0 && current_page == last_page}}">到底了~</van-divider>
+      </van-tab>
+    </van-tabs>
+
+  <!-- <t-tabs
       defaultValue="{{1}}"
       sticky
       stickyProps="{{stickyProps}}"
@@ -49,5 +106,5 @@
         </view>
         <van-empty description="暂无数据" wx:if="{{appraise_list_3.length == 0}}" />
       </t-tab-panel>
-    </t-tabs>
+    </t-tabs> -->
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/appraise/index.wxss b/Pages/yishi/appraise/index.wxss
index 87cec88..112832e 100644
--- a/Pages/yishi/appraise/index.wxss
+++ b/Pages/yishi/appraise/index.wxss
@@ -4,22 +4,47 @@ page{
 .container{
   width: 100vw;
 }
-.t-tab-panel,.t-tabs__content {
-  background-color: #F6F6F6;
-}
-.t-tabs__item--active{
-  color: #49B9AD !important;
-  font-size: 32rpx !important;
-}
-.t-tabs__item-inner--line{
-  font-size: 28rpx !important;
-}
-.t-tabs__track{
-  background-color: var(--td-tab-track-color, var(--td-primary-color, #49B9AD)) !important;
-}
 .item_list{
   width: 92vw;
   margin: 20rpx auto;
   background-color: #fff;
   border-radius: 20rpx;
 }
+
+
+
+.item{
+  display: flex;
+  padding: 20rpx;
+  flex-direction: column;
+}
+.item:not(:last-child){
+  border-bottom: 1px solid #E7E7E7;
+}
+.top{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  flex: 1;
+}
+.name{
+  flex: 1;
+  font-size: 30rpx;
+  color: #666666;
+}
+.start{
+  flex: 1;
+  display: flex;
+  justify-content: flex-end;
+}
+.content{
+  flex: 2;
+  font-size: 34rpx;
+  color: #333333;
+  margin: 20rpx 0;
+}
+.date{
+  flex: 1;
+  font-size: 28rpx;
+  color: #666666;
+}
\ No newline at end of file
diff --git a/Pages/yishi/cash/index.js b/Pages/yishi/cash/index.js
index bd1434a..5a1a320 100644
--- a/Pages/yishi/cash/index.js
+++ b/Pages/yishi/cash/index.js
@@ -17,26 +17,23 @@ Page({
     withdrawal_amount: "xxxx",
     income_tax: "xx",
     contactKeFu: false,
-    skeleton_loading: true
+    skeleton_loading: true,
+    order_inquiry_ids: ""
   },
-  onLoad(options){
-    //获取提现数据
-    api.getDoctorWithdrawal().then(response => {
-      console.log(response);
-      if(response.data.bank_card_id){
-        this.setData({
-          bank_card_id: response.data.bank_card_id,
-          bank_icon_path: response.data.bank_icon_path,
-          bank_name	: response.data.bank_name,
-          bank_card_code_mask: response.data.bank_card_code_mask,
-          withdrawal_amount: response.data.withdrawal_amount,
-          income_tax: response.data.income_tax,
-          skeleton_loading: false
-        })
-      }
-    }).catch(errors => {
-      console.error(errors);
-    })
+  onLoad(option){
+    let order_inquiry_ids = option.order_inquiry_ids;
+    let params = {};
+    if(order_inquiry_ids){
+      params.order_inquiry_ids = order_inquiry_ids;
+      this.setData({
+        "navbarData.back_url": "/Pages/yishi/my/index",
+        "navbarData.back_url_type": 1,
+      })
+    }
+    this.postDoctorWithdrawalInfo(params);
+  },
+  onShow(){
+
   },
   contactKeFu(e){
     let _this = this;
@@ -54,4 +51,23 @@ Page({
     })
 
   },
+  postDoctorWithdrawalInfo(params){
+    //获取提现数据
+    api.postDoctorWithdrawalInfo(params).then(response => {
+      console.log(response);
+      if(response.data.bank.bank_card_id){
+        this.setData({
+          bank_card_id: response.data.bank.bank_card_id,
+          bank_icon_path: response.data.bank.bank_icon_path,
+          bank_name	: response.data.bank.bank_name,
+          bank_card_code_mask: response.data.bank.bank_card_code_mask,
+          withdrawal_amount: response.data.withdrawal_amount,
+          income_tax: response.data.income_tax,
+          skeleton_loading: false
+        })
+      }
+    }).catch(errors => {
+      console.error(errors);
+    })
+  }
 })
\ No newline at end of file
diff --git a/Pages/yishi/cash/index.wxml b/Pages/yishi/cash/index.wxml
index 68e9845..bd83843 100644
--- a/Pages/yishi/cash/index.wxml
+++ b/Pages/yishi/cash/index.wxml
@@ -32,7 +32,7 @@
         </view>
       </view>
       <view class="cash_right">
-        <navigator url="/Pages/yishi/wenzhenorder/index" open-type="navigate" hover-class="other-navigator-hover">
+        <navigator url="/Pages/yishi/wenzhenorderV2/index" open-type="navigate" hover-class="other-navigator-hover">
           <van-button custom-style="text-align: center;border-radius: 10rpx;padding: 20rpx 50rpx;" color="linear-gradient(310deg, #FF931A 0%, #FF931A 0%, #FCB75D 100%);">
             查看订单
           </van-button>
diff --git a/Pages/yishi/chufangsetup/index.wxml b/Pages/yishi/chufangsetup/index.wxml
index 9aceb12..f9ce70f 100644
--- a/Pages/yishi/chufangsetup/index.wxml
+++ b/Pages/yishi/chufangsetup/index.wxml
@@ -3,8 +3,6 @@
   <view class="tabs">
     <t-tabs
       defaultValue="{{0}}"
-      sticky
-      stickyProps="{{ stickyProps }}"
       bind:change="onTabsChange"
       bind:click="onTabsClick"
       bind:scroll="onStickyScroll"
@@ -57,8 +55,8 @@
       </t-tab-panel>
 
       <!-- 驳回面板 -->
-      <t-tab-panel label="驳回" value="2" >
-        <view class="item_list">
+      <t-tab-panel label="驳回" value="2" style="overflow: scroll;">
+        <view class="item_list" style="overflow: scroll;">
 
           <view class="item" wx:for="{{chufang_list_2}}">
             <!-- 头部 -->
diff --git a/Pages/yishi/chufangsetup/index.wxss b/Pages/yishi/chufangsetup/index.wxss
index cb38bfb..467ac1d 100644
--- a/Pages/yishi/chufangsetup/index.wxss
+++ b/Pages/yishi/chufangsetup/index.wxss
@@ -15,7 +15,7 @@ page{
 }
 .item_list{
   width: 90vw;
-  margin: 20rpx auto;
+  margin: 0 auto;
 }
 .item{
   width: 100%;
diff --git a/Pages/yishi/identity/index.wxml b/Pages/yishi/identity/index.wxml
index d16420f..e75409e 100644
--- a/Pages/yishi/identity/index.wxml
+++ b/Pages/yishi/identity/index.wxml
@@ -53,7 +53,7 @@
         <!-- <t-cell title="身份证号" hover required arrow note="请填写身份证号"/> -->
 
         <view class="bottom_note">
-          说明：因互联网医院实行实名制要求，需要您的身份信息，包括姓名，身份证号码。如您不能提供上述信息，将无法完成医师身份认证。
+          说明：因互联网医院诊疗实名制法规要求，为顺利完成医师身份认证，请您如实提供姓名及身份证等身份信息
         </view>
         <view class="bottom_next">
           <van-button disabled="{{next_btn_disabled}}"
diff --git a/Pages/yishi/index/index.js b/Pages/yishi/index/index.js
index 4e8cc93..565acff 100644
--- a/Pages/yishi/index/index.js
+++ b/Pages/yishi/index/index.js
@@ -32,7 +32,7 @@ Page({
     banner: [],
     default_dialog_show: false,//只弹框一次
     dialog_visible: false,
-    dialog_content: "请您先实名认证",
+    dialog_content: "请您先完成实名认证",
     /*
       case_module取值
       新问诊 0
@@ -57,7 +57,7 @@ Page({
       {
         case_status: 0,
         case_module: [0,1,2,3,4,5,6,7,8],
-        case_text: "请您先实名认证"
+        case_text: "请您先完成实名认证"
       },
       {
         case_status: 1,
@@ -94,7 +94,11 @@ Page({
     jiesuan_dialog_show: false,
     jiesuan_dialog_visible: false,
     funbox_height: 100,
-    skeleton_loading: true
+    skeleton_loading: true,
+    confirmBtn: {
+      "openType": "contact",
+      "content": "确认",
+    }
   },
   //  获取状态栏信息
   getMenuButtonBound() {
@@ -141,6 +145,21 @@ Page({
       jiesuan_dialog_visible: false
     })
   },
+  confirmContactDialog(){
+    this.setData({
+      contactKeFu: false
+    })
+  },
+  cancelContactDialog(){
+    console.log("cancelContactDialogcancelContactDialogcancelContactDialog");
+    this.setData({
+      contactKeFu: false
+    })
+  },
+  onPullDownRefresh(){
+    console.log("用户下拉动作")
+    this.onShow();
+  },
   onLoad(){
     
   },
@@ -153,7 +172,8 @@ Page({
   onHide(){
     console.log("index onHide() onHide() ");
     this.setData({
-      swiperList: []
+      swiperList: [],
+      contactKeFu: false
     })
     wx.offCopyUrl(this.Copylistener) // 需传入与监听时同一个的函数对象
   },
@@ -245,6 +265,8 @@ Page({
       this.setData({
         skeleton_loading: false
       })
+    }).then(res => {
+      wx.stopPullDownRefresh()
     }).catch(errors => {
       console.error(errors);
     })
@@ -295,7 +317,7 @@ Page({
     let iden_auth_status = this.data.info.iden_auth_status;
     if(idcard_status != 1){
       this.setData({
-        dialog_content: "请您先实名认证",
+        dialog_content: "请您先完成实名认证",
         shiming_status_url: "/Pages/yishi/identity/index",
         dialog_visible: true,
       });
@@ -345,7 +367,7 @@ Page({
         });
       }
       this.setData({
-        dialog_content: "请您先实名认证",
+        dialog_content: "请您先完成实名认证",
         shiming_status_url: "/Pages/yishi/identity/index",
         default_dialog_show: true
       });
@@ -490,7 +512,7 @@ Page({
         "info.info_shiming_status_txt": "开启在线问诊",
         "info.info_shiming_status": "info_shiming_status_yes",
         shiming_status_url: "/Pages/yishi/onlinesetup/index",
-        dialog_content: "请您先前往在线问诊管理中开通在线问诊",
+        dialog_content: "请您点击[在线问诊管理]，开通在线问诊",
         default_dialog_show: true
       })
       return false;
diff --git a/Pages/yishi/index/index.json b/Pages/yishi/index/index.json
index 6ff3411..e4f6673 100644
--- a/Pages/yishi/index/index.json
+++ b/Pages/yishi/index/index.json
@@ -3,11 +3,12 @@
   "usingComponents": {
     "t-avatar": "tdesign-miniprogram/avatar/avatar",
     "van-button": "@vant/weapp/button/index",
-    "van-dialog": "@vant/weapp/dialog/index",
     "t-swiper": "tdesign-miniprogram/swiper/swiper",
     "t-badge": "tdesign-miniprogram/badge/badge",
     "t-dialog": "tdesign-miniprogram/dialog/dialog",
     "van-image": "@vant/weapp/image/index",
     "t-skeleton": "tdesign-miniprogram/skeleton/skeleton"
-  }
+  },
+  "enablePullDownRefresh": true,
+  "backgroundTextStyle":"dark"
 }
\ No newline at end of file
diff --git a/Pages/yishi/index/index.wxml b/Pages/yishi/index/index.wxml
index e89bb69..30c8bef 100644
--- a/Pages/yishi/index/index.wxml
+++ b/Pages/yishi/index/index.wxml
@@ -3,11 +3,10 @@
   <view class="top_bk"></view>
   <!-- 顶部标题 -->
   <view class="title"
-   style="top:0;padding-top: {{stateHeight}}px;height: {{navHeight + 10}}px;line-height: {{navHeight}}px;">{{ title }}</view>
+   style="top:0;padding-top: {{stateHeight}}px;height: {{navHeight + 10}}px;line-height: {{navHeight}}px;position: relative;">{{ title }}</view>
   <!-- 用户信息 -->
-  <view class="info_box" style="margin-top: {{stateHeight+navHeight+10}}px;">
-
-    
+  <!-- <view class="info_box" style="margin-top: {{stateHeight+navHeight+10}}px;"> -->
+  <view class="info_box">
     <view class="info">
       <view class="info_top">
         <view class="info_photo" bindtap="go" data-url="/Pages/yishi/myinfo/index">
@@ -30,7 +29,7 @@
           <t-skeleton theme="text" row-col="{{[{ width: '70%' }]}}" animation="gradient" loading="{{skeleton_loading}}" />
         </view>
         <view class="info_wenzhen_new" bindtap="go" data-url="/Pages/yishi/wenzhen_v2/wenzhen" data-moudle="0" wx:if="{{!skeleton_loading}}">
-        新问诊：{{info.not_accepted_inquiry_num}}
+        待接诊：{{info.not_accepted_inquiry_num}}
         <t-skeleton theme="text" row-col="{{[1]}}" animation="gradient" loading="{{skeleton_loading}}" />
         </view>
         <view class="info_wenzhen_ing" bindtap="go" data-url="/Pages/yishi/wenzhen_v2/wenzhen" data-moudle="1" wx:if="{{!skeleton_loading}}">接诊中：{{info.accepting_inquiry_num}}</view>
@@ -115,7 +114,7 @@
           height="70rpx"
           src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/jianjie.png"
         />
-      <text class="fun_box_item_txt">简介管理</text>
+      <text class="fun_box_item_txt">个人简介管理</text>
     </view>
     <view bindtap="go" data-moudle="4" data-url="/Pages/yishi/onlinesetup/index" class="fun_box_item" style="height: {{funbox_height}}rpx;">
       <van-image class="fun_box_item_img"
@@ -191,13 +190,28 @@
   </t-dialog>
 
 
-  <van-dialog
+  <t-dialog
+    visible="{{ contactKeFu }}"
+    title="立即联系客服"
+    confirm-btn="{{confirmBtn}}"
+    close-on-overlay-click="{{true}}"
+    close="cancelContactDialog"
+  >
+  <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="cancelContactDialog">
+    取消
+  </view>
+  <!-- <view slot="confirm-btn" class="dialog dialog_confirm_btn" open-type="contact">
+    <t-button theme="primary" size="large" open-type="contact">确认</t-button>
+  </view> -->
+  </t-dialog>
+
+  <!-- <van-dialog
     title="立即联系客服"
     show="{{ contactKeFu }}"
     show-cancel-button
     confirm-button-color="#3CC7C0"
     confirm-button-open-type="contact"
-  />
+  /> -->
 </view>
 
 
diff --git a/Pages/yishi/index/index.wxss b/Pages/yishi/index/index.wxss
index a7da0f9..92efe8c 100644
--- a/Pages/yishi/index/index.wxss
+++ b/Pages/yishi/index/index.wxss
@@ -18,7 +18,7 @@ page{
 .title{
   position: fixed; 
   letter-spacing: 3rpx;
-  margin-left: 5vw;
+  padding-left: 5vw;
   font-size: 35rpx;
   color: #fff;
   background-color: #3CC7C0;
@@ -27,7 +27,7 @@ page{
 }
 .info_box{
   width: 90vw;
-  margin: 30rpx auto;
+  margin: 0 auto;
   display: flex;
   padding: 20rpx 0;
   flex-direction: column;
@@ -229,3 +229,6 @@ page{
   border-top: 1px solid #E9E9E9;
   color: #3CC7C0;
 }
+.t-button__content{
+  color: #3CC7C0 !important;
+}
\ No newline at end of file
diff --git a/Pages/yishi/kuaisusetup/index.js b/Pages/yishi/kuaisusetup/index.js
index 898de51..71d18fa 100644
--- a/Pages/yishi/kuaisusetup/index.js
+++ b/Pages/yishi/kuaisusetup/index.js
@@ -10,8 +10,8 @@ Page({
     },
     height: app.globalData.height, 
     checked: true,
-    open_note: "已开启，可在问诊消息中选择订单接诊",
-    close_note: "已关闭，暂不接收快速图文订单",
+    open_note: "已开启，可在问诊消息中进行接诊",
+    close_note: "已关闭，暂不接收快速问诊",
     note: "",
     inquiry_type: 2,
     inquiry_mode: 1,
diff --git a/Pages/yishi/kuaisusetup/index.wxml b/Pages/yishi/kuaisusetup/index.wxml
index 34aacee..1563a9f 100644
--- a/Pages/yishi/kuaisusetup/index.wxml
+++ b/Pages/yishi/kuaisusetup/index.wxml
@@ -35,9 +35,9 @@
 
   <view class="bottom">
     <text class="bottom_txt">
-      提示：服务开通后，患者可以通过快速问诊找到您，增加您的曝光度。
-      1、快速问诊价格为平台统一定价；
-      2、接诊后{{config.duration}}分钟内和患者{{config.times_number==0?'无限':config.times_number}}次沟通。
+      提示：服务开启后，您将有机会接收到平台自动分配的在线患者快速问诊订单
+      1、快速问诊价格为平台统一设定
+      2、快速问诊服务时间为{{config.duration}}分钟，期间不限制交流次数
     </text>
   </view>
 
diff --git a/Pages/yishi/my/index.js b/Pages/yishi/my/index.js
index 92f162e..f54969d 100644
--- a/Pages/yishi/my/index.js
+++ b/Pages/yishi/my/index.js
@@ -15,7 +15,10 @@ Page({
     estimate_income: "0",
     doctor_id: ""
   },
-
+  onPullDownRefresh(){
+    console.log("用户下拉动作")
+    this.onShow();
+  },
   //  获取状态栏信息
   getMenuButtonBound() {
     let stateHeight = 0; //  接收状态栏高度
@@ -67,6 +70,8 @@ Page({
       this.setData({
         "avatar": avatar
       })
+    }).then(res => {
+      wx.stopPullDownRefresh()
     }).catch(errors => {
       console.error(errors);
     })
diff --git a/Pages/yishi/my/index.json b/Pages/yishi/my/index.json
index ddabca8..9f87f0f 100644
--- a/Pages/yishi/my/index.json
+++ b/Pages/yishi/my/index.json
@@ -6,5 +6,7 @@
     "van-icon": "@vant/weapp/icon/index",
     "van-cell": "@vant/weapp/cell/index",
     "van-cell-group": "@vant/weapp/cell-group/index"
-  }
+  },
+  "enablePullDownRefresh":true,
+  "backgroundTextStyle":"dark"
 }
\ No newline at end of file
diff --git a/Pages/yishi/my/index.wxml b/Pages/yishi/my/index.wxml
index c31887b..119ec21 100644
--- a/Pages/yishi/my/index.wxml
+++ b/Pages/yishi/my/index.wxml
@@ -50,7 +50,7 @@
   <view class="content" style="top: calc(20rpx + {{stateHeight}}px);">
     <van-cell size="large" url="/Pages/yishi/myaccount/index" link-type="navigateTo" title-style="font-size: 30rpx;" title="我的账户" is-link />
     <van-cell size="large" url="/Pages/yishi/bankcard/index" link-type="navigateTo" title-style="font-size: 30rpx;" title="我的银行卡" is-link />
-    <van-cell size="large" url="/Pages/yishi/mycard/index" link-type="navigateTo" title-style="font-size: 30rpx;" title="我的名片" is-link   />
+    <van-cell size="large" url="/Pages/yishi/mycard/index" link-type="navigateTo" title-style="font-size: 30rpx;" title="我的名片" is-link  />
     <van-cell size="large" url="/Pages/yishi/appraise/index?doctor_id={{doctor_id}}" link-type="navigateTo" title-style="font-size: 30rpx;" title="患者评价" is-link />
     <van-cell size="large" url="/Pages/yishi/quickreply/index" link-type="navigateTo" title-style="font-size: 30rpx;" title="常用语" is-link border="{{ false }}"/>
   </view>
diff --git a/Pages/yishi/my/index.wxss b/Pages/yishi/my/index.wxss
index 398d140..09dd19c 100644
--- a/Pages/yishi/my/index.wxss
+++ b/Pages/yishi/my/index.wxss
@@ -1,7 +1,8 @@
-.container{
-  height: 100vh;
-  width: 100vw;
+page{
   background-color: #F5F5F5;
+}
+.container{
+  width: 100vw;
   color: #fff;
   position: relative;
 }
diff --git a/Pages/yishi/myinfo/index.js b/Pages/yishi/myinfo/index.js
index 4bfbfce..8367253 100644
--- a/Pages/yishi/myinfo/index.js
+++ b/Pages/yishi/myinfo/index.js
@@ -56,12 +56,14 @@ Page({
           wx.setStorageSync('client_user_id_'+usertype, "");
           if(wx.$TUIKit){
             let promise = wx.$TUIKit.logout();
+            wx.$TUIKit = undefined;
             promise.then(function(imResponse) {
               console.log(imResponse.data); // 登出成功
             }).catch(function(imError) {
               console.warn('logout error:', imError);
             });
           }
+          app.clearAllInterval()
           app.go("/Pages/index/index");
         } else if (res.cancel) {
           console.log('用户点击取消')
diff --git a/Pages/yishi/onlinechufang/index.wxml b/Pages/yishi/onlinechufang/index.wxml
index 603e3fc..571d812 100644
--- a/Pages/yishi/onlinechufang/index.wxml
+++ b/Pages/yishi/onlinechufang/index.wxml
@@ -14,7 +14,7 @@
         <view class="item_content_li_title">病情主诉：</view>
         <view class="item_content_li_txt">{{case_detail.disease_desc}}</view>
       </view>
-      <view class="item_content_li">
+      <view class="item_content_li" wx:if="{{case_detail.product.length > 0}}">
         <view class="item_content_li_title">用药意向：</view>
         <view class="item_content_li_txt"><text wx:for="{{case_detail.product}}">{{item}};</text></view>
       </view>
diff --git a/Pages/yishi/onlinechufang/index.wxss b/Pages/yishi/onlinechufang/index.wxss
index beb4fba..bc7160b 100644
--- a/Pages/yishi/onlinechufang/index.wxss
+++ b/Pages/yishi/onlinechufang/index.wxss
@@ -12,10 +12,9 @@ page{
 }
 .item_top{
   position: relative;
-  height: 100rpx;
   display: flex;
   align-items: center;
-  padding: 0 32rpx;
+  padding: 20rpx 32rpx;
 }
 .item_top::after {
   position: absolute;
@@ -30,12 +29,12 @@ page{
 }
 
 .item_top_name{
-  flex: 1;
   color: #3CC7C0;
   font-size: 34rpx;
+  margin-right: 20rpx;
 }
 .item_top_sex{
-  flex: 3;
+  flex: 1;
   font-size: 34rpx;
   color: #666;
 }
diff --git a/Pages/yishi/onlinesetup/index.wxml b/Pages/yishi/onlinesetup/index.wxml
index 77a4a55..a3582c3 100644
--- a/Pages/yishi/onlinesetup/index.wxml
+++ b/Pages/yishi/onlinesetup/index.wxml
@@ -38,11 +38,11 @@
 
   <view class="bottom">
     <text class="bottom_txt">
-      提示：服务开通后，患者可以向您购买图文问诊进行问诊，接诊后需要与患者进行图文沟通
-      1、问诊价格每日仅限调整1次，每自然月仅限调整5次
-      2、单价修改后立即生效，不影响当日已生成的问诊订单
-      3、接诊后，患者可与您在{{config.duration/60}}小时内进行{{config.times_number}}个回合沟通
-      4、如有参加公益问诊活动，患者问诊订单价格以参加的公益问诊单价为准
+      提示：服务开启后，患者按照所设置的价格向您购买图文问诊服务
+    1、接诊后，患者可与您在{{config.duration/60}}小时内进行{{config.times_number}}回合沟通 
+    2、若开启公益问诊，图文问诊价格以公益问诊价格为准
+    3、问诊价格每日仅限调整1次，每月仅限调整5次 
+    4、价格修改后立即生效，不影响修改之前已生成的问诊订单 
     </text>
   </view>
 
diff --git a/Pages/yishi/onlinesetupprice/index.wxml b/Pages/yishi/onlinesetupprice/index.wxml
index c3bc297..3d4a7c7 100644
--- a/Pages/yishi/onlinesetupprice/index.wxml
+++ b/Pages/yishi/onlinesetupprice/index.wxml
@@ -19,11 +19,11 @@
 
 <view class="bottom">
   <text class="bottom_txt">
-    提示：服务开通后，患者可以向您购买图文问诊进行问诊，接诊后需要与患者进行图文沟通
-    1、问诊价格每日仅限调整1次，每自然月仅限调整5次
-    2、单价修改后立即生效，不影响当日已生成的问诊订单
-    3、接诊后，患者可与您在{{config.duration/60}}小时内进行{{config.times_number}}个回合沟通
-    4、如有参加公益问诊活动，患者问诊订单价格以参加的公益问诊单价为准
+    提示：服务开启后，患者按照所设置的价格向您购买图文问诊服务
+    1、接诊后，患者可与您在{{config.duration/60}}小时内进行{{config.times_number}}回合沟通 
+    2、若开启公益问诊，图文问诊价格以公益问诊价格为准
+    3、问诊价格每日仅限调整1次，每月仅限调整5次 
+    4、价格修改后立即生效，不影响修改之前已生成的问诊订单 
   </text>
 </view>
 
diff --git a/Pages/yishi/orderdetail/index.wxml b/Pages/yishi/orderdetail/index.wxml
index a7bb161..371eafe 100644
--- a/Pages/yishi/orderdetail/index.wxml
+++ b/Pages/yishi/orderdetail/index.wxml
@@ -13,8 +13,8 @@
           <view class="order_id">就诊患者：<text style="font-size: 30rpx;color: #666666;">张三三（女，25岁）</text></view>
           <view class="order_id">接诊时间：<text style="font-size: 30rpx;color: #666666;">2022-12-30 11：23：23</text></view>
           <view class="order_id">结束时间：<text style="font-size: 30rpx;color: #666666;">2022-12-12 11：23：23</text></view>
-          <view class="order_id">订单金额：<text style="font-size: 30rpx;color: #666666;">￥1212.00元</text></view>
-          <view class="order_id">预计收入：<text style="font-size: 30rpx;color: #666666;">￥112.00元</text></view>
+          <view class="order_id">订单金额：<text style="font-size: 30rpx;color: #666666;">￥1212.00</text></view>
+          <view class="order_id">预计收入：<text style="font-size: 30rpx;color: #666666;">￥112.00</text></view>
         </view>
       </view>
     </view>
@@ -28,7 +28,7 @@
         <view class="order_item_content_data">
           <view class="order_id">就诊患者：<text style="font-size: 30rpx;color: #666666;">张三三/18/男</text></view>
           <view class="order_id">订单编号：<text style="font-size: 30rpx;color: #666666;">2131231xxxx</text></view>
-          <view class="order_id">订单金额：<text style="font-size: 30rpx;color: #666666;">￥1212.00元</text></view>
+          <view class="order_id">订单金额：<text style="font-size: 30rpx;color: #666666;">￥1212.00</text></view>
           <view class="order_id">完成时间：<text style="font-size: 30rpx;color: #666666;">2022.12.30</text></view>
         </view>
       </view>
diff --git a/Pages/yishi/service_notice/index.js b/Pages/yishi/service_notice/index.js
index c37c0f1..81e8224 100644
--- a/Pages/yishi/service_notice/index.js
+++ b/Pages/yishi/service_notice/index.js
@@ -14,6 +14,11 @@ Page({
     total: 0,
     per_page: 0,
     last_page: 0,
+    contactKeFu: false,
+    confirmBtn: {
+      "openType": "contact",
+      "content": "确认",
+    }
   },
   onShow(){
     this.getList();
@@ -46,6 +51,111 @@ Page({
   putMessageReadNoticeAll(){
     api.putMessageReadNoticeAll({notice_type: 1}).then(response => {
       console.log(response);
+      let new_list = [];
+      this.data.list.forEach(item => {
+        item.read_status = 1;
+        new_list.push(item)
+      })
+      this.setData({
+        list: new_list
+      })
+      let usertype = wx.getStorageSync('usertype');
+      let userID = wx.getStorageSync('user_id_'+usertype);
+      wx.setStorageSync( userID+"_service_notice_unreadnnum", "");
+      wx.showToast({
+        title: '操作成功',
+        icon: "success"
+      })
     }).catch(errors => {console.error(errors);})
-  }
+  },
+  putMessageReadNotice(notice_id){
+    api.putMessageReadNotice({notice_id: notice_id}).then(response => {
+      console.log(response);
+      
+    }).catch(errors => {console.error(errors);})
+  },
+  go(e){
+    let item = e.currentTarget.dataset.item;
+    this.putMessageReadNotice(item.notice_id);
+    console.log(item);
+    let link_type = item.link_type;
+    link_type = Number(link_type);
+    // 跳转页面类型（1:聊天详情页 2:问诊结束列表页 3:问诊消息列表页 4:我的名片 5:我的简介 6:我的账户 7:我的福利 8:药品订单详情页 9:物流详情 10:问诊订单详情 11:联系客服 12:协议详情 13:处方详情）
+    switch (link_type) {
+      case 1:
+        let from_account = item.link_params.from_account;
+        let order_inquiry_id = item.link_params.order_inquiry_id;
+        let inquiry_type = item.link_params.inquiry_type;
+        let url = "/Pages/yishi/chat/index?from_account="+from_account+"&order_inquiry_id="+order_inquiry_id+"&inquiry_type="+inquiry_type;
+        app.go(url);
+        break;
+      case 2:
+        wx.showToast({
+          title: '暂无页面',
+          icon: 'error'
+        })
+        break;
+      case 3:
+        wx.switchTab({
+          url: "/Pages/yishi/wenzhen_v2/wenzhen",
+        })
+      break;
+      case 4:
+        app.go("/Pages/yishi/mycard/index")
+      break;
+      case 5:
+        app.go("/Pages/yishi/myprofile/index")
+      break;
+      case 6:
+        app.go("/Pages/yishi/myaccount/index")
+      break;
+      case 7:
+        wx.showToast({
+          title: '暂无页面',
+          icon: 'error'
+        })
+      break;
+      case 8:
+        wx.showToast({
+          title: '暂无页面',
+          icon: 'error'
+        })
+      break;
+      case 9:
+        wx.showToast({
+          title: '暂无页面',
+          icon: 'error'
+        })
+      break;
+      case 10:
+        wx.showToast({
+          title: '暂无页面',
+          icon: 'error'
+        })
+      break;
+      case 11:
+        this.setData({
+          contactKeFu: true
+        })
+      break;
+      case 12:
+        wx.showToast({
+          title: '暂无页面',
+          icon: 'error'
+        })
+      break;
+      case 13:
+        let url1 = "/Pages/yishi/onlinechufang/index?order_inquiry_id="+item.link_params.order_inquiry_id+"&order_prescription_id="+item.link_params.order_prescription_id+"&from=chat";
+        app.go(url1);
+      break;
+      default:
+        break;
+    }
+  },
+  cancelContactDialog(){
+    console.log("cancelContactDialogcancelContactDialogcancelContactDialog");
+    this.setData({
+      contactKeFu: false
+    })
+  },
 })
\ No newline at end of file
diff --git a/Pages/yishi/service_notice/index.json b/Pages/yishi/service_notice/index.json
index c57d952..627b877 100644
--- a/Pages/yishi/service_notice/index.json
+++ b/Pages/yishi/service_notice/index.json
@@ -4,7 +4,8 @@
     "te-nav-bar": "/commpents/te_navbar",
     "van-image": "@vant/weapp/image/index",
     "van-divider": "@vant/weapp/divider/index",
-    "van-empty": "@vant/weapp/empty/index"
+    "van-empty": "@vant/weapp/empty/index",
+    "t-dialog": "tdesign-miniprogram/dialog/dialog"
   },
   "enablePullDownRefresh": false,
   "onReachBottomDistance": 50
diff --git a/Pages/yishi/service_notice/index.wxml b/Pages/yishi/service_notice/index.wxml
index dc9084a..f39a07e 100644
--- a/Pages/yishi/service_notice/index.wxml
+++ b/Pages/yishi/service_notice/index.wxml
@@ -1,80 +1,52 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container">
   <view class="list">
-
-    <view class="item" wx:for="{{list}}">
+    <view class="item" wx:for="{{list}}" bindtap="go" data-item="{{item}}">
       <view class="item_top">
-        <view class="item_img" wx:if="{{item.inquiry_type == 1}}">
+        <view class="item_img" wx:if="{{item.link_params.inquiry_type == 1}}">
           <text style="margin-left: 10rpx;">快速问诊</text> 
           <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
-        <view class="item_img" wx:if="{{item.inquiry_type == 2}}">
+        <view class="item_img" wx:if="{{item.link_params.inquiry_type == 2}}">
           <text style="margin-left: 10rpx;">快速问诊</text> 
           <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
-        <view class="item_img" wx:if="{{item.inquiry_type == 3}}">
+        <view class="item_img" wx:if="{{item.link_params.inquiry_type == 3}}">
           <text style="margin-left: 10rpx;">公益问诊</text> 
           <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/yizhen.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
-        <view class="item_img" wx:if="{{item.inquiry_type == 4}}">
+        <view class="item_img" wx:if="{{item.link_params.inquiry_type == 4}}">
           <text style="margin-left: 10rpx;">问诊购药</text> 
           <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/drug.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
         <view class="item_date">{{item.notice_send_time}}</view>
       </view>
-      <view class="item_content">{{item.notice_title}}</view>
+      <view class="item_content">
+      {{item.notice_brief_title}}
+      <view class="hongdian" wx:if="{{item.read_status == 0}}">
+        <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/honhdian.png" fit="heightFix" height="20rpx" aria-label="qrcode" />
+      </view>
+      </view>
     </view>
-
-    <!-- <view class="item">
-      <view class="item_top">
-        <view class="item_img">
-          <text style="margin-left: 10rpx;">快速问诊</text> 
-          <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
-        </view>
-        <view class="item_date">2023-1-02 12:22</view>
-      </view>
-      <view class="item_content">您有新的图文问诊咨询，请注意查看。</view>
-    </view> -->
-
-    <!-- <view class="item">
-      <view class="item_top">
-        <view class="item_img">
-          <text style="margin-left: 10rpx;">在线问诊</text> 
-          <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/online.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
-        </view>
-        <view class="item_date">2023-1-02 12:22</view>
-      </view>
-      <view class="item_content">您有新的图文问诊咨询，请注意查看。</view>
-    </view> -->
-
-    <!-- <view class="item">
-      <view class="item_top">
-        <view class="item_img">
-          <text style="margin-left: 10rpx;">公益问诊</text> 
-          <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/yizhen.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
-        </view>
-        <view class="item_date">2023-1-02 12:22</view>
-      </view>
-      <view class="item_content">您有新的图文问诊咨询，请注意查看。</view>
-    </view> -->
-
-    <!-- <view class="item">
-      <view class="item_top">
-        <view class="item_img">
-          <text style="margin-left: 10rpx;">问诊购药</text> 
-          <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/drug.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
-        </view>
-        <view class="item_date">2023-1-02 12:22</view>
-      </view>
-      <view class="item_content">您有新的图文问诊咨询，请注意查看。</view>
-    </view> -->
-
-
   </view>
   <van-empty description="暂无数据" wx:if="{{list.length == 0}}" />
   <van-divider contentPosition="center" wx:if="{{list.length > 0 && current_page == last_page}}">到底了~</van-divider>
   <van-image bind:click="putMessageReadNoticeAll" style="position: fixed; right: 0;bottom: 262rpx;" src="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/yishi/service_notice/readall.png" fit="heightFix" height="84rpx" aria-label="role" />
-  <view style="height: 50rpx;">
-    
+  <view style="height: 50rpx;"></view>
+
+  <t-dialog
+    visible="{{ contactKeFu }}"
+    title="立即联系客服"
+    confirm-btn="{{confirmBtn}}"
+    close-on-overlay-click="{{true}}"
+    close="cancelContactDialog"
+    overlay-click="cancelContactDialog"
+  >
+  <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="cancelContactDialog">
+    取消
   </view>
+  <!-- <view slot="confirm-btn" class="dialog dialog_confirm_btn" open-type="contact">
+    <t-button theme="primary" size="large" open-type="contact">确认</t-button>
+  </view> -->
+  </t-dialog>
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/service_notice/index.wxss b/Pages/yishi/service_notice/index.wxss
index 594dcad..23172e5 100644
--- a/Pages/yishi/service_notice/index.wxss
+++ b/Pages/yishi/service_notice/index.wxss
@@ -37,8 +37,35 @@ page{
   margin-top: 20rpx;
   font-size: 30rpx;
   color: #666666;
+  display: flex;
+  align-items: center;
 }
 .van_img{
   display: flex;
   justify-content: center;
+}
+.hongdian{
+  height: 50rpx;
+  display: flex;
+  align-items: center;
+  flex: 1;
+  display: flex;
+  justify-content: flex-end;
+}
+.dialog{
+  width: 50%;
+  text-align: center;
+  height: 100rpx;
+  line-height: 100rpx;
+}
+.dialog_cancel_btn{
+  border-top: 1px solid #E9E9E9;
+  border-right: 1px solid #E9E9E9;
+}
+.dialog_confirm_btn{
+  border-top: 1px solid #E9E9E9;
+  color: #3CC7C0;
+}
+.t-button__content{
+  color: #3CC7C0 !important;
 }
\ No newline at end of file
diff --git a/Pages/yishi/system_notice/index.js b/Pages/yishi/system_notice/index.js
index f341cad..d273427 100644
--- a/Pages/yishi/system_notice/index.js
+++ b/Pages/yishi/system_notice/index.js
@@ -80,6 +80,21 @@ Page({
   putMessageReadNoticeAll(){
     api.putMessageReadNoticeAll({notice_type: 2}).then(response => {
       console.log(response);
+      let new_list = [];
+      this.data.list.forEach(item => {
+        item.read_status = 1;
+        new_list.push(item)
+      })
+      this.setData({
+        list: new_list
+      })
+      let usertype = wx.getStorageSync('usertype');
+      let userID = wx.getStorageSync('user_id_'+usertype);
+      wx.setStorageSync( userID+"_system_notice_unreadnnum", "");
+      wx.showToast({
+        title: '操作成功',
+        icon: "success"
+      })
     }).catch(errors => {console.error(errors);})
   }
 })
\ No newline at end of file
diff --git a/Pages/yishi/system_notice/index.wxml b/Pages/yishi/system_notice/index.wxml
index 9189956..a954b2d 100644
--- a/Pages/yishi/system_notice/index.wxml
+++ b/Pages/yishi/system_notice/index.wxml
@@ -6,7 +6,7 @@
         <view class="item_img">
           <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
-        <view class="item_content">{{item.notice_title}}</view>
+        <view class="item_content">{{item.notice_brief_title}}</view>
       </view>
       <view class="hongdian" wx:if="{{item.read_status == 0}}">
         <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/honhdian.png" fit="heightFix" height="20rpx" aria-label="qrcode" />
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index 1f94e02..dffc2a3 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -20,28 +20,40 @@ Page({
     message_inquiry_type: 99999,
     system_notice_unreadnnum: "",
     service_notice_unreadnnum: "",
-    hasOnShow: false
+    hasOnShow: false,
+    show: false,
+    show_dialog_from_account: "",
+    show_dialog_order_inquiry_id: "",
+    show_dialog_inquiry_type: "",
+    unreadnnum_inter: 0
   },
   onLoad() {
-    console.log("wenzhen onload");
+    console.log("wenzhen onloadddd");
+
+    // if(wx.$TUIKit){
+    //   wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
+    // }else{
+    //   app.imInit().then(res => {
+    //     console.log("wenzhen onload imInit");
+    //     wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
+    //   });
+    // }
+  },
+  initInterval(){
     let usertype =  wx.getStorageSync('usertype');
     let userID = wx.getStorageSync('user_id_'+usertype);
-    if(wx.$TUIKit){
-      wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
-    }else{
-      app.imInit().then(res => {
-        console.log("wenzhen onload imInit");
-        wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
-      });
-    }
-    setInterval(() => {
+    let unreadnnum_inter = setInterval(() => {
       let system_notice_unreadnnum = wx.getStorageSync(userID+"_system_notice_unreadnnum");
       let service_notice_unreadnnum = wx.getStorageSync(userID+"_service_notice_unreadnnum");
       this.setData({
         system_notice_unreadnnum: system_notice_unreadnnum,
         service_notice_unreadnnum: service_notice_unreadnnum,
       })
-    }, 500);
+    }, 1000);
+    this.setData({
+      unreadnnum_inter: unreadnnum_inter
+    })
+    console.log("app.globalData.unreadnnum_inter: ", app.globalData.unreadnnum_inter);
   },
   onShow: function () {
     console.log("onShow from wenzhen V2")
@@ -54,37 +66,60 @@ Page({
       })
     }
     this.getConversationList();
+    if(this.data.unreadnnum_inter == 0){
+      this.initInterval();
+    }
     //避免onshow加载多次
     this.setData({
       hasOnShow: true
     })
+
+    if(wx.$TUIKit){
+      wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
+    }else{
+      app.imInit().then(res => {
+        console.log("wenzhen onload imInit");
+        wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
+      });
+    }
+
   },
   onHide(){
     console.log("onHideonHide from wenzhen")
-    this.setData({hasOnShow: false})
+    clearInterval(this.data.unreadnnum_inter)
+    this.setData({
+      hasOnShow: false,
+      data_list_1: [],
+      data_list_2: [],
+      data_list_3: [],
+      data_list_4: [],
+      data_list_5: [],
+      message_inquiry_type: 9999,
+      unreadnnum_inter: 0
+    })
+    wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived);
   },
   onUnload(){
     console.log("onUnload from wenzhen")
-    this.setData({hasOnShow: false})
-    // wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived);
+    this.setData({
+      hasOnShow: false,
+      message_inquiry_type: 9999
+    })
   },
   getConversationList(){
-    wx.$TUIKit.getConversationList().then((imResponse) => {
-      console.log("imResponse.data.conversationList from wenzhen_v2: ", imResponse.data.conversationList);
-      this.setData({
-        conversationList: imResponse.data.conversationList,
-      });
-    }).then(() => {
-      console.log("开始查询订单状态")
-      this.formatStatus();
-    }).catch(error => {
-      console.log(error)
-      // 补偿登录操作
-      app.imInit().then(res => {
-        this.getConversationList();
+    console.log("getConversationListgetConversationListgetConversationList");
+    app.imInit().then(res => {
+      console.log("wenzhen onload imInit: ", res);
+      wx.$TUIKit.getConversationList().then((imResponse) => {
+        console.log("imResponse.data.conversationList from wenzhen_v2: ", imResponse.data.conversationList);
+        this.setData({
+          conversationList: imResponse.data.conversationList,
+        });
+      }).then(() => {
+        console.log("开始查询订单状态")
+        this.formatStatus();
       }).catch(error => {
         console.log(error)
-        this.getConversationList();
       });
     });
   },
@@ -190,7 +225,7 @@ Page({
   },
   formatStatus(){
     let order_inquiry_id_list = [];
-    order_inquiry_id_list.push("a");//初始化一个，防止失败
+    order_inquiry_id_list.push("");//初始化一个，防止失败
     this.data.conversationList.forEach(item => {
       let conversationID = item.conversationID;
       if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过
@@ -241,14 +276,12 @@ Page({
           item.patient_age = order.patient_age;
           item.patient_name = order.patient_name;
           item.patient_sex = order.patient_sex;
-
           new_conversationList.push(item);
         })
 
         this.setData({
           conversationList: new_conversationList
         })
-
       }
     }).then(() => {
       console.log("开始格式化formatConversationList")
@@ -300,6 +333,16 @@ Page({
       let session_item = {};
       session_item.inquiry_status = item.inquiry_status;//订单状态暂无
       let txt = {};
+      if(lastMessage.messageForShow == "[自定义消息]"){
+        let text = "自定义消息";
+        let payload = lastMessage.payload;
+        if(payload) {
+          console.log("payload: ",payload.data);
+          let payloadJson = JSON.parse(payload.data);
+          text = payloadJson.title.replace(/-/g, "");
+        }
+        lastMessage.messageForShow = text;
+      }
       txt.Text= lastMessage.messageForShow;
       session_item.last_message_content = txt;
       session_item.message_send_time = getTimeAgo(lastMessage.lastTime);
@@ -315,7 +358,12 @@ Page({
         totalUnreadCount = totalUnreadCount + unreadCount;
         session_item.message_dot = true;
       }else{
-        session_item.message_dot = false;
+        if(item.inquiry_status == 3){
+          totalUnreadCount = totalUnreadCount + 1;
+          session_item.message_dot = true;
+        }else{
+          session_item.message_dot = false;
+        }
       }
       session_list[inquiry_type - 1].push(session_item);
     })
@@ -336,7 +384,9 @@ Page({
       this.setData({has_data: false})
     }else{
       this.setData({has_data: true})
+      this.selectComponent('#tabs').resize();
     }
+
   },
   checkOrderInquiryId(list, order_inquiry_id){
     let index = list.findIndex(item => {
@@ -346,5 +396,59 @@ Page({
   },
   onTabsChange(e){
     console.log(e);
+  },
+  goChat(e){
+    this.setData({
+      show: false
+    })
+
+    console.log("开始订阅消息");
+    wx.requestSubscribeMessage({
+      tmplIds: ['jhYUf91ULCTX_f69hazqAYwImdFf8ELasRAwB6X-MTM'],
+      success (res) {
+        console.log(res);
+        let from_account = e.currentTarget.dataset.from_account;
+        let order_inquiry_id = e.currentTarget.dataset.order_inquiry_id;
+        let inquiry_type = e.currentTarget.dataset.inquiry_type;
+        let url = e.currentTarget.dataset.url+"?from_account="+from_account+"&order_inquiry_id="+order_inquiry_id+"&inquiry_type="+inquiry_type;
+        app.go(url);
+      }
+    })
+  },
+  postDoctorInquiry(e){
+    this.setData({
+      show: false
+    })
+    console.log("order_inquiry_id: ", e.currentTarget.dataset.order_inquiry_id);
+    let params = {};
+    params.order_inquiry_id = e.currentTarget.dataset.order_inquiry_id;
+    console.log("params: ",params)
+    api.postDoctorInquiry(params).then(response => {
+      console.log("开始接诊");
+      console.log(response);
+    }).then(() => {
+      this.goChat(e);
+    }).catch(errors => {
+      console.error(errors);
+    })
+
+  },
+  tabShow(e){
+    let show_dialog_from_account = e.currentTarget.dataset.show_dialog_from_account;
+    let show_dialog_order_inquiry_id = e.currentTarget.dataset.show_dialog_order_inquiry_id;
+    let show_dialog_inquiry_type = e.currentTarget.dataset.show_dialog_inquiry_type;
+    console.log("tabShowtabShowtabShowtabShow");
+    this.setData({
+      show_dialog_from_account: show_dialog_from_account,
+      show_dialog_order_inquiry_id: show_dialog_order_inquiry_id,
+      show_dialog_inquiry_type: show_dialog_inquiry_type,
+      show: true
+    })
+  },
+  onClose(){
+    console.log("onCloseonCloseonCloseonClose")
+    this.setData({
+      show: false
+    })
   }
 })
\ No newline at end of file
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.json b/Pages/yishi/wenzhen_v2/wenzhen.json
index 38cbf54..d7cc87b 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.json
+++ b/Pages/yishi/wenzhen_v2/wenzhen.json
@@ -10,6 +10,7 @@
     "van-empty": "@vant/weapp/empty/index",
     "van-image": "@vant/weapp/image/index",
     "van-tab": "@vant/weapp/tab/index",
-  "van-tabs": "@vant/weapp/tabs/index"
+    "van-tabs": "@vant/weapp/tabs/index",
+    "t-dialog": "tdesign-miniprogram/dialog/dialog"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml
index ed94341..30ce8eb 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxml
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml
@@ -146,9 +146,10 @@
     color="#3CC7C0"
     title-active-color="#3CC7C0"
     border="{{true}}"
+    id="tabs"
     >
       <van-tab title="在线问诊" name="1" wx:if="{{data_list_1.length > 0}}">
-        <wenzhen-data 
+        <!-- <wenzhen-data 
           name="{{ item.patient_name }}"
           sex="{{ item.patient_sex==1?'男':'女' }}"
           age="{{ item.patient_age }}"
@@ -162,10 +163,40 @@
           note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
           message_dot="{{item.message_dot}}"
           wx:for="{{ data_list_1 }}"
-         />
+         /> -->
+
+         <!-- aa -->
+         <view class="content" wx:for="{{ data_list_1 }}">
+          <view class="content_1">
+            <view class="name">
+              <text style="font-size: 34rpx;color: #333;">就诊人：</text>
+              {{item.patient_name}}  {{item.patient_sex==1?'男':'女'}}｜{{item.patient_age}}<t-badge dot="{{item.message_dot || item.inquiry_status==3}}" offset="{{ [-4, 4] }}" content="岁" />
+            </view>
+            <view class="date"> {{item.message_send_time}}</view>
+          </view>
+          <view class="content_2">{{item.last_message_content.Text}}</view>
+          <view class="content_3">
+            <view class="status">{{ 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="btn" wx:if="{{ item.inquiry_status == 3 }}">
+              <van-button bind:click="go" data-url="/Pages/yishi/case/index?order_inquiry_id={{item.order_inquiry_id}}" plain custom-style="padding:0 35rpx; height:67rpx;  border-radius: 10rpx;" color="#3CC7C0">查看病历</van-button>
+              <van-button type="default" 
+              bindtap="tabShow" 
+              data-show_dialog_from_account="{{item.from_account}}"
+              data-show_dialog_order_inquiry_id="{{item.order_inquiry_id}}"
+              data-show_dialog_inquiry_type="{{item.inquiry_type}}"
+              custom-style="padding:0 35rpx; height:67rpx; border-radius: 10rpx;margin-left:20rpx;" color="#3CC7C0">去接诊</van-button>
+            </view>
+            <view class="btn" wx:if="{{ item.inquiry_status >= 4 }}">
+              <van-button bind:click="goChat" data-from_account="{{item.from_account}}" data-inquiry_type="{{item.inquiry_type}}" data-order_inquiry_id="{{item.order_inquiry_id}}" data-url="/Pages/yishi/chat/index" plain custom-style="padding:0 35rpx; height:67rpx;  border-radius: 10rpx;" color="#3CC7C0">问诊详情</van-button>
+              <!-- <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>         
+         <!-- aa -->
       </van-tab>
       <van-tab title="快速问诊" name="2" wx:if="{{data_list_2.length > 0}}">
-        <wenzhen-data 
+        <!-- <wenzhen-data 
           name="{{ item.patient_name }}"
           sex="{{ item.patient_sex==1?'男':'女' }}"
           age="{{ item.patient_age }}"
@@ -179,10 +210,37 @@
           note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
           message_dot="{{item.message_dot}}"
           wx:for="{{ data_list_2 }}"
-         />
+         /> -->
+
+         <view class="content" wx:for="{{ data_list_2 }}">
+          <view class="content_1">
+            <view class="name">
+              <text style="font-size: 34rpx;color: #333;">就诊人：</text>
+              {{item.patient_name}}  {{item.patient_sex==1?'男':'女'}}｜{{item.patient_age}}<t-badge dot="{{item.message_dot || item.inquiry_status==3}}" offset="{{ [-4, 4] }}" content="岁" />
+            </view>
+            <view class="date"> {{item.message_send_time}}</view>
+          </view>
+          <view class="content_2">{{item.last_message_content.Text}}</view>
+          <view class="content_3">
+            <view class="status">{{ 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="btn" wx:if="{{ item.inquiry_status == 3 }}">
+              <van-button bind:click="go" data-url="/Pages/yishi/case/index?order_inquiry_id={{item.order_inquiry_id}}" plain custom-style="padding:0 35rpx; height:67rpx;  border-radius: 10rpx;" color="#3CC7C0">查看病历</van-button>
+              <van-button type="default" bindtap="tabShow" 
+              data-show_dialog_from_account="{{item.from_account}}"
+              data-show_dialog_order_inquiry_id="{{item.order_inquiry_id}}"
+              data-show_dialog_inquiry_type="{{item.inquiry_type}}"
+              custom-style="padding:0 35rpx; height:67rpx; border-radius: 10rpx;margin-left:20rpx;" color="#3CC7C0">去接诊</van-button>
+            </view>
+            <view class="btn" wx:if="{{ item.inquiry_status >= 4 }}">
+              <van-button bind:click="goChat" data-from_account="{{item.from_account}}" data-inquiry_type="{{item.inquiry_type}}" data-order_inquiry_id="{{item.order_inquiry_id}}" data-url="/Pages/yishi/chat/index" plain custom-style="padding:0 35rpx; height:67rpx;  border-radius: 10rpx;" color="#3CC7C0">问诊详情</van-button>
+              <!-- <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>  
       </van-tab>
       <van-tab title="公益问诊" name="3" wx:if="{{data_list_3.length > 0}}">
-        <wenzhen-data 
+        <!-- <wenzhen-data 
           name="{{ item.patient_name }}"
           sex="{{ item.patient_sex==1?'男':'女' }}"
           age="{{ item.patient_age }}"
@@ -196,10 +254,37 @@
           note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
           message_dot="{{item.message_dot}}"
           wx:for="{{ data_list_3 }}"
-         />
+         /> -->
+
+         <view class="content" wx:for="{{ data_list_3 }}">
+          <view class="content_1">
+            <view class="name">
+              <text style="font-size: 34rpx;color: #333;">就诊人：</text>
+              {{item.patient_name}}  {{item.patient_sex==1?'男':'女'}}｜{{item.patient_age}}<t-badge dot="{{item.message_dot || item.inquiry_status==3}}" offset="{{ [-4, 4] }}" content="岁" />
+            </view>
+            <view class="date"> {{item.message_send_time}}</view>
+          </view>
+          <view class="content_2">{{item.last_message_content.Text}}</view>
+          <view class="content_3">
+            <view class="status">{{ 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="btn" wx:if="{{ item.inquiry_status == 3 }}">
+              <van-button bind:click="go" data-url="/Pages/yishi/case/index?order_inquiry_id={{item.order_inquiry_id}}" plain custom-style="padding:0 35rpx; height:67rpx;  border-radius: 10rpx;" color="#3CC7C0">查看病历</van-button>
+              <van-button type="default" bindtap="tabShow" 
+              data-show_dialog_from_account="{{item.from_account}}"
+              data-show_dialog_order_inquiry_id="{{item.order_inquiry_id}}"
+              data-show_dialog_inquiry_type="{{item.inquiry_type}}"
+              custom-style="padding:0 35rpx; height:67rpx; border-radius: 10rpx;margin-left:20rpx;" color="#3CC7C0">去接诊</van-button>
+            </view>
+            <view class="btn" wx:if="{{ item.inquiry_status >= 4 }}">
+              <van-button bind:click="goChat" data-from_account="{{item.from_account}}" data-inquiry_type="{{item.inquiry_type}}" data-order_inquiry_id="{{item.order_inquiry_id}}" data-url="/Pages/yishi/chat/index" plain custom-style="padding:0 35rpx; height:67rpx;  border-radius: 10rpx;" color="#3CC7C0">问诊详情</van-button>
+              <!-- <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>  
       </van-tab>
       <van-tab title="问诊购药" name="4" wx:if="{{data_list_4.length > 0}}">
-        <wenzhen-data 
+        <!-- <wenzhen-data 
           name="{{ item.patient_name }}"
           sex="{{ item.patient_sex==1?'男':'女' }}"
           age="{{ item.patient_age }}"
@@ -213,12 +298,48 @@
           note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
           message_dot="{{item.message_dot}}"
           wx:for="{{ data_list_4 }}"
-         />
+         /> -->
+
+         <view class="content" wx:for="{{ data_list_4 }}">
+          <view class="content_1">
+            <view class="name">
+              <text style="font-size: 34rpx;color: #333;">就诊人：</text>
+              {{item.patient_name}}  {{item.patient_sex==1?'男':'女'}}｜{{item.patient_age}}<t-badge dot="{{item.message_dot || item.inquiry_status==3}}" offset="{{ [-4, 4] }}" content="岁" />
+            </view>
+            <view class="date"> {{item.message_send_time}}</view>
+          </view>
+          <view class="content_2">{{item.last_message_content.Text}}</view>
+          <view class="content_3">
+            <view class="status">{{ 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="btn" wx:if="{{ item.inquiry_status == 3 }}">
+              <van-button bind:click="go" data-url="/Pages/yishi/case/index?order_inquiry_id={{item.order_inquiry_id}}" plain custom-style="padding:0 35rpx; height:67rpx;  border-radius: 10rpx;" color="#3CC7C0">查看病历</van-button>
+              <van-button type="default" bindtap="tabShow" 
+              data-show_dialog_from_account="{{item.from_account}}"
+              data-show_dialog_order_inquiry_id="{{item.order_inquiry_id}}"
+              data-show_dialog_inquiry_type="{{item.inquiry_type}}"
+              custom-style="padding:0 35rpx; height:67rpx; border-radius: 10rpx;margin-left:20rpx;" color="#3CC7C0">去接诊</van-button>
+            </view>
+            <view class="btn" wx:if="{{ item.inquiry_status >= 4 }}">
+              <van-button bind:click="goChat" data-from_account="{{item.from_account}}" data-inquiry_type="{{item.inquiry_type}}" data-order_inquiry_id="{{item.order_inquiry_id}}" data-url="/Pages/yishi/chat/index" plain custom-style="padding:0 35rpx; height:67rpx;  border-radius: 10rpx;" color="#3CC7C0">问诊详情</van-button>
+              <!-- <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>  
       </van-tab>
     </van-tabs>
   </view>
   <view style="height: 200rpx;"></view>
 
 
-
+  <t-dialog
+    visible="{{ show }}"
+    title="温馨提示"
+    close-on-overlay-click
+    bind:close="onClose"
+    content="为保障服务质量，请您查看患者病历后再去接诊"
+  >
+  <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="go" data-from_account="{{show_dialog_from_account}}" data-url="/Pages/yishi/case/index?order_inquiry_id={{show_dialog_order_inquiry_id}}" >去查看</view>
+  <view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="postDoctorInquiry" data-from_account="{{show_dialog_from_account}}" data-inquiry_type="{{show_dialog_inquiry_type}}" data-order_inquiry_id="{{show_dialog_order_inquiry_id}}" data-url="/Pages/yishi/chat/index" >去接诊</view>
+</t-dialog>
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxss b/Pages/yishi/wenzhen_v2/wenzhen.wxss
index 7dcd8a7..fa341ca 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxss
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxss
@@ -53,3 +53,88 @@ page{
   vertical-align: baseline !important;
 }
 
+
+
+
+
+
+.content{
+  background-color: #fff;
+  display: flex;
+  flex-direction: column;
+  margin-bottom: 20rpx;
+}
+.content_1,.content_3,.content_2{
+  display: flex;
+  justify-content: space-between;
+  margin: 20rpx 30rpx;
+  align-items: center;
+}
+.content_1,.content_3{
+  flex: 5;
+}
+.name{
+  font-size: 30rpx;
+  color: #666666;
+  height: 50rpx;
+  line-height: 50rpx;
+}
+.date{
+  font-size: 30rpx;
+  color: #999;
+}
+.content_2{
+  background-color: #FAFAFA;
+  font-size: 26rpx;
+  color: #999999;
+  min-height: 70rpx;
+  padding: 10rpx 20rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  display: block;
+  line-height: 70rpx;
+}
+.status{
+  font-size: 26rpx;
+  color: #FA541C;
+  flex: 1;
+}
+.status_end{
+  color: #666666;
+}
+.btn{
+  flex: 2;
+  display: flex;
+  justify-content: flex-end;
+}
+.content_4{
+  flex: 5;
+  font-size: 24rpx;
+  color: #E34D59;
+  justify-self:flex-end;
+  text-align:right;
+  display: flex;
+  justify-content: flex-end;
+  border-top: 1px solid #E3E4E5;
+  align-items: center;
+  margin: 0 30rpx;
+  min-height: 70rpx;
+}
+.dialog{
+  width: 50%;
+  text-align: center;
+  height: 100rpx;
+  line-height: 100rpx;
+}
+.dialog_cancel_btn{
+  border-top: 1px solid #E9E9E9;
+  border-right: 1px solid #E9E9E9;
+}
+.dialog_confirm_btn{
+  border-top: 1px solid #E9E9E9;
+  color: #3CC7C0;
+}
+.t-badge__content-text {
+  line-height: 70rpx !important;
+}
diff --git a/Pages/yishi/wenzhenorder/index.js b/Pages/yishi/wenzhenorder/index.js
index d547724..9106a80 100644
--- a/Pages/yishi/wenzhenorder/index.js
+++ b/Pages/yishi/wenzhenorder/index.js
@@ -55,7 +55,7 @@ Page({
     let select_order_amount = 0;
     let select_order_inquiry_id = [];
     result.forEach(item => {
-      select_order_amount = Number(select_order_amount) + Number(this.data.order_list[item].payment_amount_total);
+      select_order_amount = Number(select_order_amount) + Number(this.data.order_list[item].expected_amount_total);
       select_order_inquiry_id.push(this.data.order_list[item].order_inquiry_id);
     })
     this.setData({
@@ -99,13 +99,7 @@ Page({
   confirmOrder(){
     const select_order_inquiry_id = this.data.select_order_inquiry_id;
     console.log(select_order_inquiry_id);
-    wx.showToast({
-      title: '缺少接口',
-      icon: "error",
-      duration: 1500
-    })
-    setTimeout(() => {
-      wx.navigateBack();
-    }, 2000);
+    let order_inquiry_ids = select_order_inquiry_id.join(",");
+    app.go("/Pages/yishi/cash/index?order_inquiry_ids="+order_inquiry_ids);
   }
 })
\ No newline at end of file
diff --git a/Pages/yishi/wenzhenorder/index.wxml b/Pages/yishi/wenzhenorder/index.wxml
index 3813818..0613fe0 100644
--- a/Pages/yishi/wenzhenorder/index.wxml
+++ b/Pages/yishi/wenzhenorder/index.wxml
@@ -15,8 +15,8 @@
               <view class="order_id">就诊患者：<text style="font-size: 30rpx;color: #666666;">{{item.patient_name}}（{{item.patient_sex==1?'男':'女'}}，{{item.patient_age}}岁）</text></view>
               <view class="order_id">接诊时间：<text style="font-size: 30rpx;color: #666666;">{{item.reception_time}}</text></view>
               <view class="order_id">结束时间：<text style="font-size: 30rpx;color: #666666;">{{item.finish_time}}</text></view>
-              <view class="order_id">订单金额：<text style="font-size: 30rpx;color: #666666;">￥{{item.amount_total}}元</text></view>
-              <view class="order_id">预计收入：<text style="font-size: 30rpx;color: #666666;">￥{{item.payment_amount_total}}元</text></view>
+              <view class="order_id">订单金额：<text style="font-size: 30rpx;color: #666666;">￥{{item.amount_total}}</text></view>
+              <view class="order_id">预计收入：<text style="font-size: 30rpx;color: #666666;">￥{{item.expected_amount_total}}</text></view>
             </view>
           </view>
         </view>
@@ -28,7 +28,7 @@
     <view class="bottom_checkbox">
       <van-checkbox value="{{ allchecked }}" checked-color="#3CC7C0" bind:change="onAllChange">全{{allchecked?'不':''}}选</van-checkbox>
     </view>
-    <view class="bottom_content">共{{select_order_length}}个订单，金额： <text style="color: red;font-size: 30rpx;">￥{{select_order_amount}}元  </text> </view>
+    <view class="bottom_content">共{{select_order_length}}个订单，金额： <text style="color: red;font-size: 30rpx;">￥{{select_order_amount}}  </text> </view>
     <view class="bottom_btn">
       <van-button 
       bind:click="confirmOrder" 
diff --git a/Pages/yishi/wenzhenorderV2/index.js b/Pages/yishi/wenzhenorderV2/index.js
new file mode 100644
index 0000000..9106a80
--- /dev/null
+++ b/Pages/yishi/wenzhenorderV2/index.js
@@ -0,0 +1,105 @@
+import { API } from './../../../utils/network/api'
+
+const api = new API()
+const app = getApp()
+Page({
+  data: {
+    navbarData: {
+      showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
+      title: '问诊订单', //导航栏 中间的标题
+    },
+    height: app.globalData.height, 
+    result: [],
+    order_list:[],
+    current_page: 0,
+    total: 0,
+    per_page: 10,
+    last_page: 0,
+    allchecked: false,
+    select_order_length: 0,
+    select_order_amount: 0,
+    select_order_inquiry_id: []
+  },
+  onChange(event) {
+    console.log("onChange: ",event)
+    this.setData({
+      result: event.detail,
+    });
+    this.resetSelectOrder();
+    this.setData({
+      allchecked: this.data.result.length == this.data.order_list.length
+    })
+  },
+  onAllChange(event) {
+    console.log("onAllChange: ",event)
+    this.setData({
+      allchecked: event.detail
+    })
+    if(event.detail == true){
+      this.data.order_list.forEach((item,index) => {
+        this.data.result.push(""+index);
+      })
+      this.setData({
+        result: this.data.result
+      })
+    }
+    if(event.detail == false){
+      this.setData({
+        result: []
+      })
+    }
+    this.resetSelectOrder();
+  },
+  resetSelectOrder(e){
+    let result = this.data.result;
+    let select_order_amount = 0;
+    let select_order_inquiry_id = [];
+    result.forEach(item => {
+      select_order_amount = Number(select_order_amount) + Number(this.data.order_list[item].expected_amount_total);
+      select_order_inquiry_id.push(this.data.order_list[item].order_inquiry_id);
+    })
+    this.setData({
+      select_order_length: result.length,
+      select_order_amount: select_order_amount,
+      select_order_inquiry_id: select_order_inquiry_id
+    })
+  },
+  selectOrder(e){
+    const { index } = e.currentTarget.dataset;
+    const checkbox = this.selectComponent(`.checkboxes-${index}`);
+    checkbox.toggle();
+  },
+  getDoctorWithdrawalOrder(){
+    //可提现问诊订单列表
+    let params = {};
+    params.page = this.data.current_page + 1;
+    params.per_page = this.data.per_page;
+    api.getDoctorWithdrawalOrder(params).then(response => {
+      console.log(response);
+      if(response.data.total > 0){
+        this.setData({
+          order_list: response.data.data,
+          current_page: response.data.current_page,
+          per_page: response.data.per_page,
+          last_page: response.data.last_page
+        })
+      }
+    }).catch(errors => {console.error(errors);})
+  },
+  onShow(){
+    this.getDoctorWithdrawalOrder();
+    this.resetSelectOrder();
+  },
+  onReachBottom() {
+    console.log('===触底了！！===');
+    if(this.data.current_page < this.data.last_page){//最后一页时停止分页
+      this.getDoctorWithdrawalOrder()
+    }
+  },
+  confirmOrder(){
+    const select_order_inquiry_id = this.data.select_order_inquiry_id;
+    console.log(select_order_inquiry_id);
+    let order_inquiry_ids = select_order_inquiry_id.join(",");
+    app.go("/Pages/yishi/cash/index?order_inquiry_ids="+order_inquiry_ids);
+  }
+})
\ No newline at end of file
diff --git a/Pages/yishi/wenzhenorderV2/index.json b/Pages/yishi/wenzhenorderV2/index.json
new file mode 100644
index 0000000..cca90c7
--- /dev/null
+++ b/Pages/yishi/wenzhenorderV2/index.json
@@ -0,0 +1,11 @@
+{
+  "component": true,
+  "usingComponents": {
+    "te-nav-bar": "/commpents/te_navbar",
+    "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"
+  },
+  "onReachBottomDistance": 100
+}
\ No newline at end of file
diff --git a/Pages/yishi/wenzhenorderV2/index.wxml b/Pages/yishi/wenzhenorderV2/index.wxml
new file mode 100644
index 0000000..1dfb713
--- /dev/null
+++ b/Pages/yishi/wenzhenorderV2/index.wxml
@@ -0,0 +1,23 @@
+<!-- 问诊订单 -->
+<te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
+<view class="container">
+    <view class="order_list">
+        <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_type==2?'快速问诊':item.inquiry_type==3?'公益问诊':item.inquiry_type==4?'问诊购药':'未知'}}</view>
+            <view class="order_item_content_data">
+              <view class="order_id">订单编号：<text style="font-size: 30rpx;color: #666666;">{{item.order_inquiry_id	}}</text></view>
+              <view class="order_id">就诊患者：<text style="font-size: 30rpx;color: #666666;">{{item.patient_name}}（{{item.patient_sex==1?'男':'女'}}，{{item.patient_age}}岁）</text></view>
+              <view class="order_id">接诊时间：<text style="font-size: 30rpx;color: #666666;">{{item.reception_time}}</text></view>
+              <view class="order_id">结束时间：<text style="font-size: 30rpx;color: #666666;">{{item.finish_time}}</text></view>
+              <view class="order_id">订单金额：<text style="font-size: 30rpx;color: #666666;">￥{{item.amount_total}}</text></view>
+              <view class="order_id">预计收入：<text style="font-size: 30rpx;color: #666666;">￥{{item.expected_amount_total}}</text></view>
+            </view>
+          </view>
+        </view>
+    </view>
+  <van-empty description="暂无数据" wx:if="{{order_list.length == 0}}" />
+
+
+</view>
\ No newline at end of file
diff --git a/Pages/yishi/wenzhenorderV2/index.wxss b/Pages/yishi/wenzhenorderV2/index.wxss
new file mode 100644
index 0000000..8c2a298
--- /dev/null
+++ b/Pages/yishi/wenzhenorderV2/index.wxss
@@ -0,0 +1,80 @@
+page{
+  background-color: #F4F4F4;
+}
+.container{
+  width: 100vw;
+}
+.order_list{
+  display: flex;
+  width: 92vw;
+  margin: 0 auto;
+  flex-direction: column;
+  padding-bottom: 180rpx;
+}
+.order_item{
+  display: flex;
+  width: 100%;
+  margin-top: 30rpx;
+}
+.order_item_checkbox{
+  flex: 1;
+  align-self: center;
+}
+.order_item_content{
+  flex: 10;
+  background-color: #fff;
+  border-radius: 20rpx;
+  display: flex;
+  flex-direction: column;
+  padding: 20rpx;
+  height: 400rpx;
+}
+.order_item_content_top{
+  flex: 1;
+  border-bottom: 1px solid #E5E5E5;
+  display: flex;
+  align-items: center;
+  font-size: 36rpx;
+}
+.order_item_content_data{
+  flex: 3;
+  display: flex;
+  flex-direction: column;
+}
+.order_id{
+  flex: 1;
+  display: flex;
+  align-items: center;
+  font-size: 30rpx;
+}
+.bottom{
+  position: fixed;
+  bottom: 0;
+  width: 100vw;
+  display: flex;
+  background-color: rgb(255, 255, 255);
+  align-items: center;
+  z-index: 99;  
+  padding-bottom: 50rpx;
+  height: 100rpx;
+}
+.bottom_checkbox{
+  flex: 2.2;
+  font-size: 30rpx;
+  display: flex;
+  justify-content: left;
+  padding-left: 4vw;
+}
+.bottom_content{
+  flex: 6;
+  text-align: center;
+  font-size: 28rpx;
+  color: #666666;
+}
+.bottom_btn{
+  flex: 2;
+  justify-content: flex-end;
+  font-size: 34rpx;
+}
+
+
diff --git a/Pages/yishi/yizhensetup/index.js b/Pages/yishi/yizhensetup/index.js
index 134c366..604a3f9 100644
--- a/Pages/yishi/yizhensetup/index.js
+++ b/Pages/yishi/yizhensetup/index.js
@@ -10,8 +10,8 @@ Page({
     },
     height: app.globalData.height, 
     checked: true,
-    open_note: "已开启，患者可以向您发起图文问诊",
-    close_note: "已关闭，暂不接收义诊订单",
+    open_note: "已开启，可在问诊消息中进行接诊",
+    close_note: "已关闭，暂不接收公益问诊",
     note: "",
     amountText: "选择金额（元）",
     amountValue: "",
diff --git a/Pages/yishi/yizhensetup/index.wxml b/Pages/yishi/yizhensetup/index.wxml
index f5668a6..2767d8f 100644
--- a/Pages/yishi/yizhensetup/index.wxml
+++ b/Pages/yishi/yizhensetup/index.wxml
@@ -48,9 +48,9 @@
 
   <view class="bottom">
     <text class="bottom_txt">
-      提示：服务开通后，患者可以通过公益问诊找到您，增加您的接诊量。
-      1、公益问诊价格为平台统一设定的几个，需要您自己选择单价；
-      2、接诊后{{config.duration/60}}小时内和患者{{config.times_number}}个回合沟通。
+      提示：服务开启后，您将参与到平台爱心公益问诊活动中
+      1、从平台统一设定的多种公益问诊价格中选择您的公益问诊价格
+      2、接诊后，患者可与您在{{config.duration/60}}小时内进行{{config.times_number}}回合沟通
     </text>
   </view>
 
diff --git a/Pages/yishi/yizhensetupprice/index.js b/Pages/yishi/yizhensetupprice/index.js
index 73ff6f2..3854ab6 100644
--- a/Pages/yishi/yizhensetupprice/index.js
+++ b/Pages/yishi/yizhensetupprice/index.js
@@ -10,8 +10,8 @@ Page({
     },
     height: app.globalData.height, 
     checked: true,
-    open_note: "已开启，患者可以向您发起图文问诊",
-    close_note: "已关闭，暂不接收义诊订单",
+    open_note: "已开启，可在问诊消息中进行接诊",
+    close_note: "已关闭，暂不接收公益问诊",
     note: "",
     amountText: "选择金额（元）",
     amountValue: "",
diff --git a/Pages/yishi/yizhensetupprice/index.wxml b/Pages/yishi/yizhensetupprice/index.wxml
index 6e335cc..5888e92 100644
--- a/Pages/yishi/yizhensetupprice/index.wxml
+++ b/Pages/yishi/yizhensetupprice/index.wxml
@@ -21,9 +21,9 @@
 
   <view class="bottom">
     <text class="bottom_txt">
-      提示：服务开通后，患者可以通过公益问诊找到您，增加您的接诊量。
-      1、公益问诊价格为平台统一设定的几个，需要您自己选择单价；
-      2、接诊后{{config.duration/60}}小时内和患者{{config.times_number}}个回合沟通。
+      提示：服务开启后，您将参与到平台爱心公益问诊活动中
+      1、从平台统一设定的多种公益问诊价格中选择您的公益问诊价格
+      2、接诊后，患者可与您在{{config.duration/60}}小时内进行{{config.times_number}}回合沟通
     </text>
   </view>
 
diff --git a/Pages/yishi/zhiye_identity/index.wxml b/Pages/yishi/zhiye_identity/index.wxml
index 2e0238a..17c2db5 100644
--- a/Pages/yishi/zhiye_identity/index.wxml
+++ b/Pages/yishi/zhiye_identity/index.wxml
@@ -38,7 +38,7 @@
     value='查看操作手册' 
     is-link />
 
-    <view class="notice">注:请先了解多点执业认证流程，在提交审核</view>
+    <view class="notice">注:请先了解多点执业认证流程，再提交审核</view>
 
     <van-divider customStyle="color: #999; width:95vw; margin: 20rpx auto;" />
 
@@ -47,7 +47,7 @@
       <view class="sign" wx:if="{{sign_image.length == 0}}" data-url="/Pages/yishi/signcanvas/index" bindtap="go">
         <van-button custom-style="height:130rpx;margin-top:20rpx;border-radius: 20rpx;border: 1px dashed #999;width:100%;font-size:30rpx;background-color: #fff;color: #3CC7C0;" icon="edit">点击签名</van-button>
       </view>
-      <view style="margin-top:20rpx;border-radius: 20rpx;border: 1px dashed #999;" class="sign_img" wx:if="{{sign_image.length > 0}}" data-url="/Pages/yishi/signcanvas/index" bindtap="go">
+      <view style="margin-top:20rpx;border-radius: 20rpx;border: 1px dashed #999;" class="sign_img" wx:if="{{sign_image.length > 0}}">
         <image mode="heightFix" style="transform: rotate(-0deg);width: 100%;" src="{{sign_image[0].url}}"></image>
       </view>
     </view>
@@ -68,7 +68,7 @@
       bindDeleteFile="doDeleteFile"
       />
     <view class="sign_box">
-      <view class="sign_note">提示：平台会在1~3天内审核您提交的资料，审核结果会第一时间通知您。</view>
+      <view class="sign_note">提示：平台会在1~3个工作日内审核您提交的资料，审核结果会第一时间通知您。</view>
       <van-button bind:click="add" 
       custom-style="font-size:30rpx; color:#fff; border-radius: 20rpx; background-color: #3CC7C0" disabled="{{btn_disabled}}"  block>{{btn_txt}}</van-button>
     </view>
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
index 87fdf49..39da407 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
@@ -78,6 +78,7 @@ Component({
       }
     },
     parseCustom(message) {
+
       const { BUSINESS_ID_TEXT } = constant;
       const { GDXZ_CUSTOM_MSEEAGE } = constant;
       // 群消息解析
@@ -149,7 +150,6 @@ Component({
         }
         // 6:处方开具成功
         if (customMessage.message_type === GDXZ_CUSTOM_MSEEAGE.PRESCRIBE) {
-          console.log("处方");
           let data = customMessage.data;
           const renderDom = [{
             type: 'prescribe',
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
index 97e9cf8..a579a30 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
@@ -50,7 +50,7 @@
     <view class="gdxz_custom_message_desc">{{renderDom[0].desc}}</view>
   </view> -->
   <!-- 自定义评价样式 -->
-  <view wx:if="{{renderDom[0].type==='order_evaluation'}}" class="gdxz_custom_order_evaluation_message" bindtap="showPop">
+  <view wx:if="{{renderDom[0].type==='order_evaluation' && false}}" class="gdxz_custom_order_evaluation_message" bindtap="showPop">
     <view class="evaluation_title">请您对本次问诊服务进行评价</view>
     <view class="evaluation_ratebox">
       <van-rate disabled value="{{0}}" size="40rpx" gutter="46rpx" color="#ffd21e" void-icon="star" void-color="#e7e7e7" readonlygutter="20"/>
diff --git a/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxss b/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxss
index ff371b8..b22385d 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxss
@@ -66,6 +66,8 @@
   letter-spacing: 0;
   line-height: 40rpx;
   font-size: 28rpx;
+  word-wrap: break-word;
+  word-break: break-all;
 }
 .message-body-span-image {
   display: inline-block;
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js
index 224013c..7631ec4 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.js
@@ -305,12 +305,8 @@ Component({
     // 发送图片消息
     handleSendImageMessage(file) {
 
-      //获取最后一条消息
-      let message_length = this.data.messageList.length;
-      let last_message = {};
-      if(message_length > 0){
-        last_message = this.data.messageList[message_length - 1];
-      }
+      // 获取最后一条消息
+      let last_message = this.data.conversation.lastMessage;
       console.log("last_message: ", last_message);
       let cloudCustomData = "";
       let cloudCustomDataJson = "";
@@ -566,13 +562,9 @@ Component({
         ext2: wx.$chat_reportType,
         ext3: wx.$chat_SDKAppID,
       });
-
+      
       //获取最后一条消息
-      let message_length = this.data.messageList.length;
-      let last_message = {};
-      if(message_length > 0){
-        last_message = this.data.messageList[message_length - 1];
-      }
+      let last_message = this.data.conversation.lastMessage;
       console.log("last_message: ", last_message);
       let cloudCustomData = "";
       let cloudCustomDataJson = "";
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxml b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
index f97004c..04b47e9 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
@@ -104,7 +104,7 @@
 <t-dialog
     visible="{{ dialog_visible }}"
     title="温馨提示"
-    content="请您先多点执业认证"
+    content="在线开处方需先进行多点执业认证"
   >
   <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="cancelDialog">
     取消
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index 5427cd5..3633bcf 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -495,6 +495,7 @@ Component({
     },
     // 消息跳转到最新
     handleJumpNewMessage() {
+      console.log("handleJumpNewMessage")
       this.setData({
         jumpAim: `ID-${this.filterSystemMessageID(this.data.messageList[this.data.messageList.length - 1].ID)}`,
         showDownJump: false,
@@ -503,6 +504,7 @@ Component({
     },
     // 消息跳转到最近未读
     handleJumpUnreadMessage() {
+      console.log("handleJumpUnreadMessage")
       if (this.data.unreadCount > 15) {
         this.getMessageList(this.data.conversation);
         this.setData({
diff --git a/TUIKit/components/TUIChat/index.wxml b/TUIKit/components/TUIChat/index.wxml
index 090e8c3..2a8be6e 100644
--- a/TUIKit/components/TUIChat/index.wxml
+++ b/TUIKit/components/TUIChat/index.wxml
@@ -43,7 +43,7 @@
 <t-dialog
   visible="{{ dialog_visible }}"
   title="温馨提示"
-  content="确定要结束问诊么？"
+  content="您确定要结束本次问诊吗？"
 >
 <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="cancelDialog">
   取消
diff --git a/TUIKit/components/TUIChat/index.wxss b/TUIKit/components/TUIChat/index.wxss
index facc82e..72ec143 100644
--- a/TUIKit/components/TUIChat/index.wxss
+++ b/TUIKit/components/TUIChat/index.wxss
@@ -142,7 +142,7 @@
   display: flex;
   justify-content: space-around;
   align-items: center;
-  flex: 2;
+  flex: 3;
 }
 .right{
   flex: 1;
@@ -159,13 +159,11 @@
 .name{
   font-size: 34rpx;
   color: #3CC7C0;
-  flex: 1;
   text-align: center;
 }
 .age{
   font-size: 34rpx;
   color: #666666;
-  flex: 1;
 }
 .status{
   background: #FFF2E8;
diff --git a/app.js b/app.js
index a85b98d..b221d6d 100644
--- a/app.js
+++ b/app.js
@@ -78,56 +78,70 @@ App({
     console.log("sign: ", sign);
     // const userSig = sign.userSig;
 
-    //获取im签名数据
-    return api.getSignIM().then(response => {
-      return response.data;
-    }).then((userSig) => {
-      console.log("userSig: ", userSig);
-      wx.$TUIKit = TIM.create({
-        SDKAppID: this.globalData.config.SDKAPPID
-      });
-      
-      wx.$chat_userID = this.globalData.config.userID;
-      wx.$chat_SDKAppID = this.globalData.config.SDKAPPID;
-      wx.$chat_userSig = userSig;
-      wx.$TUIKitTIM = TIM;
-      wx.$TUIKit.registerPlugin({ 'tim-upload-plugin': TIMUploadPlugin });            
-      let login_promise = wx.$TUIKit.login({
-          userID: this.globalData.config.userID,
-          userSig
-      });
-
-      login_promise.then(function(imResponse) {
-        console.log(imResponse.data); // 登录成功
+    if(!wx.$TUIKit){
+      //获取im签名数据
+      return api.getSignIM().then(response => {
+        return response.data;
+      }).then((userSig) => {
+        console.log("userSig: ", userSig);
+        wx.$TUIKit = TIM.create({
+          SDKAppID: this.globalData.config.SDKAPPID
+        });
         
-      }).catch(function(imError) {
-        console.warn('login error:', imError); // 登录失败的相关信息
+        wx.$chat_userID = this.globalData.config.userID;
+        wx.$chat_SDKAppID = this.globalData.config.SDKAPPID;
+        wx.$chat_userSig = userSig;
+        wx.$TUIKitTIM = TIM;
+        wx.$TUIKit.registerPlugin({ 'tim-upload-plugin': TIMUploadPlugin });            
+        let login_promise = wx.$TUIKit.login({
+            userID: this.globalData.config.userID,
+            userSig
+        });
   
+        login_promise.then(function(imResponse) {
+          console.log(imResponse.data); // 登录成功
+          
+        }).catch(function(imError) {
+          console.warn('login error:', imError); // 登录失败的相关信息
+    
+        });
+    
+        wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady);
+        wx.$TUIKit.setLogLevel(3);//设置日志级别
+        wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady, this);
+        wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.TOTAL_UNREAD_MESSAGE_COUNT_UPDATED, this.onTotalUnreadMessageCountUpdated);
+      }).catch(errors => {console.error(errors);})
+    }else{
+      let promise = new Promise((resolve, reject) => {
+        resolve("success");
+      }).then(res => {
+        console.log("from app js:", res);
+        return "from app js";
       });
-  
-      wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady);
-      wx.$TUIKit.setLogLevel(3);//设置日志级别
-      wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady, this);
-    }).then(()=>{
-      //初始化tab-bar角标
-      let index_info = wx.getStorageSync(userID+'_index_info');
-      let wenzhen_info = wx.getStorageSync(userID+'_wenzhen_info');
-      let my_info = wx.getStorageSync(userID+'_my_info');
-      if(!index_info) wx.setStorageSync(userID+'_index_info',"");
-      if(!wenzhen_info) wx.setStorageSync(userID+'_wenzhen_info', "");
-      if(!my_info) wx.setStorageSync(userID+'_my_info', "");
-    }).catch(errors => {console.error(errors);})
+      return promise;
+    }
   },
   imLogout(){
     if(wx.$TUIKit){
       wx.$TUIKit.logout();
+      wx.$TUIKit = undefined;
     }
+    this.clearAllInterval()
+  },
+  clearAllInterval(){
+    this.globalData.app_inter.forEach(item => {
+      clearInterval(item)
+    })
+  },
+  onTotalUnreadMessageCountUpdated(){
+    console.log("onTotalUnreadMessageCountUpdated");
+    let totalUnreadCount = wx.$TUIKit.getTotalUnreadMessageCount();
+      console.log("未读消息数量：", totalUnreadCount)
   },
   onSDKReady(){
     console.log("onSDKReady from app.js");
     this.globalData.chat_sdk_ready = true;
 
-    
     // let promise =  wx.$TUIKit.deleteConversation('C2C500318318078251008');
     // promise.then(function(imResponse) {
     //   // 删除会话成功
@@ -136,8 +150,17 @@ App({
     //   console.warn('deleteConversation error:', imError); // 删除会话失败的相关信息
     // });
 
+    let usertype = wx.getStorageSync('usertype');
+    let userID = wx.getStorageSync('user_id_'+usertype);
+    //初始化tab-bar角标
+    let index_info = wx.getStorageSync(userID+'_index_info');
+    let my_info = wx.getStorageSync(userID+'_my_info');
+    if(!index_info) wx.setStorageSync(userID+'_index_info',"");
+    if(!my_info) wx.setStorageSync(userID+'_my_info', "");
+    this.formatWenZhenInfo();
 
     wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onSystemPushReceived, this);
+    //互踢
     wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.KICKED_OUT, this.onKickedOut);
   },
   onKickedOut(){
@@ -224,11 +247,104 @@ App({
       SECRETKEY: "a5bcd8c583181cf004e9d91a47687d719d4b5d2a10ce33fbee95d587889447d8", // Your secretKey
       EXPIRETIME: 604800,
     },
+    app_inter: []
   },
   go(url, ...params){
     wx.navigateTo({
       url: url
     })
+  },
+  formatWenZhenInfo(){
+    this.getConversationList();
+  },
+  getConversationList(){
+    wx.$TUIKit.getConversationList().then((imResponse) => {
+      console.log("getConversationList from app js: ", imResponse.data.conversationList);
+      return imResponse.data.conversationList;
+    }).then(conversationList => {
+      console.log("开始查询订单状态")
+      this.formatStatus(conversationList);
+    }).catch(error => {
+      console.log(error)
+    });
+  },
+  formatStatus(conversationList){
+    let order_inquiry_id_list = [];
+    order_inquiry_id_list.push("");//初始化一个，防止失败
+    conversationList.forEach(item => {
+      let conversationID = item.conversationID;
+      if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过
+      let lastMessage = item.lastMessage;
+      if(!lastMessage) return;
+      let cloudCustomData = lastMessage.cloudCustomData;
+      if(!cloudCustomData) return;
+      let cloudCustomDataJson;
+      try {
+        cloudCustomDataJson = JSON.parse(cloudCustomData);
+      } catch (error) {
+        console.log(error);
+        return;
+      }
+      let order_inquiry_id = cloudCustomDataJson.order_inquiry_id;
+      order_inquiry_id_list.push(order_inquiry_id);//准备去请求后端那订单状态
+    })
+    //获取医生问诊消息用户属性
+    api.getDoctorInquiryMessageAttr({order_inquiry_ids: order_inquiry_id_list.join(",")}).then(response => {
+      if(response.data.length > 0){
+        let new_conversationList = [];
+        conversationList.forEach(item => {
+          let conversationID = item.conversationID;
+          if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过
+          let lastMessage = item.lastMessage;
+          if(!lastMessage) return;
+          let cloudCustomData = lastMessage.cloudCustomData;
+          if(!cloudCustomData) return;
+          let cloudCustomDataJson;
+          try {
+            cloudCustomDataJson = JSON.parse(item.lastMessage.cloudCustomData);
+          } catch (error) {
+            return;
+          }
+          let order_inquiry_id = cloudCustomDataJson.order_inquiry_id;
+          let order = response.data.find(attr_item => {
+            return attr_item.order_inquiry_id == order_inquiry_id;
+          })
+          if(!order) return;
+
+          let inquiry_status = order.inquiry_status;
+          //inquiry_status 状态
+          if(inquiry_status !=3 && inquiry_status != 4){
+            return;
+          }
+          item.order_inquiry_id = order_inquiry_id;
+          item.inquiry_status = inquiry_status;
+          item.patient_age = order.patient_age;
+          item.patient_name = order.patient_name;
+          item.patient_sex = order.patient_sex;
+          new_conversationList.push(item);
+        })
+        conversationList = []; 
+        return new_conversationList;
+      }
+    }).then(new_conversationList => {
+      console.log("开始计算问诊角标");
+      let wenzhen_info = 0;
+      new_conversationList.forEach(item => {
+        let unreadCount = item.unreadCount;
+        if(unreadCount > 0){
+          wenzhen_info = wenzhen_info + unreadCount;
+        }else{//若为0，则继续判断订单状态
+          let inquiry_status = item.inquiry_status;
+          if(inquiry_status == 3){//若为待接诊，则+1
+            wenzhen_info = wenzhen_info + 1;
+          }
+        }
+      })
+      console.log("角标的数量：", wenzhen_info);
+      let usertype = wx.getStorageSync('usertype');
+      let userID = wx.getStorageSync('user_id_'+usertype);
+      this.formatUnReadNum(userID+'_wenzhen_info', wenzhen_info)
+    }).catch(errors => {console.error(errors);})
   }
   
 })
\ No newline at end of file
diff --git a/app.json b/app.json
index 887ed38..c7d88a9 100644
--- a/app.json
+++ b/app.json
@@ -53,7 +53,8 @@
     "Pages/webpage/index",
     "Pages/kickedout/index",
     "Pages/yishi/onlinesetupprice/index",
-    "Pages/yishi/yizhensetupprice/index"
+    "Pages/yishi/yizhensetupprice/index",
+    "Pages/yishi/wenzhenorderV2/index"
   ],
   "window": {
     "navigationBarBackgroundColor": "#ffffff",
diff --git a/commpents/appraise_data/index.wxml b/commpents/appraise_data/index.wxml
index 2352ca0..15c7d67 100644
--- a/commpents/appraise_data/index.wxml
+++ b/commpents/appraise_data/index.wxml
@@ -2,7 +2,7 @@
   <view class="top">
     <view class="name">{{name}}</view>
     <view class="start">
-      <t-rate value="{{start}}" count="{{start}}" />
+      <t-rate value="{{start}}" count="{{start}}" color="#ED9C00"/>
     </view>
   </view>
   <view class="content">{{content}}</view>
diff --git a/commpents/appraise_data/index.wxss b/commpents/appraise_data/index.wxss
index 4fc902e..e44cd25 100644
--- a/commpents/appraise_data/index.wxss
+++ b/commpents/appraise_data/index.wxss
@@ -2,7 +2,11 @@
   display: flex;
   padding: 20rpx;
   flex-direction: column;
+  background-color: aqua;
+}
+.item:not(:last-child){
   border-bottom: 1px solid #E7E7E7;
+  background-color: brown;
 }
 .top{
   display: flex;
diff --git a/commpents/myprofile/index.js b/commpents/myprofile/index.js
index ad33e7e..8bf35c0 100644
--- a/commpents/myprofile/index.js
+++ b/commpents/myprofile/index.js
@@ -331,11 +331,18 @@ Component({
         console.log("keshi_huixian: ", keshi_huixian)
         console.log("zhicheng_huixian: ", zhicheng_huixian)
         console.log("area_huixian: ", area_huixian)
-        if((keshi_huixian && zhicheng_huixian && area_huixian) || huixian_try_count > 50){
+        if((keshi_huixian && zhicheng_huixian && area_huixian)){
+          console.log("clearInterval1111", data_replay);
+          clearInterval(data_replay);
+        }
+        if(huixian_try_count > 50){
+          console.log("clearInterva22222", data_replay);
           clearInterval(data_replay);
         }
         console.log("计时器");
       }, 500);
+
+      console.log("clearInterva3333", data_replay);
     },
   },
 
diff --git a/commpents/myprofile/index.wxml b/commpents/myprofile/index.wxml
index 71f3914..d4c2d3a 100644
--- a/commpents/myprofile/index.wxml
+++ b/commpents/myprofile/index.wxml
@@ -70,7 +70,7 @@
           <van-field bind:change="onCustomKeshiChange" 
           disabled="{{(indentity && iden_auth_disabled)}}"
           type="text" model:value="{{custom_keshi}}" label="" 
-          placeholder="请输入科室" border="{{department_custom_name_reason == ''}}" />
+          placeholder="请输入您所在科室实际名称" border="{{department_custom_name_reason == ''}}" />
         </view>
 
         <view class="has_error" wx:if="{{ department_custom_name_reason != '' }}" >
@@ -272,7 +272,7 @@
         textarea_cell_name="个人简介" 
         t_icon_name="view-module" 
         bind:showNote="onshowJianJieNote"
-        textarea_cell_content_placeholder="您的从业经历，职称，所获荣誉等信息（10~1000字）" 
+        textarea_cell_content_placeholder="您目前就职医院与科室、社会兼职、所获荣誉、参与科研课题及发表论文等信息（10~1000字）" 
         textarea_val="{{textarea_jianjie}}"
         disabled="{{(indentity && iden_auth_disabled)}}"
         has_error_content="{{ brief_introduction_reason }}"
@@ -285,7 +285,7 @@
         disabled="{{(indentity && iden_auth_disabled)}}"
         textarea_val="{{textarea_shanchang}}"
         has_error_content="{{ be_good_at_reason }}"
-        textarea_cell_content_placeholder="您的专业领域、擅长疾病、研究方法等信息（10~1000字）" 
+        textarea_cell_content_placeholder="描述您所擅长治疗的疾病或者研究方向（10~1000字）" 
         data-textarea_name="textarea_shanchang" bindTextAreaBlur="getTextAreaVal" />
 
         <m-upload-cell
@@ -299,7 +299,7 @@
         bind:showNote="onshowZhiYeNote"
         bindUploadFile="doUploadFile"
         bindDeleteFile="doDeleteFile"
-        upload_cell_desc="请提供清晰的职业证书原件照片，需包含证书编码、加盖钢印的证书照片、姓名、执业范围、最新执业医院，最少上传2张。" 
+        upload_cell_desc="请提供清晰的执业证书原件照片，照片需包含证书编号、加盖钢印的证书照片及姓名、执业范围、执业医院等信息，最少上传2张。" 
         upload_cell_note="查看示例"
         has_error_content="{{ license_cert_reason }}"
         wx:if="{{indentity}}"
@@ -318,7 +318,7 @@
         bindUploadFile="doUploadFile"
         bindDeleteFile="doDeleteFile"
         bind:showNote="onshowZiGeNote"
-        upload_cell_desc="请提供清晰的资格证书原件照片，需包含证书编码、加盖钢印的证书照片、姓名、职称等，最少上传1张。" 
+        upload_cell_desc="请提供清晰的资格证书原件照片，照片需包含证书编号、加盖钢印的证书照片、姓名等信息，最少上传1张。" 
         upload_cell_note="查看示例"
         has_error_content="{{ qualification_cert_reason }}"
         wx:if="{{indentity}}"
@@ -337,7 +337,7 @@
         bind:showNote="onshowZhiChengImgNote"
         bindUploadFile="doUploadFile"
         bindDeleteFile="doDeleteFile"
-        upload_cell_desc="请提供清晰的职称证书原件照片，需包含证书编码、加盖钢印的证书照片、姓名等，最少上传1张。" 
+        upload_cell_desc="请提供清晰的职称证书原件照片，照片需包含编号、加盖钢印的证书照片、姓名及职称等信息，最少上传1张。" 
         upload_cell_note="查看示例"
         has_error_content="{{ work_cert_reason }}"
         wx:if="{{indentity}}"
diff --git a/commpents/te_navbar/index.js b/commpents/te_navbar/index.js
index 36e1021..0ce5c54 100644
--- a/commpents/te_navbar/index.js
+++ b/commpents/te_navbar/index.js
@@ -25,7 +25,19 @@ Component({
    */
   methods: {
     onBack() {
-      wx.navigateBack();
+      let back_url = this.data.navbarData.back_url;
+      let back_url_type = this.data.navbarData.back_url_type;
+      if(back_url){
+        if(back_url_type == 0){
+          app.go(back_url);
+        }else{
+          wx.reLaunch({
+            url: back_url,
+          });
+        }
+      }else{
+        wx.navigateBack();
+      }
     },
     onGoHome() {
       wx.reLaunch({
diff --git a/commpents/wenzhen_data/index.wxml b/commpents/wenzhen_data/index.wxml
index b698566..90aa8c5 100644
--- a/commpents/wenzhen_data/index.wxml
+++ b/commpents/wenzhen_data/index.wxml
@@ -37,7 +37,7 @@
     title="温馨提示"
     close-on-overlay-click
     bind:close="onClose"
-    content="为保障服务质量，请您查看患者病历信息再选择是否接诊。"
+    content="为保障服务质量，请您查看患者病历后再去接诊"
   >
   <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="go" data-from_account="{{from_account}}" data-url="/Pages/yishi/case/index?order_inquiry_id={{order_inquiry_id}}" >去查看</view>
   <view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="postDoctorInquiry" data-from_account="{{from_account}}" data-inquiry_type="{{inquiry_type}}" data-order_inquiry_id="{{order_inquiry_id}}" data-url="/Pages/yishi/chat/index" >去接诊</view>
diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js
index fffb97a..9672b94 100644
--- a/custom-tab-bar/index.js
+++ b/custom-tab-bar/index.js
@@ -60,7 +60,6 @@ Component({
   },
   attached() {
     const usertype = wx.getStorageSync('usertype')
-    console.log("usertype: " ,usertype);
     if (usertype == 2) {
       this.setData({
         usertype: usertype,
@@ -74,7 +73,7 @@ Component({
     }
     let _this = this;
     let userID = wx.getStorageSync('user_id_'+usertype);
-    setInterval(() => {
+    let info_inter = setInterval(() => {
       let index_info = wx.getStorageSync(userID+'_index_info');
       let wenzhen_info = wx.getStorageSync(userID+'_wenzhen_info');
       let my_info = wx.getStorageSync(userID+'_my_info');
@@ -84,6 +83,8 @@ Component({
         my_info: my_info,
       })
     }, 500);
+
+    app.globalData.app_inter.push(info_inter);
   },
   methods: {
     // swichNav: function (e) {
@@ -102,7 +103,6 @@ Component({
     //   }
     // },
     onChange(e) {
-      console.log("custom tab bar onChange");
       const usertype = wx.getStorageSync('usertype');
       let userID = wx.getStorageSync('user_id_'+usertype);
       let idcard_status = wx.getStorageSync(userID+'_idcard_status');
@@ -110,15 +110,10 @@ Component({
       let multi_point_status = wx.getStorageSync(userID+'_multi_point_status');
       let is_bind_bank = wx.getStorageSync(userID+'_is_bind_bank');
 
-      console.log("idcard_status: ", idcard_status);
-      console.log("iden_auth_status: ", iden_auth_status);
-      console.log("multi_point_status: ", iden_auth_status);
-      console.log("is_bind_bank: ", is_bind_bank);
-
       if(idcard_status != 1 && usertype != 3){
         this.setData({
           dialog_visible: true,
-          dialog_content: "请您先实名认证",
+          dialog_content: "请您先完成实名认证",
           next_url: "/Pages/yishi/identity/index",
         })
         return;
@@ -140,7 +135,6 @@ Component({
         return;
       }
       let url = this.data.items[e.detail].pagePath;
-      console.log(url);
       wx.switchTab({
         url: url,
       })
@@ -149,7 +143,6 @@ Component({
       this.setData({
         dialog_visible: false
       })
-      console.log("next_url: ", this.data.next_url);
       let next_url = this.data.next_url;
       app.go(next_url);
     },
diff --git a/miniprogram_npm/tdesign-miniprogram/navbar/navbar.js b/miniprogram_npm/tdesign-miniprogram/navbar/navbar.js
index 8fe1721..b222517 100644
--- a/miniprogram_npm/tdesign-miniprogram/navbar/navbar.js
+++ b/miniprogram_npm/tdesign-miniprogram/navbar/navbar.js
@@ -96,17 +96,11 @@ let Navbar = class Navbar extends SuperComponent {
             success: (res) => {
                 const boxStyleList = [];
                 const { statusBarHeight } = wx.getSystemInfoSync();
-                console.log("statusBarHeight: ", statusBarHeight);
-                console.log("${rect.height}px: ", `${rect.height}`);
                 boxStyleList.push(`--td-navbar-padding-top:${statusBarHeight}px`);
                 if (rect && (res === null || res === void 0 ? void 0 : res.windowWidth)) {
                     boxStyleList.push(`--td-navbar-right:${res.windowWidth - rect.left}px`);
                 }
                 boxStyleList.push(`--td-navbar-capsule-height: ${rect.height}px`);
-
-                console.log("statusBarHeight: ", statusBarHeight);
-                console.log("${rect.height}: ", `${rect.height}`);
-                
                 boxStyleList.push(`--td-navbar-capsule-width:${rect.width}px`);
                 this.setData({
                     boxStyle: `${boxStyleList.join('; ')}`,
diff --git a/utils/network/api.js b/utils/network/api.js
index 274933f..e59e8c9 100644
--- a/utils/network/api.js
+++ b/utils/network/api.js
@@ -234,10 +234,10 @@ class API extends HTTP {
   })
 }
  //获取提现数据
- getDoctorWithdrawal(params) {
+ postDoctorWithdrawalInfo(params) {
   return this.request({
-    url: `${this.baseUrl}/doctor/withdrawal`,
-    method: 'GET',
+    url: `${this.baseUrl}/doctor/withdrawal/info`,
+    method: 'POST',
     data: {
       ...params
     }

From 4f14aad6f384a1f5fda777974aa7e53b6d2a5ffa Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Tue, 11 Apr 2023 18:41:46 +0800
Subject: [PATCH 21/83] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/index/index.js                          |   1 +
 Pages/yaoshi/home/home.js                     |  64 ++++++--
 Pages/yaoshi/home/home.json                   |   3 +-
 Pages/yaoshi/home/home.wxml                   |  14 +-
 Pages/yaoshi/medicalrecord/medicalrecord.js   |   5 +-
 Pages/yaoshi/medicalrecord/medicalrecord.wxml |   2 +-
 Pages/yishi/appraise/index.js                 |  13 +-
 Pages/yishi/appraise/index.json               |   1 -
 Pages/yishi/cash/index.js                     |  23 ++-
 Pages/yishi/cash/index.wxml                   |   2 +-
 Pages/yishi/cashrecord/index.js               |  23 ++-
 Pages/yishi/cashrecord/index.wxml             |   4 +-
 Pages/yishi/chufangsetup/index.wxss           |   3 +-
 Pages/yishi/identity/index.js                 |   4 +-
 Pages/yishi/index/index.js                    |  35 ++++-
 Pages/yishi/index/index.json                  |   2 +-
 Pages/yishi/index/index.wxml                  |  16 +-
 Pages/yishi/index/index.wxss                  |  28 ++--
 Pages/yishi/kuaisusetup/index.js              |   2 +-
 Pages/yishi/my/index.js                       |   8 +
 Pages/yishi/myaccount/index.wxml              |   2 +-
 Pages/yishi/myaccount/index.wxss              |   1 +
 Pages/yishi/mycard/index.wxss                 |   4 +-
 Pages/yishi/myinfo/index.js                   |  11 +-
 Pages/yishi/onlinesetup/index.js              |   2 +-
 Pages/yishi/onlinesetup/index.wxml            |   2 +-
 Pages/yishi/onlinesetupprice/index.wxml       |   2 +-
 Pages/yishi/orderdetail/index.js              |  47 +++++-
 Pages/yishi/orderdetail/index.json            |   4 +-
 Pages/yishi/orderdetail/index.wxml            |  39 ++---
 Pages/yishi/orderdetail/index.wxss            |  12 +-
 Pages/yishi/quickreply/index.wxss             |  19 ++-
 Pages/yishi/service_notice/index.js           |  11 +-
 Pages/yishi/service_notice/index.wxml         |   2 +-
 Pages/yishi/wenzhen_v2/substr.wxs             |  12 ++
 Pages/yishi/wenzhen_v2/wenzhen.js             | 139 +++++++++++++++---
 Pages/yishi/wenzhen_v2/wenzhen.json           |   7 +-
 Pages/yishi/wenzhen_v2/wenzhen.wxml           |  29 +++-
 Pages/yishi/wenzhen_v2/wenzhen.wxss           |   5 +-
 Pages/yishi/wenzhenorderV2/index.wxml         |   2 +-
 Pages/yishi/yizhensetup/index.js              |   2 +-
 Pages/yishi/yizhensetupprice/index.js         |   2 +-
 .../MessageElements/CustomMessage/index.js    |  12 ++
 .../MessageElements/RevokeMessage/index.wxml  |   5 +-
 .../TUIChat/components/MessageList/index.js   |  66 +++++++--
 .../TUIChat/components/MessageList/index.wxml |  10 +-
 TUIKit/components/TUIChat/index.wxml          |   2 +-
 app.js                                        |  17 ++-
 commpents/te_navbar/index.js                  |   1 +
 commpents/te_navbar/index.wxml                |   2 +-
 custom-tab-bar/index.js                       |  51 +++++--
 utils/network/api.js                          |  30 ++++
 utils/util.js                                 |  57 ++++++-
 53 files changed, 657 insertions(+), 205 deletions(-)
 create mode 100644 Pages/yishi/wenzhen_v2/substr.wxs

diff --git a/Pages/index/index.js b/Pages/index/index.js
index 0757550..386f8ea 100644
--- a/Pages/index/index.js
+++ b/Pages/index/index.js
@@ -15,6 +15,7 @@ Page({
     }
     this.setData({ loading: false });
   },
+  
   goCheck(e){
     console.log(e);
     let usertype = e.currentTarget.dataset.usertype;
diff --git a/Pages/yaoshi/home/home.js b/Pages/yaoshi/home/home.js
index 0bc357c..6be686b 100644
--- a/Pages/yaoshi/home/home.js
+++ b/Pages/yaoshi/home/home.js
@@ -20,21 +20,27 @@ Page({
     data_list_1: [],
     data_list_2: [],
     data_list_3: [],
+    current_page: 0,
+    total: 0,
+    per_page: 0,
+    last_page: 0,
   },
 
-  onLoad() {
-    console.log(this.data.height)
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
+  onShow() {
     if (typeof this.getTabBar === 'function' && this.getTabBar()) {
       this.getTabBar().setData({
         active: 0,  //数字是当前页面在tabbar的索引,如我的查询页索引是2，因此这边为2，同理首页就为0，审批页面为1
       })
     }
+
+    this.getPharmacistPrescription(this.data.active);
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onLoad: function () {
+   
     api.getPharmacistIndex().then(response => {
       this.setData({
         pharmacist: response.data.pharmacist,
@@ -44,11 +50,11 @@ Page({
       console.error(errors);
     })
 
-   this.getPharmacistPrescription();
+
   },
-  getPharmacistPrescription(){
+  getPharmacistPrescription(active){
     let params = {};
-    let active = this.data.active;
+    let page = this.data.current_page + 1;
     let pharmacist_audit_status = 0;
     let platform_audit_status = 1;
 
@@ -70,21 +76,51 @@ Page({
     }
     params.pharmacist_audit_status = pharmacist_audit_status;
     params.platform_audit_status = platform_audit_status;
+    params.page = page;
     let data_name = "data_list_"+active;
+    let list = this.data[data_name];
     api.getPharmacistPrescription(params).then(response => {
       this.setData({
-        [data_name]: response.data.data
+        [data_name]: list.concat(response.data.data),
+        current_page: response.data.current_page,
+        total: response.data.total,
+        per_page: response.data.per_page,
+        last_page: response.data.last_page,
       })
     }).catch(errors => {
       console.error(errors);
     })
   },
+  onHide(){
+    this.setData({
+      current_page: 0,
+      total: 0,
+      per_page: 0,
+      last_page: 0,
+      data_list_0: [],
+      data_list_1: [],
+      data_list_2: [],
+      data_list_3: [],
+    })
+  },
   onChange(e){
     console.log(e)
+    let data_name = "data_list_"+e.detail.index;
     this.setData({
-      active: e.detail.index
+      active: e.detail.index,
+      current_page: 0,
+      total: 0,
+      per_page: 0,
+      last_page: 0,
+      [data_name]: []
     })
-    this.getPharmacistPrescription();
+    this.getPharmacistPrescription(e.detail.index);
+  },
+  onReachBottom() {
+    console.log('===触底了！！===');
+    if(this.data.current_page < this.data.last_page){//最后一页时停止分页
+      this.getPharmacistPrescription(this.data.active)
+    }
   },
   go(e){
     let url = e.currentTarget.dataset.url;
diff --git a/Pages/yaoshi/home/home.json b/Pages/yaoshi/home/home.json
index a8a0021..1ec3886 100644
--- a/Pages/yaoshi/home/home.json
+++ b/Pages/yaoshi/home/home.json
@@ -6,6 +6,7 @@
     "van-tabs": "@vant/weapp/tabs/index",
     "t-avatar": "tdesign-miniprogram/avatar/avatar",
     "van-button": "@vant/weapp/button/index",
-    "van-empty": "@vant/weapp/empty/index"
+    "van-empty": "@vant/weapp/empty/index",
+    "van-divider": "@vant/weapp/divider/index"
   }
 }
\ No newline at end of file
diff --git a/Pages/yaoshi/home/home.wxml b/Pages/yaoshi/home/home.wxml
index 619ca77..b3e7aec 100644
--- a/Pages/yaoshi/home/home.wxml
+++ b/Pages/yaoshi/home/home.wxml
@@ -13,7 +13,7 @@
     </view>
   </view>
   <view class="main content">
-    <van-tabs active="{{ active }}" color="{{ active_color }}" bind:change="onChange">
+    <van-tabs color="{{ active_color }}" bind:change="onChange">
       <van-tab title="待审核处方">
         <view class="item_list" wx:if="{{data_list_0.length>0}}">
           <view class="item" wx:for="{{data_list_0}}">
@@ -28,7 +28,7 @@
 
             <view class="item_txt">
               <view class="pre_content">开方时间：{{item.created_at}}</view>
-              <view class="end_content" bindtap="go" data-url="/Pages/yaoshi/medicalrecord/medicalrecord?order_inquiry_id={{item.order_inquiry_id	}}&order_prescription_id={{item.order_prescription_id}}">
+              <view class="end_content" bindtap="go" data-url="/Pages/yaoshi/medicalrecord/medicalrecord?order_inquiry_id={{item.order_inquiry_id	}}&order_prescription_id={{item.order_prescription_id}}&from=1">
                 <van-button type="primary" color="#ec871e" size="small">查看病例</van-button>
               </view>
             </view>
@@ -40,6 +40,7 @@
               </view>
             </view>
           </view>
+        <van-divider contentPosition="center" wx:if="{{data_list_0.length > 0 && current_page == last_page}}">到底了~</van-divider>
         </view>
         <van-empty description="暂无数据" wx:if="{{data_list_0.length == 0}}" />
       </van-tab>
@@ -65,6 +66,7 @@
             </view>
           </view>
         </view>
+        <van-divider contentPosition="center" wx:if="{{data_list_1.length > 0 && current_page == last_page}}">到底了~</van-divider>
         </view>
         <van-empty description="暂无数据" wx:if="{{data_list_1.length == 0}}" />
       </van-tab>
@@ -89,7 +91,14 @@
               <!-- <van-button type="primary" color="linear-gradient(to bottom, #5EA8D5, #63CFEA)" size="small">去审方</van-button> -->
             </view>
           </view>
+          <view class="item_txt">
+            <view class="pre_content">驳回时间：{{item.pharmacist_verify_time}}</view>
+          </view>
+          <view class="item_txt">
+            <view class="pre_content">驳回理由：{{item.pharmacist_fail_reason}}</view>
+          </view>
         </view>
+        <van-divider contentPosition="center" wx:if="{{data_list_2.length > 0 && current_page == last_page}}">到底了~</van-divider>
         </view>
         <van-empty description="暂无数据" wx:if="{{data_list_2.length == 0}}" />
       </van-tab>
@@ -115,6 +124,7 @@
             </view>
           </view>
         </view>
+        <van-divider contentPosition="center" wx:if="{{data_list_3.length > 0 && current_page == last_page}}">到底了~</van-divider>
         </view>
         <van-empty description="暂无数据" wx:if="{{data_list_3.length == 0}}" />
       </van-tab>
diff --git a/Pages/yaoshi/medicalrecord/medicalrecord.js b/Pages/yaoshi/medicalrecord/medicalrecord.js
index 54df78b..94e656e 100644
--- a/Pages/yaoshi/medicalrecord/medicalrecord.js
+++ b/Pages/yaoshi/medicalrecord/medicalrecord.js
@@ -12,15 +12,18 @@ Page({
     height: app.globalData.height,
     order_inquiry_id: "",
     order_prescription_id: "",
-    case_detail: {}
+    case_detail: {},
+    from: ""
   },
   onLoad(options) {
     let order_inquiry_id = options.order_inquiry_id;
     let order_prescription_id = options.order_prescription_id;
+    let from = options.from;
     console.log("order_inquiry_id: ", order_inquiry_id);
     this.setData({
       order_inquiry_id: order_inquiry_id,
       order_prescription_id: order_prescription_id,
+      from: from,
     })
   },
   onShow(){
diff --git a/Pages/yaoshi/medicalrecord/medicalrecord.wxml b/Pages/yaoshi/medicalrecord/medicalrecord.wxml
index 6a8eb72..8829e62 100644
--- a/Pages/yaoshi/medicalrecord/medicalrecord.wxml
+++ b/Pages/yaoshi/medicalrecord/medicalrecord.wxml
@@ -22,7 +22,7 @@
     <view class="item"><text class="item_title">复诊凭证</text></view>
   </view>
   <view class="go_check" bindtap="go" data-url="/Pages/yaoshi/prescription/prescription?order_prescription_id={{order_prescription_id}}">
-    <van-button color="linear-gradient(to right, #4CABEA, #64CFE9)" block round type="info">前往审方</van-button>
+    <van-button wx:if="{{from == '1'}}" color="linear-gradient(to right, #4CABEA, #64CFE9)" block round type="info">前往审方</van-button>
   </view>
   <view class="bottom"></view>
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/appraise/index.js b/Pages/yishi/appraise/index.js
index 9a0b2de..47c86e5 100644
--- a/Pages/yishi/appraise/index.js
+++ b/Pages/yishi/appraise/index.js
@@ -36,7 +36,7 @@ Page({
   onReachBottom() {
     console.log('===触底了！！===');
     if(this.data.current_page < this.data.last_page){//最后一页时停止分页
-      this.getDoctorEvaluationList()
+      this.getDoctorEvaluationList(this.data.evaluation_type)
     }
   },
   onLoad(option){
@@ -48,7 +48,7 @@ Page({
   },
   onShow(){ 
     console.log("onShow");
-    this.getDoctorEvaluationList();
+    this.getDoctorEvaluationList(1);
   },
   onTabsChange(e){
     console.log(e);
@@ -59,18 +59,17 @@ Page({
       last_page: 0,
       [list_name]: []
     })
-    this.getDoctorEvaluationList()
+    this.getDoctorEvaluationList(e.detail.name)
   },
-  getDoctorEvaluationList(){
+  getDoctorEvaluationList(evaluation_type){
     //获取评价列表
     let params = {};
     params.page = this.data.current_page + 1;
     params.doctor_id = this.data.doctor_id;
-    params.evaluation_type = this.data.evaluation_type;
+    params.evaluation_type = evaluation_type;
     api.getDoctorEvaluation(params).then(response => {
-      console.log(response);
       if(response.data.total > 0){
-        let list_name = "appraise_list_" + this.data.evaluation_type;
+        let list_name = "appraise_list_" + evaluation_type;
         console.log(list_name);
         let apprise_list = this.data[list_name];
         this.setData({
diff --git a/Pages/yishi/appraise/index.json b/Pages/yishi/appraise/index.json
index 01214cc..34bf6ab 100644
--- a/Pages/yishi/appraise/index.json
+++ b/Pages/yishi/appraise/index.json
@@ -9,6 +9,5 @@
     "t-rate": "tdesign-miniprogram/rate/rate",
     "van-divider": "@vant/weapp/divider/index"
   },
-  "enablePullDownRefresh": true,
   "onReachBottomDistance": 100
 }
\ No newline at end of file
diff --git a/Pages/yishi/cash/index.js b/Pages/yishi/cash/index.js
index 5a1a320..71740f0 100644
--- a/Pages/yishi/cash/index.js
+++ b/Pages/yishi/cash/index.js
@@ -18,7 +18,7 @@ Page({
     income_tax: "xx",
     contactKeFu: false,
     skeleton_loading: true,
-    order_inquiry_ids: ""
+    order_inquiry_ids: []
   },
   onLoad(option){
     let order_inquiry_ids = option.order_inquiry_ids;
@@ -62,6 +62,7 @@ Page({
           bank_name	: response.data.bank.bank_name,
           bank_card_code_mask: response.data.bank.bank_card_code_mask,
           withdrawal_amount: response.data.withdrawal_amount,
+          order_inquiry_ids: response.data.order_inquiry_ids,
           income_tax: response.data.income_tax,
           skeleton_loading: false
         })
@@ -69,5 +70,25 @@ Page({
     }).catch(errors => {
       console.error(errors);
     })
+  },
+  postDoctorWithdrawal(){
+    let params = {};
+    params.order_inquiry_id = this.data.order_inquiry_ids.join(",");
+    params.withdrawal_amount_total = this.data.withdrawal_amount;
+    params.bank_card_id = this.data.bank_card_id;
+    //获取提现数据
+    api.postDoctorWithdrawal(params).then(response => {
+      console.log(response);
+      this.setData({
+        withdrawal_amount: 0,
+        income_tax: 0
+      })
+      wx.showToast({
+        title: '提现申请成功',
+        icon: "success"
+      })
+    }).catch(errors => {
+      console.error(errors);
+    })
   }
 })
\ No newline at end of file
diff --git a/Pages/yishi/cash/index.wxml b/Pages/yishi/cash/index.wxml
index bd83843..ba14638 100644
--- a/Pages/yishi/cash/index.wxml
+++ b/Pages/yishi/cash/index.wxml
@@ -58,7 +58,7 @@
   </view> -->
 
   <view class="bottom">
-    <van-button custom-style="border-radius: 10rpx;font-size: 30rpx;" block color="#3CC7C0">提取</van-button>
+    <van-button bind:click="postDoctorWithdrawal" disabled="{{order_inquiry_ids.length == 0}}" custom-style="border-radius: 10rpx;font-size: 30rpx;" block color="#3CC7C0">提取</van-button>
     <view class="kefu" bindtap="contactKeFu">
       <text>联系客服</text>
     </view>
diff --git a/Pages/yishi/cashrecord/index.js b/Pages/yishi/cashrecord/index.js
index 0d9255c..ec7de6c 100644
--- a/Pages/yishi/cashrecord/index.js
+++ b/Pages/yishi/cashrecord/index.js
@@ -23,11 +23,16 @@ Page({
     ],
   },
   onLoad(){
-    this.getDoctorWithdrawalRecord();
+    let year = this.data.select_date;
+    year = Number(year);
+    this.getDoctorWithdrawalRecord(year);
   },
-  getDoctorWithdrawalRecord(){
+  getDoctorWithdrawalRecord(year){
+    this.setData({
+      record_list: []
+    })
     //获取提现数据
-    api.getDoctorWithdrawalRecord({year: this.data.select_date}).then(response => {
+    api.getDoctorWithdrawalRecord({year: year}).then(response => {
       console.log(response);
       if(response.data.total > 0){
         this.setData({
@@ -46,28 +51,22 @@ Page({
   onPickerChange(e) {
     const { key } = e.currentTarget.dataset;
     const { value } = e.detail;
-
     console.log('picker change:', e.detail);
-
     this.setData({
       select_date: value
     })
-
-    this.getDoctorWithdrawalRecord();
-
+    let year = this.data.select_date;
+    year = Number(year);
+    this.getDoctorWithdrawalRecord(year);
   },
   onColumnChange(e) {
     const { key } = e.currentTarget.dataset;
     const { value } = e.detail;
-
     console.log('Column change:', e.detail);
-    
   },
   onPickerCancel(e) {
     const { key } = e.currentTarget.dataset;
     const { value } = e.detail;
-
     console.log('picker Cancel:', e.detail);
-
   }
 })
\ No newline at end of file
diff --git a/Pages/yishi/cashrecord/index.wxml b/Pages/yishi/cashrecord/index.wxml
index 2cf1161..af3320d 100644
--- a/Pages/yishi/cashrecord/index.wxml
+++ b/Pages/yishi/cashrecord/index.wxml
@@ -15,13 +15,13 @@
         </view>
         <view class="data_item_top_content">
           <view class="name">{{item.account_name}}<text style="margin-left:20rpx;font-size: 28rpx;color:#999;">（尾号{{item.bank_card_code_four}}）</text></view>
-          <view class="date">{{item.examine_time}}</view>
+          <view class="date">{{item.created_at}}</view>
         </view>
         <view class="data_item_top_num">
           <view class="jine">￥{{item.applied_withdrawal_amount}}</view>
           <view class="status_box">
             <!-- 审核状态（1:审核中 2:审核通过 3:审核未通过） -->
-            <view class="status status_ing">{{item.examine_status}}</view>
+            <view class="status status_ing">{{item.examine_status==1?'审核中':item.examine_status==2?'审核通过':item.examine_status==3?'审核未通过':'未知'}}</view>
           </view>
         </view>
       </view>
diff --git a/Pages/yishi/chufangsetup/index.wxss b/Pages/yishi/chufangsetup/index.wxss
index 467ac1d..7dd3d59 100644
--- a/Pages/yishi/chufangsetup/index.wxss
+++ b/Pages/yishi/chufangsetup/index.wxss
@@ -47,12 +47,11 @@ page{
   font-size: 34rpx;
 }
 .item_top_sex{
-  flex: 3;
+  flex: 1;
   font-size: 34rpx;
   color: #666;
 }
 .item_top_status_box{
-  flex: 1;
 }
 .item_top_status{
   padding: 10rpx;
diff --git a/Pages/yishi/identity/index.js b/Pages/yishi/identity/index.js
index 4343060..702f372 100644
--- a/Pages/yishi/identity/index.js
+++ b/Pages/yishi/identity/index.js
@@ -347,12 +347,12 @@ Page({
   postDoctorAuthReal(){
 
     let _this = this;
-    const realname = this.data.realname.trim();
+    let realname = this.data.realname.trim();
     const idcard = this.data.idcard.trim();
 
     console.log("realname: ",realname);
     console.log("idcard: ", idcard);
-
+    realname = realname.replace(/•/g,"·");
     var realname_reg= /^(([a-zA-Z+\.?\·?a-zA-Z+]{2,30}$)|([\u4e00-\u9fa5+\·?\u4e00-\u9fa5+]{2,30}$))/;
     var idcard_reg=/^(^[1-9]\d{5}[1-9]\d{3}(((0[2])([0|1|2][0-8])|(([0-1][1|4|6|9])([0|1|2][0-9]|[3][0]))|(((0[1|3|5|7|8])|(1[0|2]))(([0|1|2]\d)|3[0-1]))))((\d{4})|\d{3}[Xx])$)$/;
 
diff --git a/Pages/yishi/index/index.js b/Pages/yishi/index/index.js
index 565acff..d71614a 100644
--- a/Pages/yishi/index/index.js
+++ b/Pages/yishi/index/index.js
@@ -126,9 +126,9 @@ Page({
     funbox_height = rpxTopx(funbox_height);
     // 147 userinfo的高度
     // 155 认证部分的高度
-    // 150 广告部分的高度
+    // 168 广告部分的高度
     // 40 自定义适配
-    funbox_height = funbox_height - 147 - 20 - 30 - 20 - 155 - 30 - 150 - 20 - 30 - 30 - 30 - 30 - 40;
+    funbox_height = funbox_height - 147 - 20 - 30 - 20 - 155 - 30 - 168 - 20 - 30 - 30 - 30 - 30 - 40;
     funbox_height = funbox_height / 3;
     if(funbox_height > 150) funbox_height = 150
     this.setData({
@@ -173,9 +173,32 @@ Page({
     console.log("index onHide() onHide() ");
     this.setData({
       swiperList: [],
-      contactKeFu: false
+      contactKeFu: false,
+      info:{
+        user_name: "医师姓名",
+        not_accepted_inquiry_num: 0,
+        accepting_inquiry_num: 0,
+        info_shiming_status_txt: "未认证",
+        info_shiming_status: "info_shiming_status_no",
+        show_info_note: false,
+        praise_rate: "100%",
+        avg_response_time: 0,
+        number_of_fans: 0,
+        avatar: "https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/default_photo.png",
+        reject_prescription_number: false,//处方管理小红点
+      },
+      iden_auth_status_txt: "未认证",
+      multi_point_status_txt: "未认证",
+      shiming_status_url: "",
+      iden_auth_status_url: "/Pages/yishi/identity/index",
+      multi_point_status_url: "/Pages/yishi/zhiye_identity/index",
+      skeleton_loading: true
     })
     wx.offCopyUrl(this.Copylistener) // 需传入与监听时同一个的函数对象
+
+    if (typeof this.getTabBar === 'function' && this.getTabBar()) {
+      this.getTabBar().stopInterval()
+    }
   },
   Copylistener(res){
     setTimeout(()=>{
@@ -197,6 +220,8 @@ Page({
       this.getTabBar().setData({
         active: 0,  //数字是当前页面在tabbar的索引,如我的查询页索引是2，因此这边为2，同理首页就为0，审批页面为1
       })
+
+      this.getTabBar().startInterval()
     }
     this.getMenuButtonBound();
     this.getFunboxHeight();
@@ -282,9 +307,7 @@ Page({
     })
   },
   onTapAD(e) {
-    const { index } = e.detail;
-    console.log(index);
-    let item = this.data.banner[index];
+    let item = e.currentTarget.dataset.item;
     console.log(item);
     let open_with = item.open_with;
     let banner_link = item.banner_link;
diff --git a/Pages/yishi/index/index.json b/Pages/yishi/index/index.json
index e4f6673..a2f67d2 100644
--- a/Pages/yishi/index/index.json
+++ b/Pages/yishi/index/index.json
@@ -9,6 +9,6 @@
     "van-image": "@vant/weapp/image/index",
     "t-skeleton": "tdesign-miniprogram/skeleton/skeleton"
   },
-  "enablePullDownRefresh": true,
+  "enablePullDownRefresh": false,
   "backgroundTextStyle":"dark"
 }
\ No newline at end of file
diff --git a/Pages/yishi/index/index.wxml b/Pages/yishi/index/index.wxml
index 30c8bef..f25e1f0 100644
--- a/Pages/yishi/index/index.wxml
+++ b/Pages/yishi/index/index.wxml
@@ -1,3 +1,4 @@
+<page-meta page-style="{{ true ? 'overflow: hidden;' : '' }}" />
 <view class="container" id="container">
   <!-- 顶部背景 -->
   <view class="top_bk"></view>
@@ -19,7 +20,7 @@
           <view class="info_mobile" wx:if="{{!skeleton_loading}}">{{info.user_name}}</view>
           <t-skeleton theme="text" row-col="{{[1]}}" animation="gradient" loading="{{skeleton_loading}}" />
         </view>
-        <view class="info_shiming" bindtap="go" data-url="{{shiming_status_url}}">
+        <view class="info_shiming" bindtap="go" data-url="{{shiming_status_url}}" wx:if="{{!skeleton_loading}}">
           <view class="info_shiming_status {{info.info_shiming_status}}" wx:if="{{!skeleton_loading}}">{{info.info_shiming_status_txt}}</view>
           <t-skeleton theme="text" row-col="{{[1]}}" animation="gradient" loading="{{skeleton_loading}}" />
         </view>
@@ -93,7 +94,7 @@
   </view>
   <!-- 广告版块 -->
   <view class="ad">
-    <t-swiper
+    <!-- <t-swiper
       height="110rpx"
       duration="{{duration}}"
       interval="{{interval}}"
@@ -104,7 +105,16 @@
       data-url="123"
       wx:if="{{!skeleton_loading}}"
     >
-    </t-swiper>
+    </t-swiper> -->
+    <swiper class="swiper" indicator-dots="{{true}}" circular="{{true}}"  indicator-active-color="#3CC7C0" autoplay="{{true}}" interval="3000">
+        <block wx:for="{{banner}}" wx:key="*this">
+          <swiper-item>
+            <view class="swiper-item">
+                <image class="swiperimg" src="{{item.banner_path}}" data-item="{{item}}" bindtap="onTapAD"></image>
+            </view>
+          </swiper-item>
+        </block>
+      </swiper>
   </view>
   <!-- 功能模块 -->
   <view class="fun_box">
diff --git a/Pages/yishi/index/index.wxss b/Pages/yishi/index/index.wxss
index 92efe8c..e3915bd 100644
--- a/Pages/yishi/index/index.wxss
+++ b/Pages/yishi/index/index.wxss
@@ -22,7 +22,6 @@ page{
   font-size: 35rpx;
   color: #fff;
   background-color: #3CC7C0;
-  width: 100%;
   z-index: 999;
 }
 .info_box{
@@ -105,6 +104,7 @@ page{
   align-items: center;
   text-align: center;
   margin-top: 20rpx;
+  margin-left: 20rpx;
 }
 .info_note_txt{
   font-size: 28rpx;
@@ -160,24 +160,20 @@ page{
 .renzheng_content_right_img{
   width: 100%;
 }
-.ad{
-  padding: 20rpx 20rpx 0 20rpx;
-  width: calc(90vw - 40rpx);
-  height: 150rpx;
-  margin: 0 auto;
-  box-shadow: 0px 2px 10px 0px rgba(0,0,0,0.1);
+.ad {
+  width: calc(92vw - 40rpx);
   border-radius: 10rpx;
-  background-color: rgb(255, 255, 255);
-
+  margin: 0 auto;
+  background-color: #fff;
+  padding: 20rpx 20rpx 0 20rpx;
 }
-.t-swiper-nav--bottom {
-  bottom: -24rpx !important;
+.swiper{
+  height:168rpx; 
 }
-.t-swiper-nav__dots-item {
-  background: var(--td-swiper-nav-dot-color, var(--td-font-white-2, rgb(107, 106, 106))) !important;
-}
-.t-swiper-nav__dots-item--active {
-  background-color: var(--td-swiper-nav-dot-active-color, var(--td-font-white-1, #3CC7C0)) !important;
+.swiper-item .swiperimg{
+  width:100%;
+  border-radius: 10rpx;
+  height:110rpx;
 }
 .fun_box{
   width: 90vw;
diff --git a/Pages/yishi/kuaisusetup/index.js b/Pages/yishi/kuaisusetup/index.js
index 71d18fa..62f295c 100644
--- a/Pages/yishi/kuaisusetup/index.js
+++ b/Pages/yishi/kuaisusetup/index.js
@@ -79,7 +79,7 @@ Page({
     }).then(()=>{
       if(detail){
         wx.requestSubscribeMessage({
-          tmplIds: ['G1RIs0RYqsTQ2CuPQWalIGVet9sd_d371YtDVhfBsFg'],
+          tmplIds: ['G1RIs0RYqsTQ2CuPQWalIMyb6_deuEEbJfajfhGvNzc'],
           success (res) {
             console.log(res);//同意授权
           }
diff --git a/Pages/yishi/my/index.js b/Pages/yishi/my/index.js
index f54969d..76ea0cd 100644
--- a/Pages/yishi/my/index.js
+++ b/Pages/yishi/my/index.js
@@ -47,6 +47,9 @@ Page({
       this.getTabBar().setData({
         active: 2  //数字是当前页面在tabbar的索引,如我的查询页索引是2，因此这边为2，同理首页就为0，审批页面为1
       })
+
+      this.getTabBar().startInterval()
+      
     }
     this.getMenuButtonBound();
  
@@ -76,6 +79,11 @@ Page({
       console.error(errors);
     })
   },
+  onHide(){
+    if (typeof this.getTabBar === 'function' && this.getTabBar()) {
+      this.getTabBar().stopInterval()
+    }
+  },
   go(e){
     let url = e.currentTarget.dataset.url;
     app.go(url)
diff --git a/Pages/yishi/myaccount/index.wxml b/Pages/yishi/myaccount/index.wxml
index f675229..0d97cea 100644
--- a/Pages/yishi/myaccount/index.wxml
+++ b/Pages/yishi/myaccount/index.wxml
@@ -20,7 +20,7 @@
   <view class="txt_title">账单</view>
   <view class="content">
     <van-cell size="large" bindtap="goDetail" data-url="/Pages/yishi/orderdetail/index" data-md="{{item.month}}-{{item.day}}" title-style="font-size: 30rpx;" title="{{item.month}}月{{item.day}}日" value="+{{item.total_amount}}元"  is-link wx:for="{{bill}}" />
-    <van-empty description="暂无账单" wx:if="{{ bill }}" />
+    <van-empty description="暂无账单" wx:if="{{ bill.length == 0 }}" />
   </view>
 
   <van-image style="position: fixed; right: 0;bottom: 262rpx;" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/account_rule.png" fit="heightFix" height="84rpx" aria-label="role" />
diff --git a/Pages/yishi/myaccount/index.wxss b/Pages/yishi/myaccount/index.wxss
index 3b5f6cb..e1a2f53 100644
--- a/Pages/yishi/myaccount/index.wxss
+++ b/Pages/yishi/myaccount/index.wxss
@@ -57,6 +57,7 @@ page{
   margin: 20rpx 0;
   position: relative;
   left: 4vw;
+  width: 20vw;
 }
 .content{
   width: 92vw;
diff --git a/Pages/yishi/mycard/index.wxss b/Pages/yishi/mycard/index.wxss
index 08ff85e..1ed2838 100644
--- a/Pages/yishi/mycard/index.wxss
+++ b/Pages/yishi/mycard/index.wxss
@@ -93,7 +93,7 @@
 .header {
   display: flex;
   align-items: center;
-  height: 116rpx;
+  padding: 20rpx ;
 }
 
 .title {
@@ -127,6 +127,6 @@
 }
 .t_icon{
   background-color: #3B83FF;
-  padding: 40rpx;
+  padding: 30rpx;
   border-radius: 50%;
 }
diff --git a/Pages/yishi/myinfo/index.js b/Pages/yishi/myinfo/index.js
index 8367253..308d71f 100644
--- a/Pages/yishi/myinfo/index.js
+++ b/Pages/yishi/myinfo/index.js
@@ -54,16 +54,7 @@ Page({
           wx.setStorageSync('AUTH_TOKEN_'+usertype, "");
           wx.setStorageSync('user_id_'+usertype, "");
           wx.setStorageSync('client_user_id_'+usertype, "");
-          if(wx.$TUIKit){
-            let promise = wx.$TUIKit.logout();
-            wx.$TUIKit = undefined;
-            promise.then(function(imResponse) {
-              console.log(imResponse.data); // 登出成功
-            }).catch(function(imError) {
-              console.warn('logout error:', imError);
-            });
-          }
-          app.clearAllInterval()
+          app.imLogout();
           app.go("/Pages/index/index");
         } else if (res.cancel) {
           console.log('用户点击取消')
diff --git a/Pages/yishi/onlinesetup/index.js b/Pages/yishi/onlinesetup/index.js
index 58c5c32..df3f035 100644
--- a/Pages/yishi/onlinesetup/index.js
+++ b/Pages/yishi/onlinesetup/index.js
@@ -73,7 +73,7 @@ Page({
     }).then(()=>{
       if(detail){
         wx.requestSubscribeMessage({
-          tmplIds: ['G1RIs0RYqsTQ2CuPQWalIGVet9sd_d371YtDVhfBsFg'],
+          tmplIds: ['G1RIs0RYqsTQ2CuPQWalIMyb6_deuEEbJfajfhGvNzc'],
           success (res) {
             console.log(res);//同意授权
           }
diff --git a/Pages/yishi/onlinesetup/index.wxml b/Pages/yishi/onlinesetup/index.wxml
index a3582c3..617493d 100644
--- a/Pages/yishi/onlinesetup/index.wxml
+++ b/Pages/yishi/onlinesetup/index.wxml
@@ -41,7 +41,7 @@
       提示：服务开启后，患者按照所设置的价格向您购买图文问诊服务
     1、接诊后，患者可与您在{{config.duration/60}}小时内进行{{config.times_number}}回合沟通 
     2、若开启公益问诊，图文问诊价格以公益问诊价格为准
-    3、问诊价格每日仅限调整1次，每月仅限调整5次 
+    3、每日接诊数量和问诊价格每日仅限调整1次，每月仅限调整5次 
     4、价格修改后立即生效，不影响修改之前已生成的问诊订单 
     </text>
   </view>
diff --git a/Pages/yishi/onlinesetupprice/index.wxml b/Pages/yishi/onlinesetupprice/index.wxml
index 3d4a7c7..9951f9f 100644
--- a/Pages/yishi/onlinesetupprice/index.wxml
+++ b/Pages/yishi/onlinesetupprice/index.wxml
@@ -22,7 +22,7 @@
     提示：服务开启后，患者按照所设置的价格向您购买图文问诊服务
     1、接诊后，患者可与您在{{config.duration/60}}小时内进行{{config.times_number}}回合沟通 
     2、若开启公益问诊，图文问诊价格以公益问诊价格为准
-    3、问诊价格每日仅限调整1次，每月仅限调整5次 
+    3、每日接诊数量和问诊价格每日仅限调整1次，每月仅限调整5次 
     4、价格修改后立即生效，不影响修改之前已生成的问诊订单 
   </text>
 </view>
diff --git a/Pages/yishi/orderdetail/index.js b/Pages/yishi/orderdetail/index.js
index 9434029..2215c1c 100644
--- a/Pages/yishi/orderdetail/index.js
+++ b/Pages/yishi/orderdetail/index.js
@@ -6,23 +6,56 @@ Page({
   data: {
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
-      title: '问诊详情 ', //导航栏 中间的标题
+      title: '收益明细 ', //导航栏 中间的标题
     },
     height: app.globalData.height, 
-    current_page: 1,
+    list: [],
+    date: "",
+    current_page: 0,
     total: 0,
     per_page: 0,
     last_page: 0
   },
-
+  onReachBottom() {
+    console.log('===触底了！！===');
+    if(this.data.current_page < this.data.last_page){//最后一页时停止分页
+      this.getDoctorAccountInfo()
+    }
+  },
   onLoad(option){
     let date = option.date;
     console.log(date);
-    
-    //获取我的账户日账单明细数据
-    api.getDoctorAccountInfo({date:date}).then(response => {
+    this.setData({
+      date: date
+    })
+  },
+  onHide(){
+    this.setData({
+      list: [],
+      date: "",
+      current_page: 0,
+      total: 0,
+      per_page: 0,
+      last_page: 0
+    })
+  },
+  onShow(){
+    this.getDoctorAccountInfo();
+  },
+  getDoctorAccountInfo(){
+    let list = this.data.list
+    let params = {};
+    params.page = this.data.current_page + 1;
+    params.date = this.data.date;
+    api.getDoctorAccountInfo(params).then(response => {
       console.log(response);
-      //暂没数据
+      this.setData({
+        list: list.concat(response.data.data),
+        current_page: response.data.current_page,
+        total: response.data.total,
+        per_page: response.data.per_page,
+        last_page: response.data.last_page,
+      })
     }).catch(errors => {console.error(errors);})
   }
 })
\ No newline at end of file
diff --git a/Pages/yishi/orderdetail/index.json b/Pages/yishi/orderdetail/index.json
index 3b3b8cc..7767c10 100644
--- a/Pages/yishi/orderdetail/index.json
+++ b/Pages/yishi/orderdetail/index.json
@@ -1,6 +1,8 @@
 {
   "component": true,
   "usingComponents": {
-    "te-nav-bar": "/commpents/te_navbar"
+    "te-nav-bar": "/commpents/te_navbar",
+    "van-empty": "@vant/weapp/empty/index",
+    "van-divider": "@vant/weapp/divider/index"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/orderdetail/index.wxml b/Pages/yishi/orderdetail/index.wxml
index 371eafe..07ef182 100644
--- a/Pages/yishi/orderdetail/index.wxml
+++ b/Pages/yishi/orderdetail/index.wxml
@@ -1,37 +1,24 @@
 <!-- 收益明细 -->
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
-<view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
+<view class="container">
   <view class="order_list">
-    <view class="order_item">
+    <view class="order_item" wx:for="{{list}}">
       <view class="order_item_content">
         <view class="order_item_content_top ">
-        快速问诊
-        <view class="order_status order_status_ing">接诊中</view>
+          {{ item.inquiry_type==1?'专家问诊':item.inquiry_type==2?'快速问诊':item.inquiry_type==3?'公益问诊':item.inquiry_type==4?'问诊购药':'其他' }}
+        <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>
         <view class="order_item_content_data">
-          <view class="order_id">订单编号：<text style="font-size: 30rpx;color: #666666;">2131231xxxx</text></view>
-          <view class="order_id">就诊患者：<text style="font-size: 30rpx;color: #666666;">张三三（女，25岁）</text></view>
-          <view class="order_id">接诊时间：<text style="font-size: 30rpx;color: #666666;">2022-12-30 11：23：23</text></view>
-          <view class="order_id">结束时间：<text style="font-size: 30rpx;color: #666666;">2022-12-12 11：23：23</text></view>
-          <view class="order_id">订单金额：<text style="font-size: 30rpx;color: #666666;">￥1212.00</text></view>
-          <view class="order_id">预计收入：<text style="font-size: 30rpx;color: #666666;">￥112.00</text></view>
+          <view class="order_id">订单编号：<text style="font-size: 30rpx;color: #666666;">{{item.inquiry_no}}</text></view>
+          <view class="order_id">就诊患者：<text style="font-size: 30rpx;color: #666666;">{{item.patient_name}}（{{item.patient_sex==1?'男':'女'}}，{{item.patient_age}}岁）</text></view>
+          <view class="order_id">接诊时间：<text style="font-size: 30rpx;color: #666666;">{{item.reception_time}}</text></view>
+          <view class="order_id">结束时间：<text style="font-size: 30rpx;color: #666666;">{{item.finish_time}}</text></view>
+          <view class="order_id">订单金额：<text style="font-size: 30rpx;color: #666666;">￥{{item.amount_total}}</text></view>
+          <view class="order_id">预计收入：<text style="font-size: 30rpx;color: #666666;">￥{{item.estimate_income}}</text></view>
         </view>
       </view>
     </view>
-  
-    <view class="order_item">
-      <view class="order_item_content">
-        <view class="order_item_content_top">
-        快速问诊
-        <view class="order_status order_status_cancle">已取消</view>
-        </view>
-        <view class="order_item_content_data">
-          <view class="order_id">就诊患者：<text style="font-size: 30rpx;color: #666666;">张三三/18/男</text></view>
-          <view class="order_id">订单编号：<text style="font-size: 30rpx;color: #666666;">2131231xxxx</text></view>
-          <view class="order_id">订单金额：<text style="font-size: 30rpx;color: #666666;">￥1212.00</text></view>
-          <view class="order_id">完成时间：<text style="font-size: 30rpx;color: #666666;">2022.12.30</text></view>
-        </view>
-      </view>
-    </view>
-    </view>
+    <van-empty description="暂无数据" wx:if="{{list.length == 0}}" />
+    <van-divider contentPosition="center" wx:if="{{list.length > 0 && current_page == last_page}}">到底了~</van-divider>
+  </view>
 </view>
diff --git a/Pages/yishi/orderdetail/index.wxss b/Pages/yishi/orderdetail/index.wxss
index 60ec399..1c81f27 100644
--- a/Pages/yishi/orderdetail/index.wxss
+++ b/Pages/yishi/orderdetail/index.wxss
@@ -1,27 +1,29 @@
-.container{
+page{
   background-color: #F4F4F4;
+}
+.container{
   width: 100vw;
-  height: 100vh;
 }
 .order_list{
   display: flex;
   width: 92vw;
   margin: 0 auto;
   flex-direction: column;
+  padding-bottom: 50rpx;
 }
 .order_item{
   display: flex;
   width: 100%;
   margin-top: 30rpx;
+  height: 500rpx;
 }
 .order_item_content{
-  flex: 10;
+  flex: 5;
   background-color: #fff;
   border-radius: 20rpx;
   display: flex;
   flex-direction: column;
   padding: 20rpx;
-  height: 600rpx;
 }
 .order_item_content_top{
   flex: 1;
@@ -45,7 +47,7 @@
   color: #fff;
 }
 .order_item_content_data{
-  flex: 3;
+  flex: 5;
   display: flex;
   flex-direction: column;
 }
diff --git a/Pages/yishi/quickreply/index.wxss b/Pages/yishi/quickreply/index.wxss
index 5b2fdbc..c09a494 100644
--- a/Pages/yishi/quickreply/index.wxss
+++ b/Pages/yishi/quickreply/index.wxss
@@ -42,21 +42,36 @@ page{
 .popup_box_title{
   flex: 1;
   display: flex;
-  align-items: center;
-  justify-content: space-around;
   border-bottom: 1px solid #E7E7E7;
+  align-items: center;
+  justify-content: center;
 }
 .cancle{
   font-size: 32rpx;
   color: rgba(0,0,0,0.6);
+  flex: 1;
+  height: 100rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 .title{
   font-size: 32rpx;
   color: rgba(0,0,0,0.9);
+  flex: 1;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100rpx;
 }
 .confirm{
   font-size: 32rpx;
   color: #3CC7C0;
+  flex: 1;
+  height: 100rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 .popup_box_content{
   flex: 5;
diff --git a/Pages/yishi/service_notice/index.js b/Pages/yishi/service_notice/index.js
index 81e8224..28da157 100644
--- a/Pages/yishi/service_notice/index.js
+++ b/Pages/yishi/service_notice/index.js
@@ -22,7 +22,16 @@ Page({
   },
   onShow(){
     this.getList();
-    
+  },
+  onHide(){
+    console.log("onHideonHide")
+    this.setData({
+      list: [],
+      current_page: 0,
+      total: 0,
+      per_page: 0,
+      last_page: 0,
+    })
   },
   getList(){
     let current_page = this.data.current_page;
diff --git a/Pages/yishi/service_notice/index.wxml b/Pages/yishi/service_notice/index.wxml
index f39a07e..4eae707 100644
--- a/Pages/yishi/service_notice/index.wxml
+++ b/Pages/yishi/service_notice/index.wxml
@@ -4,7 +4,7 @@
     <view class="item" wx:for="{{list}}" bindtap="go" data-item="{{item}}">
       <view class="item_top">
         <view class="item_img" wx:if="{{item.link_params.inquiry_type == 1}}">
-          <text style="margin-left: 10rpx;">快速问诊</text> 
+          <text style="margin-left: 10rpx;">在线问诊</text> 
           <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
         <view class="item_img" wx:if="{{item.link_params.inquiry_type == 2}}">
diff --git a/Pages/yishi/wenzhen_v2/substr.wxs b/Pages/yishi/wenzhen_v2/substr.wxs
new file mode 100644
index 0000000..7a50e2c
--- /dev/null
+++ b/Pages/yishi/wenzhen_v2/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
+}
\ No newline at end of file
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index dffc2a3..dd2a3dd 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -18,6 +18,7 @@ Page({
     data_list_5: [],
     conversationList: [],
     message_inquiry_type: 99999,
+    now_message_inquiry_type: 5,
     system_notice_unreadnnum: "",
     service_notice_unreadnnum: "",
     hasOnShow: false,
@@ -25,7 +26,11 @@ Page({
     show_dialog_from_account: "",
     show_dialog_order_inquiry_id: "",
     show_dialog_inquiry_type: "",
-    unreadnnum_inter: 0
+    unreadnnum_inter: 0,
+    current_page: 0,
+    total: 0,
+    per_page: 0,
+    last_page: 0,
   },
   onLoad() {
     console.log("wenzhen onloadddd");
@@ -38,8 +43,20 @@ Page({
     //     wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
     //   });
     // }
+
+    //监听网络状态变化事件
+    wx.onNetworkStatusChange(function (res) {
+      console.log("onNetworkStatusChange from wenzhen: ")
+      console.log(res.isConnected)
+      console.log(res.networkType)
+      wx.showToast({
+        title: '网络类型'+res.networkType,
+      })
+    })
+
   },
   initInterval(){
+    let _this = this;
     let usertype =  wx.getStorageSync('usertype');
     let userID = wx.getStorageSync('user_id_'+usertype);
     let unreadnnum_inter = setInterval(() => {
@@ -49,7 +66,21 @@ Page({
         system_notice_unreadnnum: system_notice_unreadnnum,
         service_notice_unreadnnum: service_notice_unreadnnum,
       })
-    }, 1000);
+
+      if(_this.data.data_list_1.length > 0 || _this.data.data_list_2.length > 0 || _this.data.data_list_3.length > 0 || _this.data.data_list_4.length > 0 || _this.data.data_list_5.length > 0){
+        _this.setData({
+          has_data: true
+        })
+        _this.selectComponent('#tabs').resize();
+        let getCurrentName = _this.selectComponent('#tabs').getCurrentName();
+        let now_message_inquiry_type = _this.data.now_message_inquiry_type;
+        if(getCurrentName != now_message_inquiry_type){
+          _this.setData({
+            now_message_inquiry_type: getCurrentName
+          })
+        }
+      }
+    }, 100);
     this.setData({
       unreadnnum_inter: unreadnnum_inter
     })
@@ -58,13 +89,18 @@ Page({
   onShow: function () {
     console.log("onShow from wenzhen V2")
     if(this.data.hasOnShow){
+      wx.stopPullDownRefresh()
       return;
     }
     if (typeof this.getTabBar === 'function' && this.getTabBar()) {
       this.getTabBar().setData({
         active: 1  //数字是当前页面在tabbar的索引,如我的查询页索引是2，因此这边为2，同理首页就为0，审批页面为1
       })
+
+        this.getTabBar().startInterval()
     }
+    this.getDoctorInquiryFinishMessage();
+    this.getDoctorMessageNotice();
     this.getConversationList();
     if(this.data.unreadnnum_inter == 0){
       this.initInterval();
@@ -74,6 +110,7 @@ Page({
       hasOnShow: true
     })
 
+
     if(wx.$TUIKit){
       wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
     }else{
@@ -82,10 +119,12 @@ Page({
         wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
       });
     }
-
   },
   onHide(){
     console.log("onHideonHide from wenzhen")
+    if (typeof this.getTabBar === 'function' && this.getTabBar()) {
+      this.getTabBar().stopInterval()
+    }
     clearInterval(this.data.unreadnnum_inter)
     this.setData({
       hasOnShow: false,
@@ -95,7 +134,13 @@ Page({
       data_list_4: [],
       data_list_5: [],
       message_inquiry_type: 9999,
-      unreadnnum_inter: 0
+      now_message_inquiry_type: 5,
+      unreadnnum_inter: 0,
+      has_data: false,
+      current_page: 0,
+      total: 0,
+      per_page: 0,
+      last_page: 0,
     })
     wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived);
   },
@@ -103,7 +148,8 @@ Page({
     console.log("onUnload from wenzhen")
     this.setData({
       hasOnShow: false,
-      message_inquiry_type: 9999
+      message_inquiry_type: 9999,
+      now_message_inquiry_type: 5,
     })
   },
   getConversationList(){
@@ -124,6 +170,9 @@ Page({
     });
   },
   go(e){
+    this.setData({
+      show: false
+    })
     let url = e.currentTarget.dataset.url;
     let name = e.currentTarget.dataset.name;
     wx.setStorageSync(name, 0);
@@ -246,8 +295,8 @@ Page({
     let conversationList =  this.data.conversationList;
     //获取医生问诊消息用户属性
     api.getDoctorInquiryMessageAttr({order_inquiry_ids: order_inquiry_id_list.join(",")}).then(response => {
+      let new_conversationList = [];
       if(response.data.length > 0){
-        let  new_conversationList = [];
         conversationList.forEach(item => {
           let conversationID = item.conversationID;
           if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过
@@ -278,11 +327,10 @@ Page({
           item.patient_sex = order.patient_sex;
           new_conversationList.push(item);
         })
-
-        this.setData({
-          conversationList: new_conversationList
-        })
       }
+      this.setData({
+        conversationList: new_conversationList
+      })
     }).then(() => {
       console.log("开始格式化formatConversationList")
       this.formatConversationList();
@@ -343,6 +391,13 @@ Page({
         }
         lastMessage.messageForShow = text;
       }
+      if(lastMessage.isRevoked){
+        if(lastMessage.fromAccount == app.globalData.config.userID){
+          lastMessage.messageForShow = "你撤回了一条消息";
+        }else{
+          lastMessage.messageForShow = "对方撤回了一条消息";
+        }
+      }
       txt.Text= lastMessage.messageForShow;
       session_item.last_message_content = txt;
       session_item.message_send_time = getTimeAgo(lastMessage.lastTime);
@@ -368,9 +423,8 @@ Page({
       session_list[inquiry_type - 1].push(session_item);
     })
 
-    if(totalUnreadCount == 0){
-      app.formatUnReadNum(userID+"_wenzhen_info", totalUnreadCount);
-    }
+    wx.setStorageSync(userID+'_wenzhen_info', totalUnreadCount);
+    
 
     this.setData({
       data_list_1: session_data_list_1,
@@ -379,13 +433,8 @@ Page({
       data_list_4: session_data_list_4,
       message_inquiry_type: message_inquiry_type
     })
-
-    if(this.data.data_list_1.length == 0 && this.data.data_list_2.length == 0 && this.data.data_list_3.length == 0 && this.data.data_list_4.length == 0 && this.data.data_list_5.length == 0){
-      this.setData({has_data: false})
-    }else{
-      this.setData({has_data: true})
-      this.selectComponent('#tabs').resize();
-    }
+    wx.stopPullDownRefresh()
+    // this.selectComponent('#tabs').resize();
 
   },
   checkOrderInquiryId(list, order_inquiry_id){
@@ -431,7 +480,19 @@ Page({
     }).catch(errors => {
       console.error(errors);
     })
-
+  },
+  //获取上方角标
+  getDoctorMessageNotice(e){
+    let usertype = wx.getStorageSync('usertype');
+    let userID = wx.getStorageSync('user_id_'+usertype);
+    api.getDoctorMessageNotice().then(response => {
+      let service_message_notice = response.data.service_message_notice;
+      let system_message_notice = response.data.system_message_notice;
+      wx.setStorageSync(userID+"_service_notice_unreadnnum", service_message_notice==true?1:"");//3、医生端系统通知
+      wx.setStorageSync(userID+"_system_notice_unreadnnum", system_message_notice);//4、医生端服务通知
+    }).catch(errors => {
+      console.error(errors);
+    })
   },
   tabShow(e){
     let show_dialog_from_account = e.currentTarget.dataset.show_dialog_from_account;
@@ -450,5 +511,41 @@ Page({
     this.setData({
       show: false
     })
+  },
+  vanTabsChange(e){
+    console.log(e)
+    this.setData({
+      now_message_inquiry_type: e.detail.name
+    })
+  },
+  onPullDownRefresh(){
+    console.log("用户下拉动作")
+    this.onHide();
+    this.onShow();
+  },
+  onReachBottom() {
+    console.log('===触底了！！===');
+    let now_message_inquiry_type = this.data.now_message_inquiry_type;
+    if(now_message_inquiry_type == 5){
+      if(this.data.current_page < this.data.last_page){//最后一页时停止分页
+        this.getDoctorInquiryFinishMessage()
+      }
+    }
+  },
+  getDoctorInquiryFinishMessage(){
+    let data_list_5 = this.data.data_list_5;
+    let params = {};
+    params.page = this.data.current_page + 1;
+    api.getDoctorInquiryFinishMessage(params).then(response => {
+      console.log(response);
+      this.setData({
+        "data_list_5": data_list_5.concat(response.data.data),
+        current_page: response.data.current_page,
+        total: response.data.total,
+        per_page: response.data.per_page,
+        last_page: response.data.last_page
+      })
+      // this.selectComponent('#tabs').resize();
+    }).catch(errors => {console.error(errors);})
   }
 })
\ No newline at end of file
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.json b/Pages/yishi/wenzhen_v2/wenzhen.json
index d7cc87b..4da761c 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.json
+++ b/Pages/yishi/wenzhen_v2/wenzhen.json
@@ -11,6 +11,9 @@
     "van-image": "@vant/weapp/image/index",
     "van-tab": "@vant/weapp/tab/index",
     "van-tabs": "@vant/weapp/tabs/index",
-    "t-dialog": "tdesign-miniprogram/dialog/dialog"
-  }
+    "t-dialog": "tdesign-miniprogram/dialog/dialog",
+    "van-divider": "@vant/weapp/divider/index"
+  },
+  "enablePullDownRefresh": true,
+  "onReachBottomDistance": 100
 }
\ No newline at end of file
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml
index 30ce8eb..0c7bf6b 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxml
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml
@@ -1,4 +1,6 @@
 <!-- 问诊页面 -->
+<wxs module="dateSubstr" src="./substr.wxs"></wxs>
+
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container">
   <view class="top">
@@ -20,7 +22,7 @@
       </view>
   </view>
 
-  <view class="empty" wx:if="{{ !has_data }}" >
+   <view class="empty" wx:if="{{ has_data==false  }}" >
     <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/wnzhen_empty.png" fit="heightFix" height="108rpx" aria-label="empty" />
     <view class="empty_note">未收到任何消息</view>
   </view>
@@ -141,12 +143,14 @@
     </t-tabs>
   </view> -->
 
-  <view class="tabs" wx:if="{{ has_data }}" >
-    <van-tabs active="{{ message_inquiry_type }}" 
+  <view class="tabs" wx:if="{{ has_data==true }}">
+    <van-tabs  
     color="#3CC7C0"
     title-active-color="#3CC7C0"
     border="{{true}}"
     id="tabs"
+    bind:change="vanTabsChange"
+    wx:if="{{ has_data }}" 
     >
       <van-tab title="在线问诊" name="1" wx:if="{{data_list_1.length > 0}}">
         <!-- <wenzhen-data 
@@ -327,6 +331,25 @@
           <view class="content_4" wx:if="{{ item.inquiry_status == 3 }}">不接诊24小时后自动取消</view>
         </view>  
       </van-tab>
+      <van-tab title="问诊结束" name="5" wx:if="{{data_list_5.length > 0}}">
+         <view class="content" wx:for="{{ data_list_5 }}" bindtap="goChat" data-from_account="{{item.from_account}}" data-inquiry_type="{{item.inquiry_type}}" data-order_inquiry_id="{{item.order_inquiry_id}}" data-url="/Pages/yishi/chat/index">
+          <view class="content_1" >
+            <view class="name">
+              <text style="font-size: 34rpx;color: #333;">就诊人：</text>
+              {{item.patient_name}}  {{item.patient_sex==1?'男':'女'}}｜{{item.patient_age}}<t-badge dot="{{false}}" offset="{{ [-4, 4] }}" content="岁" />
+            </view>
+            <view class="date"> {{dateSubstr.substring(item.complete_time,0,10)}}</view>
+          </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?'问诊购药':'其他' }}</view>
+          </view>
+          <view class="content_4" wx:if="{{ item.inquiry_status == 3 }}">不接诊24小时后自动取消</view>
+        </view>  
+
+        <van-empty description="暂无数据" wx:if="{{data_list_5.length == 0}}" />
+        <van-divider contentPosition="center" wx:if="{{data_list_5.length > 0 && current_page == last_page}}">到底了~</van-divider>
+      </van-tab>
     </van-tabs>
   </view>
   <view style="height: 200rpx;"></view>
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxss b/Pages/yishi/wenzhen_v2/wenzhen.wxss
index fa341ca..0be5bc4 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxss
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxss
@@ -78,6 +78,7 @@ page{
   color: #666666;
   height: 50rpx;
   line-height: 50rpx;
+  display: flex;
 }
 .date{
   font-size: 30rpx;
@@ -135,6 +136,4 @@ page{
   border-top: 1px solid #E9E9E9;
   color: #3CC7C0;
 }
-.t-badge__content-text {
-  line-height: 70rpx !important;
-}
+
diff --git a/Pages/yishi/wenzhenorderV2/index.wxml b/Pages/yishi/wenzhenorderV2/index.wxml
index 1dfb713..9034384 100644
--- a/Pages/yishi/wenzhenorderV2/index.wxml
+++ b/Pages/yishi/wenzhenorderV2/index.wxml
@@ -7,7 +7,7 @@
             <!-- （1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药） -->
             <view class="order_item_content_top">{{item.inquiry_type==1?'专家问诊':item.inquiry_type==2?'快速问诊':item.inquiry_type==3?'公益问诊':item.inquiry_type==4?'问诊购药':'未知'}}</view>
             <view class="order_item_content_data">
-              <view class="order_id">订单编号：<text style="font-size: 30rpx;color: #666666;">{{item.order_inquiry_id	}}</text></view>
+              <view class="order_id">订单编号：<text style="font-size: 30rpx;color: #666666;">{{item.inquiry_no	}}</text></view>
               <view class="order_id">就诊患者：<text style="font-size: 30rpx;color: #666666;">{{item.patient_name}}（{{item.patient_sex==1?'男':'女'}}，{{item.patient_age}}岁）</text></view>
               <view class="order_id">接诊时间：<text style="font-size: 30rpx;color: #666666;">{{item.reception_time}}</text></view>
               <view class="order_id">结束时间：<text style="font-size: 30rpx;color: #666666;">{{item.finish_time}}</text></view>
diff --git a/Pages/yishi/yizhensetup/index.js b/Pages/yishi/yizhensetup/index.js
index 604a3f9..645c334 100644
--- a/Pages/yishi/yizhensetup/index.js
+++ b/Pages/yishi/yizhensetup/index.js
@@ -102,7 +102,7 @@ Page({
     }).then(()=>{
       if(detail){
         wx.requestSubscribeMessage({
-          tmplIds: ['G1RIs0RYqsTQ2CuPQWalIGVet9sd_d371YtDVhfBsFg'],
+          tmplIds: ['G1RIs0RYqsTQ2CuPQWalIMyb6_deuEEbJfajfhGvNzc'],
           success (res) {
             console.log(res);//同意授权
           }
diff --git a/Pages/yishi/yizhensetupprice/index.js b/Pages/yishi/yizhensetupprice/index.js
index 3854ab6..411201f 100644
--- a/Pages/yishi/yizhensetupprice/index.js
+++ b/Pages/yishi/yizhensetupprice/index.js
@@ -99,7 +99,7 @@ Page({
     }).then(()=>{
       if(detail){
         wx.requestSubscribeMessage({
-          tmplIds: ['G1RIs0RYqsTQ2CuPQWalIGVet9sd_d371YtDVhfBsFg'],
+          tmplIds: ['G1RIs0RYqsTQ2CuPQWalIMyb6_deuEEbJfajfhGvNzc'],
           success (res) {
             console.log(res);//同意授权
           }
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
index 39da407..18fffe9 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
@@ -160,6 +160,18 @@ Component({
           }];
           return renderDom;
         }
+        // 7:处方开具成功
+        if (customMessage.message_type === GDXZ_CUSTOM_MSEEAGE.PRESCRIBE_VERIFY) {
+          let data = customMessage.data;
+          const renderDom = [{
+            type: 'prescribe',
+            product_name: data.product_name,
+            order_inquiry_id: data.order_inquiry_id,
+            order_prescription_id: data.order_prescription_id,
+            pharmacist_verify_time: data.pharmacist_verify_time.substring(0,10),
+          }];
+          return renderDom;
+        }
       } catch (error) {
       }
       // 客服咨询
diff --git a/TUIKit/components/TUIChat/components/MessageElements/RevokeMessage/index.wxml b/TUIKit/components/TUIChat/components/MessageElements/RevokeMessage/index.wxml
index c4a31f8..5e14218 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/RevokeMessage/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageElements/RevokeMessage/index.wxml
@@ -1,5 +1,6 @@
-  <view class="revoke" data-value="{{message}}">
-    <label class="name" wx:if="{{message.flow === 'in'}}">{{message.nick || message.from}}</label>
+  <view class="revoke" data-value="{{message}}" id="{{'ID-'+message.ID}}">
+    <!-- <label class="name" wx:if="{{message.flow === 'in'}}">{{message.nick || message.from}}</label> -->
+    <label class="name" wx:if="{{message.flow === 'in'}}">对方</label>
     <label class="name" wx:else>你</label>
     <span class="name">撤回了一条消息</span>
     <span class="edit" wx:if="{{message.flow === 'out' && message.type === 'TIMTextElem'}}" bindtap="resendMessage" data-value="{{message}}">重新编辑</span>
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index 3633bcf..c7abe3c 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -1,6 +1,7 @@
 import dayjs from '../../../../utils/dayjs';
 import logger from '../../../../utils/logger';
 import constant from '../../../../utils/constant';
+import { getTimeAgoChat } from './../../../../../utils/util'
 const { GDXZ_CUSTOM_MSEEAGE } = constant;
 // eslint-disable-next-line no-undef
 const app = getApp();
@@ -86,11 +87,12 @@ Component({
     errorMessage: {},
     errorMessageID: '',
     typingMessage: {},
+    autoToButtom: true
   },
 
   lifetimes: {
     attached() {
-     
+      
     },
     ready() {
       if (this.data.unreadCount > 12) {
@@ -128,11 +130,22 @@ Component({
       wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.MESSAGE_REVOKED, this.$onMessageRevoked);
     },
   },
-
+  pageLifetimes: {
+    show(){
+      console.log("showshowshowshowshowshowshow")
+    },
+    hide(){
+      console.log("hidehidehidehidehidehidehidehidehidehidehide")
+    }
+  },
   methods: {
 
     // 刷新消息列表
     refresh() {
+      console.log("refresh.......")
+      this.setData({
+        autoToButtom: false
+      })
       if (this.data.isCompleted) {
         this.setData({
           isCompleted: true,
@@ -247,7 +260,12 @@ Component({
 
     // 收到的消息
     $onMessageReceived(value) {
+      let autoToButtom = this.data.autoToButtom;
+      console.log("autoToButtom:", autoToButtom)
       const message = value.data[0];
+      if(message.flow == 'out'){
+        message.isRead = false;
+      }
       if(!this.checkShowAvatar(message)){
         message.no_avatar = true;
       }
@@ -275,12 +293,14 @@ Component({
           } catch (error) {
           }
           if ((item.type === MESSAGE_TYPE_TEXT.TIM_CUSTOM_ELEM && this.data.typingMessage.businessID !== BUSINESS_ID_TEXT.USER_TYPING) || item.type !== MESSAGE_TYPE_TEXT.TIM_CUSTOM_ELEM) { 
-            this.data.showNewMessageCount.push(message);
-            this.setData({
-              showNewMessageCount: this.data.showNewMessageCount,
-              showDownJump: true,
-            });
 
+            if(!autoToButtom){
+              this.data.showNewMessageCount.push(message);
+              this.setData({
+                showNewMessageCount: this.data.showNewMessageCount,
+                showDownJump: true,
+              });
+            }
             
           }
         } else {
@@ -320,6 +340,13 @@ Component({
         });
       }
 
+      let jumpAim = `ID-${this.filterSystemMessageID(this.data.messageList[this.data.messageList.length - 1].ID)}`;
+      console.log("jumpAim:", jumpAim);
+      if(autoToButtom){
+        this.setData({
+          jumpAim: jumpAim
+        })
+      }
       //主动跳到 消息跳转到最新
       // this.handleJumpNewMessage()
     },
@@ -381,8 +408,15 @@ Component({
     // 获取消息ID
     handleLongPress(e) {
       for (let index = 0; index < this.data.messageList.length; index++) {
+        
         if (this.data.messageList[index].status === 'success') {
           const { index } = e.currentTarget.dataset;
+          let message = this.data.messageList[index];
+          console.log(message)
+          if(message.type === 'TIMCustomElem'){
+            return
+          }
+
           this.setData({
             messageID: e.currentTarget.id,
             selectedMessage: this.data.messageList[index],
@@ -519,11 +553,17 @@ Component({
         });
       }
     },
+    //myscroll 自定义滑动事件
+    myscroll(e){
+      console.log(e.detail.deltaY,e.detail.scrollTop)
+    },
     // 滑动到最底部置跳转事件为false
     scrollHandler() {
+      console.log("触底了")
       this.setData({
         jumpAim: `ID-${this.filterSystemMessageID(this.data.messageList[this.data.messageList.length - 1].ID)}`,
         showDownJump: false,
+        autoToButtom: true
       });
     },
     // 删除处理掉的群通知消息
@@ -532,17 +572,19 @@ Component({
     },
     // 展示消息时间
     messageTimeForShow(messageTime) {
+      console.log("messageTimeForShow")
       const interval = 5 * 60 * 1000;
       const nowTime = Math.floor(messageTime.time / 10) * 10 * 1000;
       if (this.data.messageList.length > 0) {
         const lastTime = this.data.messageList.slice(-1)[0].time * 1000;
+        console.log("nowTime  - lastTime=", (nowTime  - lastTime))
         if (nowTime  - lastTime > interval) {
           Object.assign(messageTime, {
             isShowTime: true,
           }),
           this.data.messageTime = dayjs(nowTime);
           this.setData({
-            messageTime: dayjs(nowTime).format('YYYY-MM-DD HH:mm:ss'),
+            messageTime: getTimeAgoChat(nowTime/1000),
             showMessageTime: true,
           });
         }
@@ -550,10 +592,12 @@ Component({
     },
     // 渲染历史消息时间
     showHistoryMessageTime(messageList) {
-      const cut = 30 * 60 * 1000;
+      const cut = 5 * 60 * 1000;
       for (let index = 0; index < messageList.length; index++) {
         const nowadayTime = Math.floor(messageList[index].time / 10) * 10 * 1000;
         const firstTime = messageList[0].time * 1000;
+        console.log("nowadayTime - firstTime=",(nowadayTime - firstTime))
+        console.log("cut",cut)
         if (nowadayTime - firstTime > cut) {
           const indexbutton = messageList.map(item => item).indexOf(messageList[index]); // 获取第一个时间大于30分钟的消息所在位置的下标
           const firstTime = nowadayTime; // 找到第一个数组时间戳大于30分钟的将其值设为初始值
@@ -563,7 +607,7 @@ Component({
           }),
           this.setData({
             firstTime: nowadayTime,
-            messageHistoryTime: dayjs(showHistoryTime).format('YYYY-MM-DD HH:mm:ss'),
+            messageHistoryTime: getTimeAgoChat(showHistoryTime/1000),
             showMessageHistoryTime: true,
           });
           return firstTime;
@@ -577,7 +621,7 @@ Component({
         Object.assign(messageList[0], {
           isShowMoreHistoryTime: true,
         });
-        this.data.newArr[messageList[0].ID] = dayjs(showHistoryTime).format('YYYY-MM-DD HH:mm:ss');
+        this.data.newArr[messageList[0].ID] = getTimeAgoChat(showHistoryTime/1000);
         this.setData({
           newArr: this.data.newArr,
         });
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxml b/TUIKit/components/TUIChat/components/MessageList/index.wxml
index 5b271b1..cda6f83 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageList/index.wxml
@@ -4,21 +4,23 @@
     <view class="no-message" wx:if="{{isCompleted}}">没有更多啦</view>
     <view class="t-message" wx:if="{{conversation.type !== '@TIM#SYSTEM'}}" wx:for="{{messageList}}" wx:key="index"  data-index ='{{index}}'  >
          <view class="time-pop-mask" data-value="{{item.time}}" wx:if="{{showMessageTime}}">
-             <view class="showmessagetime" wx:if="{{item.isShowTime}}">
+             <view class="showmessagetime 1" wx:if="{{item.isShowTime}}">
              <text class="time"  wx:if="{{!item.isDeleted && !item.isRevoked}}">{{messageTime}} </text> 
              </view>
          </view>
           <view class="time-pop-mask" data-value="{{item.time}}" wx:if="{{showMessageHistoryTime}}">
-             <view class="showmessagetime" wx:if="{{item.isShowHistoryTime && !item.isShowTime && !item.isShowMoreHistoryTime}}">
+             <view class="showmessagetime 2" wx:if="{{item.isShowHistoryTime && !item.isShowTime && !item.isShowMoreHistoryTime}}">
              <text class="time"  wx:if="{{!item.isDeleted && !item.isRevoked}}">{{messageHistoryTime}} </text> 
              </view>
          </view>
          <view class="time-pop-mask"   wx:if="{{item.isShowMoreHistoryTime}}">
-             <view class="showmessagetime">
+             <view class="showmessagetime 3">
              <text class="time">{{newArr[item.ID]}} </text> 
              </view>
          </view>
-    <RevokeMessage wx:if="{{item.isRevoked}}" message="{{item}}" isMine="{{item.flow === 'out'}}" bind:resendMessage="resendMessage"/>
+         <view id="{{concat.concat(conversation.type,'ID-',item.ID)}}">
+          <RevokeMessage wx:if="{{item.isRevoked}}" message="{{item}}" isMine="{{item.flow === 'out'}}" bind:resendMessage="resendMessage"/>
+         </view>
         <view class="t-message-item"   wx:if="{{!item.isDeleted && !item.isRevoked }}" bindtap="handleEditToggleAvatar" >
             <view wx:if="{{Show}}" catchtap="handleEditToggleAvatar">
             <view class="label-pop"  wx:if="{{messageID === concat.connect('ID-',item.ID)}}" class="{{item.flow === 'out' ? 'label-self-body' : 'label-recieve-body'}}" >
diff --git a/TUIKit/components/TUIChat/index.wxml b/TUIKit/components/TUIChat/index.wxml
index 2a8be6e..f20febd 100644
--- a/TUIKit/components/TUIChat/index.wxml
+++ b/TUIKit/components/TUIChat/index.wxml
@@ -5,7 +5,7 @@
   <view class="left">
     <view class="name">{{baseInfo.patient_family_name}}</view>
     <view class="age">{{baseInfo.patient_family_sex==1?'男':'女'}}｜{{baseInfo.patient_family_age}}岁</view>
-    <view class="status {{baseInfo.inquiry_status==5?'status_complete':''}}">{{baseInfo.inquiry_status==1?'待支付':baseInfo.inquiry_status==2?'待分配':baseInfo.inquiry_status==3?'待接诊':baseInfo.inquiry_status==4?'接诊中':baseInfo.inquiry_status==5?'已完成':baseInfo.inquiry_status==6?'已结束':baseInfo.inquiry_status==7?'已取消':'未知'}}</view>
+    <view class="status {{baseInfo.inquiry_status==5?'status_complete':''}}">{{baseInfo.inquiry_status==1?'待支付':baseInfo.inquiry_status==2?'待分配':baseInfo.inquiry_status==3?'待接诊':baseInfo.inquiry_status==4?'接诊中':baseInfo.inquiry_status==5?'问诊完成':baseInfo.inquiry_status==6?'已结束':baseInfo.inquiry_status==7?'已取消':'未知'}}</view>
   </view>
   <view class="right">
     <text class="right_txt" bindtap="putDoctorInquiryFinish" wx:if="{{baseInfo.inquiry_status==4}}">结束问诊</text>
diff --git a/app.js b/app.js
index b221d6d..44aa762 100644
--- a/app.js
+++ b/app.js
@@ -58,6 +58,12 @@ App({
         title: '网络类型'+res.networkType,
       })
     })
+
+    wx.onNetworkWeakChange(function(res){
+      console.log("onNetworkWeakChange: ")
+      console.log(res.isConnected)
+      console.log(res.networkType)
+    })
   },
   onShow(){
     this.imInit();
@@ -126,7 +132,8 @@ App({
       wx.$TUIKit.logout();
       wx.$TUIKit = undefined;
     }
-    this.clearAllInterval()
+    this.clearAllInterval();
+    this.globalData.chat_sdk_ready = false;
   },
   clearAllInterval(){
     this.globalData.app_inter.forEach(item => {
@@ -159,6 +166,7 @@ App({
     if(!my_info) wx.setStorageSync(userID+'_my_info', "");
     this.formatWenZhenInfo();
 
+    wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onSystemPushReceived);
     wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onSystemPushReceived, this);
     //互踢
     wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.KICKED_OUT, this.onKickedOut);
@@ -290,8 +298,8 @@ App({
     })
     //获取医生问诊消息用户属性
     api.getDoctorInquiryMessageAttr({order_inquiry_ids: order_inquiry_id_list.join(",")}).then(response => {
+      let new_conversationList = [];
       if(response.data.length > 0){
-        let new_conversationList = [];
         conversationList.forEach(item => {
           let conversationID = item.conversationID;
           if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过
@@ -324,8 +332,8 @@ App({
           new_conversationList.push(item);
         })
         conversationList = []; 
-        return new_conversationList;
       }
+      return new_conversationList;
     }).then(new_conversationList => {
       console.log("开始计算问诊角标");
       let wenzhen_info = 0;
@@ -343,7 +351,8 @@ App({
       console.log("角标的数量：", wenzhen_info);
       let usertype = wx.getStorageSync('usertype');
       let userID = wx.getStorageSync('user_id_'+usertype);
-      this.formatUnReadNum(userID+'_wenzhen_info', wenzhen_info)
+      wx.setStorageSync(userID+'_wenzhen_info', wenzhen_info);
+
     }).catch(errors => {console.error(errors);})
   }
   
diff --git a/commpents/te_navbar/index.js b/commpents/te_navbar/index.js
index 0ce5c54..da62db0 100644
--- a/commpents/te_navbar/index.js
+++ b/commpents/te_navbar/index.js
@@ -25,6 +25,7 @@ Component({
    */
   methods: {
     onBack() {
+      console.log("onBackonBackonBack");
       let back_url = this.data.navbarData.back_url;
       let back_url_type = this.data.navbarData.back_url_type;
       if(back_url){
diff --git a/commpents/te_navbar/index.wxml b/commpents/te_navbar/index.wxml
index 964d314..8203f58 100644
--- a/commpents/te_navbar/index.wxml
+++ b/commpents/te_navbar/index.wxml
@@ -21,7 +21,7 @@
 </t-navbar>
 <!-- 仅显示返回 -->
 <view class="block" wx:if="{{navbarData.showCapsule == 2}}">
-  <t-navbar class="block" title="{{navbarData.title}}" left-arrow bind:go-back="onBack" />
+  <t-navbar class="block" title="{{navbarData.title}}" left-arrow go-back />
 </view>
 <!-- 仅显示home -->
 <t-navbar title="{{navbarData.title}}" wx:if="{{navbarData.showCapsule == 3}}">
diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js
index 9672b94..ba1f8a0 100644
--- a/custom-tab-bar/index.js
+++ b/custom-tab-bar/index.js
@@ -1,3 +1,5 @@
+import _console from "../TUIKit/utils/console"
+
 // custom-tab-bar/index.js
 const app = getApp()
 Component({
@@ -56,9 +58,11 @@ Component({
     index_info: "",
     wenzhen_info: "",
     my_info: "",
-    next_url: "/Pages/yishi/identity/index"
+    next_url: "/Pages/yishi/identity/index",
+    info_inter: 0
   },
-  attached() {
+  ready() {
+    console.log("readyreadyreadyreadyreadyready")
     const usertype = wx.getStorageSync('usertype')
     if (usertype == 2) {
       this.setData({
@@ -71,22 +75,37 @@ Component({
         items: this.data.listAll.list1
       })
     }
-    let _this = this;
-    let userID = wx.getStorageSync('user_id_'+usertype);
-    let info_inter = setInterval(() => {
-      let index_info = wx.getStorageSync(userID+'_index_info');
-      let wenzhen_info = wx.getStorageSync(userID+'_wenzhen_info');
-      let my_info = wx.getStorageSync(userID+'_my_info');
-      _this.setData({
-        index_info: index_info,
-        wenzhen_info: wenzhen_info,
-        my_info: my_info,
-      })
-    }, 500);
-
-    app.globalData.app_inter.push(info_inter);
+    
   },
   methods: {
+    startInterval(){
+      let _this = this;
+      const usertype = wx.getStorageSync('usertype')
+      let userID = wx.getStorageSync('user_id_'+usertype);
+      let info_inter = setInterval(() => {
+        if(app.globalData.config.userID == userID){
+          let index_info = wx.getStorageSync(userID+'_index_info');
+          let wenzhen_info = wx.getStorageSync(userID+'_wenzhen_info');
+          let my_info = wx.getStorageSync(userID+'_my_info');
+          _this.setData({
+            index_info: this.formatNum(index_info),
+            wenzhen_info: this.formatNum(wenzhen_info),
+            my_info: this.formatNum(my_info),
+          })
+        }
+      }, 500);
+      this.setData({
+        info_inter: info_inter
+      })
+    },
+    stopInterval(){
+      clearInterval(this.data.info_inter)
+    },
+    formatNum(val){
+      if(val > 99) val = '+99';
+      if(val == 0) val = '';
+      return val;
+    },
     // swichNav: function (e) {
     //   console.log(123);
     //   let that = this;
diff --git a/utils/network/api.js b/utils/network/api.js
index e59e8c9..8dce962 100644
--- a/utils/network/api.js
+++ b/utils/network/api.js
@@ -242,6 +242,16 @@ class API extends HTTP {
       ...params
     }
   })
+}
+ //发起提现
+ postDoctorWithdrawal(params) {
+  return this.request({
+    url: `${this.baseUrl}/doctor/withdrawal`,
+    method: 'POST',
+    data: {
+      ...params
+    }
+  })
 }
  //可提现问诊订单列表
  getDoctorWithdrawalOrder(params) {
@@ -649,6 +659,16 @@ class API extends HTTP {
       ...params
     }
   })
+}
+ //获取医生消息页通知数据-医生
+ getDoctorMessageNotice(params) {
+  return this.request({
+    url: `${this.baseUrl}/doctor/message/notice`,
+    method: 'GET',
+    data: {
+      ...params
+    }
+  })
 }
  //获取医生服务消息列表-分页
  getDoctorMessageService(params) {
@@ -703,6 +723,16 @@ class API extends HTTP {
       ...params
     }
   })
+}
+ //结束问诊会话列表
+ getDoctorInquiryFinishMessage(params) {
+  return this.request({
+    url: `${this.baseUrl}/doctor/inquiry/finish/message`,
+    method: 'GET',
+    data: {
+      ...params
+    }
+  })
 }
 }
 
diff --git a/utils/util.js b/utils/util.js
index fa8bd1c..498c265 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -1,3 +1,27 @@
+
+
+// 对Date的扩展，将 Date 转化为指定格式的String
+// 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符， 
+// 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字) 
+// 例子： 
+// (new Date()).Format("yyyy-MM-dd hh:mm:ss.S") ==> 2006-07-02 08:09:04.423 
+// (new Date()).Format("yyyy-M-d h:m:s.S")      ==> 2006-7-2 8:9:4.18 
+Date.prototype.Format = function (fmt) {  
+  var o = {
+      "M+": this.getMonth() + 1, //月份 
+      "d+": this.getDate(), //日 
+      "h+": this.getHours(), //小时 
+      "m+": this.getMinutes(), //分 
+      "s+": this.getSeconds(), //秒 
+      "q+": Math.floor((this.getMonth() + 3) / 3), //季度 
+      "S": this.getMilliseconds() //毫秒 
+  };
+  if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+  for (var k in o)
+  if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+  return fmt;
+}
+
 const formatTime = date => {
   const year = date.getFullYear()
   const month = date.getMonth() + 1
@@ -63,6 +87,36 @@ const getTimeAgo = stringTime =>{
   }
   return result;
 }
+
+const getTimeAgoChat = stringTime =>{
+  var minute = 1000 * 60;
+  var hour = minute *60;
+  var day = hour *24;
+  var week = day * 7;
+  var month = day * 30;
+  var time1 = new Date().getTime();//当前的时间戳
+  var time2 = stringTime*1000;//指定时间的时间戳
+  var time = time1 - time2;
+  var result = null;
+  if(time < 0){
+    return '刚刚';
+  }else if(time/month >= 1){
+    result = formatChatTime(new Date(time2));
+  }else if(time/week >= 1){
+    result = formatChatTime(new Date(time2));
+  }else if(time/day >= 1){
+    result = formatChatTime(new Date(time2));
+  }else if(time/day == 1){
+    result = new Date(time2).Format("MM-dd hh:mm");
+  }else if(time/hour >= 1){
+    result = new Date(time2).Format("hh:mm");
+  }else if(time/minute >= 1){
+    result = new Date(time2).Format("hh:mm");
+  }else {
+    result = "刚刚";
+  }
+  return result;
+}
 // px 转换为 rpx ，传参类型是数字（Number）
 const rpxTopx = px => {
   let deviceWidth = wx.getSystemInfoSync().windowWidth; //获取设备屏幕宽度
@@ -75,5 +129,6 @@ module.exports = {
   getDateArr,
   formatNumber,
   getTimeAgo,
-  rpxTopx
+  rpxTopx,
+  getTimeAgoChat
 }

From 596229d4781217a11a852f044d81e6adb6e0122d Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Thu, 20 Apr 2023 14:19:23 +0800
Subject: [PATCH 22/83] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/appraise/index.wxml               |   6 +-
 Pages/yishi/bindcard/index.js                 |   4 +-
 Pages/yishi/identity/index.js                 |   4 +-
 Pages/yishi/index/index.wxss                  |  26 ++-
 Pages/yishi/service_notice/index.wxml         |   2 +-
 .../TUIChat/components/MessageInput/index.js  | 207 ++++++++++--------
 .../components/MessageInput/index.wxml        |   2 +-
 .../TUIChat/components/MessageList/index.js   |   6 +-
 TUIKit/components/TUIChat/index.js            |  39 ++--
 utils/network/api.js                          |   2 +-
 10 files changed, 183 insertions(+), 115 deletions(-)

diff --git a/Pages/yishi/appraise/index.wxml b/Pages/yishi/appraise/index.wxml
index 4850809..26609cf 100644
--- a/Pages/yishi/appraise/index.wxml
+++ b/Pages/yishi/appraise/index.wxml
@@ -13,7 +13,7 @@
             <view class="top">
               <view class="name">{{item.name_mask}}</view>
               <view class="start">
-                <t-rate value="{{item.avg_score}}" count="{{item.avg_score}}" color="#ED9C00"/>
+                <t-rate value="{{item.avg_score}}" count="5" color="#ED9C00"/>
               </view>
             </view>
             <view class="content">{{item.content}}</view>
@@ -29,7 +29,7 @@
             <view class="top">
               <view class="name">{{item.name_mask}}</view>
               <view class="start">
-                <t-rate value="{{item.avg_score}}" count="{{item.avg_score}}" color="#ED9C00"/>
+                <t-rate value="{{item.avg_score}}" count="5" color="#ED9C00"/>
               </view>
             </view>
             <view class="content">{{item.content}}</view>
@@ -45,7 +45,7 @@
             <view class="top">
               <view class="name">{{item.name_mask}}</view>
               <view class="start">
-                <t-rate value="{{item.avg_score}}" count="{{item.avg_score}}" color="#ED9C00"/>
+                <t-rate value="{{item.avg_score}}" count="5" color="#ED9C00"/>
               </view>
             </view>
             <view class="content">{{item.content}}</view>
diff --git a/Pages/yishi/bindcard/index.js b/Pages/yishi/bindcard/index.js
index 88d3f4c..9228588 100644
--- a/Pages/yishi/bindcard/index.js
+++ b/Pages/yishi/bindcard/index.js
@@ -67,8 +67,8 @@ Page({
       console.log(response);
       if(response.data){
         this.setData({
-          realname:response.data.card_name,
-          idcard:response.data.card_num
+          realname:response.data.card_name_mask,
+          idcard:response.data.card_num_mask
         });
       }
     }).catch(errors => {
diff --git a/Pages/yishi/identity/index.js b/Pages/yishi/identity/index.js
index 702f372..f470d13 100644
--- a/Pages/yishi/identity/index.js
+++ b/Pages/yishi/identity/index.js
@@ -62,8 +62,8 @@ Page({
         return;
       }
       this.setData({
-        realname:response.data.card_name,
-        idcard:response.data.card_num,
+        realname:response.data.card_name_mask,
+        idcard:response.data.card_num_mask,
         next_btn_txt: "已认证，不可修改",
         next_btn_disabled: true,
         panel_2_disabled: false,
diff --git a/Pages/yishi/index/index.wxss b/Pages/yishi/index/index.wxss
index e3915bd..57662b4 100644
--- a/Pages/yishi/index/index.wxss
+++ b/Pages/yishi/index/index.wxss
@@ -218,8 +218,25 @@ page{
   line-height: 100rpx;
 }
 .dialog_cancel_btn{
-  border-top: 1px solid #E9E9E9;
-  border-right: 1px solid #E9E9E9;
+  position: relative;
+}
+.dialog_cancel_btn::before {
+  content: ' ';
+  position: absolute;
+  box-sizing: border-box;
+  top: 0;
+  left: 0;
+  border-top: 2px solid var(--td-border-color, #e7e7e7);
+  border-right: 2px solid var(--td-border-color, #e7e7e7);
+  transform: scale(0.5);
+  transform-origin: 0 0;
+  width: 200%;
+  height: 200%;
+  border-radius: 0;
+  border-top-left-radius: 0px;
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+  border-bottom-left-radius: 0px;
 }
 .dialog_confirm_btn{
   border-top: 1px solid #E9E9E9;
@@ -227,4 +244,9 @@ page{
 }
 .t-button__content{
   color: #3CC7C0 !important;
+}
+.t-dialog__button--text:before {
+  border-top: 2px solid #E9E9E9 !important;
+  border-left: 2px solid var(--td-border-color, #E9E9E9);
+  border-top-color: #E9E9E9 !important;
 }
\ No newline at end of file
diff --git a/Pages/yishi/service_notice/index.wxml b/Pages/yishi/service_notice/index.wxml
index 4eae707..75dcfe1 100644
--- a/Pages/yishi/service_notice/index.wxml
+++ b/Pages/yishi/service_notice/index.wxml
@@ -5,7 +5,7 @@
       <view class="item_top">
         <view class="item_img" wx:if="{{item.link_params.inquiry_type == 1}}">
           <text style="margin-left: 10rpx;">在线问诊</text> 
-          <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
+          <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/online.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
         <view class="item_img" wx:if="{{item.link_params.inquiry_type == 2}}">
           <text style="margin-left: 10rpx;">快速问诊</text> 
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js
index 7631ec4..5c89212 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.js
@@ -247,6 +247,7 @@ Component({
         ext2: wx.$chat_reportType,
         ext3: wx.$chat_SDKAppID,
       });
+
       let targetFlag = 'extension';
       if (this.data.displayFlag === 'extension') {
         targetFlag = '';
@@ -305,47 +306,63 @@ Component({
     // 发送图片消息
     handleSendImageMessage(file) {
 
-      // 获取最后一条消息
-      let last_message = this.data.conversation.lastMessage;
-      console.log("last_message: ", last_message);
-      let cloudCustomData = "";
-      let cloudCustomDataJson = "";
-      if(last_message.cloudCustomData){
-        cloudCustomData = last_message.cloudCustomData;
-      }
-      if(cloudCustomData){
-        cloudCustomDataJson = JSON.parse(cloudCustomData);
-      }
-      let message_rounds = 0;
-      let patient_family_data = {};
-      patient_family_data.patient_name = this.data.baseInfo.patient_family_name;
-      patient_family_data.patient_sex = this.data.baseInfo.patient_family_sex;
-      patient_family_data.patient_age = this.data.baseInfo.patient_family_age;
-      if(cloudCustomDataJson){
-        message_rounds = cloudCustomDataJson.message_rounds;
-      }
+      let _this = this;
+      let conversationID = this.data.conversation.conversationID
+      let promise = wx.$TUIKit.getConversationProfile(conversationID);
+      promise.then(function(imResponse) {
+        console.log("getConversationProfile 正在执行")
+        // 获取成功
+        console.log(imResponse.data.conversation); // 会话资料
+        _this.setData({
+          conversation: imResponse.data.conversation
+        })
+      }).catch(function(imError) {
+        console.warn('getConversationProfile error:', imError); // 获取会话资料失败的相关信息
+      });
 
-      const mycloudCustomData = JSON.stringify({
-        order_inquiry_id: this.data.order_inquiry_id,
-        inquiry_type: this.data.inquiry_type,
-        message_type: 0,
-        is_system: 0,
-        message_rounds: message_rounds,
-        patient_family_data: patient_family_data
-      });
-      
-      const message = wx.$TUIKit.createImageMessage({
-        to: this.getToAccount(),
-        conversationType: this.data.conversation.type,
-        payload: {
-          file,
-        },
-        cloudCustomData: mycloudCustomData,
-        onProgress: (percent) => {
-          message.percent = percent;
-        },
-      });
-      this.$sendTIMMessage(message);
+      Promise.all([promise]).then(res => {
+        // 获取最后一条消息
+        let last_message = this.data.conversation.lastMessage;
+        console.log("last_message: ", last_message);
+        let cloudCustomData = "";
+        let cloudCustomDataJson = "";
+        if(last_message.cloudCustomData){
+          cloudCustomData = last_message.cloudCustomData;
+        }
+        if(cloudCustomData){
+          cloudCustomDataJson = JSON.parse(cloudCustomData);
+        }
+        let message_rounds = 0;
+        let patient_family_data = {};
+        patient_family_data.patient_name = this.data.baseInfo.patient_family_name;
+        patient_family_data.patient_sex = this.data.baseInfo.patient_family_sex;
+        patient_family_data.patient_age = this.data.baseInfo.patient_family_age;
+        if(cloudCustomDataJson){
+          message_rounds = cloudCustomDataJson.message_rounds;
+        }
+
+        const mycloudCustomData = JSON.stringify({
+          order_inquiry_id: this.data.order_inquiry_id,
+          inquiry_type: this.data.inquiry_type,
+          message_type: 0,
+          is_system: 0,
+          message_rounds: message_rounds,
+          patient_family_data: patient_family_data
+        });
+        
+        const message = wx.$TUIKit.createImageMessage({
+          to: this.getToAccount(),
+          conversationType: this.data.conversation.type,
+          payload: {
+            file,
+          },
+          cloudCustomData: mycloudCustomData,
+          onProgress: (percent) => {
+            message.percent = percent;
+          },
+        });
+        this.$sendTIMMessage(message);
+      })
     },
 
     // 发送视频消息
@@ -562,55 +579,71 @@ Component({
         ext2: wx.$chat_reportType,
         ext3: wx.$chat_SDKAppID,
       });
-      
-      //获取最后一条消息
-      let last_message = this.data.conversation.lastMessage;
-      console.log("last_message: ", last_message);
-      let cloudCustomData = "";
-      let cloudCustomDataJson = "";
-      if(last_message.cloudCustomData){
-        cloudCustomData = last_message.cloudCustomData;
-      }
-      if(cloudCustomData){
-        cloudCustomDataJson = JSON.parse(cloudCustomData);
-      }
-      let message_rounds = 0;
-      let patient_family_data = {};
-      patient_family_data.patient_name = this.data.baseInfo.patient_family_name;
-      patient_family_data.patient_sex = this.data.baseInfo.patient_family_sex;
-      patient_family_data.patient_age = this.data.baseInfo.patient_family_age;
-      if(cloudCustomDataJson){
-        message_rounds = cloudCustomDataJson.message_rounds;
-      }
-      
-      const to = this.getToAccount();
-      const text = flag ? msg : this.data.message;
-
-      const { FEAT_NATIVE_CODE } = constant;
-      const mycloudCustomData = JSON.stringify({
-        order_inquiry_id: this.data.order_inquiry_id,
-        inquiry_type: this.data.inquiry_type,
-        message_type: 0,
-        is_system: 0,
-        message_rounds: message_rounds,
-        patient_family_data: patient_family_data
+      let _this = this;
+      let conversationID = this.data.conversation.conversationID
+      let promise = wx.$TUIKit.getConversationProfile(conversationID);
+      promise.then(function(imResponse) {
+        console.log("getConversationProfile 正在执行")
+        // 获取成功
+        console.log(imResponse.data.conversation); // 会话资料
+        _this.setData({
+          conversation: imResponse.data.conversation
+        })
+      }).catch(function(imError) {
+        console.warn('getConversationProfile error:', imError); // 获取会话资料失败的相关信息
       });
 
-      console.log("mycloudCustomData: ", mycloudCustomData);
-      console.log("text: ", text);
-      const message = wx.$TUIKit.createTextMessage({
-        to, 
-        conversationType: this.data.conversation.type,
-        payload: {
-          text,
-        },
-        cloudCustomData: mycloudCustomData
-      });
-      this.setData({
-        message: '',
-        sendMessageBtn: false,
-      });
-      this.$sendTIMMessage(message);
+      Promise.all([promise]).then(res => {
+        console.log("getConversationProfile 执行完毕")
+        //获取最后一条消息
+        let last_message = this.data.conversation.lastMessage;
+        console.log("last_message: ", last_message);
+        let cloudCustomData = "";
+        let cloudCustomDataJson = "";
+        if(last_message.cloudCustomData){
+          cloudCustomData = last_message.cloudCustomData;
+        }
+        if(cloudCustomData){
+          cloudCustomDataJson = JSON.parse(cloudCustomData);
+        }
+        let message_rounds = 0;
+        let patient_family_data = {};
+        patient_family_data.patient_name = this.data.baseInfo.patient_family_name;
+        patient_family_data.patient_sex = this.data.baseInfo.patient_family_sex;
+        patient_family_data.patient_age = this.data.baseInfo.patient_family_age;
+        if(cloudCustomDataJson){
+          message_rounds = cloudCustomDataJson.message_rounds;
+        }
+        
+        const to = this.getToAccount();
+        const text = flag ? msg : this.data.message;
+
+        const { FEAT_NATIVE_CODE } = constant;
+        const mycloudCustomData = JSON.stringify({
+          order_inquiry_id: this.data.order_inquiry_id,
+          inquiry_type: this.data.inquiry_type,
+          message_type: 0,
+          is_system: 0,
+          message_rounds: message_rounds,
+          patient_family_data: patient_family_data
+        });
+
+        console.log("mycloudCustomData: ", mycloudCustomData);
+        console.log("text: ", text);
+        const message = wx.$TUIKit.createTextMessage({
+          to, 
+          conversationType: this.data.conversation.type,
+          payload: {
+            text,
+          },
+          cloudCustomData: mycloudCustomData
+        });
+        this.setData({
+          message: '',
+          sendMessageBtn: false,
+        });
+        this.$sendTIMMessage(message);
+      })
     },
 
     // 监听输入框value值变化
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxml b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
index 04b47e9..d6685d7 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
@@ -6,7 +6,7 @@
         <image class="TUI-icon" bindtap="switchAudio" wx:if="{{has_audio}}"
         src="{{isAudio ? '../../../../static/assets/keyboard.svg' : '../../../../static/assets/audio.svg'}}" />
         <view wx:if="{{!isAudio || isEmoji}}" class="TUI-message-input-main {{ focus && 'TUI-message-input-main-focus'}}" >
-            <textarea  class="TUI-message-input-area" adjust-position="{{false}}" cursor-spacing="20"
+            <textarea id="mytextarea" class="TUI-message-input-area" adjust-position="{{false}}" cursor-spacing="20"
                 value="{{message}}" bindinput="onInputValueChange" maxlength="-1" type="text" auto-height="{{true}}"
                 placeholder="请输入文字" placeholder-class="input-placeholder" confirm-type="send" show-confirm-bar="{{false}}"
                 bindfocus="inputBindFocus"
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index c7abe3c..02f2e2c 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -342,7 +342,11 @@ Component({
 
       let jumpAim = `ID-${this.filterSystemMessageID(this.data.messageList[this.data.messageList.length - 1].ID)}`;
       console.log("jumpAim:", jumpAim);
-      if(autoToButtom){
+
+      console.log("message.from: ", message.from)
+      console.log("conversation: ", this.data.conversation)
+      console.log("conversation: ", this.data.conversation.lastMessage.from)
+      if(autoToButtom && message.conversationID === this.data.conversation.conversationID){
         this.setData({
           jumpAim: jumpAim
         })
diff --git a/TUIKit/components/TUIChat/index.js b/TUIKit/components/TUIChat/index.js
index da0ed79..be3c58b 100644
--- a/TUIKit/components/TUIChat/index.js
+++ b/TUIKit/components/TUIChat/index.js
@@ -131,7 +131,7 @@ Component({
     },
     navbar_height: 0,
     dialog_visible: false,
-
+    KeysBoardsStatus: "down"
   },
 
   /**
@@ -275,39 +275,48 @@ Component({
     myhandleExtensions(e){
       console.log("myhandleExtensionsmyhandleExtensions: ", e);
       let displayFlag = e.detail.displayFlag;
-      if(displayFlag){
-        this.setData({
-          input_area_style: "position: absolute;  bottom: 30px;"
-        })
-        this.getNavbarHeight(100);
-        this.selectComponent('#MessageList').handleJumpNewMessage();
-      }else{
-        this.setData({
-          input_area_style: "",
-        })
-        this.getNavbarHeight();
-      }
+      setTimeout(() => {
+        if(displayFlag){
+          this.setData({
+            input_area_style: "position: absolute;  bottom: 30px;"
+          })
+          this.getNavbarHeight(100);
+          this.selectComponent('#MessageList').handleJumpNewMessage();
+        }else{
+          this.setData({
+            input_area_style: "",
+          })
+          this.getNavbarHeight();
+        }
+        
+      }, 10);
     },
     // 监听键盘，获取焦点时将输入框推到键盘上方
     pullKeysBoards(event) {
+      console.log("pullKeysBoardspullKeysBoards")
       setNewInputStyle(event.detail.event.detail.height);
+      this.getNavbarHeight();
       this.setData({
         'viewData.style': newInputStyle,
-        input_area_style: "position: absolute;  bottom: 45rpx;"
+        input_area_style: "position: absolute;  bottom: 45rpx;",
+        KeysBoardsStatus: "pull"
       });
     },
     // 监听键盘，失去焦点时收起键盘
     downKeysBoards(event) {
+      console.log("downKeysBoardsdownKeysBoards")
       console.log(event)
       let value = event.detail.event.detail.value;
       if(value){
         this.setData({
           'viewData.style': inputStyle,
+          KeysBoardsStatus: "down"
         });
       }else{
         this.setData({
           'viewData.style': inputStyle,
-          input_area_style: ""
+          input_area_style: "",
+          KeysBoardsStatus: "down"
         });
       }
     },
diff --git a/utils/network/api.js b/utils/network/api.js
index 8dce962..abcb222 100644
--- a/utils/network/api.js
+++ b/utils/network/api.js
@@ -641,7 +641,7 @@ class API extends HTTP {
   let order_inquiry_id = params.order_inquiry_id;
   params = {}
   return this.request({
-    url: `${this.baseUrl}/doctor/inquiry/finish/`+order_inquiry_id,
+    url: `${this.baseUrl}/inquiry/finish/`+order_inquiry_id,
     method: 'PUT',
     data: {
       ...params

From 9e3cb69030a53556364a7d44011d8f14617b8a5d Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Tue, 25 Apr 2023 18:05:51 +0800
Subject: [PATCH 23/83] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yaoshi/prescription/prescription.js     |  4 +-
 Pages/yaoshi/prescription/prescription.wxml   |  4 +-
 Pages/yishi/case/index.wxml                   |  3 +-
 Pages/yishi/index/index.js                    | 44 ++++++++++++++-----
 Pages/yishi/index/index.json                  |  3 +-
 Pages/yishi/index/index.wxml                  | 11 +++++
 Pages/yishi/onlinechufang/index.js            |  5 ++-
 Pages/yishi/onlinesetupprice/index.wxml       |  2 +-
 Pages/yishi/quickreply/index.js               | 13 +++++-
 Pages/yishi/quickreply/index.wxml             |  2 +-
 Pages/yishi/wenzhen_v2/wenzhen.js             | 12 +++++
 Pages/yishi/wenzhen_v2/wenzhen.wxml           |  8 ++--
 Pages/yishi/wenzhenorderV2/index.js           |  3 +-
 Pages/yishi/wenzhenorderV2/index.json         |  3 +-
 Pages/yishi/wenzhenorderV2/index.wxml         |  2 +-
 Pages/yishi/wenzhenorderV2/index.wxss         |  3 +-
 Pages/yishi/zhiye_identity/index.js           |  2 +-
 .../MessageElements/CustomMessage/index.js    |  2 +-
 .../TUIChat/components/MessageInput/index.js  | 28 +++++++-----
 .../TUIChat/components/MessageList/index.js   |  9 ++++
 TUIKit/components/TUIChat/index.wxml          |  8 ++--
 utils/substr.wxs                              | 12 +++++
 22 files changed, 136 insertions(+), 47 deletions(-)
 create mode 100644 utils/substr.wxs

diff --git a/Pages/yaoshi/prescription/prescription.js b/Pages/yaoshi/prescription/prescription.js
index ff957a0..fce659a 100644
--- a/Pages/yaoshi/prescription/prescription.js
+++ b/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);})
diff --git a/Pages/yaoshi/prescription/prescription.wxml b/Pages/yaoshi/prescription/prescription.wxml
index 3b5b79f..8c6b132 100644
--- a/Pages/yaoshi/prescription/prescription.wxml
+++ b/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">
diff --git a/Pages/yishi/case/index.wxml b/Pages/yishi/case/index.wxml
index 2fdb5b4..448e608 100644
--- a/Pages/yishi/case/index.wxml
+++ b/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>
diff --git a/Pages/yishi/index/index.js b/Pages/yishi/index/index.js
index d71614a..906ec86 100644
--- a/Pages/yishi/index/index.js
+++ b/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
+    })
   }
 })
\ No newline at end of file
diff --git a/Pages/yishi/index/index.json b/Pages/yishi/index/index.json
index a2f67d2..9f2b365 100644
--- a/Pages/yishi/index/index.json
+++ b/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"
diff --git a/Pages/yishi/index/index.wxml b/Pages/yishi/index/index.wxml
index f25e1f0..c27acfe 100644
--- a/Pages/yishi/index/index.wxml
+++ b/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>
 
 
diff --git a/Pages/yishi/onlinechufang/index.js b/Pages/yishi/onlinechufang/index.js
index f0f161b..66bb072 100644
--- a/Pages/yishi/onlinechufang/index.js
+++ b/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);
diff --git a/Pages/yishi/onlinesetupprice/index.wxml b/Pages/yishi/onlinesetupprice/index.wxml
index 9951f9f..13e237f 100644
--- a/Pages/yishi/onlinesetupprice/index.wxml
+++ b/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">
diff --git a/Pages/yishi/quickreply/index.js b/Pages/yishi/quickreply/index.js
index 8e02877..67a264e 100644
--- a/Pages/yishi/quickreply/index.js
+++ b/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){
diff --git a/Pages/yishi/quickreply/index.wxml b/Pages/yishi/quickreply/index.wxml
index 338ab61..06f9500 100644
--- a/Pages/yishi/quickreply/index.wxml
+++ b/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">
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index dd2a3dd..21b1831 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/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;
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml
index 0c7bf6b..b954de4 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxml
+++ b/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?'男':'女' }}"
diff --git a/Pages/yishi/wenzhenorderV2/index.js b/Pages/yishi/wenzhenorderV2/index.js
index 9106a80..8616685 100644
--- a/Pages/yishi/wenzhenorderV2/index.js
+++ b/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
diff --git a/Pages/yishi/wenzhenorderV2/index.json b/Pages/yishi/wenzhenorderV2/index.json
index cca90c7..441ea01 100644
--- a/Pages/yishi/wenzhenorderV2/index.json
+++ b/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
 }
\ No newline at end of file
diff --git a/Pages/yishi/wenzhenorderV2/index.wxml b/Pages/yishi/wenzhenorderV2/index.wxml
index 9034384..c6ae831 100644
--- a/Pages/yishi/wenzhenorderV2/index.wxml
+++ b/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>
\ No newline at end of file
diff --git a/Pages/yishi/wenzhenorderV2/index.wxss b/Pages/yishi/wenzhenorderV2/index.wxss
index 8c2a298..3c1bba1 100644
--- a/Pages/yishi/wenzhenorderV2/index.wxss
+++ b/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;
diff --git a/Pages/yishi/zhiye_identity/index.js b/Pages/yishi/zhiye_identity/index.js
index 2cfa4bd..84941a4 100644
--- a/Pages/yishi/zhiye_identity/index.js
+++ b/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);
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
index 18fffe9..9a25a60 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
+++ b/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,
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js
index 5c89212..dc78a2e 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/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 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
-            })
-          }
+          let _this = this;
+          console.log("开始订阅消息");
+          wx.requestSubscribeMessage({
+            tmplIds: ['5Tl-xmaWXrKP5BB8E6b3oTdPHbHa7WYWbmvZiuz4TLs'],
+            success (res) {
+              console.log(res);
+              let usertype =  wx.getStorageSync('usertype');
+              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;
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index 02f2e2c..3d326cf 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/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', {
diff --git a/TUIKit/components/TUIChat/index.wxml b/TUIKit/components/TUIChat/index.wxml
index f20febd..988ca9d 100644
--- a/TUIKit/components/TUIChat/index.wxml
+++ b/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>
diff --git a/utils/substr.wxs b/utils/substr.wxs
new file mode 100644
index 0000000..7a50e2c
--- /dev/null
+++ b/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
+}
\ No newline at end of file

From e7be139b04bb5fe0b19a0e68d3beb286a4c76c4b Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Wed, 26 Apr 2023 09:57:07 +0800
Subject: [PATCH 24/83] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/index/index.js              |  21 +++-
 Pages/yishi/index/index.js        | 163 +++++++++++++++++++-----------
 Pages/yishi/index/index.wxss      |   1 +
 Pages/yishi/wenzhen_v2/wenzhen.js |   7 +-
 commpents/myprofile/index.wxml    |   2 +-
 commpents/navbar/index.js         |   2 +-
 commpents/te_navbar/index.js      |   2 +-
 commpents/yishi_navbar/index.js   |   2 +-
 8 files changed, 132 insertions(+), 68 deletions(-)

diff --git a/Pages/index/index.js b/Pages/index/index.js
index 386f8ea..1d3a895 100644
--- a/Pages/index/index.js
+++ b/Pages/index/index.js
@@ -4,6 +4,18 @@ Page({
   data: {
     loading: true
   },
+  onLoad(option){
+    let from = option.from;
+    let usertype = wx.getStorageSync('usertype');
+    console.log("index onload: ", from, usertype)
+    if(from === "navbar"){
+      //切换身份
+    }else{
+      if(usertype == 2 || usertype == 3){
+        this.guideTo(usertype)
+      }
+    }
+  },
   /**
    * 生命周期函数--监听页面显示
    */
@@ -22,10 +34,16 @@ Page({
     let url = e.currentTarget.dataset.url;
     wx.setStorageSync('usertype', usertype);
     wx.setStorageSync('next_url', url);
+    this.guideTo(usertype);
+  },
+  guideTo(usertype){
+    let url;
     if(usertype == 2){
       app.imInit();
+      url = "/Pages/yishi/index/index";
     }else{
       app.imLogout();
+      url = "/Pages/yaoshi/home/home";
     }
     let token = wx.getStorageSync('AUTH_TOKEN_'+usertype);
     console.log(token);
@@ -37,5 +55,4 @@ Page({
       app.go(app.globalData.login_url);
     }
   }
-  
-})
\ No newline at end of file
+})
diff --git a/Pages/yishi/index/index.js b/Pages/yishi/index/index.js
index 906ec86..0fcb001 100644
--- a/Pages/yishi/index/index.js
+++ b/Pages/yishi/index/index.js
@@ -66,29 +66,24 @@ Page({
       },
       {
         case_status: 2,
-        case_module: [0,1,4,5,6],
+        case_module: [0,1,2,3,4,5,6,7,8],
         case_text: "请您先绑定结算银行卡"
       },
       {
         case_status: 3,
-        case_module: [0,1,5,6,7],
-        case_text: "请您先设置在线问诊价格"
+        case_module: [7],
+        case_text: "请您先进行多点执业认证"
       },
       {
         case_status: 4,
         case_module: [7],
-        case_text: "请您先多点执业认证"
+        case_text: "请您先进行多点执业认证"
       },
       {
         case_status: 5,
         case_module: [],
         case_text: "已全部通过"
       },
-      {
-        case_status: 6,
-        case_module: [7],
-        case_text: "请您先多点执业认证"
-      },
     ],
     contactKeFu: false,
     jiesuan_dialog_show: false,
@@ -126,10 +121,15 @@ Page({
     let funbox_height = wx.getSystemInfoSync().windowHeight - (this.data.stateHeight + this.data.navHeight + 10) - 55;//减去底部空白
     funbox_height = rpxTopx(funbox_height);
     // 147 userinfo的高度
+    // 80  info_note
     // 155 认证部分的高度
     // 168 广告部分的高度
     // 40 自定义适配
     funbox_height = funbox_height - 147 - 20 - 30 - 20 - 155 - 30 - 168 - 20 - 30 - 30 - 30 - 30 - 40;
+    // 50  info_note
+    if(this.data.info.show_info_note){
+      funbox_height = funbox_height - 50;
+    }
     funbox_height = funbox_height / 3;
     if(funbox_height > 150) funbox_height = 150
     this.setData({
@@ -186,29 +186,7 @@ Page({
   },
   onHide(){
     console.log("index onHide() onHide() ");
-    this.setData({
-      swiperList: [],
-      contactKeFu: false,
-      info:{
-        user_name: "医师姓名",
-        not_accepted_inquiry_num: 0,
-        accepting_inquiry_num: 0,
-        info_shiming_status_txt: "未认证",
-        info_shiming_status: "info_shiming_status_no",
-        show_info_note: false,
-        praise_rate: "100%",
-        avg_response_time: 0,
-        number_of_fans: 0,
-        avatar: "https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/default_photo.png",
-        reject_prescription_number: false,//处方管理小红点
-      },
-      iden_auth_status_txt: "未认证",
-      multi_point_status_txt: "未认证",
-      shiming_status_url: "",
-      iden_auth_status_url: "/Pages/yishi/identity/index",
-      multi_point_status_url: "/Pages/yishi/zhiye_identity/index",
-      skeleton_loading: false
-    })
+
     wx.offCopyUrl(this.Copylistener) // 需传入与监听时同一个的函数对象
 
     if (typeof this.getTabBar === 'function' && this.getTabBar()) {
@@ -239,7 +217,7 @@ Page({
       this.getTabBar().startInterval()
     }
     this.getMenuButtonBound();
-    this.getFunboxHeight();
+    
     api.yiShiIndex().then(response => {
       console.log(response);
       let avatar = response.data.info.avatar;
@@ -267,6 +245,10 @@ Page({
       let is_bind_bank = response.data.info.is_bind_bank;
       //是否参加专家图文接诊（0:否 1:是）
       let is_img_expert_reception = response.data.info.is_img_expert_reception;
+      //是否参加专家快速接诊（0:否 1:是）
+      let is_img_quick_reception = response.data.info.is_img_quick_reception;
+      //是否参加专家公益接诊（0:否 1:是）
+      let is_img_welfare_reception = response.data.info.is_img_welfare_reception;
 
       this.setData({
         "info.idcard_status": idcard_status,
@@ -274,6 +256,8 @@ Page({
         "info.multi_point_status": multi_point_status,
         "info.is_bind_bank": is_bind_bank,
         "info.is_img_expert_reception": is_img_expert_reception,
+        "info.is_img_quick_reception": is_img_quick_reception,
+        "info.is_img_welfare_reception": is_img_welfare_reception,
       });
 
       //iden_auth_status 0:未认证 1:认证通过 2:审核中 3:认证失败
@@ -307,6 +291,8 @@ Page({
       })
     }).then(res => {
       wx.stopPullDownRefresh()
+    }).then(res =>{
+      this.getFunboxHeight();
     }).catch(errors => {
       console.error(errors);
     })
@@ -353,6 +339,7 @@ Page({
   gozhiye(e){
     let idcard_status = this.data.info.idcard_status;
     let iden_auth_status = this.data.info.iden_auth_status;
+    let is_bind_bank = this.data.info.is_bind_bank;
     if(idcard_status != 1){
       this.setData({
         dialog_content: "请您先完成实名认证",
@@ -369,6 +356,14 @@ Page({
       });
       return;
     }
+    if(is_bind_bank != 1){
+      this.setData({
+        dialog_content: "请您先绑定结算银行卡",
+        shiming_status_url: "/Pages/yishi/bankcard/index",
+        dialog_visible: true,
+      });
+      return;
+    }
     app.go(e.currentTarget.dataset.url);
   },
   confirmDialog(){
@@ -390,8 +385,15 @@ Page({
      //多点执业认证
      let multi_point_status = this.data.info.multi_point_status;
       //绑定结算银行卡
-    var is_bind_bank = this.data.info.is_bind_bank;
-    let usertype =  wx.getStorageSync('usertype');
+     var is_bind_bank = this.data.info.is_bind_bank;
+        //是否参加专家图文接诊（0:否 1:是）
+    let is_img_expert_reception = this.data.info.is_img_expert_reception;
+    //是否参加专家快速接诊（0:否 1:是）
+    let is_img_quick_reception = this.data.info.is_img_quick_reception;
+    //是否参加专家公益接诊（0:否 1:是）
+    let is_img_welfare_reception = this.data.info.is_img_welfare_reception;
+
+     let usertype =  wx.getStorageSync('usertype');
      let userID = wx.getStorageSync('user_id_'+usertype);
      wx.setStorageSync(userID+'_idcard_status', idcard_status);
      wx.setStorageSync(userID+'_iden_auth_status', iden_auth_status);
@@ -507,21 +509,23 @@ Page({
       });
       // return false;
     }
+    
     if(multi_point_status == 2){
       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/zhiye_identity/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/zhiye_identity/index",
-      dialog_content: "您的多点执业认证正在审核中",
-      default_dialog_show: true
-  });
       // return false;
     }
+    
     if(multi_point_status == 3){
       if(!this.data.default_dialog_show){
         this.setData({
@@ -534,28 +538,62 @@ Page({
         shiming_status_url: "/Pages/yishi/zhiye_identity/index",
         dialog_content: "您的多点执业认证失败",
         default_dialog_show: true
-    });
+      });
       // return false;
     }
-    
-    //开启在线问诊
-    var is_img_expert_reception = this.data.info.is_img_expert_reception;
-    if(is_img_expert_reception == 0 ){
+
+    if((is_img_expert_reception + is_img_quick_reception + is_img_welfare_reception) == 0){
       if(!this.data.default_dialog_show){
-          this.setData({
-            dialog_visible: true,
-        });
+        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/onlinesetup/index",
-        dialog_content: "请您点击[在线问诊管理]，开通在线问诊",
-        default_dialog_show: true
-      })
+        dialog_content: "您的多点执业认证失败",
+        // default_dialog_show: true
+      });
       return false;
     }
 
+    if((is_img_expert_reception + is_img_quick_reception + is_img_welfare_reception) > 0){
+      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/wenzhen_v2/wenzhen",
+        dialog_content: "您的多点执业认证失败",
+        // default_dialog_show: true
+      });
+      return false;
+    }
+
+    
+    
+    //开启在线问诊
+    // var is_img_expert_reception = this.data.info.is_img_expert_reception;
+    // if(is_img_expert_reception == 0 ){
+    //   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/onlinesetup/index",
+    //     dialog_content: "请您先前往在线问诊管理中，开通在线问诊",
+    //     default_dialog_show: true
+    //   })
+    //   return false;
+    // }
+
     if(!app.globalData.jiesuan_dialog_show){
       this.setData({
         jiesuan_dialog_visible: true,
@@ -600,12 +638,16 @@ Page({
     let is_bind_bank = this.data.info.is_bind_bank;
     //是否参加专家图文接诊（0:否 1:是）
     let is_img_expert_reception = this.data.info.is_img_expert_reception;
+    //是否参加专家快速接诊（0:否 1:是）
+    let is_img_quick_reception = this.data.info.is_img_quick_reception;
+    //是否参加专家公益接诊（0:否 1:是）
+    let is_img_welfare_reception = this.data.info.is_img_welfare_reception;
     let statusArr = [];
     
     // 未实名认证和医师身份认证 0
     // 已实名认证，未医师身份认证 1
     // 已实名认证和医师身份认证，未绑定结算银行卡 2
-    // 已实名认证和医生身份认证，已绑定结算银行卡 没开通了在线问诊3
+    // 已实名认证和医生身份认证，已绑定结算银行卡 未开通多点执业认证3
     // 已实名认证和医师身份认证且绑定结算银行卡，开通了在线问诊，未开通多点执业认证 4
     // 已实名认证和医师身份认证且绑定结算银行卡，开通了在线问诊，已开通多点执业认证 5
     if(idcard_status == 0 && iden_auth_status == 0){
@@ -617,18 +659,17 @@ Page({
     if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank != 1){
       statusArr.push(2);
     }
-    if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank == 1 && is_img_expert_reception != 1){
+    if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank == 1 && multi_point_status != 1 && 
+      (is_img_expert_reception + is_img_quick_reception + is_img_welfare_reception) == 0){
       statusArr.push(3);
     }
-    if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank == 1 && is_img_expert_reception == 1 && multi_point_status != 1){
+    if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank == 1 && multi_point_status != 1 &&
+      (is_img_expert_reception + is_img_quick_reception + is_img_welfare_reception) > 0){
       statusArr.push(4);
     }
-    if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank == 1 && is_img_expert_reception == 1 && multi_point_status == 1){
+    if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank  == 1 && multi_point_status == 1){
       statusArr.push(5);
     }
-    if(idcard_status == 1 && iden_auth_status == 1 && multi_point_status != 1){
-      statusArr.push(6);
-    }
 
     let retult = true;
     statusArr.forEach(status => {
diff --git a/Pages/yishi/index/index.wxss b/Pages/yishi/index/index.wxss
index 57662b4..441b6e1 100644
--- a/Pages/yishi/index/index.wxss
+++ b/Pages/yishi/index/index.wxss
@@ -105,6 +105,7 @@ page{
   text-align: center;
   margin-top: 20rpx;
   margin-left: 20rpx;
+  height: 50rpx;
 }
 .info_note_txt{
   font-size: 28rpx;
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index 21b1831..b6e4b76 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -395,7 +395,7 @@ Page({
         if(payload) {
           console.log("payload: ",payload.data);
           let payloadJson = JSON.parse(payload.data);
-          text = payloadJson.title.replace(/-/g, "");
+          text = payloadJson.title.replaceAll(/-/g, "").replaceAll(/—/g, "");
         }
         lastMessage.messageForShow = text;
       }
@@ -428,6 +428,10 @@ Page({
         if(item.inquiry_status == 3){
           totalUnreadCount = totalUnreadCount + 1;
           session_item.message_dot = true;
+          let dot_name = "dot_"+inquiry_type
+          this.setData({
+            [dot_name]: true
+          })
         }else{
           session_item.message_dot = false;
         }
@@ -435,6 +439,7 @@ Page({
       session_list[inquiry_type - 1].push(session_item);
     })
 
+    
     wx.setStorageSync(userID+'_wenzhen_info', totalUnreadCount);
     
 
diff --git a/commpents/myprofile/index.wxml b/commpents/myprofile/index.wxml
index d4c2d3a..39d5a1e 100644
--- a/commpents/myprofile/index.wxml
+++ b/commpents/myprofile/index.wxml
@@ -349,7 +349,7 @@
           <van-button data-from="doctorauthiden" disabled="{{iden_auth_disabled}}" color="#3CC7C0" custom-style="border-radius: 20rpx;" type="primary" block bind:click="addDoctorAuthIden">{{iden_auth_status_txt}}</van-button>
         </view>
         <view class="sub_button" wx:else>
-          <van-button color="#3CC7C0" data-from="myinfo" disabled="{{iden_auth_status == 2}}" custom-style="border-radius: 20rpx;" type="primary" block bind:click="addDoctorAuthIden">{{iden_auth_status_txt}}</van-button>
+          <van-button color="#3CC7C0" data-from="myinfo" disabled custom-style="border-radius: 20rpx;" type="primary" block bind:click="addDoctorAuthIden">{{iden_auth_status_txt}}</van-button>
         </view>
 
 
diff --git a/commpents/navbar/index.js b/commpents/navbar/index.js
index 41d282f..957aaeb 100644
--- a/commpents/navbar/index.js
+++ b/commpents/navbar/index.js
@@ -32,7 +32,7 @@ Component({
   //返回到首页
     _backhome() {
       wx.navigateTo({
-        url: '/Pages/index/index',
+        url: '/Pages/index/index?from=navbar',
       })
     }
   }
diff --git a/commpents/te_navbar/index.js b/commpents/te_navbar/index.js
index da62db0..cadc4e8 100644
--- a/commpents/te_navbar/index.js
+++ b/commpents/te_navbar/index.js
@@ -42,7 +42,7 @@ Component({
     },
     onGoHome() {
       wx.reLaunch({
-        url: '/Pages/index/index',
+        url: '/Pages/index/index?from=navbar',
       });
     },
   },
diff --git a/commpents/yishi_navbar/index.js b/commpents/yishi_navbar/index.js
index 41d282f..957aaeb 100644
--- a/commpents/yishi_navbar/index.js
+++ b/commpents/yishi_navbar/index.js
@@ -32,7 +32,7 @@ Component({
   //返回到首页
     _backhome() {
       wx.navigateTo({
-        url: '/Pages/index/index',
+        url: '/Pages/index/index?from=navbar',
       })
     }
   }

From 97a504c6d24a4a96e6cd50da6e090f2505deb17b Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Fri, 5 May 2023 11:44:37 +0800
Subject: [PATCH 25/83] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/index/index.js                          |   4 +-
 Pages/login/index.wxml                        |   6 +-
 Pages/yishi/agreement_detail/index.js         |  30 +
 Pages/yishi/agreement_detail/index.json       |   6 +
 Pages/yishi/agreement_detail/index.wxml       |   5 +
 Pages/yishi/agreement_detail/index.wxss       |   8 +
 Pages/yishi/appraise/index.wxml               |   7 +-
 Pages/yishi/cash/index.js                     |   7 +-
 Pages/yishi/cash/index.wxml                   |   4 +-
 Pages/yishi/cashrecord/index.js               |  20 +-
 Pages/yishi/index/index.js                    |  63 +-
 Pages/yishi/index/index.wxml                  |   6 +-
 Pages/yishi/manual_detail/index.js            |   2 +-
 Pages/yishi/myaccount/index.js                |  22 +-
 Pages/yishi/myaccount/index.wxml              |   2 +-
 Pages/yishi/mycard/index.wxml                 |   6 +-
 Pages/yishi/onlinesetupprice/index.wxml       |   2 +-
 Pages/yishi/wenzhen_v2/wenzhen.js             |  36 +-
 Pages/yishi/wenzhen_v2/wenzhen.json           |   3 +-
 Pages/yishi/wenzhen_v2/wenzhen.wxml           |  12 +-
 Pages/yishi/wenzhen_v2/wenzhen.wxss           |   7 +-
 Pages/yishi/wenzhen_v3/substr.wxs             |  12 +
 Pages/yishi/wenzhen_v3/wenzhen.js             | 575 ++++++++++++++++++
 Pages/yishi/wenzhen_v3/wenzhen.json           |  20 +
 Pages/yishi/wenzhen_v3/wenzhen.wxml           | 378 ++++++++++++
 Pages/yishi/wenzhen_v3/wenzhen.wxss           | 139 +++++
 Pages/yishi/yizhensetup/index.js              |  14 +-
 Pages/yishi/yizhensetupprice/index.wxml       |   2 +-
 Pages/yishi/zhiye_identity/index.js           |   2 +
 Pages/yishi/zhiye_identity/index.wxml         |   3 +
 .../MessageElements/CustomMessage/index.js    |   2 +
 .../MessageElements/CustomMessage/index.wxml  |  29 +-
 .../MessageElements/CustomMessage/index.wxss  |   4 +-
 .../TUIChat/components/MessageInput/index.js  |  63 +-
 .../components/MessageInput/index.wxml        |  11 +-
 .../components/MessageInput/index.wxss        |   5 +-
 .../TUIChat/components/MessageList/index.js   | 200 ++++--
 .../TUIChat/components/MessageList/index.json |   3 +-
 .../TUIChat/components/MessageList/index.wxml |  15 +-
 .../TUIChat/components/MessageList/index.wxss |   2 +-
 TUIKit/components/TUIChat/index.js            |  41 +-
 TUIKit/components/TUIChat/index.wxml          |  17 +-
 app.js                                        |  12 +-
 app.json                                      |  10 +-
 commpents/myprofile/index.js                  |  55 +-
 commpents/myprofile/index.wxml                |  23 +-
 commpents/myprofile/index.wxss                |  35 ++
 commpents/textarea-cell/index.js              |   4 +
 commpents/textarea-cell/index.wxml            |   2 +-
 commpents/upload-cell/index.js                |   8 +
 commpents/upload-cell/index.wxml              |   6 +-
 miniprogram_npm/@vant/weapp/tabs/index.js     |   2 +-
 utils/network/api.js                          |  82 ++-
 utils/util.js                                 |  55 +-
 utils/wechatTime.js                           | 121 ++++
 55 files changed, 1961 insertions(+), 249 deletions(-)
 create mode 100644 Pages/yishi/agreement_detail/index.js
 create mode 100644 Pages/yishi/agreement_detail/index.json
 create mode 100644 Pages/yishi/agreement_detail/index.wxml
 create mode 100644 Pages/yishi/agreement_detail/index.wxss
 create mode 100644 Pages/yishi/wenzhen_v3/substr.wxs
 create mode 100644 Pages/yishi/wenzhen_v3/wenzhen.js
 create mode 100644 Pages/yishi/wenzhen_v3/wenzhen.json
 create mode 100644 Pages/yishi/wenzhen_v3/wenzhen.wxml
 create mode 100644 Pages/yishi/wenzhen_v3/wenzhen.wxss
 create mode 100644 utils/wechatTime.js

diff --git a/Pages/index/index.js b/Pages/index/index.js
index 1d3a895..739c841 100644
--- a/Pages/index/index.js
+++ b/Pages/index/index.js
@@ -39,7 +39,9 @@ Page({
   guideTo(usertype){
     let url;
     if(usertype == 2){
-      app.imInit();
+      if(!wx.$TUIKit){
+        app.imInit();
+      }
       url = "/Pages/yishi/index/index";
     }else{
       app.imLogout();
diff --git a/Pages/login/index.wxml b/Pages/login/index.wxml
index 71911e1..5f9724f 100644
--- a/Pages/login/index.wxml
+++ b/Pages/login/index.wxml
@@ -23,7 +23,11 @@
         wx:else
         bindtap="getPhoneNumber"
         color="#09BB07" custom-style="font-size: 36rpx;" type="primary" round block>微信授权手机号登录</van-button>
-      <van-checkbox value="{{ checked }}" bind:change="onChange">我已阅读并同意协议<text style="color: #4384FE;">《肝胆相照用户服务协议》</text></van-checkbox>
+      
+      <view style="display: flex;">
+        <van-checkbox value="{{ checked }}" bind:change="onChange">我已阅读并同意协议</van-checkbox>
+        <view style="color: #4384FE;flex: 1;" bindtap="go" data-url="/Pages/yishi/agreement_detail/index?agreement_id=10">《肝胆相照用户服务协议》</view>
+      </view>
     </view>
 
     <view class="bottom">
diff --git a/Pages/yishi/agreement_detail/index.js b/Pages/yishi/agreement_detail/index.js
new file mode 100644
index 0000000..9593e2d
--- /dev/null
+++ b/Pages/yishi/agreement_detail/index.js
@@ -0,0 +1,30 @@
+import { API } from './../../../utils/network/api'
+let api = new API()
+Page({
+
+  data: {
+    navbarData: {
+      showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
+      title: '协议详情', //导航栏 中间的标题
+    },
+    agreement_id: "",
+    agreement_content: ""
+  },
+
+  onLoad(option){
+    this.setData({
+      agreement_id: option.agreement_id
+    })
+  },
+
+  onShow(){
+    //获取医生我的账户数据
+    api.getBasicAgreement({agreement_id: this.data.agreement_id}).then(response => {
+      console.log(response);
+      this.setData({
+        agreement_content: response.data.agreement_content,
+        "navbarData.title": response.data.agreement_name,
+      })
+    }).catch(errors => {console.error(errors);})
+  }
+})
\ No newline at end of file
diff --git a/Pages/yishi/agreement_detail/index.json b/Pages/yishi/agreement_detail/index.json
new file mode 100644
index 0000000..3b3b8cc
--- /dev/null
+++ b/Pages/yishi/agreement_detail/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "te-nav-bar": "/commpents/te_navbar"
+  }
+}
\ No newline at end of file
diff --git a/Pages/yishi/agreement_detail/index.wxml b/Pages/yishi/agreement_detail/index.wxml
new file mode 100644
index 0000000..8e9cd5f
--- /dev/null
+++ b/Pages/yishi/agreement_detail/index.wxml
@@ -0,0 +1,5 @@
+<!-- 协议详情 -->
+<te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
+<view class="container">
+  <rich-text nodes="{{agreement_content}}" space="nbsp"></rich-text>
+</view>
diff --git a/Pages/yishi/agreement_detail/index.wxss b/Pages/yishi/agreement_detail/index.wxss
new file mode 100644
index 0000000..893b247
--- /dev/null
+++ b/Pages/yishi/agreement_detail/index.wxss
@@ -0,0 +1,8 @@
+/* Pages/yishi/manual_detail/index.wxss */
+page{
+  background-color: #F6F6F6;
+}
+.container{
+  width: 92vw;
+  margin: 20rpx auto;
+}
\ No newline at end of file
diff --git a/Pages/yishi/appraise/index.wxml b/Pages/yishi/appraise/index.wxml
index 26609cf..39259e5 100644
--- a/Pages/yishi/appraise/index.wxml
+++ b/Pages/yishi/appraise/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">
 
@@ -17,7 +18,7 @@
               </view>
             </view>
             <view class="content">{{item.content}}</view>
-            <view class="date">{{item.created_at}}</view>
+            <view class="date">{{dateSubstr.substring(item.created_at,0,16)}}</view>
           </view>
         </view>
         <van-empty description="暂无数据" wx:if="{{appraise_list_1.length == 0}}" />
@@ -33,7 +34,7 @@
               </view>
             </view>
             <view class="content">{{item.content}}</view>
-            <view class="date">{{item.created_at}}</view>
+            <view class="date">{{dateSubstr.substring(item.created_at,0,16)}}</view>
           </view>
         </view>
         <van-empty description="暂无数据" wx:if="{{appraise_list_2.length == 0}}" />
@@ -49,7 +50,7 @@
               </view>
             </view>
             <view class="content">{{item.content}}</view>
-            <view class="date">{{item.created_at}}</view>
+            <view class="date">{{dateSubstr.substring(item.created_at,0,16)}}</view>
           </view>
         </view>
         <van-empty description="暂无数据" wx:if="{{appraise_list_3.length == 0}}" />
diff --git a/Pages/yishi/cash/index.js b/Pages/yishi/cash/index.js
index 71740f0..b3e9c2a 100644
--- a/Pages/yishi/cash/index.js
+++ b/Pages/yishi/cash/index.js
@@ -11,7 +11,7 @@ Page({
     height: app.globalData.height,
     bank_card_id: "",
     bank_icon_path: "https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/bankcard/js_icon.png",
-    realname: "默认姓名",
+    bank_card_name: "默认姓名",
     bank_name	: "xx银行",
     bank_card_code_mask: "888 xxxx xxxx 888",
     withdrawal_amount: "xxxx",
@@ -34,6 +34,10 @@ Page({
   },
   onShow(){
 
+  },
+  go(e){
+    let url = e.currentTarget.dataset.url;
+    app.go(url);
   },
   contactKeFu(e){
     let _this = this;
@@ -63,6 +67,7 @@ Page({
           bank_card_code_mask: response.data.bank.bank_card_code_mask,
           withdrawal_amount: response.data.withdrawal_amount,
           order_inquiry_ids: response.data.order_inquiry_ids,
+          bank_card_name: response.data.bank.bank_card_name_mask,
           income_tax: response.data.income_tax,
           skeleton_loading: false
         })
diff --git a/Pages/yishi/cash/index.wxml b/Pages/yishi/cash/index.wxml
index ba14638..35d59b6 100644
--- a/Pages/yishi/cash/index.wxml
+++ b/Pages/yishi/cash/index.wxml
@@ -3,14 +3,14 @@
 <view class="container">
   <view class="top">
     <view class="txt_title">结算银行卡</view>
-    <view class="rule">提现规则<van-icon name="warning-o" color="#FF9800" /></view>
+    <view class="rule" bindtap="go" data-url="/Pages/yishi/agreement_detail/index?agreement_id=12">提现规则<van-icon name="warning-o" color="#FF9800" /></view>
   </view>
   <view class="bankcard" wx:if="{{!skeleton_loading}}">
     <view class="bankcard_icon">
       <van-image custom-style="" src="{{bank_icon_path}}" fit="heightFix" height="50rpx" aria-label="role" />
     </view>
     <view class="bankcard_info">
-      <view class="bankcard_info_top">{{realname}}<text style="margin-left: 20rpx; font-size: 28rpx;color: #999999;">{{bank_name}}</text></view>
+      <view class="bankcard_info_top">{{bank_card_name}}<text style="margin-left: 20rpx; font-size: 28rpx;color: #999999;">{{bank_name}}</text></view>
       <view class="bankcard_info_bottom">{{bank_card_code_mask}}</view>
     </view>
   </view>
diff --git a/Pages/yishi/cashrecord/index.js b/Pages/yishi/cashrecord/index.js
index ec7de6c..10460e8 100644
--- a/Pages/yishi/cashrecord/index.js
+++ b/Pages/yishi/cashrecord/index.js
@@ -15,14 +15,22 @@ Page({
     per_page: 0,
     last_page: 0,
     dateVisible: false,
-    select_date: '2023',
-    years: [
-      { label: '2022年', value: '2022' },
-      { label: '2023年', value: '2023' },
-      { label: '2024年', value: '2024' },
-    ],
+    select_date: '',
+    years: [],
   },
   onLoad(){
+    let now_year = (new Date()).Format("yyyy");
+    let begin_year = 2022;
+    let years = [];
+    for(let i=begin_year;i<=now_year;i++){
+      years.push({label: i+"年", value: i+""})
+    }
+    this.setData({
+      years: years,
+      select_date: now_year+""
+    })
+  },
+  onShow(){
     let year = this.data.select_date;
     year = Number(year);
     this.getDoctorWithdrawalRecord(year);
diff --git a/Pages/yishi/index/index.js b/Pages/yishi/index/index.js
index 0fcb001..9795a64 100644
--- a/Pages/yishi/index/index.js
+++ b/Pages/yishi/index/index.js
@@ -33,6 +33,7 @@ Page({
     default_dialog_show: false,//只弹框一次
     dialog_visible: false,
     dialog_content: "请您先完成实名认证",
+    dialog_url: "",
     /*
       case_module取值
       新问诊 0
@@ -57,27 +58,32 @@ Page({
       {
         case_status: 0,
         case_module: [0,1,2,3,4,5,6,7,8],
-        case_text: "请您先完成实名认证"
+        case_text: "请您先完成实名认证",
+        case_url: "/Pages/yishi/identity/index"
       },
       {
         case_status: 1,
         case_module: [0,1,2,3,4,5,6,7,8],
-        case_text: "请您先医师身份认证"
+        case_text: "请您先医师身份认证",
+        case_url: "/Pages/yishi/identity/index?selected_tab=1"
       },
       {
         case_status: 2,
         case_module: [0,1,2,3,4,5,6,7,8],
-        case_text: "请您先绑定结算银行卡"
+        case_text: "请您先绑定结算银行卡",
+        case_url: "/Pages/yishi/bankcard/index"
       },
       {
         case_status: 3,
         case_module: [7],
-        case_text: "请您先进行多点执业认证"
+        case_text: "请您先进行多点执业认证",
+        case_url: "/Pages/yishi/zhiye_identity/index"
       },
       {
         case_status: 4,
         case_module: [7],
-        case_text: "请您先进行多点执业认证"
+        case_text: "请您先进行多点执业认证",
+        case_url: "/Pages/yishi/zhiye_identity/index"
       },
       {
         case_status: 5,
@@ -147,6 +153,8 @@ Page({
       })
       wx.setStorageSync('overlay_show', "1")
     }
+
+    app.go("/Pages/yishi/manual_detail/index?manual_id=1")
   },
   cancelJieSuanDialog(){
     this.setData({
@@ -208,6 +216,12 @@ Page({
     return
   },
   onShow: function () {
+
+    //初始化默认值
+    this.setData({
+      skeleton_loading: true,
+    });
+
     wx.onCopyUrl(this.Copylistener);
     if (typeof this.getTabBar === 'function' && this.getTabBar()) {
       this.getTabBar().setData({
@@ -366,11 +380,14 @@ Page({
     }
     app.go(e.currentTarget.dataset.url);
   },
-  confirmDialog(){
+  confirmDialog(e){
+    console.log(e)
+    let url = e.currentTarget.dataset.url;
+    console.log("confirmDialog: ", url)
     this.setData({
       dialog_visible: false
     })
-    app.go(this.data.shiming_status_url);
+    app.go(url);
   },
   cancelDialog(){
     this.setData({
@@ -409,6 +426,7 @@ Page({
       this.setData({
         dialog_content: "请您先完成实名认证",
         shiming_status_url: "/Pages/yishi/identity/index",
+        dialog_url: "/Pages/yishi/identity/index",
         default_dialog_show: true
       });
       return false;
@@ -424,6 +442,7 @@ Page({
         "info.info_shiming_status_txt": "认证失败",
         "info.info_shiming_status": "info_shiming_status_yes",
         shiming_status_url: "/Pages/yishi/identity/index",
+        dialog_url: "/Pages/yishi/identity/index",
         dialog_content: "实名认证失败",
         default_dialog_show: true
       });
@@ -440,6 +459,7 @@ Page({
         "info.info_shiming_status_txt": "前往医师身份认证",
         "info.info_shiming_status": "info_shiming_status_yes",
         shiming_status_url: "/Pages/yishi/identity/index?selected_tab=1",
+        dialog_url: "/Pages/yishi/identity/index?selected_tab=1",
         dialog_content: "请您先医师身份认证",
         default_dialog_show: true
       });
@@ -455,6 +475,7 @@ Page({
         "info.info_shiming_status_txt": "审核中",
         "info.info_shiming_status": "info_shiming_status_yes",
         shiming_status_url: "/Pages/yishi/identity/index?selected_tab=1",
+        dialog_url: "/Pages/yishi/identity/index?selected_tab=1",
         // dialog_content: "您的医师身份认证正在审核中",
         // default_dialog_show: true
       });
@@ -470,6 +491,7 @@ Page({
         "info.info_shiming_status_txt": "认证失败",
         "info.info_shiming_status": "info_shiming_status_yes",
         shiming_status_url: "/Pages/yishi/identity/index?selected_tab=1",
+        dialog_url: "/Pages/yishi/identity/index?selected_tab=1",
         dialog_content: "您的医师身份认证失败",
         // default_dialog_show: true
       });
@@ -487,6 +509,7 @@ Page({
         "info.info_shiming_status_txt": "绑定结算银行卡",
         "info.info_shiming_status": "info_shiming_status_yes",
         shiming_status_url: "/Pages/yishi/bankcard/index",
+        dialog_url: "/Pages/yishi/bankcard/index",
         dialog_content: "请您先绑定结算银行卡",
         default_dialog_show: true
       });
@@ -505,7 +528,7 @@ Page({
         "info.info_shiming_status": "info_shiming_status_yes",
         shiming_status_url: "/Pages/yishi/zhiye_identity/index",
         dialog_content: "请您先进行多点执业认证",
-        default_dialog_show: true
+        // default_dialog_show: true
       });
       // return false;
     }
@@ -521,7 +544,7 @@ Page({
         "info.info_shiming_status": "info_shiming_status_yes",
         shiming_status_url: "/Pages/yishi/zhiye_identity/index",
         dialog_content: "您的多点执业认证正在审核中",
-        default_dialog_show: true
+        // default_dialog_show: true
       });
       // return false;
     }
@@ -537,11 +560,19 @@ Page({
         "info.info_shiming_status": "info_shiming_status_yes",
         shiming_status_url: "/Pages/yishi/zhiye_identity/index",
         dialog_content: "您的多点执业认证失败",
-        default_dialog_show: true
+        // default_dialog_show: true
       });
       // return false;
     }
 
+    const jiesuan_dialog_show = wx.getStorageSync('jiesuan_dialog_show');
+    if(!jiesuan_dialog_show){
+      this.setData({
+        jiesuan_dialog_visible: true,
+      });
+      wx.setStorageSync('jiesuan_dialog_show', true);
+    }
+
     if((is_img_expert_reception + is_img_quick_reception + is_img_welfare_reception) == 0){
       if(!this.data.default_dialog_show){
         this.setData({
@@ -552,7 +583,6 @@ Page({
         "info.info_shiming_status_txt": "开启在线问诊",
         "info.info_shiming_status": "info_shiming_status_yes",
         shiming_status_url: "/Pages/yishi/onlinesetup/index",
-        dialog_content: "您的多点执业认证失败",
         // default_dialog_show: true
       });
       return false;
@@ -568,7 +598,6 @@ Page({
         "info.info_shiming_status_txt": "去接诊",
         "info.info_shiming_status": "info_shiming_status_yes",
         shiming_status_url: "/Pages/yishi/wenzhen_v2/wenzhen",
-        dialog_content: "您的多点执业认证失败",
         // default_dialog_show: true
       });
       return false;
@@ -594,12 +623,7 @@ Page({
     //   return false;
     // }
 
-    if(!app.globalData.jiesuan_dialog_show){
-      this.setData({
-        jiesuan_dialog_visible: true,
-      });
-      app.globalData.jiesuan_dialog_show = true
-    }
+   
 
     this.setData({
       "info.info_shiming_status_txt": "去接诊",
@@ -688,7 +712,8 @@ Page({
         if(now_moudle != undefined){
           this.setData({
             dialog_content: now_case.case_text,
-            dialog_visible: true
+            dialog_visible: true,
+            dialog_url: now_case.case_url
           });
           retult = false;
           return;
diff --git a/Pages/yishi/index/index.wxml b/Pages/yishi/index/index.wxml
index c27acfe..2bda114 100644
--- a/Pages/yishi/index/index.wxml
+++ b/Pages/yishi/index/index.wxml
@@ -22,7 +22,7 @@
         </view>
         <view class="info_shiming" bindtap="go" data-url="{{shiming_status_url}}" wx:if="{{!skeleton_loading}}">
           <view class="info_shiming_status {{info.info_shiming_status}}" wx:if="{{!skeleton_loading}}">{{info.info_shiming_status_txt}}</view>
-          <t-skeleton theme="text" row-col="{{[1]}}" animation="gradient" loading="{{skeleton_loading}}" />
+          <t-skeleton theme="text" row-col="{{[{ width: '50rpx' }]}}" animation="gradient" loading="{{skeleton_loading}}" />
         </view>
       </view>
       <view class="info_wenzhen">
@@ -181,7 +181,7 @@
   <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="cancelDialog">
     取消
   </view>
-  <view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="confirmDialog">
+  <view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="confirmDialog" data-url="{{dialog_url}}">
     确定
   </view>
   </t-dialog>
@@ -189,7 +189,7 @@
   <t-dialog
     visible="{{ jiesuan_dialog_visible }}"
     title="温馨提示"
-    content="您是否了解费用结算规则？"
+    content="快速了解在线问诊、公益问诊和快速问诊"
   >
   <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="cancelJieSuanDialog">
     已了解
diff --git a/Pages/yishi/manual_detail/index.js b/Pages/yishi/manual_detail/index.js
index 75fe20d..b6a984f 100644
--- a/Pages/yishi/manual_detail/index.js
+++ b/Pages/yishi/manual_detail/index.js
@@ -18,7 +18,7 @@ Page({
   },
 
   onShow(){
-    //获取医生我的账户数据
+    //获取操作手册详情
     api.getBasicOperationManualID({manual_id: this.data.manual_id}).then(response => {
       console.log(response);
       this.setData({
diff --git a/Pages/yishi/myaccount/index.js b/Pages/yishi/myaccount/index.js
index d4c810a..1503f29 100644
--- a/Pages/yishi/myaccount/index.js
+++ b/Pages/yishi/myaccount/index.js
@@ -17,10 +17,7 @@ Page({
     amount_total_month: "",
     withdrawal_amount_month: "",
     bill: [],
-    years: [
-      { label: '2023年', value: '2023' },
-      { label: '2024年', value: '2024' },
-    ],
+    years: [],
     seasons: [
       { label: '1月', value: '1' },
       { label: '2月', value: '2' },
@@ -36,6 +33,17 @@ Page({
       { label: '12月', value: '12' },
     ]
   },
+  onLoad(){
+    let now_year = (new Date()).Format("yyyy");
+    let begin_year = 2022;
+    let years = [];
+    for(let i=begin_year;i<=now_year;i++){
+      years.push({label: i+"年", value: i+""})
+    }
+    this.setData({
+      years: years
+    })
+  },
   onShow(){
     let now_date = new Date();
     let now_datearr = util.getDateArr(now_date);
@@ -108,5 +116,9 @@ Page({
     let date = this.data.dateValue[0]+"-"+md;
     console.log(date);
     app.go(url+"?date="+date);
-  }
+  },
+  go(e){
+    let url = e.currentTarget.dataset.url;
+    app.go(url);
+  },
 })
\ No newline at end of file
diff --git a/Pages/yishi/myaccount/index.wxml b/Pages/yishi/myaccount/index.wxml
index 0d97cea..541a1e6 100644
--- a/Pages/yishi/myaccount/index.wxml
+++ b/Pages/yishi/myaccount/index.wxml
@@ -23,7 +23,7 @@
     <van-empty description="暂无账单" wx:if="{{ bill.length == 0 }}" />
   </view>
 
-  <van-image style="position: fixed; right: 0;bottom: 262rpx;" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/account_rule.png" fit="heightFix" height="84rpx" aria-label="role" />
+  <van-image bind:click="go" data-url="/Pages/yishi/agreement_detail/index?agreement_id=13" style="position: fixed; right: 0;bottom: 262rpx;" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/account_rule.png" fit="heightFix" height="84rpx" aria-label="role" />
 
     <t-picker
       visible="{{dateVisible}}"
diff --git a/Pages/yishi/mycard/index.wxml b/Pages/yishi/mycard/index.wxml
index 2567aaf..51ea935 100644
--- a/Pages/yishi/mycard/index.wxml
+++ b/Pages/yishi/mycard/index.wxml
@@ -15,14 +15,14 @@
   </view>
   <view class="qrcode">
     <van-image bindtap="showVisible" src="{{info.qr_code_url}}" fit="heightFix" width="150" height="150" aria-label="qrcode" />
-    <text>微信长按或扫描二维码查看我的更多信息</text>
+    <text>让您的患者微信扫码，线上复诊更便捷</text>
   </view>
 
 
 
   <view class="block" wx:if="{{painter_ready}}">
     <view class="header">
-      <view class="title">分享我的名片到</view>
+      <!-- <view class="title">分享我的名片到</view> -->
     </view>
     <view class="imgbox">
       <!-- <view class="imgbox_item">
@@ -41,7 +41,7 @@
         <!-- <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/wx.png" mode="heightFix" width="90rpx" height="90rpx" aria-label="qrcode" /> -->
         <t-icon color="#fff" name="download" size="24" data-name="download" class="t_icon" />
         <text class="imgbox_item_txt">
-          保存至相册
+          保存到相册，分享到朋友圈
         </text>
       </view>
     </view>
diff --git a/Pages/yishi/onlinesetupprice/index.wxml b/Pages/yishi/onlinesetupprice/index.wxml
index 13e237f..9d6f26c 100644
--- a/Pages/yishi/onlinesetupprice/index.wxml
+++ b/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="0" max="{{config.max_work_num_day}}" integer  bind:change="onStepperChange" />
+        <van-stepper value="{{ info.work_num_day }}" min="0" max="{{info.work_num_day > config.max_work_num_day?info.work_num_day:config.max_work_num_day}}" integer  bind:change="onStepperChange" />
       </view>
     </view>
     <view class="price_steup_box_bottom">
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index b6e4b76..bdbf521 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -16,6 +16,7 @@ Page({
     data_list_3: [],
     data_list_4: [],
     data_list_5: [],
+    data_list_5_loading: false,
     conversationList: [],
     message_inquiry_type: 99999,
     now_message_inquiry_type: 5,
@@ -395,7 +396,7 @@ Page({
         if(payload) {
           console.log("payload: ",payload.data);
           let payloadJson = JSON.parse(payload.data);
-          text = payloadJson.title.replaceAll(/-/g, "").replaceAll(/—/g, "");
+          text = payloadJson.title.replaceAll(/—/g, "");
         }
         lastMessage.messageForShow = text;
       }
@@ -468,18 +469,19 @@ Page({
       show: false
     })
 
-    console.log("开始订阅消息");
-    wx.requestSubscribeMessage({
-      tmplIds: ['jhYUf91ULCTX_f69hazqAYwImdFf8ELasRAwB6X-MTM'],
-      success (res) {
-        console.log(res);
-        let from_account = e.currentTarget.dataset.from_account;
-        let order_inquiry_id = e.currentTarget.dataset.order_inquiry_id;
-        let inquiry_type = e.currentTarget.dataset.inquiry_type;
-        let url = e.currentTarget.dataset.url+"?from_account="+from_account+"&order_inquiry_id="+order_inquiry_id+"&inquiry_type="+inquiry_type;
-        app.go(url);
-      }
-    })
+    // console.log("开始订阅消息");
+    // wx.requestSubscribeMessage({
+    //   tmplIds: ['jhYUf91ULCTX_f69hazqAYwImdFf8ELasRAwB6X-MTM'],
+    //   success (res) {
+    //     console.log(res);
+    //   }
+    // })
+
+    let from_account = e.currentTarget.dataset.from_account;
+    let order_inquiry_id = e.currentTarget.dataset.order_inquiry_id;
+    let inquiry_type = e.currentTarget.dataset.inquiry_type;
+    let url = e.currentTarget.dataset.url+"?from_account="+from_account+"&order_inquiry_id="+order_inquiry_id+"&inquiry_type="+inquiry_type;
+    app.go(url);
   },
   postDoctorInquiry(e){
     this.setData({
@@ -553,6 +555,7 @@ Page({
     let data_list_5 = this.data.data_list_5;
     let params = {};
     params.page = this.data.current_page + 1;
+    this.setData({data_list_5_loading: true})
     api.getDoctorInquiryFinishMessage(params).then(response => {
       console.log(response);
       this.setData({
@@ -563,6 +566,11 @@ Page({
         last_page: response.data.last_page
       })
       // this.selectComponent('#tabs').resize();
-    }).catch(errors => {console.error(errors);})
+    }).then(res =>{
+      this.setData({ data_list_5_loading: false})
+    }).catch(errors => {
+      this.setData({ data_list_5_loading: false})
+      console.error(errors);
+    })
   }
 })
\ No newline at end of file
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.json b/Pages/yishi/wenzhen_v2/wenzhen.json
index 4da761c..e566533 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.json
+++ b/Pages/yishi/wenzhen_v2/wenzhen.json
@@ -12,7 +12,8 @@
     "van-tab": "@vant/weapp/tab/index",
     "van-tabs": "@vant/weapp/tabs/index",
     "t-dialog": "tdesign-miniprogram/dialog/dialog",
-    "van-divider": "@vant/weapp/divider/index"
+    "van-divider": "@vant/weapp/divider/index",
+    "van-loading": "@vant/weapp/loading/index"
   },
   "enablePullDownRefresh": true,
   "onReachBottomDistance": 100
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml
index b954de4..932823c 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxml
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml
@@ -22,9 +22,12 @@
       </view>
   </view>
 
-   <view class="empty" wx:if="{{ has_data==false  }}" >
-    <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/wnzhen_empty.png" fit="heightFix" height="108rpx" aria-label="empty" />
-    <view class="empty_note">未收到任何消息</view>
+  <view class="empty" wx:if="{{ has_data==false }}" >
+    <view wx:if="{{!data_list_5_loading}}" class="empty_box">
+      <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/wnzhen_empty.png" fit="heightFix" height="108rpx" aria-label="empty" />
+      <view class="empty_note">未收到任何消息</view>
+    </view>
+    <van-loading size="24px" wx:if="{{data_list_5_loading}}">加载中...</van-loading>
   </view>
   <!-- <van-button color="#3CC7C0" custom-style="width: 92vw;margin: 0 auto;border-radius: 10rpx;" block wx:if="{{ !has_data }}">开通图文问诊</van-button> -->
 
@@ -347,6 +350,9 @@
           <view class="content_4" wx:if="{{ item.inquiry_status == 3 }}">不接诊24小时后自动取消</view>
         </view>  
 
+        <view style="width: 100%;text-align: center;">
+          <van-loading size="24px" wx:if="{{data_list_5_loading}}">加载中...</van-loading>
+        </view>
         <van-empty description="暂无数据" wx:if="{{data_list_5.length == 0}}" />
         <van-divider contentPosition="center" wx:if="{{data_list_5.length > 0 && current_page == last_page}}">到底了~</van-divider>
       </van-tab>
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxss b/Pages/yishi/wenzhen_v2/wenzhen.wxss
index 0be5bc4..ddfbe73 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxss
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxss
@@ -136,4 +136,9 @@ page{
   border-top: 1px solid #E9E9E9;
   color: #3CC7C0;
 }
-
+.empty_box{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+}
diff --git a/Pages/yishi/wenzhen_v3/substr.wxs b/Pages/yishi/wenzhen_v3/substr.wxs
new file mode 100644
index 0000000..7a50e2c
--- /dev/null
+++ b/Pages/yishi/wenzhen_v3/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
+}
\ No newline at end of file
diff --git a/Pages/yishi/wenzhen_v3/wenzhen.js b/Pages/yishi/wenzhen_v3/wenzhen.js
new file mode 100644
index 0000000..90abf7e
--- /dev/null
+++ b/Pages/yishi/wenzhen_v3/wenzhen.js
@@ -0,0 +1,575 @@
+import { API } from './../../../utils/network/api'
+import { getTimeAgo } from './../../../utils/util'
+// import TIM from '../../../TUIKit/lib/tim-wx-sdk';
+const api = new API()
+const app = getApp()
+Page({
+  data: {
+    navbarData: {
+      showCapsule: 0, //是否显示左上角图标   1表示显示    0表示不显示
+      title: '问诊消息', //导航栏 中间的标题
+    },
+    height: app.globalData.height, 
+    has_data: false,
+    data_list_1: [],
+    data_list_2: [],
+    data_list_3: [],
+    data_list_4: [],
+    data_list_5: [],
+    data_list_5_loading: false,
+    conversationList: [],
+    message_inquiry_type: 99999,
+    now_message_inquiry_type: 5,
+    system_notice_unreadnnum: "",
+    service_notice_unreadnnum: "",
+    hasOnShow: false,
+    show: false,
+    show_dialog_from_account: "",
+    show_dialog_order_inquiry_id: "",
+    show_dialog_inquiry_type: "",
+    unreadnnum_inter: 0,
+    current_page: 0,
+    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");
+
+    // if(wx.$TUIKit){
+    //   wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
+    // }else{
+    //   app.imInit().then(res => {
+    //     console.log("wenzhen onload imInit");
+    //     wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
+    //   });
+    // }
+
+    //监听网络状态变化事件
+    wx.onNetworkStatusChange(function (res) {
+      console.log("onNetworkStatusChange from wenzhen: ")
+      console.log(res.isConnected)
+      console.log(res.networkType)
+      wx.showToast({
+        title: '网络类型'+res.networkType,
+      })
+    })
+
+  },
+  initInterval(){
+    let _this = this;
+    let usertype =  wx.getStorageSync('usertype');
+    let userID = wx.getStorageSync('user_id_'+usertype);
+    let unreadnnum_inter = setInterval(() => {
+      let system_notice_unreadnnum = wx.getStorageSync(userID+"_system_notice_unreadnnum");
+      let service_notice_unreadnnum = wx.getStorageSync(userID+"_service_notice_unreadnnum");
+      this.setData({
+        system_notice_unreadnnum: system_notice_unreadnnum,
+        service_notice_unreadnnum: service_notice_unreadnnum,
+      })
+
+      if(_this.data.data_list_1.length > 0 || _this.data.data_list_2.length > 0 || _this.data.data_list_3.length > 0 || _this.data.data_list_4.length > 0 || _this.data.data_list_5.length > 0){
+        _this.setData({
+          has_data: true
+        })
+        _this.selectComponent('#tabs').resize();
+        let getCurrentName = _this.selectComponent('#tabs').getCurrentName();
+        let now_message_inquiry_type = _this.data.now_message_inquiry_type;
+        if(getCurrentName != now_message_inquiry_type){
+          _this.setData({
+            now_message_inquiry_type: getCurrentName
+          })
+        }
+      }
+    }, 100);
+    this.setData({
+      unreadnnum_inter: unreadnnum_inter
+    })
+    console.log("app.globalData.unreadnnum_inter: ", app.globalData.unreadnnum_inter);
+  },
+  onShow: function () {
+    console.log("onShow from wenzhen V2")
+    if(this.data.hasOnShow){
+      wx.stopPullDownRefresh()
+      return;
+    }
+    if (typeof this.getTabBar === 'function' && this.getTabBar()) {
+      this.getTabBar().setData({
+        active: 1  //数字是当前页面在tabbar的索引,如我的查询页索引是2，因此这边为2，同理首页就为0，审批页面为1
+      })
+
+        this.getTabBar().startInterval()
+    }
+    this.getDoctorInquiryFinishMessage();
+    this.getDoctorMessageNotice();
+    this.getConversationList();
+    if(this.data.unreadnnum_inter == 0){
+      this.initInterval();
+    }
+    //避免onshow加载多次
+    this.setData({
+      hasOnShow: true
+    })
+
+
+    if(wx.$TUIKit){
+      wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
+    }else{
+      app.imInit().then(res => {
+        console.log("wenzhen onload imInit");
+        wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
+      });
+    }
+  },
+  onHide(){
+    console.log("onHideonHide from wenzhen")
+    if (typeof this.getTabBar === 'function' && this.getTabBar()) {
+      this.getTabBar().stopInterval()
+    }
+    clearInterval(this.data.unreadnnum_inter)
+    this.setData({
+      hasOnShow: false,
+      data_list_1: [],
+      data_list_2: [],
+      data_list_3: [],
+      data_list_4: [],
+      data_list_5: [],
+      message_inquiry_type: 9999,
+      now_message_inquiry_type: 5,
+      unreadnnum_inter: 0,
+      has_data: false,
+      current_page: 0,
+      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);
+  },
+  onUnload(){
+    console.log("onUnload from wenzhen")
+    this.setData({
+      hasOnShow: false,
+      message_inquiry_type: 9999,
+      now_message_inquiry_type: 5,
+    })
+  },
+  getConversationList(){
+    console.log("getConversationListgetConversationListgetConversationList");
+    app.imInit().then(res => {
+      console.log("wenzhen onload imInit: ", res);
+      wx.$TUIKit.getConversationList().then((imResponse) => {
+        console.log("imResponse.data.conversationList from wenzhen_v2: ", imResponse.data.conversationList);
+        this.setData({
+          conversationList: imResponse.data.conversationList,
+        });
+      }).then(() => {
+        console.log("开始查询订单状态")
+        this.formatStatus();
+      }).catch(error => {
+        console.log(error)
+      });
+    });
+  },
+  go(e){
+    this.setData({
+      show: false
+    })
+    let url = e.currentTarget.dataset.url;
+    let name = e.currentTarget.dataset.name;
+    wx.setStorageSync(name, 0);
+    app.go(url);
+  },
+  $onMessageReceived(value) {
+    const message = value.data[0];
+    console.log("message from wenzhen: ",message)
+    this.getConversationList();
+    // let cloudCustomData = JSON.parse(message.cloudCustomData);
+    // let inquiry_type = cloudCustomData.inquiry_type;
+    // let order_inquiry_id = cloudCustomData.order_inquiry_id;
+    // let type = message.type;
+    // let message_txt = "新消息";
+    // console.log(type)
+    // switch (type) {
+    //   case TIM.TYPES.MSG_TEXT:
+    //     console.log("文本消息");
+    //     message_txt = message.payload.text;
+    //     break;
+    //   case TIM.TYPES.MSG_IMAGE:
+    //     console.log("图片消息");
+    //     message_txt = "[图片]";
+    //     break;
+    //   case TIM.TYPES.MSG_AUDIO:
+    //     console.log("音频消息")
+    //     message_txt = "[语言]";
+    //     break;
+    //   case TIM.TYPES.MSG_VIDEO:
+    //     console.log("视频消息");
+    //     message_txt = "[视频]";
+    //     break;
+    //   case TIM.TYPES.MSG_FILE:
+    //     console.log("文件消息")
+    //     message_txt = "[文件]";
+    //     break;
+    //   case TIM.TYPES.MSG_CUSTOM:
+    //     console.log("自定义消息")
+    //     break;
+    //   case TIM.TYPES.MSG_MERGER:
+    //     console.log("合并消息")
+    //     break;
+    //   case TIM.TYPES.MSG_LOCATION:
+    //     console.log("位置消息")
+    //     message_txt = "[位置]";
+    //     break;
+    //   case TIM.TYPES.MSG_FACE:
+    //     console.log("表情消息")
+    //     message_txt = "[表情]";
+    //     break;
+    //   default:
+    //     break;
+    // }
+    // let list_name = "data_list_" + inquiry_type;
+    // let _index = this.data[list_name].findIndex(item => {
+    //   return item.order_inquiry_id == order_inquiry_id;
+    // })
+    
+    // let new_list = [];
+    // //没有当前会话
+    // if(_index > -1){
+    //   let target = list_name + "[" + _index + "].last_message_content.Text";
+    //   let target_dot = list_name + "[" + _index + "].message_dot";
+    //   console.log("target: ",target);
+    //   this.setData({
+    //     [target]: message_txt,
+    //     [target_dot]: true
+    //   })
+    //   new_list.push(this.data[list_name][_index]);//先放入目标
+    // }else{
+    //   let item = {};
+    //   item.inquiry_status = message.inquiry_status;
+    //   let txt = {};
+    //   txt.Text= message_txt;
+    //   item.last_message_content = txt;
+    //   item.message_send_time = message.message_send_time;
+    //   item.message_seq = message.message_seq;
+    //   item.message_type = message.message_type;
+    //   item.order_inquiry_id = message.order_inquiry_id;
+    //   item.patient_age = message.patient_age;
+    //   item.patient_name = message.patient_name;
+    //   item.patient_sex = message.patient_sex;
+    //   item.to_user_id = message.to_user_id;
+    //   item.message_dot = true;
+    //   new_list.push(item);
+    // }
+    
+    // //置顶
+    // this.data[list_name].forEach((item, index) => {
+    //   if(index != _index){
+    //     new_list.push(item)
+    //   }
+    // })
+
+    // this.setData({
+    //   [list_name]: new_list
+    // })
+
+  },
+  formatStatus(){
+    let order_inquiry_id_list = [];
+    order_inquiry_id_list.push("");//初始化一个，防止失败
+    this.data.conversationList.forEach(item => {
+      let conversationID = item.conversationID;
+      if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过
+      let lastMessage = item.lastMessage;
+      if(!lastMessage) return;
+      let cloudCustomData = lastMessage.cloudCustomData;
+      if(!cloudCustomData) return;
+      let cloudCustomDataJson;
+      try {
+        cloudCustomDataJson = JSON.parse(cloudCustomData);
+      } catch (error) {
+        console.log(error);
+        return;
+      }
+      let order_inquiry_id = cloudCustomDataJson.order_inquiry_id;
+      order_inquiry_id_list.push(order_inquiry_id);//准备去请求后端那订单状态
+    })
+    let conversationList =  this.data.conversationList;
+    //获取医生问诊消息用户属性
+    api.getDoctorInquiryMessageAttr({order_inquiry_ids: order_inquiry_id_list.join(",")}).then(response => {
+      let new_conversationList = [];
+      if(response.data.length > 0){
+        conversationList.forEach(item => {
+          let conversationID = item.conversationID;
+          if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过
+          let lastMessage = item.lastMessage;
+          if(!lastMessage) return;
+          let cloudCustomData = lastMessage.cloudCustomData;
+          if(!cloudCustomData) return;
+          let cloudCustomDataJson;
+          try {
+            cloudCustomDataJson = JSON.parse(item.lastMessage.cloudCustomData);
+          } catch (error) {
+            return;
+          }
+          let order_inquiry_id = cloudCustomDataJson.order_inquiry_id;
+          let order = response.data.find(attr_item => {
+            return attr_item.order_inquiry_id == order_inquiry_id;
+          })
+          if(!order) return;
+
+          let inquiry_status = order.inquiry_status;
+          //inquiry_status 状态
+          if(inquiry_status !=3 && inquiry_status != 4){
+            return;
+          }
+          item.inquiry_status = inquiry_status;
+          item.patient_age = order.patient_age;
+          item.patient_name = order.patient_name;
+          item.patient_sex = order.patient_sex;
+          new_conversationList.push(item);
+        })
+      }
+      this.setData({
+        conversationList: new_conversationList
+      })
+    }).then(() => {
+      console.log("开始格式化formatConversationList")
+      this.formatConversationList();
+    }).catch(errors => {console.error(errors);})
+  },
+  formatConversationList(){
+    let session_list = [];
+    let session_data_list_1 = [];
+    let session_data_list_2 = [];
+    let session_data_list_3 = [];
+    let session_data_list_4 = [];
+    let session_data_list_5 = [];
+    session_list.push(session_data_list_1);
+    session_list.push(session_data_list_2);
+    session_list.push(session_data_list_3);
+    session_list.push(session_data_list_4);
+    session_list.push(session_data_list_5);
+
+    let usertype =  wx.getStorageSync('usertype');
+    let userID = wx.getStorageSync('user_id_'+usertype);
+    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 lastMessage = item.lastMessage;
+      let type = lastMessage.type;
+      let userProfile = item.userProfile;
+      if(!lastMessage) return;
+      let cloudCustomData = lastMessage.cloudCustomData;
+      if(!cloudCustomData) return;
+      let cloudCustomDataJson = JSON.parse(cloudCustomData);
+      let order_inquiry_id = cloudCustomDataJson.order_inquiry_id;
+      if(!order_inquiry_id) return;
+      let inquiry_type = cloudCustomDataJson.inquiry_type;
+      if(!inquiry_type) return;
+      if(inquiry_type > 4) return;
+      if(inquiry_type < message_inquiry_type){
+        message_inquiry_type = inquiry_type;
+      }
+      //去重order_inquiry_id
+      let index = this.checkOrderInquiryId(session_list[inquiry_type - 1], order_inquiry_id);
+      if(index > -1) return;
+      let patient_family_data = cloudCustomDataJson.patient_family_data;
+      if(patient_family_data == undefined) return;
+      console.log("patient_family_data: ", patient_family_data);
+      let session_item = {};
+      session_item.inquiry_status = item.inquiry_status;//订单状态暂无
+      let txt = {};
+      if(lastMessage.messageForShow == "[自定义消息]"){
+        let text = "自定义消息";
+        let payload = lastMessage.payload;
+        if(payload) {
+          console.log("payload: ",payload.data);
+          let payloadJson = JSON.parse(payload.data);
+          text = payloadJson.title.replaceAll(/—/g, "");
+        }
+        lastMessage.messageForShow = text;
+      }
+      if(lastMessage.isRevoked){
+        if(lastMessage.fromAccount == app.globalData.config.userID){
+          lastMessage.messageForShow = "你撤回了一条消息";
+        }else{
+          lastMessage.messageForShow = "对方撤回了一条消息";
+        }
+      }
+      txt.Text= lastMessage.messageForShow;
+      session_item.last_message_content = txt;
+      session_item.message_send_time = getTimeAgo(lastMessage.lastTime);
+      session_item.message_type = type;
+      session_item.order_inquiry_id = order_inquiry_id;
+      session_item.inquiry_type = inquiry_type;
+      session_item.patient_age = patient_family_data.patient_age;
+      session_item.patient_name = patient_family_data.patient_name;
+      session_item.patient_sex = patient_family_data.patient_sex;
+      session_item.from_account = userProfile.userID;
+      let unreadCount = item.unreadCount;
+      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;
+          session_item.message_dot = true;
+          let dot_name = "dot_"+inquiry_type
+          this.setData({
+            [dot_name]: true
+          })
+        }else{
+          session_item.message_dot = false;
+        }
+      }
+      session_list[inquiry_type - 1].push(session_item);
+    })
+
+    
+    wx.setStorageSync(userID+'_wenzhen_info', totalUnreadCount);
+    
+
+    this.setData({
+      data_list_1: session_data_list_1,
+      data_list_2: session_data_list_2,
+      data_list_3: session_data_list_3,
+      data_list_4: session_data_list_4,
+      message_inquiry_type: message_inquiry_type
+    })
+    wx.stopPullDownRefresh()
+    // this.selectComponent('#tabs').resize();
+
+  },
+  checkOrderInquiryId(list, order_inquiry_id){
+    let index = list.findIndex(item => {
+      return item.order_inquiry_id == order_inquiry_id;
+    })
+    return index;
+  },
+  onTabsChange(e){
+    console.log(e);
+  },
+  goChat(e){
+    this.setData({
+      show: false
+    })
+
+    console.log("开始订阅消息");
+    wx.requestSubscribeMessage({
+      tmplIds: ['jhYUf91ULCTX_f69hazqAYwImdFf8ELasRAwB6X-MTM'],
+      success (res) {
+        console.log(res);
+        let from_account = e.currentTarget.dataset.from_account;
+        let order_inquiry_id = e.currentTarget.dataset.order_inquiry_id;
+        let inquiry_type = e.currentTarget.dataset.inquiry_type;
+        let url = e.currentTarget.dataset.url+"?from_account="+from_account+"&order_inquiry_id="+order_inquiry_id+"&inquiry_type="+inquiry_type;
+        app.go(url);
+      }
+    })
+  },
+  postDoctorInquiry(e){
+    this.setData({
+      show: false
+    })
+    console.log("order_inquiry_id: ", e.currentTarget.dataset.order_inquiry_id);
+    let params = {};
+    params.order_inquiry_id = e.currentTarget.dataset.order_inquiry_id;
+    console.log("params: ",params)
+    api.postDoctorInquiry(params).then(response => {
+      console.log("开始接诊");
+      console.log(response);
+    }).then(() => {
+      this.goChat(e);
+    }).catch(errors => {
+      console.error(errors);
+    })
+  },
+  //获取上方角标
+  getDoctorMessageNotice(e){
+    let usertype = wx.getStorageSync('usertype');
+    let userID = wx.getStorageSync('user_id_'+usertype);
+    api.getDoctorMessageNotice().then(response => {
+      let service_message_notice = response.data.service_message_notice;
+      let system_message_notice = response.data.system_message_notice;
+      wx.setStorageSync(userID+"_service_notice_unreadnnum", service_message_notice==true?1:"");//3、医生端系统通知
+      wx.setStorageSync(userID+"_system_notice_unreadnnum", system_message_notice);//4、医生端服务通知
+    }).catch(errors => {
+      console.error(errors);
+    })
+  },
+  tabShow(e){
+    let show_dialog_from_account = e.currentTarget.dataset.show_dialog_from_account;
+    let show_dialog_order_inquiry_id = e.currentTarget.dataset.show_dialog_order_inquiry_id;
+    let show_dialog_inquiry_type = e.currentTarget.dataset.show_dialog_inquiry_type;
+    console.log("tabShowtabShowtabShowtabShow");
+    this.setData({
+      show_dialog_from_account: show_dialog_from_account,
+      show_dialog_order_inquiry_id: show_dialog_order_inquiry_id,
+      show_dialog_inquiry_type: show_dialog_inquiry_type,
+      show: true
+    })
+  },
+  onClose(){
+    console.log("onCloseonCloseonCloseonClose")
+    this.setData({
+      show: false
+    })
+  },
+  vanTabsChange(e){
+    console.log(e)
+    this.setData({
+      now_message_inquiry_type: e.detail.name
+    })
+  },
+  onPullDownRefresh(){
+    console.log("用户下拉动作")
+    this.onHide();
+    this.onShow();
+  },
+  onReachBottom() {
+    console.log('===触底了！！===');
+    let now_message_inquiry_type = this.data.now_message_inquiry_type;
+    if(now_message_inquiry_type == 5){
+      if(this.data.current_page < this.data.last_page){//最后一页时停止分页
+        this.getDoctorInquiryFinishMessage()
+      }
+    }
+  },
+  getDoctorInquiryFinishMessage(){
+    let data_list_5 = this.data.data_list_5;
+    let params = {};
+    params.page = this.data.current_page + 1;
+    this.setData({data_list_5_loading: true})
+    api.getDoctorInquiryFinishMessage(params).then(response => {
+      console.log(response);
+      this.setData({
+        "data_list_5": data_list_5.concat(response.data.data),
+        current_page: response.data.current_page,
+        total: response.data.total,
+        per_page: response.data.per_page,
+        last_page: response.data.last_page
+      })
+      // this.selectComponent('#tabs').resize();
+    }).then(res =>{
+      this.setData({ data_list_5_loading: false})
+    }).catch(errors => {
+      this.setData({ data_list_5_loading: false})
+      console.error(errors);
+    })
+  }
+})
\ No newline at end of file
diff --git a/Pages/yishi/wenzhen_v3/wenzhen.json b/Pages/yishi/wenzhen_v3/wenzhen.json
new file mode 100644
index 0000000..e566533
--- /dev/null
+++ b/Pages/yishi/wenzhen_v3/wenzhen.json
@@ -0,0 +1,20 @@
+{
+  "component": true,
+  "usingComponents": {
+    "te-nav-bar": "/commpents/te_navbar",
+    "wenzhen-data": "/commpents/wenzhen_data/index",
+    "t-tabs": "tdesign-miniprogram/tabs/tabs",
+    "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel",
+    "t-badge": "tdesign-miniprogram/badge/badge",
+    "van-button": "@vant/weapp/button/index",
+    "van-empty": "@vant/weapp/empty/index",
+    "van-image": "@vant/weapp/image/index",
+    "van-tab": "@vant/weapp/tab/index",
+    "van-tabs": "@vant/weapp/tabs/index",
+    "t-dialog": "tdesign-miniprogram/dialog/dialog",
+    "van-divider": "@vant/weapp/divider/index",
+    "van-loading": "@vant/weapp/loading/index"
+  },
+  "enablePullDownRefresh": true,
+  "onReachBottomDistance": 100
+}
\ No newline at end of file
diff --git a/Pages/yishi/wenzhen_v3/wenzhen.wxml b/Pages/yishi/wenzhen_v3/wenzhen.wxml
new file mode 100644
index 0000000..1a15d4e
--- /dev/null
+++ b/Pages/yishi/wenzhen_v3/wenzhen.wxml
@@ -0,0 +1,378 @@
+<!-- 问诊页面 -->
+<wxs module="dateSubstr" src="./substr.wxs"></wxs>
+
+<te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
+<view class="container">
+  <view class="top">
+      <view class="top_left" bindtap="go" data-name="service_notice_unreadnnum" data-url="/Pages/yishi/service_notice/index">
+        <t-badge dot="{{service_notice_unreadnnum > 0}}" offset="{{ [1, 1] }}" class="wrapper">
+          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice.png" fit="heightFix" height="108rpx" aria-label="notice" />
+        </t-badge>
+        服务通知
+      </view>
+      <view class="top_right" bindtap="go" data-name="system_notice_unreadnnum" data-url="/Pages/yishi/system_notice/index">
+        <t-badge offset="{{ [1, 1] }}" class="wrapper" wx:if="{{system_notice_unreadnnum == ''}}">
+          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/system_notice.png" fit="heightFix" height="108rpx" aria-label="notice" />
+        </t-badge>
+
+        <t-badge count="{{system_notice_unreadnnum}}" offset="{{ [1, 1] }}" class="wrapper" wx:else>
+          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/system_notice.png" fit="heightFix" height="108rpx" aria-label="notice" />
+        </t-badge>
+        系统公告
+      </view>
+  </view>
+
+  <view class="empty" wx:if="{{ has_data==false }}" >
+    <view wx:if="{{!data_list_5_loading}}">
+      <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/wnzhen_empty.png" fit="heightFix" height="108rpx" aria-label="empty" />
+      <view class="empty_note">未收到任何消息</view>
+    </view>
+    <van-loading size="24px" wx:if="{{data_list_5_loading}}">加载中...</van-loading>
+  </view>
+  <!-- <van-button color="#3CC7C0" custom-style="width: 92vw;margin: 0 auto;border-radius: 10rpx;" block wx:if="{{ !has_data }}">开通图文问诊</van-button> -->
+
+  <!-- <view class="tabs" wx:if="{{ has_data }}" >
+    <t-tabs
+      default-value="{{ message_inquiry_type }}"
+      sticky
+      bind:change="onTabsChange"
+      bind:scroll="onStickyScroll"
+      t-class="custom-tabs"
+      theme="line"
+      swipeable="{{false}}"
+      custom-style="font-size: 32rpx"
+    >
+      <t-tab-panel label="在线问诊" value="1" wx:if="{{data_list_1.length > 0}}">
+
+        <wenzhen-data 
+          name="{{ item.patient_name }}"
+          sex="{{ item.patient_sex==1?'男':'女' }}"
+          age="{{ item.patient_age }}"
+          date="{{ item.message_send_time }}"
+          desc="{{ item.last_message_content.Text }}"
+          status="{{ item.inquiry_status }}"
+          order_inquiry_id="{{ item.order_inquiry_id }}"
+          inquiry_type="{{item.inquiry_type}}"
+          from_account="{{item.from_account}}"
+          status_text="{{ 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?'已取消':'其他' }}"
+          note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
+          message_dot="{{item.message_dot}}"
+          wx:for="{{ data_list_1 }}"
+         />
+
+         <van-empty description="暂无数据" wx:if="{{data_list_1.length == 0}}" />
+      </t-tab-panel>
+
+      <t-tab-panel label="快速问诊" value="2" wx:if="{{data_list_2.length > 0}}">
+        
+        <wenzhen-data 
+          name="{{ item.patient_name }}"
+          sex="{{ item.patient_sex==1?'男':'女' }}"
+          age="{{ item.patient_age }}"
+          date="{{ item.message_send_time }}"
+          desc="{{ item.last_message_content.Text }}"
+          status="{{ item.inquiry_status }}"
+          order_inquiry_id="{{ item.order_inquiry_id }}"
+          inquiry_type="{{item.inquiry_type}}"
+          from_account="{{item.from_account}}"
+          status_text="{{ 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?'已取消':'其他' }}"
+          note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
+          message_dot="{{item.message_dot}}"
+          from_account="{{item.from_account}}"
+          wx:for="{{ data_list_2 }}"
+         />
+
+         <van-empty description="暂无数据" wx:if="{{data_list_2.length == 0}}" />
+
+      </t-tab-panel>
+      <t-tab-panel label="公益问诊" value="3" wx:if="{{data_list_3.length > 0}}">
+
+         <wenzhen-data 
+          name="{{ item.patient_name }}"
+          sex="{{ item.patient_sex==1?'男':'女' }}"
+          age="{{ item.patient_age }}"
+          date="{{ item.message_send_time }}"
+          desc="{{ item.last_message_content.Text }}"
+          status="{{ item.inquiry_status }}"
+          order_inquiry_id="{{ item.order_inquiry_id }}"
+          inquiry_type="{{item.inquiry_type}}"
+          from_account="{{item.from_account}}"
+          status_text="{{ 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?'已取消':'其他' }}"
+          note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
+          message_dot="{{item.message_dot}}"
+          wx:for="{{ data_list_3 }}"
+         />
+
+         <van-empty description="暂无数据" wx:if="{{data_list_3.length == 0}}" />
+
+      </t-tab-panel>
+      <t-tab-panel label="问诊购药" value="4" wx:if="{{data_list_4.length > 0}}">
+
+         <wenzhen-data 
+          name="{{ item.patient_name }}"
+          sex="{{ item.patient_sex==1?'男':'女' }}"
+          age="{{ item.patient_age }}"
+          date="{{ item.message_send_time }}"
+          desc="{{ item.last_message_content.Text }}"
+          status="{{ item.inquiry_status }}"
+          order_inquiry_id="{{ item.order_inquiry_id }}"
+          inquiry_type="{{item.inquiry_type}}"
+          from_account="{{item.from_account}}"
+          status_text="{{ 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?'已取消':'其他' }}"
+          note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
+          message_dot="{{item.message_dot}}"
+          wx:for="{{ data_list_4 }}"
+         />
+
+         <van-empty description="暂无数据" wx:if="{{data_list_4.length == 0}}" />
+      </t-tab-panel>
+      <t-tab-panel label="问诊结束" value="5" wx:if="{{data_list_5.length > 0}}">
+
+        <wenzhen-data 
+          name="{{ item.patient_name }}"
+          sex="{{ item.patient_sex==1?'男':'女' }}"
+          age="{{ item.patient_age }}"
+          date="{{ item.message_send_time }}"
+          desc="{{ item.last_message_content.Text }}"
+          status="{{ item.inquiry_status }}"
+          status_text="{{ 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?'已取消':'其他' }}"
+          note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
+          message_dot="{{item.message_dot}}"
+          wx:for="{{ data_list_5 }}"
+         />
+
+         <van-empty description="暂无数据" wx:if="{{data_list_5.length == 0}}" />
+      </t-tab-panel>
+    </t-tabs>
+  </view> -->
+
+  <view class="tabs" wx:if="{{ has_data==true }}">
+    <van-tabs  
+    color="#3CC7C0"
+    title-active-color="#3CC7C0"
+    border="{{true}}"
+    id="tabs"
+    bind:change="vanTabsChange"
+    wx:if="{{ has_data }}" 
+    >
+      <van-tab title="在线问诊" dot="{{dot_1}}" name="1">
+        <!-- <wenzhen-data 
+          name="{{ item.patient_name }}"
+          sex="{{ item.patient_sex==1?'男':'女' }}"
+          age="{{ item.patient_age }}"
+          date="{{ item.message_send_time }}"
+          desc="{{ item.last_message_content.Text }}"
+          status="{{ item.inquiry_status }}"
+          order_inquiry_id="{{ item.order_inquiry_id }}"
+          inquiry_type="{{item.inquiry_type}}"
+          from_account="{{item.from_account}}"
+          status_text="{{ 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?'已取消':'其他' }}"
+          note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
+          message_dot="{{item.message_dot}}"
+          wx:for="{{ data_list_1 }}"
+         /> -->
+
+         <!-- aa -->
+         <view class="content" wx:for="{{ data_list_1 }}">
+          <view class="content_1">
+            <view class="name">
+              <text style="font-size: 34rpx;color: #333;">就诊人：</text>
+              {{item.patient_name}}  {{item.patient_sex==1?'男':'女'}}｜{{item.patient_age}}<t-badge dot="{{item.message_dot || item.inquiry_status==3}}" offset="{{ [-4, 4] }}" content="岁" />
+            </view>
+            <view class="date"> {{item.message_send_time}}</view>
+          </view>
+          <view class="content_2">{{item.last_message_content.Text}}</view>
+          <view class="content_3">
+            <view class="status">{{ 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="btn" wx:if="{{ item.inquiry_status == 3 }}">
+              <van-button bind:click="go" data-url="/Pages/yishi/case/index?order_inquiry_id={{item.order_inquiry_id}}" plain custom-style="padding:0 35rpx; height:67rpx;  border-radius: 10rpx;" color="#3CC7C0">查看病历</van-button>
+              <van-button type="default" 
+              bindtap="tabShow" 
+              data-show_dialog_from_account="{{item.from_account}}"
+              data-show_dialog_order_inquiry_id="{{item.order_inquiry_id}}"
+              data-show_dialog_inquiry_type="{{item.inquiry_type}}"
+              custom-style="padding:0 35rpx; height:67rpx; border-radius: 10rpx;margin-left:20rpx;" color="#3CC7C0">去接诊</van-button>
+            </view>
+            <view class="btn" wx:if="{{ item.inquiry_status >= 4 }}">
+              <van-button bind:click="goChat" data-from_account="{{item.from_account}}" data-inquiry_type="{{item.inquiry_type}}" data-order_inquiry_id="{{item.order_inquiry_id}}" data-url="/Pages/yishi/chat/index" plain custom-style="padding:0 35rpx; height:67rpx;  border-radius: 10rpx;" color="#3CC7C0">问诊详情</van-button>
+              <!-- <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>     
+        <van-empty description="暂无数据" wx:if="{{data_list_1.length == 0}}" />    
+         <!-- aa -->
+      </van-tab>
+      <van-tab title="快速问诊" dot="{{dot_2}}" name="2">
+        <!-- <wenzhen-data 
+          name="{{ item.patient_name }}"
+          sex="{{ item.patient_sex==1?'男':'女' }}"
+          age="{{ item.patient_age }}"
+          date="{{ item.message_send_time }}"
+          desc="{{ item.last_message_content.Text }}"
+          status="{{ item.inquiry_status }}"
+          order_inquiry_id="{{ item.order_inquiry_id }}"
+          inquiry_type="{{item.inquiry_type}}"
+          from_account="{{item.from_account}}"
+          status_text="{{ 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?'已取消':'其他' }}"
+          note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
+          message_dot="{{item.message_dot}}"
+          wx:for="{{ data_list_2 }}"
+         /> -->
+
+         <view class="content" wx:for="{{ data_list_2 }}">
+          <view class="content_1">
+            <view class="name">
+              <text style="font-size: 34rpx;color: #333;">就诊人：</text>
+              {{item.patient_name}}  {{item.patient_sex==1?'男':'女'}}｜{{item.patient_age}}<t-badge dot="{{item.message_dot || item.inquiry_status==3}}" offset="{{ [-4, 4] }}" content="岁" />
+            </view>
+            <view class="date"> {{item.message_send_time}}</view>
+          </view>
+          <view class="content_2">{{item.last_message_content.Text}}</view>
+          <view class="content_3">
+            <view class="status">{{ 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="btn" wx:if="{{ item.inquiry_status == 3 }}">
+              <van-button bind:click="go" data-url="/Pages/yishi/case/index?order_inquiry_id={{item.order_inquiry_id}}" plain custom-style="padding:0 35rpx; height:67rpx;  border-radius: 10rpx;" color="#3CC7C0">查看病历</van-button>
+              <van-button type="default" bindtap="tabShow" 
+              data-show_dialog_from_account="{{item.from_account}}"
+              data-show_dialog_order_inquiry_id="{{item.order_inquiry_id}}"
+              data-show_dialog_inquiry_type="{{item.inquiry_type}}"
+              custom-style="padding:0 35rpx; height:67rpx; border-radius: 10rpx;margin-left:20rpx;" color="#3CC7C0">去接诊</van-button>
+            </view>
+            <view class="btn" wx:if="{{ item.inquiry_status >= 4 }}">
+              <van-button bind:click="goChat" data-from_account="{{item.from_account}}" data-inquiry_type="{{item.inquiry_type}}" data-order_inquiry_id="{{item.order_inquiry_id}}" data-url="/Pages/yishi/chat/index" plain custom-style="padding:0 35rpx; height:67rpx;  border-radius: 10rpx;" color="#3CC7C0">问诊详情</van-button>
+              <!-- <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>  
+        <van-empty description="暂无数据" wx:if="{{data_list_2.length == 0}}" />
+      </van-tab>
+      <van-tab title="公益问诊" dot="{{dot_3}}" name="3">
+        <!-- <wenzhen-data 
+          name="{{ item.patient_name }}"
+          sex="{{ item.patient_sex==1?'男':'女' }}"
+          age="{{ item.patient_age }}"
+          date="{{ item.message_send_time }}"
+          desc="{{ item.last_message_content.Text }}"
+          status="{{ item.inquiry_status }}"
+          order_inquiry_id="{{ item.order_inquiry_id }}"
+          inquiry_type="{{item.inquiry_type}}"
+          from_account="{{item.from_account}}"
+          status_text="{{ 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?'已取消':'其他' }}"
+          note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
+          message_dot="{{item.message_dot}}"
+          wx:for="{{ data_list_3 }}"
+         /> -->
+
+         <view class="content" wx:for="{{ data_list_3 }}">
+          <view class="content_1">
+            <view class="name">
+              <text style="font-size: 34rpx;color: #333;">就诊人：</text>
+              {{item.patient_name}}  {{item.patient_sex==1?'男':'女'}}｜{{item.patient_age}}<t-badge dot="{{item.message_dot || item.inquiry_status==3}}" offset="{{ [-4, 4] }}" content="岁" />
+            </view>
+            <view class="date"> {{item.message_send_time}}</view>
+          </view>
+          <view class="content_2">{{item.last_message_content.Text}}</view>
+          <view class="content_3">
+            <view class="status">{{ 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="btn" wx:if="{{ item.inquiry_status == 3 }}">
+              <van-button bind:click="go" data-url="/Pages/yishi/case/index?order_inquiry_id={{item.order_inquiry_id}}" plain custom-style="padding:0 35rpx; height:67rpx;  border-radius: 10rpx;" color="#3CC7C0">查看病历</van-button>
+              <van-button type="default" bindtap="tabShow" 
+              data-show_dialog_from_account="{{item.from_account}}"
+              data-show_dialog_order_inquiry_id="{{item.order_inquiry_id}}"
+              data-show_dialog_inquiry_type="{{item.inquiry_type}}"
+              custom-style="padding:0 35rpx; height:67rpx; border-radius: 10rpx;margin-left:20rpx;" color="#3CC7C0">去接诊</van-button>
+            </view>
+            <view class="btn" wx:if="{{ item.inquiry_status >= 4 }}">
+              <van-button bind:click="goChat" data-from_account="{{item.from_account}}" data-inquiry_type="{{item.inquiry_type}}" data-order_inquiry_id="{{item.order_inquiry_id}}" data-url="/Pages/yishi/chat/index" plain custom-style="padding:0 35rpx; height:67rpx;  border-radius: 10rpx;" color="#3CC7C0">问诊详情</van-button>
+              <!-- <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>  
+        <van-empty description="暂无数据" wx:if="{{data_list_3.length == 0}}" />
+      </van-tab>
+      <van-tab title="问诊购药" dot="{{dot_4}}" name="4">
+        <!-- <wenzhen-data 
+          name="{{ item.patient_name }}"
+          sex="{{ item.patient_sex==1?'男':'女' }}"
+          age="{{ item.patient_age }}"
+          date="{{ item.message_send_time }}"
+          desc="{{ item.last_message_content.Text }}"
+          status="{{ item.inquiry_status }}"
+          order_inquiry_id="{{ item.order_inquiry_id }}"
+          inquiry_type="{{item.inquiry_type}}"
+          from_account="{{item.from_account}}"
+          status_text="{{ 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?'已取消':'其他' }}"
+          note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
+          message_dot="{{item.message_dot}}"
+          wx:for="{{ data_list_4 }}"
+         /> -->
+
+         <view class="content" wx:for="{{ data_list_4 }}">
+          <view class="content_1">
+            <view class="name">
+              <text style="font-size: 34rpx;color: #333;">就诊人：</text>
+              {{item.patient_name}}  {{item.patient_sex==1?'男':'女'}}｜{{item.patient_age}}<t-badge dot="{{item.message_dot || item.inquiry_status==3}}" offset="{{ [-4, 4] }}" content="岁" />
+            </view>
+            <view class="date"> {{item.message_send_time}}</view>
+          </view>
+          <view class="content_2">{{item.last_message_content.Text}}</view>
+          <view class="content_3">
+            <view class="status">{{ 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="btn" wx:if="{{ item.inquiry_status == 3 }}">
+              <van-button bind:click="go" data-url="/Pages/yishi/case/index?order_inquiry_id={{item.order_inquiry_id}}" plain custom-style="padding:0 35rpx; height:67rpx;  border-radius: 10rpx;" color="#3CC7C0">查看病历</van-button>
+              <van-button type="default" bindtap="tabShow" 
+              data-show_dialog_from_account="{{item.from_account}}"
+              data-show_dialog_order_inquiry_id="{{item.order_inquiry_id}}"
+              data-show_dialog_inquiry_type="{{item.inquiry_type}}"
+              custom-style="padding:0 35rpx; height:67rpx; border-radius: 10rpx;margin-left:20rpx;" color="#3CC7C0">去接诊</van-button>
+            </view>
+            <view class="btn" wx:if="{{ item.inquiry_status >= 4 }}">
+              <van-button bind:click="goChat" data-from_account="{{item.from_account}}" data-inquiry_type="{{item.inquiry_type}}" data-order_inquiry_id="{{item.order_inquiry_id}}" data-url="/Pages/yishi/chat/index" plain custom-style="padding:0 35rpx; height:67rpx;  border-radius: 10rpx;" color="#3CC7C0">问诊详情</van-button>
+              <!-- <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>  
+        <van-empty description="暂无数据" wx:if="{{data_list_4.length == 0}}" />
+      </van-tab>
+      <van-tab title="问诊结束" name="5">
+         <view class="content" wx:for="{{ data_list_5 }}" bindtap="goChat" data-from_account="{{item.from_account}}" data-inquiry_type="{{item.inquiry_type}}" data-order_inquiry_id="{{item.order_inquiry_id}}" data-url="/Pages/yishi/chat/index">
+          <view class="content_1" >
+            <view class="name">
+              <text style="font-size: 34rpx;color: #333;">就诊人：</text>
+              {{item.patient_name}}  {{item.patient_sex==1?'男':'女'}}｜{{item.patient_age}}<t-badge dot="{{false}}" offset="{{ [-4, 4] }}" content="岁" />
+            </view>
+            <view class="date"> {{dateSubstr.substring(item.complete_time,0,10)}}</view>
+          </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?'问诊购药':'其他' }}</view>
+          </view>
+          <view class="content_4" wx:if="{{ item.inquiry_status == 3 }}">不接诊24小时后自动取消</view>
+        </view>  
+
+        <view style="width: 100%;text-align: center;">
+          <van-loading size="24px" wx:if="{{data_list_5_loading}}">加载中...</van-loading>
+        </view>
+        <van-empty description="暂无数据" wx:if="{{data_list_5.length == 0}}" />
+        <van-divider contentPosition="center" wx:if="{{data_list_5.length > 0 && current_page == last_page}}">到底了~</van-divider>
+      </van-tab>
+    </van-tabs>
+  </view>
+  <view style="height: 200rpx;"></view>
+
+
+  <t-dialog
+    visible="{{ show }}"
+    title="温馨提示"
+    close-on-overlay-click
+    bind:close="onClose"
+    content="为保障服务质量，请您查看患者病历后再去接诊"
+  >
+  <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="go" data-from_account="{{show_dialog_from_account}}" data-url="/Pages/yishi/case/index?order_inquiry_id={{show_dialog_order_inquiry_id}}" >去查看</view>
+  <view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="postDoctorInquiry" data-from_account="{{show_dialog_from_account}}" data-inquiry_type="{{show_dialog_inquiry_type}}" data-order_inquiry_id="{{show_dialog_order_inquiry_id}}" data-url="/Pages/yishi/chat/index" >去接诊</view>
+</t-dialog>
+</view>
\ No newline at end of file
diff --git a/Pages/yishi/wenzhen_v3/wenzhen.wxss b/Pages/yishi/wenzhen_v3/wenzhen.wxss
new file mode 100644
index 0000000..0be5bc4
--- /dev/null
+++ b/Pages/yishi/wenzhen_v3/wenzhen.wxss
@@ -0,0 +1,139 @@
+page{
+  background-color: #F4F4F4;
+}
+.container{
+  width: 100vw;
+  padding-top: 20rpx;
+}
+.top{
+  margin: 0 auto 30rpx auto;
+  display: flex;
+  padding: 20rpx 20rpx;
+  background-color: rgb(255, 255, 255);
+}
+.top_left, .top_right{
+  flex: 1;
+  text-align: center;
+  display: flex;
+  flex-direction: column;
+  color: #666666;
+  font-size: 28rpx;
+}
+.top_left{
+  border-right: 1px solid #F4F4F4;
+}
+.t-tab-panel,.t-tabs__content {
+  background-color: #F4F4F4 !important;
+}
+.t-tabs__item--active{
+  color: #49B9AD !important;
+  font-size: 32rpx !important;
+}
+.t-tabs__item-inner--line{
+  font-size: 28rpx !important;
+}
+.t-tabs__track{
+  background-color: var(--td-tab-track-color, var(--td-primary-color, #49B9AD)) !important;
+}
+.empty{
+  width: 92vw;
+  margin: 0 auto;
+  height: 500rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+}
+.empty_note{
+  font-size: 24rpx;
+  color: #999999;
+  margin-top: 30rpx;
+}
+.badge--t-badge {
+  vertical-align: baseline !important;
+}
+
+
+
+
+
+
+.content{
+  background-color: #fff;
+  display: flex;
+  flex-direction: column;
+  margin-bottom: 20rpx;
+}
+.content_1,.content_3,.content_2{
+  display: flex;
+  justify-content: space-between;
+  margin: 20rpx 30rpx;
+  align-items: center;
+}
+.content_1,.content_3{
+  flex: 5;
+}
+.name{
+  font-size: 30rpx;
+  color: #666666;
+  height: 50rpx;
+  line-height: 50rpx;
+  display: flex;
+}
+.date{
+  font-size: 30rpx;
+  color: #999;
+}
+.content_2{
+  background-color: #FAFAFA;
+  font-size: 26rpx;
+  color: #999999;
+  min-height: 70rpx;
+  padding: 10rpx 20rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  display: block;
+  line-height: 70rpx;
+}
+.status{
+  font-size: 26rpx;
+  color: #FA541C;
+  flex: 1;
+}
+.status_end{
+  color: #666666;
+}
+.btn{
+  flex: 2;
+  display: flex;
+  justify-content: flex-end;
+}
+.content_4{
+  flex: 5;
+  font-size: 24rpx;
+  color: #E34D59;
+  justify-self:flex-end;
+  text-align:right;
+  display: flex;
+  justify-content: flex-end;
+  border-top: 1px solid #E3E4E5;
+  align-items: center;
+  margin: 0 30rpx;
+  min-height: 70rpx;
+}
+.dialog{
+  width: 50%;
+  text-align: center;
+  height: 100rpx;
+  line-height: 100rpx;
+}
+.dialog_cancel_btn{
+  border-top: 1px solid #E9E9E9;
+  border-right: 1px solid #E9E9E9;
+}
+.dialog_confirm_btn{
+  border-top: 1px solid #E9E9E9;
+  color: #3CC7C0;
+}
+
diff --git a/Pages/yishi/yizhensetup/index.js b/Pages/yishi/yizhensetup/index.js
index 645c334..6102dfe 100644
--- a/Pages/yishi/yizhensetup/index.js
+++ b/Pages/yishi/yizhensetup/index.js
@@ -85,12 +85,7 @@ Page({
   },
   onChange({ detail }) {
     console.log("onChange: ", detail);
-    if(detail){
-      this.setData({ note: this.data.open_note });
-    }else{
-      this.setData({ note: this.data.close_note });
-    }
-    this.setData({ "info.is_open": detail });
+    
 
      //修改开关
      let params = {};
@@ -108,6 +103,13 @@ Page({
           }
         })
       }
+    }).then(()=>{
+      if(detail){
+        this.setData({ note: this.data.open_note });
+      }else{
+        this.setData({ note: this.data.close_note });
+      }
+      this.setData({ "info.is_open": detail });
     }).catch(errors => {console.error(errors);})
   },
 
diff --git a/Pages/yishi/yizhensetupprice/index.wxml b/Pages/yishi/yizhensetupprice/index.wxml
index 5888e92..4259805 100644
--- a/Pages/yishi/yizhensetupprice/index.wxml
+++ b/Pages/yishi/yizhensetupprice/index.wxml
@@ -5,7 +5,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 }}" max="{{config.max_work_num_day}}" integer bind:change="onStepperChange" />
+          <van-stepper value="{{ info.work_num_day }}" min="0" max="{{info.work_num_day > config.max_work_num_day?info.work_num_day:config.max_work_num_day}}" integer bind:change="onStepperChange" />
         </view>
       </view>
       <view class="price_steup_box_bottom">
diff --git a/Pages/yishi/zhiye_identity/index.js b/Pages/yishi/zhiye_identity/index.js
index 84941a4..75b3009 100644
--- a/Pages/yishi/zhiye_identity/index.js
+++ b/Pages/yishi/zhiye_identity/index.js
@@ -33,9 +33,11 @@ Page({
           break;
         case 1:
           btn_txt = "审核通过";
+          btn_disabled = true;
           break;
         case 2:
           btn_txt = "审核中";
+          btn_disabled = true;
           break;
         case 3:
           btn_txt = "认证失败，再次提交";
diff --git a/Pages/yishi/zhiye_identity/index.wxml b/Pages/yishi/zhiye_identity/index.wxml
index 17c2db5..60d18ee 100644
--- a/Pages/yishi/zhiye_identity/index.wxml
+++ b/Pages/yishi/zhiye_identity/index.wxml
@@ -7,6 +7,7 @@
     upload_cell_desc="" 
     upload_cell_note="查看示例" 
     fileList="{{ id_card_front }}"
+    deletable="{{!btn_disabled}}"
     max_count="1"
     data-scene="2" 
     data-field_name="id_card_front" 
@@ -22,6 +23,7 @@
     upload_cell_desc="" 
     upload_cell_note="查看示例" 
     fileList="{{ id_card_back }}"
+    deletable="{{!btn_disabled}}"
     max_count="1"
     data-scene="2" 
     data-field_name="id_card_back" 
@@ -60,6 +62,7 @@
       upload_cell_note="" 
       required="{{false}}"
       disabled="{{btn_disabled}}"
+      upload_cell_note_show="{{false}}"
       max_count="1"
       data-scene="2" 
       data-field_name="sign_image" 
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
index 9a25a60..3e2fe0f 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
@@ -154,6 +154,7 @@ Component({
           const renderDom = [{
             type: 'prescribe',
             product_name: data.product_name,
+            title: customMessage.title,
             order_inquiry_id: data.order_inquiry_id,
             order_prescription_id: data.order_prescription_id,
             pharmacist_verify_time: data.pharmacist_verify_time.substring(0,10),
@@ -166,6 +167,7 @@ Component({
           const renderDom = [{
             type: 'prescribe_verify',
             product_name: data.product_name,
+            title: customMessage.title,
             order_inquiry_id: data.order_inquiry_id,
             order_prescription_id: data.order_prescription_id,
             pharmacist_verify_time: data.pharmacist_verify_time.substring(0,10),
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
index a579a30..901f8cf 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
@@ -49,21 +49,32 @@
     <view class="gdxz_custom_message_title">{{renderDom[0].title}}</view>
     <view class="gdxz_custom_message_desc">{{renderDom[0].desc}}</view>
   </view> -->
-  <!-- 自定义评价样式 -->
-  <view wx:if="{{renderDom[0].type==='order_evaluation' && false}}" class="gdxz_custom_order_evaluation_message" bindtap="showPop">
-    <view class="evaluation_title">请您对本次问诊服务进行评价</view>
-    <view class="evaluation_ratebox">
-      <van-rate disabled value="{{0}}" size="40rpx" gutter="46rpx" color="#ffd21e" void-icon="star" void-color="#e7e7e7" readonlygutter="20"/>
-    </view>
-    <view class="evaluation_button">点击评价</view>
-  </view>
+
+
   <!-- 自定义开处方样式 -->
   <view wx:if="{{renderDom[0].type==='prescribe'}}" 
   class="gdxz_custom_order_prescribe_message" 
   data-url="/Pages/yishi/onlinechufang/index?order_inquiry_id={{renderDom[0].order_inquiry_id}}&order_prescription_id={{renderDom[0].order_prescription_id}}&from=chat"
   bindtap="go">
     <view class="prescribe_title">
-      处方已开具
+      {{renderDom[0].title}}
+    </view>
+    <view class="prescribe_box">
+      <view class="prescribe_box_top">
+        <view class="prescribe_box_top_product_name"><text style="color: #999;"> RP：</text>{{renderDom[0].product_name}}</view>
+        <view class="prescribe_box_top_pharmacist_verify_time"><text style="color: #999;">开方日期：</text> {{renderDom[0].pharmacist_verify_time}}</view>
+      </view>
+      <view class="prescribe_box_bottom" data-order_prescription_id="{{renderDom[0].order_prescription_id}}">
+        <view class="prescribe_box_buy">去查看</view>
+      </view>
+    </view>
+  </view>
+  <view wx:if="{{renderDom[0].type==='prescribe_verify'}}" 
+  class="gdxz_custom_order_prescribe_message" 
+  data-url="/Pages/yishi/onlinechufang/index?order_inquiry_id={{renderDom[0].order_inquiry_id}}&order_prescription_id={{renderDom[0].order_prescription_id}}&from=chat"
+  bindtap="go">
+    <view class="prescribe_title">
+      {{renderDom[0].title}}
     </view>
     <view class="prescribe_box">
       <view class="prescribe_box_top">
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss
index 55f9fbb..dda23ff 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss
@@ -133,7 +133,7 @@ line-height: 42rpx;
 .gdxz_custom_message_title{
   flex: 1;
   display: flex;
-  max-width: 92vw;
+  max-width: 95vw;
   justify-content: center;
   background-color: #E1E1E1;
   padding: 5rpx 40rpx;
@@ -143,7 +143,7 @@ line-height: 42rpx;
 .gdxz_custom_message_desc{
   margin-top: 30rpx;
   display: flex;
-  max-width: 92vw;
+  max-width: 95vw;
   letter-spacing: 2rpx;
   justify-content: center;
   color: #666666;
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js
index dc78a2e..559bcd1 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.js
@@ -1,5 +1,8 @@
 import logger from '../../../../utils/logger';
 import constant from '../../../../utils/constant';
+import { API } from '../../../../../utils/network/api';
+
+const api = new API()
 let app = getApp()
 // eslint-disable-next-line no-undef
 Component({
@@ -44,6 +47,15 @@ Component({
     baseInfo: {
       type: Object,
       value: {}
+    },
+    message_rounds:{
+      type: Number,
+      value: 0,
+      observer(newVal) {
+        this.setData({
+          message_rounds: newVal,
+        });
+      },
     }
   },
 
@@ -76,11 +88,15 @@ Component({
     isFirstSendTyping: true,
     time: 0,
     focus: false,
+    my_focus: false,
     isEmoji: false,
     fileList: [],
     hasCallKit: false,
     showChangYongYu: false,
-    ChangYongYu: []
+    ChangYongYu: [],
+    dialog_visible: false,
+    dialog_message: "在线开处方需先进行多点执业认证",
+    message_rounds: 0
   },
 
   lifetimes: {
@@ -240,6 +256,7 @@ Component({
 
     // 选自定义消息
     handleExtensions() {
+      
       console.warn("wx.aegis: ", wx.aegis);
       wx.aegis.reportEvent({
         name: 'chooseExtensions',
@@ -346,7 +363,7 @@ Component({
           inquiry_type: this.data.inquiry_type,
           message_type: 0,
           is_system: 0,
-          message_rounds: message_rounds,
+          message_rounds: this.data.message_rounds,
           patient_family_data: patient_family_data
         });
         
@@ -395,7 +412,8 @@ Component({
     },
 
     handleCommonFunctions(e) {
-      switch (e.target.dataset.function.key) {
+      console.log("handleCommonFunctions: ", e)
+      switch (e.target.dataset.key) {
         case '0':
           this.setData({
             displayCommonWords: true,
@@ -418,19 +436,24 @@ Component({
           let _this = this;
           console.log("开始订阅消息");
           wx.requestSubscribeMessage({
-            tmplIds: ['5Tl-xmaWXrKP5BB8E6b3oTdPHbHa7WYWbmvZiuz4TLs'],
+            tmplIds: ['kUy70xHlr7ADo4aIHiictM4Te7MSec3E5kHsYvFQu40'],
             success (res) {
               console.log(res);
-              let usertype =  wx.getStorageSync('usertype');
-              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
-                })
-              }
+              let order_inquiry_id = _this.data.order_inquiry_id
+              api.getDoctorPrescriptionCheck({order_inquiry_id: order_inquiry_id}).then(response => {
+                let status = response.data.status
+                if(status == 1){
+                  app.go("/Pages/yishi/onlinechufang/index?order_inquiry_id="+order_inquiry_id)
+                }else{
+                  _this.setData({
+                    dialog_visible: true,
+                    dialog_message: response.data.message
+                  })
+                }
+              }).catch(errors => {
+                console.error(errors);
+              })
+              
             }
           })
           break;
@@ -444,7 +467,7 @@ Component({
       })
     },
     confirmDialog(){
-      app.go("/Pages/yishi/zhiye_identity/index")
+      // app.go("/Pages/yishi/zhiye_identity/index")
       this.setData({
         dialog_visible: false
       })
@@ -632,7 +655,7 @@ Component({
           inquiry_type: this.data.inquiry_type,
           message_type: 0,
           is_system: 0,
-          message_rounds: message_rounds,
+          message_rounds: this.data.message_rounds,
           patient_family_data: patient_family_data
         });
 
@@ -666,7 +689,7 @@ Component({
           sendMessageBtn: false,
         });
       }
-      event.detail.value && this.sendTypingStatusMessage();
+      // event.detail.value && this.sendTypingStatusMessage();
     },
 
     // 发送正在输入状态消息
@@ -730,7 +753,7 @@ Component({
       this.setData({
         focus: true,
       });
-      this.getMessageList(this.data.conversation);
+      // this.getMessageList(this.data.conversation);
       this.triggerEvent('pullKeysBoards', {
         event,
       });
@@ -844,8 +867,7 @@ Component({
             ext3: wx.$chat_SDKAppID,
           });
         }
-      })
-        .catch((error) => {
+      }).catch((error) => {
           logger.log(`| TUI-chat | message-input | sendMessageError: ${error.code} `);
           wx.aegis.reportEvent({
             name: 'sendMessage',
@@ -866,6 +888,7 @@ Component({
     handleClose() {
       this.setData({
         displayFlag: '',
+        my_focus: false
       });
     },
 
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxml b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
index d6685d7..3511119 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
@@ -1,14 +1,15 @@
 <view class="TUI-message-input-container">
     <view class="TUI-commom-function">
-        <view class="TUI-commom-function-item" wx:for="{{commonFunction}}" wx:key="index" data-function="{{item}}" bindtap="handleCommonFunctions">{{item.name}}</view>
+        <view class="TUI-commom-function-item" data-key="10" bindtap="handleCommonFunctions">查看完整病例</view>
+        <view class="TUI-commom-function-item" data-key="11" bindtap="handleCommonFunctions" wx:if="{{baseInfo.multi_point_status == 1}}">在线开处方</view>
     </view>
     <view class="TUI-message-input">
         <image class="TUI-icon" bindtap="switchAudio" wx:if="{{has_audio}}"
         src="{{isAudio ? '../../../../static/assets/keyboard.svg' : '../../../../static/assets/audio.svg'}}" />
         <view wx:if="{{!isAudio || isEmoji}}" class="TUI-message-input-main {{ focus && 'TUI-message-input-main-focus'}}" >
-            <textarea id="mytextarea" class="TUI-message-input-area" adjust-position="{{false}}" cursor-spacing="20"
+            <textarea hold-keyboard id="mytextarea" class="TUI-message-input-area" adjust-position="{{false}}" cursor-spacing="0"
                 value="{{message}}" bindinput="onInputValueChange" maxlength="-1" type="text" auto-height="{{true}}"
-                placeholder="请输入文字" placeholder-class="input-placeholder" confirm-type="send" show-confirm-bar="{{false}}"
+                placeholder="请输入文字" placeholder-class="input-placeholder" confirm-type="return" show-confirm-bar="{{false}}"
                 bindfocus="inputBindFocus"
                 bindblur="inputBindBlur" 
                 bindconfirm="sendTextMessage"/>
@@ -26,7 +27,7 @@
               <image class="TUI-icon" bindtap="handleEmoji" src="../../../../static/assets/face-emoji.svg" />
           </view>
           <view wx:if="{{!sendMessageBtn}}" bindtap="handleExtensions" class="TUI-sendMessage-btn">
-              <image class="TUI-icon" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/chat/tianjia.png" />
+              <image  class="TUI-icon" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/chat/tianjia.png" />
           </view>
           <view wx:else class="TUI-sendMessage-btn TUI-sendMessage-btn-input" bindtap="sendTextMessage">
               发送
@@ -104,7 +105,7 @@
 <t-dialog
     visible="{{ dialog_visible }}"
     title="温馨提示"
-    content="在线开处方需先进行多点执业认证"
+    content="{{dialog_message}}"
   >
   <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="cancelDialog">
     取消
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxss b/TUIKit/components/TUIChat/components/MessageInput/index.wxss
index 9e3baa6..57f482d 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxss
@@ -74,8 +74,8 @@
     padding: 20rpx 20rpx;
 }
 .TUI-icon {
-    width: 56rpx;
-    height: 56rpx;
+    width: 50rpx;
+    height: 50rpx;
     margin: 0 16rpx;
 }
 .TUI-Extensions {
@@ -111,6 +111,7 @@
   color: #fff;
   max-height: 200rpx;
   padding: 20rpx 0;
+  height: 50rpx;
 }
 .TUI-sendMessage-btn-input{
   background-color: #3CC7C0;
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index 3d326cf..224dbf7 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -2,6 +2,8 @@ import dayjs from '../../../../utils/dayjs';
 import logger from '../../../../utils/logger';
 import constant from '../../../../utils/constant';
 import { getTimeAgoChat } from './../../../../../utils/util'
+import { wechatTimeFormat } from './../../../../../utils/wechatTime'
+
 const { GDXZ_CUSTOM_MSEEAGE } = constant;
 // eslint-disable-next-line no-undef
 const app = getApp();
@@ -87,7 +89,10 @@ Component({
     errorMessage: {},
     errorMessageID: '',
     typingMessage: {},
-    autoToButtom: true
+    autoToButtom: true,
+    cachTime: "",
+    list_first_loading: false,
+    message_rounds: 0
   },
 
   lifetimes: {
@@ -132,9 +137,15 @@ Component({
   },
   pageLifetimes: {
     show(){
+      this.setData({
+        list_first_loading: true
+      })
       console.log("showshowshowshowshowshowshow")
     },
     hide(){
+      this.setData({
+        list_first_loading: false
+      })
       console.log("hidehidehidehidehidehidehidehidehidehidehide")
     }
   },
@@ -178,15 +189,24 @@ Component({
             // console.log(item)
             //去除自定义消息
             // if(HMM_type == "TIMCustomElem") return;
-            if(!this.checkShowAvatar(item)){
+            this.refreshMessageRounds(item)
+            let checkShowAvatar = this.checkShowAvatar(item, false)
+            if(!checkShowAvatar){
               item.no_avatar = true;
+            }else{
+              item.no_avatar = false;
             }
             
+            let cath_time = this.cachMessageTime(item.time * 1000);
+            item.messageTime = cath_time[0]
+            item.isShowTime = cath_time[1]
+            item.showMessageTime = cath_time[1]
             HMM_messageList_del.push(item);
           })
           HMM_data.messageList = HMM_messageList_del;
 
-          this.showMoreHistoryMessageTime(HMM_messageList_del);
+          // this.showMoreHistoryMessageTime(HMM_messageList_del);
+          // this.showHistoryMessageTime(HMM_messageList_del);
           const { messageList } = HMM_data; // 消息列表。
           this.data.nextReqMessageID = res.data.nextReqMessageID; // 用于续拉，分页续拉时需传入该字段。
           this.data.isCompleted = res.data.isCompleted; // 表示是否已经拉完所有消息。
@@ -196,32 +216,86 @@ Component({
           }
           this.$handleMessageRender(this.data.messageList, messageList);
         }).then(res => {
+          this.setData({
+            list_first_loading: false
+          })
+        }).catch(error => {
+          this.setData({
+            list_first_loading: false
+          })
         });
       }
     },
-    checkShowAvatar(message){
-      console.log("checkShowAvatar ");
+    refreshMessageRounds(message){
+        console.log("messageList refreshMessageRounds message: ", message);
+        let cloudCustomData = "";
+        let cloudCustomDataJson = "";
+        if(message.cloudCustomData){
+          cloudCustomData = message.cloudCustomData;
+        }
+        if(cloudCustomData){
+          cloudCustomDataJson = JSON.parse(cloudCustomData);
+        }
+
+        let payload = message.payload.data;
+        if(payload){
+          const payloadData = JSON.parse(message.payload.data);
+          if(payloadData){
+            let title = payloadData.title
+            //问诊已开始，重置message_rounds = 0
+            if(title.indexOf("问诊已开始") > -1){
+              this.setData({
+                message_rounds: 0
+              })
+              var myEventOption = {}
+              myEventOption.message_rounds = 0
+              this.triggerEvent('refreshMessageRounds', myEventOption)
+              return
+            }
+          }
+        }
+        
+        let now_message_rounds = this.data.message_rounds
+        console.log("now_message_rounds: ", now_message_rounds)
+        if(cloudCustomDataJson){
+          let message_rounds = cloudCustomDataJson.message_rounds;
+          console.log("message_rounds: ", message_rounds)
+          if(message_rounds > now_message_rounds){
+            this.setData({
+              message_rounds: message_rounds
+            })
+            var myEventOption = {}
+            myEventOption.message_rounds = message_rounds
+            this.triggerEvent('refreshMessageRounds', myEventOption)
+          }
+        }
+    },
+    checkShowAvatar(message, refreshBaseInfo){
+      // console.log("checkShowAvatar ");
       let type = message.type;
-      console.log("message type: ", type);
+      // console.log("message type: ", type);
       let show_avatar = true;
       if(type === "TIMCustomElem"){
         const customMessage = JSON.parse(message.payload.data);
-        if(customMessage.message_type != GDXZ_CUSTOM_MSEEAGE.PRESCRIBE){
+        if(Number(customMessage.message_type) != GDXZ_CUSTOM_MSEEAGE.PRESCRIBE && Number(customMessage.message_type) != GDXZ_CUSTOM_MSEEAGE.PRESCRIBE_VERIFY){
           show_avatar = false;
         }
-
-        if(customMessage.message_type != GDXZ_CUSTOM_MSEEAGE.TRABECULA){
-          
-          //收到横条消息去触发父组件getbase方法
-          this.triggerEvent('getInquiryMessageBasic');
+        if(Number(customMessage.message_type) == GDXZ_CUSTOM_MSEEAGE.TRABECULA && refreshBaseInfo){
+          const title = customMessage.title
+          if(title.indexOf("问诊已结束") > -1){
+            //收到横条消息去触发父组件getbase方法
+            this.triggerEvent('getInquiryMessageBasic');
+          }
         }
       }
+
+
       return show_avatar;
     },
     // 历史消息渲染
     $handleMessageRender(messageList, currentMessageList) {
       console.log("handleMessageRenderhandleMessageRenderhandleMessageRender");
-      this.showHistoryMessageTime(currentMessageList);
+      // this.showHistoryMessageTime(currentMessageList);
       if (messageList.length > 0) {
         if (this.data.conversation.type === '@TIM#SYSTEM') {
           this.filterRepateSystemMessage(messageList);
@@ -270,11 +344,12 @@ Component({
       let autoToButtom = this.data.autoToButtom;
       console.log("autoToButtom:", autoToButtom)
       const message = value.data[0];
-      
+      //更新会话数
+      this.refreshMessageRounds(message)
       if(message.flow == 'out'){
         message.isRead = false;
       }
-      if(!this.checkShowAvatar(message)){
+      if(!this.checkShowAvatar(message, true)){
         message.no_avatar = true;
       }
       wx.$TUIKit.setMessageRead({ conversationID: this.data.conversation.conversationID }).then(() => {
@@ -283,7 +358,13 @@ Component({
       console.log('| MessageList | setMessageRead | ok');
       console.log('message cloudCustomData：', message.cloudCustomData);
       const { BUSINESS_ID_TEXT, MESSAGE_TYPE_TEXT } = constant;
-      this.messageTimeForShow(message);
+      // this.messageTimeForShow(message);
+
+      let cath_time = this.cachMessageTime(message.time * 1000);
+      message.messageTime = cath_time[0]
+      message.isShowTime = cath_time[1]
+      message.showMessageTime = cath_time[1]
+
       this.setData({
         UseData: value,
       });
@@ -367,7 +448,7 @@ Component({
       console.log("自己的消息上屏 updateMessageList: ", message);
       console.log(message);
       //自己的消息有头像
-      if(!this.checkShowAvatar(message)){
+      if(!this.checkShowAvatar(message, false)){
         message.no_avatar = true;
       }
       if (message.conversationID !== this.data.conversation.conversationID) return;
@@ -376,30 +457,31 @@ Component({
       });
       const { BUSINESS_ID_TEXT, MESSAGE_TYPE_TEXT } = constant;
       // this.$onMessageReadByPeer();
-      this.messageTimeForShow(message);
+      // this.messageTimeForShow(message);
+
+      let cath_time = this.cachMessageTime(message.time * 1000);
+      message.messageTime = cath_time[0]
+      message.isShowTime = cath_time[1]
+      message.showMessageTime = cath_time[1]
+
       if (message.type === MESSAGE_TYPE_TEXT.TIM_CUSTOM_ELEM) {
         const typingMessage = JSON.parse(message.payload.data);
         if (typingMessage.businessID === BUSINESS_ID_TEXT.USER_TYPING) {
-          console.log(1111111)
           this.setData({
             messageList: this.data.messageList,
           });
         } else {
-          console.log(44444)
           this.data.messageList.push(message);
         }
       } else {
-        console.log(55555)
         console.log(message)
         this.data.messageList.push(message);
       }
-      console.log(222222)
       this.setData({
         lastMessageSequence: this.data.messageList.slice(-1)[0].sequence,
         messageList: this.data.messageList,
         jumpAim: `ID-${this.filterSystemMessageID(this.data.messageList[this.data.messageList.length - 1].ID)}`,
       }, () => {
-        console.log(333333)
         this.setData({
           messageList: this.data.messageList,
         });
@@ -584,20 +666,26 @@ Component({
       this.updateMessageByID(event.detail.message.ID);
     },
     // 展示消息时间
-    messageTimeForShow(messageTime) {
+    messageTimeForShow(message) {
       console.log("messageTimeForShow")
-      const interval = 5 * 60 * 1000;
-      const nowTime = Math.floor(messageTime.time / 10) * 10 * 1000;
+      // const interval = 5 * 60 * 1000;
+      const interval = 5 * 60;
+      const nowTime = Math.floor(message.time / 10) * 10 * 1000;
+      console.log("nowTime: ", nowTime)
       if (this.data.messageList.length > 0) {
         const lastTime = this.data.messageList.slice(-1)[0].time * 1000;
         console.log("nowTime  - lastTime=", (nowTime  - lastTime))
         if (nowTime  - lastTime > interval) {
-          Object.assign(messageTime, {
+          Object.assign(message, {
             isShowTime: true,
           }),
-          this.data.messageTime = dayjs(nowTime);
+          this.data.messageTime = this.cachMessageTime(nowTime)[0];
+          let messageTime = this.cachMessageTime(nowTime);
+          message.messageTime = messageTime[0];
+          message.showMessageTime = messageTime[1];
+          console.log("dayjs(nowTime): ", dayjs(nowTime))
           this.setData({
-            messageTime: getTimeAgoChat(nowTime/1000),
+            messageTime: this.cachMessageTime(nowTime)[0],
             showMessageTime: true,
           });
         }
@@ -605,26 +693,17 @@ Component({
     },
     // 渲染历史消息时间
     showHistoryMessageTime(messageList) {
-      const cut = 5 * 60 * 1000;
+      const cut = 5 * 60;
       for (let index = 0; index < messageList.length; index++) {
-        const nowadayTime = Math.floor(messageList[index].time / 10) * 10 * 1000;
-        const firstTime = messageList[0].time * 1000;
-        console.log("nowadayTime - firstTime=",(nowadayTime - firstTime))
-        console.log("cut",cut)
-        if (nowadayTime - firstTime > cut) {
-          const indexbutton = messageList.map(item => item).indexOf(messageList[index]); // 获取第一个时间大于30分钟的消息所在位置的下标
-          const firstTime = nowadayTime; // 找到第一个数组时间戳大于30分钟的将其值设为初始值
-          const showHistoryTime = Math.floor(messageList[indexbutton].time / 10) * 10 * 1000;
-          Object.assign(messageList[indexbutton], {
-            isShowHistoryTime: true,
-          }),
-          this.setData({
-            firstTime: nowadayTime,
-            messageHistoryTime: getTimeAgoChat(showHistoryTime/1000),
-            showMessageHistoryTime: true,
-          });
-          return firstTime;
-        }
+        const thismessagetime = Math.floor(messageList[index].time / 10) * 10 * 1000;
+        let messageTime = this.cachMessageTime(thismessagetime);
+        messageList[index].messageTime = messageTime[0]
+        messageList[index].showMessageHistoryTime = messageTime[1]
+        this.setData({
+          messageHistoryTime: messageTime[0],
+          showMessageHistoryTime: messageTime[1]
+        });
+          
       }
     },
     // 拉取更多历史消息渲染时间
@@ -633,13 +712,34 @@ Component({
         const showHistoryTime = messageList[0].time * 1000;
         Object.assign(messageList[0], {
           isShowMoreHistoryTime: true,
-        });
-        this.data.newArr[messageList[0].ID] = getTimeAgoChat(showHistoryTime/1000);
+        }),
+        this.data.newArr[messageList[0].ID] = this.cachMessageTime(showHistoryTime)[0];
         this.setData({
           newArr: this.data.newArr,
         });
       }
     },
+    cachMessageTime(messageTime){
+      // console.log("cachMessageTime messageTime 参数:", messageTime)
+      let time = wechatTimeFormat(messageTime)
+      // console.log("cachMessageTime: ", time)
+      if(time){
+        // let nowCachTime = time.split(":")[0]  //小时级别
+        let nowCachTime = time
+        let cachTime = this.data.cachTime
+        // console.log("nowCachTime: ", nowCachTime)
+        // console.log("cachTime: ", cachTime)
+        if(nowCachTime == cachTime){
+          return [time, false]
+        }else{
+          this.setData({
+            cachTime: nowCachTime
+          })
+          return [time, true]
+        }
+      }
+      return [time, false]
+    },
     // 消息发送失败
     sendMessageError(event) {
       this.setData({
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.json b/TUIKit/components/TUIChat/components/MessageList/index.json
index 2bd9367..352b3be 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.json
+++ b/TUIKit/components/TUIChat/components/MessageList/index.json
@@ -12,6 +12,7 @@
     "FaceMessage": "../MessageElements/FaceMessage/index",
     "FileMessage": "../MessageElements/FileMessage/index",
     "MergerMessage": "../MessageElements/MergerMessage/index",
-    "RevokeMessage": "../MessageElements/RevokeMessage/index"
+    "RevokeMessage": "../MessageElements/RevokeMessage/index",
+    "van-loading": "@vant/weapp/loading/index"
   }
 }
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxml b/TUIKit/components/TUIChat/components/MessageList/index.wxml
index cda6f83..f84f7ac 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageList/index.wxml
@@ -1,16 +1,19 @@
 <view class="container">
 
-<scroll-view  class="message-list-container" scroll-y="true"   scroll-into-view="{{jumpAim}}" refresher-enabled="{{true}}" bindrefresherrefresh="refresh" refresher-triggered="{{triggered}}" lower-threshold="200"  bindscrolltolower="scrollHandler">
+<scroll-view  class="message-list-container" scroll-y="true"   scroll-into-view="{{jumpAim}}" refresher-enabled="{{true}}" bindrefresherrefresh="refresh" refresher-triggered="{{triggered}}" lower-threshold="200"  bindscrolltolower="scrollHandler" bindscrolltoupper="refresh" 	upper-threshold="100">
     <view class="no-message" wx:if="{{isCompleted}}">没有更多啦</view>
-    <view class="t-message" wx:if="{{conversation.type !== '@TIM#SYSTEM'}}" wx:for="{{messageList}}" wx:key="index"  data-index ='{{index}}'  >
-         <view class="time-pop-mask" data-value="{{item.time}}" wx:if="{{showMessageTime}}">
+    <view style="width: 100%;text-align: center;position: absolute;top: 50%;">
+      <van-loading size="24px" wx:if="{{list_first_loading}}">加载中...</van-loading>
+    </view>
+    <view class="t-message" wx:if="{{conversation.type !== '@TIM#SYSTEM'}}" wx:for="{{messageList}}" wx:key="index"  data-index ='{{index}}'>
+         <view class="time-pop-mask" data-value="{{item.time}}" wx:if="{{item.showMessageTime}}">
              <view class="showmessagetime 1" wx:if="{{item.isShowTime}}">
-             <text class="time"  wx:if="{{!item.isDeleted && !item.isRevoked}}">{{messageTime}} </text> 
+             <text class="time"  wx:if="{{!item.isDeleted && !item.isRevoked}}">{{item.messageTime}} </text> 
              </view>
          </view>
-          <view class="time-pop-mask" data-value="{{item.time}}" wx:if="{{showMessageHistoryTime}}">
+          <view class="time-pop-mask" data-value="{{item.time}}" wx:if="{{item.showMessageHistoryTime}}">
              <view class="showmessagetime 2" wx:if="{{item.isShowHistoryTime && !item.isShowTime && !item.isShowMoreHistoryTime}}">
-             <text class="time"  wx:if="{{!item.isDeleted && !item.isRevoked}}">{{messageHistoryTime}} </text> 
+             <text class="time"  wx:if="{{!item.isDeleted && !item.isRevoked}}">{{item.messageTime}} </text> 
              </view>
          </view>
          <view class="time-pop-mask"   wx:if="{{item.isShowMoreHistoryTime}}">
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxss b/TUIKit/components/TUIChat/components/MessageList/index.wxss
index fb4e32a..2a14339 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageList/index.wxss
@@ -28,7 +28,7 @@
 .t-message-avatar {
   margin-left: 20rpx;
   margin-right: 12rpx;
-  border-radius: 10rpx;
+  border-radius: 50%;
   width: 80rpx;
   height: 80rpx;
 }
diff --git a/TUIKit/components/TUIChat/index.js b/TUIKit/components/TUIChat/index.js
index be3c58b..0e94119 100644
--- a/TUIKit/components/TUIChat/index.js
+++ b/TUIKit/components/TUIChat/index.js
@@ -76,9 +76,17 @@ Component({
       if (app?.globalData?.reportType === constant.OPERATING_ENVIRONMENT) {
         this.setData({
           showTips: true,
+          message_rounds: 0
         });
       }
       this.getNavbarHeight()
+      wx.onKeyboardHeightChange(res => {
+        console.log("键盘高度：", res.height)
+        this.setData({
+          keysboards_height: res.height
+        })
+        this.getNavbarHeight();
+      })
     },
     
     ready() {
@@ -131,13 +139,23 @@ Component({
     },
     navbar_height: 0,
     dialog_visible: false,
-    KeysBoardsStatus: "down"
+    KeysBoardsStatus: "down",
+    message_rounds: 0,
+    keysboards_height: 0
   },
 
   /**
    * 组件的方法列表
    */
   methods: {
+    refreshMessageRounds(e){
+      console.log("TUIchat refreshMessageRounds", e)
+      let message_rounds = e.detail.message_rounds
+      console.log("TUIchat refreshMessageRounds message_rounds：", message_rounds)
+      this.setData({
+        message_rounds: message_rounds
+      })
+    },
     getNavbarHeight(addHeight){
       let rect = null;
       if (wx.getMenuButtonBoundingClientRect) {
@@ -153,6 +171,11 @@ Component({
             if(addHeight){
               height = height + addHeight
             }
+            let keysboards_height =  this.data.keysboards_height
+            console.log("getNavbarHeight 键盘高度：", keysboards_height)
+            if(keysboards_height){
+              height = height + keysboards_height
+            }
             this.setData({
               navbar_height: height
             })
@@ -241,7 +264,12 @@ Component({
       this.selectComponent('#MessageList').sendMessageError(event);
     },
     triggerClose() {
-      this.selectComponent('#MessageInput').handleClose();
+      console.log("message-list triggerClose")
+      if(this.data.baseInfo.inquiry_status == 4){
+        this.selectComponent('#MessageInput').handleClose();
+      }
+      wx.hideKeyboard()
+      this.getNavbarHeight()
     },
     handleCall(event) {
       if (event.detail.conversationType === wx.$TUIKitTIM.TYPES.CONV_GROUP) {
@@ -274,6 +302,7 @@ Component({
     },
     myhandleExtensions(e){
       console.log("myhandleExtensionsmyhandleExtensions: ", e);
+      wx.hideKeyboard()
       let displayFlag = e.detail.displayFlag;
       setTimeout(() => {
         if(displayFlag){
@@ -288,25 +317,27 @@ Component({
           })
           this.getNavbarHeight();
         }
-        
-      }, 10);
+      }, 100);
     },
     // 监听键盘，获取焦点时将输入框推到键盘上方
     pullKeysBoards(event) {
       console.log("pullKeysBoardspullKeysBoards")
       setNewInputStyle(event.detail.event.detail.height);
+      
       this.getNavbarHeight();
       this.setData({
         'viewData.style': newInputStyle,
-        input_area_style: "position: absolute;  bottom: 45rpx;",
+        input_area_style: "position: absolute;  bottom: 52rpx;",
         KeysBoardsStatus: "pull"
       });
+      this.selectComponent('#MessageList').handleJumpNewMessage();
     },
     // 监听键盘，失去焦点时收起键盘
     downKeysBoards(event) {
       console.log("downKeysBoardsdownKeysBoards")
       console.log(event)
       let value = event.detail.event.detail.value;
+      this.getNavbarHeight();
       if(value){
         this.setData({
           'viewData.style': inputStyle,
diff --git a/TUIKit/components/TUIChat/index.wxml b/TUIKit/components/TUIChat/index.wxml
index 988ca9d..81ad79e 100644
--- a/TUIKit/components/TUIChat/index.wxml
+++ b/TUIKit/components/TUIChat/index.wxml
@@ -16,27 +16,30 @@
      <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 - 197rpx - 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 {{baseInfo.inquiry_status==4?'- 197rpx':'+ 20px'}} - 100rpx - {{navbar_height}}px);"><!-- 100vh -input-area高度 - info高度 -navbar高度  -->
     <!-- <view wx:if="{{showTips}}" class="safetytips-box"> -->
     <!-- <view class="safetytips">
       <text>【安全提示】本 APP 仅用于体验腾讯云即时通信 IM 产品功能，不可用于业务洽谈与拓展。请勿轻信汇款、中奖等涉及钱款等信息，勿轻易拨打陌生电话，谨防上当受骗。</text>
       <span class="report" bindtap="handleReport">点此投诉</span>
     </view> -->
   <!-- </view> -->
-    <!-- <scroll-view  class="message-list" bindtap="triggerClose"> -->
-    <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> -->
+    <scroll-view  class="message-list" bindtap="triggerClose">
+    <MessageList 
+    bind:getInquiryMessageBasic="getInquiryMessageBasic" 
+    bind:refreshMessageRounds="refreshMessageRounds" 
+    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}}">
+  <view class="input-area" style="{{input_area_style}}" wx:if="{{baseInfo.inquiry_status==4}}">
     <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>
+      bind:handleCall="handleCall" message_rounds="{{message_rounds}}"></MessageInput>
     </view>
   </view>
-  <view style="height: 40px;position: fixed;bottom: 0;width: 100%;background-color: #fff;z-index: 1;">
+  <view style="height: 40px;position: fixed;bottom: 0;width: 100%;background-color: #fff;z-index: 1;" wx:if="{{baseInfo.inquiry_status==4}}">
     
   </view>
 </view>
diff --git a/app.js b/app.js
index 44aa762..419f473 100644
--- a/app.js
+++ b/app.js
@@ -66,7 +66,7 @@ App({
     })
   },
   onShow(){
-    this.imInit();
+    // this.imInit();
   },
   imInit(){
 
@@ -87,6 +87,10 @@ App({
     if(!wx.$TUIKit){
       //获取im签名数据
       return api.getSignIM().then(response => {
+        let from = response.from
+        if(from != "cache"){
+          wx.setStorageSync(userID + '_imsign', {"sign":response.data,"date":new Date().getTime()})
+        }
         return response.data;
       }).then((userSig) => {
         console.log("userSig: ", userSig);
@@ -237,9 +241,9 @@ App({
   aegisInit() {
     wx.aegis = new Aegis({
       id: 'iHWefAYquFxvklBblC', // 项目key
-      reportApiSpeed: true, // 接口测速
-      reportAssetSpeed: true, // 静态资源测速
-      pagePerformance: true, // 开启页面测速
+      reportApiSpeed: false, // 接口测速
+      reportAssetSpeed: false, // 静态资源测速
+      pagePerformance: false, // 开启页面测速
     });
   },
   globalData: {
diff --git a/app.json b/app.json
index c7d88a9..fdf0412 100644
--- a/app.json
+++ b/app.json
@@ -48,13 +48,15 @@
     "Pages/login/index",
     "Pages/mobile_login/index",
     "Pages/yishi/manual_detail/index",
+    "Pages/yishi/agreement_detail/index",
     "Pages/yishi/addzhenduan/index",
     "Pages/yishi/wenzhen_v2/wenzhen",
     "Pages/webpage/index",
     "Pages/kickedout/index",
     "Pages/yishi/onlinesetupprice/index",
     "Pages/yishi/yizhensetupprice/index",
-    "Pages/yishi/wenzhenorderV2/index"
+    "Pages/yishi/wenzhenorderV2/index",
+    "Pages/yishi/wenzhen_v3/wenzhen"
   ],
   "window": {
     "navigationBarBackgroundColor": "#ffffff",
@@ -82,19 +84,19 @@
       },
       {
         "pagePath": "Pages/yishi/index/index",
-        "text": "首页(Y)",
+        "text": "首页",
         "iconPath": "/static/images/yishi/tabbar_icon/index.png",
         "selectedIconPath": "/static/images/yishi/tabbar_icon/index_select.png"
       },
       {
         "pagePath": "Pages/yishi/wenzhen_v2/wenzhen",
-        "text": "问诊(Z)",
+        "text": "问诊",
         "iconPath": "/static/images/yishi/tabbar_icon/wenzhen.png",
         "selectedIconPath": "/static/images/yishi/tabbar_icon/wenzhen_select.png"
       },
       {
         "pagePath": "Pages/yishi/my/index",
-        "text": "我的(Y)",
+        "text": "我的",
         "iconPath": "/static/images/yishi/tabbar_icon/my.png",
         "selectedIconPath": "/static/images/yishi/tabbar_icon/my_select.png"
       }
diff --git a/commpents/myprofile/index.js b/commpents/myprofile/index.js
index 8bf35c0..39c7331 100644
--- a/commpents/myprofile/index.js
+++ b/commpents/myprofile/index.js
@@ -46,24 +46,7 @@ Component({
     select_keshi_index: "",
     custom_keshi: "",
     zhicheng_note: "请选择职称",
-    zhicheng_columns: [
-      {
-        text: "执业医师",
-        value: 1
-      },
-      {
-        text: "主治医师",
-        value: 2
-      },
-      {
-        text: "副主任医师",
-        value: 3
-      },
-      {
-        text: "主任医师",
-        value: 4
-      }
-    ],
+    zhicheng_columns: [],
     select_zhicheng_id: "",
     select_zhicheng_index: "",
     select_yiyuan_index: "",
@@ -86,6 +69,7 @@ Component({
     doctorauthiden_data_ready: false,
     basicdepartment_data_ready: false,
     areaprovince_data_ready: false,
+    basicdoctortitle_data_ready: false,
     iden_auth_status: 0,
     iden_auth_disabled: 0,
     iden_auth_status_txt: "未认证",
@@ -140,7 +124,7 @@ Component({
         });
         let iden_auth_status = response.data.iden_auth_status;
         console.log("iden_auth_status: ",iden_auth_status)
-        let iden_auth_status_txt = iden_auth_status == 0?'请完善资料后提交':iden_auth_status == 1?'认证通过': iden_auth_status==2?'资料已提交，审核中':iden_auth_status==3?'认证失败':'未认证';
+        let iden_auth_status_txt = iden_auth_status == 0?'请完善资料后提交':iden_auth_status == 1?'认证通过': iden_auth_status==2?'资料已提交，审核中':iden_auth_status==3?'认证失败，修改后重新提交':'未认证';
 
         let iden_auth_disabled = iden_auth_status == 0?false:iden_auth_status == 1?true: iden_auth_status==2?true:iden_auth_status==3?false:true;
         console.log("iden_auth_disabled: ",iden_auth_disabled)
@@ -210,6 +194,16 @@ Component({
         })
       }).catch(errors => {console.error(errors); })
 
+      //加载职称列表
+      api.getBasicDoctorTitle().then(response => {
+        console.log(response);
+        const list = _this.formatZhiCheng(response);
+        _this.setData({
+          basicdoctortitle_data_ready: true,
+          zhicheng_columns: list
+        })
+      }).catch(errors => {console.error(errors); })
+
       //加载专长列表
       api.getDoctorExpertise().then(response => {
         console.log(response);
@@ -254,15 +248,18 @@ Component({
           }
           keshi_huixian = true;
         }
+
         //回显职称
-        if(_this.data.doctorauthiden_data_ready){
+        if(_this.data.doctorauthiden_data_ready && _this.data.basicdoctortitle_data_ready){
           let index = _this.data.zhicheng_columns.findIndex(item => {
             return item.value == _this.data.select_zhicheng_id
           })
-          _this.setData({
-            select_zhicheng_index: index,
-            zhicheng_note: _this.data.zhicheng_columns[index].text
-          })
+          if(index > -1){
+            _this.setData({
+              select_zhicheng_index: index,
+              zhicheng_note: _this.data.zhicheng_columns[index].text
+            })
+          }
           zhicheng_huixian = true;
         }
 
@@ -485,6 +482,16 @@ Component({
       });
       return list;
     },
+    formatZhiCheng(response){
+      let list = [];
+      response.data.forEach(item => {
+        let data = {};
+        data.text = item.doctor_title_name;
+        data.value = item.doctor_title_id;
+        list.push(data)
+      });
+      return list;
+    },
     formatZhuanChang(response){
       let list = [];
       response.data.forEach(item => {
diff --git a/commpents/myprofile/index.wxml b/commpents/myprofile/index.wxml
index 39d5a1e..643fbfc 100644
--- a/commpents/myprofile/index.wxml
+++ b/commpents/myprofile/index.wxml
@@ -5,7 +5,7 @@
             <view class="right">
               <view class="note">真人正脸</view>
               <t-avatar image="{{ avatar }}" />
-              <view class="icon">
+              <view class="icon" wx:if="{{ !(indentity && iden_auth_disabled) }}">
                 <t-icon name="chevron-right" size="48rpx" data-name="chevron-right" />
               </view>
             </view>
@@ -20,7 +20,7 @@
         </view>
 
         <!-- <t-cell title="头像" hover required arrow note="真人正脸" /> -->
-        <t-cell title="城市" hover required arrow note="{{ city_note }}" bindtap="{{(indentity && iden_auth_disabled)?'':'onCityShow'}}"/>
+        <t-cell title="城市" hover required arrow="{{ !(indentity && iden_auth_disabled) }}" note="{{ city_note }}" bindtap="{{(indentity && iden_auth_disabled)?'':'onCityShow'}}"/>
         
         <t-cascader
           visible="{{ city_show }}"
@@ -33,7 +33,7 @@
           bind:close="onCloseCity"
         ></t-cascader>
 
-        <t-cell title="医院" hover required arrow note="{{ yiyuan_note }}" bindtap="{{(indentity && iden_auth_disabled)?'':'onYiYuanShow'}}"/>
+        <t-cell title="医院" hover required arrow="{{ !(indentity && iden_auth_disabled) }}" note="{{ yiyuan_note }}" bindtap="{{(indentity && iden_auth_disabled)?'':'onYiYuanShow'}}"/>
         <van-popup
           show="{{ yiyuan_show }}"
           position="bottom"
@@ -63,7 +63,7 @@
         <van-empty description="暂无医院" wx:if="{{yiyuan_columns.length == 0}}"/>
 
         </van-popup>
-        <t-cell title="科室" hover required arrow note="{{keshi_note}}" 
+        <t-cell title="科室" hover required arrow="{{ !(indentity && iden_auth_disabled) }}" note="{{keshi_note}}" 
         bindtap="{{(indentity && iden_auth_disabled)?'':'onKeshiShow'}}" bordered="{{ select_keshi_id == '' }}"/>
 
         <view class="custom_keshi" wx:if="{{ select_keshi_id != ''}}">
@@ -219,7 +219,7 @@
           </view>
         </t-popup>
 
-        <t-cell title="职称" hover required arrow note="{{zhicheng_note}}"
+        <t-cell title="职称" hover required arrow="{{ !(indentity && iden_auth_disabled) }}" note="{{zhicheng_note}}"
         bindtap="{{(indentity && iden_auth_disabled)?'':'onZhiChengShow'}}" />
         <!-- <t-input 
         label="科室电话" 
@@ -262,7 +262,7 @@
           
           <view class="right">
             <view class="note">{{zhuanchang_note}}</view>
-            <view class="icon">
+            <view class="icon" wx:if="{{ !(indentity && iden_auth_disabled) }}">
               <t-icon name="chevron-right" size="48rpx" data-name="chevron-right" />
             </view>
           </view>
@@ -272,16 +272,19 @@
         textarea_cell_name="个人简介" 
         t_icon_name="view-module" 
         bind:showNote="onshowJianJieNote"
+        textarea_cell_note_show="{{!(indentity && iden_auth_disabled)}}"
         textarea_cell_content_placeholder="您目前就职医院与科室、社会兼职、所获荣誉、参与科研课题及发表论文等信息（10~1000字）" 
         textarea_val="{{textarea_jianjie}}"
         disabled="{{(indentity && iden_auth_disabled)}}"
         has_error_content="{{ brief_introduction_reason }}"
-        data-textarea_name="textarea_jianjie" bindTextAreaBlur="getTextAreaVal" />
+        data-textarea_name="textarea_jianjie" 
+        bindTextAreaBlur="getTextAreaVal" />
 
         <m-textarea-cell 
         textarea_cell_name="擅长领域" 
         t_icon_name="view-module" 
         bind:showNote="onshowShanChangNote"
+        textarea_cell_note_show="{{!(indentity && iden_auth_disabled)}}"
         disabled="{{(indentity && iden_auth_disabled)}}"
         textarea_val="{{textarea_shanchang}}"
         has_error_content="{{ be_good_at_reason }}"
@@ -297,6 +300,8 @@
         data-field_name="zhiye_file_list" 
         data-file_multiple="true"
         bind:showNote="onshowZhiYeNote"
+        upload_cell_note_show="{{!(indentity && iden_auth_disabled)}}"
+        deletable="{{!(indentity && iden_auth_disabled)}}"
         bindUploadFile="doUploadFile"
         bindDeleteFile="doDeleteFile"
         upload_cell_desc="请提供清晰的执业证书原件照片，照片需包含证书编号、加盖钢印的证书照片及姓名、执业范围、执业医院等信息，最少上传2张。" 
@@ -320,6 +325,8 @@
         bind:showNote="onshowZiGeNote"
         upload_cell_desc="请提供清晰的资格证书原件照片，照片需包含证书编号、加盖钢印的证书照片、姓名等信息，最少上传1张。" 
         upload_cell_note="查看示例"
+        upload_cell_note_show="{{!(indentity && iden_auth_disabled)}}"
+        deletable="{{!(indentity && iden_auth_disabled)}}"
         has_error_content="{{ qualification_cert_reason }}"
         wx:if="{{indentity}}"
         disabled="{{(indentity && iden_auth_disabled)}}"
@@ -339,6 +346,8 @@
         bindDeleteFile="doDeleteFile"
         upload_cell_desc="请提供清晰的职称证书原件照片，照片需包含编号、加盖钢印的证书照片、姓名及职称等信息，最少上传1张。" 
         upload_cell_note="查看示例"
+        upload_cell_note_show="{{!(indentity && iden_auth_disabled)}}"
+        deletable="{{!(indentity && iden_auth_disabled)}}"
         has_error_content="{{ work_cert_reason }}"
         wx:if="{{indentity}}"
         disabled="{{(indentity && iden_auth_disabled)}}"
diff --git a/commpents/myprofile/index.wxss b/commpents/myprofile/index.wxss
index b3d7c84..90d9957 100644
--- a/commpents/myprofile/index.wxss
+++ b/commpents/myprofile/index.wxss
@@ -228,4 +228,39 @@
 }
 .jianjie_popup{
   margin: 100rpx 20rpx;
+}
+.has_error{
+  margin-left: 32rpx;
+  padding-bottom: 20rpx;
+  border-bottom: 1rpx solid #e7e7e7;
+}
+.error_box{
+  position: relative;
+  display: flex;
+  background-color: #FEF1F1;
+  width: calc(95vw - 64rpx);
+  height: 100rpx;
+  margin: 30rpx auto 0 auto;
+  align-items: center;
+  padding-left: 32rpx;
+  border-radius: 10rpx;
+}
+.error_box::after{
+  border-radius: 5rpx;
+  position: absolute;
+  width: 0px;
+  height: 0px;
+  border-width: 16rpx;
+  border-style: solid;
+  border-color: transparent transparent #FEF1F1 transparent;
+  content: ' ';
+  left: 50rpx;
+  top: -30rpx;
+}
+.error_msg{
+  position: relative;
+  margin-left: 10rpx;
+  color: #FF0000;
+  letter-spacing: 3rpx;
+  font-weight: 600;
 }
\ No newline at end of file
diff --git a/commpents/textarea-cell/index.js b/commpents/textarea-cell/index.js
index da8a4b6..1511ee4 100644
--- a/commpents/textarea-cell/index.js
+++ b/commpents/textarea-cell/index.js
@@ -20,6 +20,10 @@ Component({
       type: String,
       value: '查看示例',
     },
+    textarea_cell_note_show:{
+      type: Boolean,
+      value: true,
+    },
     textarea_cell_content_placeholder: {
       type: String,
       value: '请输入文字',
diff --git a/commpents/textarea-cell/index.wxml b/commpents/textarea-cell/index.wxml
index f767d84..c87eefd 100644
--- a/commpents/textarea-cell/index.wxml
+++ b/commpents/textarea-cell/index.wxml
@@ -1,7 +1,7 @@
 <view class="textarea-cell">
   <view class="textarea-cell-top">
     <view class="textarea-cell-name">{{ textarea_cell_name }}<text wx:if="{{ required }}" class="required"> *</text></view>
-    <view class="textarea-cell-note t-cell__note" bindtap="onshowNote">
+    <view class="textarea-cell-note t-cell__note" bindtap="onshowNote" wx:if="{{textarea_cell_note_show}}">
       <view><t-icon name="{{ t_icon_name }}" size="{{ t_icon_size}}" data-name="{{ t_icon_name }}" /></view>
       <text style="font-size: 28rpx;">{{ textarea_cell_note }}</text>
     </view>
diff --git a/commpents/upload-cell/index.js b/commpents/upload-cell/index.js
index bc98b18..d676116 100644
--- a/commpents/upload-cell/index.js
+++ b/commpents/upload-cell/index.js
@@ -20,6 +20,14 @@ Component({
       type: String,
       value: '示例备注',
     },
+    upload_cell_note_show:{
+      type: Boolean,
+      value: true,
+    },
+    deletable:{
+      type: Boolean,
+      value: true,
+    },
     upload_cell_desc: {
       type: String,
       value: '示例描述',
diff --git a/commpents/upload-cell/index.wxml b/commpents/upload-cell/index.wxml
index 85f4a78..4bfcda3 100644
--- a/commpents/upload-cell/index.wxml
+++ b/commpents/upload-cell/index.wxml
@@ -1,7 +1,7 @@
 <view class="upload-cell">
   <view class="upload-cell-top">
     <view class="upload-cell-name">{{ upload_cell_name }}<text wx:if="{{ required }}" class="required"> *</text></view>
-    <view class="upload-cell-note t-cell__note" bindtap="onshowNote" wx:if="{{upload_cell_note != ''}}">
+    <view class="upload-cell-note t-cell__note" bindtap="onshowNote" wx:if="{{upload_cell_note_show}}">
       <view><t-icon name="{{ t_icon_name }}" size="{{ t_icon_size}}" data-name="{{ t_icon_name }}" /></view>
       <text style="font-size: 28rpx;">{{ upload_cell_note }}</text>
     </view>
@@ -10,12 +10,12 @@
     <text>{{ upload_cell_desc }}</text>
   </view>
   <view class="upload-cell-input">
-    <van-uploader disabled="{{disabled}}" multiple="{{is_multiple}}" preview-full-image="{{false}}" file-list="{{ fileList }}" max-count="{{max_count}}" deletable="{{ true }}" bind:after-read="afterRead" bind:delete="delete" >
+    <van-uploader disabled="{{disabled}}" multiple="{{is_multiple}}" preview-full-image="{{true}}" file-list="{{ fileList }}" max-count="{{max_count}}" deletable="{{ deletable }}" bind:after-read="afterRead" bind:delete="delete" >
       <van-image width="100" height="100" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/upload_button.png" />
     </van-uploader>
   </view>
   <view class="error_box" wx:if="{{ has_error_content != '' }}" >
-    <t-icon color="red" name="close-circle-filled" size="48rpx" data-name="close-circle-filled" />
+    <t-icon color="red" name="close-circle-filled" size="48rpx" data-name="close-circle-filled" />  
     <text class="error_msg">{{ has_error_content }}</text>
   </view>
 </view>
\ No newline at end of file
diff --git a/miniprogram_npm/@vant/weapp/tabs/index.js b/miniprogram_npm/@vant/weapp/tabs/index.js
index e16ace9..e30d6a8 100644
--- a/miniprogram_npm/@vant/weapp/tabs/index.js
+++ b/miniprogram_npm/@vant/weapp/tabs/index.js
@@ -80,7 +80,7 @@ var relation_1 = require("../common/relation");
         },
         swipeThreshold: {
             type: Number,
-            value: 5,
+            value: 4,
             observer: function (value) {
                 this.setData({
                     scrollable: this.children.length > value || !this.data.ellipsis,
diff --git a/utils/network/api.js b/utils/network/api.js
index abcb222..ddd68b4 100644
--- a/utils/network/api.js
+++ b/utils/network/api.js
@@ -21,8 +21,7 @@ class API extends HTTP {
       method: 'GET',
       data: {
         ...params
-      },
-      showLoading: false
+      }
     })
   }
   //获取城市信息
@@ -32,8 +31,7 @@ class API extends HTTP {
       method: 'GET',
       data: {
         ...params
-      },
-      showLoading: false
+      }
     })
   }
   //获取区县信息
@@ -43,8 +41,7 @@ class API extends HTTP {
       method: 'GET',
       data: {
         ...params
-      },
-      showLoading: false
+      }
     })
   }
   //获取医院数据
@@ -54,8 +51,7 @@ class API extends HTTP {
       method: 'GET',
       data: {
         ...params
-      },
-      showLoading: false
+      }
     })
   }
   //获取自定义科室数据
@@ -65,8 +61,7 @@ class API extends HTTP {
       method: 'GET',
       data: {
         ...params
-      },
-      showLoading: false
+      }
     })
   }
   //获取医生专长列表
@@ -76,8 +71,7 @@ class API extends HTTP {
       method: 'GET',
       data: {
         ...params
-      },
-      showLoading: false
+      }
     })
   }
   //使用微信手机号登陆
@@ -542,6 +536,24 @@ class API extends HTTP {
 }
  //获取im签名数据
  getSignIM(params) {
+  let usertype = wx.getStorageSync('usertype');
+  let userID = wx.getStorageSync('user_id_'+usertype);
+  let imsign = wx.getStorageSync(userID + '_imsign');
+  console.log("缓存中的imsign:", imsign)
+
+  if(imsign){
+    const date = imsign.date;
+    var minute = 1000 * 60;
+    var hour = minute *60;
+    var day = hour *24;
+    if(new Date().getTime() - date < day){
+      console.log("小于一天从缓存中获取imsign")
+      return new Promise((resolve, reject) => {
+        resolve({"data": imsign.sign,"from":"cache"})
+      })
+    }
+  }
+
   return this.request({
     url: `${this.baseUrl}/sign/im`,
     method: 'GET',
@@ -550,6 +562,7 @@ class API extends HTTP {
     }
   })
 }
+
  //药师基本资料
  getPharmacistInfo(params) {
   return this.request({
@@ -729,6 +742,51 @@ class API extends HTTP {
   return this.request({
     url: `${this.baseUrl}/doctor/inquiry/finish/message`,
     method: 'GET',
+    data: {
+      ...params
+    },
+    showLoading: false
+  })
+}
+ //获取协议内容
+ getBasicAgreement(params) {
+  let agreement_id = params.agreement_id;
+  params = {}
+  return this.request({
+    url: `${this.baseUrl}/basic/agreement/`+agreement_id,
+    method: 'GET',
+    data: {
+      ...params
+    }
+  })
+}
+ //获取弹窗
+ getPopup(params) {
+  let agreement_id = params.agreement_id;
+  params = {}
+  return this.request({
+    url: `${this.baseUrl}/popup`,
+    method: 'GET',
+    data: {
+      ...params
+    }
+  })
+}
+ //检测是否可以开具处方
+ getDoctorPrescriptionCheck(params) {
+  return this.request({
+    url: `${this.baseUrl}/doctor/prescription/check`,
+    method: 'GET',
+    data: {
+      ...params
+    }
+  })
+}
+ //获取医生职称数据
+ getBasicDoctorTitle(params) {
+  return this.request({
+    url: `${this.baseUrl}/basic/doctor/title`,
+    method: 'GET',
     data: {
       ...params
     }
diff --git a/utils/util.js b/utils/util.js
index 498c265..43b4709 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -73,11 +73,11 @@ const getTimeAgo = stringTime =>{
   if(time < 0){
     return '刚刚';
   }else if(time/month >= 1){
-    result = formatChatTime(new Date(time2));
+    result = (new Date(time2)).Format("yyyy-MM-dd hh:mm:ss");
   }else if(time/week >= 1){
-    result = formatChatTime(new Date(time2));
+    result = (new Date(time2)).Format("MM-dd hh:mm:ss");
   }else if(time/day >= 1){
-    result = formatChatTime(new Date(time2));
+    result = (new Date(time2)).Format("MM-dd hh:mm");
   }else if(time/hour >= 1){
     result = parseInt(time/hour) + "小时前";
   }else if(time/minute >= 1){
@@ -89,34 +89,64 @@ const getTimeAgo = stringTime =>{
 }
 
 const getTimeAgoChat = stringTime =>{
+  console.log("stringTime: ", stringTime)
   var minute = 1000 * 60;
   var hour = minute *60;
   var day = hour *24;
   var week = day * 7;
   var month = day * 30;
   var time1 = new Date().getTime();//当前的时间戳
-  var time2 = stringTime*1000;//指定时间的时间戳
+  var time2 = stringTime;//指定时间的时间戳
   var time = time1 - time2;
   var result = null;
   if(time < 0){
     return '刚刚';
   }else if(time/month >= 1){
-    result = formatChatTime(new Date(time2));
+    result = (new Date(time2)).Format("yyyy-MM-dd hh:mm:ss");
   }else if(time/week >= 1){
-    result = formatChatTime(new Date(time2));
+    result = (new Date(time2)).Format("MM-dd hh:mm:ss");
   }else if(time/day >= 1){
-    result = formatChatTime(new Date(time2));
-  }else if(time/day == 1){
-    result = new Date(time2).Format("MM-dd hh:mm");
+    result = (new Date(time2)).Format("MM-dd hh:mm");
   }else if(time/hour >= 1){
-    result = new Date(time2).Format("hh:mm");
+    result = parseInt(time/hour) + "小时前";
   }else if(time/minute >= 1){
-    result = new Date(time2).Format("hh:mm");
+    result = parseInt(time/minute) + "分钟前";
   }else {
     result = "刚刚";
   }
   return result;
 }
+
+//仿微信时间显示
+const likeWeChatTimeAgoChat = stringTime =>{
+  console.log("stringTime: ", stringTime)
+  var minute = 1000 * 60;
+  var hour = minute *60;
+  var day = hour *24;
+  var week = day * 7;
+  var month = day * 30;
+  var time1 = new Date().getTime();//当前的时间戳
+  var time2 = stringTime;//指定时间的时间戳
+  var time = time1 - time2;
+  var result = null;
+  if(time < 0){
+    return '刚刚';
+  }else if(time/month >= 1){
+    result = (new Date(time2)).Format("yyyy-MM-dd hh:mm:ss");
+  }else if(time/week >= 1){
+    result = (new Date(time2)).Format("MM-dd hh:mm:ss");
+  }else if(time/day >= 1){
+    result = (new Date(time2)).Format("MM-dd hh:mm");
+  }else if(time/hour >= 1){
+    result = parseInt(time/hour) + "小时前";
+  }else if(time/minute >= 1){
+    result = parseInt(time/minute) + "分钟前";
+  }else {
+    result = "刚刚";
+  }
+  return result;
+}
+
 // px 转换为 rpx ，传参类型是数字（Number）
 const rpxTopx = px => {
   let deviceWidth = wx.getSystemInfoSync().windowWidth; //获取设备屏幕宽度
@@ -130,5 +160,6 @@ module.exports = {
   formatNumber,
   getTimeAgo,
   rpxTopx,
-  getTimeAgoChat
+  getTimeAgoChat,
+  likeWeChatTimeAgoChat
 }
diff --git a/utils/wechatTime.js b/utils/wechatTime.js
new file mode 100644
index 0000000..089b66d
--- /dev/null
+++ b/utils/wechatTime.js
@@ -0,0 +1,121 @@
+// 星期格式转换 0-6：周日到周六
+function weekFormat(e, prefix = "周") {
+  switch (e) {
+      case 0:
+          return prefix + "日"
+          break;
+      case 1:
+          return prefix + "一"
+          break;
+      case 2:
+          return prefix + "二"
+          break;
+      case 3:
+          return prefix + "三"
+          break;
+      case 4:
+          return prefix + "四"
+          break;
+      case 5:
+          return prefix + "五"
+          break;
+      case 6:
+          return prefix + "六"
+          break;
+      default:
+          return ""
+          break;
+  }
+}
+// 转换今日的时辰格式
+function todayTimeFormat(e) {
+  if (e >= 0 && e < 7) {
+      return "凌晨"
+  } else if (e >= 7 && e < 11) {
+      return "上午"
+  } else if (e >= 11 && e < 13) {
+      return "中午"
+  } else if (e >= 13 && e < 18) {
+      return "下午"
+  } else if (e >= 18 && e < 24) {
+      return "晚上"
+  } else {
+      return ""
+  }
+}
+
+// 是否显示周几
+function isShowWeekDay(sub, weekDay) {
+  const currentWeekDay = new Date().getDay()
+  const dayTime = 1000 * 60 * 60 * 24
+  // 1.当前时间与消息时间相差必须大于2天小于7天
+  // 2.当前时间距离本周一相差必须大于2天且小于当前距离周一的天数
+  // 3.消息时间不可能是0-周日，因为周日没有给后面时间留空间，不会走这里的逻辑，而是走今天的逻辑
+  if (sub >= dayTime * 2 && weekDay !== 0 && sub <= dayTime * currentWeekDay) {
+      return true
+  } else {
+      return false
+  }
+}
+
+
+// 仿微信时间显示格式转换 @time 时间戳毫秒
+function wechatTimeFormat(time) {
+  const today = new Date().getTime()
+  // 当前时间减去获取到的时间
+  const sub = today - time
+  const day = 1000 * 60 * 60 * 24
+  const timeDate = new Date(time)
+  const currentYear = new Date().getFullYear()
+  const getYear = new Date(time).getFullYear()
+  const HHmm = `${formatTime2("hh", timeDate)}:${formatTime2("mm", timeDate)}`
+  const showWeekDay = isShowWeekDay(sub, timeDate.getDay())
+  const currentDay = new Date().getDate()
+  const getDay = new Date(time).getDate()
+  const subDay = currentDay - getDay
+  if (currentYear > getYear) {
+      return `${formatTime2("yyyy-MM-dd", timeDate)} ${formatTime2("hh:mm", timeDate)}`
+      // 上午下午
+      return `${formatTime2("yyyy年MM月dd日", timeDate)} ${todayTimeFormat(timeDate.getHours())} ${formatTime2("hh:mm", timeDate)}`
+  } else if (showWeekDay) {
+      return `${weekFormat(timeDate.getDay())} ${HHmm}`
+      //} else if (sub > day && sub < day * 2) {
+  } else if (subDay === 1) {
+      return `昨天 ${HHmm}`
+  } else if (sub <= day) {
+      return HHmm
+  } else {
+      return `${formatTime2("MM-dd", timeDate)} ${formatTime2("hh:mm", timeDate)}`
+      // 上午下午
+      return `${formatTime2("MM月dd日", timeDate)} ${todayTimeFormat(timeDate.getHours())} ${formatTime2("hh:mm", timeDate)}`
+  }
+}
+
+function formatTime2(fmt, timestamp) {
+  var date = new Date(timestamp) // 兼容safari
+  var o = {
+      'M+': date.getMonth() + 1,
+      'd+': date.getDate(),
+      'h+': date.getHours(),
+      'm+': date.getMinutes(),
+      's+': date.getSeconds(),
+      'q+': Math.floor((date.getMonth() + 3) / 3),
+      'S': date.getMilliseconds()
+  }
+  if (/(y+)/.test(fmt)) {
+      fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
+  }
+  for (var k in o) {
+      if (new RegExp('(' + k + ')').test(fmt)) {
+          fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
+      }
+  }
+  return fmt
+}
+
+module.exports = {
+  weekFormat,
+  todayTimeFormat,
+  isShowWeekDay,
+  wechatTimeFormat
+}

From 7b9b80be8d56d7088ee7daeddea2f56b6a008213 Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Sat, 6 May 2023 10:18:46 +0800
Subject: [PATCH 26/83] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/chat/index.js                     |  18 ++--
 Pages/yishi/index/index.js                    |  40 +++----
 Pages/yishi/onlinechufang/index.js            |   3 +-
 Pages/yishi/onlinechufang/index.wxml          |   6 +-
 Pages/yishi/practicing/index.js               |  24 ++++-
 Pages/yishi/practicing/index.json             |   3 +-
 Pages/yishi/practicing/index.wxml             |  13 ++-
 Pages/yishi/wenzhen_v2/wenzhen.js             |  63 +++++------
 .../MessageElements/TextMessage/index.js      |   1 -
 .../TUIChat/components/MessageInput/index.js  | 101 +++++++++++++++---
 .../TUIChat/components/MessageList/index.js   |  82 ++++++++------
 .../TUIChat/components/MessageList/index.json |   3 +-
 .../TUIChat/components/MessageList/index.wxml |  15 ++-
 .../TUIChat/components/MessageList/index.wxss |   7 ++
 TUIKit/components/TUIChat/index.js            |  36 ++++---
 TUIKit/components/TUIChat/index.wxml          |   1 +
 TUIKit/lib/tim-wx-sdk.2.27.0.js               |   1 +
 app.js                                        |  65 ++++++-----
 18 files changed, 318 insertions(+), 164 deletions(-)
 create mode 100644 TUIKit/lib/tim-wx-sdk.2.27.0.js

diff --git a/Pages/yishi/chat/index.js b/Pages/yishi/chat/index.js
index abdf7db..ff4240e 100644
--- a/Pages/yishi/chat/index.js
+++ b/Pages/yishi/chat/index.js
@@ -9,7 +9,7 @@ Page({
     baseInfo: {}
   },
   onLoad(option) {
-    console.log("chat onload", option);
+    // console.log("chat onload", option);
     let order_inquiry_id = option.order_inquiry_id;
     this.setData({
       order_inquiry_id: order_inquiry_id,
@@ -17,22 +17,22 @@ Page({
     this.getInquiryMessageBasic();
   },
   onUnload() {
-    console.log("chat onUnload");
+    // console.log("chat onUnload");
   },
   onShow(){
-    console.log("chat onShow");
-    console.log("app.globalData.scene from chat: ", app.globalData.scene);
+    // console.log("chat onShow");
+    // console.log("app.globalData.scene from chat: ", app.globalData.scene);
   },
   $onMessageReceived(value) {
     const message = value.data[0];
-    console.log("message from chat: ",message)
+    // console.log("message from chat: ",message)
   },
   initChat(){
     let _this = this;
     let count = 0;
     let interval = setInterval(() => {
-      console.log("chat init count: ", count);
-      console.log("app.globalData.chat_sdk_ready: ", app.globalData.chat_sdk_ready);
+      // console.log("chat init count: ", count);
+      // console.log("app.globalData.chat_sdk_ready: ", app.globalData.chat_sdk_ready);
       if(app.globalData.chat_sdk_ready){
         const TUIChat = _this.selectComponent('#TUIChat');
         TUIChat.init();
@@ -48,9 +48,9 @@ Page({
   },
   //获取问诊订单消息内页基础数据
   getInquiryMessageBasic() {
-    console.log("order_inquiry_id: ", this.data.order_inquiry_id);
+    // console.log("order_inquiry_id: ", this.data.order_inquiry_id);
     api.getInquiryMessageBasic({order_inquiry_id: this.data.order_inquiry_id}).then(response => {
-      console.log(response);
+      // console.log(response);
       this.setData({
         baseInfo: response.data
       })
diff --git a/Pages/yishi/index/index.js b/Pages/yishi/index/index.js
index 9795a64..fdf9afa 100644
--- a/Pages/yishi/index/index.js
+++ b/Pages/yishi/index/index.js
@@ -110,8 +110,8 @@ Page({
     let top = 0;
 
     top = wx.getMenuButtonBoundingClientRect().top - stateHeight; //  获取top值
-    console.log('navHeight', navHeight);
-    console.log('top', top);
+    // console.log('navHeight', navHeight);
+    // console.log('top', top);
  
     this.setData({
       // navHeight: navHeight + top * 2, //  导航栏高度
@@ -120,10 +120,10 @@ Page({
     });
   },
   getFunboxHeight(){
-    console.log("109: ", rpxTopx(109))
-    console.log("113: ", rpxTopx(113))
+    // console.log("109: ", rpxTopx(109))
+    // console.log("113: ", rpxTopx(113))
     const { statusBarHeight } = wx.getSystemInfoSync();
-    console.log("statusBarHeight: ", rpxTopx(statusBarHeight));
+    // console.log("statusBarHeight: ", rpxTopx(statusBarHeight));
     let funbox_height = wx.getSystemInfoSync().windowHeight - (this.data.stateHeight + this.data.navHeight + 10) - 55;//减去底部空白
     funbox_height = rpxTopx(funbox_height);
     // 147 userinfo的高度
@@ -174,26 +174,26 @@ Page({
     })
   },
   cancelContactDialog(){
-    console.log("cancelContactDialogcancelContactDialogcancelContactDialog");
+    // console.log("cancelContactDialogcancelContactDialogcancelContactDialog");
     this.setData({
       contactKeFu: false
     })
   },
   onPullDownRefresh(){
-    console.log("用户下拉动作")
+    // console.log("用户下拉动作")
     this.onShow();
   },
   onLoad(){
     
   },
   onUnload(){
-    console.log("index onUnload() onUnload() ");
+    // console.log("index onUnload() onUnload() ");
     this.setData({
       swiperList: []
     })
   },
   onHide(){
-    console.log("index onHide() onHide() ");
+    // console.log("index onHide() onHide() ");
 
     wx.offCopyUrl(this.Copylistener) // 需传入与监听时同一个的函数对象
 
@@ -233,7 +233,7 @@ Page({
     this.getMenuButtonBound();
     
     api.yiShiIndex().then(response => {
-      console.log(response);
+      // console.log(response);
       let avatar = response.data.info.avatar;
       this.setData({
         "info.user_name": response.data.info.user_name,
@@ -323,7 +323,7 @@ Page({
   },
   onTapAD(e) {
     let item = e.currentTarget.dataset.item;
-    console.log(item);
+    // console.log(item);
     let open_with = item.open_with;
     let banner_link = item.banner_link;
     if(open_with == 1){//小程序页面
@@ -338,10 +338,10 @@ Page({
   },
   go(e){
     let checkDialog = this.checkDialog(e);
-    console.log("checkDialog: ", checkDialog);
+    // console.log("checkDialog: ", checkDialog);
     if(checkDialog){
       let url = e.currentTarget.dataset.url;
-      console.log(url);
+      // console.log(url);
       if(url.indexOf("wenzhen") > -1){
         wx.switchTab({
           url: url,
@@ -381,9 +381,9 @@ Page({
     app.go(e.currentTarget.dataset.url);
   },
   confirmDialog(e){
-    console.log(e)
+    // console.log(e)
     let url = e.currentTarget.dataset.url;
-    console.log("confirmDialog: ", url)
+    // console.log("confirmDialog: ", url)
     this.setData({
       dialog_visible: false
     })
@@ -637,11 +637,11 @@ Page({
 
     let checkDialog = this.checkDialog(e);
     if(checkDialog){
-      console.log("concatKeFu");
+      // console.log("concatKeFu");
       wx.requestSubscribeMessage({
         tmplIds: ['JMPmlYGh1HcUSuEfJCVQUIsZv4H5ar3QvXZfrNYNFuc'],
         success (res) {
-          console.log(res);
+          // console.log(res);
           _this.setData({
             contactKeFu: true
           })
@@ -700,15 +700,15 @@ Page({
       let now_case = this.data.mycase.find(item => {
         return item.case_status == status;
       });
-      console.log("now_case: ", now_case);
+      // console.log("now_case: ", now_case);
       //所属模块
       let moudle = e.currentTarget.dataset.moudle;
-      console.log("moudle: ", moudle);
+      // console.log("moudle: ", moudle);
       if(now_case){
         let now_moudle = now_case.case_module.find(item => {
           return item == moudle;
         })
-        console.log("now_moudle: ", now_moudle);
+        // console.log("now_moudle: ", now_moudle);
         if(now_moudle != undefined){
           this.setData({
             dialog_content: now_case.case_text,
diff --git a/Pages/yishi/onlinechufang/index.js b/Pages/yishi/onlinechufang/index.js
index 66bb072..5a341ad 100644
--- a/Pages/yishi/onlinechufang/index.js
+++ b/Pages/yishi/onlinechufang/index.js
@@ -481,8 +481,9 @@ Page({
       console.log(response);
       this.setData({
         doctor_advice: response.data.prescription.doctor_advice,
+        pharmacist_audit_status: response.data.prescription.pharmacist_audit_status,
         zhenduan_list: response.data.prescription_icd,
-        drugs_box_item_list: response.data.prescription_product,
+        drugs_box_item_list: response.data.prescription_product
       })
     }).catch(errors => {console.error(errors);})
   }
diff --git a/Pages/yishi/onlinechufang/index.wxml b/Pages/yishi/onlinechufang/index.wxml
index 571d812..0a9c015 100644
--- a/Pages/yishi/onlinechufang/index.wxml
+++ b/Pages/yishi/onlinechufang/index.wxml
@@ -63,12 +63,16 @@
   <form bindsubmit="{{ order_prescription_id == ''?'postDoctorPrescription':'putDoctorPrescription' }}">
     <view class="txt_title">医嘱</view>
     <view class="doctors_advice" bindtap="onDoctorsAdviceFocus">
-      <textarea auto-height focus="{{doctors_advice_focus}}" maxlength="1000" bindblur="getAdvice" style="width: 100%;" placeholder-style="font-size:24rpx; color:#999" placeholder="请输入医嘱（5-200字）" name="doctors_advice" value="{{doctor_advice}}"></textarea>
+      <textarea disabled="{{from == 'chat'}}" auto-height focus="{{doctors_advice_focus}}" maxlength="1000" bindblur="getAdvice" style="width: 100%;" placeholder-style="font-size:24rpx; color:#999" placeholder="请输入医嘱（5-200字）" name="doctors_advice" value="{{doctor_advice}}"></textarea>
     </view>
     <!-- 从聊天页面过来的不显示按钮 -->
     <view class="sub_btn" wx:if="{{from != 'chat'}}">
       <van-button disabled="{{sub_disabled}}" form-type="submit" color="#3CC7C0; font-size:30rpx; border-radius: 10rpx;" type="primary" block>{{ order_prescription_id == ''?'提交审核':'重开处方' }}</van-button>
     </view>
+    <!-- 0:审核中 1:审核成功 2:审核驳回 -->
+    <view class="sub_btn" wx:if="{{from == 'chat'}}">
+      <van-button disabled color="#3CC7C0; font-size:30rpx; border-radius: 10rpx;" type="primary" block>{{ pharmacist_audit_status == 0?'审核中':pharmacist_audit_status==1?'审核成功':pharmacist_audit_status==2?'审核驳回':'审核中' }}</van-button>
+    </view>
 
   </form>
 
diff --git a/Pages/yishi/practicing/index.js b/Pages/yishi/practicing/index.js
index ba8a0ba..7604a9a 100644
--- a/Pages/yishi/practicing/index.js
+++ b/Pages/yishi/practicing/index.js
@@ -11,10 +11,10 @@ Page({
     height: app.globalData.height, 
     license_cert: [],
     qualification_cert: [],
-    work_cert: []
+    work_cert: [],
+    license_cert_visible: false
   },
   onLoad(){
-    
     api.getDoctorCret().then(response => {
       console.log(response);
       this.setData({
@@ -23,7 +23,21 @@ Page({
         work_cert: response.data.work_cert,
       })
     }).catch(errors => {console.error(errors);})
-  }
-
-  
+  },
+  show_license_cert(){
+    console.log("show_license_cert")
+    this.setData({
+      license_cert_visible: true
+    })
+  },
+  close_license_cert(e) {
+    const {
+      detail: { trigger },
+    } = e;
+    console.log("trigger: ", trigger);
+    console.log("close_license_cert")
+    this.setData({
+      license_cert_visible: false,
+    });
+  },
 })
\ No newline at end of file
diff --git a/Pages/yishi/practicing/index.json b/Pages/yishi/practicing/index.json
index ee34b87..8eeb365 100644
--- a/Pages/yishi/practicing/index.json
+++ b/Pages/yishi/practicing/index.json
@@ -2,6 +2,7 @@
   "component": true,
   "usingComponents": {
     "te-nav-bar": "/commpents/te_navbar",
-    "t-image": "tdesign-miniprogram/image/image"
+    "t-image": "tdesign-miniprogram/image/image",
+    "t-image-viewer": "tdesign-miniprogram/image-viewer/image-viewer"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/practicing/index.wxml b/Pages/yishi/practicing/index.wxml
index 570cc6c..0babe0c 100644
--- a/Pages/yishi/practicing/index.wxml
+++ b/Pages/yishi/practicing/index.wxml
@@ -11,7 +11,8 @@
           mode="heightFix" 
           style="margin: 0 50rpx 0 20rpx;" 
           width="220rpx" height="220rpx" 
-          aria-label="img" wx:for="{{license_cert}}" />
+          aria-label="img" wx:for="{{license_cert}}"
+          bindtap="show_license_cert" />
       </view>
     </view>
     <view class="imgbox_item">
@@ -40,4 +41,14 @@
       </view>
     </view>
   </view>
+
+  <!-- <t-image-viewer
+        deleteBtn="{{false}}"
+        close-btn="{{true}}"
+        show-index="{{true}}"
+        visible="{{license_cert_visible}}"
+        images="{{license_cert}}"
+        bind:close="close_license_cert"
+      ></t-image-viewer> -->
+      
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index bdbf521..55e19b1 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -38,22 +38,22 @@ Page({
     dot_4: false,
   },
   onLoad() {
-    console.log("wenzhen onloadddd");
+    // console.log("wenzhen onloadddd");
 
     // if(wx.$TUIKit){
     //   wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
     // }else{
     //   app.imInit().then(res => {
-    //     console.log("wenzhen onload imInit");
+    //     // console.log("wenzhen onload imInit");
     //     wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
     //   });
     // }
 
     //监听网络状态变化事件
     wx.onNetworkStatusChange(function (res) {
-      console.log("onNetworkStatusChange from wenzhen: ")
-      console.log(res.isConnected)
-      console.log(res.networkType)
+      // console.log("onNetworkStatusChange from wenzhen: ")
+      // console.log(res.isConnected)
+      // console.log(res.networkType)
       wx.showToast({
         title: '网络类型'+res.networkType,
       })
@@ -89,10 +89,10 @@ Page({
     this.setData({
       unreadnnum_inter: unreadnnum_inter
     })
-    console.log("app.globalData.unreadnnum_inter: ", app.globalData.unreadnnum_inter);
+    // console.log("app.globalData.unreadnnum_inter: ", app.globalData.unreadnnum_inter);
   },
   onShow: function () {
-    console.log("onShow from wenzhen V2")
+    // console.log("onShow from wenzhen V2")
     if(this.data.hasOnShow){
       wx.stopPullDownRefresh()
       return;
@@ -120,13 +120,13 @@ Page({
       wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
     }else{
       app.imInit().then(res => {
-        console.log("wenzhen onload imInit");
+        // console.log("wenzhen onload imInit");
         wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
       });
     }
   },
   onHide(){
-    console.log("onHideonHide from wenzhen")
+    // console.log("onHideonHide from wenzhen")
     if (typeof this.getTabBar === 'function' && this.getTabBar()) {
       this.getTabBar().stopInterval()
     }
@@ -154,7 +154,7 @@ Page({
     wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived);
   },
   onUnload(){
-    console.log("onUnload from wenzhen")
+    // console.log("onUnload from wenzhen")
     this.setData({
       hasOnShow: false,
       message_inquiry_type: 9999,
@@ -162,19 +162,19 @@ Page({
     })
   },
   getConversationList(){
-    console.log("getConversationListgetConversationListgetConversationList");
+    // console.log("getConversationListgetConversationListgetConversationList");
     app.imInit().then(res => {
-      console.log("wenzhen onload imInit: ", res);
+      // console.log("wenzhen onload imInit: ", res);
       wx.$TUIKit.getConversationList().then((imResponse) => {
-        console.log("imResponse.data.conversationList from wenzhen_v2: ", imResponse.data.conversationList);
+        // console.log("imResponse.data.conversationList from wenzhen_v2: ", imResponse.data.conversationList);
         this.setData({
           conversationList: imResponse.data.conversationList,
         });
       }).then(() => {
-        console.log("开始查询订单状态")
+        // console.log("开始查询订单状态")
         this.formatStatus();
       }).catch(error => {
-        console.log(error)
+        console.error(error)
       });
     });
   },
@@ -189,7 +189,7 @@ Page({
   },
   $onMessageReceived(value) {
     const message = value.data[0];
-    console.log("message from wenzhen: ",message)
+    // console.log("message from wenzhen: ",message)
     this.getConversationList();
     // let cloudCustomData = JSON.parse(message.cloudCustomData);
     // let inquiry_type = cloudCustomData.inquiry_type;
@@ -286,6 +286,7 @@ Page({
     order_inquiry_id_list.push("");//初始化一个，防止失败
     this.data.conversationList.forEach(item => {
       let conversationID = item.conversationID;
+      console.warn("conversationID: ", conversationID)
       if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过
       let lastMessage = item.lastMessage;
       if(!lastMessage) return;
@@ -295,7 +296,7 @@ Page({
       try {
         cloudCustomDataJson = JSON.parse(cloudCustomData);
       } catch (error) {
-        console.log(error);
+        // console.log(error);
         return;
       }
       let order_inquiry_id = cloudCustomDataJson.order_inquiry_id;
@@ -341,7 +342,7 @@ Page({
         conversationList: new_conversationList
       })
     }).then(() => {
-      console.log("开始格式化formatConversationList")
+      // console.log("开始格式化formatConversationList")
       this.formatConversationList();
     }).catch(errors => {console.error(errors);})
   },
@@ -386,7 +387,7 @@ Page({
       if(index > -1) return;
       let patient_family_data = cloudCustomDataJson.patient_family_data;
       if(patient_family_data == undefined) return;
-      console.log("patient_family_data: ", patient_family_data);
+      // console.log("patient_family_data: ", patient_family_data);
       let session_item = {};
       session_item.inquiry_status = item.inquiry_status;//订单状态暂无
       let txt = {};
@@ -394,7 +395,7 @@ Page({
         let text = "自定义消息";
         let payload = lastMessage.payload;
         if(payload) {
-          console.log("payload: ",payload.data);
+          // console.log("payload: ",payload.data);
           let payloadJson = JSON.parse(payload.data);
           text = payloadJson.title.replaceAll(/—/g, "");
         }
@@ -462,7 +463,7 @@ Page({
     return index;
   },
   onTabsChange(e){
-    console.log(e);
+    // console.log(e);
   },
   goChat(e){
     this.setData({
@@ -487,13 +488,13 @@ Page({
     this.setData({
       show: false
     })
-    console.log("order_inquiry_id: ", e.currentTarget.dataset.order_inquiry_id);
+    // console.log("order_inquiry_id: ", e.currentTarget.dataset.order_inquiry_id);
     let params = {};
     params.order_inquiry_id = e.currentTarget.dataset.order_inquiry_id;
-    console.log("params: ",params)
+    // console.log("params: ",params)
     api.postDoctorInquiry(params).then(response => {
-      console.log("开始接诊");
-      console.log(response);
+      // console.log("开始接诊");
+      // console.log(response);
     }).then(() => {
       this.goChat(e);
     }).catch(errors => {
@@ -517,7 +518,7 @@ Page({
     let show_dialog_from_account = e.currentTarget.dataset.show_dialog_from_account;
     let show_dialog_order_inquiry_id = e.currentTarget.dataset.show_dialog_order_inquiry_id;
     let show_dialog_inquiry_type = e.currentTarget.dataset.show_dialog_inquiry_type;
-    console.log("tabShowtabShowtabShowtabShow");
+    // console.log("tabShowtabShowtabShowtabShow");
     this.setData({
       show_dialog_from_account: show_dialog_from_account,
       show_dialog_order_inquiry_id: show_dialog_order_inquiry_id,
@@ -526,24 +527,24 @@ Page({
     })
   },
   onClose(){
-    console.log("onCloseonCloseonCloseonClose")
+    // console.log("onCloseonCloseonCloseonClose")
     this.setData({
       show: false
     })
   },
   vanTabsChange(e){
-    console.log(e)
+    // // console.log(e)
     this.setData({
       now_message_inquiry_type: e.detail.name
     })
   },
   onPullDownRefresh(){
-    console.log("用户下拉动作")
+    // console.log("用户下拉动作")
     this.onHide();
     this.onShow();
   },
   onReachBottom() {
-    console.log('===触底了！！===');
+    // console.log('===触底了！！===');
     let now_message_inquiry_type = this.data.now_message_inquiry_type;
     if(now_message_inquiry_type == 5){
       if(this.data.current_page < this.data.last_page){//最后一页时停止分页
@@ -557,7 +558,7 @@ Page({
     params.page = this.data.current_page + 1;
     this.setData({data_list_5_loading: true})
     api.getDoctorInquiryFinishMessage(params).then(response => {
-      console.log(response);
+      // console.log(response);
       this.setData({
         "data_list_5": data_list_5.concat(response.data.data),
         current_page: response.data.current_page,
diff --git a/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.js b/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.js
index 81beb78..3fa6dfc 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.js
+++ b/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.js
@@ -9,7 +9,6 @@ Component({
       type: Object,
       value: {},
       observer(newVal) {
-        console.log("observerobserverobserverobserver")
         // console.log(newVal)
         this.setData({
           renderDom: parseText(newVal),
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js
index 559bcd1..2146c7e 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.js
@@ -96,7 +96,8 @@ Component({
     ChangYongYu: [],
     dialog_visible: false,
     dialog_message: "在线开处方需先进行多点执业认证",
-    message_rounds: 0
+    message_rounds: 0,
+    networkstatus: "wifi"
   },
 
   lifetimes: {
@@ -132,6 +133,27 @@ Component({
           text: '按住说话',
         });
       });
+      let _this = this
+      wx.onNetworkStatusChange(function (res) {
+        // console.log("onNetworkStatusChange from wenzhen: ")
+        // console.log(res.isConnected)
+        // console.log(res.networkType)
+        // wx.showToast({
+        //   title: '网络类型：'+res.networkType,
+        // })
+        _this.setData({
+          networkstatus: res.networkType
+        })
+      })
+      console.log("pageLifetimes show")
+      wx.getNetworkType({
+        success (res) {
+          const networkType = res.networkType
+          _this.setData({
+            networkstatus: networkType
+          })
+        }
+      })
     },
     
   },
@@ -139,7 +161,7 @@ Component({
     show(){
       //获得常用语
       let words = wx.getStorageSync('words');
-      console.log("words from chat: ", words);
+      // console.log("words from chat: ", words);
       if(words){
         this.setData({
           message: words,
@@ -147,6 +169,18 @@ Component({
         })
         wx.setStorageSync('words', "");
       }
+
+      console.log("pageLifetimes show")
+      let _this = this
+      wx.getNetworkType({
+        success (res) {
+          const networkType = res.networkType
+          _this.setData({
+            networkstatus: networkType
+          })
+        }
+      })
+
     }
   },
 
@@ -323,13 +357,23 @@ Component({
     // 发送图片消息
     handleSendImageMessage(file) {
 
+      let networkstatus = this.data.networkstatus
+      console.log("networkstatus: ", networkstatus)
+      if(networkstatus === 'none'){
+        wx.showToast({
+          title: '请检查您的网络',
+          icon: 'error'
+        })
+        return
+      }
+      
       let _this = this;
       let conversationID = this.data.conversation.conversationID
       let promise = wx.$TUIKit.getConversationProfile(conversationID);
       promise.then(function(imResponse) {
-        console.log("getConversationProfile 正在执行")
+        // console.log("getConversationProfile 正在执行")
         // 获取成功
-        console.log(imResponse.data.conversation); // 会话资料
+        // console.log(imResponse.data.conversation); // 会话资料
         _this.setData({
           conversation: imResponse.data.conversation
         })
@@ -340,7 +384,7 @@ Component({
       Promise.all([promise]).then(res => {
         // 获取最后一条消息
         let last_message = this.data.conversation.lastMessage;
-        console.log("last_message: ", last_message);
+        // console.log("last_message: ", last_message);
         let cloudCustomData = "";
         let cloudCustomDataJson = "";
         if(last_message.cloudCustomData){
@@ -412,7 +456,7 @@ Component({
     },
 
     handleCommonFunctions(e) {
-      console.log("handleCommonFunctions: ", e)
+      // console.log("handleCommonFunctions: ", e)
       switch (e.target.dataset.key) {
         case '0':
           this.setData({
@@ -434,11 +478,11 @@ Component({
           break;
         case '11'://在线开方
           let _this = this;
-          console.log("开始订阅消息");
+          // console.log("开始订阅消息");
           wx.requestSubscribeMessage({
             tmplIds: ['kUy70xHlr7ADo4aIHiictM4Te7MSec3E5kHsYvFQu40'],
             success (res) {
-              console.log(res);
+              // console.log(res);
               let order_inquiry_id = _this.data.order_inquiry_id
               api.getDoctorPrescriptionCheck({order_inquiry_id: order_inquiry_id}).then(response => {
                 let status = response.data.status
@@ -604,6 +648,17 @@ Component({
     },
 
     sendTextMessage(msg, flag) {
+
+      let networkstatus = this.data.networkstatus
+      console.log("networkstatus: ", networkstatus)
+      if(networkstatus === 'none'){
+        wx.showToast({
+          title: '请检查您的网络',
+          icon: 'error'
+        })
+        return
+      }
+
       wx.aegis.reportEvent({
         name: 'messageType',
         ext1: 'messageType-text',
@@ -614,9 +669,9 @@ Component({
       let conversationID = this.data.conversation.conversationID
       let promise = wx.$TUIKit.getConversationProfile(conversationID);
       promise.then(function(imResponse) {
-        console.log("getConversationProfile 正在执行")
+        // console.log("getConversationProfile 正在执行")
         // 获取成功
-        console.log(imResponse.data.conversation); // 会话资料
+        // console.log(imResponse.data.conversation); // 会话资料
         _this.setData({
           conversation: imResponse.data.conversation
         })
@@ -625,10 +680,10 @@ Component({
       });
 
       Promise.all([promise]).then(res => {
-        console.log("getConversationProfile 执行完毕")
+        // console.log("getConversationProfile 执行完毕")
         //获取最后一条消息
         let last_message = this.data.conversation.lastMessage;
-        console.log("last_message: ", last_message);
+        // console.log("last_message: ", last_message);
         let cloudCustomData = "";
         let cloudCustomDataJson = "";
         if(last_message.cloudCustomData){
@@ -659,8 +714,8 @@ Component({
           patient_family_data: patient_family_data
         });
 
-        console.log("mycloudCustomData: ", mycloudCustomData);
-        console.log("text: ", text);
+        // console.log("mycloudCustomData: ", mycloudCustomData);
+        // console.log("text: ", text);
         const message = wx.$TUIKit.createTextMessage({
           to, 
           conversationType: this.data.conversation.type,
@@ -850,6 +905,15 @@ Component({
     },
 
     $sendTIMMessage(message) {
+      console.log("$sendTIMMessage: ",message)
+      let networkstatus = this.data.networkstatus
+      if(networkstatus === 'none'){
+        wx.showToast({
+          title: '请检查您的网络',
+          icon: 'error'
+        })
+        return
+      }
       this.triggerEvent('sendMessage', {
         message,
       });
@@ -857,7 +921,14 @@ Component({
         offlinePushInfo: {
           disablePush: true,
         },
-      }).then(() => {
+      }).then((res) => {
+        
+        console.log("sendMessage:", res)
+        if(res.code === 0){
+          this.triggerEvent('refreshMessageStatus', {
+            message,
+          });
+        }
         const firstSendMessage = wx.getStorageSync('isFirstSendMessage');
         if (firstSendMessage) {
           wx.aegis.reportEvent({
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index 224dbf7..80ad454 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -140,22 +140,23 @@ Component({
       this.setData({
         list_first_loading: true
       })
-      console.log("showshowshowshowshowshowshow")
+      // console.log("showshowshowshowshowshowshow")
     },
     hide(){
       this.setData({
         list_first_loading: false
       })
-      console.log("hidehidehidehidehidehidehidehidehidehidehide")
+      // console.log("hidehidehidehidehidehidehidehidehidehidehide")
     }
   },
   methods: {
 
     // 刷新消息列表
     refresh() {
-      console.log("refresh.......")
+      // console.log("refresh.......")
       this.setData({
-        autoToButtom: false
+        autoToButtom: false,
+        list_first_loading: true
       })
       if (this.data.isCompleted) {
         this.setData({
@@ -171,9 +172,13 @@ Component({
         });
       }, 2000);
     },
+    pcrefresh(){
+      console.log("pcrefresh")
+      wx.startPullDownRefresh()
+    },
     // 获取消息列表
     getMessageList(conversation) {
-      console.log("getMessageListgetMessageListgetMessageList")
+      // console.log("getMessageListgetMessageListgetMessageList")
       if (!this.data.isCompleted) {
         wx.$TUIKit.getMessageList({
           conversationID: conversation.conversationID,
@@ -227,7 +232,8 @@ Component({
       }
     },
     refreshMessageRounds(message){
-        console.log("messageList refreshMessageRounds message: ", message);
+      try {
+        // console.log("messageList refreshMessageRounds message: ", message);
         let cloudCustomData = "";
         let cloudCustomDataJson = "";
         if(message.cloudCustomData){
@@ -243,7 +249,7 @@ Component({
           if(payloadData){
             let title = payloadData.title
             //问诊已开始，重置message_rounds = 0
-            if(title.indexOf("问诊已开始") > -1){
+            if(title && title.indexOf("问诊已开始") > -1){
               this.setData({
                 message_rounds: 0
               })
@@ -256,10 +262,10 @@ Component({
         }
         
         let now_message_rounds = this.data.message_rounds
-        console.log("now_message_rounds: ", now_message_rounds)
+        // console.log("now_message_rounds: ", now_message_rounds)
         if(cloudCustomDataJson){
           let message_rounds = cloudCustomDataJson.message_rounds;
-          console.log("message_rounds: ", message_rounds)
+          // console.log("message_rounds: ", message_rounds)
           if(message_rounds > now_message_rounds){
             this.setData({
               message_rounds: message_rounds
@@ -269,6 +275,10 @@ Component({
             this.triggerEvent('refreshMessageRounds', myEventOption)
           }
         }
+      } catch (error) {
+        console.error(error)
+      }
+        
     },
     checkShowAvatar(message, refreshBaseInfo){
       // console.log("checkShowAvatar ");
@@ -294,7 +304,7 @@ Component({
     },
     // 历史消息渲染
     $handleMessageRender(messageList, currentMessageList) {
-      console.log("handleMessageRenderhandleMessageRenderhandleMessageRender");
+      // console.log("handleMessageRenderhandleMessageRenderhandleMessageRender");
       // this.showHistoryMessageTime(currentMessageList);
       if (messageList.length > 0) {
         if (this.data.conversation.type === '@TIM#SYSTEM') {
@@ -311,7 +321,7 @@ Component({
     },
     // 系统消息去重
     filterRepateSystemMessage(messageList) {
-      console.log("filterRepateSystemMessage")
+      // console.log("filterRepateSystemMessage")
       const noRepateMessage = [];
       for (let index = 0;  index < messageList.length; index++) {
         if (!noRepateMessage.some(item => item && item.ID === messageList[index].ID)) {
@@ -342,7 +352,7 @@ Component({
     $onMessageReceived(value) {
 
       let autoToButtom = this.data.autoToButtom;
-      console.log("autoToButtom:", autoToButtom)
+      // console.log("autoToButtom:", autoToButtom)
       const message = value.data[0];
       //更新会话数
       this.refreshMessageRounds(message)
@@ -355,8 +365,8 @@ Component({
       wx.$TUIKit.setMessageRead({ conversationID: this.data.conversation.conversationID }).then(() => {
         logger.log('| MessageList | setMessageRead | ok');
       });
-      console.log('| MessageList | setMessageRead | ok');
-      console.log('message cloudCustomData：', message.cloudCustomData);
+      // console.log('| MessageList | setMessageRead | ok');
+      // console.log('message cloudCustomData：', message.cloudCustomData);
       const { BUSINESS_ID_TEXT, MESSAGE_TYPE_TEXT } = constant;
       // this.messageTimeForShow(message);
 
@@ -430,11 +440,11 @@ Component({
       }
 
       let jumpAim = `ID-${this.filterSystemMessageID(this.data.messageList[this.data.messageList.length - 1].ID)}`;
-      console.log("jumpAim:", jumpAim);
+      // console.log("jumpAim:", jumpAim);
 
-      console.log("message.from: ", message.from)
-      console.log("conversation: ", this.data.conversation)
-      console.log("conversation: ", this.data.conversation.lastMessage.from)
+      // console.log("message.from: ", message.from)
+      // console.log("conversation: ", this.data.conversation)
+      // console.log("conversation: ", this.data.conversation.lastMessage.from)
       if(autoToButtom && message.conversationID === this.data.conversation.conversationID){
         this.setData({
           jumpAim: jumpAim
@@ -445,8 +455,8 @@ Component({
     },
     // 自己的消息上屏
     updateMessageList(message) {
-      console.log("自己的消息上屏 updateMessageList: ", message);
-      console.log(message);
+      // console.log("自己的消息上屏 updateMessageList: ", message);
+      // console.log(message);
       //自己的消息有头像
       if(!this.checkShowAvatar(message, false)){
         message.no_avatar = true;
@@ -474,7 +484,7 @@ Component({
           this.data.messageList.push(message);
         }
       } else {
-        console.log(message)
+        // console.log(message)
         this.data.messageList.push(message);
       }
       this.setData({
@@ -487,6 +497,16 @@ Component({
         });
       });
     },
+    refreshMessageStatus(message){
+      console.log("MessageList refreshMessageStatus", message)
+      this.setData({
+        messageList: this.data.messageList,
+      }, () => {
+        this.setData({
+          messageList: this.data.messageList,
+        });
+      });
+    },
     // 兼容 scrollView
     filterSystemMessageID(messageID) {
       const index = messageID.indexOf('@TIM#');
@@ -506,7 +526,7 @@ Component({
         if (this.data.messageList[index].status === 'success') {
           const { index } = e.currentTarget.dataset;
           let message = this.data.messageList[index];
-          console.log(message)
+          // console.log(message)
           if(message.type === 'TIMCustomElem'){
             return
           }
@@ -521,7 +541,7 @@ Component({
     },
     // 更新 messagelist
     updateMessageByID(deleteMessageID) {
-      console.log("updateMessageByIDupdateMessageByIDupdateMessageByID")
+      // console.log("updateMessageByIDupdateMessageByIDupdateMessageByID")
       const { messageList } = this.data;
       const deleteMessageArr = messageList.filter(item => item.ID === deleteMessageID);
       this.setData({
@@ -624,7 +644,7 @@ Component({
     },
     // 消息跳转到最新
     handleJumpNewMessage() {
-      console.log("handleJumpNewMessage")
+      // console.log("handleJumpNewMessage")
       this.setData({
         jumpAim: `ID-${this.filterSystemMessageID(this.data.messageList[this.data.messageList.length - 1].ID)}`,
         showDownJump: false,
@@ -633,7 +653,7 @@ Component({
     },
     // 消息跳转到最近未读
     handleJumpUnreadMessage() {
-      console.log("handleJumpUnreadMessage")
+      // console.log("handleJumpUnreadMessage")
       if (this.data.unreadCount > 15) {
         this.getMessageList(this.data.conversation);
         this.setData({
@@ -650,11 +670,11 @@ Component({
     },
     //myscroll 自定义滑动事件
     myscroll(e){
-      console.log(e.detail.deltaY,e.detail.scrollTop)
+      // console.log(e.detail.deltaY,e.detail.scrollTop)
     },
     // 滑动到最底部置跳转事件为false
     scrollHandler() {
-      console.log("触底了")
+      // console.log("触底了")
       this.setData({
         jumpAim: `ID-${this.filterSystemMessageID(this.data.messageList[this.data.messageList.length - 1].ID)}`,
         showDownJump: false,
@@ -667,14 +687,14 @@ Component({
     },
     // 展示消息时间
     messageTimeForShow(message) {
-      console.log("messageTimeForShow")
+      // console.log("messageTimeForShow")
       // const interval = 5 * 60 * 1000;
       const interval = 5 * 60;
       const nowTime = Math.floor(message.time / 10) * 10 * 1000;
-      console.log("nowTime: ", nowTime)
+      // console.log("nowTime: ", nowTime)
       if (this.data.messageList.length > 0) {
         const lastTime = this.data.messageList.slice(-1)[0].time * 1000;
-        console.log("nowTime  - lastTime=", (nowTime  - lastTime))
+        // console.log("nowTime  - lastTime=", (nowTime  - lastTime))
         if (nowTime  - lastTime > interval) {
           Object.assign(message, {
             isShowTime: true,
@@ -683,7 +703,7 @@ Component({
           let messageTime = this.cachMessageTime(nowTime);
           message.messageTime = messageTime[0];
           message.showMessageTime = messageTime[1];
-          console.log("dayjs(nowTime): ", dayjs(nowTime))
+          // console.log("dayjs(nowTime): ", dayjs(nowTime))
           this.setData({
             messageTime: this.cachMessageTime(nowTime)[0],
             showMessageTime: true,
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.json b/TUIKit/components/TUIChat/components/MessageList/index.json
index 352b3be..05e95d5 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.json
+++ b/TUIKit/components/TUIChat/components/MessageList/index.json
@@ -13,6 +13,7 @@
     "FileMessage": "../MessageElements/FileMessage/index",
     "MergerMessage": "../MessageElements/MergerMessage/index",
     "RevokeMessage": "../MessageElements/RevokeMessage/index",
-    "van-loading": "@vant/weapp/loading/index"
+    "van-loading": "@vant/weapp/loading/index",
+    "van-icon": "@vant/weapp/icon/index"
   }
 }
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxml b/TUIKit/components/TUIChat/components/MessageList/index.wxml
index f84f7ac..c1d21df 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageList/index.wxml
@@ -2,8 +2,8 @@
 
 <scroll-view  class="message-list-container" scroll-y="true"   scroll-into-view="{{jumpAim}}" refresher-enabled="{{true}}" bindrefresherrefresh="refresh" refresher-triggered="{{triggered}}" lower-threshold="200"  bindscrolltolower="scrollHandler" bindscrolltoupper="refresh" 	upper-threshold="100">
     <view class="no-message" wx:if="{{isCompleted}}">没有更多啦</view>
-    <view style="width: 100%;text-align: center;position: absolute;top: 50%;">
-      <van-loading size="24px" wx:if="{{list_first_loading}}">加载中...</van-loading>
+    <view style="width: 100%;text-align: center;position: absolute;top: 20rpx;">
+      <van-loading size="24px" wx:if="{{list_first_loading}}" vertical  color="#1989fa">加载中...</van-loading>
     </view>
     <view class="t-message" wx:if="{{conversation.type !== '@TIM#SYSTEM'}}" wx:for="{{messageList}}" wx:key="index"  data-index ='{{index}}'>
          <view class="time-pop-mask" data-value="{{item.time}}" wx:if="{{item.showMessageTime}}">
@@ -40,9 +40,14 @@
             <TipMessage  wx:if="{{item.type === 'TIMGroupTipElem'}}" message="{{item}}"/>
             <view  wx:if="{{item.type !== 'TIMGroupTipElem'}}"   class="{{item.flow === 'out' ? 't-self-message':'t-recieve-message'}}" >
                 <image class="t-message-avatar" wx:if="{{item.flow === 'in' && !item.no_avatar }}" src="{{item.avatar || 'https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/default_photo.png'}}" data-value="{{item}}" bindtap="getMemberProfile" />
-                <view class="read-receipts" wx:if="{{conversation.type === 'C2C' && item.flow==='out' }}">
-                    <!-- <view wx:if="{{item.isPeerRead}}" >已读</view>
-                    <view wx:else>未读</view> -->
+                <!-- <view class="read-receipts" wx:if="{{conversation.type === 'C2C' && item.flow==='out' }}">
+                    <view wx:if="{{item.isPeerRead}}" >已读</view>
+                    <view wx:else>未读</view>
+                </view> -->
+                <view class="message_send_status" wx:if="{{conversation.type === 'C2C' && item.flow==='out' }}">
+                  <van-loading type="spinner" wx:if="{{item.status == 'unSend'}}" size="24px" />
+                  <van-icon name="fail" color="red" wx:if="{{item.status == 'fail'}}" />
+                  <!-- <van-icon name="success" color="green" wx:if="{{item.status == 'success'}}" /> -->
                 </view>
                  <view wx:if="{{item.flow === 'out' && item.ID === errorMessageID || item.status === 'fail'}}" class="t-message-error-box">
                  <image class="t-message-error" wx:if="{{showMessageError}}" src='../../../../static/images/tuikit-msg-error.png' bindtap="ResendMessage" />
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxss b/TUIKit/components/TUIChat/components/MessageList/index.wxss
index 2a14339..640c335 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageList/index.wxss
@@ -62,6 +62,13 @@
   color: #6e7981;
   margin-right: 10px
 }
+.message_send_status {
+  line-height: 42px;
+  height: 42px;
+  font-size: 12px;
+  color: #6e7981;
+  margin-right: 10px
+}
 .no-message {
   text-align: center;
   position: fixed;
diff --git a/TUIKit/components/TUIChat/index.js b/TUIKit/components/TUIChat/index.js
index 0e94119..814f595 100644
--- a/TUIKit/components/TUIChat/index.js
+++ b/TUIKit/components/TUIChat/index.js
@@ -81,7 +81,7 @@ Component({
       }
       this.getNavbarHeight()
       wx.onKeyboardHeightChange(res => {
-        console.log("键盘高度：", res.height)
+        // console.log("键盘高度：", res.height)
         this.setData({
           keysboards_height: res.height
         })
@@ -98,7 +98,7 @@ Component({
       // console.log("pages.length:", pages.length)
       // console.log("pages:", pages[0])
       if(pages.length == 1){
-        console.log("navbarData.showCapsule");
+        // console.log("navbarData.showCapsule");
         this.setData({
           "navbarData.showCapsule": 3
         })
@@ -149,9 +149,9 @@ Component({
    */
   methods: {
     refreshMessageRounds(e){
-      console.log("TUIchat refreshMessageRounds", e)
+      // console.log("TUIchat refreshMessageRounds", e)
       let message_rounds = e.detail.message_rounds
-      console.log("TUIchat refreshMessageRounds message_rounds：", message_rounds)
+      // console.log("TUIchat refreshMessageRounds message_rounds：", message_rounds)
       this.setData({
         message_rounds: message_rounds
       })
@@ -161,18 +161,18 @@ Component({
       if (wx.getMenuButtonBoundingClientRect) {
           rect = wx.getMenuButtonBoundingClientRect();
       }
-      console.log("rect: ", rect)
+      // console.log("rect: ", rect)
       wx.getSystemInfo({
         success: (res) => {
             const { statusBarHeight } = wx.getSystemInfoSync();
-            console.log("statusBarHeight: ", statusBarHeight);
-            console.log("${rect.height}px: ", `${rect.height}`);
+            // console.log("statusBarHeight: ", statusBarHeight);
+            // console.log("${rect.height}px: ", `${rect.height}`);
             let height = Number.parseInt(statusBarHeight) + Number.parseInt(`${rect.height}`) + 50;
             if(addHeight){
               height = height + addHeight
             }
             let keysboards_height =  this.data.keysboards_height
-            console.log("getNavbarHeight 键盘高度：", keysboards_height)
+            // console.log("getNavbarHeight 键盘高度：", keysboards_height)
             if(keysboards_height){
               height = height + keysboards_height
             }
@@ -198,7 +198,7 @@ Component({
     },
     confirmDialog(){
       api.putDoctorInquiryFinish({order_inquiry_id: this.data.order_inquiry_id}).then(response => {
-        console.log(response);
+        // console.log(response);
         this.getInquiryMessageBasic();
         //调用子组件中的跳到最新消息
         this.selectComponent('#MessageList').handleJumpNewMessage();
@@ -209,9 +209,9 @@ Component({
     },
     //获取问诊订单消息内页基础数据
     getInquiryMessageBasic() {
-      console.log("order_inquiry_id: ", this.data.order_inquiry_id);
+      // console.log("order_inquiry_id: ", this.data.order_inquiry_id);
       api.getInquiryMessageBasic({order_inquiry_id: this.data.order_inquiry_id}).then(response => {
-        console.log(response);
+        // console.log(response);
         this.setData({
           baseInfo: response.data,
         })
@@ -260,11 +260,15 @@ Component({
       this.selectComponent('#MessageList').updateMessageList(event.detail.message);
       this.getNavbarHeight();
     },
+    refreshMessageStatus(message) {
+      console.log("TUIchat refreshMessageStatus", message)
+      this.selectComponent('#MessageList').refreshMessageStatus(message);
+    },
     showMessageErrorImage(event) {
       this.selectComponent('#MessageList').sendMessageError(event);
     },
     triggerClose() {
-      console.log("message-list triggerClose")
+      // console.log("message-list triggerClose")
       if(this.data.baseInfo.inquiry_status == 4){
         this.selectComponent('#MessageInput').handleClose();
       }
@@ -301,7 +305,7 @@ Component({
       this.selectComponent('#MessageInput').onInputValueChange(event);
     },
     myhandleExtensions(e){
-      console.log("myhandleExtensionsmyhandleExtensions: ", e);
+      // console.log("myhandleExtensionsmyhandleExtensions: ", e);
       wx.hideKeyboard()
       let displayFlag = e.detail.displayFlag;
       setTimeout(() => {
@@ -321,7 +325,7 @@ Component({
     },
     // 监听键盘，获取焦点时将输入框推到键盘上方
     pullKeysBoards(event) {
-      console.log("pullKeysBoardspullKeysBoards")
+      // console.log("pullKeysBoardspullKeysBoards")
       setNewInputStyle(event.detail.event.detail.height);
       
       this.getNavbarHeight();
@@ -334,8 +338,8 @@ Component({
     },
     // 监听键盘，失去焦点时收起键盘
     downKeysBoards(event) {
-      console.log("downKeysBoardsdownKeysBoards")
-      console.log(event)
+      // console.log("downKeysBoardsdownKeysBoards")
+      // console.log(event)
       let value = event.detail.event.detail.value;
       this.getNavbarHeight();
       if(value){
diff --git a/TUIKit/components/TUIChat/index.wxml b/TUIKit/components/TUIChat/index.wxml
index 81ad79e..23064a1 100644
--- a/TUIKit/components/TUIChat/index.wxml
+++ b/TUIKit/components/TUIChat/index.wxml
@@ -36,6 +36,7 @@
   <view class="input-area" style="{{input_area_style}}" wx:if="{{baseInfo.inquiry_status==4}}">
     <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:refreshMessageStatus="refreshMessageStatus" 
       bind:handleCall="handleCall" message_rounds="{{message_rounds}}"></MessageInput>
     </view>
   </view>
diff --git a/TUIKit/lib/tim-wx-sdk.2.27.0.js b/TUIKit/lib/tim-wx-sdk.2.27.0.js
new file mode 100644
index 0000000..8639a34
--- /dev/null
+++ b/TUIKit/lib/tim-wx-sdk.2.27.0.js
@@ -0,0 +1 @@
+'use strict';!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e=e||self).TIM=t()}(this,(function(){function e(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);t&&(o=o.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,o)}return n}function t(t){for(var n=1;n<arguments.length;n++){var o=null!=arguments[n]?arguments[n]:{};n%2?e(Object(o),!0).forEach((function(e){r(t,e,o[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(o)):e(Object(o)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(o,e))}))}return t}function n(e){return(n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function o(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function s(e,t){for(var n=0;n<t.length;n++){var o=t[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}function a(e,t,n){return t&&s(e.prototype,t),n&&s(e,n),Object.defineProperty(e,"prototype",{writable:!1}),e}function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),Object.defineProperty(e,"prototype",{writable:!1}),t&&c(e,t)}function u(e){return(u=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function c(e,t){return(c=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function l(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(e){return!1}}function p(e,t,n){return(p=l()?Reflect.construct:function(e,t,n){var o=[null];o.push.apply(o,t);var s=new(Function.bind.apply(e,o));return n&&c(s,n.prototype),s}).apply(null,arguments)}function d(e){var t="function"==typeof Map?new Map:void 0;return(d=function(e){if(null===e||(n=e,-1===Function.toString.call(n).indexOf("[native code]")))return e;var n;if("function"!=typeof e)throw new TypeError("Super expression must either be null or a function");if(void 0!==t){if(t.has(e))return t.get(e);t.set(e,o)}function o(){return p(e,arguments,u(this).constructor)}return o.prototype=Object.create(e.prototype,{constructor:{value:o,enumerable:!1,writable:!0,configurable:!0}}),c(o,e)})(e)}function g(e,t){if(null==e)return{};var n,o,s=function(e,t){if(null==e)return{};var n,o,s={},a=Object.keys(e);for(o=0;o<a.length;o++)n=a[o],t.indexOf(n)>=0||(s[n]=e[n]);return s}(e,t);if(Object.getOwnPropertySymbols){var a=Object.getOwnPropertySymbols(e);for(o=0;o<a.length;o++)n=a[o],t.indexOf(n)>=0||Object.prototype.propertyIsEnumerable.call(e,n)&&(s[n]=e[n])}return s}function h(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}function _(e,t){if(t&&("object"==typeof t||"function"==typeof t))return t;if(void 0!==t)throw new TypeError("Derived constructors may only return object or undefined");return h(e)}function f(e){var t=l();return function(){var n,o=u(e);if(t){var s=u(this).constructor;n=Reflect.construct(o,arguments,s)}else n=o.apply(this,arguments);return _(this,n)}}function v(e,t){return M(e)||function(e,t){var n=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null==n)return;var o,s,a=[],r=!0,i=!1;try{for(n=n.call(e);!(r=(o=n.next()).done)&&(a.push(o.value),!t||a.length!==t);r=!0);}catch(u){i=!0,s=u}finally{try{r||null==n.return||n.return()}finally{if(i)throw s}}return a}(e,t)||I(e,t)||T()}function m(e){return function(e){if(Array.isArray(e))return C(e)}(e)||y(e)||I(e)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function M(e){if(Array.isArray(e))return e}function y(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function I(e,t){if(e){if("string"==typeof e)return C(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);return"Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n?Array.from(e):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?C(e,t):void 0}}function C(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,o=new Array(t);n<t;n++)o[n]=e[n];return o}function T(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function D(e,t){var n="undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(!n){if(Array.isArray(e)||(n=I(e))||t&&e&&"number"==typeof e.length){n&&(e=n);var o=0,s=function(){};return{s:s,n:function(){return o>=e.length?{done:!0}:{done:!1,value:e[o++]}},e:function(e){throw e},f:s}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var a,r=!0,i=!1;return{s:function(){n=n.call(e)},n:function(){var e=n.next();return r=e.done,e},e:function(e){i=!0,a=e},f:function(){try{r||null==n.return||n.return()}finally{if(i)throw a}}}}var k={SDK_READY:"sdkStateReady",SDK_NOT_READY:"sdkStateNotReady",SDK_DESTROY:"sdkDestroy",MESSAGE_RECEIVED:"onMessageReceived",MESSAGE_MODIFIED:"onMessageModified",MESSAGE_REVOKED:"onMessageRevoked",MESSAGE_READ_BY_PEER:"onMessageReadByPeer",MESSAGE_READ_RECEIPT_RECEIVED:"onMessageReadReceiptReceived",MESSAGE_EXTENSIONS_UPDATED:"onMessageExtensionsUpdated",MESSAGE_EXTENSIONS_DELETED:"onMessageExtensionsDeleted",CONVERSATION_LIST_UPDATED:"onConversationListUpdated",TOTAL_UNREAD_MESSAGE_COUNT_UPDATED:"onTotalUnreadMessageCountUpdated",CONVERSATION_GROUP_LIST_UPDATED:"onConversationGroupListUpdated",CONVERSATION_IN_GROUP_UPDATED:"onConversationInGroupUpdated",GROUP_LIST_UPDATED:"onGroupListUpdated",GROUP_SYSTEM_NOTICE_RECEIVED:"receiveGroupSystemNotice",GROUP_ATTRIBUTES_UPDATED:"groupAttributesUpdated",GROUP_COUNTER_UPDATED:"onGroupCounterUpdated",TOPIC_CREATED:"onTopicCreated",TOPIC_DELETED:"onTopicDeleted",TOPIC_UPDATED:"onTopicUpdated",PROFILE_UPDATED:"onProfileUpdated",USER_STATUS_UPDATED:"onUserStatusUpdated",BLACKLIST_UPDATED:"blacklistUpdated",FRIEND_LIST_UPDATED:"onFriendListUpdated",FRIEND_GROUP_LIST_UPDATED:"onFriendGroupListUpdated",FRIEND_APPLICATION_LIST_UPDATED:"onFriendApplicationListUpdated",KICKED_OUT:"kickedOut",ERROR:"error",NET_STATE_CHANGE:"netStateChange",SDK_RELOAD:"sdkReload"},S={MSG_TEXT:"TIMTextElem",MSG_IMAGE:"TIMImageElem",MSG_SOUND:"TIMSoundElem",MSG_AUDIO:"TIMSoundElem",MSG_FILE:"TIMFileElem",MSG_FACE:"TIMFaceElem",MSG_VIDEO:"TIMVideoFileElem",MSG_GEO:"TIMLocationElem",MSG_LOCATION:"TIMLocationElem",MSG_GRP_TIP:"TIMGroupTipElem",MSG_GRP_SYS_NOTICE:"TIMGroupSystemNoticeElem",MSG_CUSTOM:"TIMCustomElem",MSG_MERGER:"TIMRelayElem",MSG_PRIORITY_HIGH:"High",MSG_PRIORITY_NORMAL:"Normal",MSG_PRIORITY_LOW:"Low",MSG_PRIORITY_LOWEST:"Lowest",CONV_C2C:"C2C",CONV_GROUP:"GROUP",CONV_TOPIC:"TOPIC",CONV_SYSTEM:"@TIM#SYSTEM",CONV_AT_ME:1,CONV_AT_ALL:2,CONV_AT_ALL_AT_ME:3,CONV_MARK_TYPE_STAR:1,CONV_MARK_TYPE_UNREAD:2,CONV_MARK_TYPE_FOLD:4,CONV_MARK_TYPE_HIDE:8,GRP_PRIVATE:"Private",GRP_WORK:"Private",GRP_PUBLIC:"Public",GRP_CHATROOM:"ChatRoom",GRP_MEETING:"ChatRoom",GRP_AVCHATROOM:"AVChatRoom",GRP_COMMUNITY:"Community",GRP_MBR_ROLE_OWNER:"Owner",GRP_MBR_ROLE_ADMIN:"Admin",GRP_MBR_ROLE_MEMBER:"Member",GRP_MBR_ROLE_CUSTOM:"Custom",GRP_TIP_MBR_JOIN:1,GRP_TIP_MBR_QUIT:2,GRP_TIP_MBR_KICKED_OUT:3,GRP_TIP_MBR_SET_ADMIN:4,GRP_TIP_MBR_CANCELED_ADMIN:5,GRP_TIP_GRP_PROFILE_UPDATED:6,GRP_TIP_MBR_PROFILE_UPDATED:7,GRP_TIP_BAN_AVCHATROOM_MEMBER:10,GRP_TIP_UNBAN_AVCHATROOM_MEMBER:11,MSG_REMIND_ACPT_AND_NOTE:"AcceptAndNotify",MSG_REMIND_ACPT_NOT_NOTE:"AcceptNotNotify",MSG_REMIND_DISCARD:"Discard",GENDER_UNKNOWN:"Gender_Type_Unknown",GENDER_FEMALE:"Gender_Type_Female",GENDER_MALE:"Gender_Type_Male",KICKED_OUT_MULT_ACCOUNT:"multipleAccount",KICKED_OUT_MULT_DEVICE:"multipleDevice",KICKED_OUT_USERSIG_EXPIRED:"userSigExpired",KICKED_OUT_REST_API:"REST_API_Kick",ALLOW_TYPE_ALLOW_ANY:"AllowType_Type_AllowAny",ALLOW_TYPE_NEED_CONFIRM:"AllowType_Type_NeedConfirm",ALLOW_TYPE_DENY_ANY:"AllowType_Type_DenyAny",FORBID_TYPE_NONE:"AdminForbid_Type_None",FORBID_TYPE_SEND_OUT:"AdminForbid_Type_SendOut",JOIN_OPTIONS_FREE_ACCESS:"FreeAccess",JOIN_OPTIONS_NEED_PERMISSION:"NeedPermission",JOIN_OPTIONS_DISABLE_APPLY:"DisableApply",JOIN_STATUS_SUCCESS:"JoinedSuccess",JOIN_STATUS_ALREADY_IN_GROUP:"AlreadyInGroup",JOIN_STATUS_WAIT_APPROVAL:"WaitAdminApproval",INVITE_OPTIONS_DISABLE_INVITE:"DisableInvite",INVITE_OPTIONS_NEED_PERMISSION:"NeedPermission",INVITE_OPTIONS_FREE_ACCESS:"FreeAccess",GRP_PROFILE_OWNER_ID:"ownerID",GRP_PROFILE_CREATE_TIME:"createTime",GRP_PROFILE_LAST_INFO_TIME:"lastInfoTime",GRP_PROFILE_MEMBER_NUM:"memberNum",GRP_PROFILE_MAX_MEMBER_NUM:"maxMemberNum",GRP_PROFILE_JOIN_OPTION:"joinOption",GRP_PROFILE_INVITE_OPTION:"inviteOption",GRP_PROFILE_INTRODUCTION:"introduction",GRP_PROFILE_NOTIFICATION:"notification",GRP_PROFILE_MUTE_ALL_MBRS:"muteAllMembers",SNS_ADD_TYPE_SINGLE:"Add_Type_Single",SNS_ADD_TYPE_BOTH:"Add_Type_Both",SNS_DELETE_TYPE_SINGLE:"Delete_Type_Single",SNS_DELETE_TYPE_BOTH:"Delete_Type_Both",SNS_APPLICATION_TYPE_BOTH:"Pendency_Type_Both",SNS_APPLICATION_SENT_TO_ME:"Pendency_Type_ComeIn",SNS_APPLICATION_SENT_BY_ME:"Pendency_Type_SendOut",SNS_APPLICATION_AGREE:"Response_Action_Agree",SNS_APPLICATION_AGREE_AND_ADD:"Response_Action_AgreeAndAdd",SNS_CHECK_TYPE_BOTH:"CheckResult_Type_Both",SNS_CHECK_TYPE_SINGLE:"CheckResult_Type_Single",SNS_TYPE_NO_RELATION:"CheckResult_Type_NoRelation",SNS_TYPE_A_WITH_B:"CheckResult_Type_AWithB",SNS_TYPE_B_WITH_A:"CheckResult_Type_BWithA",SNS_TYPE_BOTH_WAY:"CheckResult_Type_BothWay",NET_STATE_CONNECTED:"connected",NET_STATE_CONNECTING:"connecting",NET_STATE_DISCONNECTED:"disconnected",MSG_AT_ALL:"__kImSDK_MesssageAtALL__",READ_ALL_C2C_MSG:"readAllC2CMessage",READ_ALL_GROUP_MSG:"readAllGroupMessage",READ_ALL_MSG:"readAllMessage",USER_STATUS_UNKNOWN:0,USER_STATUS_ONLINE:1,USER_STATUS_OFFLINE:2,USER_STATUS_UNLOGINED:3},L=function(){function e(){o(this,e),this.cache=[],this.options=null}return a(e,[{key:"use",value:function(e){if("function"!=typeof e)throw"middleware must be a function";return this.cache.push(e),this}},{key:"next",value:function(e){if(this.middlewares&&this.middlewares.length>0)return this.middlewares.shift().call(this,this.options,this.next.bind(this))}},{key:"run",value:function(e){return this.middlewares=this.cache.map((function(e){return e})),this.options=e,this.next()}}]),e}(),E=function(){function e(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:0,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0;o(this,e),this.high=t,this.low=n}return a(e,[{key:"equal",value:function(e){return null!==e&&(this.low===e.low&&this.high===e.high)}},{key:"toString",value:function(){var e=Number(this.high).toString(16),t=Number(this.low).toString(16);if(t.length<8)for(var n=8-t.length;n;)t="0"+t,n--;return e+t}}]),e}(),A={TEST:{CHINA:{DEFAULT:"wss://wss-dev.tim.qq.com"},OVERSEA:{DEFAULT:"wss://wss-dev.tim.qq.com"},SINGAPORE:{DEFAULT:"wss://wsssgp-dev.im.qcloud.com"},KOREA:{DEFAULT:"wss://wsskr-dev.im.qcloud.com"},GERMANY:{DEFAULT:"wss://wssger-dev.im.qcloud.com"},IND:{DEFAULT:"wss://wssind-dev.im.qcloud.com"},JPN:{DEFAULT:"wss://wssjpn-dev.im.qcloud.com"},USA:{DEFAULT:"wss://wssusa-dev.im.qcloud.com"}},PRODUCTION:{CHINA:{DEFAULT:"wss://wss.im.qcloud.com",BACKUP:"wss://wss.tim.qq.com",STAT:"https://events.im.qcloud.com",ANYCAST:"wss://162.14.13.203"},OVERSEA:{DEFAULT:"wss://wss.im.qcloud.com",BACKUP:"wss://wss.my-imcloud.com",STAT:"https://api.my-imcloud.com"},SINGAPORE:{DEFAULT:"wss://wsssgp.im.qcloud.com",BACKUP:"wss://wsssgp.my-imcloud.com",STAT:"https://apisgp.my-imcloud.com"},KOREA:{DEFAULT:"wss://wsskr.im.qcloud.com",BACKUP:"wss://wsskr.my-imcloud.com",STAT:"https://apikr.my-imcloud.com"},GERMANY:{DEFAULT:"wss://wssger.im.qcloud.com",BACKUP:"wss://wssger.my-imcloud.com",STAT:"https://apiger.my-imcloud.com"},IND:{DEFAULT:"wss://wssind.my-imcloud.com",BACKUP:"wss://wssind.im.qcloud.com",STAT:"https://apiind.my-imcloud.com"},JPN:{DEFAULT:"wss://wssjpn.im.qcloud.com",BACKUP:"wss://wssjpn.my-imcloud.com",STAT:"https://apijpn.my-imcloud.com"},USA:{DEFAULT:"wss://wssusa.im.qcloud.com",BACKUP:"wss://wssusa.my-imcloud.com",STAT:"https://apiusa.my-imcloud.com"}}},R={ANDROID:2,IOS:3,MAC:4,WEB:7,WX_MP:8,QQ_MP:9,TT_MP:10,BAIDU_MP:11,ALI_MP:12,IPAD:13,UNI_NATIVE_APP:15},N="1.7.3",O=537048168,G="CHINA",P="OVERSEA",U="SINGAPORE",b="KOREA",w="GERMANY",q="IND",F="JPN",x="USA",V={HOST:{CURRENT:{DEFAULT:"wss://wss.im.qcloud.com",STAT:"https://events.im.qcloud.com"},setCurrent:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:G;this.CURRENT=A.PRODUCTION[e]}},NAME:{OPEN_IM:"openim",OPEN_IM_MSG_EXT:"openim_msg_ext_http_svc",GROUP:"group_open_http_svc",GROUP_AVCHATROOM:"group_open_avchatroom_http_svc",GROUP_COMMUNITY:"million_group_open_http_svc",GROUP_ATTR:"group_open_attr_http_svc",FRIEND:"sns",PROFILE:"profile",RECENT_CONTACT:"recentcontact",PIC:"openpic",BIG_GROUP_NO_AUTH:"group_open_http_noauth_svc",BIG_GROUP_LONG_POLLING:"group_open_long_polling_http_svc",BIG_GROUP_LONG_POLLING_NO_AUTH:"group_open_long_polling_http_noauth_svc",IM_OPEN_STAT:"imopenstat",WEB_IM:"webim",IM_COS_SIGN:"im_cos_sign_svr",CUSTOM_UPLOAD:"im_cos_msg",HEARTBEAT:"heartbeat",IM_OPEN_PUSH:"im_open_push",IM_OPEN_STATUS:"im_open_status",IM_LONG_MESSAGE:"im_long_msg",IM_CONFIG_MANAGER:"im_sdk_config_mgr",STAT_SERVICE:"StatSvc",OVERLOAD_PUSH:"OverLoadPush",IM_MSG_AUDIT_MGR:"im_msg_audit_mgr",TUIROOM_SVR:"tui_room_svr",IM_OPEN_TRANSLATE:"im_open_translate"},CMD:{LOGIN:"wslogin",LOGOUT_LONG_POLL:"longpollinglogout",LOGOUT:"wslogout",HELLO:"wshello",STAT_BACKGROUND:"ws_stat_background",STAT_FOREGROUND:"ws_stat_foreground",SET_TOKEN:"ws_stat_settoken",PORTRAIT_GET:"portrait_get_all",PORTRAIT_SET:"portrait_set",GET_LONG_POLL_ID:"getlongpollingid",LONG_POLL:"longpolling",AVCHATROOM_LONG_POLL:"get_msg",ADD_FRIEND:"friend_add",UPDATE_FRIEND:"friend_update",GET_FRIEND_LIST:"friend_get",GET_FRIEND_PROFILE:"friend_get_specified",DELETE_FRIEND:"friend_delete",CHECK_FRIEND:"friend_check",GET_FRIEND_GROUP_LIST:"group_get",RESPOND_FRIEND_APPLICATION:"friend_response",GET_FRIEND_APPLICATION_LIST:"pendency_get",DELETE_FRIEND_APPLICATION:"pendency_delete",REPORT_FRIEND_APPLICATION:"pendency_report",GET_GROUP_APPLICATION:"get_pendency",CREATE_FRIEND_GROUP:"group_add",DELETE_FRIEND_GROUP:"group_delete",UPDATE_FRIEND_GROUP:"group_update",GET_BLACKLIST:"black_list_get",ADD_BLACKLIST:"black_list_add",DELETE_BLACKLIST:"black_list_delete",CREATE_GROUP:"create_group",GET_JOINED_GROUPS:"get_joined_group_list",SET_GROUP_ATTRIBUTES:"set_group_attr",MODIFY_GROUP_ATTRIBUTES:"modify_group_attr",DELETE_GROUP_ATTRIBUTES:"delete_group_attr",CLEAR_GROUP_ATTRIBUTES:"clear_group_attr",GET_GROUP_ATTRIBUTES:"get_group_attr",SEND_MESSAGE:"sendmsg",REVOKE_C2C_MESSAGE:"msgwithdraw",DELETE_C2C_MESSAGE:"delete_c2c_msg_ramble",MODIFY_C2C_MESSAGE:"modify_c2c_msg",MODIFY_C2C_MESSAGE_EXTENSIONS:"set_key_values",GET_C2C_MESSAGE_EXTENSIONS:"get_key_values",SEND_GROUP_MESSAGE:"send_group_msg",REVOKE_GROUP_MESSAGE:"group_msg_recall",DELETE_GROUP_MESSAGE:"delete_group_ramble_msg_by_seq",MODIFY_GROUP_MESSAGE:"modify_group_msg",MODIFY_GROUP_MESSAGE_EXTENSIONS:"group_set_key_values",GET_GROUP_MESSAGE_EXTENSIONS:"group_get_key_values",GET_GROUP_INFO:"get_group_self_member_info",GET_GROUP_MEMBER_INFO:"get_specified_group_member_info",GET_GROUP_MEMBER_LIST:"get_group_member_info",GET_AVCHATROOM_MEMBER_LIST:"get_members",MARK_AVCHATROOM_MEMBER_INFO:"modify_user_info",QUIT_GROUP:"quit_group",CHANGE_GROUP_OWNER:"change_group_owner",DESTROY_GROUP:"destroy_group",ADD_GROUP_MEMBER:"add_group_member",DELETE_GROUP_MEMBER:"delete_group_member",BAN_AVCHATROOM_MEMBER:"ban_group_member",SEARCH_GROUP_BY_ID:"get_group_public_info",APPLY_JOIN_GROUP:"apply_join_group",HANDLE_APPLY_JOIN_GROUP:"handle_apply_join_group",HANDLE_INVITE_JOIN_GROUP:"handle_invite_join_permission_group",HANDLE_GROUP_INVITATION:"handle_invite_join_group",MODIFY_GROUP_INFO:"modify_group_base_info",MODIFY_GROUP_MEMBER_INFO:"modify_group_member_info",DELETE_GROUP_SYSTEM_MESSAGE:"deletemsg",DELETE_GROUP_AT_TIPS:"deletemsg",GET_GROUP_NOTIFY:"get_group_notify",GET_CONVERSATION_LIST:"get",PAGING_GET_CONVERSATION_LIST:"page_get",DELETE_CONVERSATION:"batch_delete",CLEAR_HISTORY_MESSAGE:"clear_msg",PIN_CONVERSATION:"top",SET_CONVERSATION_CUSTOM_DATA:"mark_contact",MARK_CONVERSATION:"mark_contact",CREATE_CONVERSATION_GROUP:"create_contact_group",DELETE_CONVERSATION_GROUP:"del_contact_group",UPDATE_CONVERSATION_GROUP:"update_contact_group",GET_CONVERSATION_GROUP_LIST:"get_contact_group",GET_MESSAGES:"getmsg",GET_C2C_ROAM_MESSAGES:"getroammsg",SET_C2C_PEER_MUTE_NOTIFICATIONS:"set_c2c_peer_mute_notifications",GET_C2C_PEER_MUTE_NOTIFICATIONS:"get_c2c_peer_mute_notifications",GET_GROUP_ROAM_MESSAGES:"group_msg_get",GET_READ_RECEIPT:"get_group_msg_receipt",GET_READ_RECEIPT_DETAIL:"get_group_msg_receipt_detail",SEND_READ_RECEIPT:"group_msg_receipt",SEND_C2C_READ_RECEIPT:"c2c_msg_read_receipt",SET_C2C_MESSAGE_READ:"msgreaded",GET_PEER_READ_TIME:"get_peer_read_time",SET_GROUP_MESSAGE_READ:"msg_read_report",FILE_READ_AND_WRITE_AUTHKEY:"authkey",FILE_UPLOAD:"pic_up",COS_SIGN:"cos",COS_PRE_SIG:"pre_sig",VIDEO_COVER:"video_cover",TIM_WEB_REPORT_V2:"tim_web_report_v2",BIG_DATA_HALLWAY_AUTH_KEY:"authkey",GET_ONLINE_MEMBER_NUM:"get_online_member_num",ALIVE:"alive",MESSAGE_PUSH:"msg_push",MULTI_MESSAGE_PUSH:"multi_msg_push_ws",MESSAGE_PUSH_ACK:"ws_msg_push_ack",STATUS_FORCE_OFFLINE:"stat_forceoffline",DOWNLOAD_MERGER_MESSAGE:"get_relay_json_msg",UPLOAD_MERGER_MESSAGE:"save_relay_json_msg",FETCH_CLOUD_CONTROL_CONFIG:"fetch_config",PUSHED_CLOUD_CONTROL_CONFIG:"push_configv2",FETCH_COMMERCIAL_CONFIG:"fetch_imsdk_purchase_bitsv2",PUSHED_COMMERCIAL_CONFIG:"push_imsdk_purchase_bitsv2",KICK_OTHER:"KickOther",OVERLOAD_NOTIFY:"notify2",SET_ALL_MESSAGE_READ:"read_all_unread_msg",CREATE_TOPIC:"create_topic",DELETE_TOPIC:"destroy_topic",UPDATE_TOPIC_PROFILE:"modify_topic",GET_TOPIC_LIST:"get_topic",SET_SELF_STATUS:"ws_set_custom_status",GET_USER_STATUS:"ws_get_user_status",SUBSCRIBE_USER_STATUS:"ws_status_subscribe",UNSUBSCRIBE_USER_STATUS:"ws_status_unsubscribe",GET_RPOFANITY_LIST:"get_local_words",TRANSLATE_TEXT:"ws_batch_trans_text",UPDATE_GROUP_COUNTER:"update_group_counter",GET_GROUP_COUNTER:"get_group_counter"},CHANNEL:{SOCKET:1,XHR:2,AUTO:0},NAME_VERSION:{openim:"v4",group_open_http_svc:"v4",sns:"v4",profile:"v4",recentcontact:"v4",openpic:"v4",group_open_http_noauth_svc:"v4",group_open_long_polling_http_svc:"v4",group_open_long_polling_http_noauth_svc:"v4",imopenstat:"v4",im_cos_sign_svr:"v4",im_cos_msg:"v4",webim:"v4",im_open_push:"v4",im_open_status:"v4"}},B={SEARCH_MSG:new E(0,Math.pow(2,0)).toString(),SEARCH_GRP_SNS:new E(0,Math.pow(2,1)).toString(),AVCHATROOM_HISTORY_MSG:new E(0,Math.pow(2,2)).toString(),GRP_COMMUNITY:new E(0,Math.pow(2,3)).toString(),MSG_TO_SPECIFIED_GRP_MBR:new E(0,Math.pow(2,4)).toString(),AVCHATROOM_MBR_LIST:new E(0,Math.pow(2,6)).toString(),USER_STATUS:new E(0,Math.pow(2,7)).toString(),CONV_MARK:new E(0,Math.pow(2,9)).toString(),CONV_GROUP:new E(0,Math.pow(2,10)).toString(),AVCHATROOM_BAN_MBR:new E(0,Math.pow(2,11)).toString(),MSG_EXT:new E(0,Math.pow(2,13)).toString(),GRP_COUNTER:new E(0,Math.pow(2,15)).toString()},H="c2c_text_message",K="c2c_custom_message",W="group_text_message",j="group_custom_message",Y="user_profile",z="group_profile",J="group_member_profile";V.HOST.setCurrent(G);var X,Q,Z,$,ee="undefined"!=typeof wx&&"function"==typeof wx.getSystemInfoSync&&Boolean(wx.getSystemInfoSync().fontSizeSetting),te="undefined"!=typeof qq&&"function"==typeof qq.getSystemInfoSync&&Boolean(qq.getSystemInfoSync().fontSizeSetting),ne="undefined"!=typeof tt&&"function"==typeof tt.getSystemInfoSync&&Boolean(tt.getSystemInfoSync().fontSizeSetting),oe="undefined"!=typeof swan&&"function"==typeof swan.getSystemInfoSync&&Boolean(swan.getSystemInfoSync().fontSizeSetting),se="undefined"!=typeof my&&"function"==typeof my.getSystemInfoSync&&Boolean(my.getSystemInfoSync().fontSizeSetting),ae="undefined"!=typeof jd&&"function"==typeof jd.getSystemInfoSync,re="undefined"!=typeof uni&&"undefined"==typeof window,ie="undefined"!=typeof uni,ue=ee||te||ne||oe||se||re||ae,ce=("undefined"!=typeof uni||"undefined"!=typeof window)&&!ue,le=te?qq:ne?tt:oe?swan:se?my:ee?wx:re?uni:ae?jd:{},pe=ce&&window&&window.navigator&&window.navigator.userAgent||"",de=/(micromessenger|webbrowser)/i.test(pe),ge=/AppleWebKit\/([\d.]+)/i.exec(pe),he=(ge&&parseFloat(ge.pop()),X="WEB",de?X="WEB":te?X="QQ_MP":ne?X="TT_MP":oe?X="BAIDU_MP":se?X="ALI_MP":ee?X="WX_MP":re&&(X="UNI_NATIVE_APP"),R[X]),_e=/iPad/i.test(pe),fe=/iPhone/i.test(pe)&&!_e,ve=/iPod/i.test(pe),me=fe||_e||ve,Me=(Q=pe.match(/OS (\d+)_/i))&&Q[1]?Q[1]:null,ye=/Android/i.test(pe),Ie=function(){var e=pe.match(/Android (\d+)(?:\.(\d+))?(?:\.(\d+))*/i);if(!e)return null;var t=e[1]&&parseFloat(e[1]),n=e[2]&&parseFloat(e[2]);return t&&n?parseFloat(e[1]+"."+e[2]):t||null}(),Ce=(ye&&/webkit/i.test(pe),/Firefox/i.test(pe),/Edge/i.test(pe)),Te=!Ce&&/Chrome/i.test(pe),De=(function(){var e=pe.match(/Chrome\/(\d+)/);e&&e[1]&&parseFloat(e[1])}(),/MSIE/.test(pe)||pe.indexOf("Trident")>-1&&pe.indexOf("rv:11.0")>-1),ke=(/MSIE\s8\.0/.test(pe),function(){var e=/MSIE\s(\d+)\.\d/.exec(pe),t=e&&parseFloat(e[1]);return!t&&/Trident\/7.0/i.test(pe)&&/rv:11.0/.test(pe)&&(t=11),t}()),Se=(/Safari/i.test(pe),/TBS\/\d+/i.test(pe)),Le=(function(){var e=pe.match(/TBS\/(\d+)/i);if(e&&e[1])e[1]}(),!Se&&/MQQBrowser\/\d+/i.test(pe),!Se&&/ QQBrowser\/\d+/i.test(pe),/Windows/i.test(pe)),Ee=/MAC OS X/i.test(pe),Ae=(/MicroMessenger/i.test(pe),ce&&"undefined"!=typeof Worker&&!De),Re=ye||me,Ne=ce&&void 0!==window.tencent_cloud_im_csig_flutter_for_web_25F_cy;Z="undefined"!=typeof console?console:"undefined"!=typeof global&&global.console?global.console:"undefined"!=typeof window&&window.console?window.console:{};for(var Oe=function(){},Ge=["assert","clear","count","debug","dir","dirxml","error","group","groupCollapsed","groupEnd","info","log","profile","profileEnd","table","time","timeEnd","timeStamp","trace","warn"],Pe=Ge.length;Pe--;)$=Ge[Pe],console[$]||(Z[$]=Oe);var Ue=Z,be=0,we=function(){return(new Date).getTime()+be},qe=function(){be=0},Fe=function(){return Math.floor(we()/1e3)},xe=0;function Ve(){return zt()?"%c TIM %c":"TIM"}function Be(){var e,t=((e=new Date).setTime(we()),e);return t.toLocaleTimeString("en-US",{hour12:!1})+"."+function(e){var t;switch(e.toString().length){case 1:t="00"+e;break;case 2:t="0"+e;break;default:t=e}return t}(t.getMilliseconds())}var He={arguments2String:function(e){var t="";if(1===e.length)t=e[0];else for(var n=0,o=e.length;n<o;n++)ct(e[n])?pt(e[n])?t+=vt(e[n]):t+=JSON.stringify(e[n]):t+=e[n],t+=" ";return t},_exec:function(e,t){zt()?Ue[e](Ve(),"background:#0abf5b; padding:1px; border-radius:3px; color: #fff","background:transparent",Be(),t):Ue[e]("".concat(Ve()," ").concat(Be()," ").concat(t))},d:function(){if(xe<=-1){var e=this.arguments2String(arguments);this._exec("debug",e)}},l:function(){if(xe<=0){var e=this.arguments2String(arguments);this._exec("log",e)}},log:function(){if(xe<=0){var e=this.arguments2String(arguments);this._exec("log",e)}},i:function(){if(xe<=1){var e=this.arguments2String(arguments);this._exec("info",e)}},w:function(){if(xe<=2){var e=this.arguments2String(arguments);this._exec("warn",e)}},e:function(){if(xe<=3){var e=this.arguments2String(arguments);this._exec("error",e)}},setLevel:function(e){e<4&&this._exec("log","set level from "+xe+" to "+e),xe=e},getLevel:function(){return xe}},Ke={JPG:1,JPEG:1,GIF:2,PNG:3,BMP:4,UNKNOWN:255},We={NICK:"Tag_Profile_IM_Nick",GENDER:"Tag_Profile_IM_Gender",BIRTHDAY:"Tag_Profile_IM_BirthDay",LOCATION:"Tag_Profile_IM_Location",SELFSIGNATURE:"Tag_Profile_IM_SelfSignature",ALLOWTYPE:"Tag_Profile_IM_AllowType",LANGUAGE:"Tag_Profile_IM_Language",AVATAR:"Tag_Profile_IM_Image",MESSAGESETTINGS:"Tag_Profile_IM_MsgSettings",ADMINFORBIDTYPE:"Tag_Profile_IM_AdminForbidType",LEVEL:"Tag_Profile_IM_Level",ROLE:"Tag_Profile_IM_Role"},je={UNKNOWN:"Gender_Type_Unknown",FEMALE:"Gender_Type_Female",MALE:"Gender_Type_Male"},Ye={NONE:"AdminForbid_Type_None",SEND_OUT:"AdminForbid_Type_SendOut"},ze={NEED_CONFIRM:"AllowType_Type_NeedConfirm",ALLOW_ANY:"AllowType_Type_AllowAny",DENY_ANY:"AllowType_Type_DenyAny"},Je="JoinedSuccess",Xe="WaitAdminApproval",Qe="@TGS#_",Ze="@TOPIC#_",$e=["url"],et=function(e){return"map"===dt(e)},nt=function(e){return"file"===dt(e)},ot=function(e){return null!==e&&("number"==typeof e&&!isNaN(e-0)||"object"===n(e)&&e.constructor===Number)},st=function(e){return"string"==typeof e},at=function(e){return null!==e&&"object"===n(e)},rt=function(e){if("object"!==n(e)||null===e)return!1;var t=Object.getPrototypeOf(e);if(null===t)return!0;for(var o=t;null!==Object.getPrototypeOf(o);)o=Object.getPrototypeOf(o);return t===o},it=function(e){return"function"==typeof Array.isArray?Array.isArray(e):"array"===dt(e)},ut=function(e){return void 0===e},ct=function(e){return it(e)||at(e)},lt=function(e){return"function"==typeof e},pt=function(e){return e instanceof Error},dt=function(e){return Object.prototype.toString.call(e).match(/^\[object (.*)\]$/)[1].toLowerCase()},gt=function(e){if("string"!=typeof e)return!1;var t=e[0];return!/[^a-zA-Z0-9]/.test(t)},ht=0;Date.now||(Date.now=function(){return(new Date).getTime()});var _t=function(){0===ht&&(ht=Date.now()-1);var e=Date.now()-ht;return e>4294967295?(ht+=4294967295,Date.now()-ht):e},ft=function e(t,n,o,s){if(!ct(t)||!ct(n))return 0;for(var a,r=0,i=Object.keys(n),u=0,c=i.length;u<c;u++)if(a=i[u],!(ut(n[a])||o&&o.includes(a)))if(ct(t[a])&&ct(n[a]))r+=e(t[a],n[a],o,s);else{if(s&&s.includes(n[a]))continue;t[a]!==n[a]&&(t[a]=n[a],r+=1)}return r},vt=function(e){return JSON.stringify(e,["message","code"])},mt=function(e){if(0===e.length)return 0;for(var t=0,n=0,o="undefined"!=typeof document&&void 0!==document.characterSet?document.characterSet:"UTF-8";void 0!==e[t];)n+=e[t++].charCodeAt[t]<=255?1:!1===o?3:2;return n},Mt=function(e){var t=e||99999999;return Math.round(Math.random()*t)},yt="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",It=yt.length,Ct=function(e,t){for(var n in e)if(e[n]===t)return!0;return!1},Tt={},Dt=function(e){return-1===e.indexOf("http://")||-1===e.indexOf("https://")?"https://"+e:e.replace(/https|http/,"https")},kt=function e(t){if(0===Object.getOwnPropertyNames(t).length)return Object.create(null);var o=Array.isArray(t)?[]:Object.create(null),s="";for(var a in t)null!==t[a]?void 0!==t[a]?(s=n(t[a]),["string","number","function","boolean"].indexOf(s)>=0?o[a]=t[a]:o[a]=e(t[a])):o[a]=void 0:o[a]=null;return o};function St(e,t){it(e)&&it(t)&&t.forEach((function(t){var n=t.key,o=t.value,s=e.find((function(e){return e.key===n}));s?s.value=o:e.push({key:n,value:o})}))}var Lt=function(e){return e===S.GRP_AVCHATROOM},Et=function(e){var t=e.type,n=e.groupID;return t===S.GRP_COMMUNITY||"".concat(n).startsWith(Qe)&&!"".concat(n).includes(Ze)},At=function(e){return"".concat(e).startsWith(Qe)&&"".concat(e).includes(Ze)},Rt=function(e){return st(e)&&e.slice(0,3)===S.CONV_C2C},Nt=function(e){return st(e)&&e.slice(0,5)===S.CONV_GROUP},Ot=function(e){return st(e)&&e===S.CONV_SYSTEM};function Gt(e,t){var n={};return Object.keys(e).forEach((function(o){n[o]=t(e[o],o)})),n}function Pt(e){return ue?new Promise((function(t,n){le.getImageInfo({src:e,success:function(e){t({width:e.width,height:e.height})},fail:function(){t({width:0,height:0})}})})):De&&9===ke?Promise.resolve({width:0,height:0}):new Promise((function(t,n){var o=new Image;o.onload=function(){t({width:this.width,height:this.height}),o=null},o.onerror=function(){t({width:0,height:0}),o=null},o.src=e}))}function Ut(){function e(){return(65536*(1+Math.random())|0).toString(16).substring(1)}return"".concat(e()+e()).concat(e()).concat(e()).concat(e()).concat(e()).concat(e()).concat(e())}function bt(){var e="unknown";if(Ee&&(e="mac"),Le&&(e="windows"),me&&(e="ios"),ye&&(e="android"),ue)try{var t=le.getSystemInfoSync().platform;void 0!==t&&(e=t)}catch(n){}return e}function wt(e,t){e=e.split("."),t=t.split(".");for(var n=Math.max(e.length,t.length);e.length<n;)e.push("0");for(;t.length<n;)t.push("0");for(var o=0;o<n;o++){var s=parseInt(e[o]),a=parseInt(t[o]);if(s>a)return 1;if(s<a)return-1}return 0}function qt(e){var t=e.originUrl,n=void 0===t?void 0:t,o=e.originWidth,s=e.originHeight,a=e.min,r=void 0===a?198:a,i=parseInt(o),u=parseInt(s),c={url:void 0,width:0,height:0};if((i<=u?i:u)<=r)c.url=n,c.width=i,c.height=u;else{u<=i?(c.width=Math.ceil(i*r/u),c.height=r):(c.width=r,c.height=Math.ceil(u*r/i));var l=n&&n.indexOf("?")>-1?"".concat(n,"&"):"".concat(n,"?");c.url="".concat(l,198===r?"imageView2/3/w/198/h/198":"imageView2/3/w/720/h/720")}return ut(n)?g(c,$e):c}function Ft(e){var t=e[2];e[2]=e[1],e[1]=t;for(var n=0;n<e.length;n++)e[n].setType(n)}function xt(e){var t=e.servcmd;return t.slice(t.indexOf(".")+1)}function Vt(e,t){return Math.round(Number(e)*Math.pow(10,t))/Math.pow(10,t)}function Bt(e,t){return e.includes(t)}function Ht(e,t){return e.includes(t)}function Kt(e){return e.split(Ze)[0]}var Wt=function(e,t,n){if(ut(t))return"";switch(e){case S.MSG_TEXT:return t.text;case S.MSG_IMAGE:return n?"[Image]":"[图片]";case S.MSG_LOCATION:return n?"[Location]":"[位置]";case S.MSG_AUDIO:return n?"[Voice]":"[语音]";case S.MSG_VIDEO:return n?"[Video]":"[视频]";case S.MSG_FILE:return n?"[File]":"[文件]";case S.MSG_CUSTOM:return n?"[Custom Messages]":"[自定义消息]";case S.MSG_GRP_TIP:return n?"[Group Notification]":"[群提示消息]";case S.MSG_GRP_SYS_NOTICE:return n?"[Group System Message]":"[群系统通知]";case S.MSG_FACE:return n?"[Animated Sticker]":"[动画表情]";case S.MSG_MERGER:return n?"[Chat Record]":"[聊天记录]";default:return""}};function jt(e){return e===S.MSG_TEXT||e===S.MSG_CUSTOM||e===S.MSG_LOCATION||e===S.MSG_FACE}function Yt(e){var t=[];if(!st(e))return t;var n=e.length;if(0===n)return t;for(var o=n-1;o>=0;o--)"1"===e[o]&&t.push(Math.pow(2,n-o-1));return t}function zt(){return!De&&!ue}function Jt(e){return"the length of userIDList cannot exceed ".concat(e)}function Xt(e,t){if(e){var n=e;return t&&(e.startsWith("http://")?n=e.replace(/^http:\/\/[^/]+/,t):e.startsWith("https://")&&(n=e.replace(/^https:\/\/[^/]+/,t))),n}}var Qt=Object.prototype.hasOwnProperty;function Zt(e){if(null==e)return!0;if("boolean"==typeof e)return!1;if("number"==typeof e)return 0===e;if("string"==typeof e)return 0===e.length;if("function"==typeof e)return 0===e.length;if(Array.isArray(e))return 0===e.length;if(e instanceof Error)return""===e.message;if(rt(e)){for(var t in e)if(Qt.call(e,t))return!1;return!0}return!(!et(e)&&(n=e,"set"!==dt(n))&&!nt(e))&&0===e.size;var n}function $t(e,t,n){if(void 0===t)return!0;var o=!0;if(rt(t))Object.keys(t).forEach((function(s){var a=1===e.length?e[0][s]:void 0;o=!!en(a,t[s],n,s)&&o}));else if(it(t))for(var s=0;s<t.length;s++)o=!!en(e[s],t[s],n,t[s].name)&&o;if(o)return o;throw new Error("Params validate failed.")}function en(e,t,n,o){if(void 0===t)return!0;var s=!0;if(t.required&&Zt(e)&&(He.e("[".concat(n,'] Missing required params: "').concat(o,'".')),s=!1),!Zt(e)){var a=dt(e),r=t.type.toLowerCase();a!==r&&("asyncfunction"===a&&"function"===r||(He.e("[".concat(n,'] Invalid params: type check failed for "').concat(o,'".Expected ').concat(t.type,".")),s=!1))}return t.validator&&!t.validator(e)&&(He.e("[".concat(n,"] Invalid params: custom validator check failed for params.")),s=!1),s}var tn,nn={UNSEND:"unSend",SUCCESS:"success",FAIL:"fail"},on={NOT_START:"notStart",PENDING:"pending",RESOLVED:"resolved",REJECTED:"rejected"},sn=function(e){if(!e)return!1;if(Rt(e)||Nt(e)||Ot(e))return!0;var t=Nn("InvalidConversationID",e);return t&&He.w(t),!1},an=function(e){""!==e.desc&&""!==Nn("API_REFER")&&He.w("[".concat(e.api,"] | ").concat(e.param," | ").concat(e.desc,", ").concat(Nn("API_REFER")).concat(e.api))},rn=function(){return Nn("StringRequiredLog")},un=function(e){return Nn("NonEmptyStringRequiredLog",e)},cn=function(){return Nn("NumberRequiredLog")},ln=function(){return Nn("UndefinedNotAllowedLog")},pn=function(){return Nn("FileRequiredLog")},dn=function(){return Nn("FunctionRequiredLog")},gn=function(){return Nn("ArrayRequiredLog")},hn=function(){return Nn("NonEmptyArrayLog")},_n=function(){return Nn("CallbackMissingLog")},fn=function(){return Nn("PositiveIntegerRequiredLog")},vn=function(e,t){return Nn("StringNotLongerThanLog",e,t)},mn=function(e,t){return Nn("NumberLessThanLog",e,t)},Mn=function(e){return Nn("KeyValueStringRequiredLog",e)},yn=function(){return Nn("PlainObjectRequiredLog")},In=function(){return Nn("NonEmptyContentRequiredLog")},Cn=function(){return Nn("FileNotSelectedLog")},Tn=function(){return Nn("MessageInstanceRequiredLog")},Dn=function(){return Nn("NonAnonymousFunctionLog")},kn=function(){return Nn("MessageExtensionNotAvailableLog")},Sn={type:"String",required:!0},Ln={type:"Array",required:!0},En={type:"Object",required:!0},An={type:"Boolean",required:!0},Rn={type:"number",required:!0},Nn=null,On={hookGetAPITips:function(e){Nn=e},login:{userID:Sn,userSig:Sn},addToBlacklist:{userIDList:Ln},removeFromBlacklist:{userIDList:Ln},on:[{name:"eventName",type:"String",validator:function(e){return"string"==typeof e&&0!==e.length||(an({api:"on",param:"eventName",desc:un("eventName")}),!1)}},{name:"handler",type:"Function",validator:function(e){return"function"!=typeof e?(an({api:"on",param:"handler",desc:dn()}),!1):(""===e.name&&an({api:"on",param:"handler",desc:Dn()}),!0)}}],once:[{name:"eventName",type:"String",validator:function(e){return"string"==typeof e&&0!==e.length||(an({api:"once",param:"eventName",desc:un("eventName")}),!1)}},{name:"handler",type:"Function",validator:function(e){return"function"!=typeof e?(an({api:"once",param:"handler",desc:dn()}),!1):(""===e.name&&an({api:"once",param:"handler",desc:Dn()}),!0)}}],off:[{name:"eventName",type:"String",validator:function(e){return"string"==typeof e&&0!==e.length||(an({api:"off",param:"eventName",desc:un("eventName")}),!1)}},{name:"handler",type:"Function",validator:function(e){return"function"!=typeof e?(an({api:"off",param:"handler",desc:dn()}),!1):(""===e.name&&an({api:"off",param:"handler",desc:Dn()}),!0)}}],sendMessage:[t({name:"message"},En)],setMessageExtensions:[t(t({name:"message"},En),{},{validator:function(e){return e.status===nn.SUCCESS&&!0===e.isSupportExtension||(an({api:"setMessageExtensions",param:"message",desc:kn()}),!1)}}),t({name:"extensions"},Ln)],getMessageExtensions:[t(t({name:"message"},En),{},{validator:function(e){return e.status===nn.SUCCESS&&!0===e.isSupportExtension||(an({api:"getMessageExtensions",param:"message",desc:kn()}),!1)}})],deleteMessageExtensions:[t(t({name:"message"},En),{},{validator:function(e){return e.status===nn.SUCCESS&&!0===e.isSupportExtension||(an({api:"deleteMessageExtensions",param:"message",desc:kn()}),!1)}})],getMessageList:{conversationID:t(t({},Sn),{},{validator:function(e){return sn(e)}}),nextReqMessageID:{type:"String"},count:{type:"Number",validator:function(e){return!(!ut(e)&&!/^[1-9][0-9]*$/.test(e))||(an({api:"getMessageList",param:"count",desc:fn()}),!1)}}},getMessageListHopping:{conversationID:t(t({},Sn),{},{validator:function(e){return sn(e)}}),sequence:{type:"Number"},time:{type:"Number"},direction:{type:"Number",validator:function(e){return!(!ut(e)&&0!==e&&1!==e)||(an({api:"getMessageListHopping",param:"direction",desc:Nn("0Or1RequiredLog")}),!1)}},count:{type:"Number",validator:function(e){return!(!ut(e)&&!/^[1-9][0-9]*$/.test(e))||(an({api:"getMessageListHopping",param:"count",desc:fn}),!1)}}},setMessageRead:{conversationID:t(t({},Sn),{},{validator:function(e){return sn(e)}})},setAllMessageRead:{scope:{type:"String",required:!1,validator:function(e){return!e||-1!==[S.READ_ALL_C2C_MSG,S.READ_ALL_GROUP_MSG,S.READ_ALL_MSG].indexOf(e)||(an({api:"setAllMessageRead",param:"scope",desc:"TIM.TYPES.READ_ALL_C2C_MSG or TIM.TYPES.READ_ALL_GROUP_MSG or TIM.TYPES.READ_ALL_MSG required"}),!1)}}},getConversationProfile:[t(t({name:"conversationID"},Sn),{},{validator:function(e){return sn(e)}})],clearHistoryMessage:[t(t({name:"conversationID"},Sn),{},{validator:function(e){return sn(e)}})],pinConversation:{conversationID:t(t({},Sn),{},{validator:function(e){return sn(e)}}),isPinned:t({},An)},setConversationCustomData:{conversationIDList:t({},Ln),customData:{type:"String",validator:function(e){return st(e)?!(e.length>256)||(an({api:"setConversationCustomData",param:"customData",desc:vn("customData",256)}),!1):(an({api:"setConversationCustomData",param:"customData",desc:rn()}),!1)}}},markConversation:{conversationIDList:t({},Ln),markType:{type:"number",validator:function(e){return ot(e)?e<=0?(an({api:"markConversation",param:"markType",desc:(t="markType",n=0,Nn("NumberGreaterThanLog",t,n))}),!1):!(e>=Math.pow(2,64))||(an({api:"markConversation",param:"markType",desc:mn("markType","Math.pow(2,64)")}),!1):(an({api:"markConversation",param:"markType",desc:cn()}),!1);var t,n}},enableMark:t({},An)},createConversationGroup:{conversationIDList:t({},Ln),groupName:t(t({},Sn),{},{validator:function(e){return!!e&&(!(e.length>32)||(an({api:"createConversationGroup",param:"groupName",desc:vn("groupName",32)}),!1))}})},deleteConversationGroup:[t({name:"groupName"},Sn)],renameConversationGroup:{oldName:t({},Sn),newName:t(t({},Sn),{},{validator:function(e){return!!e&&(!(e.length>32)||(an({api:"renameConversationGroup",param:"newName",desc:vn("newName",32)}),!1))}})},addConversationsToGroup:{conversationIDList:t({},Ln),groupName:t({},Sn)},deleteConversationsFromGroup:{conversationIDList:t({},Ln),groupName:t({},Sn)},getGroupList:{groupProfileFilter:{type:"Array"}},getGroupProfile:{groupID:Sn,groupCustomFieldFilter:{type:"Array"},memberCustomFieldFilter:{type:"Array"}},getGroupProfileAdvance:{groupIDList:Ln},createGroup:{name:Sn},joinGroup:{groupID:Sn,type:{type:"String"},applyMessage:{type:"String"}},quitGroup:[t({name:"groupID"},Sn)],handleApplication:{message:En,handleAction:Sn,handleMessage:{type:"String"}},changeGroupOwner:{groupID:Sn,newOwnerID:Sn},updateGroupProfile:{groupID:Sn,muteAllMembers:{type:"Boolean"}},dismissGroup:[t({name:"groupID"},Sn)],searchGroupByID:[t({name:"groupID"},Sn)],initGroupAttributes:{groupID:Sn,groupAttributes:t(t({},En),{},{validator:function(e){var t=!0;return Object.keys(e).forEach((function(n){if(!st(e[n]))return an({api:"initGroupAttributes",param:"groupAttributes",desc:Mn("value")}),t=!1})),t}})},setGroupAttributes:{groupID:Sn,groupAttributes:t(t({},En),{},{validator:function(e){var t=!0;return Object.keys(e).forEach((function(n){if(!st(e[n]))return an({api:"setGroupAttributes",param:"groupAttributes",desc:Mn("value")}),t=!1})),t}})},deleteGroupAttributes:{groupID:Sn,keyList:{type:"Array",validator:function(e){if(ut(e)||!it(e))return an({api:"deleteGroupAttributes",param:"keyList",desc:gn()}),!1;if(!Zt(e)){var t=!0;return e.forEach((function(e){if(!st(e))return an({api:"deleteGroupAttributes",param:"keyList",desc:Nn("StringArrayRequiredLog")}),t=!1})),t}return!0}}},getGroupAttributes:{groupID:Sn,keyList:{type:"Array",validator:function(e){if(ut(e)||!it(e))return an({api:"getGroupAttributes",param:"keyList",desc:gn()}),!1;if(!Zt(e)){var t=!0;return e.forEach((function(e){if(!st(e))return an({api:"getGroupAttributes",param:"keyList",desc:Mn("key")}),t=!1})),t}return!0}}},setGroupCounters:{groupID:Sn,counters:En},increaseGroupCounter:{groupID:Sn,key:Sn,value:Rn},decreaseGroupCounter:{groupID:Sn,key:Sn,value:Rn},getGroupCounters:{groupID:Sn},getGroupMemberList:{groupID:Sn,count:{type:"Number"}},getGroupMemberProfile:{groupID:Sn,userIDList:Ln,memberCustomFieldFilter:{type:"Array"}},addGroupMember:{groupID:Sn,userIDList:Ln},setGroupMemberRole:{groupID:Sn,userID:Sn,role:Sn},setGroupMemberMuteTime:{groupID:Sn,userID:Sn,muteTime:{type:"Number",validator:function(e){return e>=0}}},setGroupMemberNameCard:{groupID:Sn,userID:{type:"String"},nameCard:{type:"String",validator:function(e){return st(e)?(e.length,!0):(an({api:"setGroupMemberNameCard",param:"nameCard",desc:rn()}),!1)}}},setGroupMemberCustomField:{groupID:Sn,userID:{type:"String"},memberCustomField:Ln},deleteGroupMember:{groupID:Sn},markGroupMemberList:{groupID:Sn,markType:{type:"number",validator:function(e){return ot(e)?!(e<1e3)||(an({api:"markGroupMemberList",param:"markType",desc:(t="markType",n=1e3,Nn("NumberGreaterOrEqualLog",t,n))}),!1):(an({api:"markGroupMemberList",param:"markType",desc:cn()}),!1);var t,n}},userIDList:t({},Ln),enableMark:t({},An)},createTextMessage:{to:Sn,conversationType:Sn,payload:t(t({},En),{},{validator:function(e){return rt(e)?st(e.text)?0!==e.text.length||(an({api:"createTextMessage",param:"payload.text",desc:In()}),!1):(an({api:"createTextMessage",param:"payload.text",desc:rn()}),!1):(an({api:"createTextMessage",param:"payload",desc:yn()}),!1)}})},createTextAtMessage:{to:Sn,conversationType:Sn,payload:t(t({},En),{},{validator:function(e){return rt(e)?st(e.text)?0===e.text.length?(an({api:"createTextAtMessage",param:"payload.text",desc:In()}),!1):!(e.atUserList&&!it(e.atUserList))||(an({api:"createTextAtMessage",param:"payload.atUserList",desc:gn()}),!1):(an({api:"createTextAtMessage",param:"payload.text",desc:rn()}),!1):(an({api:"createTextAtMessage",param:"payload",desc:yn()}),!1)}})},createCustomMessage:{to:Sn,conversationType:Sn,payload:t(t({},En),{},{validator:function(e){return rt(e)?e.data&&!st(e.data)?(an({api:"createCustomMessage",param:"payload.data",desc:rn()}),!1):e.description&&!st(e.description)?(an({api:"createCustomMessage",param:"payload.description",desc:rn()}),!1):!(e.extension&&!st(e.extension))||(an({api:"createCustomMessage",param:"payload.extension",desc:rn()}),!1):(an({api:"createCustomMessage",param:"payload",desc:yn()}),!1)}})},createImageMessage:{to:Sn,conversationType:Sn,payload:t(t({},En),{},{validator:function(e){if(!rt(e))return an({api:"createImageMessage",param:"payload",desc:yn()}),!1;if(ut(e.file))return an({api:"createImageMessage",param:"payload.file",desc:ln()}),!1;if(ce){if(!(e.file instanceof HTMLInputElement||nt(e.file)))return rt(e.file)&&"undefined"!=typeof uni?0!==e.file.tempFilePaths.length&&0!==e.file.tempFiles.length||(an({api:"createImageMessage",param:"payload.file",desc:Cn()}),!1):(an({api:"createImageMessage",param:"payload.file",desc:pn()}),!1);if(e.file instanceof HTMLInputElement&&0===e.file.files.length)return an({api:"createImageMessage",param:"payload.file",desc:Cn()}),!1}return!0},onProgress:{type:"Function",required:!1,validator:function(e){return ut(e)&&an({api:"createImageMessage",param:"onProgress",desc:_n()}),!0}}})},createAudioMessage:{to:Sn,conversationType:Sn,payload:t(t({},En),{},{validator:function(e){return!!rt(e)||(an({api:"createAudioMessage",param:"payload",desc:yn()}),!1)}}),onProgress:{type:"Function",required:!1,validator:function(e){return ut(e)&&an({api:"createAudioMessage",param:"onProgress",desc:_n()}),!0}}},createVideoMessage:{to:Sn,conversationType:Sn,payload:t(t({},En),{},{validator:function(e){if(!rt(e))return an({api:"createVideoMessage",param:"payload",desc:yn()}),!1;if(ut(e.file))return an({api:"createVideoMessage",param:"payload.file",desc:ln()}),!1;if(ce){if(!(e.file instanceof HTMLInputElement||nt(e.file)))return rt(e.file)&&"undefined"!=typeof uni?!!nt(e.file.tempFile)||(an({api:"createVideoMessage",param:"payload.file",desc:Cn()}),!1):(an({api:"createVideoMessage",param:"payload.file",desc:pn()}),!1);if(e.file instanceof HTMLInputElement&&0===e.file.files.length)return an({api:"createVideoMessage",param:"payload.file",desc:Cn()}),!1}return!0}}),onProgress:{type:"Function",required:!1,validator:function(e){return ut(e)&&an({api:"createVideoMessage",param:"onProgress",desc:_n()}),!0}}},createFaceMessage:{to:Sn,conversationType:Sn,payload:t(t({},En),{},{validator:function(e){return rt(e)?ot(e.index)?!!st(e.data)||(an({api:"createFaceMessage",param:"payload.data",desc:rn()}),!1):(an({api:"createFaceMessage",param:"payload.index",desc:cn()}),!1):(an({api:"createFaceMessage",param:"payload",desc:yn()}),!1)}})},createFileMessage:{to:Sn,conversationType:Sn,payload:t(t({},En),{},{validator:function(e){if(!rt(e))return an({api:"createFileMessage",param:"payload",desc:yn()}),!1;if(ut(e.file))return an({api:"createFileMessage",param:"payload.file",desc:ln()}),!1;if(ce){if(!(e.file instanceof HTMLInputElement||nt(e.file)))return rt(e.file)&&"undefined"!=typeof uni?0!==e.file.tempFilePaths.length&&0!==e.file.tempFiles.length||(an({api:"createFileMessage",param:"payload.file",desc:Cn()}),!1):(an({api:"createFileMessage",param:"payload.file",desc:pn()}),!1);if(e.file instanceof HTMLInputElement&&0===e.file.files.length)return an({api:"createFileMessage",param:"payload.file",desc:Cn()}),!1}return!0}}),onProgress:{type:"Function",required:!1,validator:function(e){return ut(e)&&an({api:"createFileMessage",param:"onProgress",desc:_n()}),!0}}},createLocationMessage:{to:Sn,conversationType:Sn,payload:t(t({},En),{},{validator:function(e){return rt(e)?st(e.description)?ot(e.longitude)?!!ot(e.latitude)||(an({api:"createLocationMessage",param:"payload.latitude",desc:cn()}),!1):(an({api:"createLocationMessage",param:"payload.longitude",desc:cn()}),!1):(an({api:"createLocationMessage",param:"payload.description",desc:rn()}),!1):(an({api:"createLocationMessage",param:"payload",desc:yn()}),!1)}})},createMergerMessage:{to:Sn,conversationType:Sn,payload:t(t({},En),{},{validator:function(e){if(Zt(e.messageList))return an({api:"createMergerMessage",param:"payload.messageList",desc:hn()}),!1;if(Zt(e.compatibleText))return an({api:"createMergerMessage",param:"payload.compatibleText",desc:un("compatibleText")}),!1;var t=!1;return e.messageList.forEach((function(e){e.status===nn.FAIL&&(t=!0)})),!t||(an({api:"createMergerMessage",param:"payload.messageList",desc:Nn("MergeFailedMessageLog")}),!1)}})},revokeMessage:[t(t({name:"message"},En),{},{validator:function(e){return Zt(e)?(an({api:"revokeMessage",param:"message",desc:Tn()}),!1):e.conversationType===S.CONV_SYSTEM?(an({api:"revokeMessage",param:"message",desc:Nn("MessageCanBeRevokedDesc")}),!1):!0!==e.isRevoked||(an({api:"revokeMessage",param:"message",desc:Nn("MessageRevokedLog")}),!1)}})],deleteMessage:[t(t({name:"messageList"},Ln),{},{validator:function(e){return!Zt(e)||(an({api:"deleteMessage",param:"messageList",desc:hn()}),!1)}})],translateText:{sourceTextList:Ln,sourceLanguage:Sn,targetLanguage:Sn},modifyMessage:[t(t({name:"message"},En),{},{validator:function(e){return Zt(e)?(an({api:"modifyMessage",param:"message",desc:Tn()}),!1):e.conversationType===S.CONV_SYSTEM?(an({api:"modifyMessage",param:"message",desc:Nn("MessageCanBeModifiedLog")}),!1):!0!==e._onlineOnlyFlag||(an({api:"modifyMessage",param:"message",desc:Nn("OnlineMessageNotSupportLog")}),!1)}})],getUserProfile:{userIDList:{type:"Array",validator:function(e){return it(e)?(0===e.length&&an({api:"getUserProfile",param:"userIDList",desc:hn()}),!0):(an({api:"getUserProfile",param:"userIDList",desc:gn()}),!1)}}},updateMyProfile:{profileCustomField:{type:"Array",validator:function(e){return!!ut(e)||(!!it(e)||(an({api:"updateMyProfile",param:"profileCustomField",desc:gn()}),!1))}}},setSelfStatus:{customStatus:{type:"String",validator:function(e){return!!st(e)||(an({api:"setSelfStatus",param:"customStatus",desc:rn()}),!1)}}},getUserStatus:{userIDList:{type:"Array",validator:function(e){return it(e)?0!==e.length||(an({api:"getUserStatus",param:"userIDList",desc:hn()}),!1):(an({api:"getUserStatus",param:"userIDList",desc:gn()}),!1)}}},subscribeUserStatus:{userIDList:{type:"Array",validator:function(e){return it(e)?0!==e.length||(an({api:"subscribeUserStatus",param:"userIDList",desc:hn()}),!1):(an({api:"subscribeUserStatus",param:"userIDList",desc:gn()}),!1)}}},unsubscribeUserStatus:{userIDList:{type:"Array",validator:function(e){return!e||(!!it(e)||(an({api:"subscribeUserStatus",param:"userIDList",desc:gn()}),!1))}}},addFriend:{to:Sn,source:{type:"String",required:!0,validator:function(e){return!!e&&(e.startsWith("AddSource_Type_")?!(e.replace("AddSource_Type_","").length>8)||(an({api:"addFriend",param:"source",desc:vn("keyword",8)}),!1):(an({api:"addFriend",param:"source",desc:Nn("SourcePrefixLog")}),!1))}},remark:{type:"String",required:!1,validator:function(e){return!(st(e)&&e.length>96)||(an({api:"addFriend",param:"remark",desc:vn("remark",96)}),!1)}}},deleteFriend:{userIDList:Ln},checkFriend:{userIDList:Ln},getFriendProfile:{userIDList:Ln},updateFriend:{userID:Sn,remark:{type:"String",required:!1,validator:function(e){return!(st(e)&&e.length>96)||(an({api:"updateFriend",param:"remark",desc:vn("remark",96)}),!1)}},friendCustomField:{type:"Array",required:!1,validator:function(e){if(e){if(!it(e))return an({api:"updateFriend",param:"friendCustomField",desc:gn()}),!1;var t=!0;return e.forEach((function(e){return st(e.key)&&-1!==e.key.indexOf("Tag_SNS_Custom")?st(e.value)?e.key.replace("Tag_SNS_Custom_","").length>8?(an({api:"updateFriend",param:"friendCustomField",desc:vn("keyword",8)}),t=!1):void 0:(an({api:"updateFriend",param:"friendCustomField",desc:Mn("value")}),t=!1):(an({api:"updateFriend",param:"friendCustomField",desc:Nn("FriendCustomFieldPrefixLog")}),t=!1)})),t}return!0}}},acceptFriendApplication:{userID:Sn},refuseFriendApplication:{userID:Sn},deleteFriendApplication:{userID:Sn},createFriendGroup:{name:Sn},deleteFriendGroup:{name:Sn},addToFriendGroup:{name:Sn,userIDList:Ln},removeFromFriendGroup:{name:Sn,userIDList:Ln},renameFriendGroup:{oldName:Sn,newName:Sn},sendMessageReadReceipt:[{name:"messageList",type:"Array",validator:function(e){return it(e)?0!==e.length||(an({api:"sendMessageReadReceipt",param:"messageList",desc:hn()}),!1):(an({api:"sendMessageReadReceipt",param:"messageList",desc:gn()}),!1)}}],getMessageReadReceiptList:[{name:"messageList",type:"Array",validator:function(e){return it(e)?0!==e.length||(an({api:"getMessageReadReceiptList",param:"messageList",desc:hn()}),!1):(an({api:"getMessageReadReceiptList",param:"messageList",desc:gn()}),!1)}}],createTopicInCommunity:{groupID:Sn,topicName:Sn},deleteTopicFromCommunity:{groupID:Sn,topicIDList:{type:"Array",validator:function(e){return!e||(!!it(e)||(an({api:"deleteTopicFromCommunity",param:"topicIDList",desc:gn()}),!1))}}},updateTopicProfile:{groupID:Sn,topicID:Sn},getTopicList:{groupID:Sn,topicIDList:{type:"Array",validator:function(e){return!e||(!!it(e)||(an({api:"getTopicList",param:"topicIDList",desc:gn()}),!1))}}}},Gn={login:1,logout:1,on:1,once:1,off:1,setLogLevel:1,registerPlugin:1,destroy:1,createTextMessage:1,createTextAtMessage:1,createImageMessage:1,createAudioMessage:1,createVideoMessage:1,createCustomMessage:1,createFaceMessage:1,createFileMessage:1,createLocationMessage:1,createMergerMessage:1,downloadMergerMessage:1,createForwardMessage:1,sendMessage:1,resendMessage:1,revokeMessage:1,deleteMessage:1,translateText:1,modifyMessage:1,sendMessageReadReceipt:1,getGroupMessageReadMemberList:1,getMessageReadReceiptList:1,setMessageExtensions:1,getMessageExtensions:1,deleteMessageExtensions:1,getMessageList:1,findMessage:1,getMessageListHopping:1,setMessageRead:1,setAllMessageRead:1,getConversationList:1,getConversationProfile:1,deleteConversation:1,pinConversation:1,getTotalUnreadMessageCount:1,setConversationCustomData:1,markConversation:1,createConversationGroup:1,getConversationGroupList:1,deleteConversationGroup:1,renameConversationGroup:1,addConversationsToGroup:1,deleteConversationsFromGroup:1,clearHistoryMessage:1,getGroupList:1,getGroupProfile:1,createGroup:1,joinGroup:1,updateGroupProfile:1,quitGroup:1,dismissGroup:1,changeGroupOwner:1,searchGroupByID:1,setMessageRemindType:1,getGroupApplicationList:1,handleGroupApplication:1,initGroupAttributes:1,setGroupAttributes:1,deleteGroupAttributes:1,getGroupAttributes:1,setGroupCounters:1,increaseGroupCounter:1,decreaseGroupCounter:1,getGroupCounters:1,getJoinedCommunityList:1,createTopicInCommunity:1,deleteTopicFromCommunity:1,updateTopicProfile:1,getTopicList:1,getGroupMemberProfile:1,getGroupMemberList:1,addGroupMember:1,deleteGroupMember:1,setGroupMemberNameCard:1,setGroupMemberMuteTime:1,setGroupMemberRole:1,setGroupMemberCustomField:1,getGroupOnlineMemberCount:1,markGroupMemberList:1,getMyProfile:1,getUserProfile:1,updateMyProfile:1,setSelfStatus:1,getUserStatus:1,subscribeUserStatus:1,unsubscribeUserStatus:1,getBlacklist:1,addToBlacklist:1,removeFromBlacklist:1,getFriendList:1,addFriend:1,deleteFriend:1,checkFriend:1,updateFriend:1,getFriendProfile:1,getFriendApplicationList:1,refuseFriendApplication:1,deleteFriendApplication:1,acceptFriendApplication:1,setFriendApplicationRead:1,getFriendGroupList:1,createFriendGroup:1,renameFriendGroup:1,deleteFriendGroup:1,addToFriendGroup:1,removeFromFriendGroup:1,callExperimentalAPI:1},Pn=1,Un=2,bn=3,wn=4,qn=6,Fn=7,xn=8,Vn=9,Bn=10,Hn=11,Kn=12,Wn=13,jn=14,Yn=15,zn=16,Jn=17,Xn=18,Qn=19,Zn=20,$n=21,eo=22,to=23,no=24,oo=25,so=26,ao=27,ro=28,io=29,uo=30,co=31,lo=32,po=function(){function e(t){o(this,e),this._m=t,this._n=""}return a(e,[{key:"isLoggedIn",value:function(){return this._m.getModule(Kn).isLoggedIn()}},{key:"isOversea",value:function(){return this._m.getModule(Kn).isOversea()}},{key:"isPrivateNetWork",value:function(){return this._m.getModule(Kn).isPrivateNetWork()}},{key:"getFileDownloadProxy",value:function(){return this._m.getModule(Kn).getFileDownloadProxy()}},{key:"getMyUserID",value:function(){return this._m.getModule(Kn).getUserID()}},{key:"getMyTinyID",value:function(){return this._m.getModule(Kn).getTinyID()}},{key:"getSDKAppID",value:function(){return this._m.getModule(Kn).getSDKAppID()}},{key:"isIntl",value:function(){return this._m.getModule(Kn).isIntl()}},{key:"isDevMode",value:function(){return this._m.getModule(Kn).isDevMode()}},{key:"getModule",value:function(e){return this._m.getModule(e)}},{key:"getPlatform",value:function(){return he}},{key:"getNetworkType",value:function(){return this._m.getModule(Yn).getNetworkType()}},{key:"probeNetwork",value:function(e){return this._m.getModule(Yn).probe(e)}},{key:"getCloudConfig",value:function(e){return this._m.getModule(to).getCloudConfig(e)}},{key:"emitOuterEvent",value:function(e,t){this._m.getOuterEmitterInstance().emit(e,t)}},{key:"emitInnerEvent",value:function(e,t){this._m.getInnerEmitterInstance().emit(e,t)}},{key:"getInnerEmitterInstance",value:function(){return this._m.getInnerEmitterInstance()}},{key:"generateTjgID",value:function(e){return this._m.getModule(Kn).getTinyID()+"-"+e.random}},{key:"filterModifiedMessage",value:function(e){if(!Zt(e)){var t=e.filter((function(e){return!0===e.isModified}));t.length>0&&this.emitOuterEvent(k.MESSAGE_MODIFIED,t)}}},{key:"filterUnmodifiedMessage",value:function(e){return Zt(e)?[]:e.filter((function(e){return!1===e.isModified}))}},{key:"request",value:function(e){return this._m.getModule(Zn).request(e)}},{key:"canIUse",value:function(e){return this._m.getModule(ao).canIUse(e)}},{key:"getErrorMessage",value:function(e,t,n){return this._m.getErrorMessage(e,t,n)}},{key:"outputWarning",value:function(e,t,n){var o=this.getErrorMessage(e,t,n);o&&He.w(o)}}]),e}(),go="wslogin",ho="wslogout",_o="wshello",fo="KickOther",vo="getmsg",mo="authkey",Mo="sendmsg",yo="send_group_msg",Io="portrait_get_all",Co="portrait_set",To="black_list_get",Do="black_list_add",ko="black_list_delete",So="msgwithdraw",Lo="msgreaded",Eo="set_c2c_peer_mute_notifications",Ao="get_c2c_peer_mute_notifications",Ro="getroammsg",No="get_peer_read_time",Oo="delete_c2c_msg_ramble",Go="modify_c2c_msg",Po="set_key_values",Uo="get_key_values",bo="page_get",wo="get",qo="batch_delete",Fo="clear_msg",xo="top",Vo="deletemsg",Bo="set_conv_custom_data",Ho="mark_contact",Ko="create_contact_group",Wo="del_contact_group",jo="update_contact_group",Yo="add_conv_to_group",zo="del_conv_from_group",Jo="get_contact_group",Xo="get_joined_group_list",Qo="get_group_self_member_info",Zo="create_group",$o="destroy_group",es="modify_group_base_info",ts="apply_join_group",ns="apply_join_group_noauth",os="quit_group",ss="get_group_public_info",as="change_group_owner",rs="handle_apply_join_group",is="handle_invite_join_permission_group",us="handle_invite_join_group",cs="group_msg_recall",ls="msg_read_report",ps="read_all_unread_msg",ds="group_msg_get",gs="get_group_msg_receipt",hs="group_msg_receipt",_s="c2c_msg_read_receipt",fs="get_group_msg_receipt_detail",vs="get_pendency",ms="deletemsg",Ms="get_msg",ys="get_msg_noauth",Is="get_online_member_num",Cs="delete_group_ramble_msg_by_seq",Ts="modify_group_msg",Ds="set_group_attr",ks="modify_group_attr",Ss="delete_group_attr",Ls="clear_group_attr",Es="get_group_attr",As="group_set_key_values",Rs="group_get_key_values",Ns="get_group_notify",Os="update_group_counter",Gs="get_group_counter",Ps="get_group_member_info",Us="get_members",bs="get_specified_group_member_info",ws="add_group_member",qs="delete_group_member",Fs="ban_group_member",xs="modify_group_member_info",Vs="modify_user_info",Bs="cos",Hs="pre_sig",Ks="video_cover",Ws="tim_web_report_v2",js="alive",Ys="msg_push",zs="multi_msg_push_ws",Js="ws_msg_push_ack",Xs="stat_forceoffline",Qs="save_relay_json_msg",Zs="get_relay_json_msg",$s="fetch_config",ea="push_configv2",ta="fetch_imsdk_purchase_bitsv2",na="push_imsdk_purchase_bitsv2",oa="notify2",sa="create_topic",aa="destroy_topic",ra="modify_topic",ia="get_topic",ua="ws_set_custom_status",ca="ws_get_user_status",la="ws_status_subscribe",pa="ws_status_unsubscribe",da="ws_stat_background",ga="ws_stat_foreground",ha="ws_stat_settoken",_a="get_local_words",fa="ws_batch_trans_text",va=2e3,ma=2002,Ma=2003,ya=2022,Ia=2023,Ca=2024,Ta=2025,Da=2040,ka=2041,Sa=2100,La=2101,Ea=2105,Aa=2106,Ra=2108,Na=2109,Oa=2110,Ga=2111,Pa=2112,Ua=2114,ba=2115,wa=2116,qa=2117,Fa=2251,xa=2252,Va=2253,Ba=2300,Ha=2301,Ka=2350,Wa=2351,ja=2352,Ya=2400,za=2401,Ja=2402,Xa=2403,Qa=2450,Za=2451,$a=2452,er=2453,tr=2480,nr=2481,or=2500,sr=2501,ar=2502,rr=2503,ir=2600,ur=2601,cr=2602,lr=2603,pr=2620,dr=2621,gr=2622,hr=2623,_r=2660,fr=2661,vr=2662,mr=2681,Mr=2682,yr=2683,Ir=2684,Cr=2685,Tr=2686,Dr=2721,kr=2722,Sr=2742,Lr=2800,Er=2801,Ar=2805,Rr=2903,Nr=2905,Or=2996,Gr=2997,Pr=2998,Ur=2999,br=3e3,wr=3001,qr=3002,Fr=3003,xr=3004,Vr=3005,Br=3006,Hr=3021,Kr=3122,Wr=3123,jr=20002,Yr=70001,zr=1002,Jr=60022,Xr="networkRTT",Qr="messageE2EDelay",Zr="sendMessageC2C",$r="sendMessageGroup",ei="sendMessageGroupAV",ti="sendMessageRichMedia",ni="cosUpload",oi="messageReceivedGroup",si="messageReceivedGroupAVPush",ai="messageReceivedGroupAVPull",ri=(r(tn={},Xr,2),r(tn,Qr,3),r(tn,Zr,4),r(tn,$r,5),r(tn,ei,6),r(tn,ti,7),r(tn,oi,8),r(tn,si,9),r(tn,ai,10),r(tn,ni,11),tn),ii={info:4,warning:5,error:6},ui={wifi:1,"2g":2,"3g":3,"4g":4,"5g":5,unknown:6,none:7,online:8},ci={login:4},li=function(){function e(t){o(this,e),this._n="SSOLogData",this.eventType=ci[t]||0,this.timestamp=0,this.networkType=8,this.code=0,this.message="",this.moreMessage="",this.extension=t,this.costTime=0,this.duplicate=!1,this.level=4,this.uiPlatform=void 0,this._sentFlag=!1,this._startts=we()}return a(e,[{key:"updateTimeStamp",value:function(){this.timestamp=we()}},{key:"start",value:function(e){return this._startts=e,this}},{key:"end",value:function(){var e=this,t=arguments.length>0&&void 0!==arguments[0]&&arguments[0];if(!this._sentFlag){var n=we();0===this.costTime&&(this.costTime=n-this._startts),this.setMoreMessage("startts:".concat(this._startts," endts:").concat(n)),t?(this._sentFlag=!0,this._eventStatModule&&this._eventStatModule.pushIn(this)):setTimeout((function(){e._sentFlag=!0,e._eventStatModule&&e._eventStatModule.pushIn(e)}),0)}}},{key:"setError",value:function(e,t,n){if(!(e instanceof Error))return He.w("".concat(this._n,".setError value not instanceof Error, please check!")),this;if(this._sentFlag)return this;if(this.setNetworkType(n),t)e.code&&this.setCode(e.code),e.message&&this.setMoreMessage(e.message);else{var o=Ar;this.setCode(o)}return this.setLevel("error"),this}},{key:"setCode",value:function(e){return ut(e)||this._sentFlag||("ECONNABORTED"===e&&(this.code=103),ot(e)?this.code=e:He.w("".concat(this._n,".setCode value not a number, please check!"),e,n(e))),this}},{key:"setMessage",value:function(e){return ut(e)||this._sentFlag||(ot(e)&&(this.message=e.toString()),st(e)&&(this.message=e)),this}},{key:"setCostTime",value:function(e){return this.costTime=e,this}},{key:"setLevel",value:function(e){return ut(e)||this._sentFlag||(this.level=ii[e]),this}},{key:"setMoreMessage",value:function(e){return Zt(this.moreMessage)?this.moreMessage="".concat(e):this.moreMessage+=" ".concat(e),this}},{key:"setNetworkType",value:function(e){if(ut(e))He.w("".concat(this._n,".setNetworkType value is undefined, please check!"));else{var t=ui[e.toLowerCase()];ut(t)||(this.networkType=t)}return this}},{key:"getStartTs",value:function(){return this._startts}},{key:"setUIPlatform",value:function(e){this.uiPlatform=e}}],[{key:"bindEventStatModule",value:function(t){e.prototype._eventStatModule=t}}]),e}(),pi=function(){function e(t){o(this,e),this.type=S.MSG_TEXT,this.content={text:t.text||""}}return a(e,[{key:"setText",value:function(e){this.content.text=e}},{key:"sendable",value:function(){return 0!==this.content.text.length}}]),e}(),di=function(){function e(t,n){o(this,e),this._imageMemoryURL="",this._fileDownloadProxy=n,ue?this.createImageDataASURLInWXMiniApp(t.file):this.createImageDataASURLInWeb(t.file),this._initImageInfoModel(),this.type=S.MSG_IMAGE,this._percent=0,this.content={imageFormat:t.imageFormat||Ke.UNKNOWN,uuid:t.uuid,imageInfoArray:[]},this.initImageInfoArray(t.imageInfoArray),this._autoFixUrl()}return a(e,[{key:"_initImageInfoModel",value:function(){var e=this;this._ImageInfoModel=function(t){this.instanceID=Mt(9999999),this.sizeType=t.type||0,this.type=0,this.size=t.size||0,this.width=t.width||0,this.height=t.height||0,this.imageUrl=t.url||"",this.url=Xt(t.url||e._imageMemoryURL,e._fileDownloadProxy)},this._ImageInfoModel.prototype={setSizeType:function(e){this.sizeType=e},setType:function(e){this.type=e},setImageUrl:function(e){e&&(this.imageUrl=e)},getImageUrl:function(){return this.imageUrl}}}},{key:"initImageInfoArray",value:function(e){for(var t=0,n=null,o=null;t<=2;)o=ut(e)||ut(e[t])?{type:0,size:0,width:0,height:0,url:""}:e[t],(n=new this._ImageInfoModel(o)).setSizeType(t+1),n.setType(t),this.addImageInfo(n),t++;this.updateAccessSideImageInfoArray()}},{key:"updateImageInfoArray",value:function(e){for(var t,n=this.content.imageInfoArray.length,o=0;o<n;o++)t=this.content.imageInfoArray[o],e[o].size&&(t.size=e[o].size),e[o].url&&t.setImageUrl(e[o].url),e[o].width&&(t.width=e[o].width),e[o].height&&(t.height=e[o].height)}},{key:"_autoFixUrl",value:function(){for(var e=this.content.imageInfoArray.length,t="",n="",o=["http","https"],s=null,a=0;a<e;a++)this.content.imageInfoArray[a].url&&""!==(s=this.content.imageInfoArray[a]).imageUrl&&(n=s.imageUrl.slice(0,s.imageUrl.indexOf("://")+1),t=s.imageUrl.slice(s.imageUrl.indexOf("://")+1),o.indexOf(n)<0&&(n="https:"),this.content.imageInfoArray[a].setImageUrl([n,t].join("")))}},{key:"updatePercent",value:function(e){this._percent=e,this._percent>1&&(this._percent=1)}},{key:"updateImageFormat",value:function(e){this.content.imageFormat=Ke[e.toUpperCase()]||Ke.UNKNOWN}},{key:"createImageDataASURLInWeb",value:function(e){void 0!==e&&e.files.length>0&&(this._imageMemoryURL=window.URL.createObjectURL(e.files[0]))}},{key:"createImageDataASURLInWXMiniApp",value:function(e){e&&e.url&&(this._imageMemoryURL=e.url)}},{key:"replaceImageInfo",value:function(e,t){this.content.imageInfoArray[t]instanceof this._ImageInfoModel||(this.content.imageInfoArray[t]=e)}},{key:"addImageInfo",value:function(e){this.content.imageInfoArray.length>=3||this.content.imageInfoArray.push(e)}},{key:"updateAccessSideImageInfoArray",value:function(){var e=this.content.imageInfoArray,t=e[0],n=t.width,o=void 0===n?0:n,s=t.height,a=void 0===s?0:s;0!==o&&0!==a&&(Ft(e),Object.assign(e[2],qt({originWidth:o,originHeight:a,min:720})))}},{key:"sendable",value:function(){return 0!==this.content.imageInfoArray.length&&(""!==this.content.imageInfoArray[0].imageUrl&&0!==this.content.imageInfoArray[0].size)}}]),e}(),gi=function(){function e(t){o(this,e),this.type=S.MSG_FACE,this.content=t||null}return a(e,[{key:"sendable",value:function(){return null!==this.content}}]),e}(),hi=function(){function e(t,n){o(this,e),this.type=S.MSG_AUDIO,this._percent=0,this.content={downloadFlag:2,second:t.second,size:t.size,url:Xt(t.url,n),remoteAudioUrl:t.url||"",uuid:t.uuid}}return a(e,[{key:"updatePercent",value:function(e){this._percent=e,this._percent>1&&(this._percent=1)}},{key:"updateAudioUrl",value:function(e){this.content.remoteAudioUrl=e}},{key:"sendable",value:function(){return""!==this.content.remoteAudioUrl}}]),e}(),_i={from:!0,groupID:!0,groupName:!0,to:!0},fi=function(){function e(t){o(this,e),this.type=S.MSG_GRP_TIP,this.content={},this._initContent(t)}return a(e,[{key:"_initContent",value:function(e){var t=this;Object.keys(e).forEach((function(n){switch(n){case"remarkInfo":break;case"groupProfile":t.content.groupProfile={},t._initGroupProfile(e[n]);break;case"operatorInfo":break;case"memberInfoList":case"msgMemberInfo":t._updateMemberList(e[n]);break;case"memberExtraInfo":case"onlineMemberInfo":break;case"memberNum":t.content[n]=e[n],t.content.memberCount=e[n];break;case"newGroupProfile":t.content.newGroupProfile={},t._initNewGroupProfile(e[n]);break;default:t.content[n]=e[n]}})),this.content.userIDList||(this.content.userIDList=[this.content.operatorID])}},{key:"_initGroupProfile",value:function(e){for(var t=Object.keys(e),n=0;n<t.length;n++){var o=t[n];_i[o]&&(this.content.groupProfile[o]=e[o])}}},{key:"_updateMemberList",value:function(e){Zt(this.content.memberList)?this.content.memberList=e:this.content.memberList.forEach((function(t){e.forEach((function(e){t.userID===e.userID&&Object.assign(t,e)}))}))}},{key:"_initNewGroupProfile",value:function(e){for(var t=Object.keys(e),n=0;n<t.length;n++){var o=t[n];"muteAllMembers"!==o?this.content.newGroupProfile[o]=e[o]:this.content.newGroupProfile[o]=1===e[o]}}}]),e}(),vi={from:!0,groupID:!0,groupName:!0,to:!0},mi=function(){function e(t){o(this,e),this.type=S.MSG_GRP_SYS_NOTICE,this.content={},this._initContent(t)}return a(e,[{key:"_initContent",value:function(e){var t=this;Object.keys(e).forEach((function(n){switch(n){case"memberInfoList":break;case"remarkInfo":t.content.handleMessage=e[n];break;case"groupProfile":t.content.groupProfile={},t._initGroupProfile(e[n]);break;default:t.content[n]=e[n]}}))}},{key:"_initGroupProfile",value:function(e){for(var t=Object.keys(e),n=0;n<t.length;n++){var o=t[n];vi[o]&&("groupName"===o?this.content.groupProfile.name=e[o]:this.content.groupProfile[o]=e[o])}}}]),e}(),Mi=function(){function e(t,n){o(this,e),this.type=S.MSG_FILE,this._percent=0;var s=this._getFileInfo(t);this.content={downloadFlag:2,fileUrl:Xt(t.url,n)||"",uuid:t.uuid,fileName:s.name||"",fileSize:s.size||0}}return a(e,[{key:"_getFileInfo",value:function(e){if(!ut(e.fileName)&&!ut(e.fileSize))return{size:e.fileSize,name:e.fileName};var t=e.file.files[0];if(re){if(t.path&&-1!==t.path.indexOf(".")){var n=t.path.slice(t.path.lastIndexOf(".")+1).toLowerCase();t.type=n,t.name||(t.name="".concat(Mt(999999),".").concat(n))}t.name||(t.type="",t.name=t.path.slice(t.path.lastIndexOf("/")+1).toLowerCase()),t.suffix&&(t.type=t.suffix),t.url||(t.url=t.path)}return{size:t.size,name:t.name}}},{key:"updatePercent",value:function(e){this._percent=e,this._percent>1&&(this._percent=1)}},{key:"updateFileUrl",value:function(e){this.content.fileUrl=e}},{key:"sendable",value:function(){return""!==this.content.fileUrl&&(""!==this.content.fileName&&0!==this.content.fileSize)}}]),e}(),yi=function(){function e(t){o(this,e),this.type=S.MSG_CUSTOM,this.content={data:t.data||"",description:t.description||"",extension:t.extension||""}}return a(e,[{key:"setData",value:function(e){return this.content.data=e,this}},{key:"setDescription",value:function(e){return this.content.description=e,this}},{key:"setExtension",value:function(e){return this.content.extension=e,this}},{key:"sendable",value:function(){return 0!==this.content.data.length||0!==this.content.description.length||0!==this.content.extension.length}}]),e}(),Ii=function(){function e(t,n){o(this,e),this.type=S.MSG_VIDEO,this._percent=0,this.content={remoteVideoUrl:t.remoteVideoUrl||t.videoUrl||"",videoFormat:t.videoFormat,videoSecond:parseInt(t.videoSecond,10),videoSize:t.videoSize,videoUrl:Xt(t.videoUrl,n),videoDownloadFlag:2,videoUUID:t.videoUUID,thumbUUID:t.thumbUUID,thumbFormat:t.thumbFormat,thumbWidth:t.thumbWidth,snapshotWidth:t.thumbWidth,thumbHeight:t.thumbHeight,snapshotHeight:t.thumbHeight,thumbSize:t.thumbSize,snapshotSize:t.thumbSize,thumbDownloadFlag:2,thumbUrl:Xt(t.thumbUrl,n),snapshotUrl:Xt(t.thumbUrl,n)}}return a(e,[{key:"updatePercent",value:function(e){this._percent=e,this._percent>1&&(this._percent=1)}},{key:"updateVideoUrl",value:function(e){e&&(this.content.remoteVideoUrl=e)}},{key:"updateSnapshotInfo",value:function(e){var t=e.snapshotUrl,n=e.snapshotWidth,o=e.snapshotHeight;Zt(t)||(this.content.thumbUrl=this.content.snapshotUrl=t),Zt(n)||(this.content.thumbWidth=this.content.snapshotWidth=Number(n)),Zt(o)||(this.content.thumbHeight=this.content.snapshotHeight=Number(o))}},{key:"sendable",value:function(){return""!==this.content.remoteVideoUrl}}]),e}(),Ci=function(){function e(t){o(this,e),this.type=S.MSG_LOCATION;var n=t.description,s=t.longitude,a=t.latitude;this.content={description:n,longitude:s,latitude:a}}return a(e,[{key:"sendable",value:function(){return!0}}]),e}(),Ti=function(){function e(t,n){if(o(this,e),this.from=t.from,this.messageSender=t.from,this.time=t.time,this.messageSequence=t.sequence,this.clientSequence=t.clientSequence||t.sequence,this.messageRandom=t.random,this.cloudCustomData=t.cloudCustomData||"",this.clientTime=t.clientTime||void 0,t.ID)this.ID=t.ID||"",this.nick=t.nick||"",this.avatar=t.avatar||"",this.messageBody=[{type:t.type,payload:t.payload}],t.conversationType.startsWith(S.CONV_C2C)?this.receiverUserID=t.to:t.conversationType.startsWith(S.CONV_GROUP)&&(this.receiverGroupID=t.to),this.messageReceiver=t.to;else{this.nick=t.nick||"",this.avatar=t.avatar||"",this.messageBody=[];var s=t.elements[0].type,a=t.elements[0].content;this._patchRichMediaPayload(s,a),this._updateRichMediaDownloadUrl(s,a,n),s===S.MSG_MERGER?this.messageBody.push({type:s,payload:new Di(a).content}):this.messageBody.push({type:s,payload:a}),t.groupID&&(this.receiverGroupID=t.groupID,this.messageReceiver=t.groupID),t.to&&(this.receiverUserID=t.to,this.messageReceiver=t.to),this.ID="".concat(t.tinyID,"-").concat(t.clientTime,"-").concat(t.random)}}return a(e,[{key:"_patchRichMediaPayload",value:function(e,t){e===S.MSG_IMAGE?t.imageInfoArray.forEach((function(e){!e.imageUrl&&e.url&&(e.imageUrl=e.url,e.sizeType=e.type,1===e.type?e.type=0:3===e.type&&(e.type=1))})):e===S.MSG_VIDEO?!t.remoteVideoUrl&&t.videoUrl&&(t.remoteVideoUrl=t.videoUrl):e===S.MSG_AUDIO?!t.remoteAudioUrl&&t.url&&(t.remoteAudioUrl=t.url):e===S.MSG_FILE&&!t.fileUrl&&t.url&&(t.fileUrl=t.url,t.url=void 0)}},{key:"_updateRichMediaDownloadUrl",value:function(e,t,n){n&&(e===S.MSG_IMAGE?t.imageInfoArray.forEach((function(e){e.url=Xt(e.url,n)})):e===S.MSG_VIDEO?(t.videoUrl=Xt(t.videoUrl,n),t.snapshotUrl=Xt(t.thumbUrl,n),t.snapshotHeight=t.thumbHeight,t.snapshotWidth=t.thumbWidth):e===S.MSG_AUDIO?t.url=Xt(t.url,n):e===S.MSG_FILE&&(t.fileUrl=Xt(t.fileUrl,n)))}}]),e}(),Di=function(){function e(t,n){if(o(this,e),this.type=S.MSG_MERGER,this.content={downloadKey:"",pbDownloadKey:"",messageList:[],title:"",abstractList:[],compatibleText:"",version:0,layersOverLimit:!1},t.downloadKey){var s=t.downloadKey,a=t.pbDownloadKey,r=t.title,i=t.abstractList,u=t.compatibleText,c=t.version;this.content.downloadKey=s,this.content.pbDownloadKey=a,this.content.title=r,this.content.abstractList=i,this.content.compatibleText=u,this.content.version=c||0}else if(Zt(t.messageList))1===t.layersOverLimit&&(this.content.layersOverLimit=!0);else{var l=t.messageList,p=t.title,d=t.abstractList,g=t.compatibleText,h=t.version,_=[];l.forEach((function(e){if(!Zt(e)){var t=new Ti(e,n);_.push(t)}})),this.content.messageList=_,this.content.title=p,this.content.abstractList=d,this.content.compatibleText=g,this.content.version=h||0}}return a(e,[{key:"sendable",value:function(){return!Zt(this.content.messageList)||!Zt(this.content.downloadKey)}}]),e}(),ki={1:S.MSG_PRIORITY_HIGH,2:S.MSG_PRIORITY_NORMAL,3:S.MSG_PRIORITY_LOW,4:S.MSG_PRIORITY_LOWEST},Si=function(){function e(t){o(this,e),this.ID="",this.conversationID=t.conversationID||null,this.conversationType=t.conversationType||S.CONV_C2C,this.conversationSubType=t.conversationSubType,this.time=t.time||Math.ceil(Date.now()/1e3),this.sequence=t.sequence||0,this.clientSequence=t.clientSequence||t.sequence||0,this.random=t.random||0===t.random?t.random:Mt(),this.priority=this._computePriority(t.priority),this.nick=t.nick||"",this.avatar=t.avatar||"",this.isPeerRead=!1,this.nameCard="",this._elements=[],this.isPlaceMessage=t.isPlaceMessage||0,this.isRevoked=2===t.isPlaceMessage||8===t.msgFlagBits,this.from=t.from||null,this.to=t.to||null,this.flow="",this.isSystemMessage=t.isSystemMessage||!1,this.protocol=t.protocol||"JSON",this.isResend=!1,this.isRead=!1,this.status=t.status||nn.SUCCESS,this._onlineOnlyFlag=!1,this._groupAtInfoList=[],this._relayFlag=!1,this.atUserList=[],this.cloudCustomData=t.cloudCustomData||"",this.isDeleted=!1,this.isModified=!1,this._isExcludedFromUnreadCount=!(!t.messageControlInfo||1!==t.messageControlInfo.excludedFromUnreadCount),this._isExcludedFromLastMessage=!(!t.messageControlInfo||1!==t.messageControlInfo.excludedFromLastMessage),this.clientTime=t.clientTime||Fe()||0,this.senderTinyID=t.senderTinyID||t.tinyID||"",this.readReceiptInfo=t.readReceiptInfo||{readCount:void 0,unreadCount:void 0,isPeerRead:void 0},this.needReadReceipt=!0===t.needReadReceipt||1===t.needReadReceipt,this.version=t.messageVersion||0,this.isBroadcastMessage=t.isBroadcastMessage||!1,this._receiverList=t.receiverList||void 0,this.isSupportExtension=!0===t.isSupportExtension||1===t.isSupportExtension,this.revoker=t.revokerInfo&&t.revokerInfo.revoker||null,this.reInitialize(t.currentUser),this.extractGroupInfo(t.groupProfile||null),this.handleGroupAtInfo(t),this.initC2CReadReceiptInfo(t.readReceiptSentByPeer)}return a(e,[{key:"elements",get:function(){return this._elements}},{key:"getElements",value:function(){return this._elements}},{key:"extractGroupInfo",value:function(e){if(null!==e){st(e.nick)&&(this.nick=e.nick),st(e.avatar)&&(this.avatar=e.avatar);var t=e.messageFromAccountExtraInformation;rt(t)&&st(t.nameCard)&&(this.nameCard=t.nameCard)}}},{key:"handleGroupAtInfo",value:function(e){var t=this;e.payload&&e.payload.atUserList&&e.payload.atUserList.forEach((function(e){e!==S.MSG_AT_ALL?(t._groupAtInfoList.push({groupAtAllFlag:0,groupAtUserID:e}),t.atUserList.push(e)):(t._groupAtInfoList.push({groupAtAllFlag:1}),t.atUserList.push(S.MSG_AT_ALL))})),it(e.groupAtInfo)&&e.groupAtInfo.forEach((function(e){0===e.groupAtAllFlag?t.atUserList.push(e.groupAtUserID):1===e.groupAtAllFlag&&t.atUserList.push(S.MSG_AT_ALL)}))}},{key:"getGroupAtInfoList",value:function(){return this._groupAtInfoList}},{key:"_initProxy",value:function(){this._elements[0]&&(this.payload=this._elements[0].content,this.type=this._elements[0].type)}},{key:"reInitialize",value:function(e){e&&(this.status=this.from?nn.SUCCESS:nn.UNSEND,!this.from&&(this.from=e)),this._initFlow(e),this._initSequence(e),this._concatConversationID(e),this.generateMessageID()}},{key:"isSendable",value:function(){return 0!==this._elements.length&&("function"==typeof this._elements[0].sendable&&this._elements[0].sendable())}},{key:"_initTo",value:function(e){this.conversationType===S.CONV_GROUP&&(this.to=e.groupID)}},{key:"_initSequence",value:function(e){0===this.clientSequence&&e&&(this.clientSequence=function(e){if(!e)return!1;if(void 0===Tt[e]){var t=new Date,n="3".concat(t.getHours()).slice(-2),o="0".concat(t.getMinutes()).slice(-2),s="0".concat(t.getSeconds()).slice(-2);Tt[e]=parseInt([n,o,s,"0001"].join("")),n=null,o=null,s=null,He.l("autoIncrementIndex start index:".concat(Tt[e]))}return Tt[e]++}(e)),0===this.sequence&&this.conversationType===S.CONV_C2C&&(this.sequence=this.clientSequence)}},{key:"generateMessageID",value:function(){this.from===S.CONV_SYSTEM&&(this.senderTinyID="144115198244471703"),this.ID="".concat(this.senderTinyID,"-").concat(this.clientTime,"-").concat(this.random)}},{key:"_initFlow",value:function(e){""!==e&&(e===this.from?(this.flow="out",this.isRead=!0):this.flow="in")}},{key:"_concatConversationID",value:function(e){var t=this.to,n="",o=this.conversationType;o!==S.CONV_SYSTEM?(n=o===S.CONV_C2C?e===this.from?t:this.from:this.to,this.conversationID=n?"".concat(o).concat(n):null):this.conversationID=S.CONV_SYSTEM}},{key:"isElement",value:function(e){return e instanceof pi||e instanceof di||e instanceof gi||e instanceof hi||e instanceof Mi||e instanceof Ii||e instanceof fi||e instanceof mi||e instanceof yi||e instanceof Ci||e instanceof Di}},{key:"setElement",value:function(e,t){var n=this;if(this.isElement(e))return this._elements=[e],void this._initProxy();var o=function(e){if(e.type&&e.content)switch(e.type){case S.MSG_TEXT:n.setTextElement(e.content);break;case S.MSG_IMAGE:n.setImageElement(e.content,t);break;case S.MSG_AUDIO:n.setAudioElement(e.content,t);break;case S.MSG_FILE:n.setFileElement(e.content,t);break;case S.MSG_VIDEO:n.setVideoElement(e.content,t);break;case S.MSG_CUSTOM:n.setCustomElement(e.content);break;case S.MSG_LOCATION:n.setLocationElement(e.content);break;case S.MSG_GRP_TIP:n.setGroupTipElement(e.content);break;case S.MSG_GRP_SYS_NOTICE:n.setGroupSystemNoticeElement(e.content);break;case S.MSG_FACE:n.setFaceElement(e.content);break;case S.MSG_MERGER:n.setMergerElement(e.content,t)}};if(it(e))for(var s=0;s<e.length;s++)o(e[s]);else o(e);this._initProxy()}},{key:"clearElement",value:function(){this._elements.length=0}},{key:"setTextElement",value:function(e){var t="string"==typeof e?e:e.text,n=new pi({text:t});this._elements.push(n)}},{key:"setImageElement",value:function(e,t){var n=new di(e,t);this._elements.push(n)}},{key:"setAudioElement",value:function(e,t){var n=new hi(e,t);this._elements.push(n)}},{key:"setFileElement",value:function(e,t){var n=new Mi(e,t);this._elements.push(n)}},{key:"setVideoElement",value:function(e,t){var n=new Ii(e,t);this._elements.push(n)}},{key:"setLocationElement",value:function(e){var t=new Ci(e);this._elements.push(t)}},{key:"setCustomElement",value:function(e){var t=new yi(e);this._elements.push(t)}},{key:"setGroupTipElement",value:function(e){var t={},n=e.operationType;if(Zt(e.memberInfoList)?e.operatorInfo&&(t=e.operatorInfo):n!==S.GRP_TIP_MBR_JOIN&&n!==S.GRP_TIP_MBR_KICKED_OUT&&n!==S.GRP_TIP_MBR_SET_ADMIN&&n!==S.GRP_TIP_MBR_CANCELED_ADMIN||(t=e.memberInfoList[0]),!Zt(e.memberExtraInfo)){var o=e.memberExtraInfo.reason;e.msgMemberInfo.forEach((function(e){e.reason=o}))}var s=t,a=s.nick,r=s.avatar;st(a)&&(this.nick=a),st(r)&&(this.avatar=r);var i=new fi(e);this._elements.push(i)}},{key:"setGroupSystemNoticeElement",value:function(e){var t=new mi(e);this._elements.push(t)}},{key:"setFaceElement",value:function(e){var t=new gi(e);this._elements.push(t)}},{key:"setMergerElement",value:function(e,t){var n=new Di(e,t);this._elements.push(n)}},{key:"setIsRead",value:function(e){this.isRead=e}},{key:"setRelayFlag",value:function(e){this._relayFlag=e}},{key:"getRelayFlag",value:function(){return this._relayFlag}},{key:"_computePriority",value:function(e){if(ut(e))return S.MSG_PRIORITY_NORMAL;if(st(e)&&-1!==Object.values(ki).indexOf(e))return e;if(ot(e)){var t=""+e;if(-1!==Object.keys(ki).indexOf(t))return ki[t]}return S.MSG_PRIORITY_NORMAL}},{key:"setNickAndAvatar",value:function(e){var t=e.nick,n=e.avatar;st(t)&&(this.nick=t),st(n)&&(this.avatar=n)}},{key:"setNameCard",value:function(e){st(e)&&(this.nameCard=e)}},{key:"initC2CReadReceiptInfo",value:function(e){this.conversationType===S.CONV_C2C&&!0===this.needReadReceipt&&(this.readReceiptInfo.isPeerRead=1===e)}}]),e}(),Li=function(e){return{code:0,data:e||{}}},Ei=function(e){i(n,e);var t=f(n);function n(e){var s;o(this,n),s=t.call(this);var a=e.code,r=e.message,i=e.data;return s.code=a,s.message=r||s._getErrorMessage(s.code),s.data=i||{},s}return a(n)}(d(Error)),Ai=null,Ri=function(e){Ai=e},Ni=function(e){return Promise.resolve(Li(e))},Oi=function(e){var t=arguments.length>1&&void 0!==arguments[1]&&arguments[1];if(e instanceof Ei)return t&&null!==Ai&&Ai.emit(k.ERROR,e),Promise.reject(e);if(e instanceof Error){var n=new Ei({code:Rr});return t&&null!==Ai&&Ai.emit(k.ERROR,n),Promise.reject(n)}if(!ut(e)&&!ut(e.code)){var o=new Ei(e);return t&&null!==Ai&&Ai.emit(k.ERROR,o),Promise.reject(o)}},Gi=function(e){i(s,e);var n=f(s);function s(e){var t;return o(this,s),(t=n.call(this,e))._n="C2CModule",t._messageFromUnreadDBMap=new Map,t._signalingFromUnreadDBList=[],t}return a(s,[{key:"onNewC2CMessage",value:function(e){var t=e.dataList,n=e.isInstantMessage,o=e.C2CRemainingUnreadList,s=e.C2CPairUnreadList;He.d("".concat(this._n,".onNewC2CMessage count:").concat(t.length," isInstantMessage:").concat(n));var a=this._newC2CMessageStoredAndSummary({dataList:t,C2CRemainingUnreadList:o,C2CPairUnreadList:s,isInstantMessage:n}),r=a.conversationOptionsList,i=a.messageList,u=a.isUnreadC2CMessage;(this.filterModifiedMessage(i),r.length>0)&&this.getModule(Hn).onNewMessage({conversationOptionsList:r,isInstantMessage:n,isUnreadC2CMessage:u});var c=this.filterUnmodifiedMessage(i);n&&c.length>0&&this.emitOuterEvent(k.MESSAGE_RECEIVED,c),i.length=0}},{key:"_newC2CMessageStoredAndSummary",value:function(e){for(var t=e.dataList,n=e.C2CRemainingUnreadList,o=e.C2CPairUnreadList,s=e.isInstantMessage,a=null,r=[],i=[],u={},c=this.getModule(zn),l=this.getModule(so),p=!1,d=this.getModule(Hn),g=this.getFileDownloadProxy(),h=0,_=t.length;h<_;h++)if(this._isSignaling(t[h]))this._signalingFromUnreadDBList.push(t[h].eventArray[0].c2CNotifyMsgArray[0]);else{var f=t[h];f.currentUser=this.getMyUserID(),f.conversationType=S.CONV_C2C,f.isSystemMessage=!!f.isSystemMessage,(ut(f.nick)||ut(f.avatar))&&(p=!0,He.d("".concat(this._n,"._newC2CMessageStoredAndSummary nick or avatar missing!"))),a=new Si(f),f.elements=c.parseElements(f.elements,f.from),a.setElement(f.elements,g),a.setNickAndAvatar({nick:f.nick,avatar:f.avatar});var v=a.conversationID;if(s){if(1===this._messageFromUnreadDBMap.get(a.ID))continue;var m=!1;if(a.from!==this.getMyUserID()){var M=d.getLatestMessageSentByPeer(v);if(M){var y=M.nick,I=M.avatar;p?a.setNickAndAvatar({nick:y,avatar:I}):y===a.nick&&I===a.avatar||(m=!0)}}else{var C=d.getLatestMessageSentByMe(v);if(C){var T=C.nick,D=C.avatar;T===a.nick&&D===a.avatar||d.modifyMessageSentByMe({conversationID:v,latestNick:a.nick,latestAvatar:a.avatar})}}var k=1===t[h].isModified;if(d.isMessageSentByCurrentInstance(a)?a.isModified=k:k=!1,0===f.msgLifeTime)a._onlineOnlyFlag=!0,d.isMessageSentByCurrentInstance(a)||i.push(a);else{if(!d.pushIntoMessageList(i,a,k))continue;m&&(d.modifyMessageSentByPeer({conversationID:v,latestNick:a.nick,latestAvatar:a.avatar}),d.updateUserProfileSpecifiedKey({conversationID:v,nick:a.nick,avatar:a.avatar}))}s&&a.clientTime>0&&l.addMessageDelay(a.clientTime)}else this._messageFromUnreadDBMap.set(a.ID,1);if(0!==f.msgLifeTime){if(!1===a._onlineOnlyFlag){var L=d.getLastMessageTime(v);if(ot(L)&&a.time<L)continue;if(ut(u[v])){var E=0;"in"===a.flow&&(a._isExcludedFromUnreadCount||(E=1)),u[v]=r.push({conversationID:v,unreadCount:E,type:a.conversationType,subType:a.conversationSubType,lastMessage:a._isExcludedFromLastMessage?"":a})-1}else{var A=u[v];r[A].type=a.conversationType,r[A].subType=a.conversationSubType,r[A].lastMessage=a._isExcludedFromLastMessage?"":a,"in"===a.flow&&(a._isExcludedFromUnreadCount||r[A].unreadCount++)}}}else a._onlineOnlyFlag=!0}this._handleSignalingFromUnreadDB();var R=!1;if(it(o))for(var N=function(e,t){if(o[e].unreadCount>0){R=!0;var n=r.find((function(t){return t.conversationID==="C2C".concat(o[e].from)}));n?n.unreadCount=o[e].unreadCount:r.push({conversationID:"C2C".concat(o[e].from),unreadCount:o[e].unreadCount,type:S.CONV_C2C})}},O=0,G=o.length;O<G;O++)N(O);if(it(n))for(var P=function(e,t){r.find((function(t){return t.conversationID==="C2C".concat(n[e].from)}))||r.push({conversationID:"C2C".concat(n[e].from),type:S.CONV_C2C,lastMsgTime:n[e].lastMsgTime})},U=0,b=n.length;U<b;U++)P(U);return{conversationOptionsList:r,messageList:i,isUnreadC2CMessage:R}}},{key:"_isSignaling",value:function(e){var t=e.eventArray;return!(!it(t)||10!==t[0].event)}},{key:"_handleSignalingFromUnreadDB",value:function(){var e=this._signalingFromUnreadDBList.length;if(He.l("".concat(this._n,"._handleSignalingFromUnreadDB signalingCount:").concat(e)),0!==e){var t=[];this._signalingFromUnreadDBList.forEach((function(e){e.hasOwnProperty("c2cMessageRevokedNotify")&&t.push(e)})),this.onC2CMessageRevoked({dataList:t}),this._signalingFromUnreadDBList.length=0,t.length=0}}},{key:"onC2CMessageRevoked",value:function(e){var t=this,n=this.getModule(Hn),o=[],s=null,a=!0;e.dataList.forEach((function(e){if(e.c2cMessageRevokedNotify){var r=e.c2cMessageRevokedNotify.revokedInfos;ut(r)||r.forEach((function(e){var r=t.getMyUserID()===e.from?"".concat(S.CONV_C2C).concat(e.to):"".concat(S.CONV_C2C).concat(e.from);s=n.revoke(r,e.sequence,e.random);var i=e.revokerInfo&&e.revokerInfo.revoker;if(s)s.revoker=i,o.push(s);else{var u={conversationID:r,sequence:e.sequence,time:e.time,revoker:i};n.isLastMessageRevoked(u)&&(o.push(u),a=!1)}}))}})),0!==o.length&&(n.onMessageRevoked(o),!0===a&&(He.l("".concat(this._n,".onC2CMessageRevoked count:").concat(o.length)),this.emitOuterEvent(k.MESSAGE_REVOKED,o)))}},{key:"onC2CMessageReadReceipt",value:function(e){var t=this;e.dataList.forEach((function(e){if(!Zt(e.c2cMessageReadReceipt)){var n=e.c2cMessageReadReceipt.to;e.c2cMessageReadReceipt.uinPairReadArray.forEach((function(e){var o=e.peerReadTime;He.d("".concat(t._n,"._onC2CMessageReadReceipt to:").concat(n," peerReadTime:").concat(o));var s="".concat(S.CONV_C2C).concat(n),a=t.getModule(Hn);a.recordPeerReadTime(s,o),a.updateMessageIsPeerReadProperty(s,o)}))}}))}},{key:"onC2CMessageReadNotice",value:function(e){var t=this;e.dataList.forEach((function(e){if(!Zt(e.c2cMessageReadNotice)){var n=t.getModule(Hn);e.c2cMessageReadNotice.uinPairReadArray.forEach((function(e){var o=e.from,s=e.peerReadTime;He.d("".concat(t._n,".onC2CMessageReadNotice from:").concat(o," lastReadTime:").concat(s));var a="".concat(S.CONV_C2C).concat(o);n.updateIsReadAfterReadReport({conversationID:a,lastMessageTime:s}),n.updateUnreadCount(a)}))}}))}},{key:"onC2CMessageModified",value:function(e){He.d("".concat(this._n,".onC2CMessageModified options:"),JSON.stringify(e));var n=this.getModule(Hn);e.dataList.forEach((function(e){n.onMessageModified(t(t({},e),{},{conversationType:S.CONV_C2C}))}))}},{key:"onReadReceiptList",value:function(e){He.d("".concat(this._n,".onReadReceiptList options:"),JSON.stringify(e));var t=e.dataList,n=t.userID,o=t.readReceiptList;this.getModule(Hn).updateReadReceiptInfo({userID:n,readReceiptList:o})}},{key:"sendMessage",value:function(e,t){var n=this._createC2CMessagePack(e,t);return this.request(n)}},{key:"_createC2CMessagePack",value:function(e,t){var n=null;t&&(t.offlinePushInfo&&(n=t.offlinePushInfo),!0===t.onlineUserOnly&&(n?n.disablePush=!0:n={disablePush:!0}));var o="";st(e.cloudCustomData)&&e.cloudCustomData.length>0&&(o=e.cloudCustomData);var s=[];if(rt(t)&&rt(t.messageControlInfo)){var a=t.messageControlInfo,r=a.excludedFromUnreadCount,i=a.excludedFromLastMessage,u=a.excludedFromContentModeration;!0===r&&s.push("NoUnread"),!0===i&&s.push("NoLastMsg"),!0===u&&s.push("NoMsgCheck")}var c=this.isOnlineMessage(e,t)?0:void 0;return{protocolName:Mo,tjgID:this.generateTjgID(e),requestData:{fromAccount:this.getMyUserID(),toAccount:e.to,msgBody:e.getElements(),cloudCustomData:o,msgSeq:e.sequence,msgRandom:e.random,msgLifeTime:c,nick:e.nick,avatar:e.avatar,offlinePushInfo:n?{pushFlag:!0===n.disablePush?1:0,title:n.title||"",desc:n.description||"",ext:n.extension||"",apnsInfo:{badgeMode:!0===n.ignoreIOSBadge?1:0,isVoipPush:this._isVoipPush(n)},androidInfo:{OPPOChannelID:n.androidOPPOChannelID||""}}:void 0,messageControlInfo:0!==c?s:void 0,clientTime:e.clientTime,needReadReceipt:!0===e.needReadReceipt?1:0,isSupportExtension:!0===e.isSupportExtension?1:0}}}},{key:"_isVoipPush",value:function(e){var t=void 0;return ut(e.disableVoipPush)||(t=!1===e.disableVoipPush?1:0),t}},{key:"isOnlineMessage",value:function(e,t){return!(!t||!0!==t.onlineUserOnly)}},{key:"revokeMessage",value:function(e){return this.request({protocolName:So,requestData:{msgInfo:{fromAccount:e.from,toAccount:e.to,msgSeq:e.sequence,msgRandom:e.random,msgTimeStamp:e.time}}})}},{key:"deleteMessage",value:function(e){var t=e.to,n=e.keyList;return He.l("".concat(this._n,".deleteMessage toAccount:").concat(t," count:").concat(n.length)),this.request({protocolName:Oo,requestData:{fromAccount:this.getMyUserID(),to:t,keyList:n}})}},{key:"modifyRemoteMessage",value:function(e){var t=e.from,n=e.to,o=e.version,s=void 0===o?0:o,a=e.sequence,r=e.random,i=e.time,u=e.payload,c=e.type,l=e.cloudCustomData,p=void 0;return jt(c)&&(p=[]).push({type:c,content:u}),this.request({protocolName:Go,requestData:{from:t,to:n,version:s,sequence:a,random:r,time:i,elements:p,cloudCustomData:l}})}},{key:"setMessageRead",value:function(e){var t=this,n=e.conversationID,o=e.lastMessageTime,s="".concat(this._n,".setMessageRead");He.l("".concat(s," conversationID:").concat(n," lastMessageTime:").concat(o)),ot(o)||this.outputWarning("DoNotModifyLastTime");var a=new li("setC2CMessageRead");return a.setMessage("conversationID:".concat(n," lastMessageTime:").concat(o)),this.request({protocolName:Lo,requestData:{C2CMsgReaded:{cookie:"",C2CMsgReadedItem:[{toAccount:n.replace("C2C",""),lastMessageTime:o,receipt:1}]}}}).then((function(){a.setNetworkType(t.getNetworkType()).end(),He.l("".concat(s," ok"));var e=t.getModule(Hn);return e.updateIsReadAfterReadReport({conversationID:n,lastMessageTime:o}),e.updateUnreadCount(n),Li()})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];a.setError(e,o,s).end()})),He.l("".concat(s," failed. error:"),e),Oi(e)}))}},{key:"getRoamingMessage",value:function(e){var t=this,n="".concat(this._n,".getRoamingMessage"),o=e.peerAccount,s=e.conversationID,a=e.count,r=e.lastMessageTime,i=e.messageKey,u="peerAccount:".concat(o," count:").concat(a||15," lastMessageTime:").concat(r||0," messageKey:").concat(i);He.l("".concat(n," ").concat(u));var c=new li("getC2CRoamingMessages");return this.request({protocolName:Ro,requestData:{peerAccount:o,count:a||15,lastMessageTime:r||0,messageKey:i}}).then((function(e){var o=e.data,a=o.complete,r=o.messageList,i=o.messageKey,l=o.lastMessageTime;ut(r)?He.l("".concat(n," ok. complete:").concat(a," but messageList is undefined!")):He.l("".concat(n," ok. complete:").concat(a," count:").concat(r.length)),c.setNetworkType(t.getNetworkType()).setMessage("".concat(u," complete:").concat(a," length:").concat(r.length)).end();var p=t.getModule(Hn);1===a&&p.setCompleted(s);var d=p.onRoamingMessage(r,s);p.modifyMessageList(s),p.updateIsRead(s),p.updateRoamingMessageKeyAndTime(s,i,l);var g=p.getPeerReadTime(s);if(He.l("".concat(n," update isPeerRead property. conversationID:").concat(s," peerReadTime:").concat(g)),g)p.updateMessageIsPeerReadProperty(s,g);else{var h=s.replace(S.CONV_C2C,"");t.getRemotePeerReadTime([h]).then((function(){p.updateMessageIsPeerReadProperty(s,p.getPeerReadTime(s))}))}var _="";if(d.length>0)_=d[0].ID;else{var f=p.getLocalOldestMessage(s);f&&(_=f.ID)}return He.l("".concat(n," nextReqID:").concat(_," stored message count:").concat(d.length)),{nextReqID:_,storedMessageList:d}})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];c.setMessage(u).setError(e,o,s).end()})),He.w("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"getRoamingMessagesHopping",value:function(e){var t=this,n="".concat(this._n,".getRoamingMessagesHopping"),o=e.peerAccount,s=e.time,a=void 0===s?0:s,r=e.count,i=e.direction,u="".concat(S.CONV_C2C).concat(o),c="peerAccount:".concat(o," count:").concat(r," time:").concat(a," direction:").concat(i);He.l("".concat(n," ").concat(c));var l=new li("getC2CRoamingMessagesHopping");return this.request({protocolName:Ro,requestData:{peerAccount:o,count:r+1,lastMessageTime:a,direction:i}}).then((function(e){var o=e.data,s=o.complete,a=o.messageList,r=void 0===a?[]:a,p=o.lastMessageTime;He.l("".concat(n," ok. complete:").concat(s," count:").concat(r.length)),l.setNetworkType(t.getNetworkType()).setMessage("".concat(c," complete:").concat(s," length:").concat(r.length)).end(),1!==s&&(1===i?r.pop():r.shift());var d=t.getModule(Hn).onRoamingMessage(r,u,!1);t._modifyMessageList(u,d);var g=t._computeResult({complete:s,lastMessageTime:p,resultList:d});return Li(g)})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];l.setMessage(c).setError(e,o,s).end()})),He.w("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"_computeResult",value:function(e){var t=e.complete,n=void 0===t?0:t,o=e.lastMessageTime,s=e.resultList,a={messageList:m(void 0===s?[]:s),isCompleted:!1,nextMessageTime:""};return 1===n?(a.isCompleted=!0,a):(a.nextMessageTime=o,a)}},{key:"_modifyMessageList",value:function(e,t){var n=this.getModule(Hn).getLocalConversation(e);if(n)for(var o=n.userProfile.nick,s=n.userProfile.avatar,a=this.getModule(wn).getNickAndAvatarByUserID(this.getMyUserID()),r=a.nick,i=a.avatar,u=t.length-1;u>=0;u--){var c=t[u];"in"===c.flow&&(c.nick!==o&&c.setNickAndAvatar({nick:o}),c.avatar!==s&&c.setNickAndAvatar({avatar:s})),"out"===c.flow&&(c.nick!==r&&c.setNickAndAvatar({nick:r}),c.avatar!==i&&c.setNickAndAvatar({avatar:i}))}}},{key:"getRemotePeerReadTime",value:function(e){var t=this,n="".concat(this._n,".getRemotePeerReadTime");if(Zt(e))return He.w("".concat(n," userIDList is empty!")),Promise.resolve();var o=new li("getPeerReadTime");return He.l("".concat(n," userIDList:").concat(e)),this.request({protocolName:No,requestData:{userIDList:e}}).then((function(s){var a=s.data.peerReadTimeList;He.l("".concat(n," ok. peerReadTimeList:").concat(a));for(var r="",i=t.getModule(Hn),u=0;u<e.length;u++)r+="".concat(e[u],"-").concat(a[u]," "),a[u]>0&&i.recordPeerReadTime("C2C".concat(e[u]),a[u]);o.setNetworkType(t.getNetworkType()).setMessage(r).end()})).catch((function(e){t.probeNetwork().then((function(t){var n=v(t,2),s=n[0],a=n[1];o.setError(e,s,a).end()})),He.w("".concat(n," failed. error:"),e)}))}},{key:"sendReadReceipt",value:function(e){var t=this,n=e[0].conversationID.replace(S.CONV_C2C,""),o=new li("sendC2CReadReceipt");o.setMessage("peerAccount:".concat(n));var s=this.getMyUserID(),a=e.filter((function(e){return e.from!==s&&!0===e.needReadReceipt})).map((function(e){return{fromAccount:e.from,toAccount:e.to,sequence:e.sequence,random:e.random,time:e.time,clientTime:e.clientTime}}));if(0===a.length)return Oi({code:Ua});var r="".concat(this._n,".sendReadReceipt");return He.l("".concat(r,". peerAccount:").concat(n," messageInfoList length:").concat(a.length)),this.request({protocolName:_s,requestData:{peerAccount:n,messageInfoList:a}}).then((function(e){return o.end(),He.l("".concat(r," ok")),Li()})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),s=n[0],a=n[1];o.setError(e,s,a).end()})),He.w("".concat(r," failed. error:"),e),Oi(e)}))}},{key:"getReadReceiptList",value:function(e){var t="".concat(this._n,".getReadReceiptList"),n=this.getMyUserID(),o=e.filter((function(e){return e.from===n&&!0===e.needReadReceipt}));return He.l("".concat(t," userID:").concat(n," messageList length:").concat(o.length)),Ni({messageList:o})}},{key:"getMessageExtensions",value:function(e,t){return He.l("".concat(this._n,".getMessageExtensions startSequence:").concat(t)),this.request({protocolName:Uo,requestData:{from:e.from,to:e.to,messageKey:this._getMessageKey(e),startSequence:t}})}},{key:"modifyMessageExtensions",value:function(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:1;return He.l("".concat(this._n,".modifyMessageExtensions operateType:").concat(n)),this.request({protocolName:Po,requestData:{from:e.from,to:e.to,messageKey:this._getMessageKey(e),extensionList:t,operateType:n}})}},{key:"_getMessageKey",value:function(e){var t=e.clientSequence,n=e.random,o=e.time;return"".concat(t,"_").concat(n,"_").concat(o)}},{key:"reset",value:function(){He.l("".concat(this._n,".reset")),this._messageFromUnreadDBMap.clear(),this._signalingFromUnreadDBList.length=0}}]),s}(po),Pi=function(){function e(){o(this,e),this.list=new Map,this._n="MessageListHandler",this._latestMessageSentByPeerMap=new Map,this._latestMessageSentByMeMap=new Map}return a(e,[{key:"getLocalOldestMessageByConversationID",value:function(e){if(!e)return null;if(!this.list.has(e))return null;var t=this.list.get(e).values();return t?t.next().value:null}},{key:"pushIn",value:function(e){var t=arguments.length>1&&void 0!==arguments[1]&&arguments[1],n=e.conversationID,o=!0;this.list.has(n)||this.list.set(n,new Map);var s=this._getUniqueIDOfMessage(e),a=this.list.get(n).has(s);if(a){var r=this.list.get(n).get(s);if(!t||!0===r.isModified)return o=!1}return this.list.get(n).set(s,e),this._setLatestMessageSentByPeer(n,e),this._setLatestMessageSentByMe(n,e),o}},{key:"unshift",value:function(e,t){var n;if(it(e)?e.length>0&&(n=e[0].conversationID,this._unshiftMultipleMessages(e,t)):(n=e.conversationID,this._unshiftSingleMessage(e,t)),n&&n.startsWith(S.CONV_C2C)){var o=Array.from(this.list.get(n).values()),s=o.length;if(0===s)return;for(var a=s-1;a>=0;a--)if("out"===o[a].flow){this._setLatestMessageSentByMe(n,o[a]);break}for(var r=s-1;r>=0;r--)if("in"===o[r].flow){this._setLatestMessageSentByPeer(n,o[r]);break}}}},{key:"_unshiftSingleMessage",value:function(e,t){var n=e.conversationID,o=this._getUniqueIDOfMessage(e);if(!this.list.has(n))return this.list.set(n,new Map),this.list.get(n).set(o,e),void t.push(e);var s=this.list.get(n),a=Array.from(s);s.has(o)||(a.unshift([o,e]),this.list.set(n,new Map(a)),t.push(e))}},{key:"_unshiftMultipleMessages",value:function(e,t){for(var n=e.length,o=[],s=e[0].conversationID,a=this.list.get(s),r=this.list.has(s)?Array.from(a):[],i=0;i<n;i++){var u=this._getUniqueIDOfMessage(e[i]);a&&a.has(u)||(o.push([u,e[i]]),t.push(e[i]))}this.list.set(s,new Map(o.concat(r)))}},{key:"remove",value:function(e){var t=e.conversationID,n=this._getUniqueIDOfMessage(e);this.list.has(t)&&this.list.get(t).delete(n)}},{key:"revoke",value:function(e,t,n){if(He.d("revoke message",e,t,n),this.list.has(e)){var o,s=D(this.list.get(e));try{for(s.s();!(o=s.n()).done;){var a=v(o.value,2)[1];if(a.sequence===t&&(ut(n)||a.random===n))return a.isRevoked=!0,a}}catch(r){s.e(r)}finally{s.f()}}return null}},{key:"removeByConversationID",value:function(e){this.list.has(e)&&(this.list.delete(e),this._latestMessageSentByPeerMap.delete(e),this._latestMessageSentByMeMap.delete(e))}},{key:"findMessage",value:function(e){var t,n=null,o=D(this.list);try{for(o.s();!(t=o.n()).done;)for(var s=m(v(t.value,2)[1].values()),a=s.length,r=0;r<a;r++)if(s[r].ID===e){n=s[r];break}}catch(i){o.e(i)}finally{o.f()}return n}},{key:"updateMessageIsPeerReadProperty",value:function(e,t){var n=[];if(this.list.has(e)){var o,s=D(this.list.get(e));try{for(s.s();!(o=s.n()).done;){var a=v(o.value,2)[1];a.time<=t&&!a.isPeerRead&&"out"===a.flow&&(a.isPeerRead=!0,n.push(a))}}catch(r){s.e(r)}finally{s.f()}He.l("".concat(this._n,".updateMessageIsPeerReadProperty conversationID:").concat(e," peerReadTime:").concat(t," count:").concat(n.length))}return n}},{key:"updateMessageIsModifiedProperty",value:function(e){var t=e.conversationID;if(this.list.has(t)){var n=this._getUniqueIDOfMessage(e),o=this.list.get(t).get(n);o&&(o.isModified=!0)}}},{key:"hasLocalMessageList",value:function(e){return this.list.has(e)}},{key:"getLocalMessageList",value:function(e){return this.hasLocalMessageList(e)?m(this.list.get(e).values()):[]}},{key:"hasLocalMessage",value:function(e,t){for(var n=!1,o=this.getLocalMessageList(e),s=o.length,a=0;a<s;a++)o[a].ID===t&&(n=!0);return n}},{key:"getLocalMessage",value:function(e,t){for(var n=null,o=this.getLocalMessageList(e),s=o.length,a=0;a<s;a++)if(o[a].ID===t){n=o[a];break}return n}},{key:"getLocalLastMessage",value:function(e){var t=this.getLocalMessageList(e);return t[t.length-1]}},{key:"getLocalOldestMessage",value:function(e){return this.getLocalMessageList(e)[0]}},{key:"_setLatestMessageSentByPeer",value:function(e,t){e.startsWith(S.CONV_C2C)&&"in"===t.flow&&this._latestMessageSentByPeerMap.set(e,t)}},{key:"_setLatestMessageSentByMe",value:function(e,t){e.startsWith(S.CONV_C2C)&&"out"===t.flow&&this._latestMessageSentByMeMap.set(e,t)}},{key:"getLatestMessageSentByPeer",value:function(e){return this._latestMessageSentByPeerMap.get(e)}},{key:"getLatestMessageSentByMe",value:function(e){return this._latestMessageSentByMeMap.get(e)}},{key:"modifyMessageSentByPeer",value:function(e){var t=e.conversationID,n=e.latestNick,o=e.latestAvatar,s=this.list.get(t);if(!Zt(s)){var a=Array.from(s.values()),r=a.length;if(0!==r){for(var i=null,u=0,c=!1,l=r-1;l>=0;l--)"in"===a[l].flow&&((i=a[l]).nick!==n&&(i.setNickAndAvatar({nick:n}),c=!0),i.avatar!==o&&(i.setNickAndAvatar({avatar:o}),c=!0),c&&(u+=1));He.l("".concat(this._n,".modifyMessageSentByPeer conversationID:").concat(t," count:").concat(u))}}}},{key:"modifyMessageSentByMe",value:function(e){var t=e.conversationID,n=e.latestNick,o=e.latestAvatar,s=this.list.get(t);if(!Zt(s)){var a=Array.from(s.values()),r=a.length;if(0!==r){for(var i=null,u=0,c=!1,l=r-1;l>=0;l--)"out"===a[l].flow&&((i=a[l]).nick!==n&&(i.setNickAndAvatar({nick:n}),c=!0),i.avatar!==o&&(i.setNickAndAvatar({avatar:o}),c=!0),c&&(u+=1));He.l("".concat(this._n,".modifyMessageSentByMe conversationID:").concat(t," count:").concat(u))}}}},{key:"getTopicConversationIDList",value:function(e){return m(this.list.keys()).filter((function(t){return t.startsWith("".concat(S.CONV_GROUP).concat(e))}))}},{key:"traversal",value:function(){if(0!==this.list.size&&-1===He.getLevel()){console.group("conversationID-messageCount");var e,t=D(this.list);try{for(t.s();!(e=t.n()).done;){var n=v(e.value,2),o=n[0],s=n[1];console.log("".concat(o,"-").concat(s.size))}}catch(a){t.e(a)}finally{t.f()}console.groupEnd()}}},{key:"onMessageModified",value:function(e,t){if(!this.list.has(e))return{isUpdated:!1,message:null};var n=this._getUniqueIDOfMessage(t),o=this.list.get(e).has(n);if(He.d("".concat(this._n,".onMessageModified conversationID:").concat(e," uniqueID:").concat(n," has:").concat(o)),o){var s=this.list.get(e).get(n),a=t.messageVersion,r=t.elements,i=t.cloudCustomData;return s.version<a?(s.version=a,s._elements=JSON.parse(JSON.stringify(r)),s.payload=JSON.parse(JSON.stringify(r[0].content)),s.type=r[0].type,s.cloudCustomData=i,s.isModified=!0,{isUpdated:!0,message:s}):{isUpdated:!1,message:s}}return{isUpdated:!1,message:null}}},{key:"_getUniqueIDOfMessage",value:function(e){var t=e.from,n=e.to,o=e.random,s=e.sequence,a=e.time;return"".concat(t,"-").concat(n,"-").concat(o,"-").concat(s,"-").concat(a)}},{key:"reset",value:function(){this.list.clear(),this._latestMessageSentByPeerMap.clear(),this._latestMessageSentByMeMap.clear()}}]),e}(),Ui="_a2KeyAndTinyIDUpdated",bi="_cloudConfigUpdated",wi="_profileUpdated";function qi(e){this.mixin(e)}qi.mixin=function(e){var t=e.prototype||e;t._isReady=!1,t.ready=function(e){var t=arguments.length>1&&void 0!==arguments[1]&&arguments[1];if(e)return this._isReady?void(t?e.call(this):setTimeout(e,1)):(this._readyQueue=this._readyQueue||[],void this._readyQueue.push(e))},t.triggerReady=function(){var e=this;this._isReady=!0,setTimeout((function(){var t=e._readyQueue;e._readyQueue=[],t&&t.length>0&&t.forEach((function(e){e.call(this)}),e)}),1)},t.resetReady=function(){this._isReady=!1,this._readyQueue=[]},t.isReady=function(){return this._isReady}};var Fi=["jpg","jpeg","gif","png","bmp","image","webp"],xi=["mp4","quicktime","mov"],Vi=1,Bi=2,Hi=3,Ki=255,Wi=function(){function e(t){var n=this;o(this,e),Zt(t)||(this.userID=t.userID||"",this.nick=t.nick||"",this.gender=t.gender||"",this.birthday=t.birthday||0,this.location=t.location||"",this.selfSignature=t.selfSignature||"",this.allowType=t.allowType||S.ALLOW_TYPE_ALLOW_ANY,this.language=t.language||0,this.avatar=t.avatar||"",this.messageSettings=t.messageSettings||0,this.adminForbidType=t.adminForbidType||S.FORBID_TYPE_NONE,this.level=t.level||0,this.role=t.role||0,this.lastUpdatedTime=0,this.profileCustomField=[],Zt(t.profileCustomField)||t.profileCustomField.forEach((function(e){n.profileCustomField.push({key:e.key,value:e.value})})))}return a(e,[{key:"validate",value:function(e){var t=!0,n="";if(Zt(e))return{valid:!1,tips:"empty options"};if(e.profileCustomField)for(var o=e.profileCustomField.length,s=null,a=0;a<o;a++){if(s=e.profileCustomField[a],!st(s.key)||-1===s.key.indexOf("Tag_Profile_Custom"))return{valid:!1,tips:"The prefix of keys of the custom profile key-value pairs (which is profileCustomField) must be Tag_Profile_Custom"};if(!st(s.value))return{valid:!1,tips:"The type of values of the custom profile key-value pairs (which is profileCustomField) must be String"}}for(var r in e)if(Object.prototype.hasOwnProperty.call(e,r)){if("profileCustomField"===r)continue;if(Zt(e[r])&&!st(e[r])&&!ot(e[r])){n="key:"+r+", invalid value:"+e[r],t=!1;continue}switch(r){case"nick":st(e[r])||(n="nick must be a string",t=!1),mt(e[r])>500&&(n="nick name limited: must less than or equal to ".concat(500," bytes, current size: ").concat(mt(e[r])," bytes"),t=!1);break;case"gender":Ct(je,e.gender)||(n="key:gender, invalid value:"+e.gender,t=!1);break;case"birthday":ot(e.birthday)||(n="birthday must be a number",t=!1);break;case"location":st(e.location)||(n="location must be a string",t=!1);break;case"selfSignature":st(e.selfSignature)||(n="selfSignature must be a string",t=!1);break;case"allowType":Ct(ze,e.allowType)||(n="key:allowType, invalid value:"+e.allowType,t=!1);break;case"language":ot(e.language)||(n="language must be a number",t=!1);break;case"avatar":st(e.avatar)||(n="avatar must be a string",t=!1);break;case"messageSettings":0!==e.messageSettings&&1!==e.messageSettings&&(n="messageSettings must be 0 or 1",t=!1);break;case"adminForbidType":Ct(Ye,e.adminForbidType)||(n="key:adminForbidType, invalid value:"+e.adminForbidType,t=!1);break;case"level":ot(e.level)||(n="level must be a number",t=!1);break;case"role":ot(e.role)||(n="role must be a number",t=!1);break;default:n="unknown key:"+r+"  "+e[r],t=!1}}return{valid:t,tips:n}}}]),e}(),ji=a((function e(t){o(this,e),this.value=t,this.next=null})),Yi=function(){function e(t){o(this,e),this.MAX_LENGTH=t,this.pTail=null,this.pNodeToDel=null,this.map=new Map}return a(e,[{key:"set",value:function(e){var t=new ji(e);if(this.map.size<this.MAX_LENGTH)null===this.pTail?(this.pTail=t,this.pNodeToDel=t):(this.pTail.next=t,this.pTail=t),this.map.set(e,1);else{var n=this.pNodeToDel;this.pNodeToDel=this.pNodeToDel.next,this.map.delete(n.value),n.next=null,n=null,this.pTail.next=t,this.pTail=t,this.map.set(e,1)}}},{key:"has",value:function(e){return this.map.has(e)}},{key:"delete",value:function(e){this.has(e)&&this.map.delete(e)}},{key:"tail",value:function(){return this.pTail}},{key:"size",value:function(){return this.map.size}},{key:"data",value:function(){return Array.from(this.map.keys())}},{key:"reset",value:function(){for(var e;null!==this.pNodeToDel;)e=this.pNodeToDel,this.pNodeToDel=this.pNodeToDel.next,e.next=null,e=null;this.pTail=null,this.map.clear()}}]),e}(),zi=["groupID","name","avatar","type","introduction","notification","ownerID","selfInfo","createTime","infoSequence","lastInfoTime","lastMessage","nextMessageSeq","memberNum","maxMemberNum","memberList","joinOption","groupCustomField","muteAllMembers","isSupportTopic","inviteOption","_lastRevokedTime"],Ji=function(){function e(t){o(this,e),this.groupID="",this.name="",this.avatar="",this.type="",this.introduction="",this.notification="",this.ownerID="",this.createTime="",this.infoSequence="",this.lastInfoTime="",this.selfInfo={messageRemindType:"",joinTime:"",nameCard:"",role:"",userID:"",memberCustomField:void 0,readedSequence:0,excludedUnreadSequenceList:void 0},this.lastMessage={lastTime:"",lastSequence:"",fromAccount:"",messageForShow:""},this.nextMessageSeq="",this.memberNum="",this.memberCount="",this.maxMemberNum="",this.maxMemberCount="",this.joinOption="",this.inviteOption="",this.groupCustomField=[],this.muteAllMembers=!1,this.isSupportTopic=!1,this._lastRevokedTime=0,this._initGroup(t)}return a(e,[{key:"memberNum",get:function(){return this.memberCount},set:function(e){}},{key:"maxMemberNum",get:function(){return this.maxMemberCount},set:function(e){}},{key:"_initGroup",value:function(e){for(var t in e)zi.indexOf(t)<0||("selfInfo"!==t?("memberNum"===t&&(this.memberCount=e[t]),"maxMemberNum"===t&&(this.maxMemberCount=e[t]),"isSupportTopic"!==t?this[t]=e[t]:this.isSupportTopic=1===e[t]):this.updateSelfInfo(e[t]))}},{key:"updateGroup",value:function(e){var t=this;e.appid=void 0,e.grossTopicNextMsgSeq=void 0,e.selfInfo&&(e.selfInfo.grossTopicReadSeq=void 0);var n=JSON.parse(JSON.stringify(e));n.lastMsgTime&&(this.lastMessage.lastTime=n.lastMsgTime),ut(n.muteAllMembers)||("On"===n.muteAllMembers?n.muteAllMembers=!0:n.muteAllMembers=!1),n.groupCustomField&&St(this.groupCustomField,n.groupCustomField),ut(n.memberNum)||(this.memberCount=n.memberNum),ut(n.maxMemberNum)||(this.maxMemberCount=n.maxMemberNum),ut(n.isSupportTopic)||(this.isSupportTopic=ot(n.isSupportTopic)?1===n.isSupportTopic:n.isSupportTopic),ft(this,n,["members","errorCode","lastMsgTime","groupCustomField","memberNum","maxMemberNum","isSupportTopic"]),it(n.members)&&n.members.length>0&&n.members.forEach((function(e){e.userID===t.selfInfo.userID&&ft(t.selfInfo,e,["sequence"])}))}},{key:"updateSelfInfo",value:function(e){var n={nameCard:e.nameCard,joinTime:e.joinTime,role:e.role,messageRemindType:e.messageRemindType,readedSequence:e.readedSequence,excludedUnreadSequenceList:e.excludedUnreadSequenceList};ft(this.selfInfo,t({},n),[],["",null,void 0,0,NaN])}},{key:"setSelfNameCard",value:function(e){this.selfInfo.nameCard=e}}]),e}(),Xi=function(e,n){return ut(e)?{lastTime:0,lastSequence:0,fromAccount:0,messageForShow:"",payload:null,type:"",isRevoked:!1,cloudCustomData:"",onlineOnlyFlag:!1,nick:"",nameCard:"",version:0,isPeerRead:!1,revoker:null}:e instanceof Si?{lastTime:e.time||0,lastSequence:e.sequence||0,fromAccount:e.from||"",messageForShow:Wt(e.type,e.payload,n),payload:e.payload||null,type:e.type||null,isRevoked:e.isRevoked||!1,cloudCustomData:e.cloudCustomData||"",onlineOnlyFlag:e._onlineOnlyFlag||!1,nick:e.nick||"",nameCard:e.nameCard||"",version:e.version||0,isPeerRead:e.isPeerRead||!1,revoker:e.revoker||null}:t(t({},e),{},{messageForShow:Wt(e.type,e.payload,n)})},Qi=function(){function e(t,n){o(this,e),this.conversationID=t.conversationID||"",this.unreadCount=t.unreadCount||0,this.type=t.type||"",this.lastMessage=Xi(t.lastMessage,n),t.lastMsgTime&&(this.lastMessage.lastTime=t.lastMsgTime),this._isInfoCompleted=!1,this.peerReadTime=t.peerReadTime||0,this.groupAtInfoList=[],this.remark="",this.isPinned=t.isPinned||!1,this.messageRemindType="",this.markList=t.markList||[],this.customData=t.customData||"",this.conversationGroupList=t.conversationGroupList||[],this._initProfile(t)}return a(e,[{key:"toAccount",get:function(){return this.conversationID.startsWith(S.CONV_C2C)?this.conversationID.replace(S.CONV_C2C,""):this.conversationID.startsWith(S.CONV_GROUP)?this.conversationID.replace(S.CONV_GROUP,""):""}},{key:"subType",get:function(){return this.groupProfile?this.groupProfile.type:""}},{key:"_initProfile",value:function(e){var t=this;Object.keys(e).forEach((function(n){switch(n){case"userProfile":t.userProfile=e.userProfile;break;case"groupProfile":t.groupProfile=e.groupProfile}})),ut(this.userProfile)&&this.type===S.CONV_C2C?this.userProfile=new Wi({userID:e.conversationID.replace("C2C","")}):ut(this.groupProfile)&&this.type===S.CONV_GROUP&&(this.groupProfile=new Ji({groupID:e.conversationID.replace("GROUP","")}))}},{key:"updateUnreadCount",value:function(e){var t=e.nextUnreadCount,n=e.isFromGetConversations,o=e.isUnreadC2CMessage;ut(t)||(Lt(this.subType)?this.unreadCount=0:n&&this.type===S.CONV_GROUP||n&&this.type===S.CONV_TOPIC||o&&this.type===S.CONV_C2C?this.unreadCount=t:this.unreadCount=this.unreadCount+t)}},{key:"updateLastMessage",value:function(e){this.lastMessage=Xi(e)}},{key:"updateGroupAtInfoList",value:function(e){if(!this._isNeedMergeGroupAtInfo(e)){var t,n=(M(t=e.groupAtType)||y(t)||I(t)||T()).slice(0);-1!==n.indexOf(S.CONV_AT_ME)&&-1!==n.indexOf(S.CONV_AT_ALL)&&(n=[S.CONV_AT_ALL_AT_ME]);var o={from:e.from,groupID:e.groupID,topicID:e.topicID,messageSequence:e.sequence,atTypeArray:n,__random:e.__random,__sequence:e.__sequence};this.groupAtInfoList.push(o)}}},{key:"_isNeedMergeGroupAtInfo",value:function(e){var t=e.groupID,n=e.sequence;if(!Et({groupID:t}))return!1;var o=!1;return this.groupAtInfoList.forEach((function(t){t.messageSequence===n&&(t.atTypeArray.indexOf(S.CONV_AT_ME)>-1&&e.groupAtType.indexOf(S.CONV_AT_ALL)>-1&&(t.atTypeArray=[S.CONV_AT_ALL_AT_ME]),t.atTypeArray.indexOf(S.CONV_AT_ALL)>-1&&e.groupAtType.indexOf(S.CONV_AT_ME)>-1&&(t.atTypeArray=[S.CONV_AT_ALL_AT_ME],t.__random=e.__random,t.__sequence=e.__sequence),o=!0)})),o}},{key:"clearGroupAtInfoList",value:function(){this.groupAtInfoList.length=0}},{key:"reduceUnreadCount",value:function(){return this.unreadCount>=1&&(this.unreadCount-=1,!0)}},{key:"isLastMessageRevoked",value:function(e){var t=e.sequence,n=e.time;return this.type===S.CONV_C2C&&t===this.lastMessage.lastSequence&&n===this.lastMessage.lastTime||this.type===S.CONV_GROUP&&t===this.lastMessage.lastSequence}},{key:"setLastMessageRevoked",value:function(e){this.lastMessage.isRevoked=e}},{key:"setLastMessageRevoker",value:function(e){this.lastMessage.revoker=e}}]),e}(),Zi=function(){function e(t){o(this,e),this._conversationModule=t,this._n="MessageRemindHandler",this._updateSequence=0}return a(e,[{key:"getC2CMessageRemindType",value:function(){var e=this,t="".concat(this._n,".getC2CMessageRemindType");return this._conversationModule.request({protocolName:Ao,updateSequence:this._updateSequence}).then((function(n){He.l("".concat(t," ok"));var o=n.data,s=o.updateSequence,a=o.muteFlagList;e._updateSequence=s,e._patchC2CMessageRemindType(a)})).catch((function(e){He.e("".concat(t," failed. error:"),e)}))}},{key:"_patchC2CMessageRemindType",value:function(e){var t=this,n=0,o="";it(e)&&e.length>0&&e.forEach((function(e){var s=e.userID,a=e.muteFlag;0===a?o=S.MSG_REMIND_ACPT_AND_NOTE:1===a?o=S.MSG_REMIND_DISCARD:2===a&&(o=S.MSG_REMIND_ACPT_NOT_NOTE),!0===t._conversationModule.patchMessageRemindType({ID:s,isC2CConversation:!0,messageRemindType:o})&&(n+=1)})),He.l("".concat(this._n,"._patchC2CMessageRemindType count:").concat(n))}},{key:"set",value:function(e){return e.groupID?this._setGroupMessageRemindType(e):it(e.userIDList)?this._setC2CMessageRemindType(e):void 0}},{key:"_setGroupMessageRemindType",value:function(e){var t=this,n="".concat(this._n,"._setGroupMessageRemindType"),o=e.groupID,s=e.messageRemindType,a="groupID:".concat(o," messageRemindType:").concat(s),r=new li("setMessageRemindType");return r.setMessage(a),this._getModule(Vn).modifyGroupMemberInfo({groupID:o,messageRemindType:s,userID:this._conversationModule.getMyUserID()}).then((function(){r.setNetworkType(t._conversationModule.getNetworkType()).end(),He.l("".concat(n," ok. ").concat(a));var o=t.onGroupMessageRemindTypeUpdated(e);return t._conversationModule.emitTotalUnreadMessageCountUpdate(),Li(o)})).catch((function(e){return t._conversationModule.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];r.setError(e,o,s).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"onGroupMessageRemindTypeUpdated",value:function(e){var t=e.groupID,n=e.messageRemindType,o=this._getModule(Fn).getLocalGroupProfile(t);if(o&&(o.selfInfo.messageRemindType=n),At(t)){var s=t,a=Kt(s),r=this._getModule(Bn).getLocalTopic(a,s);return r&&(r.updateSelfInfo({messageRemindType:n}),this._conversationModule.emitOuterEvent(k.TOPIC_UPDATED,{groupID:a,topic:r})),{topic:r}}return this._conversationModule.patchMessageRemindType({ID:t,isC2CConversation:!1,messageRemindType:n})&&this._emitConversationUpdate(),{group:o}}},{key:"_setC2CMessageRemindType",value:function(e){var t=this,n="".concat(this._n,"._setC2CMessageRemindType"),o=e.userIDList,s=e.messageRemindType,a=o.slice(0,30),r=0;s===S.MSG_REMIND_DISCARD?r=1:s===S.MSG_REMIND_ACPT_NOT_NOTE&&(r=2);var i="userIDList:".concat(a," messageRemindType:").concat(s),u=new li("setMessageRemindType");return u.setMessage(i),this._conversationModule.request({protocolName:Eo,requestData:{userIDList:a,muteFlag:r}}).then((function(e){u.setNetworkType(t._conversationModule.getNetworkType()).end();var o=e.data,r=o.updateSequence,i=o.errorList;t._updateSequence=r;var c=[],l=[];it(i)&&i.forEach((function(e){c.push(e.userID),l.push({userID:e.userID,code:e.errorCode})}));var p=a.filter((function(e){return-1===c.indexOf(e)}));He.l("".concat(n," ok. successUserIDList:").concat(p," failureUserIDList:").concat(JSON.stringify(l)));var d=0;return p.forEach((function(e){t._conversationModule.patchMessageRemindType({ID:e,isC2CConversation:!0,messageRemindType:s})&&(d+=1)})),d>=1&&t._emitConversationUpdate(),a.length=c.length=0,t._conversationModule.emitTotalUnreadMessageCountUpdate(),Ni({successUserIDList:p.map((function(e){return{userID:e}})),failureUserIDList:l})})).catch((function(e){return t._conversationModule.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];u.setError(e,o,s).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"_getModule",value:function(e){return this._conversationModule.getModule(e)}},{key:"_emitConversationUpdate",value:function(){this._conversationModule.emitConversationUpdate(!0,!1)}},{key:"setUpdateSequence",value:function(e){this._updateSequence=e}},{key:"reset",value:function(){He.l("".concat(this._n,".reset")),this._updateSequence=0}}]),e}(),$i=function(){function e(t){o(this,e),this._conversationModule=t,this._n="ConvGroupHandler",this._convGroupMap=new Map,this._startIndex=0,this._pagingStatus=on.NOT_START}return a(e,[{key:"setConvCustomData",value:function(e){var t=this,n="".concat(this._n,".").concat("setConvCustomData"),o=e.conversationIDList,s=e.customData;He.l("".concat(n," options:"),e);var a=new li("setConvCustomData");a.setMessage(JSON.stringify(e));var r={fromAccount:this._getMyUserID(),itemList:[]},i=[],u=[];return o.forEach((function(e){if(!t._hasLocalConversation(e))return t._onConversationNotFound(u,e),!0;if(!Rt(e)&&!Nt(e))return t._onConversationIDInvalid(u,e),!0;var n={operationType:2,contactItem:void 0,customMark:s};Rt(e)?n.contactItem={type:1,toAccount:e.replace(S.CONV_C2C,"")}:Nt(e)&&(n.contactItem={type:2,groupID:e.replace(S.CONV_GROUP,"")}),r.itemList.push(n)})),u.length===o.length?Ni({successConversationIDList:i,failureConversationIDList:u}):this._conversationModule.request({protocolName:Bo,requestData:r}).then((function(e){a.setNetworkType(t._conversationModule.getNetworkType()).end(),He.l("".concat(n," ok"));var o=e.data.resultItem;if(it(o)){var r,c,l=!1;o.forEach((function(e){r=t._concatConversationID(e.contactItem),0===e.resultCode?(i.push(r),(c=t._getLocalConversation(r))&&c.customData!==s&&(c.customData=s,l=!0)):u.push({conversationID:r,code:e.resultCode,message:e.resultInfo})})),!0===l&&t._emitConversationUpdate()}return Li({successConversationIDList:i,failureConversationIDList:u})})).catch((function(e){return t._conversationModule.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];a.setError(e,o,s).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"markConversation",value:function(e){var t=this;if(!this._conversationModule.canIUse(B.CONV_MARK))return Oi({code:Kr});var n="".concat(this._n,".").concat("markConversation"),o=e.conversationIDList,s=e.markType,a=e.enableMark;He.l("".concat(n," options:"),e);var r=new li("markConversation");r.setMessage(JSON.stringify(e));var i=void 0,u=void 0,c=this._getFlagBit(s);!0===a?u=[c]:i=[c];var l={fromAccount:this._getMyUserID(),itemList:[]},p=[],d=[];return o.forEach((function(e){if(!t._hasLocalConversation(e))return t._onConversationNotFound(d,e),!0;if(!Rt(e)&&!Nt(e))return t._onConversationIDInvalid(d,e),!0;var n={operationType:1,contactItem:void 0,clearMark:i,setMark:u};Rt(e)?n.contactItem={type:1,toAccount:e.replace(S.CONV_C2C,"")}:Nt(e)&&(n.contactItem={type:2,groupID:e.replace(S.CONV_GROUP,"")}),l.itemList.push(n)})),d.length===o.length?Ni({successConversationIDList:p,failureConversationIDList:d}):this._conversationModule.request({protocolName:Ho,requestData:l}).then((function(e){r.setNetworkType(t._conversationModule.getNetworkType()).end(),He.l("".concat(n," ok"));var o=e.data.resultItem;if(it(o)){var i,u,c=!1;o.forEach((function(e){if(i=t._concatConversationID(e.contactItem),0===e.resultCode){if(p.push(i),u=t._getLocalConversation(i)){var n=u.markList.indexOf(s);!0===a?-1===n&&(u.markList.push(s),c=!0):-1!==n&&(u.markList.splice(n,1),c=!0)}}else d.push({conversationID:i,code:e.resultCode,message:e.resultInfo})})),!0===c&&t._emitConversationUpdate()}return Li({successConversationIDList:p,failureConversationIDList:d})})).catch((function(e){return t._conversationModule.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];r.setError(e,o,s).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"getLocalConvGroupList",value:function(){var e=this;return He.l("".concat(this._n,".getLocalConvGroupList pagingStatus:").concat(this._pagingStatus)),this._pagingStatus===on.REJECTED?this.getRemoteConvGroupList().then((function(){return Li(m(e._convGroupMap.values()))})):Ni(m(this._convGroupMap.values()))}},{key:"getRemoteConvGroupList",value:function(){var e=this,t="".concat(this._n,".getRemoteConvGroupList");return this._pagingStatus=on.PENDING,this._conversationModule.request({protocolName:Jo,requestData:{fromAccount:this._getMyUserID(),startIndex:this._startIndex,startTime:Fe()}}).then((function(n){var o,s,a=n.data,r=a.completeFlag,i=a.contactItem,u=a.nextStartIndex,c=void 0===u?0:u,l=a.groupItem;(e._startIndex=c,He.l("".concat(t," completeFlag:").concat(r," nextStartIndex:").concat(c)),it(l)&&l.forEach((function(t){var n=t.convGroupID,o=t.groupName;e._convGroupMap.set(n,o)})),it(i))&&i.forEach((function(t){var n=t.standardMark,a=t.customData,r=t.convGroupIDList;if(o=e._concatConversationID(t),(s=e._getLocalConversation(o))&&(s.markList=Yt(n),s.customData=a||"",it(r))){var i=[];r.forEach((function(t){e._convGroupMap.has(t)&&i.push(e._convGroupMap.get(t))})),s.conversationGroupList=[].concat(i),i.length=0}}));if(0===r)return e.getRemoteConvGroupList();1===r&&(e._pagingStatus=on.RESOLVED,e._emitConversationUpdate(),e._emitConvGroupListUpdate())})).catch((function(n){e._pagingStatus=on.REJECTED,He.w("".concat(t," failed. error:"),n)}))}},{key:"createConvGroup",value:function(e){var t=this;if(!this._conversationModule.canIUse(B.CONV_GROUP))return Oi({code:Kr});var n="".concat(this._n,".").concat("createConvGroup");He.l("".concat(n," options:"),e);var o=new li("createConvGroup");o.setMessage(JSON.stringify(e));var s=e.groupName,a=e.conversationIDList,r={fromAccount:this._getMyUserID(),itemList:[{groupName:s,contactItem:[]}]},i=[],u=[];return a.forEach((function(e){return t._hasLocalConversation(e)?Rt(e)||Nt(e)?void(Rt(e)?r.itemList[0].contactItem.push({type:1,toAccount:e.replace(S.CONV_C2C,"")}):Nt(e)&&r.itemList[0].contactItem.push({type:2,groupID:e.replace(S.CONV_GROUP,"")})):(t._onConversationIDInvalid(u,e),!0):(t._onConversationNotFound(u,e),!0)})),u.length===a.length?Ni({successConversationIDList:i,failureConversationIDList:u}):this._conversationModule.request({protocolName:Ko,requestData:r}).then((function(e){o.setNetworkType(t._conversationModule.getNetworkType()).end(),He.l("".concat(n," ok"));var a=e.data.groupResultItem[0],r=a.groupItem,c=a.resultItem;if(rt(r)&&(t._convGroupMap.set(r.convGroupID,r.groupName),t._emitConvGroupListUpdate()),it(c)){var l,p,d=!1;c.forEach((function(e){l=t._concatConversationID(e.contactItem),0===e.resultCode?(i.push(l),(p=t._getLocalConversation(l))&&-1===p.conversationGroupList.indexOf(s)&&(p.conversationGroupList.push(s),d=!0)):u.push({conversationID:l,code:e.resultCode,message:e.resultInfo})})),!0===d&&(t._emitConversationUpdate(),t._emitConvGroupListUpdate())}return Li({successConversationIDList:i,failureConversationIDList:u})})).catch((function(e){return t._conversationModule.probeNetwork().then((function(t){var n=v(t,2),s=n[0],a=n[1];o.setError(e,s,a).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"deleteConvGroup",value:function(e){var t=this;if(!this._conversationModule.canIUse(B.CONV_GROUP))return Oi({code:Kr});var n="".concat(this._n,".").concat("deleteConvGroup");He.l("".concat(n," groupName:").concat(e));var o=new li("deleteConvGroup");return o.setMessage(e),this._conversationModule.request({protocolName:Wo,requestData:{fromAccount:this._getMyUserID(),groupName:[e]}}).then((function(s){o.setNetworkType(t._conversationModule.getNetworkType()).end(),He.l("".concat(n," ok"));var a=s.data.groupItem;if(it(a)){var r=!1;a.forEach((function(e){t._convGroupMap.has(e.convGroupID)&&(t._convGroupMap.delete(e.convGroupID),r=!0)})),!0===r&&t._emitConvGroupListUpdate()}t._eraseFromConversationGroupList([e])})).catch((function(e){return t._conversationModule.probeNetwork().then((function(t){var n=v(t,2),s=n[0],a=n[1];o.setError(e,s,a).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"renameConvGroup",value:function(e){var t=this;if(!this._conversationModule.canIUse(B.CONV_GROUP))return Oi({code:Kr});var n="".concat(this._n,".").concat("renameConvGroup");He.l("".concat(n," options:"),e);var o=new li("renameConvGroup");o.setMessage(JSON.stringify(e));var s=e.oldName,a=e.newName;return this._conversationModule.request({protocolName:jo,requestData:{fromAccount:this._getMyUserID(),updateType:1,updateGroup:{updateGroupType:1,oldName:s,newName:a}}}).then((function(e){o.setNetworkType(t._conversationModule.getNetworkType()).end(),He.l("".concat(n," ok"));var r=e.data.updateGroupResult.convGroupID;t._convGroupMap.set(r,a),t._emitConvGroupListUpdate();var i,u,c=t._conversationModule.getLocalConversationList(),l=!1;c.forEach((function(e){i=e.conversationGroupList,-1!==(u=i.indexOf(s))&&(i.splice(u,1,a),l=!0)})),!0===l&&t._emitConversationUpdate()})).catch((function(e){return t._conversationModule.probeNetwork().then((function(t){var n=v(t,2),s=n[0],a=n[1];o.setError(e,s,a).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"addConvsToGroup",value:function(e){var t=this;if(!this._conversationModule.canIUse(B.CONV_GROUP))return Oi({code:Kr});var n="".concat(this._n,".").concat("addConvsToGroup");He.l("".concat(n," options:"),e);var o=new li("addConvsToGroup");o.setMessage(JSON.stringify(e));var s=e.conversationIDList,a=e.groupName,r={fromAccount:this._getMyUserID(),updateType:1,updateGroup:{updateGroupType:2,groupName:a,updateItem:[]}},i=[],u=[];return s.forEach((function(e){return t._hasLocalConversation(e)?Rt(e)||Nt(e)?void(Rt(e)?r.updateGroup.updateItem.push({operationType:1,contactItem:{type:1,toAccount:e.replace(S.CONV_C2C,"")}}):Nt(e)&&r.updateGroup.updateItem.push({operationType:1,contactItem:{type:2,groupID:e.replace(S.CONV_GROUP,"")}})):(t._onConversationIDInvalid(u,e),!0):(t._onConversationNotFound(u,e),!0)})),u.length===s.length?Ni({successConversationIDList:i,failureConversationIDList:u}):this._conversationModule.request({protocolName:Yo,requestData:r}).then((function(e){o.setNetworkType(t._conversationModule.getNetworkType()).end(),He.l("".concat(n," ok"));var s=e.data.updateGroupResult.contactResultItem;if(it(s)){var r,c,l=!1;s.forEach((function(e){r=t._concatConversationID(e.contactItem),0===e.resultCode?(c=t._getLocalConversation(r))&&-1===c.conversationGroupList.indexOf(a)&&(c.conversationGroupList.push(a),i.push(r),l=!0):u.push({conversationID:r,code:e.resultCode,message:e.resultInfo})})),!0===l&&(t._emitConversationUpdate(),t._emitConvInGroupUpdate(a))}return Li({successConversationIDList:i,failureConversationIDList:u})})).catch((function(e){return t._conversationModule.probeNetwork().then((function(t){var n=v(t,2),s=n[0],a=n[1];o.setError(e,s,a).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"deleteConvsFromGroup",value:function(e){var t=this;if(!this._conversationModule.canIUse(B.CONV_GROUP))return Oi({code:Kr});var n="".concat(this._n,".").concat("deleteConvsFromGroup");He.l("".concat(n," options:"),e);var o=new li("deleteConvsFromGroup");o.setMessage(JSON.stringify(e));var s=e.conversationIDList,a=e.groupName,r={fromAccount:this._getMyUserID(),updateType:1,updateGroup:{updateGroupType:2,groupName:a,updateItem:[]}},i=[],u=[];return s.forEach((function(e){return t._hasLocalConversation(e)?Rt(e)||Nt(e)?void(Rt(e)?r.updateGroup.updateItem.push({operationType:2,contactItem:{type:1,toAccount:e.replace(S.CONV_C2C,"")}}):Nt(e)&&r.updateGroup.updateItem.push({operationType:2,contactItem:{type:2,groupID:e.replace(S.CONV_GROUP,"")}})):(t._onConversationIDInvalid(u,e),!0):(t._onConversationNotFound(u,e),!0)})),u.length===s.length?Ni({successConversationIDList:i,failureConversationIDList:u}):this._conversationModule.request({protocolName:zo,requestData:r}).then((function(e){o.setNetworkType(t._conversationModule.getNetworkType()).end(),He.l("".concat(n," ok"));var s=e.data.updateGroupResult.contactResultItem;if(it(s)){var r,c,l=!1;s.forEach((function(e){if(r=t._concatConversationID(e.contactItem),0===e.resultCode){if(c=t._getLocalConversation(r)){var n=c.conversationGroupList.indexOf(a);-1!==n&&(c.conversationGroupList.splice(n,1),i.push(r),l=!0)}}else u.push({conversationID:r,code:e.resultCode,message:e.resultInfo})})),!0===l&&(t._emitConversationUpdate(),t._emitConvInGroupUpdate(a))}return Li({successConversationIDList:i,failureConversationIDList:u})})).catch((function(e){return t._conversationModule.probeNetwork().then((function(t){var n=v(t,2),s=n[0],a=n[1];o.setError(e,s,a).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"onConvMarkUpdated",value:function(e){var t=this;if(!Zt(e)){var n,o;He.d("".concat(this._n,".onConvMarkUpdated markItemList:"),e);var s=!1;e.forEach((function(e){var a=e.recentContactItem,r=e.optType,i=e.standardMark,u=e.customMark;if(n=t._concatConversationID(a),o=t._getLocalConversation(n))if(1===r){var c=Yt(i);!0!==function(e,t){if(e===t)return!0;if(!e||!t)return!1;if(e.length!==t.length)return!1;for(var n=0,o=e.length;n<o;n++)if(e[n]!==t[n])return!1;return!0}(o.markList,c)&&(o.markList=c,s=!0)}else 2===r&&o.customData!==u&&void 0!==u&&(o.customData=u,s=!0)})),!0===s&&this._emitConversationUpdate()}}},{key:"onConvGroupCreated",value:function(e){var t=this;He.d("".concat(this._n,".onConvGroupCreated resultList:"),e);var n=!1,o=!1;it(e)&&(e.forEach((function(e){var s=e.msgGroupItem,a=s.groupID,r=s.groupName;t._convGroupMap.get(a)!==r&&(t._convGroupMap.set(a,r),o=!0);var i,u,c=e.msgRecentContactItem;it(c)&&c.forEach((function(e){i=t._concatConversationID(e),(u=t._getLocalConversation(i))&&-1===u.conversationGroupList.indexOf(r)&&(u.conversationGroupList.push(r),n=!0)}))})),!0===n&&this._emitConversationUpdate(),!0===o&&this._emitConvGroupListUpdate())}},{key:"onConvGroupDeleted",value:function(e){var t=this;He.d("".concat(this._n,".onConvGroupDeleted groupItemList:"),e);var n=[];if(it(e)){var o=!1;e.forEach((function(e){var s=e.groupID,a=e.groupName;t._convGroupMap.has(s)&&(t._convGroupMap.delete(s),o=!0,n.push(a))})),!0===o&&this._emitConvGroupListUpdate()}this._eraseFromConversationGroupList(n)}},{key:"_eraseFromConversationGroupList",value:function(e){Zt(e)||(this._conversationModule.getLocalConversationList().forEach((function(t){t.conversationGroupList=t.conversationGroupList.filter((function(t){return!e.includes(t)}))})),this._emitConversationUpdate())}},{key:"onConvGroupNameUpdated",value:function(e){He.d("".concat(this._n,".onConvGroupNameUpdated options:"),e);var t=e.groupID,n=e.groupName,o=e.oldGroupName;if(this._convGroupMap.get(t)!==n){this._convGroupMap.set(t,n),this._emitConvGroupListUpdate();var s,a,r=this._conversationModule.getLocalConversationList(),i=!1;r.forEach((function(e){s=e.conversationGroupList,-1!==(a=s.indexOf(o))&&(s.splice(a,1,n),i=!0)})),!0===i&&this._emitConversationUpdate()}}},{key:"onConvInGroupUpdated",value:function(e){var t=this;He.d("".concat(this._n,".onConvInGroupUpdated options:"),e);var n=e.oldGroupName,o=e.recentContactUpdateGroupItem;if(it(o)){var s,a,r,i=!1;o.forEach((function(e){var o=e.contactOptType,u=e.recentContactItem;s=t._concatConversationID(u),(a=t._getLocalConversation(s))&&(r=a.conversationGroupList.indexOf(n),1===o?-1===r&&(a.conversationGroupList.push(n),i=!0):2===o&&-1!==r&&(a.conversationGroupList.splice(r,1),i=!0))})),!0===i&&(this._emitConversationUpdate(),this._emitConvInGroupUpdate(n))}}},{key:"onConvAddedToOrDeletedFromGroup",value:function(e){var t=this;He.d("".concat(this._n,".onConvAddedToOrDeletedFromGroup options:"),e);var n=e.msgRecentContactItem,o=e.msgRecentContactUpdateContactItem,s=this._concatConversationID(n),a=this._getLocalConversation(s);if(a&&it(o)){var r,i=!1;o.forEach((function(e){var n=e.groupOptType,o=e.recentContactGroupItem.groupName;r=a.conversationGroupList.indexOf(o),1===n?-1===r&&(a.conversationGroupList.push(o),i=!0):2===n&&-1!==r&&(a.conversationGroupList.splice(r,1),i=!0),!0===i&&t._emitConvInGroupUpdate(o)})),!0===i&&this._emitConversationUpdate()}}},{key:"onConvGroupListSynced",value:function(e){var t=this;it(e)&&0!==e.length&&(He.l("".concat(this._n,".onConvGroupListSynced groupItemList:"),e),e.forEach((function(e){t._convGroupMap.set(e.convGroupID,e.groupName)})))}},{key:"getConvGroupListByID",value:function(e){var t=this;if(!Zt(e)){var n=[];return e.forEach((function(e){t._convGroupMap.has(e)&&n.push(t._convGroupMap.get(e))})),n}}},{key:"_onConversationNotFound",value:function(e,t){e.push({conversationID:t,code:or,message:this._conversationModule.getErrorMessage(or)})}},{key:"_onConversationIDInvalid",value:function(e,t){e.push({conversationID:t,code:rr,message:this._conversationModule.getErrorMessage(rr)})}},{key:"_getFlagBit",value:function(e){for(var t=e.toString(2),n=t.length,o=n-1;o>=0;o--)if("1"===t[o])return n-o-1}},{key:"_concatConversationID",value:function(e){var t,n=e.type,o=e.to,s=e.groupID,a=e.userID;return 1===n?ut(a)?ut(o)||(t="".concat(S.CONV_C2C).concat(o)):t="".concat(S.CONV_C2C).concat(a):2===n&&(t="".concat(S.CONV_GROUP).concat(s)),t}},{key:"_getMyUserID",value:function(){return this._conversationModule.getMyUserID()}},{key:"_insertConversationGroup",value:function(e,t){var n=this._getLocalConversation(e);if(n){var o=n.conversationGroupList;-1===o.indexOf(t)&&o.push(t)}}},{key:"_getLocalConversation",value:function(e){return this._conversationModule.getLocalConversation(e)}},{key:"_hasLocalConversation",value:function(e){return this._conversationModule.hasLocalConversation(e)}},{key:"_emitConversationUpdate",value:function(){this._conversationModule.emitConversationUpdate(!0,!1)}},{key:"_emitConvGroupListUpdate",value:function(){this._conversationModule.emitOuterEvent(k.CONVERSATION_GROUP_LIST_UPDATED,m(this._convGroupMap.values()))}},{key:"_emitConvInGroupUpdate",value:function(e){var t={groupName:e,conversationList:[]},n=this._conversationModule.getLocalConversationList();t.conversationList=n.filter((function(t){return t.conversationGroupList.includes(e)})),this._conversationModule.emitOuterEvent(k.CONVERSATION_IN_GROUP_UPDATED,t)}},{key:"reset",value:function(){He.l("".concat(this._n,".reset")),this._convGroupMap.clear(),this._startIndex=0,this._pagingStatus=on.NOT_START}}]),e}(),eu=function(e){i(s,e);var n=f(s);function s(e){var t;return o(this,s),(t=n.call(this,e))._n="ConversationModule",qi.mixin(h(t)),t._messageListHandler=new Pi,t._messageRemindHandler=new Zi(h(t)),t._convGroupHandler=new $i(h(t)),t.singlyLinkedList=new Yi(100),t._pagingStatus=on.NOT_START,t._pagingTimeStamp=0,t._pagingStartIndex=0,t._pagingPinnedTimeStamp=0,t._pagingPinnedStartIndex=0,t._pagingConvIDMap=new Map,t._convIDFromUnreadDBMap=new Map,t._conversationMap=new Map,t._tmpGroupList=[],t._tmpGroupAtTipsList=[],t._peerReadTimeMap=new Map,t._completedMap=new Map,t._roamingMessageKeyAndTimeMap=new Map,t._roamingMessageSequenceMap=new Map,t._remoteGroupReadSequenceMap=new Map,t._convTotalUnreadCount=0,t._initListeners(),t}return a(s,[{key:"_initListeners",value:function(){var e=this.getInnerEmitterInstance();e.on(Ui,this._initLocalConversationList,this),e.on(wi,this._onProfileUpdated,this)}},{key:"onCheckTimer",value:function(e){e%60==0&&this._messageListHandler.traversal()}},{key:"_initLocalConversationList",value:function(){var e=this,t=new li("_initLocalConversationList");He.l("".concat(this._n,".").concat("_initLocalConversationList"));var n="",o=this._getStorageConversationList(),s=this.isIntl();if(o){for(var a=o.length,r=0;r<a;r++){var i=o[r];if(i){if(i.conversationID==="".concat(S.CONV_C2C,"@TLS#ERROR")||i.conversationID==="".concat(S.CONV_C2C,"@TLS#NOT_FOUND"))continue;if(i.groupProfile){var u=i.groupProfile.type;if(Lt(u))continue}}this._conversationMap.set(o[r].conversationID,new Qi(o[r],s))}this.emitConversationUpdate(!0,!1),n="count:".concat(a)}else n="count:0";t.setNetworkType(this.getNetworkType()).setMessage(n).end(),this.getModule(qn)||this.triggerReady(),this.ready((function(){e._tmpGroupList.length>0&&(e.updateConversationGroupProfile(e._tmpGroupList),e._tmpGroupList.length=0)})),this.syncConversationList()}},{key:"onMessageSent",value:function(e){this._onSendOrReceiveMessage({conversationOptionsList:e.conversationOptionsList,isInstantMessage:!0})}},{key:"onNewMessage",value:function(e){this._onSendOrReceiveMessage(e)}},{key:"_onSendOrReceiveMessage",value:function(e){var t=this,n=e.conversationOptionsList,o=e.isInstantMessage,s=void 0===o||o,a=e.isUnreadC2CMessage,r=void 0!==a&&a,i=e.updateUnreadCount,u=void 0===i||i;this._isReady?0!==n.length&&(this._getC2CPeerReadTime(n),this._updateLocalConversationList({conversationOptionsList:n,isInstantMessage:s,isUnreadC2CMessage:r,isFromGetConversations:!1,updateUnreadCount:u}),s||(this._convIDFromUnreadDBMap=new Map([].concat(m(this._convIDFromUnreadDBMap),m(n.map((function(e){return[e.conversationID,1]}))))),this._diffAndDeleteConversation()),this._setStorageConversationList(),n.filter((function(e){return e.type===S.CONV_TOPIC})).length>0||this.emitConversationUpdate()):this.ready((function(){t._onSendOrReceiveMessage(e)}))}},{key:"updateConversationGroupProfile",value:function(e){var t=this;if(!it(e)||0!==e.length)if(0!==this._conversationMap.size){var n=!1;e.forEach((function(e){var o="GROUP".concat(e.groupID);if(t._conversationMap.has(o)){n=!0;var s=t._conversationMap.get(o);s.groupProfile=JSON.parse(JSON.stringify(e)),s.lastMessage.lastSequence<e.nextMessageSeq&&(s.lastMessage.lastSequence=e.nextMessageSeq-1),s.subType||(s.subType=e.type)}})),n&&this.emitConversationUpdate(!0,!1)}else this._tmpGroupList=e}},{key:"_updateConversationUserProfile",value:function(e){var t=this;e.data.forEach((function(e){var n="C2C".concat(e.userID);t._conversationMap.has(n)&&(t._conversationMap.get(n).userProfile=e)})),this.emitConversationUpdate(!0,!1)}},{key:"onMessageRevoked",value:function(e){var t=this;if(0!==e.length){var n=null,o=!1,s=[];e.forEach((function(e){(n=t._conversationMap.get(e.conversationID))&&(n.type===S.CONV_TOPIC?s.push(e):(n.reduceUnreadCount()&&(o=!0),n.isLastMessageRevoked({sequence:e.sequence,time:e.time})&&(n.setLastMessageRevoked(!0),n.setLastMessageRevoker(e.revoker),o=!0)))})),this.getModule(Bn).onMessageRevoked(s),o&&(this.emitConversationUpdate(!0,!1),this.emitTotalUnreadMessageCountUpdate())}}},{key:"isLastMessageRevoked",value:function(e){var t=!1,n=e.conversationID,o=e.sequence,s=e.time,a=this._conversationMap.get(n);a&&(t=a.type===S.CONV_TOPIC?this.getModule(Bn).isLastMessageRevoked({topicID:n.replace(S.CONV_GROUP,""),sequence:o}):a.isLastMessageRevoked({sequence:o,time:s}));return He.l("".concat(this._n,".isLastMessageRevoked options:").concat(JSON.stringify(e)," ret:").concat(t)),t}},{key:"onMessageDeleted",value:function(e){var t=this;if(0!==e.length){var n=null;e.forEach((function(e){(n=t._messageListHandler.getLocalMessage(e.conversationID,e.ID))&&(n.isDeleted=!0),e!==n&&(e.isDeleted=!0)}));for(var o=e[0].conversationID,s=this._messageListHandler.getLocalMessageList(o),a={},r=s.length-1;r>=0;r--)if(!s[r].isDeleted){a=s[r];break}var i=this._conversationMap.get(o);if(i){var u=!1;i.lastMessage.lastSequence===a.sequence&&i.lastMessage.lastTime===a.time||(Zt(a)&&(a=void 0),i.updateLastMessage(a),i.type!==S.CONV_TOPIC&&(u=!0),He.l("".concat(this._n,".onMessageDeleted. update conversationID:").concat(o," with lastMessage:"),i.lastMessage)),o.startsWith(S.CONV_C2C)&&this.updateUnreadCount(o),u&&this.emitConversationUpdate(!0,!1)}}}},{key:"onMessageModified",value:function(e){var t=e.conversationType,n=e.from,o=e.to,s=e.time,a=e.sequence,r=e.elements,i=e.cloudCustomData,u=e.messageVersion,c=this.getMyUserID(),l="".concat(t).concat(o);o===c&&t===S.CONV_C2C&&(l="".concat(t).concat(n));var p=this._messageListHandler.onMessageModified(l,e),d=p.isUpdated,g=p.message;!0===d&&this.emitOuterEvent(k.MESSAGE_MODIFIED,[g]);var h=this._isTopicConversation(l);if(He.l("".concat(this._n,".onMessageModified isUpdated:").concat(d," isTopicMessage:").concat(h," from:").concat(n," to:").concat(o)),h){this.getModule(Bn).onMessageModified(e)}else{var _=this._conversationMap.get(l);if(_){var f=_.lastMessage;He.d("".concat(this._n.onMessageModified," lastMessage:"),JSON.stringify(f),"options:",JSON.stringify(e)),f&&f.lastTime===s&&f.lastSequence===a&&f.version!==u&&(f.type=r[0].type,f.payload=r[0].content,f.messageForShow=Wt(f.type,f.payload,this.isIntl()),f.cloudCustomData=i,f.version=u,this.emitConversationUpdate(!0,!1))}}return g}},{key:"onNewGroupAtTips",value:function(e){var n=this,o=e.dataList,s=null;o.forEach((function(e){e.groupAtTips?s=e.groupAtTips:e.elements?s=t(t({},e.elements),{},{sync:!0}):e.groupAtType&&(s=t(t({},e),{},{sync:!0})),s.__random=e.random,s.__sequence=e.clientSequence,n._tmpGroupAtTipsList.push(s)})),He.d("".concat(this._n,".onNewGroupAtTips isReady:").concat(this._isReady),this._tmpGroupAtTipsList),this._isReady&&this._handleGroupAtTipsList()}},{key:"_handleGroupAtTipsList",value:function(){var e=this;if(0!==this._tmpGroupAtTipsList.length){var t=!1;this._tmpGroupAtTipsList.forEach((function(n){var o=n.groupID,s=n.from,a=n.topicID,r=void 0===a?void 0:a,i=n.sync,u=void 0!==i&&i;if(s!==e.getMyUserID())if(ut(r)){var c=e._conversationMap.get("".concat(S.CONV_GROUP).concat(o));c&&(c.updateGroupAtInfoList(n),t=!0)}else{var l=e._conversationMap.get("".concat(S.CONV_GROUP).concat(r));if(l){l.updateGroupAtInfoList(n);var p=e.getModule(Bn),d=l.groupAtInfoList;p.onConversationProxy({topicID:r,groupAtInfoList:d})}if(Zt(l)&&u)e.updateTopicConversation([{conversationID:"".concat(S.CONV_GROUP).concat(r),type:S.CONV_TOPIC}]),e._conversationMap.get("".concat(S.CONV_GROUP).concat(r)).updateGroupAtInfoList(n)}})),t&&this.emitConversationUpdate(!0,!1),this._tmpGroupAtTipsList.length=0}}},{key:"_getC2CPeerReadTime",value:function(e){var t=this,n=[];if(e.forEach((function(e){t._conversationMap.has(e.conversationID)||e.type!==S.CONV_C2C||n.push(e.conversationID.replace(S.CONV_C2C,""))})),n.length>0){He.d("".concat(this._n,"._getC2CPeerReadTime userIDList:").concat(n));var o=this.getModule(qn);o&&o.getRemotePeerReadTime(n)}}},{key:"_getStorageConversationList",value:function(){return this.getModule(Wn).getItem("conversationMap")}},{key:"_setStorageConversationList",value:function(){var e=this.getLocalConversationList().filter((function(e){return e.type===S.CONV_C2C||e.type===S.CONV_GROUP&&e.lastMessage.type!==S.MSG_GRP_TIP})).slice(0,20).map((function(e){return{conversationID:e.conversationID,type:e.type,subType:e.subType,lastMessage:e.lastMessage,groupProfile:e.groupProfile,userProfile:e.userProfile}}));this.getModule(Wn).setItem("conversationMap",e)}},{key:"emitConversationUpdate",value:function(){var e=!(arguments.length>0&&void 0!==arguments[0])||arguments[0],t=!(arguments.length>1&&void 0!==arguments[1])||arguments[1],n=this.getLocalConversationList();if(t){var o=this.getModule(Fn);o&&o.updateGroupLastMessage(n)}e&&this.emitOuterEvent(k.CONVERSATION_LIST_UPDATED)}},{key:"getLocalConversationList",value:function(){return m(this._conversationMap.values()).filter((function(e){return e.type!==S.CONV_TOPIC}))}},{key:"getLocalConversation",value:function(e){return this._conversationMap.get(e)}},{key:"hasLocalConversation",value:function(e){return this._conversationMap.has(e)}},{key:"getLocalOldestMessage",value:function(e){return this._messageListHandler.getLocalOldestMessage(e)}},{key:"syncConversationList",value:function(){var e=this,t=new li("syncConversationList");return this._pagingStatus===on.NOT_START&&this._conversationMap.clear(),this._pagingGetConversationList().then((function(n){return e._pagingStatus=on.RESOLVED,e._diffAndDeleteConversation(),e.emitConversationUpdate(!0,!1),e._setStorageConversationList(),e._handleC2CPeerReadTime(),e._patchConversationProperties(),t.setMessage(e._conversationMap.size).setNetworkType(e.getNetworkType()).end(),n})).catch((function(n){return e._pagingStatus=on.REJECTED,t.setMessage(e._pagingTimeStamp),e.probeNetwork().then((function(e){var o=v(e,2),s=o[0],a=o[1];t.setError(n,s,a).end()})),Oi(n)}))}},{key:"_diffAndDeleteConversation",value:function(){var e=this;if(this._isSyncCompleted()){var t=[];this._conversationMap.forEach((function(n,o){!e._pagingConvIDMap.has(o)&&e._convIDFromUnreadDBMap.has(o)&&(e._conversationMap.delete(o),t.push(o))})),He.l("".concat(this._n,"._diffAndDeleteConversation list:").concat(t))}}},{key:"_patchConversationProperties",value:function(){var e=this,t=Date.now(),n=this.checkAndPatchRemark(),o=this._messageRemindHandler.getC2CMessageRemindType(),s=this.getModule(Fn).getGroupList();Promise.all([n,o,s]).then((function(){var n=Date.now()-t;He.l("".concat(e._n,"._patchConversationProperties ok. cost ").concat(n," ms")),e.emitConversationUpdate(!0,!1),e.emitTotalUnreadMessageCountUpdate()}))}},{key:"_pagingGetConversationList",value:function(){var e=this,t="".concat(this._n,"._pagingGetConversationList");return He.l("".concat(t," timeStamp:").concat(this._pagingTimeStamp," startIndex:").concat(this._pagingStartIndex)+" pinnedTimeStamp:".concat(this._pagingPinnedTimeStamp," pinnedStartIndex:").concat(this._pagingPinnedStartIndex)),this._pagingStatus=on.PENDING,this.request({protocolName:bo,requestData:{fromAccount:this.getMyUserID(),timeStamp:this._pagingTimeStamp,startIndex:this._pagingStartIndex,pinnedTimeStamp:this._pagingPinnedTimeStamp,pinnedStartIndex:this._pagingPinnedStartIndex,orderType:1}}).then((function(n){var o=n.data,s=o.completeFlag,a=o.conversations,r=void 0===a?[]:a,i=o.timeStamp,u=o.startIndex,c=o.pinnedTimeStamp,l=o.pinnedStartIndex,p=o.groupItem;if(He.l("".concat(t," ok. completeFlag:").concat(s," count:").concat(r.length," isReady:").concat(e._isReady)),e._convGroupHandler.onConvGroupListSynced(p),r.length>0){var d=e._getConversationOptions(r);e._pagingConvIDMap=new Map([].concat(m(e._pagingConvIDMap),m(d.map((function(e){return[e.conversationID,1]}))))),e._updateLocalConversationList({conversationOptionsList:d,isFromGetConversations:!0}),e.isLoggedIn()&&e.emitConversationUpdate()}if(!e._isReady){if(!e.isLoggedIn())return Ni();e.triggerReady()}return e._pagingTimeStamp=i,e._pagingStartIndex=u,e._pagingPinnedTimeStamp=c,e._pagingPinnedStartIndex=l,1!==s?e._pagingGetConversationList():(e._handleGroupAtTipsList(),e._convGroupHandler.getRemoteConvGroupList(),Ni())})).catch((function(n){throw e.isLoggedIn()&&(e._isReady||(He.w("".concat(t," failed. error:"),n),e.triggerReady())),n}))}},{key:"_updateLocalConversationList",value:function(e){var t,n=e.isFromGetConversations,o=e.isInstantMessage,s=Date.now();t=this._getTmpConversationListMapping(e),this._conversationMap=new Map(this._sortConversationList([].concat(m(t.toBeUpdatedConversationList),m(this._conversationMap)))),n||(this._updateUserOrGroupProfile(t.newConversationList),o&&this.emitTotalUnreadMessageCountUpdate()),He.d("".concat(this._n,"._updateLocalConversationList cost ").concat(Date.now()-s," ms"))}},{key:"_getTmpConversationListMapping",value:function(e){for(var t=e.conversationOptionsList,n=e.isFromGetConversations,o=e.isInstantMessage,s=e.isUnreadC2CMessage,a=void 0!==s&&s,r=e.updateUnreadCount,i=[],u=[],c=this.getModule(Fn),l=this.getModule(xn),p=this.isIntl(),d=0,g=t.length;d<g;d++){var h=new Qi(t[d],p),_=h.conversationID;if(_!=="".concat(S.CONV_C2C,"@TLS#ERROR")&&_!=="".concat(S.CONV_C2C,"@TLS#NOT_FOUND"))if(this._conversationMap.has(_)){var f=this._conversationMap.get(_),v=["unreadCount","allowType","adminForbidType","payload","isPinned"];!1===o&&v.push("lastMessage");var m=t[d].lastMessage,M=!ut(m);M||t[d].type===S.CONV_TOPIC||this._onLastMessageNotExist(t[d]),ut(o)&&M&&null===f.lastMessage.payload&&(f.lastMessage.payload=m.payload),Zt(f.lastMessage.revoker)||(f.lastMessage.revoker=null),ft(f,h,v,[null,void 0,"",0,NaN]),!0===r&&f.updateUnreadCount({nextUnreadCount:h.unreadCount,isFromGetConversations:n,isUnreadC2CMessage:a}),o&&M&&(m.payload&&(f.lastMessage.payload=m.payload),f.type===S.CONV_GROUP&&(f.lastMessage.nameCard=m.nameCard,f.lastMessage.nick=m.nick)),M&&f.lastMessage.cloudCustomData!==m.cloudCustomData&&(f.lastMessage.cloudCustomData=m.cloudCustomData||""),this._conversationMap.delete(_),i.push([_,f])}else{if(h.type===S.CONV_GROUP&&c){var y=h.groupProfile.groupID,I=c.getLocalGroupProfile(y);I&&(h.groupProfile=I,!0===r&&h.updateUnreadCount({nextUnreadCount:0}))}else if(h.type===S.CONV_C2C){var C=_.replace(S.CONV_C2C,"");l&&l.isMyFriend(C)&&(h.remark=l.getFriendRemark(C))}u.push(h),i.push([_,h])}}var T=this.getModule(Bn);return i.forEach((function(e){if(e[1].type===S.CONV_TOPIC){var t=e[1],n=t.conversationID,o=t.unreadCount,s=t.groupAtInfoList;T.onConversationProxy({topicID:n.replace(S.CONV_GROUP,""),unreadCount:o,groupAtInfoList:Zt(s)?void 0:s})}})),{toBeUpdatedConversationList:i,newConversationList:u}}},{key:"_onLastMessageNotExist",value:function(e){new li("lastMessageNotExist").setMessage("".concat(JSON.stringify(e))).setNetworkType(this.getNetworkType()).end()}},{key:"_sortConversationList",value:function(e){var t=[],n=[],o=[],s=[];return e.forEach((function(e){!0===e[1].isPinned?Zt(e[1].lastMessage.lastTime)?n.push(e):t.push(e):Zt(e[1].lastMessage.lastTime)?s.push(e):o.push(e)})),t.sort((function(e,t){return t[1].lastMessage.lastTime-e[1].lastMessage.lastTime})).concat(n).concat(o.sort((function(e,t){return t[1].lastMessage.lastTime-e[1].lastMessage.lastTime}))).concat(s)}},{key:"_sortConversationListAndEmitEvent",value:function(){this._conversationMap=new Map(this._sortConversationList(m(this._conversationMap))),this.emitConversationUpdate(!0,!1)}},{key:"_updateUserOrGroupProfile",value:function(e){var t=this;if(0!==e.length){var n=[],o=[],s=this.getModule(wn),a=this.getModule(Fn);e.forEach((function(e){if(e.type===S.CONV_C2C)n.push(e.toAccount);else if(e.type===S.CONV_GROUP){var t=e.toAccount;a.hasLocalGroup(t)?e.groupProfile=a.getLocalGroupProfile(t):o.push(t)}})),He.l("".concat(this._n,"._updateUserOrGroupProfile c2cUserIDList:").concat(n," groupIDList:").concat(o)),n.length>0&&s.getUserProfile({userIDList:n}).then((function(e){var n=e.data;it(n)?n.forEach((function(e){t._doUpdateUserProfile("C2C".concat(e.userID),e)})):t._doUpdateUserProfile("C2C".concat(n.userID),n)})),o.length>0&&a.getGroupProfileAdvance({groupIDList:o,responseFilter:{groupBaseInfoFilter:["Type","Name","FaceUrl"]}}).then((function(e){e.data.successGroupList.forEach((function(e){var n="GROUP".concat(e.groupID);if(t._conversationMap.has(n)){var o=t._conversationMap.get(n);ft(o.groupProfile,e,[],[null,void 0,"",0,NaN]),!o.subType&&e.type&&(o.subType=e.type)}}))}))}}},{key:"_doUpdateUserProfile",value:function(e,t){this.hasLocalConversation(e)&&(this.getLocalConversation(e).userProfile=t)}},{key:"_getConversationOptions",value:function(e){var n=this,o=[],s=e.filter((function(e){var t=e.type,n=e.userID;return 1===t&&"@TLS#NOT_FOUND"!==n&&"@TLS#ERROR"!==n||2===t})),a=this.getMyUserID(),r=s.map((function(e){if(ut(e.lastMsg)&&(e.lastMsg={elements:[]}),1===e.type){var s={userID:e.userID,nick:e.peerNick,avatar:e.peerAvatar};return o.push(s),{conversationID:"C2C".concat(e.userID),type:"C2C",lastMessage:{lastTime:e.time,lastSequence:e.sequence,fromAccount:e.lastC2CMsgFromAccount,messageForShow:e.messageShow,type:e.lastMsg.elements[0]?e.lastMsg.elements[0].type:null,payload:e.lastMsg.elements[0]?n._amendLayersOverLimitProperty(e.lastMsg.elements[0].content):null,cloudCustomData:e.lastMsg.cloudCustomData||"",isRevoked:8===e.lastMessageFlag,onlineOnlyFlag:!1,nick:"",nameCard:"",version:0,isPeerRead:e.lastC2CMsgFromAccount===a&&e.time<=e.c2cPeerReadTime,revoker:e.lastMsg.revokerInfo?e.lastMsg.revokerInfo.revoker:null},userProfile:new Wi(s),peerReadTime:e.c2cPeerReadTime,isPinned:1===e.isPinned,messageRemindType:"",customData:e.customMark||"",markList:Yt(e.standardMark),conversationGroupList:n._convGroupHandler.getConvGroupListByID(e.contactGroupId)}}return{conversationID:"GROUP".concat(e.groupID),type:"GROUP",lastMessage:t(t({lastTime:e.time,lastSequence:e.messageReadSeq+e.unreadCount,fromAccount:e.msgGroupFromAccount,messageForShow:e.messageShow},n._patchTypeAndPayload(e)),{},{cloudCustomData:e.lastMsg.cloudCustomData||"",isRevoked:2===e.lastMessageFlag,onlineOnlyFlag:!1,nick:e.senderNick||"",nameCard:e.senderNameCard||"",revoker:e.lastMsg.revokerInfo?e.lastMsg.revokerInfo.revoker:null}),groupProfile:new Ji({groupID:e.groupID,name:e.groupNick,avatar:e.groupImage}),unreadCount:e.unreadCount,peerReadTime:0,isPinned:1===e.isPinned,messageRemindType:"",version:0,customData:e.customMark||"",markList:Yt(e.standardMark),conversationGroupList:n._convGroupHandler.getConvGroupListByID(e.contactGroupId)}}));o.length>0&&this.getModule(wn).onConversationsProfileUpdated(o);return r}},{key:"_patchTypeAndPayload",value:function(e){var n=e.lastMsg,o=n.event,s=void 0===o?void 0:o,a=n.elements,r=void 0===a?[]:a,i=n.groupTips,u=void 0===i?{}:i;if(!ut(s)&&!Zt(u)){var c=new Si(u);c.setElement({type:S.MSG_GRP_TIP,content:t(t({},u.elements),{},{groupProfile:u.groupProfile})});var l=JSON.parse(JSON.stringify(c.payload));return c=null,{type:S.MSG_GRP_TIP,payload:l}}return{type:r[0]?r[0].type:null,payload:r[0]?this._amendLayersOverLimitProperty(r[0].content):null}}},{key:"_amendLayersOverLimitProperty",value:function(e){var t=e.layersOverLimit;return 0===t?e.layersOverLimit=!1:1===t&&(e.layersOverLimit=!0),e}},{key:"getLocalMessageList",value:function(e){return this._messageListHandler.getLocalMessageList(e)}},{key:"deleteLocalMessage",value:function(e){e instanceof Si&&this._messageListHandler.remove(e)}},{key:"onConversationDeleted",value:function(e){if(it(e)){var t=e.map((function(e){var t=e.type,n=e.userID,o=e.groupID;return 1===t?"".concat(S.CONV_C2C).concat(n):2===t?"".concat(S.CONV_GROUP).concat(o):void 0}));He.l("".concat(this._n,".onConversationDeleted conversationIDList:").concat(t)),this.deleteLocalConversationList(t)}}},{key:"onConversationPinned",value:function(e){var t=this;if(it(e)){var n=!1;e.forEach((function(e){var o,s=e.type,a=e.userID,r=e.groupID;1===s?o=t.getLocalConversation("".concat(S.CONV_C2C).concat(a)):2===s&&(o=t.getLocalConversation("".concat(S.CONV_GROUP).concat(r))),o&&(He.l("".concat(t._n,".onConversationPinned conversationID:").concat(o.conversationID," isPinned:").concat(o.isPinned)),o.isPinned||(o.isPinned=!0,n=!0))})),n&&this._sortConversationListAndEmitEvent()}}},{key:"onConversationUnpinned",value:function(e){var t=this;if(it(e)){var n=!1;e.forEach((function(e){var o,s=e.type,a=e.userID,r=e.groupID;1===s?o=t.getLocalConversation("".concat(S.CONV_C2C).concat(a)):2===s&&(o=t.getLocalConversation("".concat(S.CONV_GROUP).concat(r))),o&&(He.l("".concat(t._n,".onConversationUnpinned conversationID:").concat(o.conversationID," isPinned:").concat(o.isPinned)),o.isPinned&&(o.isPinned=!1,n=!0))})),n&&this._sortConversationListAndEmitEvent()}}},{key:"getMessageList",value:function(e){var t=this,n=e.conversationID,o=e.nextReqMessageID,s=e.count,a="".concat(this._n,".getMessageList"),r=this.getLocalConversation(n),i="";if(r&&r.groupProfile&&(i=r.groupProfile.type),Lt(i))return He.l("".concat(a," not available in avchatroom. conversationID:").concat(n)),Ni({messageList:[],nextReqMessageID:"",isCompleted:!0});(ut(s)||s>15)&&(s=15),!o&&this._isNotInCommunity(n)&&(this._messageListHandler.removeByConversationID(n),this._completedMap.delete(n),this._roamingMessageSequenceMap.delete(n));var u=this._computeRemainingCount({conversationID:n,nextReqMessageID:o}),c=this._completedMap.has(n);if(He.l("".concat(a," conversationID:").concat(n," nextReqMessageID:").concat(o)+" remainingCount:".concat(u," count:").concat(s," isCompleted:").concat(c)),this._needGetHistory({conversationID:n,remainingCount:u,count:s}))return this.getHistoryMessages({conversationID:n,nextReqMessageID:o,count:20}).then((function(e){var o=e.nextReqID,s=e.storedMessageList,r=t._completedMap.has(n),i=s;u>0&&(i=t._messageListHandler.getLocalMessageList(n).slice(0,s.length+u));var c={nextReqMessageID:r?"":o,messageList:i,isCompleted:r};return He.l("".concat(a," ret.nextReqMessageID:").concat(c.nextReqMessageID," ret.isCompleted:").concat(c.isCompleted," ret.length:").concat(i.length)),Li(c)}));this.modifyMessageList(n);var l=this._getMessageListFromMemory({conversationID:n,nextReqMessageID:o,count:s});return Ni(l)}},{key:"_getMessageListFromMemory",value:function(e){var t=e.conversationID,n=e.nextReqMessageID,o=e.count,s="".concat(this._n,"._getMessageListFromMemory"),a=this._messageListHandler.getLocalMessageList(t),r=a.length,i=0,u={isCompleted:!1,nextReqMessageID:"",messageList:[]};return n?(i=a.findIndex((function(e){return e.ID===n})))>o?(u.messageList=a.slice(i-o,i),u.nextReqMessageID=a[i-o].ID):(u.messageList=a.slice(0,i),u.isCompleted=!0):r>o?(i=r-o,u.messageList=a.slice(i,r),u.nextReqMessageID=a[i].ID):(u.messageList=a.slice(0,r),u.isCompleted=!0),He.l("".concat(s," conversationID:").concat(t)+" ret.nextReqMessageID:".concat(u.nextReqMessageID," ret.isCompleted:").concat(u.isCompleted," ret.length:").concat(u.messageList.length)),u}},{key:"getMessageListHopping",value:function(e){var t=e.conversationID,n=e.sequence,o=e.time,s=e.count,a=e.direction,r=void 0===a?0:a;if((ut(s)||s>15)&&(s=15),t.startsWith(S.CONV_C2C)){var i=this.getModule(qn),u=t.replace(S.CONV_C2C,"");return i.getRoamingMessagesHopping({peerAccount:u,time:o,count:s,direction:r})}if(t.startsWith(S.CONV_GROUP)){var c=this.getModule(Fn),l=t.replace(S.CONV_GROUP,"");return c.getRoamingMessagesHopping({groupID:l,sequence:n,count:s,direction:r})}}},{key:"_computeRemainingCount",value:function(e){var t=e.conversationID,n=e.nextReqMessageID,o=this._messageListHandler.getLocalMessageList(t),s=o.length;if(!n)return s;var a=0;return Rt(t)?a=o.findIndex((function(e){return e.ID===n})):Nt(t)&&(a=-1!==n.indexOf("-")?o.findIndex((function(e){return e.ID===n})):o.findIndex((function(e){return e.sequence===n}))),-1===a&&(a=0),a}},{key:"_getMessageListSize",value:function(e){return this._messageListHandler.getLocalMessageList(e).length}},{key:"_needGetHistory",value:function(e){var t=e.conversationID,n=e.remainingCount,o=e.count,s=this.getLocalConversation(t),a="";return s&&s.groupProfile&&(a=s.groupProfile.type),!Ot(t)&&!Lt(a)&&(!(Nt(t)&&this._isPagingGetGroupListCompleted()&&this._getLocalGroupCount()<=4e3&&!this._hasLocalGroup(t)&&!this._isTopicConversation(t))&&(n<=o&&!this._completedMap.has(t)))}},{key:"_isTopicConversation",value:function(e){var t=e.replace(S.CONV_GROUP,"");return At(t)}},{key:"getHistoryMessages",value:function(e){var t=e.conversationID,n=e.count;if(t===S.CONV_SYSTEM)return Ni();var o=15;n>20&&(o=20);var s=null;if(Rt(t)){var a=this._roamingMessageKeyAndTimeMap.has(t);return(s=this.getModule(qn))?s.getRoamingMessage({conversationID:t,peerAccount:t.replace(S.CONV_C2C,""),count:o,lastMessageTime:a?this._roamingMessageKeyAndTimeMap.get(t).lastMessageTime:0,messageKey:a?this._roamingMessageKeyAndTimeMap.get(t).messageKey:""}):Oi({code:Pr})}if(Nt(t)){if(!(s=this.getModule(Fn)))return Oi({code:Pr});var r=null;this._conversationMap.has(t)&&(r=this._conversationMap.get(t).lastMessage);var i=0;r&&(i=r.lastSequence);var u=this._roamingMessageSequenceMap.get(t);return s.getRoamingMessage({conversationID:t,groupID:t.replace(S.CONV_GROUP,""),count:o,sequence:u||i})}return Ni()}},{key:"patchConversationLastMessage",value:function(e){var t=this.getLocalConversation(e);if(t){var n=t.lastMessage,o=n.messageForShow,s=n.payload;if(Zt(o)||Zt(s)){var a=this._messageListHandler.getLocalMessageList(e);if(0===a.length)return;var r=a[a.length-1];He.l("".concat(this._n,".patchConversationLastMessage conversationID:").concat(e," payload:"),r.payload),t.updateLastMessage(r)}}}},{key:"onRoamingMessage",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[],n=arguments.length>1?arguments[1]:void 0,o=!(arguments.length>2&&void 0!==arguments[2])||arguments[2],s=n.startsWith(S.CONV_C2C)?S.CONV_C2C:S.CONV_GROUP,a=null,r=[],i=[],u=0,c=e.length,l=null,p=s===S.CONV_GROUP,d=this.getModule(zn),g=this.getFileDownloadProxy(),h=function(){u=p?e.length-1:0,c=p?0:e.length},_=function(){p?--u:++u},f=function(){return p?u>=c:u<c};for(h();f();_())if(p&&1===e[u].sequence&&o&&this.setCompleted(n),1!==e[u].isPlaceMessage)if((a=new Si(e[u])).to=e[u].to,s!==S.CONV_GROUP||ut(e[u].topicID)||(a.to=e[u].topicID),a.isSystemMessage=!!e[u].isSystemMessage,a.conversationType=s,4===e[u].event?l={type:S.MSG_GRP_TIP,content:t(t({},e[u].elements),{},{groupProfile:e[u].groupProfile})}:(e[u].elements=d.parseElements(e[u].elements,e[u].from),l=e[u].elements),p||a.setNickAndAvatar({nick:e[u].nick,avatar:e[u].avatar}),Zt(l)){var v=new li("emptyMessageBody");v.setMessage("from:".concat(a.from," to:").concat(a.to," sequence:").concat(a.sequence," event:").concat(e[u].event)),v.setNetworkType(this.getNetworkType()).setLevel("warning").end()}else a.setElement(l,g),a.reInitialize(this.getMyUserID()),r.push(a);return h=_=f=null,o?(this._messageListHandler.unshift(r,i),r=null,i):(i=null,r)}},{key:"findMessage",value:function(e){return this._messageListHandler.findMessage(e)}},{key:"_isNotInCommunity",value:function(e){var t=!1;if(e.startsWith(S.CONV_GROUP)&&this._isTopicConversation(e)){var n=Kt(e.replace(S.CONV_GROUP,""));this.getModule(Fn).hasLocalGroup(n)||(t=!0)}return t}},{key:"deleteTopicRoamingMessageInfo",value:function(e){var t=this;Et({groupID:e})&&this._messageListHandler.getTopicConversationIDList(e).forEach((function(e){t._messageListHandler.removeByConversationID(e),t._completedMap.delete(e),t._roamingMessageSequenceMap.delete(e)}))}},{key:"deleteGroupRomaingMessageInfo",value:function(e){var t="".concat(S.CONV_GROUP).concat(e);this._messageListHandler.removeByConversationID(t),this._completedMap.delete(t),this._roamingMessageSequenceMap.delete(t)}},{key:"setMessageRead",value:function(e){var t=e.conversationID,n=this.getLocalConversation(t);if(He.l("".concat(this._n,".setMessageRead conversationID:").concat(t," unreadCount:").concat(n?n.unreadCount:0)),!n)return Ni();if(n.type!==S.CONV_GROUP&&n.type!==S.CONV_TOPIC||Zt(n.groupAtInfoList)||this.deleteGroupAtTips(t),0===n.unreadCount)return Ni();if(n.type===S.CONV_GROUP&&!this._hasLocalGroup(t))return 0!==n.unreadCount&&(n.unreadCount=0,this.emitConversationUpdate(!0,!1)),Ni();var o=this._messageListHandler.getLocalLastMessage(t),s=n.lastMessage.lastTime;o&&s<o.time&&(s=o.time);var a=n.lastMessage.lastSequence;if(o&&a<o.sequence&&(a=o.sequence),n.type===S.CONV_TOPIC&&ut(o)){var r=this.getModule(Bn),i=t.replace(S.CONV_GROUP,""),u=Kt(i),c=r.getLocalTopic(u,i);c&&(a=c.nextMessageSeq-1)}var l=null;switch(n.type){case S.CONV_C2C:return(l=this.getModule(qn))?l.setMessageRead({conversationID:t,lastMessageTime:s}):Oi({code:Pr});case S.CONV_GROUP:case S.CONV_TOPIC:return(l=this.getModule(Fn))?l.setMessageRead({conversationID:t,lastMessageSeq:a}):Oi({code:Pr});case S.CONV_SYSTEM:return n.unreadCount=0,this.emitConversationUpdate(!0,!1),Ni();default:return Ni()}}},{key:"setAllMessageRead",value:function(){var e=this,t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n="setAllMessageRead",o="".concat(this._n,".").concat(n);t.scope||(t.scope=S.READ_ALL_MSG),He.l("".concat(o," options:"),t);var s=this._createSetAllMessageReadPack(t);if(0===s.readAllC2CMessage&&0===s.groupMessageReadInfoList.length)return Ni();var a=new li(n);return this.request({protocolName:ps,requestData:s}).then((function(n){var o=n.data,s=e._handleAllMessageRead(o);return a.setMessage("scope:".concat(t.scope," failureGroups:").concat(JSON.stringify(s))).setNetworkType(e.getNetworkType()).end(),Ni()})).catch((function(t){return e.probeNetwork().then((function(e){var n=v(e,2),o=n[0],s=n[1];a.setError(t,o,s).end()})),He.w("".concat(o," failed. error:"),t),Oi({code:t&&t.code?t.code:Pa,message:t&&t.message?t.message:void 0})}))}},{key:"setConversationCustomData",value:function(e){return this._convGroupHandler.setConvCustomData(e)}},{key:"markConversation",value:function(e){return this._convGroupHandler.markConversation(e)}},{key:"getConversationGroupList",value:function(){return this._convGroupHandler.getLocalConvGroupList()}},{key:"createConversationGroup",value:function(e){return this._convGroupHandler.createConvGroup(e)}},{key:"deleteConversationGroup",value:function(e){return this._convGroupHandler.deleteConvGroup(e)}},{key:"renameConversationGroup",value:function(e){return this._convGroupHandler.renameConvGroup(e)}},{key:"addConversationsToGroup",value:function(e){return this._convGroupHandler.addConvsToGroup(e)}},{key:"deleteConversationsFromGroup",value:function(e){return this._convGroupHandler.deleteConvsFromGroup(e)}},{key:"onConversationMarkUpdated",value:function(e){this._convGroupHandler.onConvMarkUpdated(e)}},{key:"onConversationGroupCreated",value:function(e){this._convGroupHandler.onConvGroupCreated(e)}},{key:"onConversationGroupDeleted",value:function(e){this._convGroupHandler.onConvGroupDeleted(e)}},{key:"onConversationGroupNameUpdated",value:function(e){this._convGroupHandler.onConvGroupNameUpdated(e)}},{key:"onConversationInGroupUpdated",value:function(e){this._convGroupHandler.onConvInGroupUpdated(e)}},{key:"onConversationAddedToOrDeletedFromGroup",value:function(e){this._convGroupHandler.onConvAddedToOrDeletedFromGroup(e)}},{key:"_getConversationLastMessageSequence",value:function(e){var t=this._messageListHandler.getLocalLastMessage(e.conversationID),n=e.lastMessage.lastSequence;return t&&n<t.sequence&&(n=t.sequence),n}},{key:"_getConversationLastMessageTime",value:function(e){var t=this._messageListHandler.getLocalLastMessage(e.conversationID),n=e.lastMessage.lastTime;return t&&n<t.time&&(n=t.time),n}},{key:"_createSetAllMessageReadPack",value:function(e){var t,n={readAllC2CMessage:0,groupMessageReadInfoList:[]},o=e.scope,s=D(this._conversationMap);try{for(s.s();!(t=s.n()).done;){var a=v(t.value,2)[1];if(a.unreadCount>0)if(a.type===S.CONV_C2C&&0===n.readAllC2CMessage){if(o===S.READ_ALL_MSG)n.readAllC2CMessage=1;else if(o===S.READ_ALL_C2C_MSG){n.readAllC2CMessage=1;break}}else if(a.type===S.CONV_GROUP&&(o===S.READ_ALL_GROUP_MSG||o===S.READ_ALL_MSG)){var r=this._getConversationLastMessageSequence(a);n.groupMessageReadInfoList.push({groupID:a.groupProfile.groupID,messageSequence:r})}}}catch(i){s.e(i)}finally{s.f()}return n}},{key:"onPushedAllMessageRead",value:function(e){this._handleAllMessageRead(e)}},{key:"_handleAllMessageRead",value:function(e){var t=e.groupMessageReadInfoList,n=e.readAllC2CMessage,o=this._parseGroupReadInfo(t);return this._updateAllConversationUnreadCount({readAllC2CMessage:n})>=1&&(this.emitConversationUpdate(!0,!1),this.emitTotalUnreadMessageCountUpdate()),o}},{key:"_parseGroupReadInfo",value:function(e){var t=[];if(e&&e.length)for(var n=0,o=e.length;n<o;n++){var s=e[n],a=s.groupID,r=s.sequence,i=s.retCode,u=s.lastMessageSeq;ut(i)?this._remoteGroupReadSequenceMap.set(a,u):(this._remoteGroupReadSequenceMap.set(a,r),0!==i&&t.push("".concat(a,"-").concat(r,"-").concat(i)))}return t}},{key:"_updateAllConversationUnreadCount",value:function(e){var t,n=e.readAllC2CMessage,o=0,s=D(this._conversationMap);try{for(s.s();!(t=s.n()).done;){var a=v(t.value,2),r=a[0],i=a[1];if(i.unreadCount>=1){if(1===n&&i.type===S.CONV_C2C){var u=this._getConversationLastMessageTime(i);this.updateIsReadAfterReadReport({conversationID:r,lastMessageTime:u})}else if(i.type===S.CONV_GROUP){var c=r.replace(S.CONV_GROUP,"");if(this._remoteGroupReadSequenceMap.has(c)){var l=this._remoteGroupReadSequenceMap.get(c),p=this._getConversationLastMessageSequence(i);this.updateIsReadAfterReadReport({conversationID:r,remoteReadSequence:l}),p>=l&&this._remoteGroupReadSequenceMap.delete(c)}}this.updateUnreadCount(r,!1)&&(o+=1)}}}catch(d){s.e(d)}finally{s.f()}return o}},{key:"isRemoteRead",value:function(e){var t=e.conversationID,n=e.sequence,o=t.replace(S.CONV_GROUP,""),s=!1;if(this._remoteGroupReadSequenceMap.has(o)){var a=this._remoteGroupReadSequenceMap.get(o);n<=a&&(s=!0,He.l("".concat(this._n,".isRemoteRead conversationID:").concat(t," messageSequence:").concat(n," remoteReadSequence:").concat(a))),n>=a+10&&this._remoteGroupReadSequenceMap.delete(o)}return s}},{key:"updateIsReadAfterReadReport",value:function(e){var t=e.conversationID,n=e.lastMessageSeq,o=e.lastMessageTime,s=this._messageListHandler.getLocalMessageList(t);if(0!==s.length)for(var a,r=s.length-1;r>=0;r--)if(a=s[r],!(o&&a.time>o||n&&a.sequence>n)){if("in"===a.flow&&a.isRead)break;a.setIsRead(!0)}}},{key:"updateUnreadCount",value:function(e){var t=!(arguments.length>1&&void 0!==arguments[1])||arguments[1],n=!1,o=this.getLocalConversation(e),s=this._messageListHandler.getLocalMessageList(e);if(o){var a=o.unreadCount,r=s.filter((function(e){return!e.isRead&&!e._onlineOnlyFlag&&!e.isDeleted})).length;if(a!==r&&(o.unreadCount=r,n=!0,He.l("".concat(this._n,".updateUnreadCount from ").concat(a," to ").concat(r,", conversationID:").concat(e)),!0===t&&(this.emitConversationUpdate(!0,!1),this.emitTotalUnreadMessageCountUpdate())),n&&o.type===S.CONV_TOPIC){var i=o.unreadCount,u=this.getModule(Bn),c=e.replace(S.CONV_GROUP,"");u.onConversationProxy({topicID:c,unreadCount:i})}return n}}},{key:"clearGroupAtInfoList",value:function(e){var t=!(arguments.length>1&&void 0!==arguments[1])||arguments[1],n=this.getLocalConversation(e);if(n&&n.groupAtInfoList.length>0){if(n.clearGroupAtInfoList(),He.l("".concat(this._n,".clearGroupAtInfoList conversationID:").concat(e)),n.type===S.CONV_TOPIC){var o=n.groupAtInfoList,s=this.getModule(Bn),a=e.replace(S.CONV_GROUP,"");s.onConversationProxy({topicID:a,groupAtInfoList:o})}!0===t&&this.emitConversationUpdate(!0,!1)}}},{key:"updateReadReceiptInfo",value:function(e){var t=this,n=e.userID,o=void 0===n?void 0:n,s=e.groupID,a=void 0===s?void 0:s,r=e.readReceiptList;if(!Zt(r)){var i=[];if(ut(o)){if(!ut(a)){var u="".concat(S.CONV_GROUP).concat(a);r.forEach((function(e){var n=e.tinyID,o=e.clientTime,s=e.random,r=e.readCount,c=e.unreadCount,l="".concat(n,"-").concat(o,"-").concat(s),p=t._messageListHandler.getLocalMessage(u,l),d={groupID:a,messageID:l,readCount:0,unreadCount:0};p&&(ot(r)&&(p.readReceiptInfo.readCount=r,d.readCount=r),ot(c)&&(p.readReceiptInfo.unreadCount=c,d.unreadCount=c),i.push(d))}))}}else{var c="".concat(S.CONV_C2C).concat(o);r.forEach((function(e){var n=e.tinyID,s=e.clientTime,a=e.random,r="".concat(n,"-").concat(s,"-").concat(a),u=t._messageListHandler.getLocalMessage(c,r);if(u){u.readReceiptInfo.isPeerRead=!0;var l={userID:o,messageID:r,isPeerRead:!0};i.push(l)}}))}i.length>0&&this.emitOuterEvent(k.MESSAGE_READ_RECEIPT_RECEIVED,i)}}},{key:"recomputeGroupUnreadCount",value:function(e){var t=e.conversationID,n=e.count,o=this.getLocalConversation(t);if(o){var s=o.unreadCount,a=s-n;a<0&&(a=0),o.unreadCount=a,He.l("".concat(this._n,".recomputeGroupUnreadCount from ").concat(s," to ").concat(a,", conversationID:").concat(t))}}},{key:"updateIsRead",value:function(e){var t=this.getLocalConversation(e),n=this.getLocalMessageList(e);if(t&&0!==n.length&&!Ot(t.type)){for(var o=[],s=0,a=n.length;s<a;s++)"in"!==n[s].flow?"out"!==n[s].flow||n[s].isRead||n[s].setIsRead(!0):o.push(n[s]);var r=0;if(t.type===S.CONV_C2C){var i=o.slice(-t.unreadCount).filter((function(e){return e.isRevoked})).length;r=o.length-t.unreadCount-i}else r=o.length-t.unreadCount;for(var u=0;u<r&&!o[u].isRead;u++)o[u].setIsRead(!0)}}},{key:"deleteGroupAtTips",value:function(e){var t=this,n="".concat(this._n,".deleteGroupAtTips");He.l("".concat(n));var o=this._conversationMap.get(e);if(!o)return Promise.resolve();var s=o.groupAtInfoList;if(0===s.length)return Promise.resolve();var a=void 0;e.startsWith(S.CONV_GROUP)&&(a=e.replace(S.CONV_GROUP,""));var r=m(s);if((Et({groupID:a})||At(a))&&0===(r=s.filter((function(e){return!e.atTypeArray.includes(S.CONV_AT_ALL)}))).length)return this.clearGroupAtInfoList(e,!1),Promise.resolve();var i=this.getMyUserID();return this.request({protocolName:Vo,requestData:{messageListToDelete:r.map((function(e){return{from:e.from,to:i,messageSeq:e.__sequence,messageRandom:e.__random,groupID:ut(e.topicID)?e.groupID:e.topicID}}))}}).then((function(){return He.l("".concat(n," ok. count:").concat(s.length)),t.clearGroupAtInfoList(e,!1),Promise.resolve()})).catch((function(e){return He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"appendToMessageList",value:function(e){this._messageListHandler.pushIn(e)}},{key:"setMessageRandom",value:function(e){this.singlyLinkedList.set(e.random)}},{key:"deleteMessageRandom",value:function(e){this.singlyLinkedList.delete(e.random)}},{key:"pushIntoMessageList",value:function(e,t,n){return!(!this._messageListHandler.pushIn(t,n)||this._isMessageFromCurrentInstance(t)&&!n)&&(e.push(t),!0)}},{key:"_isMessageFromCurrentInstance",value:function(e){return this.singlyLinkedList.has(e.random)}},{key:"revoke",value:function(e,t,n){return this._messageListHandler.revoke(e,t,n)}},{key:"getPeerReadTime",value:function(e){return this._peerReadTimeMap.get(e)}},{key:"recordPeerReadTime",value:function(e,t){this._peerReadTimeMap.has(e)?this._peerReadTimeMap.get(e)<t&&this._peerReadTimeMap.set(e,t):this._peerReadTimeMap.set(e,t)}},{key:"updateMessageIsPeerReadProperty",value:function(e,t){if(e.startsWith(S.CONV_C2C)&&t>0){var n=this._messageListHandler.updateMessageIsPeerReadProperty(e,t);if(n.length>0&&this.emitOuterEvent(k.MESSAGE_READ_BY_PEER,n),this._conversationMap.has(e)){var o=this._conversationMap.get(e).lastMessage;Zt(o)||o.fromAccount===this.getMyUserID()&&o.lastTime<=t&&!o.isPeerRead&&(o.isPeerRead=!0,this.emitConversationUpdate(!0,!1))}}}},{key:"updateMessageIsModifiedProperty",value:function(e){this._messageListHandler.updateMessageIsModifiedProperty(e)}},{key:"setCompleted",value:function(e){He.l("".concat(this._n,".setCompleted. conversationID:").concat(e)),this._completedMap.set(e,!0)}},{key:"updateRoamingMessageKeyAndTime",value:function(e,t,n){this._roamingMessageKeyAndTimeMap.set(e,{messageKey:t,lastMessageTime:n})}},{key:"updateRoamingMessageSequence",value:function(e,t){this._roamingMessageSequenceMap.set(e,t)}},{key:"getConversationList",value:function(e){var t=this,n="getConversationList",o="".concat(this._n,".").concat(n),s="pagingStatus:".concat(this._pagingStatus,", local conversation count:").concat(this._conversationMap.size,", options:").concat(e);if(He.l("".concat(o,". ").concat(s)),this._pagingStatus===on.REJECTED){var a=new li(n);return a.setMessage(s),this.syncConversationList().then((function(){a.setNetworkType(t.getNetworkType()).end();var n=t._getConversationList(e);return Li({conversationList:n,isSyncCompleted:t._isSyncCompleted()})})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];a.setError(e,o,s).end()})),He.e("".concat(o," failed. error:"),e),Oi(e)}))}if(0===this._conversationMap.size){var r=new li(n);return r.setMessage(s),this.syncConversationList().then((function(){r.setNetworkType(t.getNetworkType()).end();var n=t._getConversationList(e);return Li({conversationList:n,isSyncCompleted:t._isSyncCompleted()})})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];r.setError(e,o,s).end()})),He.e("".concat(o," failed. error:"),e),Oi(e)}))}var i=this._getConversationList(e);return He.l("".concat(o,". returned conversation count:").concat(i.length)),Ni({conversationList:i,isSyncCompleted:this._isSyncCompleted()})}},{key:"_getConversationList",value:function(e){if(ut(e))return this.getLocalConversationList();if(it(e))return 0===e.length?[]:this.getLocalConversationList().filter((function(t){return e.includes(t.conversationID)}));if(rt(e)){var t=e.type,n=e.markType,o=e.groupName;return this.getLocalConversationList().filter((function(e){return(t!==S.CONV_C2C&&t!==S.CONV_GROUP||e.type===t)&&(!st(o)||e.conversationGroupList.includes(o))&&(!ot(n)||e.markList.includes(n))}))}return[]}},{key:"_handleC2CPeerReadTime",value:function(){var e,t=D(this._conversationMap);try{for(t.s();!(e=t.n()).done;){var n=v(e.value,2),o=n[0],s=n[1];s.type===S.CONV_C2C&&(He.d("".concat(this._n,"._handleC2CPeerReadTime conversationID:").concat(o," peerReadTime:").concat(s.peerReadTime)),this.recordPeerReadTime(o,s.peerReadTime))}}catch(a){t.e(a)}finally{t.f()}}},{key:"_isPagingGetGroupListCompleted",value:function(){return this.getModule(Fn).isPagingGetCompleted()}},{key:"_getLocalGroupCount",value:function(){return this.getModule(Fn).getLocalGroupList().length}},{key:"_hasLocalGroup",value:function(e){return this.getModule(Fn).hasLocalGroup(e.replace(S.CONV_GROUP,""))}},{key:"getConversationProfile",value:function(e){var t,n=this;if((t=this._conversationMap.has(e)?this._conversationMap.get(e):new Qi({conversationID:e,type:e.slice(0,3)===S.CONV_C2C?S.CONV_C2C:S.CONV_GROUP},this.isIntl()))._isInfoCompleted||t.type===S.CONV_SYSTEM)return Ni({conversation:t});if(Nt(e)&&!this._hasLocalGroup(e))return Ni({conversation:t});var o="".concat(this._n,".").concat("getConversationProfile"),s=new li("getConversationProfile");return He.l("".concat(o,". conversationID:").concat(e," remark:").concat(t.remark," lastMessage:"),t.lastMessage),this._updateUserOrGroupProfileCompletely(t).then((function(a){s.setNetworkType(n.getNetworkType()).setMessage("conversationID:".concat(e," unreadCount:").concat(a.data.conversation.unreadCount)).end();var r=n.getModule(xn);if(r&&t.type===S.CONV_C2C){var i=e.replace(S.CONV_C2C,"");if(r.isMyFriend(i)){var u=r.getFriendRemark(i);t.remark!==u&&(t.remark=u,He.l("".concat(o,". conversationID:").concat(e," patch remark:").concat(t.remark)))}}return He.l("".concat(o," ok. conversationID:").concat(e)),a})).catch((function(t){return n.probeNetwork().then((function(n){var o=v(n,2),a=o[0],r=o[1];s.setError(t,a,r).setMessage("conversationID:".concat(e)).end()})),He.e("".concat(o," failed. error:"),t),Oi(t)}))}},{key:"_updateUserOrGroupProfileCompletely",value:function(e){var t=this;return e.type===S.CONV_C2C?this.getModule(wn).getUserProfile({userIDList:[e.toAccount]}).then((function(n){var o=n.data;return 0===o.length?Oi(new Ei({code:sr})):(e.userProfile=o[0],e._isInfoCompleted=!0,t._unshiftConversation(e),Ni({conversation:e}))})):this.getModule(Fn).getGroupProfile({groupID:e.toAccount}).then((function(n){return e.groupProfile=n.data.group,e._isInfoCompleted=!0,t._unshiftConversation(e),Ni({conversation:e})}))}},{key:"_unshiftConversation",value:function(e){e instanceof Qi&&!this._conversationMap.has(e.conversationID)&&(this._conversationMap=new Map([[e.conversationID,e]].concat(m(this._conversationMap))),this._setStorageConversationList(),this.emitConversationUpdate(!0,!1))}},{key:"_onProfileUpdated",value:function(e){var t=this;e.data.forEach((function(e){var n=e.userID;if(n===t.getMyUserID())t._onMyProfileModified({latestNick:e.nick,latestAvatar:e.avatar});else{var o=t._conversationMap.get("".concat(S.CONV_C2C).concat(n));o&&(o.userProfile=e)}}))}},{key:"_isSyncCompleted",value:function(){return this._pagingStatus===on.RESOLVED}},{key:"_errorLog",value:function(e,t,n,o){var s=new Error("Params validate failed."),a="".concat(this.getErrorMessage("API_REFER")).concat(e);throw He.w("[".concat(e,"] | ").concat(t," | ").concat(this.getErrorMessage(n,o),", ").concat(a)),He.e("[".concat(e,"] Invalid ").concat(t,": type check failed for ").concat(t,".")),s}},{key:"_isValidConversationID",value:function(e){return Rt(e)||Nt(e)||Ot(e)}},{key:"deleteConversation",value:function(e){var t=this,n="deleteConversation";return st(e)||at(e)||this._errorLog(n,"options","StringOrObjectRequiredLog"),st(e)?(this._isValidConversationID(e)||this._errorLog(n,"options","InvalidConversationID",e),He.l("".concat(this._n,".").concat(n," conversationID:").concat(e)),this.deleteConversationList({conversationIDList:[e],flag:1})):(it(e.conversationIDList)||this._errorLog(n,"conversationIDList","ArrayRequiredLog"),0===e.conversationIDList.length&&this._errorLog(n,"conversationIDList","NonEmptyArrayLog"),e.conversationIDList.forEach((function(e){t._isValidConversationID(e)||t._errorLog(n,"conversationIDList","InvalidConversationID",e)})),"clearHistoryMessage"in e&&"boolean"!=typeof e.clearHistoryMessage&&this._errorLog(n,"clearHistoryMessage","BooleanRequiredLog"),e.conversationIDList.length>100&&(e.conversationIDList=e.conversationIDList.slice(0,100)),this.deleteConversationList(e))}},{key:"deleteConversationList",value:function(e){var t=this,n=e.conversationIDList,o=void 0===n?[]:n,s=e.clearHistoryMessage,a=void 0===s||s,r=e.flag,i=void 0===r?0:r,u="".concat(this._n,".").concat("deleteConversationList");He.l("".concat(u," conversationIDList.length:").concat(o.length," clearHistoryMessage:").concat(a));var c=new li("deleteConversationList");return c.setMessage("conversationIDList:".concat(o)),Promise.all([this.rmLocalOnlyConversationList(o),this.rmLocalAndRemoteConversationList(o,a)]).then((function(e){c.setNetworkType(t.getNetworkType()).end();var n=[].concat(m(e[0]),m(e[1]));return 0===n.length?Oi(new Ei({code:or})):(He.l("".concat(u," ok")),Ni(1===i?{conversationID:n[0]}:{conversationIDList:n}))})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];c.setError(e,o,s).end()})),He.e("".concat(u," failed. error:"),e),Oi(e)}))}},{key:"rmLocalOnlyConversationList",value:function(e){var t=this;return e.filter((function(e){if(!t._conversationMap.has(e))return!1;var n=t.getLocalConversation(e).type;return n!==S.CONV_GROUP||t._hasLocalGroup(e)?n===S.CONV_SYSTEM&&(t.getModule(Fn).deleteGroupSystemNotice({messageList:t._messageListHandler.getLocalMessageList(e)}),t.deleteLocalConversation(e),!0):(t.deleteLocalConversation(e),!0)}))}},{key:"rmLocalAndRemoteConversationList",value:function(e,t){var n=this,o={fromAccount:this.getMyUserID(),conversationList:[],clearHistoryMessage:t?1:0};return e.forEach((function(e){if(n._conversationMap.has(e)){var t=n.getLocalConversation(e).type;t===S.CONV_C2C?o.conversationList.push({toAccount:e.replace(t,""),type:1}):t===S.CONV_GROUP&&n._hasLocalGroup(e)&&o.conversationList.push({toGroupID:e.replace(t,""),type:2})}})),0===o.conversationList.length?[]:this.request({protocolName:qo,requestData:o}).then((function(e){var t=[];return e.data.resultList.length>0&&e.data.resultList.map((function(e){if(0===e.code){var n="".concat(1===e.type?S.CONV_C2C:S.CONV_GROUP).concat(e.to);t.push(n)}})),n.deleteLocalConversationList(t),t}))}},{key:"clearHistoryMessage",value:function(e){var t=this,n={fromAccount:this.getMyUserID(),toAccount:void 0,type:void 0,toGroupID:void 0};if(!this._conversationMap.has(e))return Oi({code:or});var o=this._conversationMap.get(e).type;if(o===S.CONV_C2C)n.type=1,n.toAccount=e.replace(S.CONV_C2C,"");else{if(o!==S.CONV_GROUP)return o===S.CONV_SYSTEM?(this.getModule(Fn).deleteGroupSystemNotice({messageList:this._messageListHandler.getLocalMessageList(e)}),Ni({conversationID:e})):Oi({code:ar});n.type=2,n.toGroupID=e.replace(S.CONV_GROUP,"")}var s="".concat(this._n,".").concat("clearHistoryMessage"),a=new li("clearHistoryMessage");return a.setMessage("conversationID:".concat(e)),He.l("".concat(s,". conversationID:").concat(e)),this.setMessageRead({conversationID:e}).then((function(){return t.request({protocolName:Fo,requestData:n})})).then((function(){a.setNetworkType(t.getNetworkType()).end(),He.l("".concat(s," ok")),t._messageListHandler.removeByConversationID(e),t.setCompleted(e);var n=t.getLocalConversation(e);return n&&(n.updateLastMessage(),t._sortConversationListAndEmitEvent()),Ni({conversationID:e})})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];a.setError(e,o,s).end()})),He.e("".concat(s," failed. error:"),e),Oi(e)}))}},{key:"pinConversation",value:function(e){var t=this,n=e.conversationID,o=e.isPinned;if(!this._conversationMap.has(n))return Oi({code:or});var s=this.getLocalConversation(n);if(s.isPinned===o)return Ni({conversationID:n});var a="".concat(this._n,".").concat("pinConversation"),r=new li("pinConversation");r.setMessage("conversationID:".concat(n," isPinned:").concat(o)),He.l("".concat(a,". conversationID:").concat(n," isPinned:").concat(o));var i=null;return Rt(n)?i={type:1,toAccount:n.replace(S.CONV_C2C,"")}:Nt(n)&&(i={type:2,groupID:n.replace(S.CONV_GROUP,"")}),this.request({protocolName:xo,requestData:{fromAccount:this.getMyUserID(),operationType:!0===o?1:2,itemList:[i]}}).then((function(){return r.setNetworkType(t.getNetworkType()).end(),He.l("".concat(a," ok")),s.isPinned!==o&&(s.isPinned=o,t._sortConversationListAndEmitEvent()),Li({conversationID:n})})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];r.setError(e,o,s).end()})),He.e("".concat(a," failed. error:"),e),Oi(e)}))}},{key:"setMessageRemindType",value:function(e){return this._messageRemindHandler.set(e)}},{key:"patchMessageRemindType",value:function(e){var t=e.ID,n=e.isC2CConversation,o=e.messageRemindType,s=!1,a=this.getLocalConversation(n?"".concat(S.CONV_C2C).concat(t):"".concat(S.CONV_GROUP).concat(t));return a&&a.messageRemindType!==o&&(a.messageRemindType=o,s=!0),He.d("".concat(this._n,".patchMessageRemindType options:"),e,"ret:".concat(s)),s}},{key:"onC2CMessageRemindTypeSynced",value:function(e){var t=this,n="".concat(this._n,".onC2CMessageRemindTypeSynced");He.d(n,e),e.dataList.forEach((function(e){if(!Zt(e.muteNotificationsSync)){var o,s=e.muteNotificationsSync,a=s.to,r=s.updateSequence,i=s.muteFlag;t._messageRemindHandler.setUpdateSequence(r),0===i?o=S.MSG_REMIND_ACPT_AND_NOTE:1===i?o=S.MSG_REMIND_DISCARD:2===i&&(o=S.MSG_REMIND_ACPT_NOT_NOTE);var u=0;t.patchMessageRemindType({ID:a,isC2CConversation:!0,messageRemindType:o})&&(u+=1),He.l("".concat(n," updateCount:").concat(u)),u>=1&&t.emitConversationUpdate(!0,!1)}}))}},{key:"onGroupMessageRemindTypeSynced",value:function(e){He.d("".concat(this._n,".onGroupMessageRemindTypeSynced options:"),e),this._messageRemindHandler.onGroupMessageRemindTypeUpdated(e)}},{key:"deleteLocalConversation",value:function(e){var t=!(arguments.length>1&&void 0!==arguments[1])||arguments[1],n=this._conversationMap.has(e);if(He.d("".concat(this._n,".deleteLocalConversation conversationID:").concat(e," has:").concat(n)),n&&(this._conversationMap.delete(e),this._roamingMessageKeyAndTimeMap.has(e)&&this._roamingMessageKeyAndTimeMap.delete(e),this._roamingMessageSequenceMap.has(e)&&this._roamingMessageSequenceMap.delete(e),this._setStorageConversationList(),this._messageListHandler.removeByConversationID(e),this._completedMap.delete(e),t)){var o=!this._isTopicConversation(e);this.emitConversationUpdate(o,!1)}}},{key:"deleteLocalConversationList",value:function(e){var t=this,n=0,o=!1;e.forEach((function(e){t._conversationMap.has(e)&&(n+=t._conversationMap.get(e).unreadCount||0,t.deleteLocalConversation(e,!1),o=!0)})),He.l("".concat(this._n,".deleteLocalConversationList conversationIDList.length:").concat(e.length," isConvIDExisted:").concat(o)),o&&(this.emitConversationUpdate(!0,!1),n>0&&this.emitTotalUnreadMessageCountUpdate())}},{key:"isMessageSentByCurrentInstance",value:function(e){return!(!this._messageListHandler.hasLocalMessage(e.conversationID,e.ID)&&!this.singlyLinkedList.has(e.random))}},{key:"modifyMessageList",value:function(e){if(e.startsWith(S.CONV_C2C)&&this._conversationMap.has(e)){var t=this._conversationMap.get(e),n=Date.now();this._messageListHandler.modifyMessageSentByPeer({conversationID:e,latestNick:t.userProfile.nick,latestAvatar:t.userProfile.avatar});var o=this.getModule(wn).getNickAndAvatarByUserID(this.getMyUserID());this._messageListHandler.modifyMessageSentByMe({conversationID:e,latestNick:o.nick,latestAvatar:o.avatar}),He.l("".concat(this._n,".modifyMessageList conversationID:").concat(e," cost ").concat(Date.now()-n," ms"))}}},{key:"updateUserProfileSpecifiedKey",value:function(e){He.l("".concat(this._n,".updateUserProfileSpecifiedKey options:"),e);var t=e.conversationID,n=e.nick,o=e.avatar;if(this._conversationMap.has(t)){var s=this._conversationMap.get(t).userProfile;st(n)&&s.nick!==n&&(s.nick=n),st(o)&&s.avatar!==o&&(s.avatar=o),this.emitConversationUpdate(!0,!1)}}},{key:"_onMyProfileModified",value:function(e){var n=this,o=this.getLocalConversationList(),s=Date.now();o.forEach((function(o){n.modifyMessageSentByMe(t({conversationID:o.conversationID},e))})),He.l("".concat(this._n,"._onMyProfileModified. modify all messages sent by me, cost ").concat(Date.now()-s," ms"))}},{key:"modifyMessageSentByMe",value:function(e){this._messageListHandler.modifyMessageSentByMe(e)}},{key:"getLatestMessageSentByMe",value:function(e){return this._messageListHandler.getLatestMessageSentByMe(e)}},{key:"modifyMessageSentByPeer",value:function(e){this._messageListHandler.modifyMessageSentByPeer(e)}},{key:"getLatestMessageSentByPeer",value:function(e){return this._messageListHandler.getLatestMessageSentByPeer(e)}},{key:"pushIntoNoticeResult",value:function(e,t){return!(!this._messageListHandler.pushIn(t)||this.singlyLinkedList.has(t.random))&&(e.push(t),!0)}},{key:"getLocalLastMessage",value:function(e){return this._messageListHandler.getLocalLastMessage(e)}},{key:"checkAndPatchRemark",value:function(){var e=Promise.resolve();if(0===this._conversationMap.size)return e;var t=this.getModule(xn);if(!t)return e;var n=m(this._conversationMap.values()).filter((function(e){return e.type===S.CONV_C2C}));if(0===n.length)return e;var o=0;return n.forEach((function(e){var n=e.conversationID.replace(S.CONV_C2C,"");if(t.isMyFriend(n)){var s=t.getFriendRemark(n);e.remark!==s&&(e.remark=s,o+=1)}})),He.l("".concat(this._n,".checkAndPatchRemark. c2c conversation count:").concat(n.length,", patched count:").concat(o)),e}},{key:"updateTopicConversation",value:function(e){this._updateLocalConversationList({conversationOptionsList:e,isFromGetConversations:!0})}},{key:"sendReadReceipt",value:function(e){var t=e[0],n=null;return t.conversationType===S.CONV_C2C?n=this._m.getModule(qn):t.conversationType===S.CONV_GROUP&&(n=this._m.getModule(Fn)),n?n.sendReadReceipt(e):Oi({code:Pr})}},{key:"getReadReceiptList",value:function(e){var t=e[0],n=null;return t.conversationType===S.CONV_C2C?n=this._m.getModule(qn):t.conversationType===S.CONV_GROUP&&(n=this._m.getModule(Fn)),n?n.getReadReceiptList(e):Oi({code:Pr})}},{key:"getLastMessageTime",value:function(e){var t=this.getLocalConversation(e);return t?t.lastMessage.lastTime:0}},{key:"getTotalUnreadMessageCount",value:function(){var e=this.getLocalConversationList(),t=0;return e.forEach((function(e){e.type!==S.CONV_SYSTEM&&(""!==e.messageRemindType&&e.messageRemindType!==S.MSG_REMIND_ACPT_AND_NOTE||(t+=e.unreadCount))})),t}},{key:"emitTotalUnreadMessageCountUpdate",value:function(){var e=this.getTotalUnreadMessageCount();this._convTotalUnreadCount!==e&&(He.l("".concat(this._n,".emitTotalUnreadMessageCountUpdate from ").concat(this._convTotalUnreadCount," to ").concat(e)),this._convTotalUnreadCount=e,this.emitOuterEvent(k.TOTAL_UNREAD_MESSAGE_COUNT_UPDATED))}},{key:"reset",value:function(){He.l("".concat(this._n,".reset")),this._pagingStatus=on.NOT_START,this._messageListHandler.reset(),this._messageRemindHandler.reset(),this._roamingMessageKeyAndTimeMap.clear(),this._roamingMessageSequenceMap.clear(),this.singlyLinkedList.reset(),this._peerReadTimeMap.clear(),this._completedMap.clear(),this._conversationMap.clear(),this._pagingTimeStamp=0,this._pagingStartIndex=0,this._pagingPinnedTimeStamp=0,this._pagingPinnedStartIndex=0,this._remoteGroupReadSequenceMap.clear(),this._convTotalUnreadCount=0,this.resetReady()}}]),s}(po),tu=function(){function e(t){o(this,e),this._groupModule=t,this._n="GroupTipsHandler",this._cachedGroupTipsMap=new Map,this._checkCountMap=new Map,this.MAX_CHECK_COUNT=4,this._getTopicPendingMap=new Map}return a(e,[{key:"onCheckTimer",value:function(e){e%1==0&&this._cachedGroupTipsMap.size>0&&this._checkCachedGroupTips()}},{key:"_checkCachedGroupTips",value:function(){var e=this;this._cachedGroupTipsMap.forEach((function(t,n){var o=e._checkCountMap.get(n),s=e._groupModule.hasLocalGroup(n);He.l("".concat(e._n,"._checkCachedGroupTips groupID:").concat(n," hasLocalGroup:").concat(s," checkCount:").concat(o)),s?(e._notifyCachedGroupTips(n),e._checkCountMap.delete(n),e._groupModule.deleteUnjoinedAVChatRoom(n)):o>=e.MAX_CHECK_COUNT?(e._deleteCachedGroupTips(n),e._checkCountMap.delete(n)):(o++,e._checkCountMap.set(n,o))}))}},{key:"onNewGroupTips",value:function(e){He.d("".concat(this._n,".onReceiveGroupTips count:").concat(e.dataList.length));var t=this.newGroupTipsStoredAndSummary(e),n=t.eventDataList,o=t.result,s=t.AVChatRoomMessageList;(s.length>0&&this._groupModule.onAVChatRoomMessage(s),n.length>0)&&(this._groupModule.updateNextMessageSeq(n),this._groupModule.getModule(Hn).onNewMessage({conversationOptionsList:n,isInstantMessage:!0}));o.length>0&&(this._groupModule.emitOuterEvent(k.MESSAGE_RECEIVED,o),this.handleMessageList(o))}},{key:"newGroupTipsStoredAndSummary",value:function(e){for(var n=this,o=e.event,s=e.dataList,a=null,r=[],i=[],u={},c=[],l=function(e,l){var p=kt(s[e]);if(6===o){if(n._groupModule.isGroupAttributesUpdatedNotice(p))return"continue";if(n._groupModule.isGroupCountersNotice(p))return"continue"}var d=p.groupProfile,g=d.groupID,h=d.communityType,_=void 0===h?0:h,f=d.topicID,v=void 0===f?void 0:f,m=d.invisible,M=void 0,y=n._groupModule.isMessageFromTopic(_,v);if(y){M=S.CONV_TOPIC,p.to=v;var I=n._groupModule.getModule(Bn);I.hasLocalTopic(g,v)||n._getTopicPendingMap.has(v)||(n._getTopicPendingMap.set(v,1),I.getTopicList({groupID:g,topicIDList:[v]}).finally((function(){n._getTopicPendingMap.delete(v)})))}var C=n._groupModule.hasLocalGroup(g);if(!C&&n._groupModule.isUnjoinedAVChatRoom(g))return"continue";if(!C&&!y)return n._cacheGroupTipsAndProbe({groupID:g,event:o,item:p}),"continue";if(n._groupModule.isMessageFromOrToAVChatroom(g))return p.event=o,c.push(p),"continue";if(p.currentUser=n._groupModule.getMyUserID(),p.conversationType=S.CONV_GROUP,(a=new Si(p)).setElement({type:S.MSG_GRP_TIP,content:t(t({},p.elements),{},{groupProfile:p.groupProfile})}),a.isSystemMessage=!1,1===m)return n._qualityStat(a),"continue";var T=n._groupModule.getModule(Hn),D=a,k=D.conversationID,L=D.sequence;if(6===o)a._onlineOnlyFlag=!0,i.push(a);else if(!T.pushIntoNoticeResult(i,a))return"continue";if(n._groupModule.isMessageFromCommunityOfTopic(_,v))return"continue";if(6===o&&T.getLocalConversation(k))return"continue";6!==o&&n._qualityStat(a);var E=T.isRemoteRead({conversationID:k,sequence:L});if(ut(u[k])){var A=0;"in"===a.flow&&(a._isExcludedFromUnreadCount||a._onlineOnlyFlag||E||(A=1)),u[k]=r.push({conversationID:k,unreadCount:A,type:ut(M)?a.conversationType:M,subType:a.conversationSubType,lastMessage:a._isExcludedFromLastMessage?"":a})-1}else{var R=u[k];r[R].type=a.conversationType,r[R].subType=a.conversationSubType,r[R].lastMessage=a._isExcludedFromLastMessage?"":a,"in"===a.flow&&(a._isExcludedFromUnreadCount||a._onlineOnlyFlag||E||r[R].unreadCount++)}},p=0,d=s.length;p<d;p++)l(p);return{eventDataList:r,result:i,AVChatRoomMessageList:c}}},{key:"_qualityStat",value:function(e){this._groupModule.getModule(so).addMessageSequence({key:oi,message:e})}},{key:"handleMessageList",value:function(e){var t=this;e.forEach((function(e){switch(e.payload.operationType){case 1:t._onNewMemberComeIn(e);break;case 2:t._onMemberQuit(e);break;case 3:t._onMemberKickedOut(e);break;case 4:t._onMemberSetAdmin(e);break;case 5:t._onMemberCancelledAdmin(e);break;case 6:t._onGroupProfileModified(e);break;case 7:t._onMemberInfoModified(e);break;case 8:t._onTopicProfileUpdated(e);break;default:He.w("".concat(t._n,".handleMessageList unknown operationType:").concat(e.payload.operationType))}}))}},{key:"_onNewMemberComeIn",value:function(e){var t=e.payload,n=t.memberNum,o=t.groupProfile.groupID,s=this._groupModule.getLocalGroupProfile(o);s&&ot(n)&&s.memberCount!==n&&(s.memberCount=n,this._updateConversationGroupProfile(s))}},{key:"_onMemberQuit",value:function(e){var t=e.payload,n=t.memberNum,o=t.groupProfile.groupID,s=this._groupModule.getLocalGroupProfile(o);s&&ot(n)&&s.memberCount!==n&&(s.memberCount=n,this._updateConversationGroupProfile(s)),this._groupModule.getModule(Vn).deleteLocalGroupMembers(o,e.payload.userIDList)}},{key:"_onMemberKickedOut",value:function(e){var t=e.payload,n=t.memberNum,o=t.groupProfile.groupID,s=this._groupModule.getLocalGroupProfile(o);s&&ot(n)&&s.memberCount!==n&&(s.memberCount=n,this._updateConversationGroupProfile(s)),this._groupModule.getModule(Vn).deleteLocalGroupMembers(o,e.payload.userIDList)}},{key:"_updateConversationGroupProfile",value:function(e){this._groupModule.getModule(Hn).updateConversationGroupProfile([e])}},{key:"_onMemberSetAdmin",value:function(e){var t=e.payload.groupProfile.groupID,n=e.payload.userIDList,o=this._groupModule.getModule(Vn);n.forEach((function(e){var n=o.getLocalGroupMemberInfo(t,e);n&&n.updateRole(S.GRP_MBR_ROLE_ADMIN)}))}},{key:"_onMemberCancelledAdmin",value:function(e){var t=e.payload.groupProfile.groupID,n=e.payload.userIDList,o=this._groupModule.getModule(Vn);n.forEach((function(e){var n=o.getLocalGroupMemberInfo(t,e);n&&n.updateRole(S.GRP_MBR_ROLE_MEMBER)}))}},{key:"_onGroupProfileModified",value:function(e){var t=this,n=e.payload,o=n.newGroupProfile,s=n.groupProfile.groupID,a=this._groupModule.getLocalGroupProfile(s);Object.keys(o).forEach((function(e){switch(e){case"ownerID":t._ownerChanged(a,o);break;default:a[e]=o[e]}}));var r=!a.isSupportTopic;this._groupModule.emitGroupListUpdate(!0,r)}},{key:"_ownerChanged",value:function(e,t){var n=e.groupID,o=this._groupModule.getLocalGroupProfile(n),s=this._groupModule.getMyUserID();if(s===t.ownerID){o.updateGroup({selfInfo:{role:S.GRP_MBR_ROLE_OWNER}});var a=this._groupModule.getModule(Vn),r=a.getLocalGroupMemberInfo(n,s),i=this._groupModule.getLocalGroupProfile(n).ownerID,u=a.getLocalGroupMemberInfo(n,i);r&&r.updateRole(S.GRP_MBR_ROLE_OWNER),u&&u.updateRole(S.GRP_MBR_ROLE_MEMBER)}}},{key:"_onMemberInfoModified",value:function(e){var t=e.to,n=e.payload,o=n.groupProfile,s=n.memberList,a=o.groupID;At(t)&&this._updateTopicMuteTime(e);var r=this._groupModule.getModule(Vn);s.forEach((function(e){var t=r.getLocalGroupMemberInfo(a,e.userID);t&&ot(e.muteTime)&&t.updateMuteUntil(e.muteTime)}))}},{key:"_updateTopicMuteTime",value:function(e){var t=e.to,n=e.payload,o=n.groupProfile,s=n.memberList,a=void 0===s?[]:s,r=this._groupModule.getModule(Bn),i=o.groupID,u=r.getLocalTopic(i,t);if(u){for(var c=!1,l=0;l<a.length;l++){var p=a[l];if(p.userID===this._groupModule.getMyUserID()&&p.muteTime>=0){u.updateSelfInfo({muteTime:p.muteTime}),c=!0;break}}c&&this._groupModule.emitOuterEvent(k.TOPIC_UPDATED,{groupID:i,topic:u})}}},{key:"_onTopicProfileUpdated",value:function(e){var n=e.payload,o=n.groupProfile.groupID,s=n.newTopicInfo;this._groupModule.getModule(Bn).onTopicProfileUpdated(t({groupID:o,topicID:e.to},s))}},{key:"_cacheGroupTips",value:function(e,t){this._cachedGroupTipsMap.has(e)||this._cachedGroupTipsMap.set(e,[]),this._cachedGroupTipsMap.get(e).push(t)}},{key:"_deleteCachedGroupTips",value:function(e){this._cachedGroupTipsMap.has(e)&&this._cachedGroupTipsMap.delete(e)}},{key:"_notifyCachedGroupTips",value:function(e){var t=this,n=this._cachedGroupTipsMap.get(e)||[];n.forEach((function(e){t.onNewGroupTips(e)})),this._deleteCachedGroupTips(e),He.l("".concat(this._n,"._notifyCachedGroupTips groupID:").concat(e," count:").concat(n.length))}},{key:"_cacheGroupTipsAndProbe",value:function(e){var t=this,n=e.groupID,o=e.event,s=e.item;this._cacheGroupTips(n,{event:o,dataList:[s]}),this._groupModule.getGroupSimplifiedInfo(n).then((function(e){e.type===S.GRP_AVCHATROOM?t._groupModule.hasLocalGroup(n)?t._notifyCachedGroupTips(n):t._groupModule.setUnjoinedAVChatRoom(n):(t._groupModule.updateGroupMap([e]),t._notifyCachedGroupTips(n))})),this._checkCountMap.has(n)||this._checkCountMap.set(n,0),He.l("".concat(this._n,"._cacheGroupTipsAndProbe groupID:").concat(n))}},{key:"reset",value:function(){this._cachedGroupTipsMap.clear(),this._checkCountMap.clear(),this._getTopicPendingMap.clear()}}]),e}(),nu=function(){function e(t){o(this,e),this._groupModule=t,this._n="CommonGroupHandler",this.tempConversationList=null,this._cachedGroupMessageMap=new Map,this._checkCountMap=new Map,this.MAX_CHECK_COUNT=4,this._getTopicPendingMap=new Map,this._isPagingGetCompleted=!1,t.getInnerEmitterInstance().once(Ui,this._initGroupList,this)}return a(e,[{key:"onCheckTimer",value:function(e){e%1==0&&this._cachedGroupMessageMap.size>0&&this._checkCachedGroupMessage()}},{key:"_checkCachedGroupMessage",value:function(){var e=this;this._cachedGroupMessageMap.forEach((function(t,n){var o=e._checkCountMap.get(n),s=e._groupModule.hasLocalGroup(n);He.l("".concat(e._n,"._checkCachedGroupMessage groupID:").concat(n," hasLocalGroup:").concat(s," checkCount:").concat(o)),s?(e._notifyCachedGroupMessage(n),e._checkCountMap.delete(n),e._groupModule.deleteUnjoinedAVChatRoom(n)):o>=e.MAX_CHECK_COUNT?(e._deleteCachedGroupMessage(n),e._checkCountMap.delete(n)):(o++,e._checkCountMap.set(n,o))}))}},{key:"_initGroupList",value:function(){var e=this;He.l("".concat(this._n,"._initGroupList"));var t=new li("getGroupListInStorage"),n=this._groupModule.getStorageGroupList();if(it(n)&&n.length>0){n.forEach((function(t){e._groupModule.initGroupMap(t)})),this._groupModule.emitGroupListUpdate(!0,!1);var o=this._groupModule.getLocalGroupList().length;t.setNetworkType(this._groupModule.getNetworkType()).setMessage("group count:".concat(o)).end()}else t.setNetworkType(this._groupModule.getNetworkType()).setMessage("group count:0").end();He.l("".concat(this._n,"._initGroupList ok"))}},{key:"handleUpdateGroupLastMessage",value:function(e){var n="".concat(this._n,".handleUpdateGroupLastMessage");if(He.l("".concat(n," conversation count:").concat(e.length,", local group count:").concat(this._groupModule.getLocalGroupList().length)),0!==this._groupModule.getGroupMap().size){for(var o,s,a,r=!1,i=0,u=e.length;i<u;i++)(o=e[i]).type===S.CONV_GROUP&&(s=o.conversationID.split(/^GROUP/)[1],(a=this._groupModule.getLocalGroupProfile(s))&&(a.lastMessage=t({},o.lastMessage),r=!0));r&&(this._groupModule.sortLocalGroupList(),this._groupModule.emitGroupListUpdate(!0,!1))}else this.tempConversationList=e}},{key:"onNewGroupMessage",value:function(e){He.d("".concat(this._n,".onNewGroupMessage count:").concat(e.dataList.length));var t=this._newGroupMessageStoredAndSummary(e),n=t.conversationOptionsList,o=t.messageList,s=t.AVChatRoomMessageList;(s.length>0&&this._groupModule.onAVChatRoomMessage(s),this._groupModule.filterModifiedMessage(o),n.length>0)&&(this._groupModule.updateNextMessageSeq(n),this._groupModule.getModule(Hn).onNewMessage({conversationOptionsList:n,isInstantMessage:e.isInstantMessage||!0,updateUnreadCount:e.updateUnreadCount||!0}));var a=this._groupModule.filterUnmodifiedMessage(o);a.length>0&&this._groupModule.emitOuterEvent(k.MESSAGE_RECEIVED,a),o.length=0}},{key:"_newGroupMessageStoredAndSummary",value:function(e){var t=this,n=e.dataList,o=e.event,s=e.isInstantMessage,a=null,r=[],i=[],u=[],c={},l=this._groupModule.getModule(zn),p=this._groupModule.getFileDownloadProxy(),d=n.length;d>1&&n.sort((function(e,t){return e.sequence-t.sequence}));for(var g=function(e){var d=kt(n[e]),g=d.groupProfile,h=g.groupID,_=g.communityType,f=void 0===_?0:_,v=g.topicID,m=void 0===v?void 0:v,M=g.invisible,y=void 0,I=t._groupModule.isMessageFromTopic(f,m);if(I){y=S.CONV_TOPIC,d.to=m;var C=t._groupModule.getModule(Bn);C.hasLocalTopic(h,m)||t._getTopicPendingMap.has(m)||(t._getTopicPendingMap.set(m,1),C.getTopicList({groupID:h,topicIDList:[m]}).finally((function(){t._getTopicPendingMap.delete(m)})))}var T=t._groupModule.hasLocalGroup(h);if(!T&&t._groupModule.isUnjoinedAVChatRoom(h))return"continue";if(!T&&!I)return t._cacheGroupMessageAndProbe({groupID:h,event:o,item:d}),"continue";if(t._groupModule.isMessageFromOrToAVChatroom(h))return d.event=o,u.push(d),"continue";if(d.currentUser=t._groupModule.getMyUserID(),d.conversationType=S.CONV_GROUP,d.isSystemMessage=!!d.isSystemMessage,a=new Si(d),d.elements=l.parseElements(d.elements,d.from),a.setElement(d.elements,p),1===M)return t._qualityStat(s,a),"continue";var D=1===n[e].isModified,k=t._groupModule.getModule(Hn);if(k.isMessageSentByCurrentInstance(a)?a.isModified=D:D=!1,1===d.onlineOnlyFlag)a._onlineOnlyFlag=!0,k.isMessageSentByCurrentInstance(a)||i.push(a);else{if(t._groupModule.isMessageFromCommunityOfTopic(f,m))return i.push(a),"continue";if(!k.pushIntoMessageList(i,a,D))return"continue";t._qualityStat(s,a);var L=a,E=L.conversationID,A=L.sequence,R=k.isRemoteRead({conversationID:E,sequence:A});if(ut(c[E])){var N=0;"in"===a.flow&&(a._isExcludedFromUnreadCount||R||(N=1)),c[E]=r.push({conversationID:E,unreadCount:N,type:ut(y)?a.conversationType:y,subType:a.conversationSubType,lastMessage:a._isExcludedFromLastMessage?"":a})-1}else{var O=c[E];r[O].type=ut(y)?a.conversationType:y,r[O].subType=a.conversationSubType,r[O].lastMessage=a._isExcludedFromLastMessage?"":a,"in"===a.flow&&(a._isExcludedFromUnreadCount||R||r[O].unreadCount++)}}},h=0;h<d;h++)g(h);return{conversationOptionsList:r,messageList:i,AVChatRoomMessageList:u}}},{key:"_qualityStat",value:function(e,t){var n=this._groupModule.getModule(so);n.addMessageSequence({key:oi,message:t}),e&&t.clientTime>0&&n.addMessageDelay(t.clientTime)}},{key:"onGroupMessageRevoked",value:function(e){var t=this._groupModule.getModule(Hn),n=[],o=null,s=!0;e.dataList.forEach((function(e){var a=e.elements.revokedInfos;ut(a)||a.forEach((function(e){var a=Zt(e.topicID)?"GROUP".concat(e.groupID):"GROUP".concat(e.topicID);o=t.revoke(a,e.sequence,e.random);var r=e.revokerInfo&&e.revokerInfo.revoker;if(o)o.revoker=r,n.push(o);else{var i={conversationID:a,to:e.topicID||"",sequence:e.sequence,time:e.time,revoker:r};t.isLastMessageRevoked(i)&&(n.push(i),s=!1)}}))})),0!==n.length&&(t.onMessageRevoked(n),!0===s&&(He.l("".concat(this._n,".onGroupMessageRevoked count:").concat(n.length)),this._groupModule.emitOuterEvent(k.MESSAGE_REVOKED,n)))}},{key:"_groupListTreeShaking",value:function(e){for(var t=new Map(m(this._groupModule.getGroupMap())),n=0,o=e.length;n<o;n++)t.delete(e[n].groupID);this._groupModule.hasJoinedAVChatRoom()&&this._groupModule.getJoinedAVChatRoom().forEach((function(e){t.delete(e)}));this._groupModule.getGroupMap().forEach((function(e,n){e.isSupportTopic&&t.delete(n)}));for(var s=m(t.keys()),a=0,r=s.length;a<r;a++)this._groupModule.deleteGroup(s[a])}},{key:"getGroupList",value:function(e){var t=this,n="".concat(this._n,".").concat("getGroupList"),o=new li("getGroupList");He.l("".concat(n));var s={introduction:"Introduction",notification:"Notification",createTime:"CreateTime",ownerID:"Owner_Account",lastInfoTime:"LastInfoTime",memberNum:"MemberNum",maxMemberNum:"MaxMemberNum",joinOption:"ApplyJoinOption",inviteOption:"InviteJoinOption",muteAllMembers:"ShutUpAllMember"},a=["Type","Name","FaceUrl","NextMsgSeq","LastMsgTime","AtInfoList","LastRecallTime"],r=[];e&&e.groupProfileFilter&&e.groupProfileFilter.forEach((function(e){s[e]&&a.push(s[e])}));var i=(e||{}).isGroupWithTopicOnly,u=void 0!==i&&i;return this._pagingGetGroupList({limit:50,offset:0,groupBaseInfoFilter:a,groupList:r,isGroupWithTopicOnly:u}).then((function(){He.l("".concat(n," ok. count:").concat(r.length," isGroupWithTopicOnly:").concat(u)),u||t._groupListTreeShaking(r),t._groupModule.updateGroupMap(r);var e=t._groupModule.getLocalGroupList().length;o.setNetworkType(t._groupModule.getNetworkType()).setMessage("remote count:".concat(r.length,", after tree shaking, local count:").concat(e,", isGroupWithTopicOnly:").concat(u)).end(),t.tempConversationList&&(t.handleUpdateGroupLastMessage(t.tempConversationList),t.tempConversationList=null),t._groupModule.patchGroupMessageRemindType(),t._groupModule.recomputeUnreadCount(),t._groupModule.emitGroupListUpdate(!0,!u);var s=t._groupModule.getLocalGroupList();if(u){var a=s.filter((function(e){return!0===e.isSupportTopic}));return Li({groupList:a})}return t._isPagingGetCompleted=!0,Li({groupList:s})})).catch((function(e){return t._groupModule.probeNetwork().then((function(t){var n=v(t,2),s=n[0],a=n[1];o.setError(e,s,a).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"isPagingGetCompleted",value:function(){return this._isPagingGetCompleted}},{key:"_pagingGetGroupList",value:function(e){var t=this,n="".concat(this._n,".").concat("_pagingGetGroupList"),o=e.isCommunityRelay,s=void 0!==o&&o,a=e.isGroupWithTopicOnly,r=void 0!==a&&a,i=e.limit,u=e.offset,c=e.groupBaseInfoFilter,l=e.groupList;if(r)return this._pagingGetGroupListWithTopic({limit:i,offset:u,groupBaseInfoFilter:c,groupList:l});var p=new li("_pagingGetGroupList");return this._groupModule.request({protocolName:Xo,requestData:{type:s?S.GRP_COMMUNITY:void 0,memberAccount:this._groupModule.getMyUserID(),limit:i,offset:u,responseFilter:{groupBaseInfoFilter:c,selfInfoFilter:["Role","JoinTime","MsgFlag","MsgSeq"]}}}).then((function(e){var o=e.data,a=o.groups,r=void 0===a?[]:a,d=o.totalCount;l.push.apply(l,m(r)),t._handleGroupAtInfoWithoutTopic(s,r);var g=u+i,h=!(d>g),_="offset:".concat(u," totalCount:").concat(d," isCompleted:").concat(h," ")+"currentCount:".concat(l.length," isCommunityRelay:").concat(s);return p.setNetworkType(t._groupModule.getNetworkType()).setMessage("".concat(_)).end(),s||h?!s&&h?(He.l("".concat(n," start to get community list")),u=0,t._pagingGetGroupList({limit:i,offset:u,groupBaseInfoFilter:c,groupList:l,isCommunityRelay:!0})):s&&!h?(u=g,t._pagingGetGroupList({limit:i,offset:u,groupBaseInfoFilter:c,groupList:l,isCommunityRelay:!0})):(He.l("".concat(n," ok. totalCount:").concat(l.length)),Li({groupList:l})):(u=g,t._pagingGetGroupList({limit:i,offset:u,groupBaseInfoFilter:c,groupList:l}))})).catch((function(e){return 11e3!==e.code&&t._groupModule.probeNetwork().then((function(t){var n=v(t,2),o=n[0],a=n[1];p.setMessage("isCommunityRelay:".concat(s)).setError(e,o,a).end()})),s?(11e3===e.code&&(p=null,He.l("".concat(n," ok. community unavailable"))),Ni({groupList:l})):Oi(e)}))}},{key:"_pagingGetGroupListWithTopic",value:function(e){var t=this,n="".concat(this._n,"._pagingGetGroupListWithTopic"),o=e.limit,s=e.offset,a=e.groupBaseInfoFilter,r=e.groupList,i=new li("pagingGetGroupListWithTopic");return this._groupModule.request({protocolName:Xo,requestData:{type:S.GRP_COMMUNITY,memberAccount:this._groupModule.getMyUserID(),limit:o,offset:s,responseFilter:{groupBaseInfoFilter:a,selfInfoFilter:["Role","JoinTime","MsgFlag","MsgSeq"]},isSupportTopic:1}}).then((function(e){var u=e.data,c=u.groups,l=void 0===c?[]:c,p=u.totalCount;r.push.apply(r,m(l));var d=s+o,g=!(p>d),h="offset:".concat(s," totalCount:").concat(p," isCompleted:").concat(g," ")+"currentCount:".concat(r.length);return i.setNetworkType(t._groupModule.getNetworkType()).setMessage("".concat(h)).end(),g?(He.l("".concat(n," ok. totalCount:").concat(r.length)),Li({groupList:r})):(s=d,t._pagingGetGroupListWithTopic({limit:o,offset:s,groupBaseInfoFilter:a,groupList:r}))})).catch((function(e){return t._groupModule.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];i.setError(e,o,s).end()})),Oi(e)}))}},{key:"_cacheGroupMessage",value:function(e,t){this._cachedGroupMessageMap.has(e)||this._cachedGroupMessageMap.set(e,[]),this._cachedGroupMessageMap.get(e).push(t)}},{key:"_deleteCachedGroupMessage",value:function(e){this._cachedGroupMessageMap.has(e)&&this._cachedGroupMessageMap.delete(e)}},{key:"_notifyCachedGroupMessage",value:function(e){var t=this,n=this._cachedGroupMessageMap.get(e)||[];n.forEach((function(e){t.onNewGroupMessage(e)})),this._deleteCachedGroupMessage(e),He.l("".concat(this._n,"._notifyCachedGroupMessage groupID:").concat(e," count:").concat(n.length))}},{key:"_cacheGroupMessageAndProbe",value:function(e){var t=this,n=e.groupID,o=e.event,s=e.item;this._cacheGroupMessage(n,{event:o,dataList:[s]}),this._groupModule.getGroupSimplifiedInfo(n).then((function(e){e.type===S.GRP_AVCHATROOM?t._groupModule.hasLocalGroup(n)?t._notifyCachedGroupMessage(n):t._groupModule.setUnjoinedAVChatRoom(n):(t._groupModule.updateGroupMap([e]),t._notifyCachedGroupMessage(n))})),this._checkCountMap.has(n)||this._checkCountMap.set(n,0),He.l("".concat(this._n,"._cacheGroupMessageAndProbe groupID:").concat(n))}},{key:"_handleGroupAtInfoWithoutTopic",value:function(e,n){var o=this;e&&0!==n.length&&n.forEach((function(e){var n=e.groupID,s=e.groupAtInfoList,a=[];ut(s)||(s.forEach((function(e){a.push(t(t({},e),{},{groupID:n}))})),o._groupModule.getModule(Hn).onNewGroupAtTips({dataList:a}))}))}},{key:"reset",value:function(){this._cachedGroupMessageMap.clear(),this._checkCountMap.clear(),this._getTopicPendingMap.clear(),this._isPagingGetCompleted=!1,this._groupModule.getInnerEmitterInstance().once(Ui,this._initGroupList,this)}}]),e}(),ou=1,su=2,au=3,ru=4,iu=5,uu=function(){function e(t){o(this,e),this._groupModule=t,this._n="GroupAttributesHandler",this._groupAttributesMap=new Map,this._groupAttributesCopy={},this.CACHE_EXPIRE_TIME=3e4,this._groupModule.getInnerEmitterInstance().on(bi,this._onCloudConfigUpdated,this)}return a(e,[{key:"_onCloudConfigUpdated",value:function(){var e=this._groupModule.getCloudConfig("grp_attr_cache_time");ut(e)||(this.CACHE_EXPIRE_TIME=Number(e))}},{key:"updateLocalMainSequenceOnReconnected",value:function(){this._groupAttributesMap.forEach((function(e){e.localMainSequence=0}))}},{key:"isGroupAttributesUpdatedNotice",value:function(e){var t=e.to,n=e.elements.newGroupProfile,o=!ut(n)&&!Zt(n.groupAttributeOption);return o&&this._onGroupAttributesUpdated({groupID:t,groupAttributeOption:n.groupAttributeOption}),o}},{key:"_onGroupAttributesUpdated",value:function(e){var t=this,n=e.groupID,o=e.groupAttributeOption,s=o.mainSequence,a=o.isWithChangedAttributeInfo,r=o.groupAttributeList,i=void 0===r?[]:r,u=o.operationType;if(He.l("".concat(this._n,".onGroupAttributesUpdated. ")+"groupID:".concat(n," isWithChangedAttributeInfo:").concat(a," operationType:").concat(u)),!ut(u)){this._groupAttributesCopy=this._getCachedAttributes({groupID:n});var c=this._getLocalGroupAttributes(n).localMainSequence;if(1===a&&s-c==1)return this._refreshCachedGroupAttributes({groupID:n,remoteMainSequence:s,groupAttributeList:i,operationType:u}),void this._emitGroupAttributesUpdated(n);if(this._hasLocalGroupAttributes(n)){var l=this._getLocalGroupAttributes(n).avChatRoomKey;this._getGroupAttributes({groupID:n,avChatRoomKey:l}).then((function(){t._emitGroupAttributesUpdated(n)}))}}}},{key:"initGroupAttributesCache",value:function(e){var t=e.groupID,n=e.avChatRoomKey,o=void 0===n?void 0:n;this._groupAttributesMap.set(t,{lastUpdateTime:0,localMainSequence:0,remoteMainSequence:0,attributes:new Map,avChatRoomKey:o}),He.l("".concat(this._n,".initGroupAttributesCache groupID:").concat(t," avChatRoomKey:").concat(o))}},{key:"initGroupAttributes",value:function(e){var t=this,n=e.groupID,o=e.groupAttributes,s=this._getLocalGroupAttributes(n),a=s.remoteMainSequence,r=s.avChatRoomKey,i=new li("initGroupAttributes");return i.setMessage("groupID:".concat(n," avChatRoomKey:").concat(r," mainSequence:").concat(a)),this._groupModule.request({protocolName:Ds,requestData:{groupID:n,avChatRoomKey:r,mainSequence:a,groupAttributeList:this._transformGroupAttributes(o)}}).then((function(e){var s=e.data,a=s.mainSequence,r=m(s.groupAttributeList);return r.forEach((function(e){e.value=o[e.key]})),t._refreshCachedGroupAttributes({groupID:n,remoteMainSequence:a,groupAttributeList:r,operationType:ou}),i.setNetworkType(t._groupModule.getNetworkType()).end(),He.l("".concat(t._n,".").concat("initGroupAttributes"," ok. groupID:").concat(n)),Li({groupAttributes:o})})).catch((function(e){return t._groupModule.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];i.setError(e,o,s).end()})),Oi(e)}))}},{key:"setGroupAttributes",value:function(e){var t=this,n="".concat(this._n,".").concat("setGroupAttributes"),o=e.groupID,s=e.groupAttributes,a=this._getLocalGroupAttributes(o),r=a.remoteMainSequence,i=a.avChatRoomKey,u=a.attributes,c=this._transformGroupAttributes(s);c.forEach((function(e){var t=e.key;e.sequence=0,u.has(t)&&(e.sequence=u.get(t).sequence)}));var l=new li("setGroupAttributes");return l.setMessage("groupID:".concat(o," groupAttributes:").concat(JSON.stringify(s))),He.l("".concat(n,". groupID:").concat(o," mainSequence:").concat(r)),this._groupModule.request({protocolName:ks,requestData:{groupID:o,avChatRoomKey:i,mainSequence:r,groupAttributeList:c}}).then((function(e){var a=e.data,r=a.mainSequence,i=m(a.groupAttributeList);return i.forEach((function(e){e.value=s[e.key]})),t._refreshCachedGroupAttributes({groupID:o,remoteMainSequence:r,groupAttributeList:i,operationType:su}),l.setNetworkType(t._groupModule.getNetworkType()).end(),He.l("".concat(n," ok.")),Li({groupAttributes:s})})).catch((function(e){return t._groupModule.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];l.setError(e,o,s).end()})),Oi(e)}))}},{key:"deleteGroupAttributes",value:function(e){var t=this,n=e.groupID,o=e.keyList,s=void 0===o?[]:o,a=this._getLocalGroupAttributes(n),r=a.remoteMainSequence,i=a.avChatRoomKey,u=a.attributes,c=m(u.keys()),l=Ls,p=au,d={groupID:n,avChatRoomKey:i,mainSequence:r},g=[];s.length>0&&(c=[],l=Ss,p=ru,s.forEach((function(e){var t=0;u.has(e)&&(t=u.get(e).sequence,c.push(e)),g.push({key:e,sequence:t})})),d.groupAttributeList=g);var h=new li("deleteGroupAttributes");return h.setMessage("groupID:".concat(n," mainSequence:").concat(r," keyList:").concat(s," protocolName:").concat(l)),this._groupModule.request({protocolName:l,requestData:d}).then((function(e){var o=e.data.mainSequence;return t._refreshCachedGroupAttributes({groupID:n,remoteMainSequence:o,groupAttributeList:g,operationType:p}),h.setNetworkType(t._groupModule.getNetworkType()).end(),He.l("".concat(t._n,".").concat("deleteGroupAttributes"," ok. groupID:").concat(n)),Li({keyList:c})})).catch((function(e){return t._groupModule.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];h.setError(e,o,s).end()})),Oi(e)}))}},{key:"getGroupAttributes",value:function(e){var t=this,n="".concat(this._n,".").concat("getGroupAttributes"),o=e.groupID,s=this._getLocalGroupAttributes(o),a=s.avChatRoomKey,r=s.lastUpdateTime,i=s.localMainSequence,u=s.remoteMainSequence,c=new li("getGroupAttributes");if(c.setMessage("groupID:".concat(o," localMainSequence:").concat(i," remoteMainSequence:").concat(u," keyList:").concat(e.keyList)),Date.now()-r>=this.CACHE_EXPIRE_TIME||i<u)return this._getGroupAttributes({groupID:o,avChatRoomKey:a}).then((function(s){c.setMoreMessage("get attributes from remote. count:".concat(s.length)).setNetworkType(t._groupModule.getNetworkType()).end(),He.l("".concat(n," from remote. groupID:").concat(o));var a=t._getCachedAttributes(e);return Li({groupAttributes:a})})).catch((function(e){return t._groupModule.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];c.setError(e,o,s).end()})),Oi(e)}));c.setMoreMessage("get attributes from cache").setNetworkType(this._groupModule.getNetworkType()).end(),He.l("".concat(n," from cache. groupID:").concat(o));var l=this._getCachedAttributes(e);return Ni({groupAttributes:l})}},{key:"_getGroupAttributes",value:function(e){var n=this,o=0;return ut(e.avChatRoomKey)||(o=1),this._groupModule.request({protocolName:Es,requestData:t(t({},e),{},{groupType:o})}).then((function(t){var o=t.data,s=o.mainSequence,a=o.groupAttributeList,r=m(a);return ut(s)||n._refreshCachedGroupAttributes({groupID:e.groupID,remoteMainSequence:s,groupAttributeList:r,operationType:iu}),He.l("".concat(n._n,"._getGroupAttributes ok. groupID:").concat(e.groupID)),a})).catch((function(e){return Oi(e)}))}},{key:"_refreshCachedGroupAttributes",value:function(e){var t=e.groupID,n=e.remoteMainSequence,o=e.groupAttributeList,s=e.operationType;if(this._hasLocalGroupAttributes(t)){var a=this._getLocalGroupAttributes(t),r=a.localMainSequence;if(s===iu||n-r==1)a.remoteMainSequence=n,a.localMainSequence=n,a.lastUpdateTime=Date.now(),this._updateCachedAttributes({groupAttributes:a,groupAttributeList:o,operationType:s});else{if(r===n)return;a.remoteMainSequence=n}this._groupAttributesMap.set(t,a);var i="operationType:".concat(s," localMainSequence:").concat(r," remoteMainSequence:").concat(n);He.l("".concat(this._n,"._refreshCachedGroupAttributes. ").concat(i))}}},{key:"_getCachedAttributes",value:function(e){var t=e.groupID,n=e.keyList,o=void 0===n?[]:n,s={};if(this._hasLocalGroupAttributes(t)){var a=this._getLocalGroupAttributes(t).attributes;if(o.length>0)o.forEach((function(e){a.has(e)&&(s[e]=a.get(e).value)}));else{var r,i=D(a.keys());try{for(i.s();!(r=i.n()).done;){var u=r.value;s[u]=a.get(u).value}}catch(c){i.e(c)}finally{i.f()}}}return s}},{key:"_updateCachedAttributes",value:function(e){var t=e.groupAttributes,n=e.groupAttributeList,o=e.operationType;o!==au?o!==ru?(o===ou&&t.attributes.clear(),n.forEach((function(e){var n=e.key,o=e.value,s=e.sequence;t.attributes.set(n,{value:o,sequence:s})}))):n.forEach((function(e){t.attributes.delete(e.key)})):t.attributes.clear()}},{key:"_hasLocalGroupAttributes",value:function(e){return this._groupAttributesMap.has(e)}},{key:"_getLocalGroupAttributes",value:function(e){return this._hasLocalGroupAttributes(e)||this.initGroupAttributesCache({groupID:e}),this._groupAttributesMap.get(e)}},{key:"_transformGroupAttributes",value:function(e){var t=[];return Object.keys(e).forEach((function(n){t.push({key:n,value:e[n]})})),t}},{key:"_emitGroupAttributesUpdated",value:function(e){var t=this._getCachedAttributes({groupID:e}),n=this._computeAttrChangedInfo(t),o=n.updatedKeyList,s=n.deletedKeyList;this._groupModule.emitOuterEvent(k.GROUP_ATTRIBUTES_UPDATED,{groupID:e,groupAttributes:t,updatedKeyList:o,deletedKeyList:s})}},{key:"_computeAttrChangedInfo",value:function(e){var t=this,n=[],o=[];return Object.keys(e).forEach((function(o){e[o]!==t._groupAttributesCopy[o]&&n.push(o)})),Object.keys(this._groupAttributesCopy).forEach((function(t){ut(e[t])&&o.push(t)})),this._groupAttributesCopy={},He.l("".concat(this._n,"._computeAttrChangedInfo update count:").concat(n.length,", delete count:").concat(o.length)),{updatedKeyList:n,deletedKeyList:o}}},{key:"deleteLocalGroupAttributes",value:function(e){this._hasLocalGroupAttributes(e)&&this._groupAttributesMap.delete(e)}},{key:"reset",value:function(){this._groupAttributesMap.clear(),this._groupAttributesCopy={},this.CACHE_EXPIRE_TIME=3e4}}]),e}(),cu="Set",lu="Increase",pu="Decrease",du=function(){function e(t){o(this,e),this._groupModule=t,this._n="GroupCountersHandler",this._groupCountersMap=new Map,this.EXPIRE_TIME=3e4,this._groupModule.getInnerEmitterInstance().on(bi,this._onCloudConfigUpdated,this)}return a(e,[{key:"_onCloudConfigUpdated",value:function(){var e=this._groupModule.getCloudConfig("grp_counter_expire_time");ut(e)||(this.EXPIRE_TIME=Number(e))}},{key:"isGroupCountersNotice",value:function(e){var t=e.to,n=e.elements.groupCounterInfo,o=!1;return Zt(n)||(this._onGroupCountersUpdated({groupID:t,groupCounterInfo:n}),o=!0),o}},{key:"_onGroupCountersUpdated",value:function(e){var t=this,n=e.groupID;e.groupCounterInfo.forEach((function(e){var o=e.type,s=e.groupCounterSeq,a=e.counterList,r=void 0===a?[]:a;0!==o&&2!==o||(t._updateLocalGroupCounters({groupID:n,groupCounterSeq:s,counterList:r}),r.forEach((function(e){t._groupModule.emitOuterEvent(k.GROUP_COUNTER_UPDATED,{groupID:n,key:e.key,value:e.value})}))),1===o&&t._deleteLocalGroupCounters({groupID:n,groupCounterSeq:s,counterList:r})})),He.l("".concat(this._n,"._onGroupCountersUpdated groupID:").concat(n))}},{key:"initGroupCountersCache",value:function(e){var t=e.groupID,n=e.avChatRoomKey;this._groupCountersMap.set(t,{lastUpdateTime:0,groupCounterSeq:0,counters:new Map,avChatRoomKey:n}),He.l("".concat(this._n,".initGroupCountersCache groupID:").concat(t," avChatRoomKey:").concat(n))}},{key:"setGroupCounters",value:function(e){var t=this;if(!this._groupModule.canIUse(B.GRP_COUNTER))return Oi({code:Kr});var n="".concat(this._n,".setGroupCounters"),o=e.groupID,s=e.counters,a=this._convertObjectToList(s),r=this._getLocalGroupCounters(o).avChatRoomKey,i="groupID:".concat(o," count:").concat(a.length),u=new li("setGroupCounters");return u.setMessage("".concat(i)),He.l("".concat(n,". ").concat(i)),this._updateGroupCounters({groupID:o,counterList:a,avChatRoomKey:r,mode:cu}).then((function(e){return u.end(),He.l("".concat(n," ok.")),Li({counters:e})})).catch((function(e){return t._groupModule.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];u.setError(e,o,s).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"increaseGroupCounter",value:function(e){var t=this;if(!this._groupModule.canIUse(B.GRP_COUNTER))return Oi({code:Kr});var n="".concat(this._n,".increaseGroupCounters"),o=e.groupID,s=e.key,a=e.value,r=this._getLocalGroupCounters(o).avChatRoomKey,i="groupID:".concat(o," key:").concat(s," value:").concat(a),u=new li("increaseGroupCounter");u.setMessage("".concat(i)),He.l("".concat(n,". ").concat(i));var c=[{key:s,value:a}];return this._updateGroupCounters({groupID:o,counterList:c,avChatRoomKey:r,mode:lu}).then((function(e){return u.end(),He.l("".concat(n," ok.")),Li({counters:e})})).catch((function(e){return t._groupModule.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];u.setError(e,o,s).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"decreaseGroupCounter",value:function(e){var t=this;if(!this._groupModule.canIUse(B.GRP_COUNTER))return Oi({code:Kr});var n="".concat(this._n,".decreaseGroupCounter"),o=e.groupID,s=e.key,a=e.value,r=this._getLocalGroupCounters(o).avChatRoomKey,i="groupID:".concat(o," key:").concat(s," value:").concat(a),u=new li("decreaseGroupCounter");u.setMessage("".concat(i)),He.l("".concat(n,". ").concat(i));var c=[{key:s,value:a}];return this._updateGroupCounters({groupID:o,counterList:c,avChatRoomKey:r,mode:pu}).then((function(e){return u.end(),He.l("".concat(n," ok.")),Li({counters:e})})).catch((function(e){return t._groupModule.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];u.setError(e,o,s).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"getGroupCounters",value:function(e){var t=this;if(!this._groupModule.canIUse(B.GRP_COUNTER))return Oi({code:Kr});var n="".concat(this._n,".getGroupCounters"),o=e.groupID,s=e.keyList,a=void 0===s?[]:s,r=this._getLocalGroupCounters(o),i=r.avChatRoomKey,u=r.lastUpdateTime,c=new li("getGroupCounters");if(c.setMessage("groupID:".concat(o)),Date.now()-u>=this.EXPIRE_TIME)return this._getRemoteGroupCounters({groupID:o,avChatRoomKey:i}).then((function(e){c.setMoreMessage("from remote. count:".concat(e.length)).end(),He.l("".concat(n," from remote. groupID:").concat(o));var s=t._getLocalCounters(o,a);return Li({counters:s})})).catch((function(e){return t._groupModule.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];c.setError(e,o,s).end()})),Oi(e)}));c.setMoreMessage("from cache").end(),He.l("".concat(n," from cache. groupID:").concat(o));var l=this._getLocalCounters(o,a);return Ni({counters:l})}},{key:"_getRemoteGroupCounters",value:function(e){var n=this;return this._groupModule.request({protocolName:Gs,requestData:t({},e)}).then((function(t){var o=t.data,s=o.counterList,a=void 0===s?[]:s,r=o.groupCounterSeq;return n._updateLocalGroupCounters({groupID:e.groupID,counterList:a,groupCounterSeq:r}),He.l("".concat(n._n,"._getRemoteGroupCounters ok. groupID:").concat(e.groupID)),a})).catch((function(e){return Oi(e)}))}},{key:"_convertObjectToList",value:function(e){var t=[];return Object.keys(e).forEach((function(n){t.push({key:n,value:e[n]})})),t}},{key:"_updateGroupCounters",value:function(e){var n="".concat(this._n,"._updateGroupCounters"),o=e.groupID,s=e.avChatRoomKey,a=e.mode;return He.l("".concat(n,". groupID:").concat(o," avChatRoomKey:").concat(s," mode:").concat(a)),this._groupModule.request({protocolName:Os,requestData:t({},e)}).then((function(e){He.l("".concat(n," ok."));var t=e.data.counterList,o={};return(void 0===t?[]:t).forEach((function(e){var t=e.key,n=e.value;o[t]=n})),o})).catch((function(e){return Oi(e)}))}},{key:"_hasLocalGroupCounters",value:function(e){return this._groupCountersMap.has(e)}},{key:"_getLocalGroupCounters",value:function(e){return this._hasLocalGroupCounters(e)||this.initGroupCountersCache({groupID:e}),this._groupCountersMap.get(e)}},{key:"_updateLocalGroupCounters",value:function(e){var t=e.groupID,n=e.counterList,o=void 0===n?[]:n,s=e.groupCounterSeq;if(this._hasLocalGroupCounters(t)){var a=this._getLocalGroupCounters(t),r=a.counters,i=a.avChatRoomKey,u=a.groupCounterSeq;if(s>0&&s<u)return;o.forEach((function(e){var t=e.key,n=e.value;r.set(t,n)})),this._groupCountersMap.set(t,{lastUpdateTime:Date.now(),groupCounterSeq:s,counters:r,avChatRoomKey:i})}}},{key:"_deleteLocalGroupCounters",value:function(e){var t=e.groupID,n=e.counterList,o=void 0===n?[]:n,s=e.groupCounterSeq;if(this._hasLocalGroupCounters(t)){var a=this._getLocalGroupCounters(t),r=a.counters,i=a.avChatRoomKey;o.forEach((function(e){r.delete(e.key)})),this._groupCountersMap.set(t,{lastUpdateTime:Date.now(),groupCounterSeq:s,counters:r,avChatRoomKey:i})}}},{key:"_getLocalCounters",value:function(e,t){var n={};if(!this._hasLocalGroupCounters(e))return n;var o=this._getLocalGroupCounters(e).counters;if(t.length>0)t.forEach((function(e){o.has(e)&&(n[e]=o.get(e))}));else{var s,a=D(o.keys());try{for(a.s();!(s=a.n()).done;){var r=s.value;n[r]=o.get(r)}}catch(i){a.e(i)}finally{a.f()}}return n}},{key:"reset",value:function(){this._groupCountersMap.clear(),this.EXPIRE_TIME=3e4}}]),e}(),gu=function(){function e(t){o(this,e);var n=t.manager,s=t.groupID,a=t.onInit,r=t.onSuccess,i=t.onFail;this._n="Polling",this._manager=n,this._groupModule=n._groupModule,this._onInit=a,this._onSuccess=r,this._onFail=i,this._groupID=s,this._timeoutID=-1,this._isRunning=!1,this._protocolName=Ms}return a(e,[{key:"start",value:function(){var e=this._groupModule.isLoggedIn();e||(this._protocolName=ys),He.l("".concat(this._n,".start pollingInterval:").concat(this._manager.getPollingInterval()," isLoggedIn:").concat(e)),this._isRunning=!0,this._request()}},{key:"isRunning",value:function(){return this._isRunning}},{key:"_request",value:function(){var e=this,t=this._onInit(this._groupID);this._groupModule.request({protocolName:this._protocolName,requestData:t}).then((function(t){e._onSuccess(e._groupID,t),e.isRunning()&&(clearTimeout(e._timeoutID),e._timeoutID=setTimeout(e._request.bind(e),e._manager.getPollingInterval()))})).catch((function(t){e._onFail(e._groupID,t),e.isRunning()&&(clearTimeout(e._timeoutID),e._timeoutID=setTimeout(e._request.bind(e),e._manager.MAX_POLLING_INTERVAL))}))}},{key:"stop",value:function(){He.l("".concat(this._n,".stop")),this._timeoutID>0&&(clearTimeout(this._timeoutID),this._timeoutID=-1),this._isRunning=!1}}]),e}(),hu={3:!0,4:!0,5:!0,6:!0,17:!0},_u=function(){function e(t){o(this,e),this._groupModule=t,this._n="AVChatRoomHandler",this._joinedGroupMap=new Map,this._pollingRequestInfoMap=new Map,this._pollingInstanceMap=new Map,this.sequencesLinkedList=new Yi(200),this.messageIDLinkedList=new Yi(100),this.receivedMessageCount=0,this._reportMessageStackedCount=0,this._onlineMemberCountMap=new Map,this.DEFAULT_EXPIRE_TIME=60,this.DEFAULT_POLLING_INTERVAL=300,this.MAX_POLLING_INTERVAL=2e3,this._pollingInterval=this.DEFAULT_POLLING_INTERVAL,this.DEFAULT_POLLING_NO_MESSAGE_COUNT=20,this.DEFAULT_POLLING_INTERVAL_PLUS=2e3,this._pollingNoMessageCount=0,this._startBroadcastSeq=1,this._broadcastMessageIDMap=new Map,this.DEFAULT_POLLING_SIMPLIFIED_MSG=0}return a(e,[{key:"hasJoinedAVChatRoom",value:function(){return this._joinedGroupMap.size>0}},{key:"checkJoinedAVChatRoomByID",value:function(e){return this._joinedGroupMap.has(e)}},{key:"getJoinedAVChatRoom",value:function(){return this._joinedGroupMap.size>0?m(this._joinedGroupMap.keys()):null}},{key:"_updateRequestData",value:function(e){var n=this._pollingRequestInfoMap.get(e);return e===m(this._pollingInstanceMap.keys())[0]?t(t({},n),{},{startBroadcastSeq:this._startBroadcastSeq,simplifiedMessage:this.DEFAULT_POLLING_SIMPLIFIED_MSG}):t(t({},n),{},{simplifiedMessage:this.DEFAULT_POLLING_SIMPLIFIED_MSG})}},{key:"_handleSuccess",value:function(e,t){var n=t.data,o=n.key,s=n.nextSeq,a=n.rspMsgList,r=n.errorCode,i=n.nextBroadcastSeq,u=n.broadcastMessageList;if(0!==r){var c=this._pollingRequestInfoMap.get(e),l=new li("longPollingAVError"),p=c?"".concat(c.key,"-").concat(c.startSeq):"requestInfo is undefined";l.setMessage("".concat(e,"-").concat(p,"-").concat(t.errorInfo)).setCode(t.errorCode).setNetworkType(this._groupModule.getNetworkType()).end(!0)}else{if(!this.checkJoinedAVChatRoomByID(e))return;st(o)&&ot(s)&&this._pollingRequestInfoMap.set(e,{key:o,startSeq:s}),ot(i)&&i>this._startBroadcastSeq&&(this._startBroadcastSeq=i),it(a)&&a.length>0?(a.forEach((function(e){e.to=e.groupID})),this.onMessage(a)):(this._pollingNoMessageCount+=1,this._pollingNoMessageCount===this.DEFAULT_POLLING_NO_MESSAGE_COUNT&&(this._pollingInterval=this.DEFAULT_POLLING_INTERVAL+this.DEFAULT_POLLING_INTERVAL_PLUS)),this._onBroadcastMessage(u)}}},{key:"_handleFailure",value:function(e,t){}},{key:"onMessage",value:function(e){if(it(e)&&0!==e.length){0!==this._pollingNoMessageCount&&(this._pollingNoMessageCount=0,this._pollingInterval=this.DEFAULT_POLLING_INTERVAL);var t=null,n=[],o=this._getModule(Hn),s=this._getModule(so),a=e.length;a>1&&e.sort((function(e,t){return e.sequence-t.sequence}));for(var r=this._getModule(Kn),i=0;i<a;i++){var u=this.restoreMessageFromSimplified(e[i]);if(hu[u.event]){if(6===u.event){if(this._groupModule.isGroupAttributesUpdatedNotice(u))continue;if(this._groupModule.isGroupCountersNotice(u))continue}this.receivedMessageCount+=1,t=this.packMessage(u,u.event);var c=1===u.isModified,l=1===u.isHistoryMessage;if((r.isUnlimitedAVChatRoom()||!this.sequencesLinkedList.has(t.sequence))&&!this.messageIDLinkedList.has(t.ID)){var p=t.conversationID;if(this.receivedMessageCount%50==0?this._getModule(eo).detectFirstRound(p,this.sequencesLinkedList.data()):this.receivedMessageCount%80==0&&this._getModule(eo).detectSecondRound(p,this.sequencesLinkedList.data()),null!==this.sequencesLinkedList.tail()){var d=this.sequencesLinkedList.tail().value,g=t.sequence-d;g>1&&g<=20?this._getModule(eo).onMessageMaybeLost(p,d+1,g-1):g<-1&&g>=-20&&this._getModule(eo).onMessageMaybeLost(p,t.sequence+1,Math.abs(g)-1)}this.sequencesLinkedList.set(t.sequence),this.messageIDLinkedList.set(t.ID);var h=!1;if(this._isMessageSentByCurrentInstance(t)?c&&(h=!0,t.isModified=c,o.updateMessageIsModifiedProperty(t)):h=!0,h){if(t.conversationType===S.CONV_SYSTEM&&5===t.payload.operationType&&this._onGroupDismissed(t.payload.groupProfile.groupID),!l&&t.conversationType!==S.CONV_SYSTEM){var _=t.conversationID.replace(S.CONV_GROUP,"");this._pollingInstanceMap.has(_)?this._groupModule.isLoggedIn()&&s.addMessageSequence({key:ai,message:t}):(t.type!==S.MSG_GRP_TIP&&t.clientTime>0&&s.addMessageDelay(t.clientTime),s.addMessageSequence({key:si,message:t}))}n.push(t)}}}else He.w("".concat(this._n,".onMessage unknown event:").concat(u.event))}if(0!==n.length){this._groupModule.filterModifiedMessage(n);var f=this.packConversationOption(n);if(f.length>0)this._getModule(Hn).onNewMessage({conversationOptionsList:f,isInstantMessage:!0});He.d("".concat(this._n,".onMessage count:").concat(n.length)),this._checkMessageStacked(n);var v=this._groupModule.filterUnmodifiedMessage(n);v.length>0&&this._groupModule.emitOuterEvent(k.MESSAGE_RECEIVED,v),n.length=0}}}},{key:"isBroadcastOrNormal",value:function(e){return 3===e||17===e}},{key:"isGroupTip",value:function(e){return 4===e||6===e}},{key:"isGroupSystemNotice",value:function(e){return 5===e}},{key:"restoreGroupTipElements",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};e.groupJoinType||(e.groupJoinType=1);var t=e.operatorInfo,n=void 0===t?{}:t,o=e.operatorID,s=e.userIDList,a=void 0===s?[]:s,r=n.userID,i=void 0===r?o:r,u=n.avatar,c=void 0===u?"":u,l=n.nick,p=void 0===l?"":l;e.operatorInfo={userID:i,avatar:c,nick:p};var d=a.map((function(e){return{userID:e}}));return e.memberInfoList=e.memberInfoList||d,e}},{key:"restoreMessageFromSimplified",value:function(e){var n=e.event;if(this.isBroadcastOrNormal(n)&&(e.cloudCustomData=e.cloudCustomData||"",e.elements=e.elements.map((function(e){if(e.type===S.MSG_CUSTOM){var n=e.content,o=void 0===n?{}:n;e.content=t({data:"",description:"",extension:""},o)}return e}))),(this.isGroupTip(n)||this.isGroupSystemNotice(n))&&(e.from=e.from||"@TIM#SYSTEM"),this.isGroupTip(n)){e.elements=this.restoreGroupTipElements(e.elements);var o=e.elements,s=void 0===o?{}:o,a=s.operationType,i=s.operatorInfo;if(1===a){var u=[{userID:(void 0===i?{}:i).userID}];s.memberInfoList=s.memberInfoList||u}}if(this.isGroupSystemNotice(n)){var c=e.elements,l=c.memberInfoList,p=c.operatorInfo;l||(l=void 0===p?{}:p),e.elements.memberInfoList=t({userID:e.elements.operatorID,avatar:"",nick:""},l),e.elements=t({authentication:"",remarkInfo:"",messageKey:1e3*e.time},e.elements);var d=Object.keys(e.elements).filter((function(e){return"operatorInfo"!==e})).reduce((function(n,o){return t(t({},n),{},r({},o,e.elements[o]))}),{});e.elements=d}return e}},{key:"_onGroupDismissed",value:function(e){He.l("".concat(this._n,"._onGroupDismissed groupID:").concat(e)),this._groupModule.deleteLocalGroupAndConversation(e),this.reset(e)}},{key:"_checkMessageStacked",value:function(e){var t="MessageStacked",n=e.length;n>=100&&(this._groupModule.outputWarning(t),this._reportMessageStackedCount<5&&(new li(t).setNetworkType(this._groupModule.getNetworkType()).setMessage("count:".concat(n," groupID:").concat(m(this._joinedGroupMap.keys()))).setLevel("warning").end(),this._reportMessageStackedCount+=1))}},{key:"_isMessageSentByCurrentInstance",value:function(e){return!!this._getModule(Hn).isMessageSentByCurrentInstance(e)}},{key:"packMessage",value:function(e,t){e.currentUser=this._groupModule.getMyUserID(),e.conversationType=5===t?S.CONV_SYSTEM:S.CONV_GROUP,e.isSystemMessage=!!e.isSystemMessage;var n=new Si(e),o=this.packElements(e,t);return n.setElement(o,this._groupModule.getFileDownloadProxy()),n}},{key:"packElements",value:function(e,n){return 4===n||6===n?(this._updateMemberCountByGroupTips(e),{type:S.MSG_GRP_TIP,content:t(t({},e.elements),{},{groupProfile:e.groupProfile})}):5===n?{type:S.MSG_GRP_SYS_NOTICE,content:t(t({},e.elements),{},{groupProfile:t(t({},e.groupProfile),{},{groupID:e.groupID})})}:this._getModule(zn).parseElements(e.elements,e.from)}},{key:"packConversationOption",value:function(e){for(var t=new Map,n=0;n<e.length;n++){var o=e[n],s=o.conversationID;if(t.has(s)){var a=t.get(s);a.lastMessage=o,"in"===o.flow&&a.unreadCount++}else t.set(s,{conversationID:o.conversationID,unreadCount:"out"===o.flow?0:1,type:o.conversationType,subType:o.conversationSubType,lastMessage:o})}return m(t.values())}},{key:"_updateMemberCountByGroupTips",value:function(e){var t=e.groupProfile.groupID,n=e.elements.onlineMemberInfo,o=void 0===n?void 0:n;if(!Zt(o)){var s=o.onlineMemberNum,a=void 0===s?0:s,r=o.expireTime,i=void 0===r?this.DEFAULT_EXPIRE_TIME:r,u=this._onlineMemberCountMap.get(t)||{},c=Date.now();Zt(u)?Object.assign(u,{lastReqTime:0,lastSyncTime:0,latestUpdateTime:c,memberCount:a,expireTime:i}):(u.latestUpdateTime=c,u.memberCount=a),He.d("".concat(this._n,"._updateMemberCountByGroupTips info:"),u),this._onlineMemberCountMap.set(t,u)}}},{key:"_onBroadcastMessage",value:function(e){if(!Zt(e)){for(var t=[],n=e.length,o=null,s=0;s<n;s++){var a=this.restoreMessageFromSimplified(e[s]);hu[a.event]?((o=this.packMessage(a,a.event)).isBroadcastMessage=!0,this._broadcastMessageIDMap.has(o.ID)||(t.push(o),this._broadcastMessageIDMap.set(o.ID,1))):He.w("".concat(this._n,"._onBroadcastMessage unknown event:").concat(a.event))}t.length>0&&this._groupModule.emitOuterEvent(k.MESSAGE_RECEIVED,t)}}},{key:"start",value:function(e){if(this._pollingInstanceMap.has(e)){var t=this._pollingInstanceMap.get(e);t.isRunning()||t.start()}else{var n=new gu({manager:this,groupID:e,onInit:this._updateRequestData.bind(this),onSuccess:this._handleSuccess.bind(this),onFail:this._handleFailure.bind(this)});n.start(),this._pollingInstanceMap.set(e,n),He.l("".concat(this._n,".start groupID:").concat(e))}}},{key:"handleJoinResult",value:function(e){var t=this;return this._preCheck().then((function(){var n=e.longPollingKey,o=e.group,s=o.groupID;return t._joinedGroupMap.set(s,o),t._groupModule.updateGroupMap([o]),t._groupModule.deleteUnjoinedAVChatRoom(s),t._groupModule.emitGroupListUpdate(!0,!1),ut(n)?Ni({status:Je,group:o}):Promise.resolve()}))}},{key:"startRunLoop",value:function(e){var t=this;return this.handleJoinResult(e).then((function(){var n=e.longPollingKey,o=e.group,s=e.startSeq,a=void 0===s?0:s,r=o.groupID;return t._pollingRequestInfoMap.set(r,{key:n,startSeq:a}),t.start(r),t._groupModule.isLoggedIn()?Ni({status:Je,group:o}):Ni({status:Je})}))}},{key:"_preCheck",value:function(){if(this._getModule(Kn).isUnlimitedAVChatRoom())return Promise.resolve();if(!this.hasJoinedAVChatRoom())return Promise.resolve();var e=v(this._joinedGroupMap.entries().next().value,2),t=e[0],n=e[1];if(this._groupModule.isLoggedIn()){if(!(n.selfInfo.role===S.GRP_MBR_ROLE_OWNER||n.ownerID===this._groupModule.getMyUserID()))return this._groupModule.quitGroup(t);this._groupModule.deleteLocalGroupAndConversation(t)}else this._groupModule.deleteLocalGroupAndConversation(t);return this.reset(t),Promise.resolve()}},{key:"joinWithoutAuth",value:function(e){var t=this,n=e.groupID,o="".concat(this._n,".").concat("joinWithoutAuth"),s=new li("joinWithoutAuth");return this._groupModule.request({protocolName:ns,requestData:e}).then((function(e){var a=e.data.longPollingKey;if(t._groupModule.probeNetwork().then((function(e){var t=v(e,2),o=(t[0],t[1]);s.setNetworkType(o).setMessage("groupID:".concat(n," longPollingKey:").concat(a)).end(!0)})),ut(a))return Oi({code:vr});He.l("".concat(o," ok. groupID:").concat(n)),t._getModule(Hn).setCompleted("".concat(S.CONV_GROUP).concat(n));var r=new Ji({groupID:n});return t.startRunLoop({group:r,longPollingKey:a}),Li({status:Je})})).catch((function(e){return He.e("".concat(o," failed. groupID:").concat(n," error:"),e),t._groupModule.probeNetwork().then((function(t){var o=v(t,2),a=o[0],r=o[1];s.setError(e,a,r).setMessage("groupID:".concat(n)).end(!0)})),Oi(e)})).finally((function(){t._groupModule.getModule(jn).reportAtOnce()}))}},{key:"getGroupOnlineMemberCount",value:function(e){var t=this._onlineMemberCountMap.get(e)||{},n=Date.now();return Zt(t)||n-t.lastSyncTime>1e3*t.expireTime&&n-t.latestUpdateTime>1e4&&n-t.lastReqTime>3e3?(t.lastReqTime=n,this._onlineMemberCountMap.set(e,t),this._getGroupOnlineMemberCount(e).then((function(e){return Li({memberCount:e.memberCount})})).catch((function(e){return Oi(e)}))):Ni({memberCount:t.memberCount})}},{key:"_getGroupOnlineMemberCount",value:function(e){var t=this,n="".concat(this._n,".").concat("_getGroupOnlineMemberCount");return this._groupModule.request({protocolName:Is,requestData:{groupID:e}}).then((function(o){var s=t._onlineMemberCountMap.get(e)||{},a=o.data,r=a.onlineMemberNum,i=void 0===r?0:r,u=a.expireTime,c=void 0===u?t.DEFAULT_EXPIRE_TIME:u;He.l("".concat(n," ok. groupID:").concat(e," memberCount:").concat(i," expireTime:").concat(c));var l=Date.now();return Zt(s)&&(s.lastReqTime=l),t._onlineMemberCountMap.set(e,Object.assign(s,{lastSyncTime:l,latestUpdateTime:l,memberCount:i,expireTime:c})),{memberCount:i}})).catch((function(o){return He.w("".concat(n," failed. error:"),o),new li("_getGroupOnlineMemberCount").setCode(o.code).setMessage("groupID:".concat(e," error:").concat(JSON.stringify(o))).setNetworkType(t._groupModule.getNetworkType()).end(),Promise.reject(o)}))}},{key:"_getModule",value:function(e){return this._groupModule.getModule(e)}},{key:"setPollingInterval",value:function(e){ut(e)||(ot(e)?this._pollingInterval=this.DEFAULT_POLLING_INTERVAL=e:this._pollingInterval=this.DEFAULT_POLLING_INTERVAL=parseInt(e,10))}},{key:"setPollingIntervalPlus",value:function(e){ut(e)||(ot(e)?this.DEFAULT_POLLING_INTERVAL_PLUS=e:this.DEFAULT_POLLING_INTERVAL_PLUS=parseInt(e,10))}},{key:"setPollingNoMessageCount",value:function(e){ut(e)||(ot(e)?this.DEFAULT_POLLING_NO_MESSAGE_COUNT=e:this.DEFAULT_POLLING_NO_MESSAGE_COUNT=parseInt(e,10))}},{key:"setPollingSimplifiedMessage",value:function(e){ut(e)||"0"!==e&&"1"!==e||(this.DEFAULT_POLLING_SIMPLIFIED_MSG=parseInt(e,10))}},{key:"getPollingInterval",value:function(){return this._pollingInterval}},{key:"onAVChatRoomMemberBanned",value:function(e){var t=e.payload.groupProfile.groupID;He.l("".concat(this._n,".onAVChatRoomMemberBanned groupID:").concat(t)),this._groupModule.deleteLocalGroupAndConversation(t),this.reset(t)}},{key:"restartPolling",value:function(){He.l("".concat(this._n,".restartPolling count:").concat(this._pollingInstanceMap.size));var e,t=D(this._pollingInstanceMap.values());try{for(t.s();!(e=t.n()).done;){var n=e.value;n.stop(),n.start()}}catch(o){t.e(o)}finally{t.f()}}},{key:"reset",value:function(e){if(e){He.l("".concat(this._n,".reset groupID:").concat(e));var t=this._pollingInstanceMap.get(e);t&&t.stop(),this._pollingInstanceMap.delete(e),this._joinedGroupMap.delete(e),this._pollingRequestInfoMap.delete(e),this._onlineMemberCountMap.delete(e)}else{He.l("".concat(this._n,".reset all"));var n,o=D(this._pollingInstanceMap.values());try{for(o.s();!(n=o.n()).done;){n.value.stop()}}catch(s){o.e(s)}finally{o.f()}this._pollingInstanceMap.clear(),this._joinedGroupMap.clear(),this._pollingRequestInfoMap.clear(),this._onlineMemberCountMap.clear(),this._broadcastMessageIDMap.clear()}this.sequencesLinkedList.reset(),this.messageIDLinkedList.reset(),this.receivedMessageCount=0,this._reportMessageStackedCount=0,this._pollingInterval=this.DEFAULT_POLLING_INTERVAL=300,this.DEFAULT_POLLING_NO_MESSAGE_COUNT=20,this.DEFAULT_POLLING_INTERVAL_PLUS=2e3,this._pollingNoMessageCount=0}}]),e}(),fu=1,vu=15,mu=function(){function e(t){o(this,e),this._groupModule=t,this._n="GroupSystemNoticeHandler",this.pendencyMap=new Map}return a(e,[{key:"onNewGroupSystemNotice",value:function(e){var t=e.dataList,n=e.isSyncingEnded,o=e.isInstantMessage;He.d("".concat(this._n,".onReceiveSystemNotice count:").concat(t.length));var s=this.newSystemNoticeStoredAndSummary({notifiesList:t,isInstantMessage:o}),a=s.eventDataList,r=s.result;a.length>0&&(this._groupModule.getModule(Hn).onNewMessage({conversationOptionsList:a,isInstantMessage:o}),this._onReceivedGroupSystemNotice({result:r,isInstantMessage:o}));o?r.length>0&&this._groupModule.emitOuterEvent(k.MESSAGE_RECEIVED,r):!0===n&&this._clearGroupSystemNotice()}},{key:"newSystemNoticeStoredAndSummary",value:function(e){var n=e.notifiesList,o=e.isInstantMessage,s=null,a=n.length,r=0,i=[],u={conversationID:S.CONV_SYSTEM,unreadCount:0,type:S.CONV_SYSTEM,subType:null,lastMessage:null};for(r=0;r<a;r++){var c=n[r],l=c.groupProfile,p=l.communityType,d=void 0===p?0:p,g=l.topicID,h=void 0===g?void 0:g,_=c.elements,f=_.topicIDList,v=void 0===f?void 0:f,m=_.operationType;if(!(2!==d||Zt(h)&&Zt(v))){if([17,18,20].includes(m)){this._handleTopicSystemNotice(c);continue}Zt(h)||(c.to=h)}if(c.elements.operationType!==vu)c.currentUser=this._groupModule.getMyUserID(),c.conversationType=S.CONV_SYSTEM,c.conversationID=S.CONV_SYSTEM,(s=new Si(c)).setElement({type:S.MSG_GRP_SYS_NOTICE,content:t(t({},c.elements),{},{groupProfile:t({},c.groupProfile)})}),s.isSystemMessage=!0,(1===s.sequence&&1===s.random||2===s.sequence&&2===s.random)&&(s.sequence=Mt(),s.random=Mt(),s.generateMessageID(),He.l("".concat(this._n,".newSystemNoticeStoredAndSummary sequence and random maybe duplicated, regenerate. ID:").concat(s.ID))),this._groupModule.getModule(Hn).pushIntoNoticeResult(i,s)&&(o?u.unreadCount++:s.setIsRead(!0),u.subType=s.conversationSubType)}return u.lastMessage=i[i.length-1],{eventDataList:i.length>0?[u]:[],result:i}}},{key:"_clearGroupSystemNotice",value:function(){var e=this;this._getPendencyList().then((function(t){t.forEach((function(t){e.pendencyMap.set("".concat(t.from,"_").concat(t.groupID,"_").concat(t.to),t)}));var n=e._groupModule.getModule(Hn).getLocalMessageList(S.CONV_SYSTEM),o=[];n.forEach((function(t){var n=t.payload,s=n.operatorID,a=n.operationType,r=n.groupProfile;if(a===fu){var i="".concat(s,"_").concat(r.groupID,"_").concat(r.to),u=e.pendencyMap.get(i);u&&ot(u.handled)&&0!==u.handled&&o.push(t)}})),e.deleteGroupSystemNotice({messageList:o})}))}},{key:"deleteGroupSystemNotice",value:function(e){var t=this,n="".concat(this._n,".deleteGroupSystemNotice");return it(e.messageList)&&0!==e.messageList.length?(He.l("".concat(n," ")+e.messageList.map((function(e){return e.ID}))),this._groupModule.request({protocolName:ms,requestData:{messageListToDelete:e.messageList.map((function(e){return{from:S.CONV_SYSTEM,messageSeq:e.clientSequence,messageRandom:e.random}}))}}).then((function(){He.l("".concat(n," ok"));var o=t._groupModule.getModule(Hn);return e.messageList.forEach((function(e){o.deleteLocalMessage(e)})),Li()})).catch((function(e){return He.e("".concat(n," error:"),e),Oi(e)}))):Ni()}},{key:"_getPendencyList",value:function(){var e=this,t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=t.type,o=void 0===n?void 0:n,s=t.startTime,a=void 0===s?0:s,r=t.limit,i=void 0===r?20:r;return this._groupModule.request({protocolName:vs,requestData:{type:o,startTime:a,limit:i,handleAccount:this._groupModule.getMyUserID()}}).then((function(t){var n=t.data.pendencyList;return 0!==t.data.nextStartTime?e._getPendencyList({startTime:t.data.nextStartTime}).then((function(e){return[].concat(m(n),m(e))})):n}))}},{key:"getGroupApplicationList",value:function(){var e=this;return this._getPendencyList().then((function(t){return e._getPendencyList({type:S.GRP_COMMUNITY}).then((function(n){return t.push.apply(t,m(n)),e._handlePendencyResult(t)})).catch((function(n){return e._handlePendencyResult(t)}))}))}},{key:"_handlePendencyResult",value:function(e){var t=this,n=[];return e.forEach((function(e){t.pendencyMap.set("".concat(e.from,"_").concat(e.groupID,"_").concat(e.to),e),0===e.handled&&n.push({applicant:e.from,applicantNick:e.fromUserNickName,groupName:e.groupName,groupID:e.groupID,authentication:e.authentication,messageKey:e.time,applicationType:e.applicationType,userID:e.userID})})),Ni({applicationList:n})}},{key:"_onReceivedGroupSystemNotice",value:function(e){var t=this,n=e.result;e.isInstantMessage&&n.forEach((function(e){switch(e.payload.operationType){case 1:break;case 2:t._onApplyGroupRequestAgreed(e);break;case 3:break;case 4:t._onMemberKicked(e);break;case 5:t._onGroupDismissed(e);break;case 6:break;case 7:t._onInviteGroup(e);break;case 8:t._onQuitGroup(e);break;case 9:t._onSetManager(e);break;case 10:t._onDeleteManager(e);break;case 11:case 12:case 15:break;case 20:t._onMessageRemindTypeSynced(e);break;case 21:t._groupModule.onAVChatRoomMemberBanned(e)}}))}},{key:"_onApplyGroupRequestAgreed",value:function(e){var t=this,n=e.payload.groupProfile.groupID;this._groupModule.hasLocalGroup(n)||this._groupModule.getGroupProfile({groupID:n}).then((function(e){var n=e.data.group;if(n){t._groupModule.updateGroupMap([n]);var o=!n.isSupportTopic;t._groupModule.emitGroupListUpdate(!0,o)}}))}},{key:"_onMemberKicked",value:function(e){var t=e.payload.groupProfile.groupID;this._groupModule.hasLocalGroup(t)&&this._groupModule.deleteLocalGroupAndConversation(t)}},{key:"_onGroupDismissed",value:function(e){var t=e.payload.groupProfile.groupID;this._groupModule.hasLocalGroup(t)&&this._groupModule.deleteLocalGroupAndConversation(t);var n=this._groupModule._AVChatRoomHandler;n&&n.checkJoinedAVChatRoomByID(t)&&n.reset(t)}},{key:"_onInviteGroup",value:function(e){var t=this,n=e.payload.groupProfile.groupID;this._groupModule.hasLocalGroup(n)||this._groupModule.getGroupProfile({groupID:n}).then((function(e){var n=e.data.group;n&&(t._groupModule.updateGroupMap([n]),t._groupModule.emitGroupListUpdate())}))}},{key:"_onQuitGroup",value:function(e){var t=e.payload.groupProfile.groupID;this._groupModule.hasLocalGroup(t)&&this._groupModule.deleteLocalGroupAndConversation(t)}},{key:"_onSetManager",value:function(e){var t=e.payload.groupProfile,n=t.to,o=t.groupID,s=this._groupModule.getModule(Vn).getLocalGroupMemberInfo(o,n);s&&s.updateRole(S.GRP_MBR_ROLE_ADMIN)}},{key:"_onDeleteManager",value:function(e){var t=e.payload.groupProfile,n=t.to,o=t.groupID,s=this._groupModule.getModule(Vn).getLocalGroupMemberInfo(o,n);s&&s.updateRole(S.GRP_MBR_ROLE_MEMBER)}},{key:"_onMessageRemindTypeSynced",value:function(e){var t=e.payload.groupProfile.groupID,n=e.payload.messageRemindType;this._groupModule.getModule(Hn).onGroupMessageRemindTypeSynced({groupID:t,messageRemindType:n})}},{key:"_handleTopicSystemNotice",value:function(e){var t=e.groupProfile,n=t.groupID,o=t.topicID,s=e.elements,a=s.operationType,r=s.topicIDList,i=s.messageRemindType,u=this._groupModule.getModule(Bn);17===a?u.onTopicCreated({groupID:n,topicID:o}):18===a?u.onTopicDeleted({groupID:n,topicIDList:r}):20===a&&u.onTopicMessageRemindTypeUpdated({groupID:n,topicID:o,messageRemindType:i})}},{key:"reset",value:function(){this.pendencyMap.clear()}}]),e}(),Mu=["relayFlag"],yu=function(e){i(s,e);var n=f(s);function s(e){var t;return o(this,s),(t=n.call(this,e))._n="GroupModule",t._commonGroupHandler=null,t._AVChatRoomHandler=null,t._groupSystemNoticeHandler=null,t._commonGroupHandler=new nu(h(t)),t._groupAttributesHandler=new uu(h(t)),t._groupCountersHandler=new du(h(t)),t._AVChatRoomHandler=new _u(h(t)),t._groupTipsHandler=new tu(h(t)),t._groupSystemNoticeHandler=new mu(h(t)),t.groupMap=new Map,t._unjoinedAVChatRoomList=new Map,t._receiptDetailCompleteMap=new Map,t.getInnerEmitterInstance().on(bi,t._onCloudConfigUpdated,h(t)),t}return a(s,[{key:"_onCloudConfigUpdated",value:function(){var e=this.getCloudConfig("polling_interval"),t=this.getCloudConfig("polling_interval_plus"),n=this.getCloudConfig("polling_no_msg_count"),o=this.getCloudConfig("polling_simplified_msg");this._AVChatRoomHandler&&(He.l("".concat(this._n,"._onCloudConfigUpdated pollingInterval:").concat(e)+" pollingIntervalPlus:".concat(t," pollingNoMessageCount:").concat(n)+" pollingSimplifiedMessage:".concat(o)),this._AVChatRoomHandler.setPollingInterval(e),this._AVChatRoomHandler.setPollingIntervalPlus(t),this._AVChatRoomHandler.setPollingNoMessageCount(n),this._AVChatRoomHandler.setPollingSimplifiedMessage(o))}},{key:"onCheckTimer",value:function(e){this.isLoggedIn()&&(this._commonGroupHandler.onCheckTimer(e),this._groupTipsHandler.onCheckTimer(e))}},{key:"guardForAVChatRoom",value:function(e){var t=this;if(e.conversationType===S.CONV_GROUP){var n=At(e.to)?Kt(e.to):e.to;return this.hasLocalGroup(n)?Ni():this.getGroupProfile({groupID:n}).then((function(o){var s=o.data.group.type;if(He.l("".concat(t._n,".guardForAVChatRoom. groupID:").concat(n," type:").concat(s)),s===S.GRP_AVCHATROOM){var a=La;return Oi(new Ei({code:a,message:t.getErrorMessage(a,e.from,n),data:{message:e}}))}return Ni()}))}return Ni()}},{key:"checkJoinedAVChatRoomByID",value:function(e){return!!this._AVChatRoomHandler&&this._AVChatRoomHandler.checkJoinedAVChatRoomByID(e)}},{key:"onNewGroupMessage",value:function(e){this._commonGroupHandler&&this._commonGroupHandler.onNewGroupMessage(e)}},{key:"updateNextMessageSeq",value:function(e){var t=this;if(it(e)){var n=this.getModule(Bn);e.forEach((function(e){var o=e.conversationID.replace(S.CONV_GROUP,"");At(o)&&n.updateLastMessage(o,e.lastMessage),t.groupMap.has(o)&&(t.groupMap.get(o).nextMessageSeq=e.lastMessage.sequence+1)}))}}},{key:"onNewGroupTips",value:function(e){this._groupTipsHandler&&this._groupTipsHandler.onNewGroupTips(e)}},{key:"onGroupMessageRevoked",value:function(e){this._commonGroupHandler&&this._commonGroupHandler.onGroupMessageRevoked(e)}},{key:"onNewGroupSystemNotice",value:function(e){this._groupSystemNoticeHandler&&this._groupSystemNoticeHandler.onNewGroupSystemNotice(e)}},{key:"onGroupMessageReadNotice",value:function(e){var t=this;e.dataList.forEach((function(e){var n=e.elements.groupMessageReadNotice;if(!ut(n)){var o=t.getModule(Hn);n.forEach((function(e){var n=e.groupID,s=e.topicID,a=void 0===s?void 0:s,r=e.lastMessageSeq;He.d("".concat(t._n,".onGroupMessageReadNotice groupID:").concat(n," lastMessageSeq:").concat(r));var i="".concat(S.CONV_GROUP).concat(n),u=!0;Zt(a)||(i="".concat(S.CONV_GROUP).concat(a),u=!1),o.updateIsReadAfterReadReport({conversationID:i,lastMessageSeq:r}),o.updateUnreadCount(i,u),o.clearGroupAtInfoList(i,u)}))}}))}},{key:"onReadReceiptList",value:function(e){var t=this;He.d("".concat(this._n,".onReadReceiptList options:"),JSON.stringify(e)),e.dataList.forEach((function(e){var n=e.groupProfile,o=e.elements,s=n.groupID,a=t.getModule(Hn),r=o.readReceiptList;a.updateReadReceiptInfo({groupID:s,readReceiptList:r})}))}},{key:"onGroupMessageModified",value:function(e){He.d("".concat(this._n,".onGroupMessageModified options:"),JSON.stringify(e));var n=this.getModule(Hn);e.dataList.forEach((function(e){n.onMessageModified(t(t({},e),{},{conversationType:S.CONV_GROUP,to:e.topicID?e.topicID:e.groupID}))}))}},{key:"deleteGroupSystemNotice",value:function(e){this._groupSystemNoticeHandler&&this._groupSystemNoticeHandler.deleteGroupSystemNotice(e)}},{key:"initGroupMap",value:function(e){this.groupMap.set(e.groupID,new Ji(e))}},{key:"deleteGroup",value:function(e){this.groupMap.delete(e)}},{key:"updateGroupMap",value:function(e){var t,n=this,o=this.getModule(Hn);e.forEach((function(e){t=e.groupID,n.groupMap.has(t)?n.groupMap.get(t).updateGroup(e):(n.groupMap.set(t,new Ji(e)),o.deleteGroupRomaingMessageInfo(t))}));var s,a=this.getMyUserID(),r=D(this.groupMap);try{for(r.s();!(s=r.n()).done;){var i=v(s.value,2)[1];i.selfInfo.userID=a,"Owner"===i.selfInfo.role&&(i.ownerID=a)}}catch(u){r.e(u)}finally{r.f()}this._setStorageGroupList()}},{key:"getStorageGroupList",value:function(){return this.getModule(Wn).getItem("groupMap")}},{key:"_setStorageGroupList",value:function(){var e=this.getLocalGroupList().filter((function(e){var t=e.type;return!Lt(t)})).filter((function(e){return!e.isSupportTopic})).slice(0,20).map((function(e){return{groupID:e.groupID,name:e.name,avatar:e.avatar,type:e.type}}));this.getModule(Wn).setItem("groupMap",e)}},{key:"getGroupMap",value:function(){return this.groupMap}},{key:"getLocalGroupList",value:function(){return m(this.groupMap.values())}},{key:"getLocalGroupProfile",value:function(e){return this.groupMap.get(e)}},{key:"sortLocalGroupList",value:function(){var e=m(this.groupMap).filter((function(e){var t=v(e,2);t[0];return!Zt(t[1].lastMessage)}));e.sort((function(e,t){return t[1].lastMessage.lastTime-e[1].lastMessage.lastTime})),this.groupMap=new Map(m(e))}},{key:"updateGroupLastMessage",value:function(e){this._commonGroupHandler&&this._commonGroupHandler.handleUpdateGroupLastMessage(e)}},{key:"emitGroupListUpdate",value:function(){var e=!(arguments.length>0&&void 0!==arguments[0])||arguments[0],t=!(arguments.length>1&&void 0!==arguments[1])||arguments[1],n=this.getLocalGroupList();if(e&&this.emitOuterEvent(k.GROUP_LIST_UPDATED),t){var o=JSON.parse(JSON.stringify(n)),s=this.getModule(Hn);s.updateConversationGroupProfile(o)}}},{key:"patchGroupMessageRemindType",value:function(){var e=this.getLocalGroupList(),t=this.getModule(Hn),n=0;e.forEach((function(e){!0===t.patchMessageRemindType({ID:e.groupID,isC2CConversation:!1,messageRemindType:e.selfInfo.messageRemindType})&&(n+=1)})),He.l("".concat(this._n,".patchGroupMessageRemindType count:").concat(n))}},{key:"recomputeUnreadCount",value:function(){var e=this.getLocalGroupList(),t=this.getModule(Hn);e.forEach((function(e){var n=e.groupID,o=e.selfInfo,s=o.excludedUnreadSequenceList,a=o.readedSequence;if(it(s)){var r=0;s.forEach((function(t){t>=a&&t<=e.nextMessageSeq-1&&(r+=1)})),r>=1&&t.recomputeGroupUnreadCount({conversationID:"".concat(S.CONV_GROUP).concat(n),count:r})}}))}},{key:"getMyNameCardByGroupID",value:function(e){var t=this.getLocalGroupProfile(e);return t?t.selfInfo.nameCard:""}},{key:"isPagingGetCompleted",value:function(){return!!this._commonGroupHandler&&this._commonGroupHandler.isPagingGetCompleted()}},{key:"getGroupList",value:function(e){return this._commonGroupHandler?this._commonGroupHandler.getGroupList(e):Ni()}},{key:"getGroupProfile",value:function(e){var t=this,n="".concat(this._n,".").concat("getGroupProfile"),o=new li("getGroupProfile"),s=e.groupID,a=e.groupCustomFieldFilter;He.l("".concat(n," groupID:").concat(s));var r={groupIDList:[s],responseFilter:{groupBaseInfoFilter:["Type","Name","Introduction","Notification","FaceUrl","Owner_Account","CreateTime","InfoSeq","LastInfoTime","LastMsgTime","MemberNum","MaxMemberNum","ApplyJoinOption","NextMsgSeq","ShutUpAllMember","InviteJoinOption"],groupCustomFieldFilter:a,memberInfoFilter:["Role","JoinTime","MsgSeq","MsgFlag","NameCard"]}};return this.getGroupProfileAdvance(r).then((function(e){var a,r=e.data,i=r.successGroupList,u=r.failureGroupList;if(He.l("".concat(n," ok")),u.length>0)return Oi(u[0]);(Lt(i[0].type)&&!t.hasLocalGroup(s)?a=new Ji(i[0]):(t.updateGroupMap(i),a=t.getLocalGroupProfile(s)),a.isSupportTopic)||t.getModule(Hn).updateConversationGroupProfile([a]);return o.setNetworkType(t.getNetworkType()).setMessage("groupID:".concat(s," type:").concat(a.type," muteAllMembers:").concat(a.muteAllMembers," ownerID:").concat(a.ownerID)).end(),Li({group:a})})).catch((function(s){return t.probeNetwork().then((function(t){var n=v(t,2),a=n[0],r=n[1];o.setError(s,a,r).setMessage("groupID:".concat(e.groupID)).end()})),He.e("".concat(n," failed. error:"),s),Oi(s)}))}},{key:"getGroupProfileAdvance",value:function(e){var n="".concat(this._n,".getGroupProfileAdvance"),o=e.groupIDList;it(o)&&o.length>50&&(this.outputWarning("GetGroupProfileLimit"),o.length=50);var s=[],a=[];o.forEach((function(e){Et({groupID:e})?a.push(e):s.push(e)}));var r=[];if(s.length>0){var i=this._getGroupProfileAdvance(t(t({},e),{},{groupIDList:s}));r.push(i)}if(a.length>0){var u=this._getGroupProfileAdvance(t(t({},e),{},{groupIDList:a,relayFlag:s.length>0}));r.push(u)}return Promise.all(r).then((function(e){var t=[],n=[];return e.forEach((function(e){t.push.apply(t,m(e.successGroupList)),n.push.apply(n,m(e.failureGroupList))})),Li({successGroupList:t,failureGroupList:n})})).catch((function(e){return He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"_getGroupProfileAdvance",value:function(e){var t=this,n=e.relayFlag,o=void 0!==n&&n,s=g(e,Mu);return this.request({protocolName:Qo,requestData:s}).then((function(e){He.l("".concat(t._n,"._getGroupProfileAdvance ok."));var n=e.data.groups;return{successGroupList:n.filter((function(e){return ut(e.errorCode)||0===e.errorCode})),failureGroupList:n.filter((function(e){return e.errorCode&&0!==e.errorCode})).map((function(e){return new Ei({code:e.errorCode,message:e.errorInfo,data:{groupID:e.groupID}})}))}})).catch((function(t){return o&&Et({groupID:e.groupIDList[0]})?{successGroupList:[],failureGroupList:[]}:Oi(t)}))}},{key:"createGroup",value:function(e){var n=this,o="".concat(this._n,".").concat("createGroup"),s=e.type,a=e.groupID;if(e.name&&!1===this._filterProfanity("name",e))return Oi({code:Wr});if(e.introduction&&!1===this._filterProfanity("introduction",e))return Oi({code:Wr});if(e.notification&&!1===this._filterProfanity("notification",e))return Oi({code:Wr});if(!["Public","Private","ChatRoom","AVChatRoom","Community"].includes(s))return Oi({code:ir});if(!Et({type:s})){if(!Zt(a)&&Et({groupID:a}))return Oi({code:cr});e.isSupportTopic=void 0}if(Lt(s)&&!ut(e.memberList)&&e.memberList.length>0&&(e.memberList=void 0),this._canIUseJoinOption(s)||ut(e.joinOption)||(e.joinOption=void 0),Et({type:s})){if(!Zt(a)&&!Et({groupID:a}))return Oi({code:cr});e.isSupportTopic=!0===e.isSupportTopic?1:0}var r=new li("createGroup");He.l("".concat(o," options:"),e);var i=null,u=[];return this.request({protocolName:Zo,requestData:t(t({},e),{},{ownerID:this.getMyUserID(),webPushFlag:1})}).then((function(s){var a=s.data,c=a.groupID,l=a.overLimitUserIDList,p=void 0===l?[]:l;if(i=c,u=p,r.setNetworkType(n.getNetworkType()).setMessage("groupType:".concat(e.type," groupID:").concat(c," overLimitUserIDList=").concat(p)).end(),He.l("".concat(o," ok groupID:").concat(c," overLimitUserIDList:"),p),e.type===S.GRP_AVCHATROOM)return n.getGroupProfile({groupID:c});if(e.type===S.GRP_COMMUNITY&&1===e.isSupportTopic)return n.getGroupProfile({groupID:c});Zt(e.memberList)||Zt(p)||(e.memberList=e.memberList.filter((function(e){return-1===p.indexOf(e.userID)}))),n.updateGroupMap([t(t({},e),{},{groupID:c})]);var d=n.getModule(Un),g=d.createCustomMessage({to:c,conversationType:S.CONV_GROUP,payload:{data:"group_create",extension:n.isIntl()?"".concat(n.getMyUserID()," created a group"):"".concat(n.getMyUserID(),"创建群组")}});return d.sendMessageInstance(g),n.emitGroupListUpdate(),n.getGroupProfile({groupID:c})})).then((function(e){var t=e.data.group,n=t.selfInfo,o=n.nameCard,s=n.joinTime;return t.updateSelfInfo({nameCard:o,joinTime:s,messageRemindType:S.MSG_REMIND_ACPT_AND_NOTE,role:S.GRP_MBR_ROLE_OWNER}),Li({group:t,overLimitUserIDList:u})})).catch((function(s){if(r.setMessage("groupType:".concat(e.type)),n.probeNetwork().then((function(e){var t=v(e,2),n=t[0],o=t[1];r.setError(s,n,o).end()})),10010===s.code||10007===s.code){n.updateGroupMap([t(t({},e),{},{groupID:i})]);var a=n.getLocalGroupProfile(i);return He.l("".concat(o," success, but failed to get group profile.")),Li({group:a,overLimitUserIDList:u})}return He.e("".concat(o," failed. error:"),s),Oi(s)}))}},{key:"dismissGroup",value:function(e){var t=this,n="".concat(this._n,".").concat("dismissGroup");if(this.hasLocalGroup(e)&&this.getLocalGroupProfile(e).type===S.GRP_WORK)return Oi(new Ei({code:gr}));var o=new li("dismissGroup");return o.setMessage("groupID:".concat(e)),He.l("".concat(n," groupID:").concat(e)),this.request({protocolName:$o,requestData:{groupID:e}}).then((function(){return o.setNetworkType(t.getNetworkType()).end(),He.l("".concat(n," ok")),t.deleteLocalGroupAndConversation(e),t.checkJoinedAVChatRoomByID(e)&&t._AVChatRoomHandler.reset(e),t._groupAttributesHandler.deleteLocalGroupAttributes(e),Li({groupID:e})})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),s=n[0],a=n[1];o.setError(e,s,a).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"updateGroupProfile",value:function(e){var t=this,n="".concat(this._n,".").concat("updateGroupProfile");if(this.hasLocalGroup(e.groupID)){var o=this.getLocalGroupProfile(e.groupID).type;this._canIUseJoinOption(o)||ut(e.joinOption)||(He.w("".concat(n," joinOption is unavailable for Work/Meeting/AVChatRoom")),e.joinOption=void 0)}if(ut(e.muteAllMembers)||(e.muteAllMembers?e.muteAllMembers="On":e.muteAllMembers="Off"),e.name&&!1===this._filterProfanity("name",e))return Oi({code:Wr});if(e.introduction&&!1===this._filterProfanity("introduction",e))return Oi({code:Wr});if(e.notification&&!1===this._filterProfanity("notification",e))return Oi({code:Wr});var s=new li("updateGroupProfile");return s.setMessage(JSON.stringify(e)),He.l("".concat(n," groupID:").concat(e.groupID)),this.request({protocolName:es,requestData:e}).then((function(){(s.setNetworkType(t.getNetworkType()).end(),He.l("".concat(n," ok")),t.hasLocalGroup(e.groupID))&&(t.groupMap.get(e.groupID).updateGroup(e),t._setStorageGroupList());return Li({group:t.groupMap.get(e.groupID)})})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],a=n[1];s.setError(e,o,a).end()})),He.l("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"_filterProfanity",value:function(e,t){var n=this.getModule(io);if(!n)return!0;var o=n.filterText(t[e],z),s=o.isAllowedToSend,a=o.modifiedText;return!0===s&&(t[e]=a,!0)}},{key:"joinGroup",value:function(e){var t=this,n=e.groupID,o=e.type,s="".concat(this._n,".joinGroup");if(o===S.GRP_WORK)return Oi({code:ur});if(this.deleteUnjoinedAVChatRoom(n),this.hasLocalGroup(n)){if(!this.isLoggedIn())return Ni({status:S.JOIN_STATUS_ALREADY_IN_GROUP});var a=new li("applyJoinGroup");return this.getGroupProfile({groupID:n}).then((function(){return a.setNetworkType(t.getNetworkType()).setMessage("groupID:".concat(n," joinedStatus:").concat(S.JOIN_STATUS_ALREADY_IN_GROUP)).end(),Ni({status:S.JOIN_STATUS_ALREADY_IN_GROUP})})).catch((function(o){return a.setNetworkType(t.getNetworkType()).setMessage("groupID:".concat(n," unjoined")).end(),He.w("".concat(s," ").concat(n," was unjoined, now join!")),t.groupMap.delete(n),t.applyJoinGroup(e)}))}return He.l("".concat(s," groupID:").concat(n)),this.isLoggedIn()?this.applyJoinGroup(e):this._AVChatRoomHandler.joinWithoutAuth(e)}},{key:"applyJoinGroup",value:function(e){var n=this,o="".concat(this._n,".").concat("applyJoinGroup"),s=e.groupID;if(!Zt(e.applyMessage)&&!1===this._filterProfanity("applyMessage",e))return Oi({code:Wr});var a=new li("applyJoinGroup"),r=t({},e),i=this.canIUse(B.AVCHATROOM_HISTORY_MSG);return i&&(r.historyMessageFlag=1),this.getModule(Hn).deleteTopicRoamingMessageInfo(s),this.request({protocolName:ts,requestData:r}).then((function(e){var t=e.data,r=t.joinedStatus,u=t.longPollingKey,c=t.startSeq,l=t.avChatRoomFlag,p=t.avChatRoomKey,d=t.messageList,g="groupID:".concat(s," joinedStatus:").concat(r," longPollingKey:").concat(u," startSeq:").concat(c)+" avChatRoomFlag:".concat(l," canGetAVChatRoomHistoryMessage:").concat(i,",")+" history message count:".concat(Zt(d)?0:d.length);switch(a.setNetworkType(n.getNetworkType()).setMessage("".concat(g)).end(),He.l("".concat(o," ok. ").concat(g)),r){case Xe:return Li({status:Xe});case Je:return n.getGroupProfile({groupID:s}).then((function(e){var t=e.data.group;return n._handleJoinResult({group:t,avChatRoomFlag:l,longPollingKey:u,startSeq:c,avChatRoomKey:p,messageList:d})})).catch((function(){var e=new Ji({groupID:s});return n._handleJoinResult({group:e,avChatRoomFlag:l,longPollingKey:u,startSeq:c,avChatRoomKey:p,messageList:d})}));default:var h=new Ei({code:_r});return He.e("".concat(o," failed. error:"),h),Oi(h)}})).catch((function(e){return a.setMessage("groupID:".concat(s)),n.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];a.setError(e,o,s).end()})),He.e("".concat(o," failed. error:"),e),Oi(e)}))}},{key:"_handleJoinResult",value:function(e){var t,n=this,o=e.group,s=e.avChatRoomFlag,a=e.longPollingKey,r=e.startSeq,i=e.avChatRoomKey,u=e.messageList,c=o.groupID;return 1===s?(this.getModule(Hn).setCompleted("".concat(S.CONV_GROUP).concat(c)),this._groupAttributesHandler.initGroupAttributesCache({groupID:c,avChatRoomKey:i}),this._groupCountersHandler.initGroupCountersCache({groupID:c,avChatRoomKey:i}),(t=ut(a)?this._AVChatRoomHandler.handleJoinResult({group:o}):this._AVChatRoomHandler.startRunLoop({group:o,longPollingKey:a,startSeq:r})).then((function(){n._onAVChatRoomHistoryMessage(u)})),t):(this.emitGroupListUpdate(!0,!1),Li({status:Je,group:o}))}},{key:"quitGroup",value:function(e){var t=this,n="".concat(this._n,".").concat("quitGroup");He.l("".concat(n," groupID:").concat(e));var o=this.checkJoinedAVChatRoomByID(e);if(!o&&!this.hasLocalGroup(e))return Oi({code:hr});if(o&&!this.isLoggedIn())return He.l("".concat(n," anonymously ok. groupID:").concat(e)),this.deleteLocalGroupAndConversation(e),this._AVChatRoomHandler.reset(e),Ni({groupID:e});var s=new li("quitGroup");return s.setMessage("groupID:".concat(e)),this.request({protocolName:os,requestData:{groupID:e}}).then((function(){return s.setNetworkType(t.getNetworkType()).end(),He.l("".concat(n," ok")),t.deleteLocalGroupAndConversation(e),o&&t._AVChatRoomHandler.reset(e),t._groupAttributesHandler.deleteLocalGroupAttributes(e),Li({groupID:e})})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],a=n[1];s.setError(e,o,a).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"searchGroupByID",value:function(e){var t=this,n="".concat(this._n,".").concat("searchGroupByID"),o={groupIDList:[e]},s=new li("searchGroupByID");return s.setMessage("groupID:".concat(e)),He.l("".concat(n," groupID:").concat(e)),this.request({protocolName:ss,requestData:o}).then((function(e){var o=e.data.groupProfile;if(0!==o[0].errorCode)throw new Ei({code:o[0].errorCode,message:o[0].errorInfo});return s.setNetworkType(t.getNetworkType()).end(),He.l("".concat(n," ok")),Li({group:new Ji(o[0])})})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],a=n[1];s.setError(e,o,a).end()})),He.w("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"changeGroupOwner",value:function(e){var t=this,n="".concat(this._n,".").concat("changeGroupOwner");if(this.hasLocalGroup(e.groupID)&&this.getLocalGroupProfile(e.groupID).type===S.GRP_AVCHATROOM)return Oi({code:pr});if(e.newOwnerID===this.getMyUserID())return Oi({code:dr});var o=new li("changeGroupOwner");return o.setMessage("groupID:".concat(e.groupID," newOwnerID:").concat(e.newOwnerID)),He.l("".concat(n," groupID:").concat(e.groupID)),this.request({protocolName:as,requestData:e}).then((function(){o.setNetworkType(t.getNetworkType()).end(),He.l("".concat(n," ok"));var s=e.groupID,a=e.newOwnerID;t.groupMap.get(s).ownerID=a;var r=t.getModule(Vn).getLocalGroupMemberList(s);if(r instanceof Map){var i=r.get(t.getMyUserID());ut(i)||(i.updateRole("Member"),t.groupMap.get(s).selfInfo.role="Member");var u=r.get(a);ut(u)||u.updateRole("Owner")}return t.emitGroupListUpdate(!0,!1),Li({group:t.groupMap.get(s)})})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),s=n[0],a=n[1];o.setError(e,s,a).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"getGroupApplicationList",value:function(){return this._groupSystemNoticeHandler.getGroupApplicationList()}},{key:"handleGroupApplication",value:function(e){var t,n,o,s,a,r=this,i="".concat(this._n,".").concat("handleGroupApplication"),u=e.handleAction,c=e.handleMessage,l=e.message,p=e.application;l?(t=l.payload.operatorID,n=l.payload.groupProfile.groupID,o=l.payload.authentication,s=l.payload.messageKey):p&&(t=p.applicant,n=p.groupID,o=p.authentication,s=p.messageKey);var d=rs;p&&2===p.applicationType&&(d=is,a=p.userID);var g=new li("handleGroupApplication");return g.setMessage("groupID:".concat(n)),He.l("".concat(i," groupID:").concat(n)),this.request({protocolName:d,requestData:{handleAction:u,handleMessage:c,applicant:t,invitee:a,groupID:n,authentication:o,messageKey:s}}).then((function(){return g.setNetworkType(r.getNetworkType()).end(),He.l("".concat(i," ok")),l&&r._groupSystemNoticeHandler.deleteGroupSystemNotice({messageList:[e.message]}),Li({group:r.getLocalGroupProfile(n)})})).catch((function(e){return r.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];g.setError(e,o,s).end()})),He.e("".concat(i," failed. error"),e),Oi(e)}))}},{key:"handleGroupInvitation",value:function(e){var n=this,o="".concat(this._n,".").concat("handleGroupInvitation"),s=e.message.payload,a=s.groupProfile.groupID,r=s.authentication,i=s.messageKey,u=s.operatorID,c=e.handleAction,l=new li("handleGroupInvitation");return l.setMessage("groupID:".concat(a," inviter:").concat(u," handleAction:").concat(c)),He.l("".concat(o," groupID:").concat(a," inviter:").concat(u," handleAction:").concat(c)),this.request({protocolName:us,requestData:t(t({},e),{},{inviter:u,groupID:a,authentication:r,messageKey:i})}).then((function(){return l.setNetworkType(n.getNetworkType()).end(),He.l("".concat(o," ok")),n._groupSystemNoticeHandler.deleteGroupSystemNotice({messageList:[e.message]}),Li({group:n.getLocalGroupProfile(a)})})).catch((function(e){return n.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];l.setError(e,o,s).end()})),He.e("".concat(o," failed. error"),e),Oi(e)}))}},{key:"getGroupOnlineMemberCount",value:function(e){return this._AVChatRoomHandler?this._AVChatRoomHandler.checkJoinedAVChatRoomByID(e)?this._AVChatRoomHandler.getGroupOnlineMemberCount(e):Ni({memberCount:0}):Oi({code:Pr})}},{key:"hasLocalGroup",value:function(e){return this.groupMap.has(e)}},{key:"deleteLocalGroupAndConversation",value:function(e){var t=this.checkJoinedAVChatRoomByID(e);(He.l("".concat(this._n,".deleteLocalGroupAndConversation isJoinedAVChatRoom:").concat(t)),t)&&this.getModule(Hn).deleteLocalConversation("".concat(S.CONV_GROUP).concat(e));if(Et({groupID:e})){var n=this.getLocalGroupProfile(e);if(n&&!0===n.isSupportTopic)this.getModule(Bn).deleteTopicListInCommunity(e)}this._deleteLocalGroup(e),this.emitGroupListUpdate(!0,!1)}},{key:"_deleteLocalGroup",value:function(e){this.groupMap.delete(e),this.getModule(Vn).deleteGroupMemberList(e),this._setStorageGroupList()}},{key:"sendMessage",value:function(e,t){if(it(e._receiverList)&&e._receiverList.length>0&&!this.canIUse(B.MSG_TO_SPECIFIED_GRP_MBR))return Oi({code:Kr});var n=this.createGroupMessagePack(e,t);return this.request(n)}},{key:"createGroupMessagePack",value:function(e,t){var n=null;t&&t.offlinePushInfo&&(n=t.offlinePushInfo);var o="";st(e.cloudCustomData)&&e.cloudCustomData.length>0&&(o=e.cloudCustomData);var s=[];if(rt(t)&&rt(t.messageControlInfo)){var a=t.messageControlInfo,r=a.excludedFromUnreadCount,i=a.excludedFromLastMessage,u=a.excludedFromContentModeration;!0===r&&s.push("NoUnread"),!0===i&&s.push("NoLastMsg"),!0===u&&s.push("NoMsgCheck")}var c=void 0;it(e._receiverList)&&e._receiverList.length>0&&(c=e._receiverList,e._receiverList.length>50&&(c=e._receiverList.slice(0,50),this.outputWarning("ReceiverListLimit")));var l=this.isOnlineMessage(e,t)?1:0,p=e.getGroupAtInfoList(),d={fromAccount:this.getMyUserID(),groupID:e.to,msgBody:e.getElements(),cloudCustomData:o,random:e.random,priority:e.priority,clientSequence:e.clientSequence,groupAtInfo:e.type!==S.MSG_TEXT||Zt(p)?void 0:p,onlineOnlyFlag:l,clientTime:e.clientTime,offlinePushInfo:n?{pushFlag:!0===n.disablePush?1:0,title:n.title||"",desc:n.description||"",ext:n.extension||"",apnsInfo:{badgeMode:!0===n.ignoreIOSBadge?1:0,isVoipPush:this._isVoipPush(n)},androidInfo:{OPPOChannelID:n.androidOPPOChannelID||""}}:void 0,messageControlInfo:0===l?s:void 0,needReadReceipt:!0!==e.needReadReceipt||this.isMessageFromOrToAVChatroom(e.to)?0:1,receiverList:c,isSupportExtension:!0===e.isSupportExtension?1:0};return At(e.to)&&(d.groupID=Kt(e.to),d.topicID=e.to),{protocolName:yo,tjgID:this.generateTjgID(e),requestData:d}}},{key:"_isVoipPush",value:function(e){var t=void 0;return ut(e.disableVoipPush)||(t=!1===e.disableVoipPush?1:0),t}},{key:"revokeMessage",value:function(e){var t={groupID:e.to,msgSeqList:[{msgSeq:e.sequence}]};return At(e.to)&&(t.groupID=Kt(e.to),t.topicID=e.to),this.request({protocolName:cs,requestData:t})}},{key:"deleteMessage",value:function(e){var t=e.to,n=e.keyList;He.l("".concat(this._n,".deleteMessage groupID:").concat(t," count:").concat(n.length));var o={groupID:t,deleter:this.getMyUserID(),keyList:n};return At(t)&&(o.groupID=Kt(t),o.topicID=t),this.request({protocolName:Cs,requestData:o})}},{key:"modifyRemoteMessage",value:function(e){var t=e.to,n=e.sequence,o=e.payload,s=e.type,a=e.version,r=void 0===a?0:a,i=e.cloudCustomData,u=t,c=void 0;At(t)&&(u=Kt(t),c=t);var l=void 0;return jt(s)&&(l=[]).push({type:s,content:o}),this.request({protocolName:Ts,requestData:{groupID:u,topicID:c,sequence:n,version:r,elements:l,cloudCustomData:i}})}},{key:"getRoamingMessage",value:function(e){var t=this,n="".concat(this._n,".getRoamingMessage"),o=e.conversationID,s=e.groupID,a=e.sequence,r=new li("getGroupRoamingMessages"),i=0,u=void 0;return At(s)&&(s=Kt(u=s)),this._computeLastSequence({groupID:s,topicID:u,sequence:a}).then((function(e){return i=e,He.l("".concat(n," groupID:").concat(s," startSequence:").concat(i)),t.request({protocolName:ds,requestData:{groupID:s,count:21,sequence:i,topicID:u}})})).then((function(e){var a=e.data,c=a.messageList,l=a.complete,p=a.invisibleSequenceList,d=void 0===p?[]:p;ut(c)?He.l("".concat(n," ok. complete:").concat(l," but messageList is undefined!")):He.l("".concat(n," ok. complete:").concat(l," count:").concat(c.length));var g=t._getMinSequence(d,c)-1;r.setNetworkType(t.getNetworkType()).setMessage("groupID:".concat(s," topicID:").concat(u," startSequence:").concat(i," complete:").concat(l," nextSequence:").concat(g)).end();var h=t.getModule(Hn),_=[];return Zt(c)||(h.updateRoamingMessageSequence(o,g),_=h.onRoamingMessage(c,o),h.updateIsRead(o),h.patchConversationLastMessage(o)),2===l&&(h.setCompleted(o),g=""),He.l("".concat(n," nextReqID:").concat(g,", stored message count:").concat(_.length,", invisible sequence count:").concat(d.length)),{nextReqID:g+"",storedMessageList:_}})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],a=n[1];r.setError(e,o,a).setMessage("groupID:".concat(s," topicID:").concat(u," startSequence:").concat(i)).end()})),He.w("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"_getGroupIDOfMessage",value:function(e){return e.conversationID.replace(S.CONV_GROUP,"")}},{key:"_getMinSequence",value:function(e,t){var n=0;Zt(t)||(n=t[t.length-1].sequence);var o=0;Zt(e)||(o=e[e.length-1]);return He.l("".concat(this._n,"._getMinSequence minVisibleSequence:").concat(n," minInvisibleSequence:").concat(o)),o>0&&o<n?o:n}},{key:"getReadReceiptList",value:function(e){var t=this,n="".concat(this._n,".").concat("getReadReceiptList"),o=this._getGroupIDOfMessage(e[0]),s=this.getMyUserID(),a=e.filter((function(e){return e.from===s&&!0===e.needReadReceipt})).map((function(e){return{sequence:e.sequence}}));if(He.l("".concat(n," groupID:").concat(o," sequenceList:").concat(JSON.stringify(a))),0===a.length)return Ni({messageList:e});var r=new li("getReadReceiptList");return r.setMessage("groupID:".concat(o)),this.request({protocolName:gs,requestData:{groupID:o,sequenceList:a}}).then((function(t){r.end(),He.l("".concat(n," ok"));var o=t.data.readReceiptList;return it(o)&&o.forEach((function(t){e.forEach((function(e){0===t.code&&t.sequence===e.sequence&&(e.readReceiptInfo.readCount=t.readCount,e.readReceiptInfo.unreadCount=t.unreadCount)}))})),Li({messageList:e})})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];r.setError(e,o,s).end()})),He.w("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"sendReadReceipt",value:function(e){var t=this,n="".concat(this._n,".").concat("sendReadReceipt"),o=this._getGroupIDOfMessage(e[0]),s=new li("sendReadReceipt");s.setMessage("groupID:".concat(o));var a=this.getMyUserID(),r=e.filter((function(e){return e.from!==a&&!0===e.needReadReceipt})).map((function(e){return{sequence:e.sequence}}));return 0===r.length?Oi({code:Ua}):(He.l("".concat(n,". sequenceList:").concat(JSON.stringify(r))),this.request({protocolName:hs,requestData:{groupID:o,sequenceList:r}}).then((function(e){return s.end(),He.l("".concat(n," ok")),Li()})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],a=n[1];s.setError(e,o,a).end()})),He.w("".concat(n," failed. error:"),e),Oi(e)})))}},{key:"getReadReceiptDetail",value:function(e){var t=this,n=e.message,o=e.filter,s=e.cursor,a=e.count,r=this._getGroupIDOfMessage(n),i=n.ID,u=n.sequence,c="".concat(this._n,".").concat("getReadReceiptDetail"),l=this._receiptDetailCompleteMap.get(i)||!1,p=0!==o&&1!==o?0:o,d=st(s)?s:"",g=!ot(a)||a<=0||a>=100?100:a,h="groupID:".concat(r," sequence:").concat(u," cursor:").concat(d," filter:").concat(p," completeFlag:").concat(l);He.l("".concat(c," ").concat(h));var _={cursor:"",isCompleted:!1,messageID:i,unreadUserIDList:[],readUserIDList:[]},f=new li("getReadReceiptDetail");return f.setMessage(h),this.request({protocolName:fs,requestData:{groupID:r,sequence:u,flag:p,cursor:d,count:g}}).then((function(e){f.end();var n=e.data,o=n.cursor,s=n.isCompleted,a=n.unreadUserIDList,r=n.readUserIDList;return _.cursor=o,1===s&&(_.isCompleted=!0,t._receiptDetailCompleteMap.set(i,!0)),0===p?_.readUserIDList=r.map((function(e){return e.userID})):1===p&&(_.unreadUserIDList=a.map((function(e){return e.userID}))),He.l("".concat(c," ok")),Li(_)})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];f.setError(e,o,s).end()})),He.w("".concat(c," failed. error:"),e),Oi(e)}))}},{key:"getRoamingMessagesHopping",value:function(e){var t=this,n="".concat(this._n,".getRoamingMessagesHopping"),o=new li("getGroupRoamingMessagesHopping"),s=e.groupID,a=e.count,r=e.sequence,i=e.direction,u=r;1===i&&(u=r+a-1);var c=void 0;At(s)&&(s=Kt(c=s));var l="".concat(c?"topicID:".concat(c):"groupID:".concat(s)," sequence:").concat(r," direction:").concat(i);return He.l("".concat(n," ").concat(l)),this.request({protocolName:ds,requestData:{groupID:s,topicID:c,count:a,sequence:u}}).then((function(s){var a=s.data,u=a.messageList,c=a.complete,p="complete:".concat(c," count:").concat(u?u.length:0);if(He.l("".concat(n," ok. ").concat(p)),o.setNetworkType(t.getNetworkType()).setMessage("".concat(l," ").concat(p)).end(),2===c||Zt(u)){var d=t._computeResult();return Li(d)}var g="".concat(S.CONV_GROUP).concat(e.groupID),h=t.getModule(Hn).onRoamingMessage(u,g,!1),_=t._computeResult({direction:i,sequence:r,remoteMessageList:u,processedMessageList:h});return Li(_)})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),i=n[0],u=n[1];o.setError(e,i,u).setMessage("groupID:".concat(s," sequence:").concat(r," count:").concat(a)).end()})),He.w("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"_computeResult",value:function(e){var t={messageList:[],isCompleted:!1,nextMessageSeq:""};if(ut(e))return t.isCompleted=!0,t;var n=e.direction,o=e.sequence,s=e.remoteMessageList,a=void 0===s?[]:s,r=e.processedMessageList,i=void 0===r?[]:r,u=a.length;return 1===n?(t.nextMessageSeq=a[0].sequence+1,i.forEach((function(e){e.sequence>=o&&t.messageList.push(e)})),0===t.messageList.length&&a[0].sequence<o&&(t.isCompleted=!0,t.nextMessageSeq=""),t):(t.nextMessageSeq=a[u-1].sequence-1,t.messageList=m(i),0===t.nextMessageSeq&&(t.isCompleted=!0,t.nextMessageSeq=""),t)}},{key:"setMessageRead",value:function(e){var t=this,n=e.conversationID,o=e.lastMessageSeq,s="".concat(this._n,".setMessageRead");He.l("".concat(s," conversationID:").concat(n," lastMessageSeq:").concat(o)),ot(o)||this.outputWarning("DoNotModifyLastSeq");var a=new li("setGroupMessageRead");a.setMessage("".concat(n,"-").concat(o));var r=n.replace(S.CONV_GROUP,""),i=void 0;return At(r)&&(r=Kt(i=r)),this.request({protocolName:ls,requestData:{groupID:r,topicID:i,messageReadSeq:o}}).then((function(){a.setNetworkType(t.getNetworkType()).end(),He.l("".concat(s," ok."));var e=t.getModule(Hn);e.updateIsReadAfterReadReport({conversationID:n,lastMessageSeq:o});var u=!0;if(!ut(i)){u=!1;var c=t.getModule(Bn).getLocalTopic(r,i);c&&c.updateSelfInfo({readedSequence:o})}return e.updateUnreadCount(n,u),Li()})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];a.setError(e,o,s).end()})),He.l("".concat(s," failed. error:"),e),Oi(e)}))}},{key:"_computeLastSequence",value:function(e){var t=e.groupID,n=e.topicID,o=void 0===n?void 0:n,s=e.sequence;return s>0?Promise.resolve(s):ut(o)||this.hasLocalGroup(t)?ut(o)?this.getGroupLastSequence(t):this.getTopicLastSequence({groupID:t,topicID:o}):Promise.resolve(0)}},{key:"getGroupLastSequence",value:function(e){var t=this,n="".concat(this._n,".").concat("getGroupLastSequence"),o=new li("getGroupLastSequence"),s=0,a="";if(this.hasLocalGroup(e)){var r=this.getLocalGroupProfile(e),i=r.lastMessage;if(i.lastSequence>0&&!1===i.onlineOnlyFlag)return s=i.lastSequence,a="got lastSequence:".concat(s," from local group profile[lastMessage.lastSequence]. groupID:").concat(e),He.l("".concat(n," ").concat(a)),o.setNetworkType(this.getNetworkType()).setMessage("".concat(a)).end(),Promise.resolve(s);if(r.nextMessageSeq>1)return s=r.nextMessageSeq-1,a="got lastSequence:".concat(s," from local group profile[nextMessageSeq]. groupID:").concat(e),He.l("".concat(n," ").concat(a)),o.setNetworkType(this.getNetworkType()).setMessage("".concat(a)).end(),Promise.resolve(s)}var u="GROUP".concat(e),c=this.getModule(Hn).getLocalConversation(u);if(c&&c.lastMessage.lastSequence&&!1===c.lastMessage.onlineOnlyFlag)return s=c.lastMessage.lastSequence,a="got lastSequence:".concat(s," from local conversation profile[lastMessage.lastSequence]. groupID:").concat(e),He.l("".concat(n," ").concat(a)),o.setNetworkType(this.getNetworkType()).setMessage("".concat(a)).end(),Promise.resolve(s);var l={groupIDList:[e],responseFilter:{groupBaseInfoFilter:["NextMsgSeq"]}};return this.getGroupProfileAdvance(l).then((function(r){var i=r.data.successGroupList;return Zt(i)?He.l("".concat(n," successGroupList is empty. groupID:").concat(e)):(s=i[0].nextMessageSeq-1,a="got lastSequence:".concat(s," from getGroupProfileAdvance. groupID:").concat(e),He.l("".concat(n," ").concat(a))),o.setNetworkType(t.getNetworkType()).setMessage("".concat(a)).end(),s})).catch((function(s){return t.probeNetwork().then((function(t){var n=v(t,2),a=n[0],r=n[1];o.setError(s,a,r).setMessage("get lastSequence failed from getGroupProfileAdvance. groupID:".concat(e)).end()})),He.w("".concat(n," failed. error:"),s),Oi(s)}))}},{key:"getTopicLastSequence",value:function(e){var t=this,n=e.groupID,o=e.topicID,s="".concat(this._n,".").concat("getTopicLastSequence"),a=new li("getTopicLastSequence"),r=0,i="",u=this.getModule(Bn);return u.hasLocalTopic(n,o)?(r=u.getLocalTopic(n,o).nextMessageSeq-1,i="get lastSequence:".concat(r," from local topic info[nextMessageSeq]. topicID:").concat(o),He.l("".concat(s," ").concat(i)),a.setNetworkType(this.getNetworkType()).setMessage("".concat(i)).end(),Promise.resolve(r)):u.getTopicList({groupID:n,topicIDList:[o]}).then((function(e){var n=e.data.successTopicList;return Zt(n)?He.l("".concat(s," successTopicList is empty. topicID:").concat(o)):(r=n[0].nextMessageSeq-1,i="get lastSequence:".concat(r," from getTopicList. topicID:").concat(o),He.l("".concat(s," ").concat(i))),a.setNetworkType(t.getNetworkType()).setMessage("".concat(i)).end(),r})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),s=n[0],r=n[1];a.setError(e,s,r).setMessage("get lastSequence failed from getTopicList. topicID:".concat(o)).end()})),He.w("".concat(s," failed. error:"),e),Oi(e)}))}},{key:"isMessageFromOrToAVChatroom",value:function(e){return!!this._AVChatRoomHandler&&this._AVChatRoomHandler.checkJoinedAVChatRoomByID(e)}},{key:"hasJoinedAVChatRoom",value:function(){return this._AVChatRoomHandler?this._AVChatRoomHandler.hasJoinedAVChatRoom():0}},{key:"getJoinedAVChatRoom",value:function(){return this._AVChatRoomHandler?this._AVChatRoomHandler.getJoinedAVChatRoom():[]}},{key:"isOnlineMessage",value:function(e,t){return!(!this._canIUseOnlineOnlyFlag(e)||!t||!0!==t.onlineUserOnly)}},{key:"_canIUseOnlineOnlyFlag",value:function(e){var t=this.getJoinedAVChatRoom();return!t||!t.includes(e.to)||e.conversationType!==S.CONV_GROUP}},{key:"_onAVChatRoomHistoryMessage",value:function(e){if(!Zt(e)){He.l("".concat(this._n,"._onAVChatRoomHistoryMessage count:").concat(e.length));var n=[];e.forEach((function(e){n.push(t(t({},e),{},{isHistoryMessage:1}))})),this.onAVChatRoomMessage(n)}}},{key:"onAVChatRoomMessage",value:function(e){this._AVChatRoomHandler&&this._AVChatRoomHandler.onMessage(e)}},{key:"onAVChatRoomMemberBanned",value:function(e){this._AVChatRoomHandler&&this._AVChatRoomHandler.onAVChatRoomMemberBanned(e)}},{key:"getGroupSimplifiedInfo",value:function(e){var t=this,n=new li("getGroupSimplifiedInfo"),o={groupIDList:[e],responseFilter:{groupBaseInfoFilter:["Type","Name"]}};return this.getGroupProfileAdvance(o).then((function(o){var s=o.data.successGroupList;return n.setNetworkType(t.getNetworkType()).setMessage("groupID:".concat(e," type:").concat(s[0].type)).end(),s[0]})).catch((function(o){t.probeNetwork().then((function(t){var s=v(t,2),a=s[0],r=s[1];n.setError(o,a,r).setMessage("groupID:".concat(e)).end()}))}))}},{key:"setUnjoinedAVChatRoom",value:function(e){this._unjoinedAVChatRoomList.set(e,1)}},{key:"deleteUnjoinedAVChatRoom",value:function(e){this._unjoinedAVChatRoomList.has(e)&&this._unjoinedAVChatRoomList.delete(e)}},{key:"isUnjoinedAVChatRoom",value:function(e){return this._unjoinedAVChatRoomList.has(e)}},{key:"isGroupAttributesUpdatedNotice",value:function(e){return this._groupAttributesHandler.isGroupAttributesUpdatedNotice(e)}},{key:"updateLocalMainSequenceOnReconnected",value:function(){this._groupAttributesHandler.updateLocalMainSequenceOnReconnected()}},{key:"initGroupAttributes",value:function(e){return this._groupAttributesHandler.initGroupAttributes(e)}},{key:"setGroupAttributes",value:function(e){return this._groupAttributesHandler.setGroupAttributes(e)}},{key:"deleteGroupAttributes",value:function(e){return this._groupAttributesHandler.deleteGroupAttributes(e)}},{key:"getGroupAttributes",value:function(e){return this._groupAttributesHandler.getGroupAttributes(e)}},{key:"isMessageFromTopic",value:function(e,t){return 2===e&&!Zt(t)}},{key:"isMessageFromCommunityOfTopic",value:function(e,t){return 2===e&&Zt(t)}},{key:"getMessageExtensions",value:function(e,t){return He.l("".concat(this._n,".getMessageExtensions startSequence:").concat(t)),this.request({protocolName:Rs,requestData:{groupID:e.to,messageSequence:e.sequence,startSequence:t}})}},{key:"modifyMessageExtensions",value:function(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:1;return He.l("".concat(this._n,".modifyMessageExtensions operateType:").concat(n)),this.request({protocolName:As,requestData:{groupID:e.to,messageSequence:e.sequence,extensionList:t,operateType:n}})}},{key:"getGroupNotify",value:function(e){var n=this;if(this.hasLocalGroup(e)){var o=this.getLocalGroupProfile(e),s=o.type,a=o.isSupportTopic;if(!Lt(s)&&!a){var r="".concat(this._n,".getGroupNotify"),i=this._getGroupLastRevokedTime(e),u=1e3*we();He.l("".concat(r," groupID:").concat(e," type:").concat(s," beginTime:").concat(i," endTime:").concat(u)),this.request({protocolName:Ns,requestData:{type:Et({type:s,groupID:e})?S.GRP_COMMUNITY:void 0,groupID:e,beginTime:i,endTime:u}}).then((function(o){var s=o.data,a=s.nextRevokedTime,i=s.notifyList;He.l("".concat(r," ok. groupID:").concat(e," nextRevokedTime:").concat(a));var u={dataList:[{elements:{revokedInfos:[]}}]};it(i)&&i.forEach((function(n){u.dataList[0].elements.revokedInfos.push({groupID:e,sequence:n.sequence,random:n.random,revokerInfo:t({},n.revokerInfo)})})),n.onGroupMessageRevoked(u),0!==a?(n._setGroupLastRevokedTime(e,a),n.getGroupNotify(e)):n._setGroupLastRevokedTime(e,1e3*we())})).catch((function(e){He.e("".concat(r," failed. error:"),e)}))}}}},{key:"_getGroupLastRevokedTime",value:function(e){return this.hasLocalGroup(e)?this.getLocalGroupProfile(e)._lastRevokedTime:0}},{key:"_setGroupLastRevokedTime",value:function(e,t){this.hasLocalGroup(e)&&(this.getLocalGroupProfile(e)._lastRevokedTime=t)}},{key:"isGroupCountersNotice",value:function(e){return this._groupCountersHandler.isGroupCountersNotice(e)}},{key:"setGroupCounters",value:function(e){return this._groupCountersHandler.setGroupCounters(e)}},{key:"increaseGroupCounter",value:function(e){return this._groupCountersHandler.increaseGroupCounter(e)}},{key:"decreaseGroupCounter",value:function(e){return this._groupCountersHandler.decreaseGroupCounter(e)}},{key:"getGroupCounters",value:function(e){return this._groupCountersHandler.getGroupCounters(e)}},{key:"restartPolling",value:function(){this._AVChatRoomHandler&&this._AVChatRoomHandler.restartPolling()}},{key:"_canIUseJoinOption",value:function(e){return function(e){return e===S.GRP_PUBLIC}(e)||Et({type:e})}},{key:"reset",value:function(){this.groupMap.clear(),this._unjoinedAVChatRoomList.clear(),this._receiptDetailCompleteMap.clear(),this._commonGroupHandler.reset(),this._groupSystemNoticeHandler.reset(),this._groupTipsHandler.reset(),this._groupAttributesHandler.reset(),this._groupCountersHandler.reset(),this._AVChatRoomHandler&&this._AVChatRoomHandler.reset()}}]),s}(po),Iu=function(){function e(t){o(this,e),this.userID="",this.avatar="",this.nick="",this.role="",this.joinTime="",this.lastSendMsgTime="",this.nameCard="",this.muteUntil=0,this.memberCustomField=[],this._initMember(t)}return a(e,[{key:"_initMember",value:function(e){this.updateMember(e)}},{key:"updateMember",value:function(e){var t=[null,void 0,"",0,NaN];e.memberCustomField&&St(this.memberCustomField,e.memberCustomField),ft(this,e,["memberCustomField","marks"],t)}},{key:"updateRole",value:function(e){["Owner","Admin","Member"].indexOf(e)<0||(this.role=e)}},{key:"updateMuteUntil",value:function(e){ut(e)||(this.muteUntil=Math.floor((Date.now()+1e3*e)/1e3))}},{key:"updateNameCard",value:function(e){ut(e)||(this.nameCard=e)}},{key:"updateMemberCustomField",value:function(e){e&&St(this.memberCustomField,e)}}]),e}(),Cu=function(e){i(s,e);var n=f(s);function s(e){var t;return o(this,s),(t=n.call(this,e))._n="GroupMemberModule",t.groupMemberListMap=new Map,t.getInnerEmitterInstance().on(wi,t._onProfileUpdated,h(t)),t}return a(s,[{key:"_onProfileUpdated",value:function(e){for(var t=this,n=e.data,o=function(e){var o=n[e];t.groupMemberListMap.forEach((function(e){e.has(o.userID)&&e.get(o.userID).updateMember({nick:o.nick,avatar:o.avatar})}))},s=0;s<n.length;s++)o(s)}},{key:"deleteGroupMemberList",value:function(e){this.groupMemberListMap.delete(e)}},{key:"getGroupMemberList",value:function(e){var t=this,n=e.groupID,o=e.offset,s=void 0===o?0:o,a=e.count,r=void 0===a?15:a,i=e.filter,u=void 0===i?void 0:i,c="".concat(this._n,".").concat("getGroupMemberList"),l=this.getModule(Fn),p=l.hasLocalGroup(n);if(He.l("".concat(c," groupID:").concat(n," offset:").concat(s," count:").concat(r," hasLocalGroup:").concat(p)),!p)return Ni({memberList:[],offset:0});if(l.getLocalGroupProfile(n).type===S.GRP_AVCHATROOM){if(this.canIUse(B.AVCHATROOM_MBR_LIST))return this._getAVChatRoomMemberList({groupID:n,offset:s,filter:u});this.outputWarning("LiveOnlineMember")}var d=new li("getGroupMemberList"),g=0,h={groupID:n,limit:r>100?100:r};Et({groupID:n})?h.next="".concat(s):(h.offset=s,g=s+r);var _=[];return this.request({protocolName:Ps,requestData:h}).then((function(e){var o=e.data,s=o.members,a=o.memberNum,r=o.next,i=void 0===r?void 0:r;if(ut(i)||(g=Zt(i)?0:i),!it(s)||0===s.length)return g=0,Promise.resolve([]);var u=t.getModule(Fn);return u.hasLocalGroup(n)&&(u.getLocalGroupProfile(n).memberNum=a),_=t._updateLocalGroupMemberMap(n,s),t.getModule(wn).getUserProfile({userIDList:s.map((function(e){return e.userID})),tagList:[We.NICK,We.AVATAR]})})).then((function(e){var o=e.data;if(!it(o)||0===o.length)return Ni({memberList:[],offset:g});var a=o.map((function(e){return{userID:e.userID,nick:e.nick,avatar:e.avatar}}));return t._updateLocalGroupMemberMap(n,a),_.length<r&&(g=0),d.setNetworkType(t.getNetworkType()).setMessage("groupID:".concat(n," offset:").concat(s," count:").concat(r)).end(),He.l("".concat(c," ok.")),Li({memberList:_,offset:g})})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];d.setError(e,o,s).end()})),He.e("".concat(c," failed. error:"),e),Oi(e)}))}},{key:"_getAVChatRoomMemberList",value:function(e){var t=this,n=e.groupID,o=e.offset,s=e.filter,a="".concat(this._n,".").concat("_getAVChatRoomMemberList"),r=new li("_getAVChatRoomMemberList");return r.setMessage("groupID:".concat(n," offset:").concat(o," filter:").concat(s)),this.request({protocolName:Us,requestData:{groupID:n,offset:o,filter:s}}).then((function(e){var o=e.data,s=o.memberList,i=void 0===s?[]:s,u=o.offset,c=void 0===u?0:u;r.setNetworkType(t.getNetworkType()).end(),He.l("".concat(a," ok. member count:").concat(i.length,", next request timestamp:").concat(c));var l=t._updateLocalGroupMemberMap(n,i);return Li({memberList:l,offset:c})})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];r.setError(e,o,s).end()})),He.e("".concat(a," failed. error:"),e),Oi(e)}))}},{key:"getGroupMemberProfile",value:function(e){var n=this,o="".concat(this._n,".").concat("getGroupMemberProfile"),s=new li("getGroupMemberProfile");s.setMessage(e.userIDList.length>5?"userIDList.length:".concat(e.userIDList.length):"userIDList:".concat(e.userIDList)),He.l("".concat(o," groupID:").concat(e.groupID," userIDList:").concat(e.userIDList.join(","))),e.userIDList.length>50&&(e.userIDList=e.userIDList.slice(0,50));var a=e.groupID,r=e.userIDList;return this._getGroupMemberProfileAdvance(t(t({},e),{},{userIDList:r})).then((function(e){var t=e.data.members;return it(t)&&0!==t.length?(n._updateLocalGroupMemberMap(a,t),n.getModule(wn).getUserProfile({userIDList:t.map((function(e){return e.userID})),tagList:[We.NICK,We.AVATAR]})):Ni([])})).then((function(e){var t=e.data.map((function(e){return{userID:e.userID,nick:e.nick,avatar:e.avatar}}));n._updateLocalGroupMemberMap(a,t);var o=r.filter((function(e){return n.hasLocalGroupMember(a,e)})).map((function(e){return n.getLocalGroupMemberInfo(a,e)}));return s.setNetworkType(n.getNetworkType()).end(),Li({memberList:o})}))}},{key:"addGroupMember",value:function(e){var t=this,n="".concat(this._n,".").concat("addGroupMember"),o=e.groupID,s=this.getModule(Fn).getLocalGroupProfile(o),a=s.type,r=new li("addGroupMember");if(r.setMessage("groupID:".concat(o," groupType:").concat(a)),Lt(a)){var i=new Ei({code:fr});return r.setError(i,!0,this.getNetworkType()).end(),Oi(i)}return e.userIDList=e.userIDList.map((function(e){return{userID:e}})),He.l("".concat(n," groupID:").concat(o)),this.request({protocolName:ws,requestData:e}).then((function(o){var a=o.data.members;He.l("".concat(n," ok"));var i=a.filter((function(e){return 1===e.result})).map((function(e){return e.userID})),u=a.filter((function(e){return 0===e.result})).map((function(e){return e.userID})),c=a.filter((function(e){return 2===e.result})).map((function(e){return e.userID})),l=a.filter((function(e){return 4===e.result})).map((function(e){return e.userID})),p="groupID:".concat(e.groupID,", ")+"successUserIDList:".concat(i,", ")+"failureUserIDList:".concat(u,", ")+"existedUserIDList:".concat(c,", ")+"overLimitUserIDList:".concat(l);return r.setNetworkType(t.getNetworkType()).setMoreMessage(p).end(),0===i.length?Li({successUserIDList:i,failureUserIDList:u,existedUserIDList:c,overLimitUserIDList:l}):(s.memberCount+=i.length,t._updateConversationGroupProfile(s),Li({successUserIDList:i,failureUserIDList:u,existedUserIDList:c,overLimitUserIDList:l,group:s}))})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];r.setError(e,o,s).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"deleteGroupMember",value:function(e){var t=this,n="".concat(this._n,".").concat("deleteGroupMember"),o=e.groupID,s=e.userIDList,a=this.getModule(Fn).getLocalGroupProfile(o);if(ut(a))return Oi({code:lr});if(Lt(a.type))return this.canIUse(B.AVCHATROOM_BAN_MBR)?this._banAVChatRoomMember(e):Oi({code:Kr});var r=new li("deleteGroupMember"),i="groupID:".concat(o," ").concat(s.length>5?"userIDList.length:".concat(s.length):"userIDList:".concat(s));return r.setMessage(i),He.l("".concat(n," groupID:").concat(o," userIDList:"),s),this.request({protocolName:qs,requestData:e}).then((function(){return r.setNetworkType(t.getNetworkType()).end(),He.l("".concat(n," ok")),a.memberCount-=1,t._updateConversationGroupProfile(a),t.deleteLocalGroupMembers(o,s),Li({group:a,userIDList:s})})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];r.setError(e,o,s).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"_updateConversationGroupProfile",value:function(e){this.getModule(Hn).updateConversationGroupProfile([e])}},{key:"_banAVChatRoomMember",value:function(e){var t=this,n="".concat(this._n,".").concat("deleteGroupMember"),o=e.groupID,s=e.userIDList,a="groupID:".concat(o," ").concat(s.length>5?"userIDList.length:".concat(s.length):"userIDList:".concat(s)),r=new li("deleteGroupMember");r.setMessage(a),He.l("".concat(n," groupID:").concat(o," userIDList:"),s);var i=this.getModule(Fn).getLocalGroupProfile(o);return ut(e.duration)||0===e.duration?Oi({code:Tr}):this.request({protocolName:Fs,requestData:e}).then((function(){return r.setNetworkType(t.getNetworkType()).end(),He.l("".concat(n," ok")),t.deleteLocalGroupMembers(o,s),Li({group:i,userIDList:s})})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];r.setError(e,o,s).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"setGroupMemberMuteTime",value:function(e){var t=this,n=e.groupID,o=e.userID,s=e.muteTime,a="".concat(this._n,".").concat("setGroupMemberMuteTime");if(o===this.getMyUserID())return Oi(new Ei({code:Cr}));He.l("".concat(a," groupID:").concat(n," userID:").concat(o));var r=new li("setGroupMemberMuteTime");return r.setMessage("groupID:".concat(n," userID:").concat(o," muteTime:").concat(s)),this.modifyGroupMemberInfo({groupID:n,userID:o,muteTime:s}).then((function(e){r.setNetworkType(t.getNetworkType()).end(),He.l("".concat(a," ok"));var o=t.getModule(Fn);return Li({group:o.getLocalGroupProfile(n),member:e})})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];r.setError(e,o,s).end()})),He.e("".concat(a," failed. error:"),e),Oi(e)}))}},{key:"setGroupMemberRole",value:function(e){var t=this,n="".concat(this._n,".").concat("setGroupMemberRole"),o=e.groupID,s=e.userID,a=e.role,r=this.getModule(Fn).getLocalGroupProfile(o);if(r.selfInfo.role!==S.GRP_MBR_ROLE_OWNER)return Oi({code:mr});if([S.GRP_WORK,S.GRP_AVCHATROOM].includes(r.type))return Oi({code:Mr});var i=[S.GRP_MBR_ROLE_ADMIN,S.GRP_MBR_ROLE_MEMBER];if(Et({groupID:o})&&i.push(S.GRP_MBR_ROLE_CUSTOM),i.indexOf(a)<0)return Oi({code:yr});if(s===this.getMyUserID())return Oi({code:Ir});var u=new li("setGroupMemberRole");return u.setMessage("groupID:".concat(o," userID:").concat(s," role:").concat(a)),He.l("".concat(n," groupID:").concat(o," userID:").concat(s)),this.modifyGroupMemberInfo({groupID:o,userID:s,role:a}).then((function(e){return u.setNetworkType(t.getNetworkType()).end(),He.l("".concat(n," ok")),Li({group:r,member:e})})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];u.setError(e,o,s).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"_filterProfanity",value:function(e,t){var n=this.getModule(io);if(!n)return!0;var o=n.filterText(t[e],J),s=o.isAllowedToSend,a=o.modifiedText;return!0===s&&(t[e]=a,!0)}},{key:"setGroupMemberNameCard",value:function(e){var t=this,n="".concat(this._n,".").concat("setGroupMemberNameCard");if(e.nameCard&&!1===this._filterProfanity("nameCard",e))return Oi({code:Wr});var o=e.groupID,s=e.userID,a=void 0===s?this.getMyUserID():s,r=e.nameCard;He.l("".concat(n," groupID:").concat(o," userID:").concat(a));var i=new li("setGroupMemberNameCard");return i.setMessage("groupID:".concat(o," userID:").concat(a," nameCard:").concat(r)),this.modifyGroupMemberInfo({groupID:o,userID:a,nameCard:r}).then((function(e){He.l("".concat(n," ok")),i.setNetworkType(t.getNetworkType()).end();var s=t.getModule(Fn).getLocalGroupProfile(o);return a===t.getMyUserID()&&s&&s.setSelfNameCard(r),Li({group:s,member:e})})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];i.setError(e,o,s).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"setGroupMemberCustomField",value:function(e){var t=this,n="".concat(this._n,".").concat("setGroupMemberCustomField"),o=e.groupID,s=e.userID,a=void 0===s?this.getMyUserID():s,r=e.memberCustomField;He.l("".concat(n," groupID:").concat(o," userID:").concat(a));var i=new li("setGroupMemberCustomField");return i.setMessage("groupID:".concat(o," userID:").concat(a," memberCustomField:").concat(JSON.stringify(r))),this.modifyGroupMemberInfo({groupID:o,userID:a,memberCustomField:r}).then((function(e){i.setNetworkType(t.getNetworkType()).end(),He.l("".concat(n," ok"));var s=t.getModule(Fn).getLocalGroupProfile(o);return Li({group:s,member:e})})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];i.setError(e,o,s).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"modifyGroupMemberInfo",value:function(e){var n=this,o=e.groupID,s=e.userID,a=void 0;return At(o)&&(o=Kt(a=o)),this.request({protocolName:xs,requestData:t(t({},e),{},{groupID:o,topicID:a})}).then((function(){if(n.hasLocalGroupMember(o,s)){var t=n.getLocalGroupMemberInfo(o,s);return ut(e.muteTime)||t.updateMuteUntil(e.muteTime),ut(e.role)||t.updateRole(e.role),ut(e.nameCard)||t.updateNameCard(e.nameCard),ut(e.memberCustomField)||t.updateMemberCustomField(e.memberCustomField),t}return n.getGroupMemberProfile({groupID:o,userIDList:[s]}).then((function(e){return v(e.data.memberList,1)[0]}))}))}},{key:"markGroupMemberList",value:function(e){var t=this,n="".concat(this._n,".").concat("markGroupMemberList"),o=e.groupID,s=e.markType,a=e.enableMark,r=e.userIDList,i=void 0===r?[]:r,u="groupID:".concat(o," markType:").concat(s," enableMark:").concat(a," userIDList count: ").concat(i.length);He.l("".concat(n," ").concat(u));var c=2,l=[];!0===a&&(c=1);var p=m(i);i.length>500&&(p=i.slice(0,500),He.w("".concat(n," ").concat(Jt(500)))),p.forEach((function(e){l.push({userID:e,markType:[s]})})),p=null;var d=new li("markGroupMemberList");return d.setMessage("".concat(u)),this.request({protocolName:Vs,requestData:{groupID:o,operationType:c,memberList:l}}).then((function(e){var o=e.data.memberList,s=void 0===o?[]:o,a=[],r=[];s.length===i.length?a.push.apply(a,m(i)):(s.forEach((function(e){a.push(e.userID)})),i.forEach((function(e){a.includes(e)||r.push(e)})));var u="success count:".concat(a.length," fail count:").concat(r.length);return d.setNetworkType(t.getNetworkType()).setMessage(u).end(),He.l("".concat(n," ok. ").concat(u)),Li({successUserIDList:a,failureUserIDList:r})})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];d.setError(e,o,s).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"_getGroupMemberProfileAdvance",value:function(e){return this.request({protocolName:bs,requestData:t(t({},e),{},{memberInfoFilter:e.memberInfoFilter?e.memberInfoFilter:["Role","JoinTime","NameCard","ShutUpUntil"]})})}},{key:"_updateLocalGroupMemberMap",value:function(e,t){var n=this;return it(t)&&0!==t.length?t.map((function(t){return n.hasLocalGroupMember(e,t.userID)?n.getLocalGroupMemberInfo(e,t.userID).updateMember(t):n.setLocalGroupMember(e,new Iu(t)),n.getLocalGroupMemberInfo(e,t.userID)})):[]}},{key:"deleteLocalGroupMembers",value:function(e,t){var n=this.groupMemberListMap.get(e);n&&t.forEach((function(e){n.delete(e)}))}},{key:"getLocalGroupMemberInfo",value:function(e,t){return this.groupMemberListMap.has(e)?this.groupMemberListMap.get(e).get(t):null}},{key:"setLocalGroupMember",value:function(e,t){if(this.groupMemberListMap.has(e))this.groupMemberListMap.get(e).set(t.userID,t);else{var n=(new Map).set(t.userID,t);this.groupMemberListMap.set(e,n)}}},{key:"getLocalGroupMemberList",value:function(e){return this.groupMemberListMap.get(e)}},{key:"hasLocalGroupMember",value:function(e,t){return this.groupMemberListMap.has(e)&&this.groupMemberListMap.get(e).has(t)}},{key:"hasLocalGroupMemberMap",value:function(e){return this.groupMemberListMap.has(e)}},{key:"reset",value:function(){this.groupMemberListMap.clear()}}]),s}(po),Tu=["topicID","topicName","avatar","introduction","notification","unreadCount","muteAllMembers","customData","groupAtInfoList","nextMessageSeq","selfInfo"],Du=function(e,t){return Zt(e)?{lastTime:0,lastSequence:0,fromAccount:"",payload:null,type:"",messageForShow:"",nick:"",version:0,cloudCustomData:"",isRevoked:!1,revoker:null}:{lastTime:e.time||0,lastSequence:e.sequence||0,fromAccount:e.from||"",payload:e.payload||null,type:e.type||"",messageForShow:Wt(e.type,e.payload,t),nick:e.nick||"",version:e.version||0,cloudCustomData:e.cloudCustomData||"",isRevoked:e.isRevoked||!1,revoker:e.revoker||null}},ku=function(){function e(t,n){o(this,e),this.topicID="",this.topicName="",this.avatar="",this.introduction="",this.notification="",this.unreadCount=0,this.muteAllMembers=!1,this.customData="",this.groupAtInfoList=[],this.nextMessageSeq=0,this.lastMessage=Du(t.lastMessage,n),this.selfInfo={muteTime:0,readedSequence:0,messageRemindType:"",excludedUnreadSequenceList:void 0},this._initTopic(t)}return a(e,[{key:"_initTopic",value:function(e){for(var t in e)Tu.indexOf(t)<0||("selfInfo"===t?this.updateSelfInfo(e[t]):this[t]="muteAllMembers"===t?1===e[t]:e[t])}},{key:"updateUnreadCount",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:0;this.unreadCount=e}},{key:"updateNextMessageSeq",value:function(e){this.nextMessageSeq=e}},{key:"updateLastMessage",value:function(e){this.lastMessage=Du(e)}},{key:"updateGroupAtInfoList",value:function(e){this.groupAtInfoList=JSON.parse(JSON.stringify(e))}},{key:"updateTopic",value:function(e){ut(e.selfInfo)||this.updateSelfInfo(e.selfInfo),ut(e.muteAllMembers)||(this.muteAllMembers=1===e.muteAllMembers),ft(this,e,["groupID","lastMessageTime","selfInfo","muteAllMembers","lastMsg"])}},{key:"updateSelfInfo",value:function(e){return 0!==ft(this.selfInfo,e,[],[""])}},{key:"reduceUnreadCount",value:function(){return this.unreadCount>=1&&(this.unreadCount-=1,!0)}},{key:"isLastMessageRevoked",value:function(e){return e.sequence===this.lastMessage.lastSequence}},{key:"setLastMessageRevoked",value:function(e){this.lastMessage.isRevoked=e}},{key:"setLastMessageRevoker",value:function(e){this.lastMessage.revoker=e}}]),e}(),Su=function(e){i(s,e);var n=f(s);function s(e){var t;return o(this,s),(t=n.call(this,e))._n="TopicModule",t._topicMap=new Map,t._getTopicTimeMap=new Map,t.TOPIC_CACHE_TIME=300,t.TOPIC_LAST_ACTIVE_TIME=3600,t.getInnerEmitterInstance().on(bi,t._onCloudConfigUpdated,h(t)),t}return a(s,[{key:"_onCloudConfigUpdated",value:function(){var e=this.getCloudConfig("topic_cache_time"),t=this.getCloudConfig("topic_last_active_time");ut(e)||(this.TOPIC_CACHE_TIME=Number(e)),ut(t)||(this.TOPIC_LAST_ACTIVE_TIME=Number(t))}},{key:"onTopicCreated",value:function(e){var t=e.groupID;this.resetGetTopicTime(t),this.emitOuterEvent(k.TOPIC_CREATED,e)}},{key:"onTopicDeleted",value:function(e){var t=this,n=e.groupID,o=e.topicIDList;(void 0===o?[]:o).forEach((function(e){t._deleteLocalTopic(n,e)})),this.emitOuterEvent(k.TOPIC_DELETED,e)}},{key:"onTopicMessageRemindTypeUpdated",value:function(e){var t=e.groupID,n=e.topicID,o=e.messageRemindType,s=this.getLocalTopic(t,n);if(s){var a=s.updateSelfInfo({messageRemindType:o});a&&this.emitOuterEvent(k.TOPIC_UPDATED,{groupID:t,topic:s}),He.d("".concat(this._n,".onTopicMessageRemindTypeUpdated topicID:").concat(n)+" messageRemindType:".concat(o," isTopicUpdated:").concat(a))}}},{key:"onTopicProfileUpdated",value:function(e){var t=e.groupID,n=e.topicID,o=this.getLocalTopic(t,n);o&&(o.updateTopic(e),this.emitOuterEvent(k.TOPIC_UPDATED,{groupID:t,topic:o}))}},{key:"onConversationProxy",value:function(e){var t=e.topicID,n=e.unreadCount,o=e.groupAtInfoList,s=Kt(t),a=this.getLocalTopic(s,t),r=!1;a&&(ut(n)||a.unreadCount===n||(a.updateUnreadCount(n),r=!0),ut(o)||(a.updateGroupAtInfoList(o),r=!0)),r&&this.emitOuterEvent(k.TOPIC_UPDATED,{groupID:s,topic:a})}},{key:"onMessageSent",value:function(e){var t=e.groupID,n=e.topicID,o=e.lastMessage,s=this.getLocalTopic(t,n);s&&(s.nextMessageSeq+=1,s.updateLastMessage(o),this.emitOuterEvent(k.TOPIC_UPDATED,{groupID:t,topic:s}))}},{key:"onMessageModified",value:function(e){var t=e.to,n=e.time,o=e.sequence,s=e.elements,a=e.cloudCustomData,r=e.messageVersion,i=Kt(t),u=this.getLocalTopic(i,t);if(u){var c=u.lastMessage;He.d("".concat(this._n,".onMessageModified topicID:").concat(t," lastMessage:"),JSON.stringify(c),"options:",JSON.stringify(e)),c&&(null===c.payload||c.lastTime===n&&c.lastSequence===o&&c.version!==r)&&(c.type=s[0].type,c.payload=s[0].content,c.messageForShow=Wt(c.type,c.payload,this.isIntl()),c.cloudCustomData=a,c.version=r,c.lastSequence=o,c.lastTime=n,this.emitOuterEvent(k.TOPIC_UPDATED,{groupID:i,topic:u}))}}},{key:"onMessageRevoked",value:function(e){var t=this;if(0!==e.length){var n=null,o=null,s=!1;e.forEach((function(e){var a=e.to;o=Kt(a),(n=t.getLocalTopic(o,a))&&(n.reduceUnreadCount()&&(s=!0),n.isLastMessageRevoked(e)&&(n.setLastMessageRevoked(!0),n.setLastMessageRevoker(e.revoker),s=!0))})),s&&this.emitOuterEvent(k.TOPIC_UPDATED,{groupID:o,topic:n})}}},{key:"isLastMessageRevoked",value:function(e){var t=e.topicID,n=e.sequence,o=Kt(t),s=this.getLocalTopic(o,t),a=!1;return s&&(a=s.isLastMessageRevoked({sequence:n})),a}},{key:"getJoinedCommunityList",value:function(){return this.getModule(Fn).getGroupList({isGroupWithTopicOnly:!0}).then((function(e){var t=e.data.groupList;return Li({groupList:void 0===t?[]:t})})).catch((function(e){return Oi(e)}))}},{key:"createTopicInCommunity",value:function(e){var n=this,o="".concat(this._n,".").concat("createTopicInCommunity"),s=e.topicID;if(!ut(s)&&!At(s))return Oi({code:Hr});if(e.topicName&&!1===this._filterProfanity("topicName",e))return Oi({code:Wr});if(e.introduction&&!1===this._filterProfanity("introduction",e))return Oi({code:Wr});if(e.notification&&!1===this._filterProfanity("notification",e))return Oi({code:Wr});var a=new li("createTopicInCommunity");return this.request({protocolName:sa,requestData:t({},e)}).then((function(s){var r=s.data.topicID;return a.setMessage("topicID:".concat(r)).setNetworkType(n.getNetworkType()).end(),He.l("".concat(o," ok")),n._updateTopicMap([t(t({},e),{},{topicID:r})]),Li({topicID:r})})).catch((function(e){return n.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];a.setError(e,o,s).end()})),He.e("".concat(o," failed. error:"),e),Oi(e)}))}},{key:"deleteTopicFromCommunity",value:function(e){var t=this,n="".concat(this._n,".").concat("deleteTopicFromCommunity"),o=e.groupID,s=e.topicIDList,a=void 0===s?[]:s,r=new li("deleteTopicFromCommunity");return r.setMessage("groupID:".concat(o," topicIDList:").concat(a)),this.request({protocolName:aa,requestData:{groupID:o,topicIDList:a}}).then((function(e){var n=e.data.resultList,s=[],a=[];(void 0===n?[]:n).forEach((function(e){var t=e.topicID,n=e.errorCode,o=e.errorInfo;0===n?s.push({topicID:t}):a.push({topicID:t,code:n,message:o})}));var i="success count:".concat(s.length,", fail count:").concat(a.length);return r.setMoreMessage("".concat(i)).setNetworkType(t.getNetworkType()).end(),He.l("".concat(i)),s.forEach((function(e){t._deleteLocalTopic(o,e.topicID)})),Li({successTopicList:s,failureTopicList:a})})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];r.setError(e,o,s).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"updateTopicProfile",value:function(e){var n=this,o="".concat(this._n,".").concat("updateTopicProfile");if(He.l("".concat(o," options:"),e),e.topicName&&!1===this._filterProfanity("topicName",e))return Oi({code:Wr});if(e.introduction&&!1===this._filterProfanity("introduction",e))return Oi({code:Wr});if(e.notification&&!1===this._filterProfanity("notification",e))return Oi({code:Wr});var s=new li("updateTopicProfile");return s.setMessage("groupID:".concat(e.groupID," topicID:").concat(e.topicID)),ut(e.muteAllMembers)||(e.muteAllMembers=!0===e.muteAllMembers?"On":"Off"),this.request({protocolName:ra,requestData:t({},e)}).then((function(){return s.setNetworkType(n.getNetworkType()).end(),He.l("".concat(o," ok")),n._updateTopicMap([e]),Li({topic:n.getLocalTopic(e.groupID,e.topicID)})})).catch((function(e){return n.probeNetwork().then((function(t){var n=v(t,2),o=n[0],a=n[1];s.setError(e,o,a).end()})),He.e("".concat(o," failed. error:"),e),Oi(e)}))}},{key:"getTopicList",value:function(e){var n=this,o="".concat(this._n,".").concat("getTopicList"),s=e.groupID,a=e.topicIDList,r=void 0===a?[]:a,i=0===r.length,u=new li("getTopicList");if(u.setMessage("groupID:".concat(s)),this._getTopicTimeMap.has(s)){var c=this._getTopicTimeMap.get(s),l=c.isGetAll,p=c.time;if((l||!l&&!i)&&Date.now()-p<1e3*this.TOPIC_CACHE_TIME){var d=this._getLocalTopicList(s,r);if(i||d.length===r.length)return u.setNetworkType(this.getNetworkType()).setMoreMessage("from cache, topic count:".concat(d.length)).end(),He.l("".concat(o," groupID:").concat(s," from cache, topic count:").concat(d.length)),Ni({successTopicList:d,failureTopicList:[]})}}return this.request({protocolName:ia,requestData:{groupID:s,topicIDList:r}}).then((function(e){var a=e.data.topicInfoList,r=[],c=[],l=[];(void 0===a?[]:a).forEach((function(e){var n=e.topic,o=e.selfInfo,s=e.errorCode,a=e.errorInfo,i=n.topicID;0===s?(r.push(t(t({},n),{},{selfInfo:o})),c.push(i)):l.push({topicID:i,code:s,message:a})})),n._updateTopicMap(r),n._handleTopicAtInfo(r);var p="success count:".concat(c.length,", fail count:").concat(l.length);u.setNetworkType(n.getNetworkType()).setMoreMessage("".concat(p)).end(),He.l("".concat(o," groupID:").concat(s," from remote, ").concat(p));var d=[];return Zt(c)||(n._getTopicTimeMap.set(s,{time:Date.now(),isGetAll:i}),d=n._getLocalTopicList(s,c)),Li({successTopicList:d,failureTopicList:l})})).catch((function(e){return n.probeNetwork(e).then((function(t){var n=v(t,2),o=n[0],s=n[1];u.setError(e,o,s).end()})),He.e("".concat(o," failed. error:"),e),Oi(e)}))}},{key:"hasLocalTopic",value:function(e,t){return!!this._topicMap.has(e)&&this._topicMap.get(e).has(t)}},{key:"getLocalTopic",value:function(e,t){var n=null;return this._topicMap.has(e)&&(n=this._topicMap.get(e).get(t)),n}},{key:"_getLocalTopicList",value:function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:[],n=this._topicMap.get(e),o=[];return n&&(o=m(n.values())),0===t.length?o:o.filter((function(e){return t.includes(e.topicID)}))}},{key:"_deleteLocalTopic",value:function(e,t){this._topicMap.has(e)&&(this._topicMap.get(e).delete(t),He.l("".concat(this._n,"._deleteLocalTopic groupID:").concat(e," topicID:").concat(t)))}},{key:"_updateTopicMap",value:function(e){var t=this,n=[];(e.forEach((function(e){var o=e.groupID,s=e.topicID,a=null;t._topicMap.has(o)||t._topicMap.set(o,new Map),t._topicMap.get(o).has(s)?(a=t._topicMap.get(o).get(s)).updateTopic(e):(t._getTopicLastMessage(e),a=new ku(e,t.isIntl()),t._topicMap.get(o).set(s,a));var r=t._computeUnreadCount(a);a.updateUnreadCount(r),n.push({conversationID:"".concat(S.CONV_GROUP).concat(s),type:S.CONV_TOPIC,unreadCount:r})})),n.length>0)&&this.getModule(Hn).updateTopicConversation(n)}},{key:"resetGetTopicTime",value:function(e){var t=this;ut(e)?m(this._getTopicTimeMap.keys()).forEach((function(e){t._getTopicTimeMap.set(e,0)})):this._getTopicTimeMap.set(e,0)}},{key:"getTopicListOnReconnected",value:function(){var e=this,t=m(this._topicMap.keys()),n=[];t.forEach((function(t){var o=[];e._getLocalTopicList(t).forEach((function(t){var n=t.lastMessage.lastTime,s=void 0===n?0:n;Date.now()-1e3*s<1e3*e.TOPIC_LAST_ACTIVE_TIME&&o.push(t.topicID)})),o.length>0&&n.push({groupID:t,topicIDList:o})})),He.l("".concat(this._n,".getTopicListOnReconnected. active community count:").concat(n.length)),this._relayGetTopicList(n)}},{key:"_relayGetTopicList",value:function(e){var t=this;if(0!==e.length){var n=e.shift(),o=n.topicIDList.length>5?"topicIDList.length:".concat(n.topicIDList.length):"topicIDList:".concat(n.topicIDList),s=new li("relayGetTopicList");s.setMessage(o),He.l("".concat(this._n,"._relayGetTopicList. ").concat(o)),this.getTopicList(n).then((function(){s.setNetworkType(t.getNetworkType()).end(),t._relayGetTopicList(e)})).catch((function(n){t.probeNetwork().then((function(e){var t=v(e,2),o=t[0],a=t[1];s.setError(n,o,a).end()})),t._relayGetTopicList(e)}))}}},{key:"_handleTopicAtInfo",value:function(e){var n=this;0!==e.length&&e.forEach((function(e){var o=e.groupID,s=e.topicID,a=e.groupAtInfoList,r=[];ut(a)||(a.forEach((function(e){r.push(t(t({},e),{},{groupID:o,topicID:s}))})),n.getModule(Hn).onNewGroupAtTips({dataList:r}))}))}},{key:"_getTopicLastMessage",value:function(e){if(!ut(e.lastMsg)){var t={time:e.lastMsg.time,sequence:e.lastMsg.sequence,from:e.lastMsg.from,payload:e.lastMsg.elements[0]?e.lastMsg.elements[0].content:null,type:e.lastMsg.elements[0]?e.lastMsg.elements[0].type:"",nick:e.lastMsg.nick,version:e.lastMsg.messageVersion,cloudCustomData:e.lastMsg.cloudCustomData,isRevoked:2===e.lastMsg.isPlaceMessage,revoker:Zt(e.lastMsg.revokerInfo)?null:e.lastMsg.revokerInfo.revoker};e.lastMessage=t}}},{key:"deleteTopicListInCommunity",value:function(e){var t=this,n=this._getLocalTopicList(e),o=this.getModule(Hn);n.forEach((function(n){var s=n.topicID;t._deleteLocalTopic(e,s),t._getTopicTimeMap.delete(e),o.deleteLocalConversation("".concat(S.CONV_GROUP).concat(s))}))}},{key:"_computeUnreadCount",value:function(e){var t=e.selfInfo,n=t.excludedUnreadSequenceList,o=t.readedSequence,s=e.nextMessageSeq-e.selfInfo.readedSequence-1;if(it(n)){var a=0;n.forEach((function(t){t>=o&&t<=e.nextMessageSeq-1&&(a+=1)})),a>=1&&(s-=a)}return s<0?0:s}},{key:"_filterProfanity",value:function(e,t){var n=this.getModule(io);if(!n)return!0;var o=n.filterText(t[e],z),s=o.isAllowedToSend,a=o.modifiedText;return!0===s&&(t[e]=a,!0)}},{key:"updateLastMessage",value:function(e,t){var n=Kt(e),o=this.getLocalTopic(n,e);if(o){var s=t.sequence+1;o.updateNextMessageSeq(s),o.updateLastMessage(t),this.emitOuterEvent(k.TOPIC_UPDATED,{groupID:n,topic:o})}}},{key:"getMessageExtensions",value:function(e,t){He.l("".concat(this._n,".getMessageExtensions startSequence:").concat(t));var n=Kt(e.to);return this.request({protocolName:Rs,requestData:{groupID:n,topicID:e.to,messageSequence:e.sequence,startSequence:t}})}},{key:"modifyMessageExtensions",value:function(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:1;He.l("".concat(this._n,".modifyMessageExtensions operateType:").concat(n));var o=Kt(e.to);return this.request({protocolName:As,requestData:{groupID:o,topicID:e.to,messageSequence:e.sequence,extensionList:t,operateType:n}})}},{key:"reset",value:function(){He.l("".concat(this._n,".reset")),this._topicMap.clear(),this._getTopicTimeMap.clear(),this.TOPIC_CACHE_TIME=300,this.TOPIC_LAST_ACTIVE_TIME=3600}}]),s}(po),Lu=function(){function e(t){o(this,e),this._userModule=t,this._n="ProfileHandler",this.TAG="profile",this.accountProfileMap=new Map,this.expirationTime=864e5}return a(e,[{key:"setExpirationTime",value:function(e){this.expirationTime=e}},{key:"getUserProfile",value:function(e){var t=this,n=e.userIDList;e.fromAccount=this._userModule.getMyAccount(),n.length>100&&(He.w("".concat(this._n,".getUserProfile ").concat(Jt(100))),n.length=100);for(var o,s=[],a=[],r=0,i=n.length;r<i;r++)o=n[r],this._userModule.isMyFriend(o)&&this._containsAccount(o)?a.push(this._getProfileFromMap(o)):s.push(o);if(0===s.length)return Ni(a);e.toAccount=s;var u=e.bFromGetMyProfile||!1,c=[];e.toAccount.forEach((function(e){c.push({toAccount:e,standardSequence:0,customSequence:0})})),e.userItem=c;var l=new li("getUserProfile");return l.setMessage(n.length>5?"userIDList.length:".concat(n.length):"userIDList:".concat(n)),this._userModule.request({protocolName:Io,requestData:e}).then((function(e){l.setNetworkType(t._userModule.getNetworkType()).end(),He.i("".concat(t._n,".getUserProfile ok"));var n=t._handleResponse(e).concat(a);return Li(u?n[0]:n)})).catch((function(e){return t._userModule.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];l.setError(e,o,s).end()})),He.e("".concat(t._n,".getUserProfile failed. error:"),e),Oi(e)}))}},{key:"getMyProfile",value:function(){var e=this._userModule.getMyAccount();if(He.l("".concat(this._n,".getMyProfile myAccount:").concat(e)),this._fillMap(),this._containsAccount(e)){var t=this._getProfileFromMap(e);return He.d("".concat(this._n,".getMyProfile from cache, myProfile:")+JSON.stringify(t)),Ni(t)}return this.getUserProfile({fromAccount:e,userIDList:[e],bFromGetMyProfile:!0})}},{key:"_handleResponse",value:function(e){for(var t,n,o=_t(),s=e.data.userProfileItem,a=[],r=0,i=s.length;r<i;r++)"@TLS#NOT_FOUND"!==s[r].to&&""!==s[r].to&&(t=s[r].to,n=this._updateMap(t,this._getLatestProfileFromResponse(t,s[r].profileItem)),a.push(n));return He.l("".concat(this._n,"._handleResponse cost ").concat(_t()-o," ms")),a}},{key:"_getLatestProfileFromResponse",value:function(e,t){var n={};if(n.userID=e,n.profileCustomField=[],!Zt(t))for(var o=0,s=t.length;o<s;o++)if(t[o].tag.indexOf("Tag_Profile_Custom")>-1)n.profileCustomField.push({key:t[o].tag,value:t[o].value});else switch(t[o].tag){case We.NICK:n.nick=t[o].value;break;case We.GENDER:n.gender=t[o].value;break;case We.BIRTHDAY:n.birthday=t[o].value;break;case We.LOCATION:n.location=t[o].value;break;case We.SELFSIGNATURE:n.selfSignature=t[o].value;break;case We.ALLOWTYPE:n.allowType=t[o].value;break;case We.LANGUAGE:n.language=t[o].value;break;case We.AVATAR:n.avatar=t[o].value;break;case We.MESSAGESETTINGS:n.messageSettings=t[o].value;break;case We.ADMINFORBIDTYPE:n.adminForbidType=t[o].value;break;case We.LEVEL:n.level=t[o].value;break;case We.ROLE:n.role=t[o].value;break;default:He.w("".concat(this._n,"._handleResponse unknown tag:"),t[o].tag,t[o].value)}return n}},{key:"updateMyProfile",value:function(e){var t=this,n="".concat(this._n,".updateMyProfile");if(e.nick&&!1===this._userModule.filterProfanity("nick",e))return Oi({code:Wr});if(e.selfSignature&&!1===this._userModule.filterProfanity("selfSignature",e))return Oi({code:Wr});var o=new li("updateMyProfile");o.setMessage(JSON.stringify(e));var s=(new Wi).validate(e);if(!s.valid)return o.setCode(Dr).setMoreMessage("updateMyProfile info:".concat(s.tips)).setNetworkType(this._userModule.getNetworkType()).end(),He.e("".concat(n," info:").concat(s.tips)),Oi({code:Dr});var a=[];for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&("profileCustomField"===r?e.profileCustomField.forEach((function(e){a.push({tag:e.key,value:e.value})})):a.push({tag:We[r.toUpperCase()],value:e[r]}));if(0===a.length){var i=new Ei({code:kr});return o.setError(i,!0,this._userModule.getNetworkType()).end(),He.e("".concat(n," failed. error:"),i),Oi(i)}return this._userModule.request({protocolName:Co,requestData:{fromAccount:this._userModule.getMyAccount(),profileItem:a}}).then((function(s){o.setNetworkType(t._userModule.getNetworkType()).end(),He.i("".concat(n," ok"));var a=t._updateMap(t._userModule.getMyAccount(),e);return t._userModule.emitOuterEvent(k.PROFILE_UPDATED,[a]),Ni(a)})).catch((function(e){return t._userModule.probeNetwork().then((function(t){var n=v(t,2),s=n[0],a=n[1];o.setError(e,s,a).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"onProfileModified",value:function(e){var t=e.dataList;if(!Zt(t)){var n,o,s=t.length;He.d("".concat(this._n,".onProfileModified count:").concat(s," dataList:"),e.dataList);for(var a=[],r=0;r<s;r++)n=t[r].userID,o=this._updateMap(n,this._getLatestProfileFromResponse(n,t[r].profileList)),a.push(o);a.length>0&&(this._userModule.emitInnerEvent(wi,a),this._userModule.emitOuterEvent(k.PROFILE_UPDATED,a))}}},{key:"_fillMap",value:function(){if(0===this.accountProfileMap.size){for(var e=this._getCachedProfiles(),t=Date.now(),n=0,o=e.length;n<o;n++)t-e[n].lastUpdatedTime<this.expirationTime&&this.accountProfileMap.set(e[n].userID,e[n]);He.l("".concat(this._n,"._fillMap from cache, map.size:").concat(this.accountProfileMap.size))}}},{key:"_updateMap",value:function(e,t){var n,o=Date.now();return this._containsAccount(e)?(n=this._getProfileFromMap(e),t.profileCustomField&&St(n.profileCustomField,t.profileCustomField),ft(n,t,["profileCustomField"]),n.lastUpdatedTime=o):(n=new Wi(t),(this._userModule.isMyFriend(e)||e===this._userModule.getMyAccount())&&(n.lastUpdatedTime=o,this.accountProfileMap.set(e,n))),this._flushMap(e===this._userModule.getMyAccount()),n}},{key:"_flushMap",value:function(e){var t=m(this.accountProfileMap.values()),n=this._userModule.getStorageModule();He.d("".concat(this._n,"._flushMap length:").concat(t.length," flushAtOnce:").concat(e)),n.setItem(this.TAG,t,e)}},{key:"_containsAccount",value:function(e){return this.accountProfileMap.has(e)}},{key:"_getProfileFromMap",value:function(e){return this.accountProfileMap.get(e)}},{key:"_getCachedProfiles",value:function(){var e=this._userModule.getStorageModule().getItem(this.TAG);return Zt(e)?[]:e}},{key:"onConversationsProfileUpdated",value:function(e){for(var t,n,o,s=[],a=0,r=e.length;a<r;a++)n=(t=e[a]).userID,this._userModule.isMyFriend(n)||(this._containsAccount(n)?(o=this._getProfileFromMap(n),ft(o,t)>0&&s.push(n)):s.push(t.userID));0!==s.length&&(He.i("".concat(this._n,".onConversationsProfileUpdated toAccountList:").concat(s)),this.getUserProfile({userIDList:s}))}},{key:"getNickAndAvatarByUserID",value:function(e){if(this._containsAccount(e)){var t=this._getProfileFromMap(e);return{nick:t.nick,avatar:t.avatar}}return{nick:"",avatar:""}}},{key:"reset",value:function(){this._flushMap(!0),this.accountProfileMap.clear()}}]),e}(),Eu=a((function e(t){o(this,e),Zt||(this.userID=t.userID||"",this.timeStamp=t.timeStamp||0)})),Au=function(){function e(t){o(this,e),this._userModule=t,this._n="BlacklistHandler",this._blacklistMap=new Map,this.startIndex=0,this.maxLimited=100,this.currentSequence=0}return a(e,[{key:"getLocalBlacklist",value:function(){return m(this._blacklistMap.keys())}},{key:"getBlacklist",value:function(){var e=this,t="".concat(this._n,".getBlacklist"),n={fromAccount:this._userModule.getMyAccount(),maxLimited:this.maxLimited,startIndex:0,lastSequence:this.currentSequence},o=new li("getBlacklist");return this._userModule.request({protocolName:To,requestData:n}).then((function(n){var s=n.data,a=s.blackListItem,r=s.currentSequence,i=Zt(a)?0:a.length;o.setNetworkType(e._userModule.getNetworkType()).setMessage("count:".concat(i)).end(),He.i("".concat(t," ok")),e.currentSequence=r,e._handleResponse(a,!0),e._userModule.emitOuterEvent(k.BLACKLIST_UPDATED,m(e._blacklistMap.keys()))})).catch((function(n){return e._userModule.probeNetwork().then((function(e){var t=v(e,2),s=t[0],a=t[1];o.setError(n,s,a).end()})),He.e("".concat(t," failed. error:"),n),Oi(n)}))}},{key:"addBlacklist",value:function(e){var t=this,n=new li("addToBlacklist"),o="".concat(this._n,".addBlacklist"),s=this._userModule.getMyAccount();if(1===e.userIDList.length&&e.userIDList[0]===s){var a=Sr,r=this._userModule.getErrorMessage(a);n.setCode(a).setMessage(r).setNetworkType(this._userModule.getNetworkType()).end();var i=new Ei({code:a});return He.e("".concat(o," failed. error:"),i),Oi(i)}return e.userIDList.includes(s)&&(e.userIDList=e.userIDList.filter((function(e){return e!==s}))),e.fromAccount=this._userModule.getMyAccount(),e.toAccount=e.userIDList,this._userModule.request({protocolName:Do,requestData:e}).then((function(s){return n.setNetworkType(t._userModule.getNetworkType()).setMessage(e.userIDList.length>5?"userIDList.length:".concat(e.userIDList.length):"userIDList:".concat(e.userIDList)).end(),He.i("".concat(o," ok")),t._handleResponse(s.resultItem,!0),Li(m(t._blacklistMap.keys()))})).catch((function(e){return t._userModule.probeNetwork().then((function(t){var o=v(t,2),s=o[0],a=o[1];n.setError(e,s,a).end()})),He.e("".concat(o," failed. error:"),e),Oi(e)}))}},{key:"_handleResponse",value:function(e,t){if(!Zt(e))for(var n,o,s,a=0,r=e.length;a<r;a++)o=e[a].to,s=e[a].resultCode,(ut(s)||0===s)&&(t?((n=this._blacklistMap.has(o)?this._blacklistMap.get(o):new Eu).userID=o,!Zt(e[a].addBlackTimeStamp)&&(n.timeStamp=e[a].addBlackTimeStamp),this._blacklistMap.set(o,n)):this._blacklistMap.has(o)&&(n=this._blacklistMap.get(o),this._blacklistMap.delete(o)));He.l("".concat(this._n,"._handleResponse total:").concat(this._blacklistMap.size," bAdd:").concat(t))}},{key:"deleteBlacklist",value:function(e){var t=this,n="".concat(this._n,".deleteBlacklist"),o=new li("removeFromBlacklist");return e.fromAccount=this._userModule.getMyAccount(),e.toAccount=e.userIDList,this._userModule.request({protocolName:ko,requestData:e}).then((function(s){return o.setNetworkType(t._userModule.getNetworkType()).setMessage(e.userIDList.length>5?"userIDList.length:".concat(e.userIDList.length):"userIDList:".concat(e.userIDList)).end(),He.i("".concat(n," ok")),t._handleResponse(s.data.resultItem,!1),Li(m(t._blacklistMap.keys()))})).catch((function(e){return t._userModule.probeNetwork().then((function(t){var n=v(t,2),s=n[0],a=n[1];o.setError(e,s,a).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"onAccountDeleted",value:function(e){for(var t,n=[],o=0,s=e.length;o<s;o++)t=e[o],this._blacklistMap.has(t)&&(this._blacklistMap.delete(t),n.push(t));n.length>0&&(He.l("".concat(this._n,".onAccountDeleted count:").concat(n.length," userIDList:"),n),this._userModule.emitOuterEvent(k.BLACKLIST_UPDATED,m(this._blacklistMap.keys())))}},{key:"onAccountAdded",value:function(e){for(var t,n=[],o=0,s=e.length;o<s;o++)t=e[o],this._blacklistMap.has(t)||(this._blacklistMap.set(t,new Eu({userID:t})),n.push(t));n.length>0&&(He.l("".concat(this._n,".onAccountAdded count:").concat(n.length," userIDList:"),n),this._userModule.emitOuterEvent(k.BLACKLIST_UPDATED,m(this._blacklistMap.keys())))}},{key:"reset",value:function(){this._blacklistMap.clear(),this.startIndex=0,this.maxLimited=100,this.currentSequence=0}}]),e}(),Ru=function(e){var t=String(e).replace(/[=]+$/,""),n="";if(t.length%4==1)return"";for(var o,s,a=0,r=0;s=t.charAt(r++);~s&&(o=a%4?64*o+s:s,a++%4)?n+=String.fromCharCode(255&o>>(-2*a&6)):0)s="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(s);try{return decodeURIComponent(escape(n))}catch(i){return""}},Nu=function(){function e(t){o(this,e),this._userModule=t,this._n="UserStatusHandler",this.MAX_QUERY_USER_COUNT=500,this.MAX_SUBSCRIBE_USER_COUNT=100,this.MAX_UNSUBSCRIBE_USER_COUNT=100,this._userModule.getInnerEmitterInstance().on(bi,this._onCloudConfigUpdated,this)}return a(e,[{key:"_onCloudConfigUpdated",value:function(){var e=this._userModule.getCloudConfig("status_query_count"),t=this._userModule.getCloudConfig("status_sub_count"),n=this._userModule.getCloudConfig("status_unsub_count");He.l("".concat(this._n,"._onCloudConfigUpdated statusQueryCount:").concat(e," statusSubscribeCount:").concat(t)+" statusUnsubscribeCount:".concat(n)),ut(e)||(this.MAX_QUERY_USER_COUNT=parseInt(e,10)),ut(e)||(this.MAX_SUBSCRIBE_USER_COUNT=parseInt(t,10)),ut(e)||(this.MAX_UNSUBSCRIBE_USER_COUNT=parseInt(n,10))}},{key:"onUserStatusUpdated",value:function(e){var t=e.dataList,n=this._userModule.getMyUserID(),o=this._userModule.getModule(Kn),s=t.map((function(e){var t=e.to,s=e.statusType,a=e.customStatus,r=Ru(a);return t===n&&o.setCustomStatus(r),{userID:t,statusType:s,customStatus:r}}));this._userModule.emitOuterEvent(k.USER_STATUS_UPDATED,s)}},{key:"setSelfStatus",value:function(e){var t=this,n="".concat(this._n,".setSelfStatus");if(!1===this._userModule.filterProfanity("customStatus",e))return Oi({code:Wr});var o=new li("setSelfStatus"),s=e.customStatus;return this._userModule.request({protocolName:ua,requestData:{customStatus:s}}).then((function(e){return o.setNetworkType(t._userModule.getNetworkType()).setMessage("customStatus:".concat(s)).end(),He.l("".concat(n," ok. customStatus:").concat(s)),t._userModule.getModule(Kn).setCustomStatus(s),Li({userID:t._userModule.getMyUserID(),statusType:1,customStatus:s})})).catch((function(e){return t._userModule.probeNetwork().then((function(t){var n=v(t,2),s=n[0],a=n[1];o.setError(e,s,a).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"getUserStatus",value:function(e){var t=this,n="".concat(this._n,".getUserStatus"),o=e.userIDList,s=void 0===o?[]:o,a=this._userModule.getMyUserID(),r=m(s),i=void 0,u=r.indexOf(a);if(u>-1){r.splice(u,1);var c=this._userModule.getModule(Kn).getCustomStatus();i={userID:a,statusType:1,customStatus:c}}if(0===r.length)return Ni({successUserList:[i],failureUserList:[]});if(!this._userModule.canIUse(B.USER_STATUS))return Oi({code:Kr});r.length>this.MAX_QUERY_USER_COUNT&&(He.w("".concat(n," ").concat(Jt(this.MAX_QUERY_USER_COUNT))),r=s.slice(0,this.MAX_QUERY_USER_COUNT));var l=new li("getUserStatus");return this._userModule.request({protocolName:ca,requestData:{userIDList:r}}).then((function(e){var o=e.data,a=o.successUserList,r=void 0===a?[]:a,u=o.failureUserList,c=void 0===u?[]:u,p=r.map((function(e){var t=e.userID,n=e.statusType,o=e.customStatus;return{userID:t,statusType:n,customStatus:Ru(o)}})),d=c.map((function(e){var t=e.userID,n=e.invalidUserID,o=e.errorCode,s=e.errorInfo;return{userID:Zt(n)?t:n,code:o,message:s}}));ut(i)||p.unshift(i);var g="userID count:".concat(s.length,", success count:").concat(p.length,", fail count:").concat(d.length);return l.setNetworkType(t._userModule.getNetworkType()).setMessage("".concat(g)).end(),He.l("".concat(n," ok. ").concat(g,".")),Li({successUserList:p,failureUserList:d})})).catch((function(e){return t._userModule.probeNetwork().then((function(t){var n=v(t,2),o=n[0],a=n[1];l.setMessage("userID count:".concat(s.length)).setError(e,o,a).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"subscribeUserStatus",value:function(e){var t=this;if(!this._userModule.canIUse(B.USER_STATUS))return Oi({code:Kr});var n="".concat(this._n,".subscribeUserStatus"),o=e.userIDList,s=void 0===o?[]:o,a=m(s);a.length>this.MAX_SUBSCRIBE_USER_COUNT&&(He.w("".concat(n," ").concat(Jt(this.MAX_SUBSCRIBE_USER_COUNT))),a=s.slice(0,this.MAX_SUBSCRIBE_USER_COUNT));var r=new li("subscribeUserStatus"),i="userID count:".concat(s.length);return He.l("".concat(n," ").concat(i)),this._userModule.request({protocolName:la,requestData:{userIDList:a}}).then((function(e){var o=e.data.failureUserList,s=(void 0===o?[]:o).map((function(e){var t=e.userID,n=e.invalidUserID,o=e.errorCode,s=e.errorInfo;return{userID:Zt(n)?t:n,code:o,message:s}}));return r.setNetworkType(t._userModule.getNetworkType()).setMessage("".concat(i," fail count:").concat(s.length)).end(),He.l("".concat(n," ok. fail count:").concat(s.length,".")),Li({failureUserList:s})})).catch((function(e){return t._userModule.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];r.setMessage("".concat(i)).setError(e,o,s).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"unsubscribeUserStatus",value:function(e){var t=this;if(!this._userModule.canIUse(B.USER_STATUS))return Oi({code:Kr});var n="".concat(this._n,".unsubscribeUserStatus"),o=(e||{}).userIDList,s=void 0===o?[]:o,a=m(s);s.length>this.MAX_UNSUBSCRIBE_USER_COUNT&&(He.w("".concat(n," ").concat(Jt(this.MAX_UNSUBSCRIBE_USER_COUNT))),a=s.slice(0,this.MAX_UNSUBSCRIBE_USER_COUNT));var r=new li("unsubscribeUserStatus"),i="userID count:".concat(s.length);He.l("".concat(n," ").concat(i));var u={userIDList:a};return 0===a.length&&(u.userIDList=void 0,u.unsubscribeAll=1),this._userModule.request({protocolName:pa,requestData:u}).then((function(e){var o=e.data.failureUserList,s=(void 0===o?[]:o).map((function(e){var t=e.userID,n=e.invalidUserID,o=e.errorCode,s=e.errorInfo;return{userID:Zt(n)?t:n,code:o,message:s}}));return r.setNetworkType(t._userModule.getNetworkType()).setMessage("".concat(i," fail count:").concat(s.length)).end(),He.l("".concat(n," ok. fail count:").concat(s.length,".")),Li({failureUserList:s})})).catch((function(e){return t._userModule.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];r.setMessage("".concat(i)).setError(e,o,s).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"reset",value:function(){this.MAX_QUERY_USER_COUNT=500,this.MAX_SUBSCRIBE_USER_COUNT=100,this.MAX_UNSUBSCRIBE_USER_COUNT=100}}]),e}(),Ou=function(e){i(n,e);var t=f(n);function n(e){var s;return o(this,n),(s=t.call(this,e))._n="UserModule",s._profileHandler=new Lu(h(s)),s._blacklistHandler=new Au(h(s)),s._userStatusHandler=new Nu(h(s)),s.getInnerEmitterInstance().on(Ui,s.onContextUpdated,h(s)),s}return a(n,[{key:"onContextUpdated",value:function(e){this._profileHandler.getMyProfile(),this._blacklistHandler.getBlacklist()}},{key:"onProfileModified",value:function(e){this._profileHandler.onProfileModified(e)}},{key:"onRelationChainModified",value:function(e){var t=e.dataList;if(!Zt(t)){var n=[];t.forEach((function(e){e.blackListDelAccount&&n.push.apply(n,m(e.blackListDelAccount))})),n.length>0&&this._blacklistHandler.onAccountDeleted(n);var o=[];t.forEach((function(e){e.blackListAddAccount&&o.push.apply(o,m(e.blackListAddAccount))})),o.length>0&&this._blacklistHandler.onAccountAdded(o)}}},{key:"onConversationsProfileUpdated",value:function(e){this._profileHandler.onConversationsProfileUpdated(e)}},{key:"getMyAccount",value:function(){return this.getMyUserID()}},{key:"getMyProfile",value:function(){return this._profileHandler.getMyProfile()}},{key:"getStorageModule",value:function(){return this.getModule(Wn)}},{key:"filterProfanity",value:function(e,t){var n=this.getModule(io);if(!n)return!0;var o=n.filterText(t[e],Y),s=o.isAllowedToSend,a=o.modifiedText;return!0===s&&(t[e]=a,!0)}},{key:"isMyFriend",value:function(e){var t=this.getModule(xn);return!!t&&t.isMyFriend(e)}},{key:"getUserProfile",value:function(e){return this._profileHandler.getUserProfile(e)}},{key:"updateMyProfile",value:function(e){return this._profileHandler.updateMyProfile(e)}},{key:"getNickAndAvatarByUserID",value:function(e){return this._profileHandler.getNickAndAvatarByUserID(e)}},{key:"getLocalBlacklist",value:function(){var e=this._blacklistHandler.getLocalBlacklist();return Ni(e)}},{key:"addBlacklist",value:function(e){return this._blacklistHandler.addBlacklist(e)}},{key:"deleteBlacklist",value:function(e){return this._blacklistHandler.deleteBlacklist(e)}},{key:"onUserStatusUpdated",value:function(e){this._userStatusHandler.onUserStatusUpdated(e)}},{key:"setSelfStatus",value:function(e){return this._userStatusHandler.setSelfStatus(e)}},{key:"getUserStatus",value:function(e){return this._userStatusHandler.getUserStatus(e)}},{key:"subscribeUserStatus",value:function(e){return this._userStatusHandler.subscribeUserStatus(e)}},{key:"unsubscribeUserStatus",value:function(e){return this._userStatusHandler.unsubscribeUserStatus(e)}},{key:"reset",value:function(){He.l("".concat(this._n,".reset")),this._profileHandler.reset(),this._blacklistHandler.reset(),this._userStatusHandler.reset()}}]),n}(po),Gu=function(){function e(t,n){o(this,e),this._m=t,this._isLoggedIn=!1,this._SDKAppID=n.SDKAppID,this._userID=n.userID||"",this._userSig=n.userSig||"",this._version="2.27.0",this._a2Key="",this._tinyID="",this._customStatus="",this._contentType="json",this._unlimitedAVChatRoom=n.unlimitedAVChatRoom,this._scene=n.scene||"",this._oversea=n.oversea,this._instanceID=n.instanceID,this._statusInstanceID=0,this._isDevMode=n.devMode,this._proxyServer=n.proxyServer,this._fileUploadProxy=n.fileUploadProxy,this._fileDownloadProxy=n.fileDownloadProxy}return a(e,[{key:"isLoggedIn",value:function(){return this._isLoggedIn}},{key:"isOversea",value:function(){return this._oversea}},{key:"isPrivateNetWork",value:function(){return this._proxyServer}},{key:"isDevMode",value:function(){return this._isDevMode}},{key:"isSingaporeSite",value:function(){return this._SDKAppID>=2e7&&this._SDKAppID<3e7||this._SDKAppID>=172e7&&this._SDKAppID<173e7}},{key:"isKoreaSite",value:function(){return this._SDKAppID>=3e7&&this._SDKAppID<4e7||this._SDKAppID>=173e7&&this._SDKAppID<174e7}},{key:"isGermanySite",value:function(){return this._SDKAppID>=4e7&&this._SDKAppID<5e7||this._SDKAppID>=174e7&&this._SDKAppID<175e7}},{key:"isIndiaSite",value:function(){return this._SDKAppID>=5e7&&this._SDKAppID<6e7||this._SDKAppID>=175e7&&this._SDKAppID<176e7}},{key:"isJapanSite",value:function(){return this._SDKAppID>=6e7&&this._SDKAppID<7e7||this._SDKAppID>=176e7&&this._SDKAppID<177e7}},{key:"isUSASite",value:function(){return this._SDKAppID>=7e7&&this._SDKAppID<8e7||this._SDKAppID>=177e7&&this._SDKAppID<178e7}},{key:"isIntl",value:function(){return 0===(e=this._SDKAppID)||e>=2e7&&e<8e7||e>=172e7&&e<178e7;var e}},{key:"isUnlimitedAVChatRoom",value:function(){return this._unlimitedAVChatRoom}},{key:"setUserID",value:function(e){this._userID=e}},{key:"getUserID",value:function(){return this._userID}},{key:"setUserSig",value:function(e){this._userSig=e}},{key:"getUserSig",value:function(){return this._userSig}},{key:"getSDKAppID",value:function(){return this._SDKAppID}},{key:"setTinyID",value:function(e){this._tinyID=e,this._isLoggedIn=!0}},{key:"getTinyID",value:function(){return this._tinyID}},{key:"setCustomStatus",value:function(e){this._customStatus=e}},{key:"getCustomStatus",value:function(){return this._customStatus}},{key:"getScene",value:function(){return Ne?window.tencent_cloud_im_csig_flutter_for_web_25F_cy:this._isTUIKit()?"tuikit":this._scene}},{key:"getInstanceID",value:function(){return this._instanceID}},{key:"getStatusInstanceID",value:function(){return this._statusInstanceID}},{key:"setStatusInstanceID",value:function(e){this._statusInstanceID=e}},{key:"getVersion",value:function(){return this._version}},{key:"getA2Key",value:function(){return this._a2Key}},{key:"setA2Key",value:function(e){this._a2Key=e}},{key:"getContentType",value:function(){return this._contentType}},{key:"getProxyServer",value:function(){return this._proxyServer}},{key:"getFileUploadProxy",value:function(){return this._fileUploadProxy}},{key:"getFileDownloadProxy",value:function(){return this._fileDownloadProxy}},{key:"_isTUIKit",value:function(){var e=!1,t=!1,n=!1,o=!1,s=[];ue&&(s=Object.keys(le)),ce&&(s=ie?Object.keys(uni):Object.keys(window));for(var a=0,r=s.length;a<r;a++)if(s[a].toLowerCase().includes("uikit")){e=!0;break}if(s=null,ue&&!lt(le.createGamePortal)&&lt(getApp)&&!ut(getApp())){var i=getApp().globalData;rt(i)&&!0===i.isTUIKit&&(t=!0)}!0===this._m.getModule(Wn).getStorageSync("TIM_".concat(this._SDKAppID,"_isTUIKit"))&&(n=!0);var u=null;if(ee&&!ne&&"undefined"==typeof uni&&__wxConfig&&(u=__wxConfig.pages),te&&"undefined"==typeof uni&&__qqConfig&&(u=__qqConfig.pages),it(u)&&u.length>0){for(var c=0,l=u.length;c<l;c++)if(u[c].toLowerCase().includes("tui")){o=!0;break}u=null}return e||t||n||o}},{key:"reset",value:function(){this._isLoggedIn=!1,this._userSig="",this._a2Key="",this._tinyID="",this._customStatus="",this._statusInstanceID=0}}]),e}(),Pu=function(e){i(n,e);var t=f(n);function n(e){var s;return o(this,n),(s=t.call(this,e))._n="SignModule",s._helloInterval=120,s._lastLoginTs=0,s._lastWsHelloTs=0,s._isWebUniapp=0,qi.mixin(h(s)),s}return a(n,[{key:"onCheckTimer",value:function(e){this.isLoggedIn()&&e%this._helloInterval==0&&this._hello()}},{key:"login",value:function(e){var t="";if(this.isLoggedIn()){var n=this.getMyUserID();return(t=this.getErrorMessage("RepeatLogin",n))&&He.w(t),Ni({actionStatus:"OK",errorCode:0,errorInfo:t,repeatLogin:!0})}if(Date.now()-this._lastLoginTs<=15e3)return this.outputWarning("LoggingIn",e.userID),Oi({code:Ta});He.l("".concat(this._n,".login userID:").concat(e.userID));var o=this._checkLoginInfo(e);if(0!==o.code)return Oi(o);var s=this.getModule(Kn),a=e.userID,r=e.userSig;return s.setUserID(a),s.setUserSig(r),this.getModule(Zn).updateProtocolConfig(),this._login()}},{key:"_login",value:function(){var e=this,t=this.getModule(Kn),n=t.getScene(),o=0,s=new li("login");s.setMessage("".concat(n)).setMoreMessage("identifier:".concat(this.getMyUserID())),ie?"tuikit"===n?s.setUIPlatform(4):s.setUIPlatform(3):ue?"tuikit"===n?s.setUIPlatform(12):s.setUIPlatform(11):ce&&(Ne?"flutter_web_uikit"===n?s.setUIPlatform(21):s.setUIPlatform(20):this._isReactUIKit()?Re?s.setUIPlatform(25):s.setUIPlatform(24):Re?"tuikit"===n?s.setUIPlatform(17):s.setUIPlatform(16):"tuikit"===n?s.setUIPlatform(14):s.setUIPlatform(13));var a=this.getModule(ro);if(a.canIUseOfflinePush()){this._isWebUniapp=a.getUniAppPlatform();var r=this._getStatusInstanceID();t.setStatusInstanceID(r),this.getModule(Zn).updateProtocolConfig(),o=a.getDeviceBrand()}var i="".concat(this._n,"._login");return this._lastLoginTs=Date.now(),this.request({protocolName:go,requestData:{deviceBrand:o,isWebUniapp:this._isWebUniapp}}).then((function(o){e._lastLoginTs=0;var a=Date.now(),r=null,u=o.data,c=u.a2Key,l=u.tinyID,p=u.helloInterval,d=u.instanceID,g=u.timeStamp,h=u.customStatus,_=void 0===h?"":h;He.l("".concat(i," ok. scene:").concat(n," helloInterval:").concat(p," instanceID:").concat(d," timeStamp:").concat(g));var f=1e3*g,v=a-s.getStartTs(),m=f+parseInt(v/2)-a,M=s.getStartTs()+m;if(s.start(M),function(e,t){be=t;var n=new Date;n.setTime(e),He.i("baseTime from server:".concat(n," offset:").concat(be))}(f,m),!l)throw r=new Ei({code:ya}),s.setError(r,!0,e.getNetworkType()).end(),r;if(!c)throw r=new Ei({code:Ia}),s.setError(r,!0,e.getNetworkType()).end(),r;var y=Ru(_);s.setNetworkType(e.getNetworkType()).setMoreMessage("helloInterval:".concat(p," instanceID:").concat(d," offset:").concat(m," customStatus:").concat(y)).end(),t.setA2Key(c),t.setTinyID(l),t.setStatusInstanceID(d),t.setCustomStatus(y),e.getModule(Zn).updateProtocolConfig(),e.emitInnerEvent(Ui),e._helloInterval=p,e.triggerReady();var I=e.getModule(ro);return I.canIUseOfflinePush()&&(uni.setStorageSync("timUniAppInstanceID",d),I.init()),e._fetchCloudControlConfig(),e.getModule(io).init(),o})).catch((function(t){return e.probeNetwork().then((function(e){var n=v(e,2),o=n[0],a=n[1];s.setError(t,o,a).end(!0)})),e._m.setNotReadyReason(wr),He.e("".concat(i," failed. error:"),t),e._lastLoginTs=0,e._m.onLoginFailed(),Oi(t)}))}},{key:"logout",value:function(){var e=this,t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:0;if(!this.isLoggedIn())return Oi({code:Ca});var n=new li("logout");n.setNetworkType(this.getNetworkType()).setMessage("identifier:".concat(this.getMyUserID())).end(!0);var o="".concat(this._n,".logout");return He.i("".concat(o," type:").concat(t)),0===t&&this._m.setNotReadyReason(Vr),this.request({protocolName:ho,requestData:{type:t}}).then((function(){return e.resetReady(),Ni({})})).catch((function(t){return He.e("".concat(o," error:"),t),e.resetReady(),Ni({})}))}},{key:"_fetchCloudControlConfig",value:function(){this.getModule(to).fetchConfig()}},{key:"_getStatusInstanceID",value:function(){return uni.getStorageSync("timUniAppInstanceID")}},{key:"_hello",value:function(){var e=this;this._lastWsHelloTs=Date.now(),this.request({protocolName:_o,requestData:{isWebUniapp:this._isWebUniapp}}).catch((function(t){He.w("".concat(e._n,"._hello error:"),t)}))}},{key:"getLastWsHelloTs",value:function(){return this._lastWsHelloTs}},{key:"_checkLoginInfo",value:function(e){var t=0;return Zt(this.getModule(Kn).getSDKAppID())?t=va:Zt(e.userID)?t=ma:Zt(e.userSig)&&(t=Ma),{code:t}}},{key:"_isReactUIKit",value:function(){return ce&&void 0!==window.tencent_cloud_im_csig_react_uikit_23F_xa}},{key:"onMultipleAccountKickedOut",value:function(e){var t=this;new li("kickedOut").setNetworkType(this.getNetworkType()).setMessage("type:".concat(S.KICKED_OUT_MULT_ACCOUNT," newInstanceInfo:").concat(JSON.stringify(e))).end(!0),He.w("".concat(this._n,".onMultipleAccountKickedOut userID:").concat(this.getMyUserID()," newInstanceInfo:"),e),this.logout(1).then((function(){t.emitOuterEvent(k.KICKED_OUT,{type:S.KICKED_OUT_MULT_ACCOUNT}),t._m.setNotReadyReason(Fr),t._m.reset()}))}},{key:"onMultipleDeviceKickedOut",value:function(e){var t=this;new li("kickedOut").setNetworkType(this.getNetworkType()).setMessage("type:".concat(S.KICKED_OUT_MULT_DEVICE," newInstanceInfo:").concat(JSON.stringify(e))).end(!0),He.w("".concat(this._n,".onMultipleDeviceKickedOut userID:").concat(this.getMyUserID()," newInstanceInfo:"),e),this.logout(1).then((function(){t.emitOuterEvent(k.KICKED_OUT,{type:S.KICKED_OUT_MULT_DEVICE}),t._m.setNotReadyReason(qr),t._m.reset()}))}},{key:"onUserSigExpired",value:function(){new li("kickedOut").setNetworkType(this.getNetworkType()).setMessage(S.KICKED_OUT_USERSIG_EXPIRED).end(!0),He.w("".concat(this._n,".onUserSigExpired: userSig expired")),0!==this.getModule(Kn).getStatusInstanceID()&&(this.emitOuterEvent(k.KICKED_OUT,{type:S.KICKED_OUT_USERSIG_EXPIRED}),this._m.setNotReadyReason(xr),this._m.reset())}},{key:"onRestApiKickedOut",value:function(e){(new li("kickedOut").setNetworkType(this.getNetworkType()).setMessage("type:".concat(S.KICKED_OUT_REST_API," newInstanceInfo:").concat(JSON.stringify(e))).end(!0),He.w("".concat(this._n,".onRestApiKickedOut userID:").concat(this.getMyUserID()," newInstanceInfo:"),e),0!==this.getModule(Kn).getStatusInstanceID())&&(this.emitOuterEvent(k.KICKED_OUT,{type:S.KICKED_OUT_REST_API}),this._m.setNotReadyReason(Br),this._m.reset(),this.getModule($n).onRestApiKickedOut())}},{key:"reset",value:function(){He.l("".concat(this._n,".reset")),this.resetReady(),this._helloInterval=120,this._lastLoginTs=0,this._lastWsHelloTs=0,this._isWebUniapp=0}}]),n}(po);function Uu(){return null}var bu=function(){function e(t){o(this,e),this._m=t,this._n="StorageModule",this._storageQueue=new Map,this._errorTolerantHandle()}return a(e,[{key:"_errorTolerantHandle",value:function(){ue||!ut(window)&&this._canIUseCookies()||(this.getItem=Uu,this.setItem=Uu,this.removeItem=Uu,this.clear=Uu)}},{key:"onCheckTimer",value:function(e){if(e%20==0){if(0===this._storageQueue.size)return;this._doFlush()}}},{key:"_doFlush",value:function(){try{var e,t=D(this._storageQueue);try{for(t.s();!(e=t.n()).done;){var n=v(e.value,2),o=n[0],s=n[1];this._setStorageSync(this._getKey(o),s)}}catch(a){t.e(a)}finally{t.f()}this._storageQueue.clear()}catch(r){He.w("".concat(this._n,"._doFlush error:"),r)}}},{key:"_getPrefix",value:function(){var e=this._m.getModule(Kn);return"TIM_".concat(e.getSDKAppID(),"_").concat(e.getUserID(),"_")}},{key:"_getKey",value:function(e){return"".concat(this._getPrefix()).concat(e)}},{key:"getItem",value:function(e){var t=!(arguments.length>1&&void 0!==arguments[1])||arguments[1];try{var n=t?this._getKey(e):e;return this.getStorageSync(n)}catch(o){return He.w("".concat(this._n,".getItem error:"),o),{}}}},{key:"setItem",value:function(e,t){var n=arguments.length>2&&void 0!==arguments[2]&&arguments[2],o=!(arguments.length>3&&void 0!==arguments[3])||arguments[3];if(n){var s=o?this._getKey(e):e;this._setStorageSync(s,t)}else this._storageQueue.set(e,t)}},{key:"clear",value:function(){try{ue?le.clearStorageSync():this._canIUseCookies()&&localStorage.clear()}catch(e){He.w("".concat(this._n,".clear error:"),e)}}},{key:"removeItem",value:function(e){var t=!(arguments.length>1&&void 0!==arguments[1])||arguments[1];try{var n=t?this._getKey(e):e;this._removeStorageSync(n)}catch(o){He.w("".concat(this._n,".removeItem error:"),o)}}},{key:"getSize",value:function(e){var t=this,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"b";try{var o={size:0,limitSize:5242880,unit:n};if(Object.defineProperty(o,"leftSize",{enumerable:!0,get:function(){return o.limitSize-o.size}}),ue&&(o.limitSize=1024*le.getStorageInfoSync().limitSize),e)o.size=JSON.stringify(this.getItem(e)).length+this._getKey(e).length;else if(ue){var s=le.getStorageInfoSync(),a=s.keys;a.forEach((function(e){o.size+=JSON.stringify(t.getStorageSync(e)).length+t._getKey(e).length}))}else if(this._canIUseCookies())for(var r in localStorage)localStorage.hasOwnProperty(r)&&(o.size+=localStorage.getItem(r).length+r.length);return this._convertUnit(o)}catch(i){He.w("".concat(this._n," error:"),i)}}},{key:"_convertUnit",value:function(e){var t={},n=e.unit;for(var o in t.unit=n,e)"number"==typeof e[o]&&("kb"===n.toLowerCase()?t[o]=Math.round(e[o]/1024):"mb"===n.toLowerCase()?t[o]=Math.round(e[o]/1024/1024):t[o]=e[o]);return t}},{key:"_setStorageSync",value:function(e,t){ue?se?my.setStorageSync({key:e,data:t}):le.setStorageSync(e,t):this._canIUseCookies()&&localStorage.setItem(e,JSON.stringify(t))}},{key:"getStorageSync",value:function(e){return ue?se?my.getStorageSync({key:e}).data:le.getStorageSync(e):this._canIUseCookies()?JSON.parse(localStorage.getItem(e)):{}}},{key:"_removeStorageSync",value:function(e){ue?se?my.removeStorageSync({key:e}):le.removeStorageSync(e):this._canIUseCookies()&&localStorage.removeItem(e)}},{key:"_canIUseCookies",value:function(){return navigator&&navigator.cookieEnabled&&localStorage}},{key:"reset",value:function(){He.l("".concat(this._n,".reset")),this._doFlush()}}]),e}(),wu=function(){function e(t){o(this,e),this._n="SSOLogBody",this._report=[]}return a(e,[{key:"pushIn",value:function(e){He.d("".concat(this._n,".pushIn"),this._report.length,e),this._report.push(e)}},{key:"backfill",value:function(e){var t;it(e)&&0!==e.length&&(He.d("".concat(this._n,".backfill"),this._report.length,e.length),(t=this._report).unshift.apply(t,m(e)))}},{key:"getLogsNumInMemory",value:function(){return this._report.length}},{key:"isEmpty",value:function(){return 0===this._report.length}},{key:"_reset",value:function(){this._report.length=0,this._report=[]}},{key:"getLogsInMemory",value:function(){var e=this._report.slice();return this._reset(),e}}]),e}(),qu=function(e){var t=e.getModule(Kn);return{SDKType:10,SDKAppID:t.getSDKAppID(),SDKVersion:t.getVersion(),tinyID:Number(t.getTinyID()),userID:t.getUserID(),platform:e.getPlatform(),instanceID:t.getInstanceID(),traceID:we()}},Fu=function(e){i(s,e);var n=f(s);function s(e){var t;o(this,s),(t=n.call(this,e))._n="EventStatModule",t.TAG="im-ssolog-event",t._reportBody=new wu,t.MIN_THRESHOLD=20,t.MAX_THRESHOLD=100,t.WAITING_TIME=6e4,t.REPORT_LEVEL=[4,5,6],t.REPORT_SDKAPPID_BLACKLIST=[],t.REPORT_TINYID_WHITELIST=[],t._lastReportTime=Date.now();var a=t.getInnerEmitterInstance();return a.on(Ui,t._onLoginSuccess,h(t)),a.on(bi,t._onCloudConfigUpdated,h(t)),t}return a(s,[{key:"reportAtOnce",value:function(){He.d("".concat(this._n,".reportAtOnce")),this._report()}},{key:"_onLoginSuccess",value:function(){var e=this,t=this.getModule(Wn),n=t.getItem(this.TAG,!1);!Zt(n)&&lt(n.forEach)&&(He.l("".concat(this._n,"._onLoginSuccess get ssolog in storage, count:").concat(n.length)),n.forEach((function(t){e._reportBody.pushIn(t)})),t.removeItem(this.TAG,!1))}},{key:"_onCloudConfigUpdated",value:function(){var e=this.getCloudConfig("evt_rpt_threshold"),t=this.getCloudConfig("evt_rpt_waiting"),n=this.getCloudConfig("evt_rpt_level"),o=this.getCloudConfig("evt_rpt_sdkappid_bl"),s=this.getCloudConfig("evt_rpt_tinyid_wl");ut(e)||(this.MIN_THRESHOLD=Number(e)),ut(t)||(this.WAITING_TIME=Number(t)),ut(n)||(this.REPORT_LEVEL=n.split(",").map((function(e){return Number(e)}))),ut(o)||(this.REPORT_SDKAPPID_BLACKLIST=o.split(",").map((function(e){return Number(e)}))),ut(s)||(this.REPORT_TINYID_WHITELIST=s.split(","))}},{key:"pushIn",value:function(e){e instanceof li&&(e.updateTimeStamp(),this._reportBody.pushIn(e),this._reportBody.getLogsNumInMemory()>=this.MIN_THRESHOLD&&this._report())}},{key:"onCheckTimer",value:function(){Date.now()<this._lastReportTime+this.WAITING_TIME||this._reportBody.isEmpty()||this._report()}},{key:"_filterLogs",value:function(e){var t=this,n=this.getModule(Kn),o=n.getSDKAppID(),s=n.getTinyID();return Bt(this.REPORT_SDKAPPID_BLACKLIST,o)&&!Ht(this.REPORT_TINYID_WHITELIST,s)?[]:e.filter((function(e){return t.REPORT_LEVEL.includes(e.level)}))}},{key:"_report",value:function(){var e=this;if(!this._reportBody.isEmpty()){var n=this._reportBody.getLogsInMemory(),o=this._filterLogs(n);if(0!==o.length){var s={header:qu(this),event:o};this.request({protocolName:Ws,requestData:t({},s)}).then((function(){e._lastReportTime=Date.now()})).catch((function(t){He.w("".concat(e._n,".report failed. networkType:").concat(e.getNetworkType()," error:"),t),e._reportBody.backfill(n),e._reportBody.getLogsNumInMemory()>e.MAX_THRESHOLD&&e._flushAtOnce()}))}else this._lastReportTime=Date.now()}}},{key:"_flushAtOnce",value:function(){var e=this.getModule(Wn),t=e.getItem(this.TAG,!1),n=this._reportBody.getLogsInMemory(),o="".concat(this._n,"._flushAtOnce");if(Zt(t))He.l("".concat(o," count:").concat(n.length)),e.setItem(this.TAG,n,!0,!1);else{var s=n.concat(t);s.length>this.MAX_THRESHOLD&&(s=s.slice(0,this.MAX_THRESHOLD)),He.l("".concat(o," count:").concat(s.length)),e.setItem(this.TAG,s,!0,!1)}}},{key:"reset",value:function(){He.l("".concat(this._n,".reset")),this._lastReportTime=0,this._report(),this.REPORT_SDKAPPID_BLACKLIST=[],this.REPORT_TINYID_WHITELIST=[]}}]),s}(po),xu="none",Vu="online",Bu=[Or,Jr],Hu=function(){function e(t){o(this,e),this._m=t,this._networkType="",this._n="NetMonitorModule",this.MAX_WAIT_TIME=3e3,this._mpNetworkStatusCallback=null,this._webOnlineCallback=null,this._webOfflineCallback=null}return a(e,[{key:"start",value:function(){var e=this;ue?(le.getNetworkType({success:function(t){e._networkType=t.networkType||t.subtype||"",t.networkType===xu?He.w("".concat(e._n,".start no network, please check!")):He.i("".concat(e._n,".start networkType:").concat(t.networkType))}}),this._mpNetworkStatusCallback=this._onNetworkStatusChange.bind(this),le.onNetworkStatusChange(this._mpNetworkStatusCallback)):(this._networkType=Vu,this._webOnlineCallback=this._onWebOnline.bind(this),this._webOfflineCallback=this._onWebOffline.bind(this),window&&(window.addEventListener("online",this._webOnlineCallback),window.addEventListener("offline",this._webOfflineCallback)))}},{key:"_onWebOnline",value:function(){this._onNetworkStatusChange({isConnected:!0,networkType:Vu})}},{key:"_onWebOffline",value:function(){this._onNetworkStatusChange({isConnected:!1,networkType:xu})}},{key:"_onNetworkStatusChange",value:function(e){var t=e.isConnected,n=e.networkType,o="".concat(this._n,"._onNetworkStatusChange"),s=!1;t?(He.i("".concat(o," previous:").concat(this._networkType," current:").concat(n)),this._networkType!==n&&(s=!0,this._m.getModule($n).reConnect(!0))):this._networkType!==n&&(s=!0,He.w("".concat(o," no network, please check!")),this._m.getModule($n).offline());s&&(new li("networkChange").setMessage("isConnected:".concat(t," previousNetworkType:").concat(this._networkType," networkType:").concat(n)).end(),this._networkType=n)}},{key:"probe",value:function(e){var t=this;if(!ut(e)&&Bu.includes(e.code))return Promise.resolve([!0,this._networkType]);var n="".concat(this._n,".probe");return new Promise((function(e,o){ue?le.getNetworkType({success:function(o){t._networkType=o.networkType,o.networkType===xu?(He.w("".concat(n," no network, please check!")),e([!1,o.networkType])):(He.i("".concat(n," networkType:").concat(o.networkType)),e([!0,o.networkType]))}}):t._networkType===xu?e([!1,xu]):e([!0,Vu])}))}},{key:"getNetworkType",value:function(){return this._networkType}},{key:"reset",value:function(){He.l("".concat(this._n,".reset")),ue?null!==this._mpNetworkStatusCallback&&(le.offNetworkStatusChange&&(re||ne?le.offNetworkStatusChange(this._mpNetworkStatusCallback):le.offNetworkStatusChange()),this._mpNetworkStatusCallback=null):window&&(null!==this._webOnlineCallback&&(window.removeEventListener("online",this._webOnlineCallback),this._webOnlineCallback=null),null!==this._onWebOffline&&(window.removeEventListener("offline",this._webOfflineCallback),this._webOfflineCallback=null))}}]),e}();var Ku=function(e,t){return e(t={exports:{}},t.exports),t.exports}((function(e){var t=Object.prototype.hasOwnProperty,n="~";function o(){}function s(e,t,n){this.fn=e,this.context=t,this.once=n||!1}function a(e,t,o,a,r){if("function"!=typeof o)throw new TypeError("The listener must be a function");var i=new s(o,a||e,r),u=n?n+t:t;return e._events[u]?e._events[u].fn?e._events[u]=[e._events[u],i]:e._events[u].push(i):(e._events[u]=i,e._eventsCount++),e}function r(e,t){0==--e._eventsCount?e._events=new o:delete e._events[t]}function i(){this._events=new o,this._eventsCount=0}Object.create&&(o.prototype=Object.create(null),(new o).__proto__||(n=!1)),i.prototype.eventNames=function(){var e,o,s=[];if(0===this._eventsCount)return s;for(o in e=this._events)t.call(e,o)&&s.push(n?o.slice(1):o);return Object.getOwnPropertySymbols?s.concat(Object.getOwnPropertySymbols(e)):s},i.prototype.listeners=function(e){var t=n?n+e:e,o=this._events[t];if(!o)return[];if(o.fn)return[o.fn];for(var s=0,a=o.length,r=new Array(a);s<a;s++)r[s]=o[s].fn;return r},i.prototype.listenerCount=function(e){var t=n?n+e:e,o=this._events[t];return o?o.fn?1:o.length:0},i.prototype.emit=function(e,t,o,s,a,r){var i=n?n+e:e;if(!this._events[i])return!1;var u,c,l=this._events[i],p=arguments.length;if(l.fn){switch(l.once&&this.removeListener(e,l.fn,void 0,!0),p){case 1:return l.fn.call(l.context),!0;case 2:return l.fn.call(l.context,t),!0;case 3:return l.fn.call(l.context,t,o),!0;case 4:return l.fn.call(l.context,t,o,s),!0;case 5:return l.fn.call(l.context,t,o,s,a),!0;case 6:return l.fn.call(l.context,t,o,s,a,r),!0}for(c=1,u=new Array(p-1);c<p;c++)u[c-1]=arguments[c];l.fn.apply(l.context,u)}else{var d,g=l.length;for(c=0;c<g;c++)switch(l[c].once&&this.removeListener(e,l[c].fn,void 0,!0),p){case 1:l[c].fn.call(l[c].context);break;case 2:l[c].fn.call(l[c].context,t);break;case 3:l[c].fn.call(l[c].context,t,o);break;case 4:l[c].fn.call(l[c].context,t,o,s);break;default:if(!u)for(d=1,u=new Array(p-1);d<p;d++)u[d-1]=arguments[d];l[c].fn.apply(l[c].context,u)}}return!0},i.prototype.on=function(e,t,n){return a(this,e,t,n,!1)},i.prototype.once=function(e,t,n){return a(this,e,t,n,!0)},i.prototype.removeListener=function(e,t,o,s){var a=n?n+e:e;if(!this._events[a])return this;if(!t)return r(this,a),this;var i=this._events[a];if(i.fn)i.fn!==t||s&&!i.once||o&&i.context!==o||r(this,a);else{for(var u=0,c=[],l=i.length;u<l;u++)(i[u].fn!==t||s&&!i[u].once||o&&i[u].context!==o)&&c.push(i[u]);c.length?this._events[a]=1===c.length?c[0]:c:r(this,a)}return this},i.prototype.removeAllListeners=function(e){var t;return e?(t=n?n+e:e,this._events[t]&&r(this,t)):(this._events=new o,this._eventsCount=0),this},i.prototype.off=i.prototype.removeListener,i.prototype.addListener=i.prototype.on,i.prefixed=n,i.EventEmitter=i,e.exports=i})),Wu=function(e){i(n,e);var t=f(n);function n(e){var s;return o(this,n),(s=t.call(this,e))._n="BigDataChannelModule",s.FILETYPE={SOUND:2106,FILE:2107,VIDEO:2113},s._bdh_download_server="grouptalk.c2c.qq.com",s._BDHBizID=10001,s._authKey="",s._expireTime=0,s.getInnerEmitterInstance().on(Ui,s._getAuthKey,h(s)),s}return a(n,[{key:"_getAuthKey",value:function(){var e=this;this.isIntl()||this.request({protocolName:mo}).then((function(t){t.data.authKey&&(e._authKey=t.data.authKey,e._expireTime=parseInt(t.data.expireTime))}))}},{key:"_isFromOlderVersion",value:function(e){return!(!e.content||2===e.content.downloadFlag)}},{key:"parseElements",value:function(e,t){if(!it(e)||!t)return[];for(var n=[],o=null,s=0;s<e.length;s++)o=e[s],this._needParse(o)?n.push(this._parseElement(o,t)):n.push(e[s]);return n}},{key:"_needParse",value:function(e){return!e.cloudCustomData&&!(!this._isFromOlderVersion(e)||e.type!==S.MSG_AUDIO&&e.type!==S.MSG_FILE&&e.type!==S.MSG_VIDEO)}},{key:"_parseElement",value:function(e,t){switch(e.type){case S.MSG_AUDIO:return this._parseAudioElement(e,t);case S.MSG_FILE:return this._parseFileElement(e,t);case S.MSG_VIDEO:return this._parseVideoElement(e,t)}}},{key:"_parseAudioElement",value:function(e,t){return e.content.url=this._genAudioUrl(e.content.uuid,t),e}},{key:"_parseFileElement",value:function(e,t){return e.content.url=this._genFileUrl(e.content.uuid,t,e.content.fileName),e}},{key:"_parseVideoElement",value:function(e,t){return e.content.url=this._genVideoUrl(e.content.uuid,t),e}},{key:"_genAudioUrl",value:function(e,t){if(""===this._authKey)return"";var n=this.getModule(Kn).getSDKAppID();return"https://".concat(this._bdh_download_server,"/asn.com/stddownload_common_file?authkey=").concat(this._authKey,"&bid=").concat(this._BDHBizID,"&subbid=").concat(n,"&fileid=").concat(e,"&filetype=").concat(this.FILETYPE.SOUND,"&openid=").concat(t,"&ver=0")}},{key:"_genFileUrl",value:function(e,t,n){if(""===this._authKey)return"";n||(n="".concat(Math.floor(1e5*Math.random()),"-").concat(Date.now()));var o=this.getModule(Kn).getSDKAppID();return"https://".concat(this._bdh_download_server,"/asn.com/stddownload_common_file?authkey=").concat(this._authKey,"&bid=").concat(this._BDHBizID,"&subbid=").concat(o,"&fileid=").concat(e,"&filetype=").concat(this.FILETYPE.FILE,"&openid=").concat(t,"&ver=0&filename=").concat(encodeURIComponent(n))}},{key:"_genVideoUrl",value:function(e,t){if(""===this._authKey)return"";var n=this.getModule(Kn).getSDKAppID();return"https://".concat(this._bdh_download_server,"/asn.com/stddownload_common_file?authkey=").concat(this._authKey,"&bid=").concat(this._BDHBizID,"&subbid=").concat(n,"&fileid=").concat(e,"&filetype=").concat(this.FILETYPE.VIDEO,"&openid=").concat(t,"&ver=0")}},{key:"reset",value:function(){this._authKey="",this.expireTime=0}}]),n}(po),ju=["requestSnapshotUrl"],Yu=function(e){i(s,e);var n=f(s);function s(e){var t;return o(this,s),(t=n.call(this,e))._n="UploadModule",t.TIMUploadPlugin=null,t.timUploadPlugin=null,t.COSSDK=null,t._cosUploadMethod=null,t.expiredTimeLimit=600,t.appid=0,t.bucketName="",t.ciUrl="",t.directory="",t.downloadUrl="",t.uploadUrl="",t.region="ap-shanghai",t.cos=null,t.cosOptions={secretId:"",secretKey:"",sessionToken:"",expiredTime:0},t.uploadFileType="",t.duration=900,t.tryCount=0,t.getInnerEmitterInstance().on(Ui,t._init,h(t)),t}return a(s,[{key:"_init",value:function(){var e=this.getModule(Xn);if(this.TIMUploadPlugin=e.getPlugin("tim-upload-plugin"),this.TIMUploadPlugin)this._initUploaderMethod();else{var t=ue?"cos-wx-sdk":"cos-js-sdk";this.COSSDK=e.getPlugin(t),this.COSSDK?(this._getAuthorizationKey(),this.outputWarning("CosReplacement",t)):this.outputWarning("PluginUndetected")}}},{key:"_getAuthorizationKey",value:function(){var e=this,t="".concat(this._n,".").concat("_getAuthorizationKey"),n=new li("_getAuthorizationKey"),o=Math.ceil(Date.now()/1e3);this.request({protocolName:Bs,requestData:{duration:this.expiredTimeLimit}}).then((function(s){var a=s.data;He.l("".concat(t," ok. data:"),a);var r=a.expiredTime-o;n.setMessage("requestId:".concat(a.requestId," requestTime:").concat(o," expiredTime:").concat(a.expiredTime," diff:").concat(r,"s")).setNetworkType(e.getNetworkType()).end(),!ue&&a.region&&(e.region=a.region),e.appid=a.appid,e.bucketName=a.bucketName,e.ciUrl=a.ciUrl,e.directory=a.directory,e.downloadUrl=a.downloadUrl,e.uploadUrl=a.uploadUrl,e.cosOptions={secretId:a.secretId,secretKey:a.secretKey,sessionToken:a.sessionToken,expiredTime:a.expiredTime},He.l("".concat(t," ok. region:").concat(e.region," bucketName:").concat(e.bucketName)),e._initUploaderMethod()})).catch((function(o){e.probeNetwork().then((function(e){var t=v(e,2),s=t[0],a=t[1];n.setError(o,s,a).end()})),He.w("".concat(t," failed. error:"),o)}))}},{key:"_getCosPreSigUrl",value:function(e){var t=this,n="".concat(this._n,".").concat("_getCosPreSigUrl"),o=Math.ceil(Date.now()/1e3),s=new li("_getCosPreSigUrl");return this.request({protocolName:Hs,requestData:{fileType:e.fileType,fileName:e.fileName,uploadMethod:e.uploadMethod,duration:e.duration}}).then((function(e){t.tryCount=0;var a=e.data||{},r=a.expiredTime-o;return He.l("".concat(n," ok. data:"),a),s.setMessage("requestId:".concat(a.requestId," expiredTime:").concat(a.expiredTime," diff:").concat(r,"s")).setNetworkType(t.getNetworkType()).end(),a})).catch((function(o){return-1===o.code&&(o.code=ka),t.probeNetwork().then((function(e){var t=v(e,2),n=t[0],a=t[1];s.setError(o,n,a).end()})),He.w("".concat(n," failed. error:"),o),t.tryCount<1?(t.tryCount++,t._getCosPreSigUrl(e)):(t.tryCount=0,Oi({code:ka}))}))}},{key:"_initUploaderMethod",value:function(){var e=this;if(this.TIMUploadPlugin)return this.timUploadPlugin=new this.TIMUploadPlugin,void(this._cosUploadMethod=function(t,n){e.timUploadPlugin.uploadFile(t,n)});this.appid&&(this.cos=ue?new this.COSSDK({ForcePathStyle:!0,getAuthorization:this._getAuthorization.bind(this)}):new this.COSSDK({getAuthorization:this._getAuthorization.bind(this)}),this._cosUploadMethod=ue?function(t,n){e.cos.postObject(t,n)}:function(t,n){e.cos.uploadFiles(t,n)})}},{key:"onCheckTimer",value:function(e){this.COSSDK&&(this.TIMUploadPlugin||this.isLoggedIn()&&e%60==0&&Math.ceil(Date.now()/1e3)>=this.cosOptions.expiredTime-120&&this._getAuthorizationKey())}},{key:"_getAuthorization",value:function(e,t){t({TmpSecretId:this.cosOptions.secretId,TmpSecretKey:this.cosOptions.secretKey,XCosSecurityToken:this.cosOptions.sessionToken,ExpiredTime:this.cosOptions.expiredTime})}},{key:"upload",value:function(e){if(!0===e.getRelayFlag())return Promise.resolve();var t=this.getModule(so);switch(e.type){case S.MSG_IMAGE:return t.addTotalCount(ni),this._uploadImage(e);case S.MSG_FILE:return t.addTotalCount(ni),this._uploadFile(e);case S.MSG_AUDIO:return t.addTotalCount(ni),this._uploadAudio(e);case S.MSG_VIDEO:return t.addTotalCount(ni),this._uploadVideo(e);default:return Promise.resolve()}}},{key:"_uploadImage",value:function(e){var n=this,o=this.getModule(Un),s=e.getElements()[0],a=o.getMessageOption(e.clientSequence);return this.doUploadImage({file:a.payload.file,to:a.to,onProgress:function(e){if(s.updatePercent(e),lt(a.onProgress))try{a.onProgress(e)}catch(t){return Oi({code:Na})}}}).then((function(o){var a,r,i=o.location,u=o.fileType,c=o.fileSize,l=o.width,p=o.height,d=o.smallImageUrl,g=o.smallImageWidth,h=o.smallImageHeight,_=o.largeImageUrl,f=o.largeImageWidth,v=o.largeImageHeight,m=n.isPrivateNetWork()?i:Dt(i);return s.updateImageFormat(u),d&&_?(a={url:d,width:g,height:h},r={url:_,width:f,height:v}):(a=qt({originUrl:m,originWidth:l,originHeight:p,min:198}),r=qt({originUrl:m,originWidth:l,originHeight:p,min:720})),s.updateImageInfoArray([{size:c,url:m,width:l,height:p},t({},r),t({},a)]),e}))}},{key:"_uploadFile",value:function(e){var t=this,n=this.getModule(Un),o=e.getElements()[0],s=n.getMessageOption(e.clientSequence);return this.doUploadFile({file:s.payload.file,to:s.to,onProgress:function(e){if(o.updatePercent(e),lt(s.onProgress))try{s.onProgress(e)}catch(t){return Oi({code:Na})}}}).then((function(n){var s=n.location,a=t.isPrivateNetWork()?s:Dt(s);return o.updateFileUrl(a),e}))}},{key:"_uploadAudio",value:function(e){var t=this,n=this.getModule(Un),o=e.getElements()[0],s=n.getMessageOption(e.clientSequence);return this.doUploadAudio({file:s.payload.file,to:s.to,onProgress:function(e){if(o.updatePercent(e),lt(s.onProgress))try{s.onProgress(e)}catch(t){return Oi({code:Na})}}}).then((function(n){var s=n.location,a=t.isPrivateNetWork()?s:Dt(s);return o.updateAudioUrl(a),e}))}},{key:"_uploadVideo",value:function(e){var t=this,n=this.getModule(Un),o=e.getElements()[0],s=n.getMessageOption(e.clientSequence);return this.doUploadVideo({file:s.payload.file,to:s.to,onProgress:function(e){if(o.updatePercent(e),lt(s.onProgress))try{s.onProgress(e)}catch(t){return Oi({code:Na})}}}).then((function(n){var s=n.location,a=n.snapshotInfo,r=t.isPrivateNetWork()?s:Dt(s);return o.updateVideoUrl(r),Zt(a)||o.updateSnapshotInfo(a),e}))}},{key:"doUploadImage",value:function(e){var t=this;if(!e.file)return Oi({code:Fa});var n=this._checkImageType(e.file);if(!0!==n)return n;var o=this._checkImageSize(e.file);if(!0!==o)return o;var s=null;return this._setUploadFileType(Vi),this.uploadByCOS(e).then((function(e){return s=e,t.isPrivateNetWork()?Pt(e.location):Pt("https://".concat(e.location))})).then((function(e){return s.width=e.width,s.height=e.height,Promise.resolve(s)}))}},{key:"_checkImageType",value:function(e){var t="";return t=ue?e.url.slice(e.url.lastIndexOf(".")+1):e.files[0].name.slice(e.files[0].name.lastIndexOf(".")+1),Fi.indexOf(t.toLowerCase())>=0||Oi({code:xa})}},{key:"_checkImageSize",value:function(e){var t=0;return 0===(t=ue?e.size:e.files[0].size)?Oi({code:Ra}):t<20971520||Oi({code:Va})}},{key:"doUploadFile",value:function(e){return e.file?e.file.files[0].size>104857600?Oi({code:Ja}):0===e.file.files[0].size?Oi({code:Ra}):(this._setUploadFileType(Ki),this.uploadByCOS(e)):Oi({code:za})}},{key:"doUploadVideo",value:function(e){return e.file.videoFile.size>104857600?Oi({code:Wa}):0===e.file.videoFile.size?Oi({code:Ra}):-1===xi.indexOf(e.file.videoFile.type)?Oi({code:ja}):(this._setUploadFileType(Bi),ue?this.handleVideoUpload({file:e.file.videoFile,onProgress:e.onProgress}):ce?this.handleVideoUpload(e):void 0)}},{key:"handleVideoUpload",value:function(e){var t=this;return new Promise((function(n,o){t.uploadByCOS(e).then((function(e){n(e)})).catch((function(){t.uploadByCOS(e).then((function(e){n(e)})).catch((function(){o(new Ei({code:Ka}))}))}))}))}},{key:"doUploadAudio",value:function(e){return e.file?e.file.size>20971520?Oi({code:Ha}):0===e.file.size?Oi({code:Ra}):(this._setUploadFileType(Hi),this.uploadByCOS(e)):Oi({code:Ba})}},{key:"uploadByCOS",value:function(e){var t=this;if(!lt(this._cosUploadMethod))return this.outputWarning("PluginUndetected"),Oi({code:Da});if(this.timUploadPlugin)return this._uploadWithPreSigUrl(e);var n=new li("upload"),o="".concat(this._n,".uploadByCOS"),s=Date.now(),a=this._getFile(e);return new Promise((function(r,i){var u=ue?t._createCosOptionsWXMiniApp(e):t._createCosOptionsWeb(e),c=t;t._cosUploadMethod(u,(function(e,u){var l=Object.create(null);if(u){if(e||it(u.files)&&u.files[0].error){var p=new Ei({code:Ya});return n.setError(p,!0,t.getNetworkType()).end(),He.l("".concat(o," failed. error:"),u.files[0].error),403===u.files[0].error.statusCode&&(He.w("".concat(o," failed. cos AccessKeyId was invalid, regain auth key!")),t._getAuthorizationKey()),void i(p)}l.fileName=a.name,l.fileSize=a.size,l.fileType=a.type.slice(a.type.indexOf("/")+1).toLowerCase(),l.location=ue?u.Location:u.files[0].data.Location;var d=Date.now()-s,g=c._formatFileSize(a.size),h=c._formatSpeed(1e3*a.size/d),_="size:".concat(g," time:").concat(d,"ms speed:").concat(h);He.l("".concat(o," success. name:").concat(a.name," ").concat(_)),r(l);var f=t.getModule(so);return f.addCost(ni,d),f.addFileSize(ni,a.size),void n.setNetworkType(t.getNetworkType()).setMessage(_).end()}var v=new Ei({code:Ya});n.setError(v,!0,c.getNetworkType()).end(),He.w("".concat(o," failed. error:"),e),403===e.statusCode&&(He.w("".concat(o," failed. cos AccessKeyId was invalid, regain auth key!")),t._getAuthorizationKey()),i(v)}))}))}},{key:"_uploadWithPreSigUrl",value:function(e){var t=this,n="".concat(this._n,"._uploadWithPreSigUrl"),o=this._getFile(e);return this._createCosOptionsPreSigUrl(e).then((function(e){return new Promise((function(s,a){var r=new li("upload"),i=e.requestSnapshotUrl,u=void 0===i?void 0:i,c=g(e,ju),l=Date.now();t._cosUploadMethod(c,(function(e,i){if(e||403===i.statusCode)return r.setError(new Ei(e),!0,t.getNetworkType()).end(),He.l("".concat(n," failed, error:"),e),void a(new Ei({code:Ya}));var p=Object.create(null),d=i.data.location||"";t.isPrivateNetWork()||0!==d.indexOf("https://")&&0!==d.indexOf("http://")||(d=d.split("//")[1]),p.fileName=o.name,p.fileSize=o.size,p.fileType=o.type.slice(o.type.indexOf("/")+1).toLowerCase(),p.location=d;var g=Date.now()-l,h=t._formatFileSize(o.size),_=t._formatSpeed(1e3*o.size/g),f="size:".concat(h,",time:").concat(g,"ms,speed:").concat(_," res:").concat(JSON.stringify(i.data));He.l("".concat(n," success name:").concat(o.name,",").concat(f)),r.setNetworkType(t.getNetworkType()).setMessage(f).end();var v=t.getModule(so);v.addCost(ni,g),v.addFileSize(ni,o.size);var m=[];if(c.thumbUrl&&c.largeUrl&&(m=[t._getSmallImageInfoByUrl(c.thumbUrl,p),t._getLargeImageInfoByUrl(c.largeUrl,p)]),u&&m.push(t._getSnapshotInfoByUrl(u,p)),m.length>0)return Promise.all(m).then((function(){s(p)}));s(p)}))}))}))}},{key:"_getRawOrUploadProxyUrl",value:function(e){var t=this.getModule(Kn).getFileUploadProxy(),n=e;return t&&(n=e.replace(/^https:\/\/[^/]+/,t)),n}},{key:"_getFile",value:function(e){var t;return it(e.file.files)||(t=e.file.files,"filelist"===dt(t))?e.file.files[0]:e.file}},{key:"_formatFileSize",value:function(e){return e<1024?e+"B":e<1048576?Math.floor(e/1024)+"KB":Math.floor(e/1048576)+"MB"}},{key:"_formatSpeed",value:function(e){return e<=1048576?Vt(e/1024,1)+"KB/s":Vt(e/1048576,1)+"MB/s"}},{key:"_createCosOptionsWeb",value:function(e){var t=this._getFile(e),n=t.name,o=n.slice(n.lastIndexOf(".")),s=this._genFileName("".concat(Mt(999999)).concat(o));return{files:[{Bucket:"".concat(this.bucketName,"-").concat(this.appid),Region:this.region,Key:"".concat(this.directory,"/").concat(s),Body:t}],SliceSize:1048576,onProgress:function(t){if("function"==typeof e.onProgress)try{e.onProgress(t.percent)}catch(n){He.w("onProgress callback error:",n)}},onFileFinish:function(e,t,n){}}}},{key:"_createCosOptionsWXMiniApp",value:function(e){var t=this._getFile(e),n=this._genFileName(t.name),o=t.url;return{Bucket:"".concat(this.bucketName,"-").concat(this.appid),Region:this.region,Key:"".concat(this.directory,"/").concat(n),FilePath:o,onProgress:function(t){if(He.l(JSON.stringify(t)),"function"==typeof e.onProgress)try{e.onProgress(t.percent)}catch(n){He.w("onProgress callback error:",n)}}}}},{key:"_createCosOptionsPreSigUrl",value:function(e){var t=this,n="",o="",s=0,a=this._getFile(e);if(ue)n=this._genFileName(a.name),o=a.url,s=1;else{var r=a.name,i=r.slice(r.lastIndexOf("."));n=this._genFileName("".concat(Mt(999999)).concat(i)),o=a,s=0}return this._getCosPreSigUrl({fileType:this.uploadFileType,fileName:n,uploadMethod:s,duration:this.duration}).then((function(s){var a=s.uploadUrl,r=s.downloadUrl,i=s.requestSnapshotUrl,u=void 0===i?void 0:i,c=s.thumbUrl,l=s.largeUrl;return{url:t._getRawOrUploadProxyUrl(a),fileType:t.uploadFileType,fileName:n,resources:o,downloadUrl:r,requestSnapshotUrl:u,thumbUrl:c,largeUrl:l,onProgress:function(t){if("function"==typeof e.onProgress)try{e.onProgress(t.percent)}catch(n){He.w("onProgress callback error:",n),He.e(n)}}}}))}},{key:"_genFileName",value:function(e){return"".concat(Ut(),"-").concat(e)}},{key:"_setUploadFileType",value:function(e){this.uploadFileType=e}},{key:"_getSnapshotInfoByUrl",value:function(e,t){var n=this,o=new li("getSnapshotInfo");return this.request({protocolName:Ks,requestData:{platform:this.getPlatform(),coverName:this._genFileName(Mt(99999)),requestSnapshotUrl:e}}).then((function(e){var n=(e.data||{}).snapshotUrl;return o.setMessage("snapshotUrl:".concat(n)).end(),Zt(n)?{}:Pt(n).then((function(e){t.snapshotInfo={snapshotUrl:n,snapshotWidth:e.width,snapshotHeight:e.height}}))})).catch((function(e){return He.w("".concat(n._n,"._getSnapshotInfoByUrl failed. error:"),e),o.setCode(e.errorCode).setMessage(e.errorInfo).end(),{}}))}},{key:"_getSmallImageInfoByUrl",value:function(e,t){return Pt(e).then((function(n){t.smallImageUrl=e,t.smallImageWidth=n.width,t.smallImageHeight=n.height}))}},{key:"_getLargeImageInfoByUrl",value:function(e,t){return Pt(e).then((function(n){t.largeImageUrl=e,t.largeImageWidth=n.width,t.largeImageHeight=n.height}))}},{key:"reset",value:function(){He.l("".concat(this._n,".reset"))}}]),s}(po),zu=["downloadKey","pbDownloadKey","messageList"],Ju=function(){function e(t){o(this,e),this._n="MergerMessageHandler",this._messageModule=t}return a(e,[{key:"uploadMergerMessage",value:function(e,t){var n=this,o="".concat(this._n,".").concat("uploadMergerMessage");He.d("".concat(o," message:"),e,"messageBytes:".concat(t));var s=e.payload.messageList,a=s.length,r=new li("uploadMergerMessage");return this._messageModule.request({protocolName:Qs,requestData:{messageList:s}}).then((function(e){He.d("".concat(o," ok. response:"),e.data);var s=e.data,i=s.pbDownloadKey,u=s.downloadKey,c={pbDownloadKey:i,downloadKey:u,messageNumber:a};return r.setNetworkType(n._messageModule.getNetworkType()).setMessage("".concat(a,"-").concat(t,"-").concat(u)).end(),c})).catch((function(e){throw He.w("".concat(o," failed. error:"),e),n._messageModule.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];r.setError(e,o,s).end()})),e}))}},{key:"downloadMergerMessage",value:function(e){var n=this,o="".concat(this._n,".").concat("downloadMergerMessage");He.d("".concat(o," message:"),e);var s=e.payload.downloadKey,a=this._messageModule.getFileDownloadProxy(),r=new li("downloadMergerMessage");return r.setMessage("downloadKey:".concat(s)),this._messageModule.request({protocolName:Zs,requestData:{downloadKey:s}}).then((function(s){if(He.d("".concat(o," ok. response:"),s.data),lt(e.clearElement)){var i=e.payload,u=(i.downloadKey,i.pbDownloadKey,i.messageList,g(i,zu));e.clearElement(),e.setElement({type:e.type,content:t({messageList:s.data.messageList},u)},a)}else{var c=[];s.data.messageList.forEach((function(e){if(!Zt(e)){var t=new Ti(e,a);c.push(t)}})),e.payload.messageList=c,e.payload.downloadKey="",e.payload.pbDownloadKey=""}return r.setNetworkType(n._messageModule.getNetworkType()).end(),e})).catch((function(e){throw He.w("".concat(o," failed. key:").concat(s," error:"),e),n._messageModule.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];r.setError(e,o,s).end()})),e}))}},{key:"createMergerMessagePack",value:function(e,t,n){return e.conversationType===S.CONV_C2C?this._createC2CMergerMessagePack(e,t,n):this._createGroupMergerMessagePack(e,t,n)}},{key:"_createC2CMergerMessagePack",value:function(e,t,n){var o=null;t&&(t.offlinePushInfo&&(o=t.offlinePushInfo),!0===t.onlineUserOnly&&(o?o.disablePush=!0:o={disablePush:!0}));var s=[];if(rt(t)&&rt(t.messageControlInfo)){var a=t.messageControlInfo,r=a.excludedFromUnreadCount,i=a.excludedFromLastMessage,u=a.excludedFromContentModeration;!0===r&&s.push("NoUnread"),!0===i&&s.push("NoLastMsg"),!0===u&&s.push("NoMsgCheck")}var c="";st(e.cloudCustomData)&&e.cloudCustomData.length>0&&(c=e.cloudCustomData);var l=n.pbDownloadKey,p=n.downloadKey,d=n.messageNumber,g=e.payload,h=g.title,_=g.abstractList,f=g.compatibleText,v=this._messageModule.getModule(qn),m=v&&v.isOnlineMessage(e,t)?0:void 0;return{protocolName:Mo,tjgID:this._messageModule.generateTjgID(e),requestData:{fromAccount:this._messageModule.getMyUserID(),toAccount:e.to,msgBody:[{msgType:e.type,msgContent:{pbDownloadKey:l,downloadKey:p,title:h,abstractList:_,compatibleText:f,messageNumber:d}}],cloudCustomData:c,clientTime:e.clientTime,msgSeq:e.sequence,msgRandom:e.random,msgLifeTime:m,offlinePushInfo:o?{pushFlag:!0===o.disablePush?1:0,title:o.title||"",desc:o.description||"",ext:o.extension||"",apnsInfo:{badgeMode:!0===o.ignoreIOSBadge?1:0},androidInfo:{OPPOChannelID:o.androidOPPOChannelID||""}}:void 0,messageControlInfo:0!==m?s:void 0,isSupportExtension:!0===e.isSupportExtension?1:0}}}},{key:"_createGroupMergerMessagePack",value:function(e,t,n){var o=null;t&&t.offlinePushInfo&&(o=t.offlinePushInfo);var s=[];if(rt(t)&&rt(t.messageControlInfo)){var a=t.messageControlInfo,r=a.excludedFromUnreadCount,i=a.excludedFromLastMessage,u=a.excludedFromContentModeration;!0===r&&s.push("NoUnread"),!0===i&&s.push("NoLastMsg"),!0===u&&s.push("NoMsgCheck")}var c="";st(e.cloudCustomData)&&e.cloudCustomData.length>0&&(c=e.cloudCustomData);var l=n.pbDownloadKey,p=n.downloadKey,d=n.messageNumber,g=e.payload,h=g.title,_=g.abstractList,f=g.compatibleText,v=this._messageModule.getModule(Fn),m=v&&v.isOnlineMessage(e,t)?1:0;return{protocolName:yo,tjgID:this._messageModule.generateTjgID(e),requestData:{fromAccount:this._messageModule.getMyUserID(),groupID:e.to,msgBody:[{msgType:e.type,msgContent:{pbDownloadKey:l,downloadKey:p,title:h,abstractList:_,compatibleText:f,messageNumber:d}}],random:e.random,priority:e.priority,clientSequence:e.clientSequence,groupAtInfo:void 0,cloudCustomData:c,onlineOnlyFlag:m,offlinePushInfo:o?{pushFlag:!0===o.disablePush?1:0,title:o.title||"",desc:o.description||"",ext:o.extension||"",apnsInfo:{badgeMode:!0===o.ignoreIOSBadge?1:0},androidInfo:{OPPOChannelID:o.androidOPPOChannelID||""}}:void 0,clientTime:e.clientTime,needReadReceipt:!0!==e.needReadReceipt||v.isMessageFromOrToAVChatroom(e.to)?0:1,messageControlInfo:0===m?s:void 0,isSupportExtension:!0===e.isSupportExtension?1:0}}}}]),e}(),Xu={ERR_SVR_COMM_SENSITIVE_TEXT:80001,ERR_SVR_COMM_BODY_SIZE_LIMIT:80002,OPEN_SERVICE_OVERLOAD_ERROR:60022,ERR_SVR_MSG_PKG_PARSE_FAILED:20001,ERR_SVR_MSG_INTERNAL_AUTH_FAILED:20002,ERR_SVR_MSG_INVALID_ID:20003,ERR_SVR_MSG_PUSH_DENY:20006,ERR_SVR_MSG_IN_PEER_BLACKLIST:20007,ERR_SVR_MSG_BOTH_NOT_FRIEND:20009,ERR_SVR_MSG_NOT_PEER_FRIEND:20010,ERR_SVR_MSG_NOT_SELF_FRIEND:20011,ERR_SVR_MSG_SHUTUP_DENY:20012,ERR_SVR_GROUP_INVALID_PARAMETERS:10004,ERR_SVR_GROUP_PERMISSION_DENY:10007,ERR_SVR_GROUP_NOT_FOUND:10010,ERR_SVR_GROUP_INVALID_GROUPID:10015,ERR_SVR_GROUP_REJECT_FROM_THIRDPARTY:10016,ERR_SVR_GROUP_SHUTUP_DENY:10017,MESSAGE_SEND_FAIL:2100,OVER_FREQUENCY_LIMIT:2996},Qu=[Na,Fa,xa,Ra,Va,za,Ja,Wa,ja,Ba,Ha,Da];function Zu(e){var t=!1;return Object.values(Xu).includes(e)&&(t=!0),(e>=120001&&e<=13e4||e>=10100&&e<=10200)&&(t=!0),t}var $u=function(e){i(s,e);var n=f(s);function s(e){var t;return o(this,s),(t=n.call(this,e))._n="MessageModule",t._messageOptionsMap=new Map,t._mergerMessageHandler=new Ju(h(t)),t}return a(s,[{key:"createTextMessage",value:function(e){var t=this.getMyUserID();e.currentUser=t,e.senderTinyID=this.getMyTinyID();var n=new Si(e),o="string"==typeof e.payload?e.payload:e.payload.text,s=new pi({text:o}),a=this._getNickAndAvatarByUserID(t);return n.setElement(s),n.setNickAndAvatar(a),n.setNameCard(this._getNameCardByGroupID(n)),n}},{key:"createImageMessage",value:function(e){var t=this.getMyUserID();e.currentUser=t,e.senderTinyID=this.getMyTinyID();var n=new Si(e);if(ue){var o=e.payload.file;if(nt(o))return void this.outputWarning("FileUnsupportedInMP","createImageMessage");var s=o.tempFiles[0].path||o.tempFiles[0].tempFilePath,a={url:s,name:s.slice(s.lastIndexOf("/")+1),size:o.tempFiles&&o.tempFiles[0].size||1,type:s.slice(s.lastIndexOf(".")+1).toLowerCase()};e.payload.file=a}else if(ce)if(nt(e.payload.file)){var r=e.payload.file;e.payload.file={files:[r]}}else if(rt(e.payload.file)&&"undefined"!=typeof uni){var i=e.payload.file.tempFiles[0];e.payload.file={files:[i]}}var u=new di({imageFormat:Ke.UNKNOWN,uuid:this._generateUUID(e.payload.file),file:e.payload.file}),c=this._getNickAndAvatarByUserID(t);return n.setElement(u),n.setNickAndAvatar(c),n.setNameCard(this._getNameCardByGroupID(n)),this._messageOptionsMap.set(n.clientSequence,e),n}},{key:"createAudioMessage",value:function(e){var t=e.payload.file;if(ue){var n={url:t.tempFilePath,name:t.tempFilePath.slice(t.tempFilePath.lastIndexOf("/")+1),size:t.fileSize,second:parseInt(t.duration)/1e3,type:t.tempFilePath.slice(t.tempFilePath.lastIndexOf(".")+1).toLowerCase()};e.payload.file=n}var o=this.getMyUserID();e.currentUser=o,e.senderTinyID=this.getMyTinyID();var s=new Si(e),a=new hi({second:Math.floor(t.duration/1e3),size:t.fileSize||t.size,url:t.tempFilePath,uuid:this._generateUUID(e.payload.file)}),r=this._getNickAndAvatarByUserID(o);return s.setElement(a),s.setNickAndAvatar(r),s.setNameCard(this._getNameCardByGroupID(s)),this._messageOptionsMap.set(s.clientSequence,e),s}},{key:"createVideoMessage",value:function(e){var t=this.getMyUserID();e.currentUser=t,e.senderTinyID=this.getMyTinyID(),e.payload.file.thumbUrl="",e.payload.file.thumbSize=0;var n={};if(ue){if(se)return void this.outputWarning("VideoUnsupportedInAlipay");if(nt(e.payload.file))return void this.outputWarning("FileUnsupportedInMP","createVideoMessage");var o=e.payload.file;it(o.tempFiles)&&(o=o.tempFiles[0]),n.url=o.tempFilePath,n.name=o.tempFilePath.slice(o.tempFilePath.lastIndexOf("/")+1),n.size=o.size||1,n.second=o.duration||0,n.type=o.tempFilePath.slice(o.tempFilePath.lastIndexOf(".")+1).toLowerCase()}else if(ce){if(nt(e.payload.file)){var s=e.payload.file;e.payload.file.files=[s]}else if(rt(e.payload.file)&&"undefined"!=typeof uni){var a=e.payload.file.tempFile;e.payload.file.files=[a]}var r=e.payload.file;n.url=window.URL.createObjectURL(r.files[0]),n.name=r.files[0].name,n.size=r.files[0].size||1,n.second=r.files[0].duration||0,n.type=r.files[0].type.split("/")[1]}e.payload.file.videoFile=n;var i=new Si(e),u=new Ii({videoFormat:n.type,videoSecond:Vt(n.second,0),videoSize:n.size,remoteVideoUrl:"",videoUrl:n.url,videoUUID:this._generateUUID(e.payload.file.videoFile),thumbUUID:this._generateUUID(e.payload.file.videoFile),thumbWidth:e.payload.file.width||200,thumbHeight:e.payload.file.height||200,thumbUrl:e.payload.file.thumbUrl,thumbSize:e.payload.file.thumbSize,thumbFormat:e.payload.file.thumbUrl.slice(e.payload.file.thumbUrl.lastIndexOf(".")+1).toLowerCase()}),c=this._getNickAndAvatarByUserID(t);return i.setElement(u),i.setNickAndAvatar(c),i.setNameCard(this._getNameCardByGroupID(i)),this._messageOptionsMap.set(i.clientSequence,e),i}},{key:"createCustomMessage",value:function(e){var t=this.getMyUserID();e.currentUser=t,e.senderTinyID=this.getMyTinyID();var n=new Si(e),o=new yi({data:e.payload.data,description:e.payload.description,extension:e.payload.extension}),s=this._getNickAndAvatarByUserID(t);return n.setElement(o),n.setNickAndAvatar(s),n.setNameCard(this._getNameCardByGroupID(n)),n}},{key:"createFaceMessage",value:function(e){var t=this.getMyUserID();e.currentUser=t,e.senderTinyID=this.getMyTinyID();var n=new Si(e),o=new gi(e.payload),s=this._getNickAndAvatarByUserID(t);return n.setElement(o),n.setNickAndAvatar(s),n.setNameCard(this._getNameCardByGroupID(n)),n}},{key:"createMergerMessage",value:function(e){var t=this.getMyUserID();e.currentUser=t,e.senderTinyID=this.getMyTinyID();var n=this._getNickAndAvatarByUserID(t),o=new Si(e),s=new Di(e.payload);return o.setElement(s),o.setNickAndAvatar(n),o.setNameCard(this._getNameCardByGroupID(o)),o.setRelayFlag(!0),o}},{key:"createForwardMessage",value:function(e){var t=e.to,n=e.conversationType,o=e.priority,s=e.payload,a=e.needReadReceipt,r=e.receiverList,i=this.getMyUserID(),u=this._getNickAndAvatarByUserID(i);if(s.type===S.MSG_GRP_TIP)return Oi({code:er});var c={to:t,conversationType:n,conversationID:"".concat(n).concat(t),priority:o,isPlaceMessage:0,status:nn.UNSEND,currentUser:i,senderTinyID:this.getMyTinyID(),cloudCustomData:e.cloudCustomData||s.cloudCustomData||"",needReadReceipt:a,receiverList:r,isSupportExtension:e.isSupportExtension||!1},l=new Si(c);return l.setElement(s.getElements()[0]),l.setNickAndAvatar(u),l.setNameCard(this._getNameCardByGroupID(s)),l.setRelayFlag(!0),l}},{key:"downloadMergerMessage",value:function(e){return this._mergerMessageHandler.downloadMergerMessage(e)}},{key:"createFileMessage",value:function(e){if(ue){if(!ee&&!te&&!re)return;var n=le.getSystemInfoSync().SDKVersion;if(ee&&wt(n,"2.5.0")<0)return void this.outputWarning("WXChooseMessageFile");if(te&&wt(n,"1.18.0")<0)return void this.outputWarning("QQChooseMessageFile")}if(ce||re){if(nt(e.payload.file)){var o=e.payload.file;e.payload.file={files:[o]}}else if(rt(e.payload.file)&&"undefined"!=typeof uni){var s=e.payload.file,a=s.tempFiles,r=s.files,i=null;it(a)?i=a[0]:it(r)&&(i=r[0]),e.payload.file={files:[i]}}}else if(ee||te){var u=e.payload.file.tempFiles,c=t(t({},u[0]),{},{url:u[0].path});e.payload.file={files:[c]}}var l=this.getMyUserID();e.currentUser=l,e.senderTinyID=this.getMyTinyID();var p=new Si(e),d=new Mi({uuid:this._generateUUID(e.payload.file),file:e.payload.file}),g=this._getNickAndAvatarByUserID(l);return p.setElement(d),p.setNickAndAvatar(g),p.setNameCard(this._getNameCardByGroupID(p)),this._messageOptionsMap.set(p.clientSequence,e),p}},{key:"createLocationMessage",value:function(e){var t=this.getMyUserID();e.currentUser=t,e.senderTinyID=this.getMyTinyID();var n=new Si(e),o=new Ci(e.payload),s=this._getNickAndAvatarByUserID(t);return n.setElement(o),n.setNickAndAvatar(s),n.setNameCard(this._getNameCardByGroupID(n)),n}},{key:"_onCannotFindModule",value:function(){return Oi({code:Pr})}},{key:"sendMessageInstance",value:function(e,t){var n=this;if(!1===this.getModule(io).filterMessage(e,t))return this._onSendMessageFailed(e,new Ei({code:Wr}));var o,s=null;switch(e.conversationType){case S.CONV_C2C:if(!(s=this.getModule(qn)))return this._onCannotFindModule();break;case S.CONV_GROUP:if(!(s=this.getModule(Fn)))return this._onCannotFindModule();if(Et({groupID:e.to})){var a=s.getLocalGroupProfile(e.to);if(a&&a.isSupportTopic)return Oi({code:ba})}break;default:return Oi({code:Aa})}var r=this.getModule(Jn),i=this.getModule(Fn);return r.upload(e).then((function(){n._getSendMessageSpecifiedKey(e)===ti&&n.getModule(so).addSuccessCount(ni);return i.guardForAVChatRoom(e).then((function(){if(!e.isSendable())return Oi({code:Xa});n._addSendMessageTotalCount(e),o=Date.now();var a=function(e){var t="utf-8";ce&&document&&(t=document.charset.toLowerCase());var n,o,s=0;if(o=e.length,"utf-8"===t||"utf8"===t)for(var a=0;a<o;a++)(n=e.codePointAt(a))<=127?s+=1:n<=2047?s+=2:n<=65535?s+=3:(s+=4,a++);else if("utf-16"===t||"utf16"===t)for(var r=0;r<o;r++)(n=e.codePointAt(r))<=65535?s+=2:(s+=4,r++);else s=e.replace(/[^\x00-\xff]/g,"aa").length;return s}(JSON.stringify(e));return e.type===S.MSG_MERGER&&a>11264?n._mergerMessageHandler.uploadMergerMessage(e,a).then((function(o){var s=n._mergerMessageHandler.createMergerMessagePack(e,t,o);return n.request(s)})):(n.getModule(Hn).setMessageRandom(e),e.conversationType===S.CONV_C2C||e.conversationType===S.CONV_GROUP?s.sendMessage(e,t):void 0)})).then((function(a){var r=a.data,i=r.time,u=r.sequence,c=r.readReceiptCode;ot(c)&&0!==c&&(new li("sendMessageWithReceipt").setMessage("from:".concat(e.from," to:").concat(e.to," sequence:").concat(u," readReceiptCode:").concat(c)).end(),He.w("".concat(n._n,".sendMessageInstance readReceiptCode:").concat(c," message:").concat(n.getErrorMessage(c))));n._addSendMessageSuccessCount(e,o),n._messageOptionsMap.delete(e.clientSequence);var l=n.getModule(Hn);e.status=nn.SUCCESS,e.time=i;var p=!1;if(e.conversationType===S.CONV_GROUP)e.sequence=u;else if(e.conversationType===S.CONV_C2C){var d=l.getLatestMessageSentByMe(e.conversationID);if(d){var g=d.nick,h=d.avatar;g===e.nick&&h===e.avatar||(p=!0)}}if(p&&l.modifyMessageSentByMe({conversationID:e.conversationID,latestNick:e.nick,latestAvatar:e.avatar}),s.isOnlineMessage(e,t))e._onlineOnlyFlag=!0;else{l.appendToMessageList(e);var _=e;rt(t)&&rt(t.messageControlInfo)&&(!0===t.messageControlInfo.excludedFromLastMessage&&(e._isExcludedFromLastMessage=!0,_=""),!0===t.messageControlInfo.excludedFromUnreadCount&&(e._isExcludedFromUnreadCount=!0));var f=e.conversationType;if(At(e.to))f=S.CONV_TOPIC,n.getModule(Bn).onMessageSent({groupID:Kt(e.to),topicID:e.to,lastMessage:_});l.onMessageSent({conversationOptionsList:[{conversationID:e.conversationID,unreadCount:0,type:f,subType:e.conversationSubType,lastMessage:_}]})}return e.getRelayFlag()||"TIMImageElem"!==e.type||Ft(e.payload.imageInfoArray),Li({message:e})}))})).catch((function(t){return n._onSendMessageFailed(e,t)}))}},{key:"_onSendMessageFailed",value:function(e,t){e.status=nn.FAIL,this.getModule(Hn).deleteMessageRandom(e),this._addSendMessageFailCountOnUser(e,t);var n=new li("sendMessage");return n.setMessage("tjg_id:".concat(this.generateTjgID(e)," type:").concat(e.type," from:").concat(e.from," to:").concat(e.to)),this.probeNetwork().then((function(e){var o=v(e,2),s=o[0],a=o[1];n.setError(t,s,a).end()})),He.e("".concat(this._n,"._onSendMessageFailed error:"),t),Oi(new Ei({code:t&&t.code?t.code:Sa,message:t&&t.message?t.message:void 0,data:{message:e}}))}},{key:"_getSendMessageSpecifiedKey",value:function(e){if([S.MSG_IMAGE,S.MSG_AUDIO,S.MSG_VIDEO,S.MSG_FILE].includes(e.type))return ti;if(e.conversationType===S.CONV_C2C)return Zr;if(e.conversationType===S.CONV_GROUP){var t=this.getModule(Fn).getLocalGroupProfile(e.to);if(!t)return;var n=t.type;return Lt(n)?ei:$r}}},{key:"_addSendMessageTotalCount",value:function(e){var t=this._getSendMessageSpecifiedKey(e);t&&this.getModule(so).addTotalCount(t)}},{key:"_addSendMessageSuccessCount",value:function(e,t){var n=Math.abs(Date.now()-t),o=this._getSendMessageSpecifiedKey(e);if(o){var s=this.getModule(so);s.addSuccessCount(o),s.addCost(o,n)}}},{key:"_addSendMessageFailCountOnUser",value:function(e,t){var n,o,s=t.code,a=void 0===s?-1:s,r=this.getModule(so),i=this._getSendMessageSpecifiedKey(e);i===ti&&(n=a,o=!1,Qu.includes(n)&&(o=!0),o)?r.addFailedCountOfUserSide(ni):Zu(a)&&i&&r.addFailedCountOfUserSide(i)}},{key:"resendMessage",value:function(e){return e.isResend=!0,e.status=nn.UNSEND,this.sendMessageInstance(e)}},{key:"revokeMessage",value:function(e){var t=this,n=null;if(e.conversationType===S.CONV_C2C?n=this.getModule(qn):e.conversationType===S.CONV_GROUP&&(n=this.getModule(Fn)),!n)return this._onCannotFindModule();var o=new li("revokeMessage");o.setMessage("tjg_id:".concat(this.generateTjgID(e)," type:").concat(e.type," from:").concat(e.from," to:").concat(e.to));var s="".concat(this._n,".").concat("revokeMessage");return n.revokeMessage(e).then((function(n){var a=n.data.recallRetList;if(!Zt(a)&&0!==a[0].retCode){var r=new Ei({code:a[0].retCode,data:{message:e}});return o.setCode(r.code).setMoreMessage(r.message).end(),Oi(r)}return He.i("".concat(s," ok. ID:").concat(e.ID)),e.isRevoked=!0,o.end(),t.getModule(Hn).onMessageRevoked([e]),Li({message:e})})).catch((function(n){t.probeNetwork().then((function(e){var t=v(e,2),s=t[0],a=t[1];o.setError(n,s,a).end()}));var a=new Ei({code:n&&n.code?n.code:Oa,message:n&&n.message?n.message:void 0,data:{message:e}});return He.w("".concat(s," failed. error:"),n),Oi(a)}))}},{key:"deleteMessage",value:function(e){var t=this,n=null,o=e[0],s=o.conversationID,a="",r=[],i=[];if(o.conversationType===S.CONV_C2C)n=this.getModule(qn),a=s.replace(S.CONV_C2C,""),e.forEach((function(e){e&&e.status===nn.SUCCESS&&e.conversationID===s&&(e._onlineOnlyFlag||r.push("".concat(e.sequence,"_").concat(e.random,"_").concat(e.time)),i.push(e))}));else if(o.conversationType===S.CONV_GROUP)n=this.getModule(Fn),a=s.replace(S.CONV_GROUP,""),e.forEach((function(e){e&&e.status===nn.SUCCESS&&e.conversationID===s&&(e._onlineOnlyFlag||r.push("".concat(e.sequence)),i.push(e))}));else if(o.conversationType===S.CONV_SYSTEM)return Oi({code:wa});if(!n)return this._onCannotFindModule();if(0===r.length)return this._onMessageDeleted(i);r.length>30&&(r=r.slice(0,30),i=i.slice(0,30));var u=new li("deleteMessage");u.setMessage("to:".concat(a," count:").concat(r.length));var c="".concat(this._n,".").concat("deleteMessage");return n.deleteMessage({to:a,keyList:r}).then((function(e){return u.end(),He.i("".concat(c," ok")),t._onMessageDeleted(i)})).catch((function(e){t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];u.setError(e,o,s).end()})),He.w("".concat(c," failed. error:"),e);var n=new Ei({code:e&&e.code?e.code:Ga,message:e&&e.message?e.message:void 0});return Oi(n)}))}},{key:"_onMessageDeleted",value:function(e){return this.getModule(Hn).onMessageDeleted(e),Ni({messageList:e})}},{key:"translateText",value:function(e){var n="".concat(this._n,".").concat("translateText"),o=e.sourceTextList,s=e.sourceLanguage,a=e.targetLanguage,r=new li("translateText");return r.setMessage("sourceLanguage:".concat(s," targetLanguage:").concat(a)),this.request({protocolName:fa,requestData:{sourceTextList:o,source:s||"auto",target:a,from:this.getMyTinyID(),SDKAppID:this.getSDKAppID()}}).then((function(e){var o=e.data,s=o.error,a=o.requestID,i=o.translatedTextList;if(0===s.code)return r.end(),He.i("".concat(n," ok. requestID:").concat(a)),Li({translatedTextList:i});throw t(t({},s),{},{requestID:a})})).catch((function(e){return r.setCode(e.code).setMoreMessage(e.requestID).end(),He.w("".concat(n," failed. error:"),e),Oi({code:qa})}))}},{key:"modifyRemoteMessage",value:function(e){var t=this,n=null,o=e.conversationType,s=e.to;if(this.getModule(Fn).isMessageFromOrToAVChatroom(s))return Oi({code:nr,data:{message:e}});if(!1===this.getModule(io).filterMessage(e))return Oi({code:Wr,data:{message:e}});o===S.CONV_C2C?n=this.getModule(qn):o===S.CONV_GROUP&&(n=this.getModule(Fn));var a=new li("modifyMessage");a.setMessage("to:".concat(s));var r="".concat(this._n,".modifyRemoteMessage");return n.modifyRemoteMessage(e).then((function(n){a.end(),He.i("".concat(r," ok"));var o=t._onModifyRemoteMessageResp(e,n.data);return Li({message:o})})).catch((function(n){if(a.setCode(n.code).setMoreMessage(n.message).end(),He.w("".concat(r," failed. error:"),n),20027===n.code){var o=t._onModifyRemoteMessageResp(e,n.data);return Oi({code:tr,data:{message:o}})}return Oi({code:n.code,message:n.message,data:{message:e}})}))}},{key:"_onModifyRemoteMessageResp",value:function(e,t){He.d("".concat(this._n,"._onModifyRemoteMessageResp options:"),t);var n=e.conversationType,o=e.from,s=e.to,a=e.random,r=e.sequence,i=e.time,u=t.elements,c=t.messageVersion,l=t.cloudCustomData,p=void 0===l?"":l;return this.getModule(Hn).onMessageModified({conversationType:n,from:o,to:s,time:i,random:a,sequence:r,elements:u,cloudCustomData:p,messageVersion:c})}},{key:"_generateUUID",value:function(e){var t=this.getModule(Kn),n="".concat(t.getSDKAppID(),"-").concat(t.getUserID(),"-").concat(function(){for(var e="",t=32;t>0;--t)e+=yt[Math.floor(Math.random()*It)];return e}()),o=e.name||e.value||e.url||e.tempFilePath,s=o&&o.slice(o.lastIndexOf(".")+1);return s&&(n="".concat(n,".").concat(s)),n}},{key:"getMessageOption",value:function(e){return this._messageOptionsMap.get(e)}},{key:"_getNickAndAvatarByUserID",value:function(e){return this.getModule(wn).getNickAndAvatarByUserID(e)}},{key:"_getNameCardByGroupID",value:function(e){if(e.conversationType===S.CONV_GROUP){var t=this.getModule(Fn);if(t)return t.getMyNameCardByGroupID(e.to)}return""}},{key:"reset",value:function(){He.l("".concat(this._n,".reset")),this._messageOptionsMap.clear()}}]),s}(po),ec=function(e){i(n,e);var t=f(n);function n(e){var s;return o(this,n),(s=t.call(this,e))._n="MessageExtensionModule",s.messageExtensionMap=new Map,s.globalSeqMap=new Map,s.getMessageExtensionsMap=new Map,s}return a(n,[{key:"onMessageExtensionNotify",value:function(e){var t=this,n=e.dataList,o=n.messageInfo,s=n.operateType,a=n.operateResultList,r=n.tinyID,i=n.globalSequence,u=o.clientTime,c=o.random,l="".concat(r,"-").concat(u,"-").concat(c),p=[],d=[];He.l("".concat(this._n,".onMessageExtensionNotify messageID:").concat(l," operateType:").concat(s," globalSequence:").concat(i)),this._updateGlobalSequence(l,i);var g=!1,h=!1;a.forEach((function(e){var n=e.extensions,o=void 0===n?[]:n,a=e.clearSequence;if(1===s)g=!0,o.forEach((function(e){p.push({key:e.key,value:e.value})})),t._updateLocalExtension(l,o);else if(2===s)h=!0,o.forEach((function(e){d.push(e.key)})),t._updateLocalExtension(l,o);else if(3===s){if(h=!0,t._hasLocalExtension(l))t._getLocalExtension(l).forEach((function(e,t){e.seq<=a&&!Zt(e.value)&&d.push(t)}));t._clearLocalExtension(l,a)}})),g&&this.emitOuterEvent(k.MESSAGE_EXTENSIONS_UPDATED,{messageID:l,extensions:p}),h&&this.emitOuterEvent(k.MESSAGE_EXTENSIONS_DELETED,{messageID:l,keyList:d})}},{key:"setMessageExtensions",value:function(e,t){var n=this;if(!this.canIUse(B.MSG_EXT))return Oi({code:Kr});var o="".concat(this._n,".").concat("setMessageExtensions"),s=e.ID,a=e.conversationID,r=e.sequence,i=e.time,u=m(t);t.length>20&&(u=t.slice(0,20),He.w("".concat(o,". the length of extensions cannot exceed 20.")));var c="conversationID:".concat(a," messageID:").concat(s," sequence:").concat(r," time:").concat(i," count:").concat(u.length),l=new li("setMessageExtensions");return l.setMessage(c),He.l("".concat(o," ").concat(c)),this._modifyMessageExtensions(e,u).then((function(e){var t=e.resultList,n=e.successCount,s=e.failureCount,a="success count:".concat(n," fail count:").concat(s);return l.setMoreMessage(a).end(),He.l("".concat(o," ok. ").concat(a)),Li({extensions:t})})).catch((function(e){return n.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];l.setError(e,o,s).end()})),He.e("".concat(o," failed. error:"),e),Oi(e)}))}},{key:"getMessageExtensions",value:function(e){var t=this;if(!this.canIUse(B.MSG_EXT))return Oi({code:Kr});var n="".concat(this._n,".").concat("getMessageExtensions"),o=e.ID,s=e.conversationID,a=e.sequence,r=e.time,i="conversationID:".concat(s," messageID:").concat(o," sequence:").concat(a," time:").concat(r),u=new li("getMessageExtensions");u.setMessage(i),He.l("".concat(n," ").concat(i));var c=void 0;return this.getMessageExtensionsMap.has(o)&&(c=this._getGlobalSequence(o)),this._getMessageExtensions(e,c).then((function(e){return u.end(),He.l("".concat(n," ok. total count:").concat(e.length)),ut(c)&&e.length>0&&t.getMessageExtensionsMap.set(o,1),Li({extensions:e})})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];u.setError(e,o,s).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"deleteMessageExtensions",value:function(e,t){var n=this;if(!this.canIUse(B.MSG_EXT))return Oi({code:Kr});var o="".concat(this._n,".").concat("deleteMessageExtensions"),s=[],a=3;Zt(t)||(a=2,t.forEach((function(e){s.push({key:e,value:"",seq:0})})));var r=e.ID,i=e.conversationID,u=e.sequence,c=e.time,l="conversationID:".concat(i," messageID:").concat(r," sequence:").concat(u," time:").concat(c," operateType:").concat(a),p=new li("deleteMessageExtensions");return p.setMessage(l),He.l("".concat(o," ").concat(l)),this._modifyMessageExtensions(e,s,a).then((function(e){var t=e.resultList,n=e.successCount,s=e.failureCount,r="";return 2===a&&(r="success count:".concat(n," fail count:").concat(s)),p.setMoreMessage("".concat(r)).end(),He.l("".concat(o," ok. ").concat(r)),Li({extensions:t})})).catch((function(e){return n.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];p.setError(e,o,s).end()})),He.e("".concat(o," failed. error:"),e),Oi(e)}))}},{key:"_modifyMessageExtensions",value:function(e,t){var n=this,o=arguments.length>2&&void 0!==arguments[2]?arguments[2]:1,s=At(e.to)?S.CONV_TOPIC:e.conversationType,a=void 0;3!==o&&(a=this._getRequestExtensions(e,t));var r=null;switch(s){case S.CONV_C2C:r=this.getModule(qn);break;case S.CONV_GROUP:r=this.getModule(Fn);break;case S.CONV_TOPIC:r=this.getModule(Bn);break;default:return Oi({code:Pr})}return r.modifyMessageExtensions(e,a,o).then((function(t){var o=t.data,s=o.extensions,a=o.seq,r=[],i=0,u=0,c=[];return(s=Zt(s)?[]:s).forEach((function(e){var t=e.errorCode,n=e.extension,o=n.key,s=n.value,a=n.seq;r.push({code:t,key:o,value:s}),0===t?i++:u++,c.push({key:o,value:s,seq:a})})),n._updateGlobalSequence(e.ID,a),c.length>0&&(n._updateLocalExtension(e.ID,c),c=null),{resultList:r,successCount:i,failureCount:u}})).catch((function(e){return Oi(e)}))}},{key:"_getRequestExtensions",value:function(e,t){var n=[];if(this._hasLocalExtension(e.ID)){var o=this._getLocalExtension(e.ID);return t.forEach((function(e){var t=e.key,s=e.value,a=0;o.has(t)&&(a=o.get(t).seq),n.push({key:t,value:s,seq:a})})),n}return t.forEach((function(e){var t=e.key,o=e.value;n.push({key:t,value:o,seq:0})})),n}},{key:"_getMessageExtensions",value:function(e,t){var n=this,o="".concat(this._n,"._getMessageExtensions"),s=e.ID,a=e.to,r=null;switch(At(a)?S.CONV_TOPIC:e.conversationType){case S.CONV_C2C:r=this.getModule(qn);break;case S.CONV_GROUP:r=this.getModule(Fn);break;case S.CONV_TOPIC:r=this.getModule(Bn);break;default:return Oi({code:Pr})}return r.getMessageExtensions(e,t).then((function(t){var a=t.data,r=a.extensions,i=a.completeFlag,u=a.globalSequence,c=a.clearSequence;if(r=Zt(r)?[]:r,He.l("".concat(o," ok. completeFlag:").concat(i," globalSequence:").concat(u," clearSequence:").concat(c," count:").concat(r.length)),n._updateLocalExtension(s,r),n._clearLocalExtension(s,c),n._updateGlobalSequence(s,u),1!==i){var l=r.slice(-1)[0].seq+1;return n._getMessageExtensions(e,l)}return n._getLocalExtensions(s)})).catch((function(e){return Oi(e)}))}},{key:"_hasLocalExtension",value:function(e){return this.messageExtensionMap.has(e)}},{key:"_getLocalExtension",value:function(e){return this.messageExtensionMap.get(e)}},{key:"_updateLocalExtension",value:function(e,t){this._hasLocalExtension(e)||this.messageExtensionMap.set(e,new Map);var n=this._getLocalExtension(e);t.forEach((function(e){var t=e.key,o=e.value,s=void 0===o?"":o,a=e.seq;n.set(t,{value:s,seq:a})}))}},{key:"_clearLocalExtension",value:function(e,t){if(!(t<=0)&&this._hasLocalExtension(e)){var n=this._getLocalExtension(e);n.forEach((function(e,o){e.seq<=t&&n.delete(o)}))}}},{key:"_getLocalExtensions",value:function(e){var t=[];this._hasLocalExtension(e)&&this._getLocalExtension(e).forEach((function(e,n){var o=e.value;Zt(o)||t.push({key:n,value:o})}));return t}},{key:"_getGlobalSequence",value:function(e){return this.globalSeqMap.get(e)}},{key:"_updateGlobalSequence",value:function(e,t){this.globalSeqMap.set(e,t)}},{key:"reset",value:function(){He.l("".concat(this._n,".reset")),this.messageExtensionMap.clear(),this.globalSeqMap.clear(),this.getMessageExtensionsMap.clear()}}]),n}(po),tc=function(e){i(n,e);var t=f(n);function n(e){var s;return o(this,n),(s=t.call(this,e))._n="ComboMessageModule",s}return a(n,[{key:"sendMessage",value:function(e){var t=this,n=this._constructMessageInstance(e);if(null===n)return Oi({code:Sa});this._addSendMessageTotalCount(n);var o=Date.now();return this.getModule(Hn).setMessageRandom(n),this._sendComboMessage(n,e).then((function(e){var s=e.data,a=s.time,r=s.sequence,i=s.readReceiptCode;ot(i)&&0!==i&&(new li("sendMessageWithReceipt").setMessage("from:".concat(n.from," to:").concat(n.to," sequence:").concat(r," readReceiptCode:").concat(i)).end(),He.w("".concat(t._n,".sendMessage readReceiptCode:").concat(i," message:").concat(t.getErrorMessage(i))));t._addSendMessageSuccessCount(n,o);var u=t.getModule(Hn);n.status=nn.SUCCESS,n.time=a,n.conversationType===S.CONV_GROUP&&(n.sequence=r),u.appendToMessageList(n);var c=n;return!0===n._isExcludedFromLastMessage&&(c=""),u.onMessageSent({conversationOptionsList:[{conversationID:n.conversationID,unreadCount:0,type:n.conversationType,subType:n.conversationSubType,lastMessage:c}]}),Li({message:n})})).catch((function(e){return t._onSendMessageFailed(n,e)}))}},{key:"_sendComboMessage",value:function(e,t){var n=this._m.getModule(Zn),o="";return e.conversationType===S.CONV_C2C&&(o="".concat(V.NAME.OPEN_IM,".").concat(V.CMD.SEND_MESSAGE)),e.conversationType===S.CONV_GROUP&&(o="".concat(V.NAME.GROUP,".").concat(V.CMD.SEND_GROUP_MESSAGE)),n.sendComboMessage({servcmd:o,data:t})}},{key:"_constructMessageInstance",value:function(e){var t="".concat(this._n,"._constructMessageInstance"),n=null;try{var o=this.getMyUserID(),s={};if(s.senderTinyID=this.getMyTinyID(),s.currentUser=o,s.from=e.From_Account||o,e.GroupId?(s.conversationID="".concat(S.CONV_GROUP).concat(e.GroupId),s.conversationType=S.CONV_GROUP,s.to=e.GroupId):e.To_Account&&(s.conversationID="".concat(S.CONV_C2C).concat(e.To_Account),s.conversationType=S.CONV_C2C,s.to=e.To_Account),s.time=e.MsgTimeStamp||0,s.random=e.Random||e.MsgRandom||0,s.priority=e.MsgPriority,st(e.CloudCustomData)&&e.CloudCustomData.length>0&&(s.cloudCustomData=e.CloudCustomData),it(e.SendMsgControl)&&(s.messageControlInfo={},e.SendMsgControl.includes("NoUnread")&&(s.messageControlInfo.excludedFromUnreadCount=1),e.SendMsgControl.includes("NoLastMsg")&&(s.messageControlInfo.excludedFromLastMessage=1)),s.conversationType===S.CONV_GROUP&&it(e.To_Account)&&e.To_Account.length>0){var a=e.To_Account;e.To_Account.length>50&&(a=e.To_Account.slice(0,50),He.w("".concat(t," To_Account must be less than or equal to 50."))),s.receiverList=m(a),e.To_Account=m(a)}1!==e.IsNeedReadReceipt&&1!==e.NeedReadReceipt||(s.needReadReceipt=!0),1===e.SupportMessageExtension&&(s.isSupportExtension=!0),(n=new Si(s)).status=nn.UNSEND,e.MsgClientTime=n.clientTime,n.conversationType===S.CONV_C2C&&(e.MsgSeq=n.sequence);for(var r,i=e.MsgBody.length,u=0;u<i;u++)"TIMTextElem"===(r=e.MsgBody[u]).MsgType?n.setTextElement(r.MsgContent.Text):"TIMCustomElem"===r.MsgType?n.setCustomElement({data:r.MsgContent.Data||"",description:r.MsgContent.Desc||"",extension:r.MsgContent.Ext||""}):"TIMFaceElem"===r.MsgType&&n.setFaceElement({index:r.MsgContent.Index,data:r.MsgContent.Data});var c=n.getElements();n.payload=c[0].content,n.type=c[0].type}catch(l){n=null,He.e("".concat(t," failed. error:"),l)}return n}},{key:"_onSendMessageFailed",value:function(e,t){e.status=nn.FAIL,this.getModule(Hn).deleteMessageRandom(e),this._addSendMessageFailCountOnUser(e,t);var n=new li("sendMessage");return n.setMessage("tjg_id:".concat(this.generateTjgID(e)," type:").concat(e.type," from:").concat(e.from," to:").concat(e.to)),this.probeNetwork().then((function(e){var o=v(e,2),s=o[0],a=o[1];n.setError(t,s,a).end()})),He.e("".concat(this._n,"._onSendMessageFailed error:"),t),Oi(new Ei({code:t&&t.code?t.code:Sa,message:t&&t.message?t.message:void 0,data:{message:e}}))}},{key:"_getSendMessageSpecifiedKey",value:function(e){if(e.conversationType===S.CONV_C2C)return Zr;if(e.conversationType===S.CONV_GROUP){var t=this.getModule(Fn).getLocalGroupProfile(e.to);if(!t)return;var n=t.type;return Lt(n)?ei:$r}}},{key:"_addSendMessageTotalCount",value:function(e){var t=this._getSendMessageSpecifiedKey(e);t&&this.getModule(so).addTotalCount(t)}},{key:"_addSendMessageSuccessCount",value:function(e,t){var n=Math.abs(Date.now()-t),o=this._getSendMessageSpecifiedKey(e);if(o){var s=this.getModule(so);s.addSuccessCount(o),s.addCost(o,n)}}},{key:"_addSendMessageFailCountOnUser",value:function(e,t){var n=t.code,o=void 0===n?-1:n,s=this.getModule(so),a=this._getSendMessageSpecifiedKey(e);Zu(o)&&a&&s.addFailedCountOfUserSide(a)}}]),n}(po),nc=function(e){i(n,e);var t=f(n);function n(e){var s;return o(this,n),(s=t.call(this,e))._n="PluginModule",s.plugins={},s}return a(n,[{key:"registerPlugin",value:function(e){var t=this;Object.keys(e).forEach((function(n){t.plugins[n]=e[n]})),new li("registerPlugin").setMessage("".concat(Object.keys(e))).end()}},{key:"getPlugin",value:function(e){return this.plugins[e]}},{key:"reset",value:function(){}}]),n}(po),oc=function(e){i(s,e);var n=f(s);function s(e){var t;return o(this,s),(t=n.call(this,e))._n="SyncUnreadMessageModule",t._cookie="",t._onlineSyncFlag=!1,t.getInnerEmitterInstance().on(Ui,t._onLoginSuccess,h(t)),t}return a(s,[{key:"_onLoginSuccess",value:function(e){this._startSync({cookie:this._cookie,syncFlag:0,isOnlineSync:0})}},{key:"_startSync",value:function(e){var n=this,o=e.cookie,s=e.syncFlag,a=e.isOnlineSync,r="".concat(this._n,"._startSync");He.l("".concat(r," cookie:").concat(o," syncFlag:").concat(s," isOnlineSync:").concat(a)),this.request({protocolName:vo,requestData:{cookie:o,syncFlag:s,isOnlineSync:a}}).then((function(e){var o=e.data,s=o.cookie,a=o.syncFlag;n._cookie=s,Zt(s)||(0===a||1===a?(n._dispatchUnreadMessage(t(t({},e.data),{},{isSyncingEnded:!1})),n._startSync({cookie:s,syncFlag:a,isOnlineSync:0})):2===a&&n._dispatchUnreadMessage(t(t({},e.data),{},{isSyncingEnded:!0})))})).catch((function(e){He.e("".concat(r," failed. error:"),e)}))}},{key:"_dispatchUnreadMessage",value:function(e){e.eventArray&&this.getModule(Zn).onMessage({head:{},body:{eventArray:e.eventArray,isInstantMessage:this._onlineSyncFlag,isSyncingEnded:e.isSyncingEnded}});this.getModule(qn).onNewC2CMessage({dataList:e.messageList,isInstantMessage:!!e.isSyncingEnded&&this._onlineSyncFlag,C2CRemainingUnreadList:e.C2CRemainingUnreadList,C2CPairUnreadList:e.C2CPairUnreadList})}},{key:"startOnlineSync",value:function(){He.l("".concat(this._n,".startOnlineSync")),this._onlineSyncFlag=!0,this._startSync({cookie:this._cookie,syncFlag:0,isOnlineSync:1})}},{key:"startSyncOnReconnected",value:function(){He.l("".concat(this._n,".startSyncOnReconnected.")),this._onlineSyncFlag=!0,this._startSync({cookie:this._cookie,syncFlag:0,isOnlineSync:0})}},{key:"reset",value:function(){He.l("".concat(this._n,".reset")),this._onlineSyncFlag=!1,this._cookie=""}}]),s}(po),sc={request:{toAccount:"To_Account",fromAccount:"From_Account",to:"To_Account",from:"From_Account",groupID:"GroupId",groupAtUserID:"GroupAt_Account",extension:"Ext",data:"Data",description:"Desc",elements:"MsgBody",sizeType:"Type",downloadFlag:"Download_Flag",thumbUUID:"ThumbUUID",videoUUID:"VideoUUID",remoteAudioUrl:"Url",remoteVideoUrl:"VideoUrl",videoUrl:"",imageUrl:"URL",fileUrl:"Url",uuid:"UUID",priority:"MsgPriority",receiverUserID:"To_Account",receiverGroupID:"GroupId",messageSender:"SenderId",messageReceiver:"ReceiverId",nick:"From_AccountNick",avatar:"From_AccountHeadurl",messageNumber:"MsgNum",pbDownloadKey:"PbMsgKey",downloadKey:"JsonMsgKey",applicationType:"PendencyType",userIDList:"To_Account",groupNameList:"GroupName",userID:"To_Account",groupAttributeList:"GroupAttr",mainSequence:"AttrMainSeq",avChatRoomKey:"BytesKey",attributeControl:"AttrControl",sequence:"seq",messageControlInfo:"SendMsgControl",updateSequence:"UpdateSeq",clientTime:"MsgClientTime",sequenceList:"MsgSeqList",topicID:"TopicId",customData:"CustomString",isSupportTopic:"SupportTopic",isWebUniapp:"is_web_uniapp",isSupportExtension:"SupportMessageExtension",messageSequence:"MsgSeq",messageKey:"MsgKey",startSequence:"startSeq",simplifiedMessage:"DownsizeFlag"},response:{MsgPriority:"priority",ThumbUUID:"thumbUUID",VideoUUID:"videoUUID",Download_Flag:"downloadFlag",GroupId:"groupID",Member_Account:"userID",MsgList:"messageList",SyncFlag:"syncFlag",To_Account:"to",From_Account:"from",MsgSeq:"sequence",MsgRandom:"random",MsgTime:"time",MsgTimeStamp:"time",MsgContent:"content",MsgBody:"elements",From_AccountNick:"nick",From_AccountHeadurl:"avatar",GroupWithdrawInfoArray:"revokedInfos",GroupReadInfoArray:"groupMessageReadNotice",LastReadMsgSeq:"lastMessageSeq",WithdrawC2cMsgNotify:"c2cMessageRevokedNotify",C2cWithdrawInfoArray:"revokedInfos",C2cReadedReceipt:"c2cMessageReadReceipt",ReadC2cMsgNotify:"c2cMessageReadNotice",LastReadTime:"peerReadTime",MsgRand:"random",MsgType:"type",MsgShow:"messageShow",NextMsgSeq:"nextMessageSeq",FaceUrl:"avatar",ProfileDataMod:"profileModify",Profile_Account:"userID",ValueBytes:"value",ValueNum:"value",NoticeSeq:"noticeSequence",NotifySeq:"notifySequence",MsgFrom_AccountExtraInfo:"messageFromAccountExtraInformation",Operator_Account:"operatorID",OpType:"operationType",ReportType:"operationType",UserId:"userID",User_Account:"userID",List_Account:"userIDList",MsgOperatorMemberExtraInfo:"operatorInfo",MsgMemberExtraInfo:"memberInfoList",ImageUrl:"avatar",NickName:"nick",MsgGroupNewInfo:"newGroupProfile",MsgAppDefinedData:"groupCustomField",Owner_Account:"ownerID",GroupFaceUrl:"avatar",GroupIntroduction:"introduction",GroupNotification:"notification",GroupApplyJoinOption:"joinOption",MsgKey:"messageKey",GroupInfo:"groupProfile",ShutupTime:"muteTime",Desc:"description",Ext:"extension",GroupAt_Account:"groupAtUserID",MsgNum:"messageNumber",PbMsgKey:"pbDownloadKey",JsonMsgKey:"downloadKey",MsgModifiedFlag:"isModified",PendencyItem:"applicationItem",PendencyType:"applicationType",AddTime:"time",AddSource:"source",AddWording:"wording",ProfileImImage:"avatar",PendencyAdd:"friendApplicationAdded",FrienPencydDel_Account:"friendApplicationDeletedUserIDList",Peer_Account:"userID",GroupAttr:"groupAttributeList",GroupAttrAry:"groupAttributeList",AttrMainSeq:"mainSequence",seq:"sequence",GroupAttrOption:"groupAttributeOption",BytesChangedKeys:"changedKeyList",GroupAttrInfo:"groupAttributeList",GroupAttrSeq:"mainSequence",PushChangedAttrValFlag:"isWithChangedAttributeInfo",SubKeySeq:"sequence",Val:"value",MsgGroupFromCardName:"senderNameCard",MsgGroupFromNickName:"senderNick",C2cNick:"peerNick",C2cImage:"peerAvatar",SendMsgControl:"messageControlInfo",NoLastMsg:"excludedFromLastMessage",NoUnread:"excludedFromUnreadCount",UpdateSeq:"updateSequence",MuteNotifications:"muteFlag",MsgClientTime:"clientTime",TinyId:"tinyID",GroupMsgReceiptList:"readReceiptList",ReadNum:"readCount",UnreadNum:"unreadCount",TopicId:"topicID",MillionGroupFlag:"communityType",SupportTopic:"isSupportTopic",MsgTopicNewInfo:"newTopicInfo",ShutupAll:"muteAllMembers",CustomString:"customData",TopicFaceUrl:"avatar",TopicIntroduction:"introduction",TopicNotification:"notification",TopicIdArray:"topicIDList",MsgVersion:"messageVersion",C2cMsgModNotifys:"c2cMessageModified",GroupMsgModNotifys:"groupMessageModified",ApplyJoinOption:"joinOption",MsgFlag:"messageRemindType",AtInfoList:"groupAtInfoList",AtFlagList:"groupAtType",AtMsgSeq:"sequence",BanDuration:"duration",BanDescription:"reason",NotVisible:"invisible",BytesTag:"tag",BytesValue:"value",RptBytesValue:"value",LatestSeq:"globalSequence",ClearSeq:"clearSequence",SupportMessageExtension:"isSupportExtension",ExtensionList:"extensions",GroupCounter:"counterList",Revoker_Account:"revoker",MsgExtensionNotify:"messageExtensionNotify",ExtensionC2cMsgInfo:"messageInfo",ExtensionGroupMsgInfo:"messageInfo",MsgOptType:"operateType",SetKVInfo:"operateResultList",DeleteKVInfo:"operateResultList",ClearKVInfo:"operateResultList",MsgKeyValue:"extensions",ClearMsgSeq:"clearSequence",MsgLastSeq:"globalSequence",InviteJoinOption:"inviteOption",MemberList_Account:"inviteeList",MsgMemberExtraInfoList:"inviteeInfoList",E:"event",GInf:"groupProfile",MCT:"clientTime",MR:"random",MP:"priority",MTS:"time",GId:"groupID",MS:"sequence",CCD:"cloudCustomData",F_Account:"from",F_Hd:"avatar",F_NN:"nick",GN:"groupName",GT:"groupType",IsSys:"isSystemMessage",OpInf:"operatorInfo",Img:"avatar",NN:"nick",OnlineInf:"onlineMemberInfo",ET:"expireTime",Num:"onlineMemberNum",Opt:"operationType",O_Account:"operatorID",RT:"operationType",UDF:"userDefinedField",L_Account:"userIDList"},ignoreKeyWord:["C2C","ID","USP"]};function ac(e,t){if("string"!=typeof e&&!Array.isArray(e))throw new TypeError("Expected the input to be `string | string[]`");t=Object.assign({pascalCase:!1},t);var n;return 0===(e=Array.isArray(e)?e.map((function(e){return e.trim()})).filter((function(e){return e.length})).join("-"):e.trim()).length?"":1===e.length?t.pascalCase?e.toUpperCase():e.toLowerCase():(e!==e.toLowerCase()&&(e=rc(e)),e=e.replace(/^[_.\- ]+/,"").toLowerCase().replace(/[_.\- ]+(\w|$)/g,(function(e,t){return t.toUpperCase()})).replace(/\d+(\w|$)/g,(function(e){return e.toUpperCase()})),n=e,t.pascalCase?n.charAt(0).toUpperCase()+n.slice(1):n)}var rc=function(e){for(var t=!1,n=!1,o=!1,s=0;s<e.length;s++){var a=e[s];t&&/[a-zA-Z]/.test(a)&&a.toUpperCase()===a?(e=e.slice(0,s)+"-"+e.slice(s),t=!1,o=n,n=!0,s++):n&&o&&/[a-zA-Z]/.test(a)&&a.toLowerCase()===a?(e=e.slice(0,s-1)+"-"+e.slice(s-1),o=n,n=!1,t=!0):(t=a.toLowerCase()===a&&a.toUpperCase()!==a,o=n,n=a.toUpperCase()===a&&a.toLowerCase()!==a)}return e};function ic(e,t){var n=0;return function e(t,o){if(++n>100)return n--,t;if(it(t)){var s=t.map((function(t){return at(t)?e(t,o):t}));return n--,s}if(at(t)){var a=(r=t,i=function(e,t){if(!gt(t))return!1;if((s=t)!==ac(s))for(var n=0;n<sc.ignoreKeyWord.length&&!t.includes(sc.ignoreKeyWord[n]);n++);var s;return ut(o[t])?function(e){return"OPPOChannelID"===e?e:e[0].toUpperCase()+ac(e).slice(1)}(t):o[t]},u=Object.create(null),Object.keys(r).forEach((function(e){var t=i(r[e],e);t&&(u[t]=r[e])})),u);return a=Gt(a,(function(t,n){return it(t)||at(t)?e(t,o):t})),n--,a}var r,i,u}(e,t)}function uc(e,t){if(it(e))return e.map((function(e){return at(e)?uc(e,t):e}));if(at(e)){var n=(o=e,s=function(e,n){return ut(t[n])?ac(n):t[n]},a={},Object.keys(o).forEach((function(e){a[s(o[e],e)]=o[e]})),a);return n=Gt(n,(function(e){return it(e)||at(e)?uc(e,t):e}))}var o,s,a}var cc=String.fromCharCode,lc=function(e){var t=0|e.charCodeAt(0);if(55296<=t)if(t<56320){var n=0|e.charCodeAt(1);if(56320<=n&&n<=57343){if((t=(t<<10)+n-56613888|0)>65535)return cc(240|t>>>18,128|t>>>12&63,128|t>>>6&63,128|63&t)}else t=65533}else t<=57343&&(t=65533);return t<=2047?cc(192|t>>>6,128|63&t):cc(224|t>>>12,128|t>>>6&63,128|63&t)},pc=function(e){for(var t=void 0===e?"":(""+e).replace(/[\x80-\uD7ff\uDC00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]?/g,lc),n=0|t.length,o=new Uint8Array(n),s=0;s<n;s=s+1|0)o[s]=0|t.charCodeAt(s);return o},dc=function(e){for(var t=new Uint8Array(e),n="",o=0,s=t.length;o<s;){var a=t[o],r=0,i=0;if(a<=127?(r=0,i=255&a):a<=223?(r=1,i=31&a):a<=239?(r=2,i=15&a):a<=244&&(r=3,i=7&a),s-o-r>0)for(var u=0;u<r;)i=i<<6|63&(a=t[o+u+1]),u+=1;else i=65533,r=s-o;n+=String.fromCodePoint(i),o+=r+1}return n},gc=function(){function e(t){o(this,e),this._handler=t;var n=t.getURL();if(this._socket=null,this._workerSocket=null,this._id=Mt(),this._handler.getIsWorkerEnabled()){var s=URL.createObjectURL(new Blob([';let _socket = null;onmessage = function(event) {  if (event.data.cmd === "start") {    const url = event.data.url;    _socket = new WebSocket(url);    _socket.binaryType = "arraybuffer";    _socket.onopen = function() {      postMessage({ callback: "onOpen" });    };    _socket.onclose = function(e) {      postMessage({ callback: "onOpen", e: { code: e.code, reason: e.reason } });    };    _socket.onmessage = function(e) {      postMessage({ callback: "onMessage", data: e.data });    };    _socket.onerror = function(e) {      postMessage({ callback: "onError", e: { isTrusted: "true" } });    };  } else if (event.data.cmd === "sendMessage") {    if (_socket !== null) {      _socket.send(event.data.data);    }  } else if (event.data.cmd === "stop") {    if (_socket !== null) {      _socket.close(event.data.code);      _socket = null;    }  }};'],{type:"application/javascript; charset=utf-8"}));this._workerSocket=new Worker(s);var a=this;this._workerSocket.onmessage=function(e){var t=e.data,n=t.callback,o=t.e;"onOpen"===n?a._onOpen():"onClose"===n?a._onClose(o):"onError"===n?a._onError(o):"onMessage"===n&&a._onMessage(e.data)},this._workerSocket.postMessage({cmd:"start",id:this._id,url:n})}else ue?se?(le.connectSocket({url:n,header:{"content-type":"application/json"}}),le.onSocketClose(this._onClose.bind(this)),le.onSocketOpen(this._onOpen.bind(this)),le.onSocketMessage(this._onMessage.bind(this)),le.onSocketError(this._onError.bind(this))):(this._socket=le.connectSocket({url:n,header:{"content-type":"application/json"},complete:function(){}}),this._socket.onClose(this._onClose.bind(this)),this._socket.onOpen(this._onOpen.bind(this)),this._socket.onMessage(this._onMessage.bind(this)),this._socket.onError(this._onError.bind(this))):ce&&(this._socket=new WebSocket(n),this._socket.binaryType="arraybuffer",this._socket.onopen=this._onOpen.bind(this),this._socket.onmessage=this._onMessage.bind(this),this._socket.onclose=this._onClose.bind(this),this._socket.onerror=this._onError.bind(this));this._canIUseBinaryFrame=t.canIUseBinaryFrame()}return a(e,[{key:"getID",value:function(){return this._id}},{key:"_onOpen",value:function(){this._handler.onOpen({id:this._id})}},{key:"_onClose",value:function(e){this._handler.onClose({id:this._id,e:e})}},{key:"_onMessage",value:function(e){this._handler.onMessage({data:this._canIUseBinaryFrame?dc(e.data):e.data})}},{key:"_onError",value:function(e){this._handler.onError({id:this._id,e:e})}},{key:"setIsWorkerEnabled",value:function(e){this._isWorkerEnabled=!0}},{key:"close",value:function(e){if(this._workerSocket&&(this._workerSocket.postMessage({cmd:"stop",code:e}),this._workerSocket.terminate(),this._workerSocket=null),se)return le.offSocketClose(),le.offSocketMessage(),le.offSocketOpen(),le.offSocketError(),void le.closeSocket();this._socket&&(ue?(this._socket.onClose((function(){})),this._socket.onOpen((function(){})),this._socket.onMessage((function(){})),this._socket.onError((function(){}))):ce&&(this._socket.onopen=null,this._socket.onmessage=null,this._socket.onclose=null,this._socket.onerror=null),oe?this._socket.close({code:e}):this._socket.close(e),this._socket=null)}},{key:"send",value:function(e){if(this._workerSocket)this._workerSocket.postMessage({cmd:"sendMessage",data:this._canIUseBinaryFrame?pc(e.data).buffer:e.data});else{if(se)return void le.sendSocketMessage({data:e.data,fail:function(){e.fail&&e.requestID&&e.fail(e.requestID)}});this._socket&&(ue?this._socket.send({data:this._canIUseBinaryFrame?pc(e.data).buffer:e.data,fail:function(){e.fail&&e.requestID&&e.fail(e.requestID)}}):ce&&this._socket.send(this._canIUseBinaryFrame?pc(e.data).buffer:e.data))}}}]),e}(),hc=4e3,_c=4001,fc=["keyMap"],vc=["keyMap"],mc="connected",Mc="connecting",yc="disconnected",Ic=function(){function e(t){o(this,e),this._channelModule=t,this._n="SocketHandler",this._promiseMap=new Map,this._readyState=yc,this._simpleRequestMap=new Map,this.MAX_SIZE=100,this._startSequence=Mt(),this._startTs=0,this._reConnectFlag=!1,this._nextPingTs=0,this._reConnectCount=0,this.MAX_RECONNECT_COUNT=3,this._socketID=-1,this._random=0,this._socket=null,this._url="",this._onOpenTs=0,this._canIUseBinaryFrame=!0,this._isWorkerEnabled=!0,this._setWebsocketHost(),this._initConnection()}return a(e,[{key:"_setWebsocketHost",value:function(){var e=this._channelModule.getModule(Kn),t=G;this._channelModule.isOversea()&&(t=P),e.isSingaporeSite()?t=U:e.isKoreaSite()?t=b:e.isGermanySite()?t=w:e.isIndiaSite()?t=q:e.isJapanSite()?t=F:e.isUSASite()&&(t=x),V.HOST.setCurrent(t)}},{key:"_initConnection",value:function(){ut(V.HOST.CURRENT.BACKUP)||""===this._url?this._url=V.HOST.CURRENT.DEFAULT:this._url===V.HOST.CURRENT.DEFAULT?this._url=V.HOST.CURRENT.BACKUP:this._url===V.HOST.CURRENT.BACKUP?this._url=this._canIUseAnyCast()?V.HOST.CURRENT.ANYCAST:V.HOST.CURRENT.DEFAULT:this._url===V.HOST.CURRENT.ANYCAST&&(V.HOST.CURRENT.ANYCAST="",this._url=V.HOST.CURRENT.DEFAULT);var e=this._channelModule.getModule(Kn).getProxyServer();Zt(e)||(this._url=e),this._connect(),this._nextPingTs=0}},{key:"_canIUseAnyCast",value:function(){return ce&&V.HOST.CURRENT.ANYCAST}},{key:"onCheckTimer",value:function(e){e%1==0&&this._checkPromiseMap()}},{key:"_checkPromiseMap",value:function(){var e=this;0!==this._promiseMap.size&&this._promiseMap.forEach((function(t,n){var o=t.reject,s=t.timestamp,a=15e3;-1!==n.indexOf(go)&&(a=9e4),Date.now()-s>=a&&(He.l("".concat(e._n,"._checkPromiseMap request timeout, delete requestID:").concat(n)),e._promiseMap.delete(n),o(new Ei({code:Er})),e._channelModule.onRequestTimeout(n))}))}},{key:"onOpen",value:function(e){if(""!==this._readyState){this._onOpenTs=Date.now();var t=e.id;this._socketID=t;var n=Date.now()-this._startTs;He.l("".concat(this._n,"._onOpen cost ").concat(n," ms. socketID:").concat(t)),new li("wsOnOpen").setMessage(n).setCostTime(n).setMoreMessage("socketID:".concat(t)).end(),e.id===this._socketID&&(this._readyState=mc,this._reConnectCount=0,this._resend(),!0===this._reConnectFlag&&(this._channelModule.onReconnected(),this._reConnectFlag=!1),this._channelModule.onOpen())}}},{key:"onClose",value:function(e){var t=new li("wsOnClose"),n=e.id,o=e.e,s="sourceSocketID:".concat(n," currentSocketID:").concat(this._socketID," code:").concat(o.code," reason:").concat(o.reason),a=0;0!==this._onOpenTs&&(a=Date.now()-this._onOpenTs),t.setMessage(a).setCostTime(a).setMoreMessage(s).setCode(o.code).end(),He.l("".concat(this._n,"._onClose ").concat(s," onlineTime:").concat(a)),n===this._socketID&&(this._readyState=yc,a<1e3?this._channelModule.onReconnectFailed():this._channelModule.onClose())}},{key:"onError",value:function(e){var t=e.id,n=e.e,o="sourceSocketID:".concat(t," currentSocketID:").concat(this._socketID);new li("wsOnError").setMessage(n.errMsg||vt(n)).setMoreMessage(o).setLevel("error").end(),He.w("".concat(this._n,"._onError"),n,o),t===this._socketID&&(this._readyState="",this._channelModule.onError())}},{key:"onMessage",value:function(e){var t;try{t=JSON.parse(e.data)}catch(c){new li("jsonParseError").setMessage(e.data).end()}if(t&&t.head){var n=this._getRequestIDFromHead(t.head),o=t.body;if(!n.startsWith(V.NAME.TUIROOM_SVR)){var s=xt(t.head);o=uc(t.body,this._getResponseKeyMap(s))}if(He.d("".concat(this._n,".onMessage ret:").concat(JSON.stringify(o)," requestID:").concat(n," has:").concat(this._promiseMap.has(n))),this._setNextPingTs(),this._promiseMap.has(n)){var a=this._promiseMap.get(n),r=a.resolve,i=a.reject,u=a.timestamp;return this._promiseMap.delete(n),this._calcRTT(u),void(o.errorCode&&0!==o.errorCode?(this._channelModule.onErrorCodeNotZero(o),i(new Ei({code:o.errorCode,message:o.errorInfo||"",data:n.includes(Go)||n.includes(Ts)?{elements:o.elements,messageVersion:o.messageVersion,cloudCustomData:o.cloudCustomData}:void 0}))):r(Li(o)))}this._channelModule.onMessage({head:t.head,body:o})}}},{key:"_calcRTT",value:function(e){var t=Date.now()-e;this._channelModule.getModule(so).addRTT(t)}},{key:"_connect",value:function(){this._startTs=Date.now(),this._onOpenTs=0,this._socket=new gc(this),this._socketID=this._socket.getID(),this._readyState=Mc,He.l("".concat(this._n,"._connect isWorkerEnabled:").concat(this.getIsWorkerEnabled()," socketID:").concat(this._socketID," url:").concat(this.getURL())),new li("wsConnect").setMessage("socketID:".concat(this._socketID," url:").concat(this.getURL())).end()}},{key:"getURL",value:function(){this._channelModule.isDevMode()&&(this._canIUseBinaryFrame=!1);var e=bt();(se||ee&&"windows"===e||re)&&(this._canIUseBinaryFrame=!1);var t=-1;"ios"===e?t=Me||-1:"android"===e&&(t=Ie||-1);var n=this._channelModule.getModule(Kn),o=this._channelModule.getPlatform(),s=n.getSDKAppID(),a=n.getInstanceID(),r="sdkappid=".concat(s,"&instanceid=").concat(a,"&random=").concat(this._getRandom(),"&platform=").concat(o,"&host=").concat(e,"&version=").concat(t);return this._canIUseBinaryFrame?"".concat(this._url,"/binfo?").concat(r):"".concat(this._url,"/info?").concat(r)}},{key:"_closeConnection",value:function(e){He.l("".concat(this._n,"._closeConnection socketID:").concat(this._socketID)),this._socket&&(this._socket.close(e),this._socketID=-1,this._socket=null,this._readyState=yc)}},{key:"_resend",value:function(){var e=this;if(He.l("".concat(this._n,"._resend reConnectFlag:").concat(this._reConnectFlag),"promiseMap.size:".concat(this._promiseMap.size," simpleRequestMap.size:").concat(this._simpleRequestMap.size)),this._promiseMap.size>0&&this._promiseMap.forEach((function(t,n){var o=t.uplinkData,s=t.resolve,a=t.reject;e._promiseMap.set(n,{resolve:s,reject:a,timestamp:Date.now(),uplinkData:o}),e._execute(n,o)})),this._simpleRequestMap.size>0){var t,n=D(this._simpleRequestMap);try{for(n.s();!(t=n.n()).done;){var o=v(t.value,2),s=o[0],a=o[1];this._execute(s,a)}}catch(r){n.e(r)}finally{n.f()}this._simpleRequestMap.clear()}}},{key:"send",value:function(e){var t=this;e.head.seq=this._getSequence(),e.head.reqtime=Math.floor(Date.now()/1e3);e.keyMap;var n=g(e,fc),o=this._getRequestIDFromHead(e.head),s=JSON.stringify(n);return new Promise((function(e,a){(t._promiseMap.set(o,{resolve:e,reject:a,timestamp:Date.now(),uplinkData:s}),He.d("".concat(t._n,".send uplinkData:").concat(JSON.stringify(n)," requestID:").concat(o," readyState:").concat(t._readyState)),t._readyState!==mc)?t._reConnect():(t._execute(o,s),t._channelModule.getModule(so).addRequestCount())}))}},{key:"simplySend",value:function(e){e.head.seq=this._getSequence(),e.head.reqtime=Math.floor(Date.now()/1e3);e.keyMap;var t=g(e,vc),n=this._getRequestIDFromHead(e.head),o=JSON.stringify(t);this._readyState!==mc?(this._simpleRequestMap.size<this.MAX_SIZE?this._simpleRequestMap.set(n,o):He.l("".concat(this._n,".simplySend. simpleRequestMap is full, drop request!")),this._reConnect()):this._execute(n,o)}},{key:"_execute",value:function(e,t){this._socket.send({data:t,fail:ue?this._onSendFail.bind(this):void 0,requestID:e})}},{key:"_onSendFail",value:function(e){He.l("".concat(this._n,"._onSendFail requestID:").concat(e))}},{key:"_getSequence",value:function(){var e;if(this._startSequence<2415919103)return e=this._startSequence,this._startSequence+=1,2415919103===this._startSequence&&(this._startSequence=Mt()),e}},{key:"_getRequestIDFromHead",value:function(e){return e.servcmd+e.seq}},{key:"_getResponseKeyMap",value:function(e){var n=this._channelModule.getKeyMap(e);return t(t({},sc.response),n.response)}},{key:"_reConnect",value:function(){this._readyState!==mc&&this._readyState!==Mc&&this.forcedReconnect()}},{key:"forcedReconnect",value:function(){var e=this,t="".concat(this._n,".forcedReconnect");He.l("".concat(t," count:").concat(this._reConnectCount," readyState:").concat(this._readyState)),this._reConnectFlag=!0,this._resetRandom(),this._reConnectCount<this.MAX_RECONNECT_COUNT?(this._reConnectCount+=1,this._closeConnection(_c),this._initConnection()):(this._reConnectCount=0,this._channelModule.probeNetwork().then((function(n){var o=v(n,2),s=o[0];o[1];s?(He.w("".concat(t," disconnected from wsserver but network is ok, continue...")),e._closeConnection(_c),e._initConnection()):e._channelModule.onReconnectFailed()})))}},{key:"getReconnectFlag",value:function(){return this._reConnectFlag}},{key:"_setNextPingTs",value:function(){this._nextPingTs=Date.now()+1e4}},{key:"getNextPingTs",value:function(){return this._nextPingTs}},{key:"isConnected",value:function(){return this._readyState===mc}},{key:"canIUseBinaryFrame",value:function(){return this._canIUseBinaryFrame}},{key:"setIsWorkerEnabled",value:function(e){He.l("".concat(this._n,".setIsWorkerEnabled flag:").concat(e)),this._isWorkerEnabled=e}},{key:"getIsWorkerEnabled",value:function(){return this._isWorkerEnabled&&Ae}},{key:"_getRandom",value:function(){return 0===this._random&&(this._random=Math.random()),this._random}},{key:"_resetRandom",value:function(){this._random=0}},{key:"close",value:function(){He.l("".concat(this._n,".close")),this._closeConnection(hc),this._promiseMap.clear(),this._startSequence=Mt(),this._readyState=yc,this._simpleRequestMap.clear(),this._reConnectFlag=!1,this._reConnectCount=0,this._onOpenTs=0,this._url="",this._random=0,this._canIUseBinaryFrame=!0,this._isWorkerEnabled=!0}}]),e}(),Cc=function(e){i(n,e);var t=f(n);function n(e){var s;if(o(this,n),(s=t.call(this,e))._n="ChannelModule",s._socketHandler=new Ic(h(s)),s._probing=!1,s._isAppShowing=!0,s._previousState=S.NET_STATE_CONNECTED,ue&&"function"==typeof le.onAppShow&&"function"==typeof le.onAppHide){var a=s._onAppHide.bind(h(s)),r=s._onAppShow.bind(h(s));"function"==typeof le.offAppHide&&le.offAppHide(a),"function"==typeof le.offAppShow&&le.offAppShow(r),le.onAppHide(a),le.onAppShow(r)}return s._timerForNotLoggedIn=-1,s._timerForNotLoggedIn=setInterval(s.onCheckTimer.bind(h(s)),1e3),s._fatalErrorFlag=!1,s}return a(n,[{key:"onCheckTimer",value:function(e){this._socketHandler&&(this.isLoggedIn()?(this._timerForNotLoggedIn>0&&(clearInterval(this._timerForNotLoggedIn),this._timerForNotLoggedIn=-1),this._socketHandler.onCheckTimer(e)):this._socketHandler.onCheckTimer(1),this._checkNextPing())}},{key:"onErrorCodeNotZero",value:function(e){this.getModule(Zn).onErrorCodeNotZero(e)}},{key:"onMessage",value:function(e){this.getModule(Zn).onMessage(e)}},{key:"send",value:function(e){return this._socketHandler?this._previousState!==S.NET_STATE_CONNECTED&&e.head.servcmd.includes(Ws)?(this.reConnect(),this._sendLogViaHTTP(e)):this._socketHandler.send(e):Promise.reject()}},{key:"_sendLogViaHTTP",value:function(e){var t=V.HOST.CURRENT.STAT;return new Promise((function(n,o){var s="".concat(t,"/v4/imopenstat/tim_web_report_v2?sdkappid=").concat(e.head.sdkappid,"&reqtime=").concat(Date.now()),a=JSON.stringify(e.body),r="application/x-www-form-urlencoded;charset=UTF-8";if(ue)le.request({url:s,data:a,method:"POST",timeout:3e3,header:{"content-type":r},success:function(){n()},fail:function(){o(new Ei({code:Lr}))}});else{var i=new XMLHttpRequest,u=setTimeout((function(){i.abort(),o(new Ei({code:Er}))}),3e3);i.onreadystatechange=function(){4===i.readyState&&(clearTimeout(u),200===i.status||304===i.status?n():o(new Ei({code:Lr})))},i.open("POST",s,!0),i.setRequestHeader("Content-type",r),i.send(a)}}))}},{key:"simplySend",value:function(e){return this._socketHandler?this._socketHandler.simplySend(e):Promise.reject()}},{key:"onOpen",value:function(){this._ping()}},{key:"onClose",value:function(){this._socketHandler&&(this._socketHandler.getReconnectFlag()&&this._emitNetStateChangeEvent(S.NET_STATE_DISCONNECTED));this.reConnect()}},{key:"onError",value:function(){ue&&!re&&this.outputWarning("DomainNameInMP"),this._emitNetStateChangeEvent(S.NET_STATE_DISCONNECTED)}},{key:"getKeyMap",value:function(e){return this.getModule(Zn).getKeyMap(e)}},{key:"_onAppHide",value:function(){this._isAppShowing=!1}},{key:"_onAppShow",value:function(){this._isAppShowing=!0}},{key:"onRequestTimeout",value:function(e){}},{key:"onReconnected",value:function(){He.l("".concat(this._n,".onReconnected")),this._m.restartTimer(),this.getModule(Zn).onReconnected(),this._emitNetStateChangeEvent(S.NET_STATE_CONNECTED)}},{key:"onReconnectFailed",value:function(){He.l("".concat(this._n,".onReconnectFailed")),this._emitNetStateChangeEvent(S.NET_STATE_DISCONNECTED)}},{key:"setIsWorkerEnabled",value:function(e){this._socketHandler&&this._socketHandler.setIsWorkerEnabled(!1)}},{key:"offline",value:function(){this._emitNetStateChangeEvent(S.NET_STATE_DISCONNECTED)}},{key:"reConnect",value:function(){var e=arguments.length>0&&void 0!==arguments[0]&&arguments[0],t=!1;this._socketHandler&&(t=this._socketHandler.getReconnectFlag());var n="forcedFlag:".concat(e," fatalErrorFlag:").concat(this._fatalErrorFlag," previousState:").concat(this._previousState," reconnectFlag:").concat(t);if(He.l("".concat(this._n,".reConnect ").concat(n)),!this._fatalErrorFlag&&this._socketHandler){if(!0===e)this._socketHandler.forcedReconnect();else{if(this._previousState===S.NET_STATE_CONNECTING&&t)return;this._socketHandler.forcedReconnect()}this._emitNetStateChangeEvent(S.NET_STATE_CONNECTING)}}},{key:"_emitNetStateChangeEvent",value:function(e){this._previousState!==e&&(He.l("".concat(this._n,"._emitNetStateChangeEvent from ").concat(this._previousState," to ").concat(e)),this._previousState=e,this.emitOuterEvent(k.NET_STATE_CHANGE,{state:e}))}},{key:"_ping",value:function(){var e=this;if(!0!==this._probing){this._probing=!0;var t=this.getModule(Zn).getProtocolData({protocolName:js});this.send(t).then((function(){e._probing=!1})).catch((function(t){if(He.w("".concat(e._n,"._ping failed. error:"),t),e._probing=!1,t&&60002===t.code)return new li("error").setMessage("code:".concat(t.code," message:").concat(t.message)).setNetworkType(e.getModule(Yn).getNetworkType()).end(),e._fatalErrorFlag=!0,void e._emitNetStateChangeEvent(S.NET_STATE_DISCONNECTED);e.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];He.l("".concat(e._n,"._ping failed. probe network, isAppShowing:").concat(e._isAppShowing," online:").concat(o," networkType:").concat(s)),o?e.reConnect():e._emitNetStateChangeEvent(S.NET_STATE_DISCONNECTED)}))}))}}},{key:"_checkNextPing",value:function(){this._socketHandler&&(this._socketHandler.isConnected()&&Date.now()>=this._socketHandler.getNextPingTs()&&this._ping())}},{key:"dealloc",value:function(){this._socketHandler&&(this._socketHandler.close(),this._socketHandler=null),this._timerForNotLoggedIn>-1&&clearInterval(this._timerForNotLoggedIn)}},{key:"onRestApiKickedOut",value:function(){this._socketHandler&&(this._socketHandler.close(),this.reConnect(!0))}},{key:"reset",value:function(){He.l("".concat(this._n,".reset")),this._previousState=S.NET_STATE_CONNECTED,this._probing=!1,this._fatalErrorFlag=!1,this._timerForNotLoggedIn=setInterval(this.onCheckTimer.bind(this),1e3)}}]),n}(po),Tc=["a2","tinyid"],Dc=["a2","tinyid"],kc=function(){function e(t){o(this,e),this._n="ProtocolHandler",this._sessionModule=t,this._configMap=new Map,this._fillConfigMap()}return a(e,[{key:"_fillConfigMap",value:function(){this._configMap.clear();var e=this._sessionModule.genCommonHead(),n=this._sessionModule.genCosSpecifiedHead(),o=this._sessionModule.genSSOReportHead(),s=this._sessionModule.isIntl();this._configMap.set(go,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.IM_OPEN_STATUS,".").concat(V.CMD.LOGIN)}),body:{state:"Online",isWebUniapp:0,deviceBrand:0},keyMap:{request:{deviceBrand:"InstType"},response:{InstId:"instanceID",HelloInterval:"helloInterval"}}}}(e)),this._configMap.set(ho,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.IM_OPEN_STATUS,".").concat(V.CMD.LOGOUT)}),body:{type:0},keyMap:{request:{type:"wslogout_type"}}}}(e)),this._configMap.set(_o,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.IM_OPEN_STATUS,".").concat(V.CMD.HELLO)}),body:{isWebUniapp:0},keyMap:{response:{NewInstInfo:"newInstanceInfo"}}}}(e)),this._configMap.set(fo,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.STAT_SERVICE,".").concat(V.CMD.KICK_OTHER)}),body:{}}}(e)),this._configMap.set(Bs,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.IM_COS_SIGN,".").concat(V.CMD.COS_SIGN)}),body:{cmd:"open_im_cos_svc",subCmd:"get_cos_token",duration:300,version:2},keyMap:{request:{userSig:"usersig",subCmd:"sub_cmd",cmd:"cmd",duration:"duration",version:"version"},response:{expired_time:"expiredTime",bucket_name:"bucketName",session_token:"sessionToken",tmp_secret_id:"secretId",tmp_secret_key:"secretKey"}}}}(n)),this._configMap.set(Hs,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.CUSTOM_UPLOAD,".").concat(V.CMD.COS_PRE_SIG)}),body:{fileType:void 0,fileName:void 0,uploadMethod:0,duration:900},keyMap:{request:{userSig:"usersig",fileType:"file_type",fileName:"file_name",uploadMethod:"upload_method"},response:{expired_time:"expiredTime",request_id:"requestId",head_url:"headUrl",upload_url:"uploadUrl",download_url:"downloadUrl",ci_url:"ciUrl",snapshot_url:"requestSnapshotUrl"}}}}(n)),this._configMap.set(Ks,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.CUSTOM_UPLOAD,".").concat(V.CMD.VIDEO_COVER)}),body:{version:1,platform:void 0,coverName:void 0,requestSnapshotUrl:void 0},keyMap:{request:{version:"version",platform:"platform",coverName:"cover_name",requestSnapshotUrl:"snapshot_url"},response:{error_code:"errorCode",error_msg:"errorInfo",download_url:"snapshotUrl"}}}}(n)),this._configMap.set(ta,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.IM_CONFIG_MANAGER,".").concat(V.CMD.FETCH_COMMERCIAL_CONFIG)}),body:{SDKAppID:0},keyMap:{request:{SDKAppID:"uint32_sdkappid"},response:{int32_error_code:"errorCode",str_error_message:"errorMessage",str_purchase_bits:"purchaseBits",uint32_expired_time:"expiredTime"}}}}(e)),this._configMap.set(na,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.IM_CONFIG_MANAGER,".").concat(V.CMD.PUSHED_COMMERCIAL_CONFIG)}),body:{},keyMap:{response:{int32_error_code:"errorCode",str_error_message:"errorMessage",str_purchase_bits:"purchaseBits",uint32_expired_time:"expiredTime"}}}}(e)),this._configMap.set($s,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.IM_CONFIG_MANAGER,".").concat(V.CMD.FETCH_CLOUD_CONTROL_CONFIG)}),body:{SDKAppID:0,version:0},keyMap:{request:{SDKAppID:"uint32_sdkappid",version:"uint64_version"},response:{int32_error_code:"errorCode",str_error_message:"errorMessage",str_json_config:"cloudControlConfig",uint32_expired_time:"expiredTime",uint32_sdkappid:"SDKAppID",uint64_version:"version"}}}}(e)),this._configMap.set(ea,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.IM_CONFIG_MANAGER,".").concat(V.CMD.PUSHED_CLOUD_CONTROL_CONFIG)}),body:{},keyMap:{response:{int32_error_code:"errorCode",str_error_message:"errorMessage",str_json_config:"cloudControlConfig",uint32_expired_time:"expiredTime",uint32_sdkappid:"SDKAppID",uint64_version:"version"}}}}(e)),this._configMap.set(oa,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.OVERLOAD_PUSH,".").concat(V.CMD.OVERLOAD_NOTIFY)}),body:{},keyMap:{response:{OverLoadServCmd:"overloadCommand",DelaySecs:"waitingTime"}}}}(e)),this._configMap.set(vo,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.OPEN_IM,".").concat(V.CMD.GET_MESSAGES)}),body:{cookie:"",syncFlag:0,needAbstract:1,isOnlineSync:0,needSignaling:1},keyMap:{request:{fromAccount:"From_Account",toAccount:"To_Account",from:"From_Account",to:"To_Account",time:"MsgTimeStamp",sequence:"MsgSeq",random:"MsgRandom",elements:"MsgBody"},response:{MsgList:"messageList",SyncFlag:"syncFlag",To_Account:"to",From_Account:"from",ClientSeq:"clientSequence",MsgSeq:"sequence",NoticeSeq:"noticeSequence",NotifySeq:"notifySequence",MsgRandom:"random",MsgTimeStamp:"time",MsgContent:"content",ToGroupId:"to",MsgKey:"messageKey",GroupTips:"groupTips",MsgBody:"elements",MsgType:"type",C2CRemainingUnreadCount:"C2CRemainingUnreadList",C2CPairUnreadCount:"C2CPairUnreadList"}}}}(e)),s||(this._configMap.set(mo,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.OPEN_IM,".").concat(V.CMD.BIG_DATA_HALLWAY_AUTH_KEY)}),body:{}}}(e)),this._configMap.set(_a,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.IM_MSG_AUDIT_MGR,".").concat(V.CMD.GET_RPOFANITY_LIST)}),body:{version:0,deviceID:"",startIndex:void 0},keyMap:{request:{version:"uint64_version",deviceID:"str_device_id",startIndex:"uint64_start_index"},response:{msg_cmd_error_code:"errorInfo",str_err_msg:"errorMessage",uint32_code:"errorCode",msg_scene_ctl_config:"filterConfig",uint64_c2c_custom_msg_flag:"c2c_custom_message",uint64_c2c_text_msg_flag:"c2c_text_message",uint64_group_custom_msg_flag:"group_custom_message",uint64_group_text_msg_flag:"group_text_message",uint64_group_info_flag:"group_profile",uint64_group_member_info_flag:"group_member_profile",uint64_relation_chain_flag:"sns",uint64_user_info_flag:"user_profile",rpt_msg_dirty_word:"lexicon",str_dirty_word:"profanity",str_replaced_content:"replacement",uint64_filter_type:"filterType",uint64_id:"id",uint64_word_type:"profanityType",uint64_complete_flag:"completeFlag",uint64_next_start_index:"nextStartIndex",uint64_version:"version",uint64_expired_time:"expiredTime"}}}}(e))),this._configMap.set(Mo,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.OPEN_IM,".").concat(V.CMD.SEND_MESSAGE)}),body:{fromAccount:"",toAccount:"",msgSeq:0,msgRandom:0,msgBody:[],cloudCustomData:void 0,nick:"",avatar:"",msgLifeTime:void 0,offlinePushInfo:{pushFlag:0,title:"",desc:"",ext:"",apnsInfo:{badgeMode:0,isVoipPush:void 0},androidInfo:{OPPOChannelID:""}},messageControlInfo:void 0,clientTime:void 0,needReadReceipt:0,isSupportExtension:0},keyMap:{request:{fromAccount:"From_Account",toAccount:"To_Account",msgTimeStamp:"MsgTimeStamp",msgSeq:"MsgSeq",msgRandom:"MsgRandom",msgBody:"MsgBody",count:"MaxCnt",lastMessageTime:"LastMsgTime",messageKey:"MsgKey",peerAccount:"Peer_Account",data:"Data",description:"Desc",extension:"Ext",type:"MsgType",content:"MsgContent",sizeType:"Type",uuid:"UUID",url:"",imageUrl:"URL",fileUrl:"Url",remoteAudioUrl:"Url",remoteVideoUrl:"VideoUrl",thumbUUID:"ThumbUUID",videoUUID:"VideoUUID",videoUrl:"",downloadFlag:"Download_Flag",nick:"From_AccountNick",avatar:"From_AccountHeadurl",from:"From_Account",time:"MsgTimeStamp",messageRandom:"MsgRandom",messageSequence:"MsgSeq",elements:"MsgBody",clientSequence:"ClientSeq",payload:"MsgContent",messageList:"MsgList",messageNumber:"MsgNum",abstractList:"AbstractList",messageBody:"MsgBody",needReadReceipt:"IsNeedReadReceipt"}}}}(e)),this._configMap.set(yo,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.SEND_GROUP_MESSAGE)}),body:{fromAccount:"",groupID:"",random:0,clientSequence:0,priority:"",msgBody:[],cloudCustomData:void 0,onlineOnlyFlag:0,offlinePushInfo:{pushFlag:0,title:"",desc:"",ext:"",apnsInfo:{badgeMode:0,isVoipPush:void 0},androidInfo:{OPPOChannelID:""}},groupAtInfo:[],messageControlInfo:void 0,clientTime:void 0,needReadReceipt:0,topicID:void 0,receiverList:void 0,isSupportExtension:0},keyMap:{request:{to:"GroupId",extension:"Ext",data:"Data",description:"Desc",random:"Random",sequence:"ReqMsgSeq",count:"ReqMsgNumber",type:"MsgType",priority:"MsgPriority",content:"MsgContent",elements:"MsgBody",sizeType:"Type",uuid:"UUID",url:"",imageUrl:"URL",fileUrl:"Url",remoteAudioUrl:"Url",remoteVideoUrl:"VideoUrl",thumbUUID:"ThumbUUID",videoUUID:"VideoUUID",videoUrl:"",downloadFlag:"Download_Flag",clientSequence:"ClientSeq",from:"From_Account",time:"MsgTimeStamp",messageRandom:"MsgRandom",messageSequence:"MsgSeq",payload:"MsgContent",messageList:"MsgList",messageNumber:"MsgNum",abstractList:"AbstractList",messageBody:"MsgBody",needReadReceipt:"NeedReadReceipt",receiverList:"To_Account"},response:{MsgTime:"time",MsgSeq:"sequence"}}}}(e)),this._configMap.set(So,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.OPEN_IM,".").concat(V.CMD.REVOKE_C2C_MESSAGE)}),body:{msgInfo:{fromAccount:"",toAccount:"",msgTimeStamp:0,msgSeq:0,msgRandom:0}},keyMap:{request:{msgInfo:"MsgInfo",msgTimeStamp:"MsgTimeStamp",msgSeq:"MsgSeq",msgRandom:"MsgRandom"}}}}(e)),this._configMap.set(cs,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.REVOKE_GROUP_MESSAGE)}),body:{groupID:"",msgSeqList:void 0,topicID:""},keyMap:{request:{msgSeqList:"MsgSeqList",msgSeq:"MsgSeq"}}}}(e)),this._configMap.set(Ro,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.OPEN_IM,".").concat(V.CMD.GET_C2C_ROAM_MESSAGES)}),body:{peerAccount:"",count:15,lastMessageTime:0,messageKey:"",withRecalledMessage:1,direction:0},keyMap:{request:{messageKey:"MsgKey",peerAccount:"Peer_Account",count:"MaxCnt",lastMessageTime:"LastMsgTime",withRecalledMessage:"WithRecalledMsg",direction:"GetDirection"},response:{LastMsgTime:"lastMessageTime",IsNeedReadReceipt:"needReadReceipt",IsPeerRead:"readReceiptSentByPeer"}}}}(e)),this._configMap.set(Go,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.OPEN_IM,".").concat(V.CMD.MODIFY_C2C_MESSAGE)}),body:{from:"",to:"",sequence:0,random:0,time:0,version:0,elements:void 0,cloudCustomData:void 0},keyMap:{request:{sequence:"MsgSeq",random:"MsgRandom",time:"MsgTime",version:"MsgVersion",type:"MsgType",content:"MsgContent"}}}}(e)),this._configMap.set(ds,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.GET_GROUP_ROAM_MESSAGES)}),body:{withRecalledMsg:1,groupID:"",count:15,sequence:"",topicID:void 0},keyMap:{request:{sequence:"ReqMsgSeq",count:"ReqMsgNumber",withRecalledMessage:"WithRecalledMsg"},response:{Random:"random",MsgTime:"time",MsgSeq:"sequence",ReqMsgSeq:"sequence",RspMsgList:"messageList",IsPlaceMsg:"isPlaceMessage",IsSystemMsg:"isSystemMessage",ToGroupId:"to",EnumFrom_AccountType:"fromAccountType",EnumTo_AccountType:"toAccountType",GroupCode:"groupCode",MsgPriority:"priority",MsgBody:"elements",MsgType:"type",MsgContent:"content",IsFinished:"complete",Download_Flag:"downloadFlag",ClientSeq:"clientSequence",ThumbUUID:"thumbUUID",VideoUUID:"videoUUID",ToTopicId:"topicID",InvisibleMsgSeq:"invisibleSequenceList"}}}}(e)),this._configMap.set(Lo,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.OPEN_IM,".").concat(V.CMD.SET_C2C_MESSAGE_READ)}),body:{C2CMsgReaded:void 0},keyMap:{request:{lastMessageTime:"LastedMsgTime"}}}}(e)),this._configMap.set(Eo,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.OPEN_IM,".").concat(V.CMD.SET_C2C_PEER_MUTE_NOTIFICATIONS)}),body:{userIDList:void 0,muteFlag:0},keyMap:{request:{userIDList:"Peer_Account",muteFlag:"Mute_Notifications"}}}}(e)),this._configMap.set(Ao,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.OPEN_IM,".").concat(V.CMD.GET_C2C_PEER_MUTE_NOTIFICATIONS)}),body:{updateSequence:0},keyMap:{response:{MuteNotificationsList:"muteFlagList"}}}}(e)),this._configMap.set(ls,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.SET_GROUP_MESSAGE_READ)}),body:{groupID:void 0,messageReadSeq:void 0,topicID:void 0},keyMap:{request:{messageReadSeq:"MsgReadedSeq"}}}}(e)),this._configMap.set(ps,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.OPEN_IM,".").concat(V.CMD.SET_ALL_MESSAGE_READ)}),body:{readAllC2CMessage:0,groupMessageReadInfoList:[]},keyMap:{request:{readAllC2CMessage:"C2CReadAllMsg",groupMessageReadInfoList:"GroupReadInfo",messageSequence:"MsgSeq"},response:{C2CReadAllMsg:"readAllC2CMessage",GroupReadInfoArray:"groupMessageReadInfoList"}}}}(e)),this._configMap.set(Oo,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.OPEN_IM,".").concat(V.CMD.DELETE_C2C_MESSAGE)}),body:{fromAccount:"",to:"",keyList:void 0},keyMap:{request:{keyList:"MsgKeyList"}}}}(e)),this._configMap.set(Cs,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.DELETE_GROUP_MESSAGE)}),body:{groupID:"",deleter:"",keyList:void 0,topicID:void 0},keyMap:{request:{deleter:"Deleter_Account",keyList:"Seqs"}}}}(e)),this._configMap.set(fa,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.IM_OPEN_TRANSLATE,".").concat(V.CMD.TRANSLATE_TEXT)}),body:{sourceTextList:void 0,SDKAppID:0,from:0,source:"",target:""},keyMap:{request:{sourceTextList:"SourceText",SDKAppID:"SdkAppId",from:"FromAccount"},response:{TargetText:"translatedTextList",RequestId:"requestID",CmdErrorCode:"error",ErrorCode:"code",ErrorInfo:"message"}}}}(e)),this._configMap.set(Ts,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.OPEN_IM,".").concat(V.CMD.MODIFY_GROUP_MESSAGE)}),body:{groupID:"",topicID:void 0,sequence:0,version:0,elements:void 0,cloudCustomData:void 0},keyMap:{request:{sequence:"MsgSeq",version:"MsgVersion",type:"MsgType",content:"MsgContent"}}}}(e)),this._configMap.set(gs,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.GET_READ_RECEIPT)}),body:{groupID:"",sequenceList:void 0},keyMap:{request:{sequence:"MsgSeq"}}}}(e)),this._configMap.set(_s,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.OPEN_IM,".").concat(V.CMD.SEND_C2C_READ_RECEIPT)}),body:{peerAccount:"",messageInfoList:void 0},keyMap:{request:{peerAccount:"Peer_Account",messageInfoList:"C2CMsgInfo",fromAccount:"From_Account",toAccount:"To_Account",sequence:"MsgSeq",random:"MsgRandom",time:"MsgTime",clientTime:"MsgClientTime"}}}}(e)),this._configMap.set(hs,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.SEND_READ_RECEIPT)}),body:{groupID:"",sequenceList:void 0},keyMap:{request:{sequenceList:"MsgSeqList",sequence:"MsgSeq"}}}}(e)),this._configMap.set(fs,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.GET_READ_RECEIPT_DETAIL)}),body:{groupID:"",sequence:void 0,flag:0,cursor:0,count:0},keyMap:{request:{sequence:"MsgSeq",count:"Num"},response:{ReadList:"readUserIDList",Read_Account:"userID",UnreadList:"unreadUserIDList",Unread_Account:"userID",IsFinish:"isCompleted"}}}}(e)),this._configMap.set(Po,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.OPEN_IM_MSG_EXT,".").concat(V.CMD.MODIFY_C2C_MESSAGE_EXTENSIONS)}),body:{from:void 0,to:void 0,messageKey:void 0,operateType:void 0,extensionList:void 0}}}(e)),this._configMap.set(Uo,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.OPEN_IM_MSG_EXT,".").concat(V.CMD.GET_C2C_MESSAGE_EXTENSIONS)}),body:{from:void 0,to:void 0,messageKey:void 0,startSequence:void 0}}}(e)),this._configMap.set(As,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.OPEN_IM_MSG_EXT,".").concat(V.CMD.MODIFY_GROUP_MESSAGE_EXTENSIONS)}),body:{groupID:void 0,topicID:void 0,messageSequence:void 0,operateType:void 0,extensionList:void 0}}}(e)),this._configMap.set(Rs,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.OPEN_IM_MSG_EXT,".").concat(V.CMD.GET_GROUP_MESSAGE_EXTENSIONS)}),body:{groupID:void 0,topicID:void 0,messageSequence:void 0,startSequence:void 0}}}(e)),this._configMap.set(No,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.OPEN_IM,".").concat(V.CMD.GET_PEER_READ_TIME)}),body:{userIDList:void 0},keyMap:{request:{userIDList:"To_Account"},response:{ReadTime:"peerReadTimeList"}}}}(e)),this._configMap.set(wo,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.RECENT_CONTACT,".").concat(V.CMD.GET_CONVERSATION_LIST)}),body:{fromAccount:void 0,count:0},keyMap:{request:{},response:{SessionItem:"conversations",ToAccount:"groupID",To_Account:"userID",UnreadMsgCount:"unreadCount",MsgGroupReadedSeq:"messageReadSeq",C2cPeerReadTime:"c2cPeerReadTime"}}}}(e)),this._configMap.set(bo,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.RECENT_CONTACT,".").concat(V.CMD.PAGING_GET_CONVERSATION_LIST)}),body:{fromAccount:void 0,timeStamp:void 0,startIndex:void 0,pinnedTimeStamp:void 0,pinnedStartIndex:void 0,orderType:void 0,messageAssistFlag:4,assistFlag:15},keyMap:{request:{messageAssistFlag:"MsgAssistFlags",assistFlag:"AssistFlags",pinnedTimeStamp:"TopTimeStamp",pinnedStartIndex:"TopStartIndex"},response:{SessionItem:"conversations",ToAccount:"groupID",To_Account:"userID",UnreadMsgCount:"unreadCount",MsgGroupReadedSeq:"messageReadSeq",C2cPeerReadTime:"c2cPeerReadTime",LastMsgFlags:"lastMessageFlag",TopFlags:"isPinned",TopTimeStamp:"pinnedTimeStamp",TopStartIndex:"pinnedStartIndex",GroupId:"convGroupID"}}}}(e)),this._configMap.set(qo,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.RECENT_CONTACT,".").concat(V.CMD.DELETE_CONVERSATION)}),body:{fromAccount:"",conversationList:void 0,clearHistoryMessage:void 0},keyMap:{request:{toGroupID:"ToGroupid",clearHistoryMessage:"ClearRamble",conversationList:"ContactItem"},response:{ResultItem:"resultList",ToGroupid:"toGroupID",ResultCode:"code",ResultInfo:"info"}}}}(e)),this._configMap.set(Fo,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.RECENT_CONTACT,".").concat(V.CMD.CLEAR_HISTORY_MESSAGE)}),body:{fromAccount:"",toAccount:void 0,type:1,toGroupID:void 0},keyMap:{request:{toGroupID:"ToGroupid"}}}}(e)),this._configMap.set(xo,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.RECENT_CONTACT,".").concat(V.CMD.PIN_CONVERSATION)}),body:{fromAccount:"",operationType:1,itemList:void 0},keyMap:{request:{itemList:"RecentContactItem"}}}}(e)),this._configMap.set(Vo,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.OPEN_IM,".").concat(V.CMD.DELETE_GROUP_AT_TIPS)}),body:{messageListToDelete:void 0},keyMap:{request:{messageListToDelete:"DelMsgList",messageSeq:"MsgSeq",messageRandom:"MsgRandom"}}}}(e)),this._configMap.set(Bo,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.RECENT_CONTACT,".").concat(V.CMD.MARK_CONVERSATION)}),body:{fromAccount:"",itemList:void 0},keyMap:{request:{itemList:"MarkItem",operationType:"OptType",groupID:"ToGroupId"},response:{ToGroupId:"groupID",OptType:"operationType"}}}}(e)),this._configMap.set(Ho,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.RECENT_CONTACT,".").concat(V.CMD.MARK_CONVERSATION)}),body:{fromAccount:"",itemList:void 0},keyMap:{request:{itemList:"MarkItem",operationType:"OptType",groupID:"ToGroupId"},response:{ToGroupId:"groupID",OptType:"operationType"}}}}(e)),this._configMap.set(Ko,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.RECENT_CONTACT,".").concat(V.CMD.CREATE_CONVERSATION_GROUP)}),body:{fromAccount:"",itemList:void 0},keyMap:{request:{itemList:"GroupContactItem",groupID:"ToGroupId"},response:{GroupId:"convGroupID",ToGroupId:"groupID",OptType:"operationType"}}}}(e)),this._configMap.set(Wo,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.RECENT_CONTACT,".").concat(V.CMD.DELETE_CONVERSATION_GROUP)}),body:{fromAccount:"",groupName:void 0},keyMap:{request:{},response:{GroupId:"convGroupID"}}}}(e)),this._configMap.set(jo,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.RECENT_CONTACT,".").concat(V.CMD.UPDATE_CONVERSATION_GROUP)}),body:{fromAccount:"",updateType:void 0,updateGroup:void 0},keyMap:{request:{oldName:"OldGroupName",newName:"NewGroupName",groupID:"ToGroupId",operationType:"ContactOptType",groupName:"OldGroupName",updateItem:"ContactUpdateItem"},response:{ContactOptType:"operationType",ToGroupId:"groupID",GroupId:"convGroupID"}}}}(e)),this._configMap.set(Yo,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.RECENT_CONTACT,".").concat(V.CMD.UPDATE_CONVERSATION_GROUP)}),body:{fromAccount:"",updateType:void 0,updateGroup:{groupName:void 0,updateGroupType:void 0,updateItem:void 0}},keyMap:{request:{},response:{}}}}(e)),this._configMap.set(zo,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.RECENT_CONTACT,".").concat(V.CMD.UPDATE_CONVERSATION_GROUP)}),body:{fromAccount:"",updateType:void 0,updateGroup:void 0},keyMap:{request:{},response:{}}}}(e)),this._configMap.set(Jo,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.RECENT_CONTACT,".").concat(V.CMD.GET_CONVERSATION_GROUP_LIST)}),body:{fromAccount:"",startTime:void 0,startIndex:void 0},keyMap:{request:{},response:{GroupId:"convGroupID",ToGroupId:"groupID",OptType:"operationType",CustomMark:"customData",ContactGroupId:"convGroupIDList"}}}}(e)),this._configMap.set(Io,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.PROFILE,".").concat(V.CMD.PORTRAIT_GET)}),body:{fromAccount:"",userItem:[]},keyMap:{request:{toAccount:"To_Account",standardSequence:"StandardSequence",customSequence:"CustomSequence"}}}}(e)),this._configMap.set(Co,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.PROFILE,".").concat(V.CMD.PORTRAIT_SET)}),body:{fromAccount:"",profileItem:[{tag:We.NICK,value:""},{tag:We.GENDER,value:""},{tag:We.ALLOWTYPE,value:""},{tag:We.AVATAR,value:""}]},keyMap:{request:{toAccount:"To_Account",standardSequence:"StandardSequence",customSequence:"CustomSequence"}}}}(e)),this._configMap.set(To,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.FRIEND,".").concat(V.CMD.GET_BLACKLIST)}),body:{fromAccount:"",startIndex:0,maxLimited:30,lastSequence:0},keyMap:{response:{CurruentSequence:"currentSequence"}}}}(e)),this._configMap.set(Do,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.FRIEND,".").concat(V.CMD.ADD_BLACKLIST)}),body:{fromAccount:"",toAccount:[]}}}(e)),this._configMap.set(ko,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.FRIEND,".").concat(V.CMD.DELETE_BLACKLIST)}),body:{fromAccount:"",toAccount:[]}}}(e)),this._configMap.set(ua,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.IM_OPEN_STATUS,".").concat(V.CMD.SET_SELF_STATUS)}),body:{customStatus:""},keyMap:{}}}(e)),this._configMap.set(ca,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.IM_OPEN_STATUS,".").concat(V.CMD.GET_USER_STATUS)}),body:{userIDList:void 0},keyMap:{response:{UserStatusList:"successUserList",ErrorList:"failureUserList",To_Account:"userID",Invalid_Account:"invalidUserID",Status:"statusType"}}}}(e)),this._configMap.set(la,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.IM_OPEN_STATUS,".").concat(V.CMD.SUBSCRIBE_USER_STATUS)}),body:{userIDList:void 0},keyMap:{response:{ErrorList:"failureUserList",To_Account:"userID",Invalid_Account:"invalidUserID"}}}}(e)),this._configMap.set(pa,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.IM_OPEN_STATUS,".").concat(V.CMD.UNSUBSCRIBE_USER_STATUS)}),body:{userIDList:void 0,unsubscribeAll:void 0},keyMap:{response:{ErrorList:"failureUserList",To_Account:"userID",Invalid_Account:"invalidUserID"}}}}(e)),this._configMap.set(Xo,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.GET_JOINED_GROUPS)}),body:{memberAccount:"",limit:void 0,offset:void 0,groupType:void 0,responseFilter:{groupBaseInfoFilter:void 0,selfInfoFilter:void 0},isSupportTopic:0},keyMap:{request:{memberAccount:"Member_Account"},response:{GroupIdList:"groups",NoUnreadSeqList:"excludedUnreadSequenceList",MsgSeq:"readedSequence",LastRecallTime:"_lastRevokedTime"}}}}(e)),this._configMap.set(Qo,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.GET_GROUP_INFO)}),body:{groupIDList:void 0,responseFilter:{groupBaseInfoFilter:["Type","Name","Introduction","Notification","FaceUrl","Owner_Account","CreateTime","InfoSeq","LastInfoTime","LastMsgTime","MemberNum","MaxMemberNum","ApplyJoinOption","NextMsgSeq","ShutUpAllMember"],groupCustomFieldFilter:void 0,memberInfoFilter:void 0,memberCustomFieldFilter:void 0}},keyMap:{request:{groupIDList:"GroupIdList",groupCustomField:"AppDefinedData",memberCustomField:"AppMemberDefinedData",groupCustomFieldFilter:"AppDefinedDataFilter_Group",memberCustomFieldFilter:"AppDefinedDataFilter_GroupMember"},response:{GroupIdList:"groups",AppDefinedData:"groupCustomField",AppMemberDefinedData:"memberCustomField",AppDefinedDataFilter_Group:"groupCustomFieldFilter",AppDefinedDataFilter_GroupMember:"memberCustomFieldFilter",InfoSeq:"infoSequence",MemberList:"members",GroupInfo:"groups",ShutUpUntil:"muteUntil",ShutUpAllMember:"muteAllMembers"}}}}(e)),this._configMap.set(Zo,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.CREATE_GROUP)}),body:{type:void 0,name:void 0,groupID:void 0,ownerID:void 0,introduction:void 0,notification:void 0,maxMemberNum:void 0,joinOption:void 0,memberList:void 0,groupCustomField:void 0,memberCustomField:void 0,webPushFlag:1,avatar:"",isSupportTopic:void 0,inviteOption:void 0},keyMap:{request:{ownerID:"Owner_Account",userID:"Member_Account",avatar:"FaceUrl",maxMemberNum:"MaxMemberCount",joinOption:"ApplyJoinOption",groupCustomField:"AppDefinedData",memberCustomField:"AppMemberDefinedData",inviteOption:"InviteJoinOption"},response:{HugeGroupFlag:"avChatRoomFlag",OverJoinedGroupLimit_Account:"overLimitUserIDList"}}}}(e)),this._configMap.set($o,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.DESTROY_GROUP)}),body:{groupID:void 0}}}(e)),this._configMap.set(es,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.MODIFY_GROUP_INFO)}),body:{groupID:void 0,name:void 0,introduction:void 0,notification:void 0,avatar:void 0,joinOption:void 0,groupCustomField:void 0,muteAllMembers:void 0,inviteOption:void 0},keyMap:{request:{groupCustomField:"AppDefinedData",muteAllMembers:"ShutUpAllMember",joinOption:"ApplyJoinOption",avatar:"FaceUrl",inviteOption:"InviteJoinOption"},response:{AppDefinedData:"groupCustomField",ShutUpAllMember:"muteAllMembers"}}}}(e)),this._configMap.set(ts,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.APPLY_JOIN_GROUP)}),body:{groupID:void 0,applyMessage:void 0,userDefinedField:void 0,webPushFlag:1,historyMessageFlag:void 0},keyMap:{request:{applyMessage:"ApplyMsg",historyMessageFlag:"HugeGroupHistoryMsgFlag"},response:{HugeGroupFlag:"avChatRoomFlag",AVChatRoomKey:"avChatRoomKey",RspMsgList:"messageList",ToGroupId:"to"}}}}(e)),this._configMap.set(ns,function(e){e.a2,e.tinyid;return{head:t(t({},g(e,Tc)),{},{servcmd:"".concat(V.NAME.BIG_GROUP_NO_AUTH,".").concat(V.CMD.APPLY_JOIN_GROUP)}),body:{groupID:void 0,applyMessage:void 0,userDefinedField:void 0,webPushFlag:1},keyMap:{request:{applyMessage:"ApplyMsg"},response:{HugeGroupFlag:"avChatRoomFlag"}}}}(e)),this._configMap.set(os,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.QUIT_GROUP)}),body:{groupID:void 0}}}(e)),this._configMap.set(ss,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.SEARCH_GROUP_BY_ID)}),body:{groupIDList:void 0,responseFilter:{groupBasePublicInfoFilter:["Type","Name","Introduction","Notification","FaceUrl","CreateTime","Owner_Account","LastInfoTime","LastMsgTime","NextMsgSeq","MemberNum","MaxMemberNum","ApplyJoinOption","InviteJoinOption"]}},keyMap:{response:{}}}}(e)),this._configMap.set(as,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.CHANGE_GROUP_OWNER)}),body:{groupID:void 0,newOwnerID:void 0},keyMap:{request:{newOwnerID:"NewOwner_Account"}}}}(e)),this._configMap.set(rs,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.HANDLE_APPLY_JOIN_GROUP)}),body:{groupID:void 0,applicant:void 0,handleAction:void 0,handleMessage:void 0,authentication:void 0,messageKey:void 0,userDefinedField:void 0},keyMap:{request:{applicant:"Applicant_Account",handleAction:"HandleMsg",handleMessage:"ApprovalMsg",messageKey:"MsgKey"}}}}(e)),this._configMap.set(is,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.HANDLE_INVITE_JOIN_GROUP)}),body:{groupID:void 0,applicant:void 0,invitee:void 0,handleAction:void 0,handleMessage:void 0,authentication:void 0,userDefinedField:void 0},keyMap:{request:{applicant:"Applicant_Account",invitee:"Invited_Account",handleAction:"HandleMsg",handleMessage:"ApprovalMsg"}}}}(e)),this._configMap.set(us,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.HANDLE_GROUP_INVITATION)}),body:{groupID:void 0,inviter:void 0,handleAction:void 0,handleMessage:void 0,authentication:void 0,messageKey:void 0,userDefinedField:void 0},keyMap:{request:{inviter:"Inviter_Account",handleAction:"HandleMsg",handleMessage:"ApprovalMsg",messageKey:"MsgKey"}}}}(e)),this._configMap.set(vs,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.GET_GROUP_APPLICATION)}),body:{startTime:void 0,limit:void 0,handleAccount:void 0},keyMap:{request:{handleAccount:"Handle_Account"},response:{To_Account:"userID"}}}}(e)),this._configMap.set(ms,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.OPEN_IM,".").concat(V.CMD.DELETE_GROUP_SYSTEM_MESSAGE)}),body:{messageListToDelete:void 0},keyMap:{request:{messageListToDelete:"DelMsgList",messageSeq:"MsgSeq",messageRandom:"MsgRandom"}}}}(e)),this._configMap.set(Ms,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.BIG_GROUP_LONG_POLLING,".").concat(V.CMD.AVCHATROOM_LONG_POLL)}),body:{USP:1,startSeq:1,startBroadcastSeq:void 0,holdTime:90,key:void 0,simplifiedMessage:void 0},keyMap:{request:{USP:"USP"},response:{ToGroupId:"groupID",RspBroadcastMsgList:"broadcastMessageList",IsSystemMsg:"isSystemMessage"}}}}(e)),this._configMap.set(ys,function(e){e.a2,e.tinyid;return{head:t(t({},g(e,Dc)),{},{servcmd:"".concat(V.NAME.BIG_GROUP_LONG_POLLING_NO_AUTH,".").concat(V.CMD.AVCHATROOM_LONG_POLL)}),body:{USP:1,startSeq:1,holdTime:90,key:void 0,simplifiedMessage:void 0},keyMap:{request:{USP:"USP"},response:{ToGroupId:"groupID",RspBroadcastMsgList:"broadcastMessageList",IsSystemMsg:"isSystemMessage"}}}}(e)),this._configMap.set(Is,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.GET_ONLINE_MEMBER_NUM)}),body:{groupID:void 0}}}(e)),this._configMap.set(Ds,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.SET_GROUP_ATTRIBUTES)}),body:{groupID:void 0,groupAttributeList:void 0,mainSequence:void 0,avChatRoomKey:void 0,attributeControl:["RaceConflict"]},keyMap:{request:{key:"key",value:"value"}}}}(e)),this._configMap.set(ks,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.MODIFY_GROUP_ATTRIBUTES)}),body:{groupID:void 0,groupAttributeList:void 0,mainSequence:void 0,avChatRoomKey:void 0,attributeControl:["RaceConflict"]},keyMap:{request:{key:"key",value:"value"}}}}(e)),this._configMap.set(Ss,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.DELETE_GROUP_ATTRIBUTES)}),body:{groupID:void 0,groupAttributeList:void 0,mainSequence:void 0,avChatRoomKey:void 0,attributeControl:["RaceConflict"]},keyMap:{request:{key:"key"}}}}(e)),this._configMap.set(Ls,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.CLEAR_GROUP_ATTRIBUTES)}),body:{groupID:void 0,mainSequence:void 0,avChatRoomKey:void 0,attributeControl:["RaceConflict"]}}}(e)),this._configMap.set(Es,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP_ATTR,".").concat(V.CMD.GET_GROUP_ATTRIBUTES)}),body:{groupID:void 0,avChatRoomKey:void 0,groupType:1},keyMap:{request:{avChatRoomKey:"Key",groupType:"GroupType"}}}}(e)),this._configMap.set(Ns,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.GET_GROUP_NOTIFY)}),body:{notifyType:1,groupID:"",beginTime:0,endTime:0,limit:20},keyMap:{request:{},response:{NextMsgTime:"nextRevokedTime",NotifyMsgList:"notifyList"}}}}(e)),this._configMap.set(Os,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.UPDATE_GROUP_COUNTER)}),body:{groupID:void 0,counterList:void 0,avChatRoomKey:void 0,mode:void 0},keyMap:{request:{counterList:"GroupCounter"}}}}(e)),this._configMap.set(Gs,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.GET_GROUP_COUNTER)}),body:{groupID:void 0,keyList:[],avChatRoomKey:void 0},keyMap:{request:{keyList:"GroupCounterKeys"}}}}(e)),this._configMap.set(sa,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP_COMMUNITY,".").concat(V.CMD.CREATE_TOPIC)}),body:{groupID:void 0,topicName:void 0,avatar:void 0,customData:void 0,topicID:void 0,notification:void 0,introduction:void 0},keyMap:{request:{avatar:"FaceUrl"}}}}(e)),this._configMap.set(aa,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP_COMMUNITY,".").concat(V.CMD.DELETE_TOPIC)}),body:{groupID:void 0,topicIDList:void 0},keyMap:{request:{topicIDList:"TopicIdList"},response:{DestroyResultItem:"resultList"}}}}(e)),this._configMap.set(ra,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP_COMMUNITY,".").concat(V.CMD.UPDATE_TOPIC_PROFILE)}),body:{groupID:void 0,topicID:void 0,avatar:void 0,customData:void 0,notification:void 0,introduction:void 0,muteAllMembers:void 0,topicName:void 0},keyMap:{request:{avatar:"FaceUrl",muteAllMembers:"ShutUpAllMember"}}}}(e)),this._configMap.set(ia,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP_COMMUNITY,".").concat(V.CMD.GET_TOPIC_LIST)}),body:{groupID:void 0,topicIDList:void 0,MemberInfoFilter:["NoUnreadSeqList"]},keyMap:{request:{topicIDList:"TopicIdList"},response:{TopicAndSelfInfo:"topicInfoList",TopicInfo:"topic",GroupID:"groupID",ShutUpTime:"muteTime",ShutUpAllFlag:"muteAllMembers",LastMsgTime:"lastMessageTime",MsgSeq:"readedSequence",LastMsgSeq:"sequence",NoUnreadSeqList:"excludedUnreadSequenceList"}}}}(e)),this._configMap.set(Ps,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.GET_GROUP_MEMBER_LIST)}),body:{groupID:void 0,limit:0,offset:void 0,next:void 0,memberRoleFilter:void 0,memberInfoFilter:["Role","NameCard","ShutUpUntil","JoinTime"],memberCustomFieldFilter:void 0},keyMap:{request:{memberCustomFieldFilter:"AppDefinedDataFilter_GroupMember"},response:{AppMemberDefinedData:"memberCustomField",AppDefinedDataFilter_GroupMember:"memberCustomFieldFilter",MemberList:"members",ShutUpUntil:"muteUntil"}}}}(e)),this._configMap.set(Us,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP_AVCHATROOM,".").concat(V.CMD.GET_AVCHATROOM_MEMBER_LIST)}),body:{groupID:void 0,offset:void 0,filter:void 0},keyMap:{request:{offset:"Timestamp",filter:"Mark"},response:{NextTimestamp:"offset"}}}}(e)),this._configMap.set(bs,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.GET_GROUP_MEMBER_INFO)}),body:{groupID:void 0,userIDList:void 0,memberInfoFilter:void 0,memberCustomFieldFilter:void 0},keyMap:{request:{userIDList:"Member_List_Account",memberCustomFieldFilter:"AppDefinedDataFilter_GroupMember"},response:{MemberList:"members",ShutUpUntil:"muteUntil",AppDefinedDataFilter_GroupMember:"memberCustomFieldFilter",AppMemberDefinedData:"memberCustomField"}}}}(e)),this._configMap.set(ws,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.ADD_GROUP_MEMBER)}),body:{groupID:void 0,silence:void 0,userIDList:void 0},keyMap:{request:{userID:"Member_Account",userIDList:"MemberList"},response:{MemberList:"members"}}}}(e)),this._configMap.set(qs,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.DELETE_GROUP_MEMBER)}),body:{groupID:void 0,userIDList:void 0,reason:void 0},keyMap:{request:{userIDList:"MemberToDel_Account"}}}}(e)),this._configMap.set(Fs,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.BAN_AVCHATROOM_MEMBER)}),body:{groupID:void 0,userIDList:void 0,duration:void 0,reason:""},keyMap:{request:{userIDList:"Members_Account",duration:"Duration",reason:"Description"}}}}(e)),this._configMap.set(xs,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP,".").concat(V.CMD.MODIFY_GROUP_MEMBER_INFO)}),body:{groupID:void 0,topicID:void 0,userID:void 0,messageRemindType:void 0,nameCard:void 0,role:void 0,memberCustomField:void 0,muteTime:void 0},keyMap:{request:{userID:"Member_Account",memberCustomField:"AppMemberDefinedData",muteTime:"ShutUpTime",messageRemindType:"MsgFlag"}}}}(e)),this._configMap.set(Vs,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.GROUP_AVCHATROOM,".").concat(V.CMD.MARK_AVCHATROOM_MEMBER_INFO)}),body:{groupID:void 0,operationType:1,memberList:[]},keyMap:{request:{operationType:"CommandType",memberList:"MemberList",markType:"Marks",userID:"Member_Account"},response:{CommandType:"operationType",Marks:"markType",Member_Account:"userID"}}}}(e)),this._configMap.set(Ws,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.IM_OPEN_STAT,".").concat(V.CMD.TIM_WEB_REPORT_V2)}),body:{header:{},event:[],quality:[]},keyMap:{request:{SDKType:"sdk_type",SDKVersion:"sdk_version",deviceType:"device_type",platform:"platform",instanceID:"instance_id",traceID:"trace_id",SDKAppID:"sdk_app_id",userID:"user_id",tinyID:"tiny_id",extension:"extension",timestamp:"timestamp",networkType:"network_type",eventType:"event_type",code:"error_code",message:"error_message",moreMessage:"more_message",duplicate:"duplicate",costTime:"cost_time",level:"level",qualityType:"quality_type",reportIndex:"report_index",wholePeriod:"whole_period",totalCount:"total_count",rttCount:"success_count_business",successRateOfRequest:"percent_business",countLessThan1Second:"success_count_business",percentOfCountLessThan1Second:"percent_business",countLessThan3Second:"success_count_platform",percentOfCountLessThan3Second:"percent_platform",successCountOfBusiness:"success_count_business",successRateOfBusiness:"percent_business",successCountOfPlatform:"success_count_platform",successRateOfPlatform:"percent_platform",successCountOfMessageReceived:"success_count_business",successRateOfMessageReceived:"percent_business",avgRTT:"average_value",avgDelay:"average_value",avgValue:"average_value",uiPlatform:"ui_platform"}}}}(o)),this._configMap.set(js,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.HEARTBEAT,".").concat(V.CMD.ALIVE)}),body:{}}}(e)),this._configMap.set(Ys,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.IM_OPEN_PUSH,".").concat(V.CMD.MESSAGE_PUSH)}),body:{},keyMap:{response:{C2cMsgArray:"C2CMessageArray",GroupMsgArray:"groupMessageArray",GroupTips:"groupTips",C2cNotifyMsgArray:"C2CNotifyMessageArray",C2cMsgInfo:"C2CReadReceiptArray",ClientSeq:"clientSequence",MsgPriority:"priority",NoticeSeq:"noticeSequence",MsgContent:"content",MsgType:"type",MsgBody:"elements",ToGroupId:"to",Desc:"description",Ext:"extension",IsSyncMsg:"isSyncMessage",Flag:"needSync",NeedAck:"needAck",PendencyAdd_Account:"userID",ProfileImNick:"nick",PendencyType:"applicationType",C2CReadAllMsg:"readAllC2CMessage",IsNeedReadReceipt:"needReadReceipt",Status:"statusType"}}}}(e)),this._configMap.set(zs,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.IM_OPEN_PUSH,".").concat(V.CMD.MULTI_MESSAGE_PUSH)}),body:{},keyMap:{response:{GroupMsgArray:"groupMessageArray",GroupTips:"groupTips",ClientSeq:"clientSequence",MsgPriority:"priority",NoticeSeq:"noticeSequence",MsgContent:"content",MsgType:"type",MsgBody:"elements",ToGroupId:"to",Desc:"description",Ext:"extension",IsSyncMsg:"isSyncMessage",Flag:"needSync",NeedAck:"needAck",PendencyType:"applicationType"}}}}(e)),this._configMap.set(Js,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.OPEN_IM,".").concat(V.CMD.MESSAGE_PUSH_ACK)}),body:{sessionData:void 0},keyMap:{request:{sessionData:"SessionData"}}}}(e)),this._configMap.set(Xs,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.IM_OPEN_STATUS,".").concat(V.CMD.STATUS_FORCE_OFFLINE)}),body:{},keyMap:{response:{C2cNotifyMsgArray:"C2CNotifyMessageArray",NoticeSeq:"noticeSequence",KickoutMsgNotify:"kickoutMsgNotify",NewInstInfo:"newInstanceInfo"}}}}(e)),this._configMap.set(Zs,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.IM_LONG_MESSAGE,".").concat(V.CMD.DOWNLOAD_MERGER_MESSAGE)}),body:{downloadKey:""},keyMap:{response:{Data:"data",Desc:"description",Ext:"extension",Download_Flag:"downloadFlag",ThumbUUID:"thumbUUID",VideoUUID:"videoUUID"}}}}(e)),this._configMap.set(Qs,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.IM_LONG_MESSAGE,".").concat(V.CMD.UPLOAD_MERGER_MESSAGE)}),body:{messageList:[]},keyMap:{request:{fromAccount:"From_Account",toAccount:"To_Account",msgTimeStamp:"MsgTimeStamp",msgSeq:"MsgSeq",msgRandom:"MsgRandom",msgBody:"MsgBody",type:"MsgType",content:"MsgContent",data:"Data",description:"Desc",extension:"Ext",sizeType:"Type",uuid:"UUID",url:"",imageUrl:"URL",fileUrl:"Url",remoteAudioUrl:"Url",remoteVideoUrl:"VideoUrl",thumbUUID:"ThumbUUID",videoUUID:"VideoUUID",videoUrl:"",downloadFlag:"Download_Flag",from:"From_Account",time:"MsgTimeStamp",messageRandom:"MsgRandom",messageSequence:"MsgSeq",elements:"MsgBody",clientSequence:"ClientSeq",payload:"MsgContent",messageList:"MsgList",messageNumber:"MsgNum",abstractList:"AbstractList",messageBody:"MsgBody"}}}}(e)),this._configMap.set(ha,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.IM_OPEN_STATUS,".").concat(V.CMD.SET_TOKEN)}),body:{tokenID:"",pushMsg:0,sdkAppID:0,businessID:"",deviceBrand:"",deviceToken:"",isTpns:0,isWebUniapp:0},keyMap:{request:{tokenID:"TokenID",pushMsg:"PushMsg",sdkAppID:"EnterVersion",businessID:"BusiID",deviceBrand:"InstType",deviceToken:"VarToken",isTpns:"IsTpns"}}}}(e)),this._configMap.set(ga,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.IM_OPEN_STATUS,".").concat(V.CMD.STAT_FOREGROUND)}),body:{isWebUniapp:0}}}(e)),this._configMap.set(da,function(e){return{head:t(t({},e),{},{servcmd:"".concat(V.NAME.IM_OPEN_STATUS,".").concat(V.CMD.STAT_BACKGROUND)}),body:{C2CUnread:0,GroupUnread:0,isWebUniapp:0},keyMap:{request:{c2cUnreadCount:"C2cUnread",groupUnreadCount:"GrpUnread"}}}}(e))}},{key:"has",value:function(e){return this._configMap.has(e)}},{key:"get",value:function(e){return this._configMap.get(e)}},{key:"update",value:function(){this._fillConfigMap()}},{key:"getKeyMap",value:function(e){return this.has(e)?this.get(e).keyMap||{}:(He.w("".concat(this._n,".getKeyMap unknown protocolName:").concat(e)),{})}},{key:"getProtocolData",value:function(e){var t=e.protocolName,n=e.requestData,o=this.get(t),s=null;if(n){var a=this._simpleDeepCopy(o),r=this._updateService(n,a),i=r.body,u=Object.create(null);for(var c in i)if(Object.prototype.hasOwnProperty.call(i,c)){if(u[c]=i[c],void 0===n[c])continue;u[c]=n[c]}r.body=u,s=this._getUplinkData(r)}else s=this._getUplinkData(o);return s}},{key:"_getUplinkData",value:function(e){var t=this._requestDataCleaner(e),n=xt(t.head),o=ic(t.body,this._getRequestKeyMap(n));return t.body=o,t}},{key:"_updateService",value:function(e,t){var n=xt(t.head);if(this._isFromGroupRequest(t)){var o=e.type,s=e.groupID,a=void 0===s?void 0:s,r=e.groupIDList,i=void 0===r?[]:r;ut(a)&&(a=i[0]||""),Et({type:o,groupID:a})&&(t.head.servcmd="".concat(V.NAME.GROUP_COMMUNITY,".").concat(n))}return t}},{key:"_isFromGroupRequest",value:function(e){return e.head.servcmd.includes(V.NAME.GROUP)||e.head.servcmd.includes(V.NAME.GROUP_ATTR)}},{key:"_getRequestKeyMap",value:function(e){var n=this.getKeyMap(e);return t(t({},sc.request),n.request)}},{key:"_requestDataCleaner",value:function(e){var t=Array.isArray(e)?[]:Object.create(null);for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&gt(o)&&null!==e[o]&&void 0!==e[o]&&("object"!==n(e[o])?t[o]=e[o]:t[o]=this._requestDataCleaner.bind(this)(e[o]));return t}},{key:"_simpleDeepCopy",value:function(e){for(var t,n=Object.keys(e),o={},s=0,a=n.length;s<a;s++)t=n[s],it(e[t])?o[t]=Array.from(e[t]):at(e[t])?o[t]=this._simpleDeepCopy(e[t]):o[t]=e[t];return o}}]),e}(),Sc=[Js],Lc=function(){function e(t){o(this,e),this._sessionModule=t,this._n="DownlinkHandler",this._eventHandlerMap=new Map,this._eventHandlerMap.set("C2CMessageArray",this._c2cMessageArrayHandler.bind(this)),this._eventHandlerMap.set("groupMessageArray",this._groupMessageArrayHandler.bind(this)),this._eventHandlerMap.set("groupTips",this._groupTipsHandler.bind(this)),this._eventHandlerMap.set("C2CNotifyMessageArray",this._C2CNotifyMessageArrayHandler.bind(this)),this._eventHandlerMap.set("C2CReadReceiptArray",this._C2CReadReceiptArrayHandler.bind(this)),this._eventHandlerMap.set("profileModify",this._profileHandler.bind(this)),this._eventHandlerMap.set("friendListMod",this._relationChainHandler.bind(this)),this._eventHandlerMap.set("recentContactMod",this._recentContactHandler.bind(this)),this._eventHandlerMap.set("readAllC2CMessage",this._allMessageReadHandler.bind(this)),this._eventHandlerMap.set("c2cMessageModified",this._c2cMessageModifiedHandler.bind(this)),this._eventHandlerMap.set("groupMessageModified",this._groupMessageModifiedHandler.bind(this)),this._eventHandlerMap.set("userStatusList",this._userStatusListHandler.bind(this)),this._eventHandlerMap.set("messageExtensionNotify",this._messageExtensionNotifyHandler.bind(this)),this._keys=m(this._eventHandlerMap.keys())}return a(e,[{key:"_c2cMessageArrayHandler",value:function(e){var t=this._sessionModule.getModule(qn);if(t){if(e.dataList.forEach((function(e){if(1===e.isSyncMessage){var t=e.from;e.from=e.to,e.to=t}})),1===e.needSync)this._sessionModule.getModule(Qn).startOnlineSync();t.onNewC2CMessage({dataList:e.dataList,isInstantMessage:!0})}}},{key:"_c2cMessageModifiedHandler",value:function(e){var t=this._sessionModule.getModule(qn);t&&t.onC2CMessageModified(e)}},{key:"_groupMessageArrayHandler",value:function(e){var t=this._sessionModule.getModule(Fn);t&&t.onNewGroupMessage({event:e.event,dataList:e.dataList,isInstantMessage:!0})}},{key:"_groupMessageModifiedHandler",value:function(e){var t=this._sessionModule.getModule(Fn);t&&t.onGroupMessageModified(e)}},{key:"_groupTipsHandler",value:function(e){var t=this._sessionModule.getModule(Fn);if(t){var n=e.event,o=e.dataList,s=e.isInstantMessage,a=void 0===s||s,r=e.isSyncingEnded;switch(n){case 4:case 6:t.onNewGroupTips({event:n,dataList:o});break;case 5:for(var i=0;i<o.length;i++)if(it(o[i].elements.revokedInfos))t.onGroupMessageRevoked({dataList:o});else if(it(o[i].elements.groupMessageReadNotice))t.onGroupMessageReadNotice({dataList:o});else{if(!it(o[i].elements.readReceiptList)){t.onNewGroupSystemNotice({dataList:o,isInstantMessage:a,isSyncingEnded:r});break}t.onReadReceiptList({dataList:o})}break;case 12:this._sessionModule.getModule(Hn).onNewGroupAtTips({dataList:o});break;default:He.l("".concat(this._n,"._groupTipsHandler unknown event:").concat(n," dataList:"),o)}}}},{key:"_C2CNotifyMessageArrayHandler",value:function(e){var t=this,n=e.dataList;if(it(n)){var o=this._sessionModule.getModule(qn);n.forEach((function(e){if(rt(e))if(e.hasOwnProperty("kickoutMsgNotify")){var s=e.kickoutMsgNotify,a=s.kickType,r=s.newInstanceInfo,i=void 0===r?{}:r;1===a?t._sessionModule.onMultipleAccountKickedOut(i):2===a?t._sessionModule.onMultipleDeviceKickedOut(i):3===a&&t._sessionModule.onRestApiKickedOut(i)}else if(e.hasOwnProperty("c2cMessageRevokedNotify"))o&&o.onC2CMessageRevoked({dataList:n});else if(e.hasOwnProperty("c2cMessageReadReceipt"))o&&o.onC2CMessageReadReceipt({dataList:n});else if(e.hasOwnProperty("c2cMessageReadNotice"))o&&o.onC2CMessageReadNotice({dataList:n});else if(e.hasOwnProperty("muteNotificationsSync")){t._sessionModule.getModule(Hn).onC2CMessageRemindTypeSynced({dataList:n})}}))}}},{key:"_C2CReadReceiptArrayHandler",value:function(e){this._sessionModule.getModule(qn).onReadReceiptList(e)}},{key:"_profileHandler",value:function(e){this._sessionModule.getModule(wn).onProfileModified({dataList:e.dataList});var t=this._sessionModule.getModule(xn);t&&t.onFriendProfileModified({dataList:e.dataList})}},{key:"_relationChainHandler",value:function(e){this._sessionModule.getModule(wn).onRelationChainModified({dataList:e.dataList});var t=this._sessionModule.getModule(xn);t&&t.onRelationChainModified({dataList:e.dataList})}},{key:"_recentContactHandler",value:function(e){var t=e.dataList;if(it(t)){var n=this._sessionModule.getModule(Hn);n&&t.forEach((function(e){var t=e.pushType;if(1===t){var o=e.recentContactDeleteItem;n.onConversationDeleted(o.recentContactList)}else if(2===t){var s=e.recentContactTopItem;n.onConversationPinned(s.recentContactList)}else if(3===t){var a=e.recentContactTopItem;n.onConversationUnpinned(a.recentContactList)}else if(4===t){var r=e.recentContactMarkContact;n.onConversationMarkUpdated(r.recentContactMarkContactItem)}else if(5===t){var i=e.recentContactCreateContactGroup;n.onConversationGroupCreated(i.msgContactGroupContactItem)}else if(6===t){var u=e.recentContactDelContactGroup;n.onConversationGroupDeleted(u.msgGroupItem)}else if(7===t){var c=e.recentContactUpdateContactGroup,l=c.updateType,p=c.msgUpdateGroup,d=c.msgUpdateContact;if(1===l){var g=p.updateGroupType;1===g?n.onConversationGroupNameUpdated(p):2===g&&n.onConversationInGroupUpdated(p)}else 2===l&&n.onConversationAddedToOrDeletedFromGroup(d)}}))}}},{key:"_allMessageReadHandler",value:function(e){var t=e.dataList,n=this._sessionModule.getModule(Hn);n&&n.onPushedAllMessageRead(t)}},{key:"_userStatusListHandler",value:function(e){this._sessionModule.getModule(wn).onUserStatusUpdated(e)}},{key:"_messageExtensionNotifyHandler",value:function(e){this._sessionModule.getModule(bn).onMessageExtensionNotify(e)}},{key:"onMessage",value:function(e){var t=this,n=e.body;if(this._filterMessageFromIMOpenPush(e)){var o=n.eventArray,s=n.isInstantMessage,a=n.isSyncingEnded,r=n.needSync;if(it(o))for(var i=null,u=null,c=0,l=0,p=o.length;l<p;l++){c=(i=o[l]).event;var d=Object.keys(i).find((function(e){return-1!==t._keys.indexOf(e)}));d?(u=14===c?{readAllC2CMessage:i[d],groupMessageReadInfoList:i.groupMessageReadNotice||[]}:16===c?{userID:i.userID,readReceiptList:i[d]}:i[d],this._eventHandlerMap.get(d)({event:c,dataList:u,isInstantMessage:s,isSyncingEnded:a,needSync:r})):He.l("".concat(this._n,".onMessage unknown eventItem:").concat(i))}}}},{key:"_filterMessageFromIMOpenPush",value:function(e){var t=e.head,n=e.body,o=t.servcmd,s=!1;if(ut(o)||(s=o.includes(V.NAME.IM_CONFIG_MANAGER)||o.includes(V.NAME.OVERLOAD_PUSH)||o.includes(V.NAME.STAT_SERVICE)),!s)return!0;if(o.includes(V.CMD.PUSHED_CLOUD_CONTROL_CONFIG))this._sessionModule.getModule(to).onPushedCloudControlConfig(n);else if(o.includes(V.CMD.PUSHED_COMMERCIAL_CONFIG)){this._sessionModule.getModule(ao).onPushedConfig(n)}else if(o.includes(V.CMD.OVERLOAD_NOTIFY))this._sessionModule.onPushedServerOverload(n);else if(o.includes(V.CMD.KICK_OTHER)){var a=Date.now();this._sessionModule.reLoginOnKickOther();var r=new li("kickOther"),i=this._sessionModule.getModule(Pn).getLastWsHelloTs(),u=a-i;r.setMessage("last wshello time:".concat(i," diff:").concat(u,"ms")).setNetworkType(this._sessionModule.getNetworkType()).end()}return!1}}]),e}(),Ec=[{cmd:V.CMD.GET_GROUP_INFO,interval:1,count:20},{cmd:V.CMD.GET_AVCHATROOM_MEMBER_LIST,interval:3,count:1},{cmd:V.CMD.GET_GROUP_APPLICATION,interval:1,count:15},{cmd:V.CMD.GET_TOPIC_LIST,interval:1,count:10},{cmd:V.CMD.SET_GROUP_ATTRIBUTES,interval:5,count:10},{cmd:V.CMD.MODIFY_GROUP_ATTRIBUTES,interval:5,count:10},{cmd:V.CMD.DELETE_GROUP_ATTRIBUTES,interval:5,count:10},{cmd:V.CMD.CLEAR_GROUP_ATTRIBUTES,interval:5,count:10},{cmd:V.CMD.GET_GROUP_ATTRIBUTES,interval:5,count:20},{cmd:V.CMD.UPDATE_GROUP_COUNTER,interval:5,count:20},{cmd:V.CMD.GET_GROUP_COUNTER,interval:5,count:20},{cmd:V.CMD.SET_ALL_MESSAGE_READ,interval:1,count:1},{cmd:V.CMD.GET_USER_STATUS,interval:5,count:20},{cmd:V.CMD.SUBSCRIBE_USER_STATUS,interval:5,count:20},{cmd:V.CMD.UNSUBSCRIBE_USER_STATUS,interval:5,count:20}],Ac=function(e){i(s,e);var n=f(s);function s(e){var t;return o(this,s),(t=n.call(this,e))._n="SessionModule",t._platform=t.getPlatform(),t._protocolHandler=new kc(h(t)),t._messageDispatcher=new Lc(h(t)),t._commandFrequencyLimitMap=new Map,t._commandRequestInfoMap=new Map,t._serverOverloadInfoMap=new Map,t._init(),t.getInnerEmitterInstance().on(bi,t._onCloudConfigUpdated,h(t)),t}return a(s,[{key:"_init",value:function(){this._updateCommandFrequencyLimitMap(Ec)}},{key:"_onCloudConfigUpdated",value:function(){var e=this.getCloudConfig("cmd_frequency_limit");ut(e)||(e=JSON.parse(e),this._updateCommandFrequencyLimitMap(e))}},{key:"_updateCommandFrequencyLimitMap",value:function(e){var t=this;e.forEach((function(e){t._commandFrequencyLimitMap.set(e.cmd,{interval:e.interval,count:e.count})}))}},{key:"updateProtocolConfig",value:function(){this._protocolHandler.update()}},{key:"request",value:function(e){He.d("".concat(this._n,".request options:"),e);var t=e.protocolName,n=e.tjgID;if(!this._protocolHandler.has(t))return He.w("".concat(this._n,".request unknown protocol:").concat(t)),Oi({code:Gr});var o=this.getProtocolData(e),s=o.head.servcmd;if(this._isFrequencyOverLimit(s))return Oi({code:Or});if(this._isServerOverload(s))return Oi({code:Jr});Zt(n)||(o.head.tjgID=n);var a=this.getModule($n);return Sc.includes(t)?a.simplySend(o):a.send(o)}},{key:"getKeyMap",value:function(e){return this._protocolHandler.getKeyMap(e)}},{key:"genCommonHead",value:function(){var e=this.getModule(Kn);return{ver:"v4",platform:this._platform,websdkappid:O,websdkversion:N,a2:e.getA2Key()||void 0,tinyid:e.getTinyID()||void 0,status_instid:e.getStatusInstanceID(),sdkappid:e.getSDKAppID(),contenttype:e.getContentType(),reqtime:0,identifier:e.getA2Key()?void 0:e.getUserID(),usersig:e.getA2Key()?void 0:e.getUserSig(),sdkability:192371,tjgID:""}}},{key:"genCosSpecifiedHead",value:function(){var e=this.getModule(Kn);return{ver:"v4",platform:this._platform,websdkappid:O,websdkversion:N,sdkappid:e.getSDKAppID(),contenttype:e.getContentType(),reqtime:0,identifier:e.getUserID(),usersig:e.getUserSig(),status_instid:e.getStatusInstanceID(),sdkability:192371}}},{key:"genSSOReportHead",value:function(){var e=this.getModule(Kn);return{ver:"v4",platform:this._platform,websdkappid:O,websdkversion:N,sdkappid:e.getSDKAppID(),contenttype:"",reqtime:0,identifier:"",usersig:"",status_instid:e.getStatusInstanceID(),sdkability:192371}}},{key:"getProtocolData",value:function(e){return this._protocolHandler.getProtocolData(e)}},{key:"trans",value:function(e){var n=e.servcmd,o=e.data,s={head:t(t({},this.genCommonHead()),{},{servcmd:n}),body:o};return this.getModule($n).send(s)}},{key:"sendComboMessage",value:function(e){var n=e.servcmd,o=e.data,s={head:t(t({},this.genCommonHead()),{},{servcmd:n}),body:o};return this.getModule($n).send(s)}},{key:"onErrorCodeNotZero",value:function(e){var t=e.errorCode;if(t===zr){var n=e.kickType,o=e.newInstanceInfo,s=void 0===o?{}:o;1===n?this.onMultipleAccountKickedOut(s):2===n?this.onMultipleDeviceKickedOut(s):3===n&&this.onRestApiKickedOut(s)}t!==jr&&t!==Yr||(this._onUserSigExpired(),this.getModule($n).reConnect())}},{key:"onMessage",value:function(e){var t=e.body,n=t.needAck,o=void 0===n?0:n,s=t.sessionData;1===o&&this._sendACK(s),this._messageDispatcher.onMessage(e)}},{key:"onReconnected",value:function(){this._reLoginOnReconnected()}},{key:"reLoginOnKickOther",value:function(){He.l("".concat(this._n,".reLoginOnKickOther")),this._reLogin()}},{key:"_reLoginOnReconnected",value:function(){He.l("".concat(this._n,"._reLoginOnReconnected")),this._reLogin()}},{key:"_reLogin",value:function(){var e=this;if(this.isLoggedIn()){var t=0,n=this.getModule(ro);n.canIUseOfflinePush()&&(t=n.getUniAppPlatform()),this.request({protocolName:go,requestData:{isWebUniapp:t}}).then((function(t){var n=t.data.instanceID;e.getModule(Kn).setStatusInstanceID(n),He.l("".concat(e._n,"._reLogin ok. start to sync unread messages")),e.getModule(Hn).syncConversationList().then((function(){e.getModule(oo).start()})),e.getModule(Fn).updateLocalMainSequenceOnReconnected();var o=e.getModule(Bn);o.resetGetTopicTime(),o.getTopicListOnReconnected()}))}}},{key:"onMultipleAccountKickedOut",value:function(e){this.getModule(Pn).onMultipleAccountKickedOut(e)}},{key:"onMultipleDeviceKickedOut",value:function(e){this.getModule(Pn).onMultipleDeviceKickedOut(e)}},{key:"_onUserSigExpired",value:function(){this.getModule(Pn).onUserSigExpired()}},{key:"onRestApiKickedOut",value:function(e){this.getModule(Pn).onRestApiKickedOut(e)}},{key:"_sendACK",value:function(e){this.request({protocolName:Js,requestData:{sessionData:e}})}},{key:"_isFrequencyOverLimit",value:function(e){var t=e.split(".")[1];if(!this._commandFrequencyLimitMap.has(t))return!1;if(!this._commandRequestInfoMap.has(t))return this._commandRequestInfoMap.set(t,{startTime:Date.now(),requestCount:1}),!1;var n=this._commandFrequencyLimitMap.get(t),o=n.count,s=n.interval,a=this._commandRequestInfoMap.get(t),r=a.startTime,i=a.requestCount;if(Date.now()-r>1e3*s)return this._commandRequestInfoMap.set(t,{startTime:Date.now(),requestCount:1}),!1;i+=1,this._commandRequestInfoMap.set(t,{startTime:r,requestCount:i});var u=!1;return i>o&&(u=!0),u}},{key:"_isServerOverload",value:function(e){if(!this._serverOverloadInfoMap.has(e))return!1;var t=this._serverOverloadInfoMap.get(e),n=t.overloadTime,o=t.waitingTime,s=!1;return Date.now()-n<=1e3*o?s=!0:(this._serverOverloadInfoMap.delete(e),s=!1),s}},{key:"onPushedServerOverload",value:function(e){var t=e.overloadCommand,n=e.waitingTime;this._serverOverloadInfoMap.set(t,{overloadTime:Date.now(),waitingTime:n}),He.w("".concat(this._n,".onPushedServerOverload waitingTime:").concat(n,"s"))}},{key:"reset",value:function(){He.l("".concat(this._n,".reset")),this._updateCommandFrequencyLimitMap(Ec),this._commandRequestInfoMap.clear(),this._serverOverloadInfoMap.clear()}}]),s}(po),Rc=function(e){i(n,e);var t=f(n);function n(e){var s;return o(this,n),(s=t.call(this,e))._n="MessageLossDetectionModule",s._maybeLostSequencesMap=new Map,s._firstRoundRet=[],s}return a(n,[{key:"onMessageMaybeLost",value:function(e,t,n){this._maybeLostSequencesMap.has(e)||this._maybeLostSequencesMap.set(e,[]);for(var o=this._maybeLostSequencesMap.get(e),s=0;s<n;s++)-1===o.indexOf(t+s)&&o.push(t+s)}},{key:"detectFirstRound",value:function(e,t){var n=this._maybeLostSequencesMap.get(e);if(!Zt(n)&&!Zt(t)){var o=n.filter((function(e){return-1===t.indexOf(e)}));0===o.length?He.i("".concat(this._n,".detectFirstRound no message loss. conversationID:").concat(e)):this._firstRoundRet=this._firstRoundRet.concat(o),n.length=0}}},{key:"detectSecondRound",value:function(e,t){if(!Zt(this._firstRoundRet)&&!Zt(t)){var n=this._firstRoundRet.filter((function(e){return-1===t.indexOf(e)}));this._firstRoundRet.length=0;var o,s=n.length;if(0!==s)s<=5?o=e+"-"+n.join("-"):(n.sort((function(e,t){return e-t})),o=e+" start:"+n[0]+" end:"+n[s-1]+" count:"+s),new li("messageLoss").setMessage(o).setNetworkType(this.getNetworkType()).setLevel("warning").end(),He.i("".concat(this._n,".detectSecondRound message loss detected. conversationID:").concat(e," lostSequences:").concat(n))}}},{key:"reset",value:function(){He.l("".concat(this._n,".reset")),this._maybeLostSequencesMap.clear(),this._firstRoundRet.length=0}}]),n}(po),Nc=function(e){i(n,e);var t=f(n);function n(e){var s;return o(this,n),(s=t.call(this,e))._n="CloudControlModule",s._cloudConfig=new Map,s._expiredTime=0,s._version=0,s._isFetching=!1,s}return a(n,[{key:"getCloudConfig",value:function(e){return ut(e)?this._cloudConfig:this._cloudConfig.has(e)?this._cloudConfig.get(e):void 0}},{key:"_canFetchConfig",value:function(){return this.isLoggedIn()&&!this._isFetching&&Date.now()>=this._expiredTime}},{key:"fetchConfig",value:function(){var e=this,t=this._canFetchConfig();if(He.l("".concat(this._n,".fetchConfig canFetchConfig:").concat(t)),t){var n=new li("fetchCloudControlConfig"),o=this.getModule(Kn).getSDKAppID();this._isFetching=!0,this.request({protocolName:$s,requestData:{SDKAppID:o,version:this._version}}).then((function(t){e._isFetching=!1,n.setMessage("version:".concat(e._version," newVersion:").concat(t.data.version," config:").concat(t.data.cloudControlConfig)).setNetworkType(e.getNetworkType()).end(),He.l("".concat(e._n,".fetchConfig ok")),e._parseCloudControlConfig(t.data)})).catch((function(t){e._isFetching=!1,e.probeNetwork().then((function(e){var o=v(e,2),s=o[0],a=o[1];n.setError(t,s,a).end()})),He.l("".concat(e._n,".fetchConfig failed. error:"),t),e._setExpiredTimeOnResponseError(12e4)}))}}},{key:"onPushedCloudControlConfig",value:function(e){He.l("".concat(this._n,".onPushedCloudControlConfig")),new li("pushedCloudControlConfig").setNetworkType(this.getNetworkType()).setMessage("newVersion:".concat(e.version," config:").concat(e.cloudControlConfig)).end(),this._parseCloudControlConfig(e)}},{key:"onCheckTimer",value:function(e){this._canFetchConfig()&&this.fetchConfig()}},{key:"_parseCloudControlConfig",value:function(e){var t=this,n="".concat(this._n,"._parseCloudControlConfig"),o=e.errorCode,s=e.errorMessage,a=e.cloudControlConfig,r=e.version,i=e.expiredTime;if(0===o){if(this._version!==r){var u=null;try{u=JSON.parse(a)}catch(c){this.isPrivateNetWork()||He.e("".concat(n," JSON parse error. cloudControlConfig:"),a)}u&&(this._cloudConfig.clear(),Object.keys(u).forEach((function(e){t._cloudConfig.set(e,u[e])})),this._version=r,this.emitInnerEvent(bi))}this._expiredTime=Date.now()+1e3*i}else ut(o)?(He.l("".concat(n," failed. Invalid message format:"),e),this._setExpiredTimeOnResponseError(36e5)):(He.e("".concat(n," errorCode:").concat(o," errorMessage:").concat(s)),this._setExpiredTimeOnResponseError(12e4))}},{key:"_setExpiredTimeOnResponseError",value:function(e){this._expiredTime=Date.now()+e}},{key:"reset",value:function(){He.l("".concat(this._n,".reset")),this._cloudConfig.clear(),this._expiredTime=0,this._version=0,this._isFetching=!1}}]),n}(po),Oc=function(e){i(n,e);var t=f(n);function n(e){var s;return o(this,n),(s=t.call(this,e))._n="RecoverMessageModule",s.PULL_LIMIT_COUNT=15,s}return a(n,[{key:"start",value:function(){this._recoverGroupChat(),this._recoverC2CChat()}},{key:"_recoverGroupChat",value:function(){var e,t,n=this,o=this._getLocalConversationList().filter((function(e){return e.type===S.CONV_GROUP&&e.groupProfile.type!==S.GRP_AVCHATROOM})),s=this.getModule(Hn),a=0,r=0,i=0;o.forEach((function(o){var u=o.conversationID,c=o.lastMessage;t=u.replace(S.CONV_GROUP,""),e=s.getLocalLastMessage(u),c&&0!==c.lastSequence&&e?(r=c.lastSequence,a=e.sequence,i=r-a,a>0&&i>=1&&i<300?n._recoverGroupMessage({groupID:t,localLastMessageSequence:a,remoteLastMessageSequence:r}):n._getGroupNotify(t)):n._getGroupNotify(t)}))}},{key:"_recoverC2CChat",value:function(){var e,t=this,n=this._getLocalConversationList().filter((function(e){return e.type===S.CONV_C2C})),o=this.getModule(Hn),s=0,a=0,r=0,i=[Promise.resolve()];n.forEach((function(n){var u=n.conversationID,c=n.lastMessage;e=o.getLocalLastMessage(u),c&&0!==c.lastTime&&e&&(a=c.lastTime,s=e.time,r=a-s,s>0&&r>=1&&r<=600&&i.push(t._recoverC2CMessage({conversationID:u,localLastMessageTime:s,remoteLastMessageTime:a})))})),Promise.all(i).then((function(){He.l("".concat(t._n,"._recoverC2CChat all promise fulfilled, start to sync unread messages")),t.getModule(Qn).startSyncOnReconnected()}))}},{key:"_getLocalConversationList",value:function(){return this.getModule(Hn).getLocalConversationList()}},{key:"_recoverGroupMessage",value:function(e){var t=this,n="".concat(this._n,"._recoverGroupMessage");He.l("".concat(n," options:"),e);var o=e.groupID,s=e.localLastMessageSequence,a=e.remoteLastMessageSequence;this._getGroupRomaingMessage({groupID:o,sequence:s}).then((function(e){var s=e.data,r=s.complete,i=s.messageList;if(!ut(i)){var u=i[0].sequence;He.l("".concat(n," pkgLastMessageSequence:").concat(u," complete:").concat(r)),u<a&&2!==r&&t._recoverGroupMessage({groupID:o,localLastMessageSequence:u,remoteLastMessageSequence:a}),new li("recoverMessage").setNetworkType(t.getNetworkType()).setMessage("groupID:".concat(o," complete:").concat(r," messageList length:").concat(i.length)).end(),t.getModule(Fn).onNewGroupMessage({dataList:i,isInstantMessage:!1,updateUnreadCount:!1}),t._getGroupNotify(o)}}))}},{key:"_getGroupNotify",value:function(e){this.getModule(Fn).getGroupNotify(e)}},{key:"_getGroupRomaingMessage",value:function(e){var t=e.groupID,n=e.sequence;return this.request({protocolName:ds,requestData:{groupID:t,count:this.PULL_LIMIT_COUNT,sequence:n+this.PULL_LIMIT_COUNT-1}})}},{key:"_recoverC2CMessage",value:function(e){var t=this,n="".concat(this._n,"._recoverC2CMessage");He.l("".concat(this._n,"._recoverC2CMessage options:"),e);var o=e.conversationID,s=e.localLastMessageTime,a=e.remoteLastMessageTime;return this._getC2CRoamingMessage({conversationID:o,time:s}).then((function(e){var s=e.data,r=s.complete,i=s.messageList;if(!ut(i)){new li("recoverMessage").setNetworkType(t.getNetworkType()).setMessage("".concat(o," complete:").concat(r," messageList length:").concat(u)).end(),t.getModule(qn).onNewC2CMessage({dataList:i,isInstantMessage:!0});var u=i.length,c=i[u-1].time;if(He.l("".concat(n," pkgLastMessageTime:").concat(c," complete:").concat(r)),c<a&&1!==r)return t._recoverC2CMessage({conversationID:o,localLastMessageTime:c,remoteLastMessageTime:a})}}))}},{key:"_getC2CRoamingMessage",value:function(e){var t=e.conversationID,n=e.time;return this.request({protocolName:Ro,requestData:{peerAccount:t.replace(S.CONV_C2C,""),count:this.PULL_LIMIT_COUNT+1,lastMessageTime:n,direction:1}})}},{key:"reset",value:function(){He.l("".concat(this._n,".reset"))}}]),n}(po),Gc=function(){function e(){o(this,e),this._n="AvgE2EDelay",this._e2eDelayArray=[]}return a(e,[{key:"addMessageDelay",value:function(e){var t=Fe()-e;t>=0&&this._e2eDelayArray.push(t)}},{key:"_calcAvg",value:function(e,t){if(0===t)return 0;var n=0;return e.forEach((function(e){n+=e})),Vt(n/t,1)}},{key:"_calcCountWithLimit",value:function(e){var t=e.e2eDelayArray,n=e.min,o=e.max;return t.filter((function(e){return n<=e&&e<o})).length}},{key:"_calcPercent",value:function(e,t){var n=Vt(e/t*100,2);return n>100&&(n=100),n}},{key:"_checkE2EDelayException",value:function(e,t){var n=e.filter((function(e){return e>t}));if(n.length>0){var o=n.length,s=Math.min.apply(Math,m(n)),a=Math.max.apply(Math,m(n)),r=this._calcAvg(n,o),i=Vt(o/e.length*100,2);if(i>50)new li("messageE2EDelayException").setMessage("count:".concat(o," min:").concat(s," max:").concat(a," avg:").concat(r," percent:").concat(i)).setLevel("warning").end()}}},{key:"getStatResult",value:function(){var e=this._e2eDelayArray.length;if(0===e)return null;var t=m(this._e2eDelayArray),n=this._calcCountWithLimit({e2eDelayArray:t,min:0,max:1}),o=this._calcCountWithLimit({e2eDelayArray:t,min:1,max:3}),s=this._calcPercent(n,e),a=this._calcPercent(o,e),r=this._calcAvg(t,e);return this._checkE2EDelayException(t,3),t.length=0,this.reset(),{totalCount:e,countLessThan1Second:n,percentOfCountLessThan1Second:s,countLessThan3Second:o,percentOfCountLessThan3Second:a,avgDelay:r}}},{key:"reset",value:function(){this._e2eDelayArray.length=0}}]),e}(),Pc=function(){function e(){o(this,e),this._n="AvgRTT",this._requestCount=0,this._rttArray=[]}return a(e,[{key:"addRequestCount",value:function(){this._requestCount+=1}},{key:"addRTT",value:function(e){this._rttArray.push(e)}},{key:"_calcTotalCount",value:function(){return this._requestCount}},{key:"_calcRTTCount",value:function(e){return e.length}},{key:"_calcSuccessRateOfRequest",value:function(e,t){if(0===t)return 0;var n=Vt(e/t*100,2);return n>100&&(n=100),n}},{key:"_calcAvg",value:function(e,t){if(0===t)return 0;var n=0;return e.forEach((function(e){n+=e})),parseInt(n/t)}},{key:"_calcMax",value:function(){return Math.max.apply(Math,m(this._rttArray))}},{key:"_calcMin",value:function(){return Math.min.apply(Math,m(this._rttArray))}},{key:"getStatResult",value:function(){var e=this._calcTotalCount(),t=m(this._rttArray);if(0===e)return null;var n=this._calcRTTCount(t),o=this._calcSuccessRateOfRequest(n,e),s=this._calcAvg(t,n);return He.l("".concat(this._n,".getStatResult max:").concat(this._calcMax()," min:").concat(this._calcMin()," avg:").concat(s)),this.reset(),{totalCount:e,rttCount:n,successRateOfRequest:o,avgRTT:s}}},{key:"reset",value:function(){this._requestCount=0,this._rttArray.length=0}}]),e}(),Uc=function(){function e(){o(this,e),this._map=new Map}return a(e,[{key:"initMap",value:function(e){var t=this;e.forEach((function(e){t._map.set(e,{totalCount:0,successCount:0,failedCountOfUserSide:0,costArray:[],fileSizeArray:[]})}))}},{key:"addTotalCount",value:function(e){return!(ut(e)||!this._map.has(e))&&(this._map.get(e).totalCount+=1,!0)}},{key:"addSuccessCount",value:function(e){return!(ut(e)||!this._map.has(e))&&(this._map.get(e).successCount+=1,!0)}},{key:"addFailedCountOfUserSide",value:function(e){return!(ut(e)||!this._map.has(e))&&(this._map.get(e).failedCountOfUserSide+=1,!0)}},{key:"addCost",value:function(e,t){return!(ut(e)||!this._map.has(e))&&(this._map.get(e).costArray.push(t),!0)}},{key:"addFileSize",value:function(e,t){return!(ut(e)||!this._map.has(e))&&(this._map.get(e).fileSizeArray.push(t),!0)}},{key:"_calcSuccessRateOfBusiness",value:function(e){if(ut(e)||!this._map.has(e))return-1;var t=this._map.get(e),n=Vt(t.successCount/t.totalCount*100,2);return n>100&&(n=100),n}},{key:"_calcSuccessRateOfPlatform",value:function(e){if(ut(e)||!this._map.has(e))return-1;var t=this._map.get(e),n=this._calcSuccessCountOfPlatform(e)/t.totalCount*100;return(n=Vt(n,2))>100&&(n=100),n}},{key:"_calcTotalCount",value:function(e){return ut(e)||!this._map.has(e)?-1:this._map.get(e).totalCount}},{key:"_calcSuccessCountOfBusiness",value:function(e){return ut(e)||!this._map.has(e)?-1:this._map.get(e).successCount}},{key:"_calcSuccessCountOfPlatform",value:function(e){if(ut(e)||!this._map.has(e))return-1;var t=this._map.get(e);return t.successCount+t.failedCountOfUserSide}},{key:"_calcAvg",value:function(e){return ut(e)||!this._map.has(e)?-1:e===ni?this._calcAvgSpeed(e):this._calcAvgCost(e)}},{key:"_calcAvgCost",value:function(e){var t=this._map.get(e).costArray.length;if(0===t)return 0;var n=0;return this._map.get(e).costArray.forEach((function(e){n+=e})),parseInt(n/t)}},{key:"_calcAvgSpeed",value:function(e){var t=0,n=0;return this._map.get(e).costArray.forEach((function(e){t+=e})),this._map.get(e).fileSizeArray.forEach((function(e){n+=e})),parseInt(1e3*n/t)}},{key:"getStatResult",value:function(e){var t=this._calcTotalCount(e);if(0===t)return null;var n=this._calcSuccessCountOfBusiness(e),o=this._calcSuccessRateOfBusiness(e),s=this._calcSuccessCountOfPlatform(e),a=this._calcSuccessRateOfPlatform(e),r=this._calcAvg(e);return this.reset(e),{totalCount:t,successCountOfBusiness:n,successRateOfBusiness:o,successCountOfPlatform:s,successRateOfPlatform:a,avgValue:r}}},{key:"reset",value:function(e){ut(e)?this._map.clear():this._map.set(e,{totalCount:0,successCount:0,failedCountOfUserSide:0,costArray:[],fileSizeArray:[]})}}]),e}(),bc=function(){function e(){o(this,e),this._lastMap=new Map,this._currentMap=new Map}return a(e,[{key:"initMap",value:function(e){var t=this;e.forEach((function(e){t._lastMap.set(e,new Map),t._currentMap.set(e,new Map)}))}},{key:"addMessageSequence",value:function(e){var t=e.key,n=e.message;if(ut(t)||!this._lastMap.has(t)||!this._currentMap.has(t))return!1;var o=n.conversationID,s=n.sequence,a=o.replace(S.CONV_GROUP,"");if(0===this._lastMap.get(t).size)this._addCurrentMap(e);else if(this._lastMap.get(t).has(a)){var r=this._lastMap.get(t).get(a),i=r.length-1;s>r[0]&&s<r[i]?(r.push(s),r.sort(),this._lastMap.get(t).set(a,r)):this._addCurrentMap(e)}else this._addCurrentMap(e);return!0}},{key:"_addCurrentMap",value:function(e){var t=e.key,n=e.message,o=n.conversationID,s=n.sequence,a=o.replace(S.CONV_GROUP,"");this._currentMap.get(t).has(a)||this._currentMap.get(t).set(a,[]),this._currentMap.get(t).get(a).push(s)}},{key:"_copyData",value:function(e){if(!ut(e)){this._lastMap.set(e,new Map);var t,n=this._lastMap.get(e),o=D(this._currentMap.get(e));try{for(o.s();!(t=o.n()).done;){var s=v(t.value,2),a=s[0],r=s[1];n.set(a,r)}}catch(i){o.e(i)}finally{o.f()}n=null,this._currentMap.set(e,new Map)}}},{key:"getStatResult",value:function(e){if(ut(this._currentMap.get(e))||ut(this._lastMap.get(e)))return null;if(0===this._lastMap.get(e).size)return this._copyData(e),null;var t=0,n=0;if(this._lastMap.get(e).forEach((function(e,o){var s=m(e.values()),a=s.length,r=s[a-1]-s[0]+1;t+=r,n+=a})),0===t)return null;var o=Vt(n/t*100,2);return o>100&&(o=100),this._copyData(e),{totalCount:t,successCountOfMessageReceived:n,successRateOfMessageReceived:o}}},{key:"reset",value:function(){this._currentMap.clear(),this._lastMap.clear()}}]),e}(),wc=function(e){i(s,e);var n=f(s);function s(e){var t;o(this,s),(t=n.call(this,e))._n="QualityStatModule",t.TAG="im-ssolog-quality-stat",t.reportIndex=0,t.wholePeriod=!1,t._qualityItems=[Xr,Qr,Zr,$r,ei,ti,ni,oi,si,ai],t._messageSentItems=[Zr,$r,ei,ti,ni],t._messageReceivedItems=[oi,si,ai],t.REPORT_INTERVAL=120,t.REPORT_SDKAPPID_BLACKLIST=[],t.REPORT_TINYID_WHITELIST=[],t._statInfoArr=[],t._avgRTT=new Pc,t._avgE2EDelay=new Gc,t._rateMessageSent=new Uc,t._rateMessageReceived=new bc;var a=t.getInnerEmitterInstance();return a.on(Ui,t._onLoginSuccess,h(t)),a.on(bi,t._onCloudConfigUpdated,h(t)),t}return a(s,[{key:"_onLoginSuccess",value:function(){var e=this;this._rateMessageSent.initMap(this._messageSentItems),this._rateMessageReceived.initMap(this._messageReceivedItems);var t=this.getModule(Wn),n=t.getItem(this.TAG,!1);!Zt(n)&&lt(n.forEach)&&(He.l("".concat(this._n,"._onLoginSuccess get quality stat logs from local storage, count:").concat(n.length)),n.forEach((function(t){e._statInfoArr.push(t)})),t.removeItem(this.TAG,!1))}},{key:"_onCloudConfigUpdated",value:function(){var e=this.getCloudConfig("q_rpt_interval"),t=this.getCloudConfig("q_rpt_sdkappid_bl"),n=this.getCloudConfig("q_rpt_tinyid_wl");ut(e)||(this.REPORT_INTERVAL=Number(e)),ut(t)||(this.REPORT_SDKAPPID_BLACKLIST=t.split(",").map((function(e){return Number(e)}))),ut(n)||(this.REPORT_TINYID_WHITELIST=n.split(","))}},{key:"onCheckTimer",value:function(e){this.isLoggedIn()&&e%this.REPORT_INTERVAL==0&&(this.wholePeriod=!0,this._report())}},{key:"addRequestCount",value:function(){this._avgRTT.addRequestCount()}},{key:"addRTT",value:function(e){this._avgRTT.addRTT(e)}},{key:"addMessageDelay",value:function(e){this._avgE2EDelay.addMessageDelay(e)}},{key:"addTotalCount",value:function(e){this._rateMessageSent.addTotalCount(e)||He.w("".concat(this._n,".addTotalCount invalid key:"),e)}},{key:"addSuccessCount",value:function(e){this._rateMessageSent.addSuccessCount(e)||He.w("".concat(this._n,".addSuccessCount invalid key:"),e)}},{key:"addFailedCountOfUserSide",value:function(e){this._rateMessageSent.addFailedCountOfUserSide(e)||He.w("".concat(this._n,".addFailedCountOfUserSide invalid key:"),e)}},{key:"addCost",value:function(e,t){this._rateMessageSent.addCost(e,t)||He.w("".concat(this._n,".addCost invalid key or cost:"),e,t)}},{key:"addFileSize",value:function(e,t){this._rateMessageSent.addFileSize(e,t)||He.w("".concat(this._n,".addFileSize invalid key or size:"),e,t)}},{key:"addMessageSequence",value:function(e){this._rateMessageReceived.addMessageSequence(e)||He.w("".concat(this._n,".addMessageSequence invalid key:"),e.key)}},{key:"_getQualityItem",value:function(e){var n={},o=ui[this.getNetworkType()];ut(o)&&(o=8);var s={qualityType:ri[e],timestamp:we(),networkType:o,extension:""};switch(e){case Xr:n=this._avgRTT.getStatResult();break;case Qr:n=this._avgE2EDelay.getStatResult();break;case Zr:case $r:case ei:case ti:case ni:n=this._rateMessageSent.getStatResult(e);break;case oi:case si:case ai:n=this._rateMessageReceived.getStatResult(e)}return null===n?null:t(t({},s),n)}},{key:"_report",value:function(e){var t=this,n=[],o=null;ut(e)?this._qualityItems.forEach((function(e){null!==(o=t._getQualityItem(e))&&(o.reportIndex=t.reportIndex,o.wholePeriod=t.wholePeriod,n.push(o))})):null!==(o=this._getQualityItem(e))&&(o.reportIndex=this.reportIndex,o.wholePeriod=this.wholePeriod,n.push(o)),He.d("".concat(this._n,"._report"),n),this._statInfoArr.length>0&&(n=n.concat(this._statInfoArr),this._statInfoArr=[]);var s=this.getModule(Kn),a=s.getSDKAppID(),r=s.getTinyID();Bt(this.REPORT_SDKAPPID_BLACKLIST,a)&&!Ht(this.REPORT_TINYID_WHITELIST,r)&&(n=[]),n.length>0&&this._doReport(n)}},{key:"_doReport",value:function(e){var n=this,o={header:qu(this),quality:e};this.request({protocolName:Ws,requestData:t({},o)}).then((function(){n.reportIndex++,n.wholePeriod=!1})).catch((function(t){He.w("".concat(n._n,"._doReport, online:").concat(n.getNetworkType()," error:"),t),n._statInfoArr=n._statInfoArr.concat(e),n._flushAtOnce()}))}},{key:"_flushAtOnce",value:function(){var e=this.getModule(Wn),t=e.getItem(this.TAG,!1),n=this._statInfoArr,o="".concat(this._n,"._flushAtOnce");if(Zt(t))He.l("".concat(o," count:").concat(n.length)),e.setItem(this.TAG,n,!0,!1);else{var s=n.concat(t);s.length>10&&(s=s.slice(0,10)),He.l("".concat(o," count:").concat(s.length)),e.setItem(this.TAG,s,!0,!1)}this._statInfoArr=[]}},{key:"reset",value:function(){He.l("".concat(this._n,".reset")),this._report(),this.reportIndex=0,this.wholePeriod=!1,this.REPORT_SDKAPPID_BLACKLIST=[],this.REPORT_TINYID_WHITELIST=[],this._avgRTT.reset(),this._avgE2EDelay.reset(),this._rateMessageSent.reset(),this._rateMessageReceived.reset()}}]),s}(po),qc=function(e){i(n,e);var t=f(n);function n(e){var s;return o(this,n),(s=t.call(this,e))._n="WorkerTimerModule",s._isWorkerEnabled=!0,s._workerTimer=null,s._timerID=-1,s._init(),s.getInnerEmitterInstance().on(bi,s._onCloudConfigUpdated,h(s)),s}return a(n,[{key:"isWorkerEnabled",value:function(){return this._isWorkerEnabled&&Ae}},{key:"startWorkerTimer",value:function(){He.l("".concat(this._n,".startWorkerTimer")),this._workerTimer&&this._workerTimer.postMessage("start")}},{key:"stopWorkerTimer",value:function(){He.l("".concat(this._n,".stopWorkerTimer")),this._workerTimer&&this._workerTimer.postMessage("stop")}},{key:"_init",value:function(){if(Ae){var e=URL.createObjectURL(new Blob(['let interval = -1;onmessage = function(event) {  if (event.data === "start") {    if (interval > 0) {      clearInterval(interval);    }    interval = setInterval(() => {      postMessage("");    }, 1000);    postMessage(interval);  } else if (event.data === "stop") {    clearInterval(interval);    interval = -1;  }};'],{type:"application/javascript; charset=utf-8"}));this._workerTimer=new Worker(e);var t=this;this._workerTimer.onmessage=function(e){e.data?(t._timerID=e.data,He.l("".concat(t._n,"._init seed:").concat(t._timerID))):t._m.onCheckTimer()}}}},{key:"_onCloudConfigUpdated",value:function(){var e=this.getCloudConfig("enable_worker");He.l("".concat(this._n,"._onCloudConfigUpdated enableWorker:").concat(e)),ut(e)||"1"===e?!this._isWorkerEnabled&&Ae&&(this._isWorkerEnabled=!0,this.startWorkerTimer(),this._m.onWorkerTimerEnabled()):this._isWorkerEnabled&&Ae&&(this._isWorkerEnabled=!1,this.stopWorkerTimer(),this._m.onWorkerTimerDisabled())}},{key:"terminate",value:function(){He.l("".concat(this._n,".terminate")),this._workerTimer&&(this._workerTimer.terminate(),this._workerTimer=null,this._timerID=-1)}},{key:"getTimerID",value:function(){return this._timerID}},{key:"reset",value:function(){He.l("".concat(this._n,".reset"))}}]),n}(po),Fc=function(){function e(){o(this,e),this._n="PurchasedFeatureHandler",this._purchasedFeatureMap=new Map}return a(e,[{key:"isValidPurchaseBits",value:function(e){return e&&"string"==typeof e&&e.length>=1&&e.length<=64&&/[01]{1,64}/.test(e)}},{key:"parsePurchaseBits",value:function(e){var t="".concat(this._n,".parsePurchaseBits");if(this.isValidPurchaseBits(e)){this._purchasedFeatureMap.clear();for(var n=null,o=e.length-1,s=0;o>=0;o--,s++)n=s<32?new E(0,Math.pow(2,s)).toString():new E(Math.pow(2,s-32),0).toString(),"1"===e[o]?this._purchasedFeatureMap.set(n,!0):this._purchasedFeatureMap.set(n,!1)}else He.w("".concat(t," invalid purchase bits:").concat(e))}},{key:"hasPurchasedFeature",value:function(e){return!!this._purchasedFeatureMap.get(e)}},{key:"isFeatureEnabled",value:function(e){for(var t=parseInt(e).toString(2),n=void 0,o=!0,s=t.length-1,a=0;s>=0;s--,a++)if("1"===t.charAt(s)&&(n=a<32?new E(0,Math.pow(2,a)).toString():new E(Math.pow(2,a-32),0).toString(),!this._purchasedFeatureMap.get(n))){o=!1;break}return He.l("".concat(this._n,".isFeatureEnabled decimalNumber:").concat(e," binaryString:").concat(t," ret:").concat(o)),Ni({enabled:o})}},{key:"clear",value:function(){this._purchasedFeatureMap.clear()}}]),e}(),xc=function(){function e(t){o(this,e),this._m=t,this._n="CommercialConfigModule",this._expiredTime=0,this._isFetching=!1,this._purchasedFeatureHandler=new Fc}return a(e,[{key:"_canFetch",value:function(){return this._getModule(Kn).isLoggedIn()?!this._isFetching&&Date.now()>=this._expiredTime:(this._expiredTime=Date.now()+2e3,!1)}},{key:"onCheckTimer",value:function(e){this._canFetch()&&this.fetchConfig()}},{key:"fetchConfig",value:function(){var e=this,t=this._canFetch(),n="".concat(this._n,".fetchConfig");if(He.l("".concat(n," canFetch:").concat(t)),t){var o=this._getModule(Yn),s=new li("fetchCommercialConfig");s.setNetworkType(o.getNetworkType());var a=this._getModule(Kn).getSDKAppID(),r=this._getModule(Zn);this._isFetching=!0,r.request({protocolName:ta,requestData:{SDKAppID:a}}).then((function(t){s.setMessage("purchaseBits:".concat(t.data.purchaseBits)).end(),He.l("".concat(n," ok.")),e._parseConfig(t.data),e._isFetching=!1})).catch((function(t){o.probe().then((function(e){var n=v(e,2),o=n[0],a=n[1];s.setError(t,o,a).end()})),e._isFetching=!1}))}}},{key:"onPushedConfig",value:function(e){var t="".concat(this._n,".onPushedConfig");He.l("".concat(t)),new li("pushedCommercialConfig").setNetworkType(this._getModule(Yn).getNetworkType()).setMessage("purchaseBits:".concat(e.purchaseBits)).end(),this._parseConfig(e)}},{key:"_parseConfig",value:function(e){var t="".concat(this._n,"._parseConfig"),n=e.errorCode,o=e.errorMessage,s=e.purchaseBits,a=e.expiredTime;0===n?(this._purchasedFeatureHandler.parsePurchaseBits(s),this._expiredTime=Date.now()+1e3*a):ut(n)?(He.l("".concat(t," failed. Invalid message format:"),e),this._setExpiredTimeOnResponseError(36e5)):(He.e("".concat(t," errorCode:").concat(n," errorMessage:").concat(o)),this._setExpiredTimeOnResponseError(12e4))}},{key:"_setExpiredTimeOnResponseError",value:function(e){this._expiredTime=Date.now()+e}},{key:"canIUse",value:function(e){return this._purchasedFeatureHandler.hasPurchasedFeature(e)}},{key:"isFeatureEnabled",value:function(e){return this._purchasedFeatureHandler.isFeatureEnabled(e)}},{key:"_getModule",value:function(e){return this._m.getModule(e)}},{key:"reset",value:function(){He.l("".concat(this._n,".reset")),this._expiredTime=0,this._isFetching=!1,this._purchasedFeatureHandler.clear()}}]),e}(),Vc=function(e){i(n,e);var t=f(n);function n(e){var s;return o(this,n),(s=t.call(this,e))._m=e,s._n="OfflinePushModule",s._offlinePushPlugin=void 0,s._androidPushConfig={huaweiPushBussinessId:"",xiaomiPushBussinessId:"",xiaomiPushAppId:"",xiaomiPushAppKey:"",meizuPushBussinessId:"",meizuPushAppId:"",meizuPushAppKey:"",vivoPushBussinessId:"",fcmPushBussinessId:"",oppoPushBussinessId:"",oppoPushAppKey:"",oppoPushAppSecret:"",honorPushBussinessId:""},s._deviceToken="",s._businessID=0,s._iosBusinessID=0,s._c2cUnreadCount=0,s._groupUnreadCount=0,s._isWebUniapp=0,s}return a(n,[{key:"registerPlugin",value:function(e){if(re){this._offlinePushPlugin=e["tim-offline-push-plugin"];var t=e.offlinePushConfig||{},n=t.huaweiBusinessID,o=t.xiaomiBusinessID,s=t.xiaomiAppID,a=t.xiaomiAppKey,r=t.meizuBusinessID,i=t.meizuAppID,u=t.meizuAppKey,c=t.vivoBusinessID,l=t.oppoBusinessID,p=t.oppoAppKey,d=t.oppoAppSecret,g=t.honorBusinessID,h=t.iosBusinessID;this._androidPushConfig.huaweiPushBussinessId=n,this._androidPushConfig.xiaomiPushBussinessId=o,this._androidPushConfig.xiaomiPushAppId=s,this._androidPushConfig.xiaomiPushAppKey=a,this._androidPushConfig.meizuPushBussinessId=r,this._androidPushConfig.meizuPushAppId=i,this._androidPushConfig.meizuPushAppKey=u,this._androidPushConfig.vivoPushBussinessId=c,this._androidPushConfig.oppoPushBussinessId=l,this._androidPushConfig.oppoPushAppKey=p,this._androidPushConfig.oppoPushAppSecret=d,this._androidPushConfig.honorPushBussinessId=g,new li("registerPlugin").setMessage("tim-offline-push-plugin").setMoreMessage("isExist:".concat(!ut(this._offlinePushPlugin))).end(!0),He.l("".concat(this._n,".").concat("registerPlugin"," ok. offlinePushConfig:").concat(JSON.stringify(e.offlinePushConfig))),this._iosBusinessID=h,this._setAppShowListener()}else this.outputWarning("OfflinePushInUniapp")}},{key:"init",value:function(){this._isWebUniapp=this.getUniAppPlatform(),this._getDeviceToken()}},{key:"_getDeviceToken",value:function(){var e=this,t="".concat(this._n,".").concat("_getDeviceToken");if(lt(this._offlinePushPlugin.getDeviceToken)){var n="androidPushConfig:".concat(JSON.stringify(this._androidPushConfig),", iosBusinessID:").concat(this._iosBusinessID);He.l("".concat(t," start. ").concat(n)),new li("_getDeviceToken").setMessage("".concat(n)).end(!0),this._offlinePushPlugin.getDeviceToken(this._androidPushConfig,(function(o){var s=new li("getDeviceTokenRes"),a=o.code,r=o.msg;if(0===a){var i=o.data,u=i.deviceToken,c=i.deviceBrand,l=i.deviceType,p=i.bussinessId;e._deviceToken=u,e._businessID=p||e._iosBusinessID,n="deviceToken:".concat(u,", deviceBrand:").concat(c||l,", businessID:").concat(e._businessID),He.l("".concat(t," ok. ").concat(n)),s.setMessage(n).end(!0),e._setToken()}else s.setMessage("code:".concat(a,", msg:").concat(r)).end(!0),He.e("".concat(t," failed. error:"),o)}))}else He.e("".concat(t," getDeviceToken is not a function"))}},{key:"canIUseOfflinePush",value:function(){return re&&!ut(this._offlinePushPlugin)}},{key:"_setAppShowListener",value:function(){var e=this,t="".concat(this._n,".").concat("_setAppShowListener");ut(this._offlinePushPlugin)?He.e("".concat(t," offlinePushPlugin is undefined")):lt(this._offlinePushPlugin.setAppShowListener)?(new li("_setAppShowListener").end(!0),He.l("".concat(t," start")),this._offlinePushPlugin.setAppShowListener((function(n){var o=(n||{}).appShow;new li("setAppShowListenerRes").setMessage("appShow:".concat(o)).end(!0),He.l("".concat(t," ok. appShow:").concat(o)),e._m.isReady()&&(0===o?(e._getConvUnreadCount(),e._onBackground()):1===o&&e._onForeground())}))):He.e("".concat(t," setAppShowListener is not a function"))}},{key:"getDeviceBrand",value:function(){if(!ut(this._offlinePushPlugin)&&lt(this._offlinePushPlugin.getDeviceType)){var e=(this._offlinePushPlugin.getDeviceType()||{}).deviceType;return He.l("".concat(this._n,".getDeviceBrand ok. deviceType:").concat(e)),e}}},{key:"_setToken",value:function(){var e,t=this,n="".concat(this._n,"._setToken"),o=this.getModule(Kn),s=1,a="",r="";Zt(this._deviceToken)&&(s=0);var i=this.getUniAppPlatform(),u=this.getDeviceBrand();i===R.IOS||i===R.IPAD||i===R.MAC?r=this._deviceToken:i===R.ANDROID&&(a=this._deviceToken);var c=new li("offlinePushSetToken");return e="deviceToken:".concat(r||a,", businessID:").concat(this._businessID,", ")+"deviceBrand:".concat(u,", isWebUniapp:").concat(this._isWebUniapp,", pushMsg:").concat(s,", platform:").concat(i),c.setMessage("".concat(e)),He.l("".concat(n," ").concat(e)),this.request({protocolName:ha,requestData:{tokenID:a,pushMsg:s,sdkAppID:o.getSDKAppID(),businessID:parseInt(this._businessID),deviceBrand:u,deviceToken:r,isWebUniapp:this._isWebUniapp}}).then((function(e){return c.end(),He.l("".concat(n," ok")),e})).catch((function(e){return t.probeNetwork().then((function(t){var n=v(t,2),o=n[0],s=n[1];c.setError(e,o,s).end()})),He.e("".concat(n," failed. error:"),e),Oi(e)}))}},{key:"_getConvUnreadCount",value:function(){var e=this;this._c2cUnreadCount=0,this._groupUnreadCount=0,this.getModule(Hn).getLocalConversationList().forEach((function(t){t.type===S.CONV_C2C&&(e._c2cUnreadCount+=t.unreadCount),t.type===S.CONV_GROUP&&(e._groupUnreadCount+=t.unreadCount)}))}},{key:"_onBackground",value:function(){var e=this,t="".concat(this._n,".").concat("_onBackground"),n=new li("_onBackground");this.request({protocolName:da,requestData:{c2cUnreadCount:this._c2cUnreadCount,groupUnreadCount:this._groupUnreadCount,isWebUniapp:this._isWebUniapp}}).then((function(o){return n.setMessage("c2cUnreadCount: ".concat(e._c2cUnreadCount,", groupUnreadCount: ").concat(e._groupUnreadCount)).end(),He.l("".concat(t," ok")),o})).catch((function(o){e.probeNetwork().then((function(e){var t=v(e,2),s=t[0],a=t[1];n.setError(o,s,a).end()})),He.e("".concat(t," failed. error:"),o)}))}},{key:"_onForeground",value:function(){var e=this,t="".concat(this._n,".").concat("_onForeground"),n=new li("_onForeground");this.request({protocolName:ga,requestData:{isWebUniapp:this._isWebUniapp}}).then((function(e){return n.end(),He.l("".concat(t," ok")),e})).catch((function(o){e.probeNetwork().then((function(e){var t=v(e,2),s=t[0],a=t[1];n.setError(o,s,a).end()})),He.e("".concat(t," failed. error:"),o)}))}},{key:"getUniAppPlatform",value:function(){var e=uni.getSystemInfoSync().platform,t=this.getDeviceBrand();return"ios"===e?R.IOS:"android"===e?R.ANDROID:1002===t?R.IPAD:1001===t?R.MAC:void 0}},{key:"reset",value:function(){this._deviceToken="",this._businessID=0,this._c2cUnreadCount=0,this._groupUnreadCount=0,this._isWebUniapp=0,He.l("".concat(this._n,".reset"))}}]),n}(po),Bc=function(e){i(n,e);var t=f(n);function n(e){var s;return o(this,n),(s=t.call(this,e))._n="ProfanityFilterModule",s._plugin=null,s._filterConfigMap=new Map,s._startIndex=0,s._version=0,s._canIUseLexicon=!1,s._isFetching=!1,s._expiredTime=0,s}return a(n,[{key:"init",value:function(){var e=this.getModule(Xn).getPlugin("tim-profanity-filter-plugin");e?(this._plugin=new e({logger:He,isArray:it,isMap:et,isDevMode:this.isDevMode()}),this._getLexicon()):this.outputWarning("ProfanityPluginNotFound")}},{key:"onCheckTimer",value:function(){this._plugin&&this._canIUseLexicon&&this.isLoggedIn()&&!this._isFetching&&Date.now()>=this._expiredTime&&this._getLexicon()}},{key:"filterMessage",value:function(e,t){var n=!0;if(!this._plugin||!this._canIUseLexicon)return n;if(t&&t.messageControlInfo&&!0===t.messageControlInfo.excludedFromContentModeration)return n;var o=e.type,s=e.conversationType;if(o!==S.MSG_TEXT&&o!==S.MSG_CUSTOM)return n;var a,r="".concat(this._n,".filterMessage");if(He.l("".concat(r)),o===S.MSG_TEXT){if(s===S.CONV_C2C?a=H:s===S.CONV_GROUP&&(a=W),!this._isConfigOn(a))return n;var i=this._plugin.filter(e.payload.text),u=i.type,c=i.modifiedText;1===u?n=!1:2===u&&(e.payload.text=c)}else if(o===S.MSG_CUSTOM){if(s===S.CONV_C2C?a=K:s===S.CONV_GROUP&&(a=j),!this._isConfigOn(a))return n;var l=this._plugin.filter(e.payload.data),p=this._plugin.filter(e.payload.description),d=this._plugin.filter(e.payload.extension);1===l.type||1===p.type||1===d.type?n=!1:(2===l.type&&(e.payload.data=l.modifiedText),2===p.type&&(e.payload.description=p.modifiedText),2===d.type&&(e.payload.extension=d.modifiedText))}return He.l("".concat(r," done. isAllowedToSend:").concat(n)),n}},{key:"filterText",value:function(e,t){var n="".concat(this._n,".filterText"),o={isAllowedToSend:!0,modifiedText:e};if(!this._plugin||!this._canIUseLexicon)return o;if(!this._isConfigOn(t))return o;He.l("".concat(n));var s=this._plugin.filter(e),a=s.type,r=s.modifiedText;return 1===a?o.isAllowedToSend=!1:2===a&&(o.modifiedText=r),He.l("".concat(n," done. ret:"),o),o}},{key:"_getLexicon",value:function(){var e=this,t=new li("profanityFilter"),n="".concat(this._n,"._getLexicon");this._isFetching=!0,this.request({protocolName:_a,requestData:{startIndex:this._startIndex,version:this._version}}).then((function(o){var s=o.data,a=s.errorInfo,r=s.filterConfig,i=s.lexicon,u=s.strToken,c=s.completeFlag,l=s.nextStartIndex,p=s.version,d=s.expiredTime,g=a.errorCode,h=a.errorMessage;return 0!==g?(e._isFetching=!1,He.w("".concat(n," failed. error:"),a),void t.setCode(g).setMessage(h).end()):(e._onFilterConfig(r),e._getToken(u),1===c?(He.l("".concat(n," done. version:").concat(p," expiredTime:").concat(d)),e._version=p,e._canIUseLexicon=!0,e._isFetching=!1,e._expiredTime=Date.now()+1e3*d,void e._plugin.onLexiconCompleted(i)):(e._startIndex=l,e._plugin.onLexiconSliced(i),void e._getLexicon()))})).catch((function(o){e.probeNetwork().then((function(e){var n=v(e,2),s=n[0],a=n[1];t.setError(o,s,a).end()})),e._isFetching=!1,He.l("".concat(n," failed. error:"),o)}))}},{key:"_onFilterConfig",value:function(e){var t=this;Zt(e)||(this._filterConfigMap.clear(),Object.keys(e).forEach((function(n){t._filterConfigMap.set(n,e[n])})),He.l("".concat(this._n,"._onFilterConfig. keys:").concat(Array.from(this._filterConfigMap.keys())," values:").concat(Array.from(this._filterConfigMap.values()))))}},{key:"_isConfigOn",value:function(e){return 1===this._filterConfigMap.get(e)}},{key:"_getToken",value:function(e){if(st(e)){var t=e.length,n="";if(t%2==0)for(var o=0;o<=t-1;o+=2)n+=e[o+1],n+=e[o];else{for(var s=0;s<t-1;s+=2)n+=e[s+1],n+=e[s];n+=e[t-1]}this._plugin.onToken(n)}}},{key:"reset",value:function(){He.l("".concat(this._n,".reset")),this._plugin&&(this._plugin.reset(),this._plugin=null),this._filterConfigMap.clear(),this._startIndex=0,this._version=0,this._canIUseLexicon=!1,this._isFetching=!1,this._expiredTime=0}}]),n}(po),Hc=function(){function e(t){o(this,e),this._m=t,this._n="TransCmdModule"}return a(e,[{key:"sendTRTCCustomData",value:function(e){return this._trans(t({serv:V.NAME.TUIROOM_SVR},e))}},{key:"_trans",value:function(e){He.d("".concat(this._n,"._trans. options:").concat(JSON.stringify(e)));var t=e.serv,n=e.data;return this._m.getModule(Zn).trans({servcmd:"".concat(t,".*"),data:st(n)?JSON.parse(n):n})}},{key:"reset",value:function(){He.l("".concat(this._n,".reset"))}}]),e}(),Kc=function(){function e(t){o(this,e),this._m=t,this._n="ErrorMessageModule",this.TIM_ERROR_ASSISTANCE="tim_error_assistance",this.STORAGE_EXPIRES_TIME=6048e5,this._map=new Map,this._init()}return a(e,[{key:"_init",value:function(){var e=this._getStorageModule().getItem(this.TIM_ERROR_ASSISTANCE,!1);if(e){var t=JSON.parse(e);this._needToUpdate(t)?this._fetch():this._fillMap(t.message)}else this._fetch()}},{key:"_needToUpdate",value:function(e){var t=e.localSavedTime,n=e.localSavedVersion,o=t&&(new Date).getTime()-t>=this.STORAGE_EXPIRES_TIME,s=!n||"2.27.0"!==n;return He.l("".concat(this._n,"._needToUpdate isTimeout:").concat(o," isDifferentVersion:").concat(s)),o||s}},{key:"_fetch",value:function(){if(!this._m.getModule(Kn).isPrivateNetWork()){var e="https://web.sdk.qcloud.com/im/download/error-message/0.0.1/tim-error-message.txt",t="application/x-www-form-urlencoded;charset=UTF-8",n="".concat(this._n,"._fetch ok in"),o=this;if(ue)le.request({url:e,method:"GET",timeout:3e3,header:{"content-type":t},dataType:"text",success:function(e){o._fillAndSave(e.data),He.l("".concat(n," mini program"))},fail:function(){}});else{var s=new XMLHttpRequest,a=setTimeout((function(){s.abort()}),3e3);s.onreadystatechange=function(){4===s.readyState&&(clearTimeout(a),200!==s.status&&304!==s.status||(He.l("".concat(n," browser")),o._fillAndSave(s.responseText)))},s.open("GET",e,!0),s.setRequestHeader("Content-type",t),s.send()}}}},{key:"_fillAndSave",value:function(e){this._fillMap(e),this._getStorageModule().setItem(this.TIM_ERROR_ASSISTANCE,JSON.stringify({message:e,localSavedTime:(new Date).getTime(),localSavedVersion:"2.27.0"}),!0,!1)}},{key:"_getStorageModule",value:function(){return this._m.getModule(Wn)}},{key:"_fillMap",value:function(e){this._map.clear();for(var t,n,o,s=e.split(";\n"),a=s.length,r=new RegExp(/'/g),i=0;i<a;i++)if(t=s[i].indexOf(":"),n=s[i].slice(0,t),o=s[i].slice(t+1,s[i].length),!n.startsWith("//")){if(ut(o))continue;this._map.set(n,o.replace(r,""))}}},{key:"get",value:function(e){var t=e.isIntl,n=e.key,o=e.replacement1,s=e.replacement2,a="".concat(n,t?"_en":"_cn");!this._map.has(a)&&this._map.has(n)&&(a=n);var r="";return this._map.has(a)?(r=this._map.get(a),ut(o)||(r=r.replace("$replacement1",o)),ut(s)||(r=r.replace("$replacement2",s)),r):r}},{key:"reset",value:function(){He.l("".concat(this._n,".reset"))}}]),e}(),Wc=function(){function e(t){o(this,e);var n=new li("sdkConstruct");this._n="ModuleManager",this._isReady=!1,this._reason=Ca,this._startLoginTs=0,this._moduleMap=new Map,this._innerEmitter=null,this._outerEmitter=null,this._checkCount=0,this._checkTimer=-1,this._moduleMap.set(Kn,new Gu(this,t)),this._moduleMap.set(ao,new xc(this)),this._moduleMap.set(to,new Nc(this)),this._moduleMap.set(no,new qc(this)),this._moduleMap.set(so,new wc(this)),this._moduleMap.set($n,new Cc(this)),this._moduleMap.set(Zn,new Ac(this)),this._moduleMap.set(Pn,new Pu(this)),this._moduleMap.set(Un,new $u(this)),this._moduleMap.set(bn,new ec(this)),this._moduleMap.set(co,new tc(this)),this._moduleMap.set(wn,new Ou(this)),this._moduleMap.set(qn,new Gi(this)),this._moduleMap.set(Hn,new eu(this)),this._moduleMap.set(Fn,new yu(this)),this._moduleMap.set(Vn,new Cu(this)),this._moduleMap.set(Bn,new Su(this)),this._moduleMap.set(Wn,new bu(this)),this._moduleMap.set(lo,new Kc(this)),this._moduleMap.set(jn,new Fu(this)),this._moduleMap.set(Yn,new Hu(this)),this._moduleMap.set(zn,new Wu(this)),this._moduleMap.set(Jn,new Yu(this)),this._moduleMap.set(Xn,new nc(this)),this._moduleMap.set(Qn,new oc(this)),this._moduleMap.set(eo,new Rc(this)),this._moduleMap.set(oo,new Oc(this)),this._moduleMap.set(ro,new Vc(this)),this._moduleMap.set(io,new Bc(this)),this._moduleMap.set(uo,new Hc(this)),this._eventThrottleMap=new Map;var s=t.instanceID,a=t.oversea,r=t.SDKAppID,i="instanceID:".concat(s," SDKAppID:").concat(r," host:").concat(bt()," oversea:").concat(a," inBrowser:").concat(ce," inMiniApp:").concat(ue)+" workerAvailable:".concat(Ae," UserAgent:").concat(pe);li.bindEventStatModule(this._moduleMap.get(jn)),n.setMessage("".concat(i," ").concat(function(){var e="";if(ue)try{var t=le.getSystemInfoSync(),n=t.model,o=t.version,s=t.system,a=t.platform,r=t.SDKVersion;e="model:".concat(n," version:").concat(o," system:").concat(s," platform:").concat(a," SDKVersion:").concat(r)}catch(i){e=""}return e}())).end(),He.i("SDK ".concat(i)),Ei.prototype._getErrorMessage=this.getErrorMessage.bind(this),this._readyList=void 0,this._ssoLogForReady=null,this._initReadyList()}return a(e,[{key:"_startTimer",value:function(){var e=this._moduleMap.get(no),t=e.isWorkerEnabled();He.l("".concat(this._n,".startTimer isWorkerEnabled:").concat(t," seed:").concat(this._checkTimer)),t?e.startWorkerTimer():this._startMainThreadTimer()}},{key:"_startMainThreadTimer",value:function(){this._checkTimer<0&&(this._checkTimer=setInterval(this.onCheckTimer.bind(this),1e3)),He.l("".concat(this._n,"._startMainThreadTimer seed:").concat(this._checkTimer))}},{key:"stopTimer",value:function(){var e=this._moduleMap.get(no),t=e.isWorkerEnabled();He.l("".concat(this._n,".stopTimer isWorkerEnabled:").concat(t," seed:").concat(this._checkTimer)),t?e.stopWorkerTimer():this._stopMainThreadTimer()}},{key:"_stopMainThreadTimer",value:function(){He.l("".concat(this._n,"._stopMainThreadTimer")),this._checkTimer>0&&(clearInterval(this._checkTimer),this._checkTimer=-1,this._checkCount=0)}},{key:"_stopMainThreadSocket",value:function(){He.l("".concat(this._n,"._stopMainThreadSocket"));var e=this._moduleMap.get($n);e.setIsWorkerEnabled(!0),e.reConnect()}},{key:"_startMainThreadSocket",value:function(){He.l("".concat(this._n,"._startMainThreadSocket"));var e=this._moduleMap.get($n);e.setIsWorkerEnabled(!1),e.reConnect()}},{key:"onWorkerTimerEnabled",value:function(){He.l("".concat(this._n,".onWorkerTimerEnabled, disable main thread timer and socket")),this._stopMainThreadTimer(),this._stopMainThreadSocket()}},{key:"onWorkerTimerDisabled",value:function(){He.l("".concat(this._n,".onWorkerTimerDisabled, enable main thread timer and socket")),this._startMainThreadTimer(),this._startMainThreadSocket()}},{key:"onCheckTimer",value:function(){this._checkCount+=1;var e,t=D(this._moduleMap);try{for(t.s();!(e=t.n()).done;){var n=v(e.value,2)[1];n.onCheckTimer&&n.onCheckTimer(this._checkCount)}}catch(o){t.e(o)}finally{t.f()}}},{key:"_initReadyList",value:function(){var e=this;this._readyList=[this._moduleMap.get(Pn),this._moduleMap.get(Hn)],this._readyList.forEach((function(t){t.ready((function(){return e._onModuleReady()}))}))}},{key:"_onModuleReady",value:function(){var e=!0;if(this._readyList.forEach((function(t){t.isReady()||(e=!1)})),e&&!this._isReady){this._isReady=!0,this._outerEmitter.emit(k.SDK_READY);var t=Date.now()-this._startLoginTs;He.w("SDK is ready. cost ".concat(t," ms")),this._startLoginTs=Date.now();var n=this._moduleMap.get(Yn).getNetworkType(),o=this._ssoLogForReady.getStartTs()+be;this._ssoLogForReady.setNetworkType(n).setMessage(t).start(o).end()}}},{key:"login",value:function(){0===this._startLoginTs&&(qe(),this._startLoginTs=Date.now(),this._startTimer(),this._moduleMap.get(Yn).start(),this._ssoLogForReady=new li("sdkReady"),this._reason=br)}},{key:"onLoginFailed",value:function(){this._startLoginTs=0}},{key:"getOuterEmitterInstance",value:function(){return null===this._outerEmitter&&(this._outerEmitter=new Ku,Ri(this._outerEmitter),this._outerEmitter._emit=this._outerEmitter.emit,this._outerEmitter.emit=function(e,t){var n=this;if(e===k.CONVERSATION_LIST_UPDATED||e===k.FRIEND_LIST_UPDATED||e===k.GROUP_LIST_UPDATED||e===k.TOTAL_UNREAD_MESSAGE_COUNT_UPDATED)if(this._eventThrottleMap.has(e)){var o=Date.now(),s=this._eventThrottleMap.get(e);o-s.last<1e3?(s.timeoutID&&clearTimeout(s.timeoutID),s.timeoutID=setTimeout((function(){s.last=o,n._outerEmitter._emit.apply(n._outerEmitter,[e,{name:e,data:n._getEventData(e)}])}),500)):(s.last=o,this._outerEmitter._emit.apply(this._outerEmitter,[e,{name:e,data:this._getEventData(e)}]))}else this._eventThrottleMap.set(e,{last:Date.now(),timeoutID:-1}),this._outerEmitter._emit.apply(this._outerEmitter,[e,{name:e,data:this._getEventData(e)}]);else this._outerEmitter._emit.apply(this._outerEmitter,[e,{name:e,data:arguments[1]}])}.bind(this)),this._outerEmitter}},{key:"_getEventData",value:function(e){return e===k.CONVERSATION_LIST_UPDATED?this._moduleMap.get(Hn).getLocalConversationList():e===k.FRIEND_LIST_UPDATED?this._moduleMap.get(xn).getLocalFriendList(!1):e===k.GROUP_LIST_UPDATED?this._moduleMap.get(Fn).getLocalGroupList():e===k.TOTAL_UNREAD_MESSAGE_COUNT_UPDATED?this._moduleMap.get(Hn).getTotalUnreadMessageCount():void 0}},{key:"getInnerEmitterInstance",value:function(){return null===this._innerEmitter&&(this._innerEmitter=new Ku,this._innerEmitter._emit=this._innerEmitter.emit,this._innerEmitter.emit=function(e,t){var n;n=rt(arguments[1])&&arguments[1].data?[e,{name:arguments[0],data:arguments[1].data}]:[e,{name:arguments[0],data:arguments[1]}],this._innerEmitter._emit.apply(this._innerEmitter,n)}.bind(this)),this._innerEmitter}},{key:"hasModule",value:function(e){return this._moduleMap.has(e)}},{key:"getModule",value:function(e){return this._moduleMap.get(e)}},{key:"isReady",value:function(){return this._isReady}},{key:"isIntl",value:function(){return this.getModule(Kn).isIntl()}},{key:"getNotReadyReason",value:function(){return this._reason}},{key:"setNotReadyReason",value:function(e){this._reason=e}},{key:"getErrorMessage",value:function(e,t,n){return this._moduleMap.get(lo).get({key:e,replacement1:t,replacement2:n,isIntl:this.isIntl()})}},{key:"outputWarning",value:function(e,t,n){var o=this.getErrorMessage(e,t,n);o&&He.w(o)}},{key:"onError",value:function(e){var t="code:".concat(e.code," message:").concat(e.message);He.w("Oops! ".concat(t)),new li("error").setMessage(t).setNetworkType(this.getModule(Yn).getNetworkType()).setLevel("error").end(),this.getOuterEmitterInstance().emit(k.ERROR,e)}},{key:"restartTimer",value:function(){He.l("".concat(this._n,".restartTimer")),this.stopTimer(),this._startTimer(),this.getModule(Fn).restartPolling()}},{key:"getTimerID",value:function(){var e=this._moduleMap.get(no);return e.isWorkerEnabled()?e.getTimerID():this._checkTimer}},{key:"reset",value:function(){He.l("".concat(this._n,".reset")),qe();var e,t=D(this._moduleMap);try{for(t.s();!(e=t.n()).done;){var n=v(e.value,2)[1];n.reset&&n.reset()}}catch(r){t.e(r)}finally{t.f()}this._startLoginTs=0,this._initReadyList(),this._isReady=!1,this.stopTimer(),this._outerEmitter.emit(k.SDK_NOT_READY);var o,s=D(this._eventThrottleMap);try{for(s.s();!(o=s.n()).done;){var a=v(o.value,2)[1];a.timeoutID&&clearTimeout(a.timeoutID)}}catch(r){s.e(r)}finally{s.f()}this._eventThrottleMap.clear()}}]),e}(),jc=function(){function e(t){o(this,e),this._funcMap=new Map,this._m=t}return a(e,[{key:"defense",value:function(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:void 0;if("string"!=typeof e)return null;if(0===e.length)return null;if("function"!=typeof t)return null;if(this._funcMap.has(e)&&this._funcMap.get(e).has(t))return this._funcMap.get(e).get(t);this._funcMap.has(e)||this._funcMap.set(e,new Map);var o=null;return this._funcMap.get(e).has(t)?o=this._funcMap.get(e).get(t):(o=this._pack(e,t,n),this._funcMap.get(e).set(t,o)),o}},{key:"defenseOnce",value:function(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:void 0;return"function"!=typeof t?null:this._pack(e,t,n)}},{key:"find",value:function(e,t){return"string"!=typeof e||0===e.length||"function"!=typeof t?null:this._funcMap.has(e)&&this._funcMap.get(e).has(t)?this._funcMap.get(e).get(t):(this._m.outputWarning("ListenerFnNotFound",e),null)}},{key:"delete",value:function(e,t){return"function"==typeof t&&(!!this._funcMap.has(e)&&(!!this._funcMap.get(e).has(t)&&(this._funcMap.get(e).delete(t),0===this._funcMap.get(e).size&&this._funcMap.delete(e),!0)))}},{key:"_pack",value:function(e,t,n){var o=this;return function(){try{t.apply(n,Array.from(arguments))}catch(u){var s=Object.values(k).indexOf(e),a="CallbackError";if(-1!==s){var r=Object.keys(k)[s];o._m.outputWarning(a,r,u)}var i=new li(a);i.setMessage("eventName:".concat(e)).setMoreMessage(u.message).end()}}}}]),e}(),Yc=function(){function e(t){o(this,e);var n={SDKAppID:t.SDKAppID,unlimitedAVChatRoom:t.unlimitedAVChatRoom||!1,scene:t.scene||"",oversea:t.oversea||!1,instanceID:Ut(),devMode:t.devMode||!1,proxyServer:t.proxyServer||void 0,fileUploadProxy:t.fileUploadProxy||void 0,fileDownloadProxy:t.fileDownloadProxy||t.fileUploadProxy||void 0};this._m=new Wc(n),this._safetyCallbackFactory=new jc(this._m)}return a(e,[{key:"onError",value:function(e){this._m.onError(e)}},{key:"login",value:function(e){return this._m.login(),this._getModule(Pn).login(e)}},{key:"logout",value:function(){var e=this;return this._getModule(Pn).logout().then((function(t){return e._m.reset(),t}))}},{key:"isReady",value:function(){return this._m.isReady()}},{key:"isIntl",value:function(){return this._m.isIntl()}},{key:"getNotReadyReason",value:function(){return this._m.getNotReadyReason()}},{key:"getErrorMessage",value:function(e,t,n){return this._m.getErrorMessage(e,t,n)}},{key:"_getModule",value:function(e){return this._m.getModule(e)}},{key:"destroy",value:function(){var e=this;return this.logout().finally((function(){e._m.stopTimer(),e._getModule(no).terminate(),e._getModule($n).dealloc();var t=e._m.getOuterEmitterInstance(),n=e._getModule(Kn);t.emit(k.SDK_DESTROY,{SDKAppID:n.getSDKAppID()})}))}},{key:"on",value:function(e,t,n){He.d("on","eventName:".concat(e)),this._m.getOuterEmitterInstance().on(e,this._safetyCallbackFactory.defense(e,t,n),n)}},{key:"once",value:function(e,t,n){He.d("once","eventName:".concat(e)),this._m.getOuterEmitterInstance().once(e,this._safetyCallbackFactory.defenseOnce(e,t,n),n||this)}},{key:"off",value:function(e,t,n,o){He.d("off","eventName:".concat(e));var s=this._safetyCallbackFactory.find(e,t);null!==s&&(this._m.getOuterEmitterInstance().off(e,s,n,o),this._safetyCallbackFactory.delete(e,t))}},{key:"registerPlugin",value:function(e){ut(e["tim-offline-push-plugin"])?this._getModule(Xn).registerPlugin(e):this._getModule(ro).registerPlugin(e)}},{key:"setLogLevel",value:function(e){if(e<=0){var t=this.getErrorMessage("TIM_ASCII_ART");t&&console.log(t);var n=this.getErrorMessage("API_REFER");if(n){zt()?console.log("%c ".concat("IM SDK API ->"," %c"),"background:#ff9d00; padding:1px; border-radius:3px; color: #fff","background:transparent",n):console.log("IM SDK API ->",n)}var o=this.getErrorMessage("DOCS_GUIDE");o&&console.log(o)}He.setLevel(e)}},{key:"createTextMessage",value:function(e){return this._getModule(Un).createTextMessage(e)}},{key:"createTextAtMessage",value:function(e){return this._getModule(Un).createTextMessage(e)}},{key:"createImageMessage",value:function(e){return this._getModule(Un).createImageMessage(e)}},{key:"createAudioMessage",value:function(e){return this._getModule(Un).createAudioMessage(e)}},{key:"createVideoMessage",value:function(e){return this._getModule(Un).createVideoMessage(e)}},{key:"createCustomMessage",value:function(e){return this._getModule(Un).createCustomMessage(e)}},{key:"createFaceMessage",value:function(e){return this._getModule(Un).createFaceMessage(e)}},{key:"createFileMessage",value:function(e){return this._getModule(Un).createFileMessage(e)}},{key:"createLocationMessage",value:function(e){return this._getModule(Un).createLocationMessage(e)}},{key:"createMergerMessage",value:function(e){return this._getModule(Un).createMergerMessage(e)}},{key:"downloadMergerMessage",value:function(e){return e.type!==S.MSG_MERGER?Oi({code:Qa}):Zt(e.payload.downloadKey)?Oi({code:Za}):this._getModule(Un).downloadMergerMessage(e).catch((function(e){return Oi({code:$a})}))}},{key:"createForwardMessage",value:function(e){return this._getModule(Un).createForwardMessage(e)}},{key:"sendMessage",value:function(e,t){return e instanceof Si?this._getModule(Un).sendMessageInstance(e,t):Oi({code:Ea})}},{key:"callExperimentalAPI",value:function(e,t){return"sendComboMessage"===e?this._getModule(co).sendMessage(t):"handleGroupInvitation"===e?this._getModule(Fn).handleGroupInvitation(t):"isCommercialAbilityEnabled"===e?this._getModule(ao).isFeatureEnabled(t):"isIntl"===e?this.isIntl():"sendTRTCCustomData"===e?this._getModule(uo).sendTRTCCustomData(t):"getTimerID"===e?this._m.getTimerID():Oi({code:Nr})}},{key:"revokeMessage",value:function(e){return this._getModule(Un).revokeMessage(e)}},{key:"resendMessage",value:function(e){return this._getModule(Un).resendMessage(e)}},{key:"deleteMessage",value:function(e){return this._getModule(Un).deleteMessage(e)}},{key:"translateText",value:function(e){return this._getModule(Un).translateText(e)}},{key:"setMessageExtensions",value:function(e,t){return this._getModule(bn).setMessageExtensions(e,t)}},{key:"getMessageExtensions",value:function(e){return this._getModule(bn).getMessageExtensions(e)}},{key:"deleteMessageExtensions",value:function(e,t){return this._getModule(bn).deleteMessageExtensions(e,t)}},{key:"modifyMessage",value:function(e){return this._getModule(Un).modifyRemoteMessage(e)}},{key:"getMessageList",value:function(e){return this._getModule(Hn).getMessageList(e)}},{key:"getMessageListHopping",value:function(e){return this._getModule(Hn).getMessageListHopping(e)}},{key:"sendMessageReadReceipt",value:function(e){return this._getModule(Hn).sendReadReceipt(e)}},{key:"getMessageReadReceiptList",value:function(e){return this._getModule(Hn).getReadReceiptList(e)}},{key:"getGroupMessageReadMemberList",value:function(e){return this._getModule(Fn).getReadReceiptDetail(e)}},{key:"findMessage",value:function(e){return this._getModule(Hn).findMessage(e)}},{key:"setMessageRead",value:function(e){return this._getModule(Hn).setMessageRead(e)}},{key:"getConversationList",value:function(e){return this._getModule(Hn).getConversationList(e)}},{key:"getConversationProfile",value:function(e){return this._getModule(Hn).getConversationProfile(e)}},{key:"deleteConversation",value:function(e){return this._getModule(Hn).deleteConversation(e)}},{key:"clearHistoryMessage",value:function(e){return this._getModule(Hn).clearHistoryMessage(e)}},{key:"pinConversation",value:function(e){return this._getModule(Hn).pinConversation(e)}},{key:"setAllMessageRead",value:function(e){return this._getModule(Hn).setAllMessageRead(e)}},{key:"setMessageRemindType",value:function(e){return this._getModule(Hn).setMessageRemindType(e)}},{key:"getTotalUnreadMessageCount",value:function(){return this._getModule(Hn).getTotalUnreadMessageCount()}},{key:"setConversationCustomData",value:function(e){return this._getModule(Hn).setConversationCustomData(e)}},{key:"markConversation",value:function(e){return this._getModule(Hn).markConversation(e)}},{key:"getConversationGroupList",value:function(){return this._getModule(Hn).getConversationGroupList()}},{key:"createConversationGroup",value:function(e){return this._getModule(Hn).createConversationGroup(e)}},{key:"deleteConversationGroup",value:function(e){return this._getModule(Hn).deleteConversationGroup(e)}},{key:"renameConversationGroup",value:function(e){return this._getModule(Hn).renameConversationGroup(e)}},{key:"addConversationsToGroup",value:function(e){return this._getModule(Hn).addConversationsToGroup(e)}},{key:"deleteConversationsFromGroup",value:function(e){return this._getModule(Hn).deleteConversationsFromGroup(e)}},{key:"getMyProfile",value:function(){return this._getModule(wn).getMyProfile()}},{key:"getUserProfile",value:function(e){return this._getModule(wn).getUserProfile(e)}},{key:"updateMyProfile",value:function(e){return this._getModule(wn).updateMyProfile(e)}},{key:"getBlacklist",value:function(){return this._getModule(wn).getLocalBlacklist()}},{key:"addToBlacklist",value:function(e){return this._getModule(wn).addBlacklist(e)}},{key:"removeFromBlacklist",value:function(e){return this._getModule(wn).deleteBlacklist(e)}},{key:"setSelfStatus",value:function(e){return this._getModule(wn).setSelfStatus(e)}},{key:"getUserStatus",value:function(e){return this._getModule(wn).getUserStatus(e)}},{key:"subscribeUserStatus",value:function(e){return this._getModule(wn).subscribeUserStatus(e)}},{key:"unsubscribeUserStatus",value:function(e){return this._getModule(wn).unsubscribeUserStatus(e)}},{key:"getFriendList",value:function(){var e=this._getModule(xn);return e?e.getLocalFriendList():Oi({code:Pr})}},{key:"addFriend",value:function(e){var t=this._getModule(xn);return t?t.addFriend(e):Oi({code:Pr})}},{key:"deleteFriend",value:function(e){var t=this._getModule(xn);return t?t.deleteFriend(e):Oi({code:Pr})}},{key:"checkFriend",value:function(e){var t=this._getModule(xn);return t?t.checkFriend(e):Oi({code:Pr})}},{key:"getFriendProfile",value:function(e){var t=this._getModule(xn);return t?t.getFriendProfile(e):Oi({code:Pr})}},{key:"updateFriend",value:function(e){var t=this._getModule(xn);return t?t.updateFriend(e):Oi({code:Pr})}},{key:"getFriendApplicationList",value:function(){var e=this._getModule(xn);return e?e.getLocalFriendApplicationList():Oi({code:Pr})}},{key:"acceptFriendApplication",value:function(e){var t=this._getModule(xn);return t?t.acceptFriendApplication(e):Oi({code:Pr})}},{key:"refuseFriendApplication",value:function(e){var t=this._getModule(xn);return t?t.refuseFriendApplication(e):Oi({code:Pr})}},{key:"deleteFriendApplication",value:function(e){var t=this._getModule(xn);return t?t.deleteFriendApplication(e):Oi({code:Pr})}},{key:"setFriendApplicationRead",value:function(){var e=this._getModule(xn);return e?e.setFriendApplicationRead():Oi({code:Pr})}},{key:"getFriendGroupList",value:function(){var e=this._getModule(xn);return e?e.getLocalFriendGroupList():Oi({code:Pr})}},{key:"createFriendGroup",value:function(e){var t=this._getModule(xn);return t?t.createFriendGroup(e):Oi({code:Pr})}},{key:"deleteFriendGroup",value:function(e){var t=this._getModule(xn);return t?t.deleteFriendGroup(e):Oi({code:Pr})}},{key:"addToFriendGroup",value:function(e){var t=this._getModule(xn);return t?t.addToFriendGroup(e):Oi({code:Pr})}},{key:"removeFromFriendGroup",value:function(e){var t=this._getModule(xn);return t?t.removeFromFriendGroup(e):Oi({code:Pr})}},{key:"renameFriendGroup",value:function(e){var t=this._getModule(xn);return t?t.renameFriendGroup(e):Oi({code:Pr})}},{key:"getGroupList",value:function(e){return this._getModule(Fn).getGroupList(e)}},{key:"getGroupProfile",value:function(e){return this._getModule(Fn).getGroupProfile(e)}},{key:"createGroup",value:function(e){return this._getModule(Fn).createGroup(e)}},{key:"dismissGroup",value:function(e){return this._getModule(Fn).dismissGroup(e)}},{key:"updateGroupProfile",value:function(e){return this._getModule(Fn).updateGroupProfile(e)}},{key:"joinGroup",value:function(e){return this._getModule(Fn).joinGroup(e)}},{key:"quitGroup",value:function(e){return this._getModule(Fn).quitGroup(e)}},{key:"searchGroupByID",value:function(e){return this._getModule(Fn).searchGroupByID(e)}},{key:"getGroupOnlineMemberCount",value:function(e){return this._getModule(Fn).getGroupOnlineMemberCount(e)}},{key:"changeGroupOwner",value:function(e){return this._getModule(Fn).changeGroupOwner(e)}},{key:"getGroupApplicationList",value:function(){return this._getModule(Fn).getGroupApplicationList()}},{key:"handleGroupApplication",value:function(e){return this._getModule(Fn).handleGroupApplication(e)}},{key:"initGroupAttributes",value:function(e){return this._getModule(Fn).initGroupAttributes(e)}},{key:"setGroupAttributes",value:function(e){return this._getModule(Fn).setGroupAttributes(e)}},{key:"deleteGroupAttributes",value:function(e){return this._getModule(Fn).deleteGroupAttributes(e)}},{key:"getGroupAttributes",value:function(e){return this._getModule(Fn).getGroupAttributes(e)}},{key:"setGroupCounters",value:function(e){return this._getModule(Fn).setGroupCounters(e)}},{key:"increaseGroupCounter",value:function(e){return this._getModule(Fn).increaseGroupCounter(e)}},{key:"decreaseGroupCounter",value:function(e){return this._getModule(Fn).decreaseGroupCounter(e)}},{key:"getGroupCounters",value:function(e){return this._getModule(Fn).getGroupCounters(e)}},{key:"getGroupMemberList",value:function(e){return this._getModule(Vn).getGroupMemberList(e)}},{key:"getGroupMemberProfile",value:function(e){return this._getModule(Vn).getGroupMemberProfile(e)}},{key:"addGroupMember",value:function(e){return this._getModule(Vn).addGroupMember(e)}},{key:"deleteGroupMember",value:function(e){return this._getModule(Vn).deleteGroupMember(e)}},{key:"setGroupMemberMuteTime",value:function(e){return this._getModule(Vn).setGroupMemberMuteTime(e)}},{key:"setGroupMemberRole",value:function(e){return this._getModule(Vn).setGroupMemberRole(e)}},{key:"setGroupMemberNameCard",value:function(e){return this._getModule(Vn).setGroupMemberNameCard(e)}},{key:"setGroupMemberCustomField",value:function(e){return this._getModule(Vn).setGroupMemberCustomField(e)}},{key:"markGroupMemberList",value:function(e){return this._getModule(Vn).markGroupMemberList(e)}},{key:"getJoinedCommunityList",value:function(){return this._getModule(Bn).getJoinedCommunityList()}},{key:"createTopicInCommunity",value:function(e){return this._getModule(Bn).createTopicInCommunity(e)}},{key:"deleteTopicFromCommunity",value:function(e){return this._getModule(Bn).deleteTopicFromCommunity(e)}},{key:"updateTopicProfile",value:function(e){return this._getModule(Bn).updateTopicProfile(e)}},{key:"getTopicList",value:function(e){return this._getModule(Bn).getTopicList(e)}}]),e}(),zc={login:1,logout:1,destroy:1,on:1,off:1,ready:1,setLogLevel:1,joinGroup:1,quitGroup:1,registerPlugin:1,getGroupOnlineMemberCount:1};function Jc(e,t){if(e.isReady()||1===zc[t])return!0;var n=e.getNotReadyReason(),o={code:n,message:"".concat(e.getErrorMessage(n)," | ").concat(t," | ").concat(e.getErrorMessage(Ur))};return e.onError(o),o}var Xc={},Qc={};return Qc.create=function(e){var n=0,o=e.SDKAppID;if(ot(o))n=o;else if(n=parseInt(o),isNaN(o))return He.e("".concat("TIM.create"," failed. Failed to parse the SDKAppID, please check the arguments")),null;if(n&&Xc[n])return Xc[n];He.l("".concat("TIM.create"));var s=new Yc(t(t({},e),{},{SDKAppID:n}));s.on(k.SDK_DESTROY,(function(e){Xc[e.data.SDKAppID]=null,delete Xc[e.data.SDKAppID]}));var a=function(e){var t=Object.create(null);return Object.keys(Gn).forEach((function(n){if(e[n]){var o=new L;t[n]=function(){var t=Array.from(arguments);return o.use((function(t,o){var s=Jc(e,n);return!0===s?o():Oi(s)})).use((function(e,t){if(!0===$t(e,On[n],n))return t()})).use((function(t,o){return e[n].apply(e,t)})),o.run(t)}}})),t}(s);return Xc[n]=a,On.hookGetAPITips(s.getErrorMessage.bind(s)),He.l("".concat("TIM.create"," ok")),a},Qc.TYPES=S,Qc.EVENT=k,Qc.VERSION="2.27.0",He.l("TIM.VERSION:".concat(Qc.VERSION)),Qc}));
diff --git a/app.js b/app.js
index 419f473..2ac21ce 100644
--- a/app.js
+++ b/app.js
@@ -25,7 +25,7 @@ App({
       }
     })
 
-    console.log("download fonts from oss ");
+    // console.log("download fonts from oss ");
     let loadStatus = false;
     if (!loadStatus) {
       // wx.loadFontFace({
@@ -51,18 +51,18 @@ App({
 
     //监听网络状态变化事件
     wx.onNetworkStatusChange(function (res) {
-      console.log("onNetworkStatusChange: ")
-      console.log(res.isConnected)
-      console.log(res.networkType)
+      // console.log("onNetworkStatusChange: ")
+      // console.log(res.isConnected)
+      // console.log(res.networkType)
       wx.showToast({
         title: '网络类型'+res.networkType,
       })
     })
 
     wx.onNetworkWeakChange(function(res){
-      console.log("onNetworkWeakChange: ")
-      console.log(res.isConnected)
-      console.log(res.networkType)
+      // console.log("onNetworkWeakChange: ")
+      // console.log(res.isConnected)
+      // console.log(res.networkType)
     })
   },
   onShow(){
@@ -81,7 +81,7 @@ App({
     }
     this.globalData.config.userID = userID;
     let sign = genTestUserSig(this.globalData.config);
-    console.log("sign: ", sign);
+    // console.log("sign: ", sign);
     // const userSig = sign.userSig;
 
     if(!wx.$TUIKit){
@@ -93,7 +93,7 @@ App({
         }
         return response.data;
       }).then((userSig) => {
-        console.log("userSig: ", userSig);
+        // console.log("userSig: ", userSig);
         wx.$TUIKit = TIM.create({
           SDKAppID: this.globalData.config.SDKAPPID
         });
@@ -102,6 +102,7 @@ App({
         wx.$chat_SDKAppID = this.globalData.config.SDKAPPID;
         wx.$chat_userSig = userSig;
         wx.$TUIKitTIM = TIM;
+        console.log("TIM: ", wx.$TUIKitTIM)
         wx.$TUIKit.registerPlugin({ 'tim-upload-plugin': TIMUploadPlugin });            
         let login_promise = wx.$TUIKit.login({
             userID: this.globalData.config.userID,
@@ -109,7 +110,7 @@ App({
         });
   
         login_promise.then(function(imResponse) {
-          console.log(imResponse.data); // 登录成功
+          // console.log(imResponse.data); // 登录成功
           
         }).catch(function(imError) {
           console.warn('login error:', imError); // 登录失败的相关信息
@@ -125,7 +126,7 @@ App({
       let promise = new Promise((resolve, reject) => {
         resolve("success");
       }).then(res => {
-        console.log("from app js:", res);
+        // console.log("from app js:", res);
         return "from app js";
       });
       return promise;
@@ -145,12 +146,12 @@ App({
     })
   },
   onTotalUnreadMessageCountUpdated(){
-    console.log("onTotalUnreadMessageCountUpdated");
+    // console.log("onTotalUnreadMessageCountUpdated");
     let totalUnreadCount = wx.$TUIKit.getTotalUnreadMessageCount();
-      console.log("未读消息数量：", totalUnreadCount)
+      // console.log("未读消息数量：", totalUnreadCount)
   },
   onSDKReady(){
-    console.log("onSDKReady from app.js");
+    // console.log("onSDKReady from app.js");
     this.globalData.chat_sdk_ready = true;
 
     // let promise =  wx.$TUIKit.deleteConversation('C2C500318318078251008');
@@ -161,6 +162,18 @@ App({
     //   console.warn('deleteConversation error:', imError); // 删除会话失败的相关信息
     // });
 
+    // console.log("TIM.version: ", wx.$TUIKitTIM)
+    // console.log("wx.$TUIKit: ",wx.$TUIKit.deleteConversation)
+    // // 删除单一会话, 不清空会话历史消息
+    // let promise = wx.$TUIKit.deleteConversation({conversationIDList:["C2C492404831991414785"], clearHistoryMessage: false});
+    // promise.then(function(imResponse) {
+    //   // 删除会话成功
+    //   console.log("删除成功！！")
+    //   const { conversationIDList } = imResponse.data; // 被删除的会话 ID 列表
+    // }).catch(function(imError) {
+    //   console.warn('deleteConversation error:', imError); // 删除会话失败的相关信息
+    // });
+
     let usertype = wx.getStorageSync('usertype');
     let userID = wx.getStorageSync('user_id_'+usertype);
     //初始化tab-bar角标
@@ -176,7 +189,7 @@ App({
     wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.KICKED_OUT, this.onKickedOut);
   },
   onKickedOut(){
-    console.log("onKickedOutonKickedOutonKickedOutonKickedOut");
+    // console.log("onKickedOutonKickedOutonKickedOutonKickedOut");
     let usertype =  wx.getStorageSync('usertype');
     wx.setStorageSync('AUTH_TOKEN_'+usertype, "");
     wx.setStorageSync('user_id_'+usertype, "");
@@ -184,22 +197,22 @@ App({
     this.go("/Pages/kickedout/index");
   },
   $onSystemPushReceived(e){
-    console.log("onSystemPushReceived from app.js");
-    console.log(e)
+    // console.log("onSystemPushReceived from app.js");
+    // console.log(e)
     let usertype = wx.getStorageSync('usertype');
     let userID = wx.getStorageSync('user_id_'+usertype);
     let message = e.data[0];
-    console.log(message)
+    // console.log(message)
 
     let type = message.type;
-    console.log(type);
+    // console.log(type);
     let unread_name = "";
     if(type == TIM.TYPES.MSG_CUSTOM){
       let payload = message.payload;
       let payloadData = payload.data;
       let payloadDataJson = JSON.parse(payloadData);
       let message_type = payloadDataJson.message_type;
-      console.log("message_type: ", message_type);
+      // console.log("message_type: ", message_type);
       switch (message_type) {
         case GDXZ_CUSTOM_MSEEAGE.TRABECULA:
           unread_name = userID+"_wenzhen_info"; //1、消息内页横条
@@ -271,13 +284,13 @@ App({
   },
   getConversationList(){
     wx.$TUIKit.getConversationList().then((imResponse) => {
-      console.log("getConversationList from app js: ", imResponse.data.conversationList);
+      // console.log("getConversationList from app js: ", imResponse.data.conversationList);
       return imResponse.data.conversationList;
     }).then(conversationList => {
-      console.log("开始查询订单状态")
+      // console.log("开始查询订单状态")
       this.formatStatus(conversationList);
     }).catch(error => {
-      console.log(error)
+      console.error(error)
     });
   },
   formatStatus(conversationList){
@@ -294,7 +307,7 @@ App({
       try {
         cloudCustomDataJson = JSON.parse(cloudCustomData);
       } catch (error) {
-        console.log(error);
+        console.error(error);
         return;
       }
       let order_inquiry_id = cloudCustomDataJson.order_inquiry_id;
@@ -339,7 +352,7 @@ App({
       }
       return new_conversationList;
     }).then(new_conversationList => {
-      console.log("开始计算问诊角标");
+      // console.log("开始计算问诊角标");
       let wenzhen_info = 0;
       new_conversationList.forEach(item => {
         let unreadCount = item.unreadCount;
@@ -352,7 +365,7 @@ App({
           }
         }
       })
-      console.log("角标的数量：", wenzhen_info);
+      // console.log("角标的数量：", wenzhen_info);
       let usertype = wx.getStorageSync('usertype');
       let userID = wx.getStorageSync('user_id_'+usertype);
       wx.setStorageSync(userID+'_wenzhen_info', wenzhen_info);

From 807698b89f751ddcf8fee8c7d0582c8f1e45ab5b Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Tue, 9 May 2023 15:04:05 +0800
Subject: [PATCH 27/83] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/agreement_page/index.js                 |  18 +++
 Pages/agreement_page/index.json               |   3 +
 Pages/agreement_page/index.wxml               |   2 +
 Pages/agreement_page/index.wxss               |   1 +
 Pages/login/index.wxml                        |   2 +-
 Pages/yishi/cash/index.js                     |  55 +++++--
 Pages/yishi/cash/index.json                   |   3 +-
 Pages/yishi/cash/index.wxml                   |  18 ++-
 Pages/yishi/cash/index.wxss                   |  15 +-
 Pages/yishi/index/index.js                    |  48 ++++--
 Pages/yishi/index/index.wxml                  |  13 ++
 Pages/yishi/index/index.wxss                  |   1 +
 Pages/yishi/kuaisusetup/index.js              |  39 ++++-
 Pages/yishi/kuaisusetup/index.json            |   3 +-
 Pages/yishi/kuaisusetup/index.wxml            |  13 ++
 Pages/yishi/kuaisusetup/index.wxss            |  14 ++
 Pages/yishi/myaccount/index.wxml              |   2 +-
 Pages/yishi/onlinechufang/index.js            |  46 ++++++
 Pages/yishi/onlinechufang/index.json          |   3 +-
 Pages/yishi/onlinechufang/index.wxml          |   8 +-
 Pages/yishi/onlinesetup/index.js              |  38 ++++-
 Pages/yishi/onlinesetup/index.json            |   3 +-
 Pages/yishi/onlinesetup/index.wxml            |  13 ++
 Pages/yishi/onlinesetup/index.wxss            |  14 ++
 Pages/yishi/wenzhen_v2/wenzhen.js             |  14 +-
 Pages/yishi/wenzhen_v2/wenzhen.json           |   3 +-
 Pages/yishi/wenzhen_v3/wenzhen.js             |  24 +--
 Pages/yishi/yizhensetup/index.js              |  37 ++++-
 Pages/yishi/yizhensetup/index.json            |   3 +-
 Pages/yishi/yizhensetup/index.wxml            |  13 ++
 Pages/yishi/yizhensetup/index.wxss            |  14 ++
 Pages/yishi/yizhensetupprice/index.js         |  37 ++++-
 Pages/yishi/yizhensetupprice/index.json       |   3 +-
 Pages/yishi/yizhensetupprice/index.wxml       |  13 ++
 Pages/yishi/yizhensetupprice/index.wxss       |  14 ++
 Pages/yishi/zhiye_identity/index.js           | 142 +++++++++-------
 Pages/yishi/zhiye_identity/index.json         |   3 +-
 Pages/yishi/zhiye_identity/index.wxml         |  13 ++
 Pages/yishi/zhiye_identity/index.wxss         |  14 ++
 .../TUIChat/components/MessageInput/index.js  |  76 ++++++---
 .../components/MessageInput/index.wxml        |  21 ++-
 .../components/MessageInput/index.wxss        |   2 +-
 .../TUIChat/components/MessageList/index.js   |   7 +-
 TUIKit/components/TUIChat/index.js            | 151 ++++++++++++++----
 TUIKit/components/TUIChat/index.wxml          |  19 +--
 app.js                                        |  10 +-
 app.json                                      |   3 +-
 commpents/myprofile/index.js                  |  16 +-
 custom-tab-bar/index.js                       |   9 +-
 project.private.config.json                   |   2 +-
 utils/network/request.js                      |   4 +-
 utils/requestSubscribeUtil.js                 |  68 ++++++++
 utils/util.js                                 |   8 +-
 53 files changed, 896 insertions(+), 222 deletions(-)
 create mode 100644 Pages/agreement_page/index.js
 create mode 100644 Pages/agreement_page/index.json
 create mode 100644 Pages/agreement_page/index.wxml
 create mode 100644 Pages/agreement_page/index.wxss
 create mode 100644 utils/requestSubscribeUtil.js

diff --git a/Pages/agreement_page/index.js b/Pages/agreement_page/index.js
new file mode 100644
index 0000000..aa5596d
--- /dev/null
+++ b/Pages/agreement_page/index.js
@@ -0,0 +1,18 @@
+// Pages/webpage/index.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    src: ""
+  },
+
+  onLoad(options) {
+    console.log(options.agreement_id)
+    this.setData({
+      src: "https://img.applets.igandanyiyuan.com/basic/file/agreement.htm?id="+options.agreement_id
+    })
+  },
+
+})
\ No newline at end of file
diff --git a/Pages/agreement_page/index.json b/Pages/agreement_page/index.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/Pages/agreement_page/index.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/Pages/agreement_page/index.wxml b/Pages/agreement_page/index.wxml
new file mode 100644
index 0000000..22a9b46
--- /dev/null
+++ b/Pages/agreement_page/index.wxml
@@ -0,0 +1,2 @@
+<!--Pages/webpage/index.wxml-->
+<web-view src="{{src}}"/>
diff --git a/Pages/agreement_page/index.wxss b/Pages/agreement_page/index.wxss
new file mode 100644
index 0000000..12b229e
--- /dev/null
+++ b/Pages/agreement_page/index.wxss
@@ -0,0 +1 @@
+/* Pages/webpage/index.wxss */
\ No newline at end of file
diff --git a/Pages/login/index.wxml b/Pages/login/index.wxml
index 5f9724f..c577cf5 100644
--- a/Pages/login/index.wxml
+++ b/Pages/login/index.wxml
@@ -26,7 +26,7 @@
       
       <view style="display: flex;">
         <van-checkbox value="{{ checked }}" bind:change="onChange">我已阅读并同意协议</van-checkbox>
-        <view style="color: #4384FE;flex: 1;" bindtap="go" data-url="/Pages/yishi/agreement_detail/index?agreement_id=10">《肝胆相照用户服务协议》</view>
+        <view style="color: #4384FE;flex: 1;" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=10">《肝胆相照用户服务协议》</view>
       </view>
     </view>
 
diff --git a/Pages/yishi/cash/index.js b/Pages/yishi/cash/index.js
index b3e9c2a..1b33f6c 100644
--- a/Pages/yishi/cash/index.js
+++ b/Pages/yishi/cash/index.js
@@ -1,4 +1,5 @@
 import { API } from './../../../utils/network/api'
+import { requestSubscribeMessage } from './../../../utils/requestSubscribeUtil';
 
 const api = new API()
 const app = getApp()
@@ -17,8 +18,10 @@ Page({
     withdrawal_amount: "xxxx",
     income_tax: "xx",
     contactKeFu: false,
+    sub_visible: false,
     skeleton_loading: true,
-    order_inquiry_ids: []
+    order_inquiry_ids: [],
+    sub_btn_disabled: false
   },
   onLoad(option){
     let order_inquiry_ids = option.order_inquiry_ids;
@@ -33,29 +36,50 @@ Page({
     this.postDoctorWithdrawalInfo(params);
   },
   onShow(){
-
+    this.setData({
+      sub_btn_disabled: false
+    })
   },
   go(e){
     let url = e.currentTarget.dataset.url;
     app.go(url);
   },
   contactKeFu(e){
-    let _this = this;
-
     console.log("concatKeFu");
-    wx.requestSubscribeMessage({
-      tmplIds: ['JMPmlYGh1HcUSuEfJCVQUIsZv4H5ar3QvXZfrNYNFuc'],
-      success (res) {
-        console.log(res);
-        _this.setData({
-          contactKeFu: true
+    let tmplIds = ['JMPmlYGh1HcUSuEfJCVQUIsZv4H5ar3QvXZfrNYNFuc']
+    let sub_promise = requestSubscribeMessage(tmplIds)
+    sub_promise.then(res => {
+      console.log("订阅成功")
+      this.setData({
+        contactKeFu: true
+      })
+    }).catch(err => {
+      console.log(err)
+      let errCode = err.errCode
+      if(errCode == 20004){
+        this.setData({
+          sub_visible: true,
         })
-
       }
     })
-
+  },
+  subcancelDialog(){
+    this.setData({
+      sub_visible: false
+    })
+  },
+  subconfirmDialog(){
+    this.setData({
+      sub_visible: false
+    })
+    wx.openSetting({
+      success (res) {
+        console.log(res.authSetting)
+      }
+    })
   },
   postDoctorWithdrawalInfo(params){
+    
     //获取提现数据
     api.postDoctorWithdrawalInfo(params).then(response => {
       console.log(response);
@@ -74,9 +98,13 @@ Page({
       }
     }).catch(errors => {
       console.error(errors);
+      
     })
   },
   postDoctorWithdrawal(){
+    this.setData({
+      sub_btn_disabled: true
+    })
     let params = {};
     params.order_inquiry_id = this.data.order_inquiry_ids.join(",");
     params.withdrawal_amount_total = this.data.withdrawal_amount;
@@ -94,6 +122,9 @@ Page({
       })
     }).catch(errors => {
       console.error(errors);
+      this.setData({
+        sub_btn_disabled: false
+      })
     })
   }
 })
\ No newline at end of file
diff --git a/Pages/yishi/cash/index.json b/Pages/yishi/cash/index.json
index ae3c221..de018e6 100644
--- a/Pages/yishi/cash/index.json
+++ b/Pages/yishi/cash/index.json
@@ -6,6 +6,7 @@
     "van-icon": "@vant/weapp/icon/index",
     "van-button": "@vant/weapp/button/index",
     "van-dialog": "@vant/weapp/dialog/index",
-    "t-skeleton": "tdesign-miniprogram/skeleton/skeleton"
+    "t-skeleton": "tdesign-miniprogram/skeleton/skeleton",
+    "t-dialog": "tdesign-miniprogram/dialog/dialog"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/cash/index.wxml b/Pages/yishi/cash/index.wxml
index 35d59b6..315ab96 100644
--- a/Pages/yishi/cash/index.wxml
+++ b/Pages/yishi/cash/index.wxml
@@ -3,7 +3,7 @@
 <view class="container">
   <view class="top">
     <view class="txt_title">结算银行卡</view>
-    <view class="rule" bindtap="go" data-url="/Pages/yishi/agreement_detail/index?agreement_id=12">提现规则<van-icon name="warning-o" color="#FF9800" /></view>
+    <view class="rule" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=12">提现规则<van-icon name="warning-o" color="#FF9800" /></view>
   </view>
   <view class="bankcard" wx:if="{{!skeleton_loading}}">
     <view class="bankcard_icon">
@@ -58,7 +58,7 @@
   </view> -->
 
   <view class="bottom">
-    <van-button bind:click="postDoctorWithdrawal" disabled="{{order_inquiry_ids.length == 0}}" custom-style="border-radius: 10rpx;font-size: 30rpx;" block color="#3CC7C0">提取</van-button>
+    <van-button bind:click="postDoctorWithdrawal" disabled="{{order_inquiry_ids.length == 0 || sub_btn_disabled}}" custom-style="border-radius: 10rpx;font-size: 30rpx;" block color="#3CC7C0">提取</van-button>
     <view class="kefu" bindtap="contactKeFu">
       <text>联系客服</text>
     </view>
@@ -71,4 +71,18 @@
     confirm-button-color="#3CC7C0"
     confirm-button-open-type="contact"
   />
+
+  <t-dialog
+    visible="{{ sub_visible }}"
+    title="温馨提示"
+    content="您已关闭订阅消息通知，请点击“确认”按钮在设置中打开订阅通知。"
+  >
+  <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="subcancelDialog">
+    取消
+  </view>
+  <view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="subconfirmDialog">
+    确定
+  </view>
+</t-dialog>
+
 </view>
diff --git a/Pages/yishi/cash/index.wxss b/Pages/yishi/cash/index.wxss
index 8f6696b..fb7a38c 100644
--- a/Pages/yishi/cash/index.wxss
+++ b/Pages/yishi/cash/index.wxss
@@ -139,5 +139,18 @@ page{
   color: #3CC7C0;
   margin: 30rpx;
 }
-
+.dialog{
+  width: 50%;
+  text-align: center;
+  height: 100rpx;
+  line-height: 100rpx;
+}
+.dialog_cancel_btn{
+  border-top: 1px solid #E9E9E9;
+  border-right: 1px solid #E9E9E9;
+}
+.dialog_confirm_btn{
+  border-top: 1px solid #E9E9E9;
+  color: #3CC7C0;
+}
 
diff --git a/Pages/yishi/index/index.js b/Pages/yishi/index/index.js
index fdf9afa..feffe85 100644
--- a/Pages/yishi/index/index.js
+++ b/Pages/yishi/index/index.js
@@ -1,6 +1,8 @@
 // Pages/yishi/index/index.js
 import { API } from './../../../utils/network/api'
-import { rpxTopx } from './../../../utils/util'
+import { pxTorpx } from './../../../utils/util'
+import { requestSubscribeMessage } from './../../../utils/requestSubscribeUtil';
+
 const api = new API()
 const app = getApp()
 Page({
@@ -92,6 +94,7 @@ Page({
       },
     ],
     contactKeFu: false,
+    sub_visible: false,
     jiesuan_dialog_show: false,
     jiesuan_dialog_visible: false,
     funbox_height: 100,
@@ -125,7 +128,7 @@ Page({
     const { statusBarHeight } = wx.getSystemInfoSync();
     // console.log("statusBarHeight: ", rpxTopx(statusBarHeight));
     let funbox_height = wx.getSystemInfoSync().windowHeight - (this.data.stateHeight + this.data.navHeight + 10) - 55;//减去底部空白
-    funbox_height = rpxTopx(funbox_height);
+    funbox_height = pxTorpx(funbox_height);
     // 147 userinfo的高度
     // 80  info_note
     // 155 认证部分的高度
@@ -424,6 +427,8 @@ Page({
         });
       }
       this.setData({
+        "info.info_shiming_status_txt": "未认证",
+        "info.info_shiming_status": "info_shiming_status_no",
         dialog_content: "请您先完成实名认证",
         shiming_status_url: "/Pages/yishi/identity/index",
         dialog_url: "/Pages/yishi/identity/index",
@@ -637,20 +642,41 @@ Page({
 
     let checkDialog = this.checkDialog(e);
     if(checkDialog){
-      // console.log("concatKeFu");
-      wx.requestSubscribeMessage({
-        tmplIds: ['JMPmlYGh1HcUSuEfJCVQUIsZv4H5ar3QvXZfrNYNFuc'],
-        success (res) {
-          // console.log(res);
-          _this.setData({
-            contactKeFu: true
+      
+      let tmplIds = ['JMPmlYGh1HcUSuEfJCVQUIsZv4H5ar3QvXZfrNYNFuc']
+      let sub_promise = requestSubscribeMessage(tmplIds)
+      sub_promise.then(res => {
+        console.log("订阅成功")
+        this.setData({
+          contactKeFu: true
+        })
+      }).catch(err => {
+        console.log(err)
+        let errCode = err.errCode
+        if(errCode == 20004){
+          this.setData({
+            sub_visible: true,
           })
-  
         }
       })
-
     }
   },
+  subcancelDialog(){
+    this.setData({
+      sub_visible: false,
+      contactKeFu: true
+    })
+  },
+  subconfirmDialog(){
+    this.setData({
+      sub_visible: false
+    })
+    wx.openSetting({
+      success (res) {
+        console.log(res.authSetting)
+      }
+    })
+  },
   checkDialog(e){
     //实名认证
     let idcard_status = this.data.info.idcard_status;
diff --git a/Pages/yishi/index/index.wxml b/Pages/yishi/index/index.wxml
index 2bda114..60e6f93 100644
--- a/Pages/yishi/index/index.wxml
+++ b/Pages/yishi/index/index.wxml
@@ -233,6 +233,19 @@
     <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>
 
+  <t-dialog
+    visible="{{ sub_visible }}"
+    title="温馨提示"
+    content="您已关闭订阅消息通知，请点击“确认”按钮在设置中打开订阅通知。"
+  >
+  <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="subcancelDialog">
+    取消
+  </view>
+  <view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="subconfirmDialog">
+    确定
+  </view>
+</t-dialog>
+
 </view>
 
 
diff --git a/Pages/yishi/index/index.wxss b/Pages/yishi/index/index.wxss
index 441b6e1..5fe6670 100644
--- a/Pages/yishi/index/index.wxss
+++ b/Pages/yishi/index/index.wxss
@@ -167,6 +167,7 @@ page{
   margin: 0 auto;
   background-color: #fff;
   padding: 20rpx 20rpx 0 20rpx;
+  box-shadow: 0px 2px 10px 0px rgba(0,0,0,0.1);
 }
 .swiper{
   height:168rpx; 
diff --git a/Pages/yishi/kuaisusetup/index.js b/Pages/yishi/kuaisusetup/index.js
index 62f295c..787faa7 100644
--- a/Pages/yishi/kuaisusetup/index.js
+++ b/Pages/yishi/kuaisusetup/index.js
@@ -1,5 +1,6 @@
 import { API } from './../../../utils/network/api'
-import Toast from '@vant/weapp/toast/toast';
+import { requestSubscribeMessage } from './../../../utils/requestSubscribeUtil';
+
 let api = new API()
 const app = getApp()
 Page({
@@ -32,7 +33,8 @@ Page({
         "5",
         "10"
       ]
-    }
+    },
+    sub_visible: false,
   },
 
   onLoad(){
@@ -78,16 +80,41 @@ Page({
       console.log(response);
     }).then(()=>{
       if(detail){
-        wx.requestSubscribeMessage({
-          tmplIds: ['G1RIs0RYqsTQ2CuPQWalIMyb6_deuEEbJfajfhGvNzc'],
-          success (res) {
-            console.log(res);//同意授权
+
+        let tmplIds = ['G1RIs0RYqsTQ2CuPQWalIMyb6_deuEEbJfajfhGvNzc']
+        let sub_promise = requestSubscribeMessage(tmplIds)
+        sub_promise.then(res => {
+          console.log("订阅成功")
+          
+        }).catch(err => {
+          console.log(err)
+          let errCode = err.errCode
+          if(errCode == 20004){
+            this.setData({
+              sub_visible: true,
+            })
           }
         })
+
       }
     }).catch(errors => {console.error(errors);})
 
   },
+  subcancelDialog(){
+    this.setData({
+      sub_visible: false
+    })
+  },
+  subconfirmDialog(){
+    this.setData({
+      sub_visible: false
+    })
+    wx.openSetting({
+      success (res) {
+        console.log(res.authSetting)
+      }
+    })
+  },
   putDoctorInquiryConfig(){
     wx.switchTab({
       url: "/Pages/yishi/wenzhen_v2/wenzhen"
diff --git a/Pages/yishi/kuaisusetup/index.json b/Pages/yishi/kuaisusetup/index.json
index 71178ef..cc9281e 100644
--- a/Pages/yishi/kuaisusetup/index.json
+++ b/Pages/yishi/kuaisusetup/index.json
@@ -7,6 +7,7 @@
     "van-stepper": "@vant/weapp/stepper/index",
     "van-switch": "@vant/weapp/switch/index",
     "van-button": "@vant/weapp/button/index",
-    "van-toast": "@vant/weapp/toast/index"
+    "van-toast": "@vant/weapp/toast/index",
+    "t-dialog": "tdesign-miniprogram/dialog/dialog"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/kuaisusetup/index.wxml b/Pages/yishi/kuaisusetup/index.wxml
index 1563a9f..960c705 100644
--- a/Pages/yishi/kuaisusetup/index.wxml
+++ b/Pages/yishi/kuaisusetup/index.wxml
@@ -46,4 +46,17 @@
   </view>
 
   <van-toast id="van-toast" />
+
+  <t-dialog
+    visible="{{ sub_visible }}"
+    title="温馨提示"
+    content="您已关闭订阅消息通知，请点击“确认”按钮在设置中打开订阅通知。"
+  >
+  <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="subcancelDialog">
+    取消
+  </view>
+  <view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="subconfirmDialog">
+    确定
+  </view>
+</t-dialog>
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/kuaisusetup/index.wxss b/Pages/yishi/kuaisusetup/index.wxss
index d556c43..83437f4 100644
--- a/Pages/yishi/kuaisusetup/index.wxss
+++ b/Pages/yishi/kuaisusetup/index.wxss
@@ -123,4 +123,18 @@ page{
 .price{
   text-align: center;
   flex: 1;
+}
+.dialog{
+  width: 50%;
+  text-align: center;
+  height: 100rpx;
+  line-height: 100rpx;
+}
+.dialog_cancel_btn{
+  border-top: 1px solid #E9E9E9;
+  border-right: 1px solid #E9E9E9;
+}
+.dialog_confirm_btn{
+  border-top: 1px solid #E9E9E9;
+  color: #3CC7C0;
 }
\ No newline at end of file
diff --git a/Pages/yishi/myaccount/index.wxml b/Pages/yishi/myaccount/index.wxml
index 541a1e6..43ffae7 100644
--- a/Pages/yishi/myaccount/index.wxml
+++ b/Pages/yishi/myaccount/index.wxml
@@ -23,7 +23,7 @@
     <van-empty description="暂无账单" wx:if="{{ bill.length == 0 }}" />
   </view>
 
-  <van-image bind:click="go" data-url="/Pages/yishi/agreement_detail/index?agreement_id=13" style="position: fixed; right: 0;bottom: 262rpx;" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/account_rule.png" fit="heightFix" height="84rpx" aria-label="role" />
+  <van-image bind:click="go" data-url="/Pages/agreement_page/index?agreement_id=13" style="position: fixed; right: 0;bottom: 262rpx;" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/account_rule.png" fit="heightFix" height="84rpx" aria-label="role" />
 
     <t-picker
       visible="{{dateVisible}}"
diff --git a/Pages/yishi/onlinechufang/index.js b/Pages/yishi/onlinechufang/index.js
index 5a341ad..c21a016 100644
--- a/Pages/yishi/onlinechufang/index.js
+++ b/Pages/yishi/onlinechufang/index.js
@@ -1,5 +1,7 @@
 import Toast from '@vant/weapp/toast/toast';
 import { API } from './../../../utils/network/api'
+import Dialog from '@vant/weapp/dialog/dialog';
+
 const api = new API()
 const app = getApp()
 Page({
@@ -138,11 +140,24 @@ Page({
 
     let product_id = this.data.save_durg_product_id;
     this.delDrugBox(product_id);
+    let save_durg_prescription_product_num = this.data.save_durg_prescription_product_num;
+
+    if(!save_durg_prescription_product_num || save_durg_prescription_product_num <0){
+      Dialog.alert({
+        message: '请输入药品数量',
+      }).then(() => {
+        this.setData({
+          save_durg_prescription_product_num: ""
+        })
+      });
+      return
+    }
 
     let save_durg = {};
     save_durg.product_name = this.data.product_name;
     save_durg.product_id = this.data.save_durg_product_id;
     save_durg.prescription_product_num = this.data.save_durg_prescription_product_num;
+    
     save_durg.single_unit = this.data.save_durg_single_unit;
     save_durg.single_use = this.data.save_durg_single_use;
     save_durg.packaging_unit = this.data.save_durg_packaging_unit;
@@ -394,6 +409,37 @@ Page({
       })
     })
   },
+  get_save_durg_prescription_product_num(e){
+    console.log("get_save_durg_prescription_product_num")
+    let save_durg_prescription_product_num = e.detail
+    console.log(typeof save_durg_prescription_product_num)
+    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)){
+      Dialog.alert({
+        message: '请输入正确数字',
+      }).then(() => {
+        this.setData({
+          save_durg_prescription_product_num: ""
+        })
+      });
+      return
+    }
+
+    if(save_durg_prescription_product_num > 5){
+      Dialog.alert({
+        message: '每个药品数量不允许添加超过5个',
+      }).then(() => {
+        this.setData({
+          save_durg_prescription_product_num: ""
+        })
+      });
+      return
+    }
+    this.setData({
+      save_durg_prescription_product_num: save_durg_prescription_product_num
+    })
+  },
   putDoctorPrescription(){//修改处方
     let sub_disabled = this.data.sub_disabled;
     if(sub_disabled) return
diff --git a/Pages/yishi/onlinechufang/index.json b/Pages/yishi/onlinechufang/index.json
index 705f3c9..03447a9 100644
--- a/Pages/yishi/onlinechufang/index.json
+++ b/Pages/yishi/onlinechufang/index.json
@@ -11,6 +11,7 @@
     "van-search": "@vant/weapp/search/index",
     "van-image": "@vant/weapp/image/index",
     "van-toast": "@vant/weapp/toast/index",
-    "van-icon": "@vant/weapp/icon/index"
+    "van-icon": "@vant/weapp/icon/index",
+    "van-dialog": "@vant/weapp/dialog/index"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/onlinechufang/index.wxml b/Pages/yishi/onlinechufang/index.wxml
index 0a9c015..1d809fe 100644
--- a/Pages/yishi/onlinechufang/index.wxml
+++ b/Pages/yishi/onlinechufang/index.wxml
@@ -187,7 +187,8 @@
       <van-field
         label="药品数量"
         type="number"
-        model:value="{{save_durg_prescription_product_num}}"
+        bind:input="get_save_durg_prescription_product_num"
+        value="{{save_durg_prescription_product_num}}"
         input-align="left"
         placeholder="请输入数量"
         custom-style="font-size: 30rpx;"
@@ -255,5 +256,6 @@
   <van-toast id="van-toast" />
 </view>
 <view style="height: 50rpx;">
-  
-</view>
\ No newline at end of file
+
+</view>
+<van-dialog id="van-dialog" confirm-button-color="#3CC7C0"/>
\ No newline at end of file
diff --git a/Pages/yishi/onlinesetup/index.js b/Pages/yishi/onlinesetup/index.js
index df3f035..d8a1200 100644
--- a/Pages/yishi/onlinesetup/index.js
+++ b/Pages/yishi/onlinesetup/index.js
@@ -1,5 +1,7 @@
 import { API } from './../../../utils/network/api'
 import Toast from 'tdesign-miniprogram/toast/index';
+import { requestSubscribeMessage } from './../../../utils/requestSubscribeUtil';
+
 let api = new API()
 const app = getApp()
 Page({
@@ -32,7 +34,8 @@ Page({
         "5",
         "10"
       ]
-    }
+    },
+    sub_visible: false,
   },
   onLoad(){
     
@@ -72,16 +75,41 @@ Page({
       console.log(response);
     }).then(()=>{
       if(detail){
-        wx.requestSubscribeMessage({
-          tmplIds: ['G1RIs0RYqsTQ2CuPQWalIMyb6_deuEEbJfajfhGvNzc'],
-          success (res) {
-            console.log(res);//同意授权
+
+        let tmplIds = ['G1RIs0RYqsTQ2CuPQWalIMyb6_deuEEbJfajfhGvNzc']
+        let sub_promise = requestSubscribeMessage(tmplIds)
+        sub_promise.then(res => {
+          console.log("订阅成功")
+          
+        }).catch(err => {
+          console.log(err)
+          let errCode = err.errCode
+          if(errCode == 20004){
+            this.setData({
+              sub_visible: true,
+            })
           }
         })
+
       }
     }).catch(errors => {console.error(errors);})
 
   },
+  subcancelDialog(){
+    this.setData({
+      sub_visible: false
+    })
+  },
+  subconfirmDialog(){
+    this.setData({
+      sub_visible: false
+    })
+    wx.openSetting({
+      success (res) {
+        console.log(res.authSetting)
+      }
+    })
+  },
   putDoctorInquiryConfig(){
     //修改医生问诊配置
     // let params = {};
diff --git a/Pages/yishi/onlinesetup/index.json b/Pages/yishi/onlinesetup/index.json
index fb84336..932d65d 100644
--- a/Pages/yishi/onlinesetup/index.json
+++ b/Pages/yishi/onlinesetup/index.json
@@ -7,6 +7,7 @@
     "van-stepper": "@vant/weapp/stepper/index",
     "van-switch": "@vant/weapp/switch/index",
     "van-button": "@vant/weapp/button/index",
-    "t-toast": "tdesign-miniprogram/toast/toast"
+    "t-toast": "tdesign-miniprogram/toast/toast",
+    "t-dialog": "tdesign-miniprogram/dialog/dialog"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/onlinesetup/index.wxml b/Pages/yishi/onlinesetup/index.wxml
index 617493d..5d257f7 100644
--- a/Pages/yishi/onlinesetup/index.wxml
+++ b/Pages/yishi/onlinesetup/index.wxml
@@ -51,4 +51,17 @@
   </view>
 
   <t-toast id="t-toast" />
+
+  <t-dialog
+    visible="{{ sub_visible }}"
+    title="温馨提示"
+    content="您已关闭订阅消息通知，请点击“确认”按钮在设置中打开订阅通知。"
+  >
+  <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="subcancelDialog">
+    取消
+  </view>
+  <view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="subconfirmDialog">
+    确定
+  </view>
+</t-dialog>
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/onlinesetup/index.wxss b/Pages/yishi/onlinesetup/index.wxss
index 17d1bd2..bb62421 100644
--- a/Pages/yishi/onlinesetup/index.wxss
+++ b/Pages/yishi/onlinesetup/index.wxss
@@ -137,4 +137,18 @@ page{
 }
 .cell_value{
   color: #000;
+}
+.dialog{
+  width: 50%;
+  text-align: center;
+  height: 100rpx;
+  line-height: 100rpx;
+}
+.dialog_cancel_btn{
+  border-top: 1px solid #E9E9E9;
+  border-right: 1px solid #E9E9E9;
+}
+.dialog_confirm_btn{
+  border-top: 1px solid #E9E9E9;
+  color: #3CC7C0;
 }
\ No newline at end of file
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index 55e19b1..b3cb159 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -118,6 +118,8 @@ Page({
 
     if(wx.$TUIKit){
       wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
+      wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady);
+      wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady, this);
     }else{
       app.imInit().then(res => {
         // console.log("wenzhen onload imInit");
@@ -152,6 +154,7 @@ Page({
       dot_4: false,
     })
     wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived);
+    wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady);
   },
   onUnload(){
     // console.log("onUnload from wenzhen")
@@ -161,6 +164,9 @@ Page({
       now_message_inquiry_type: 5,
     })
   },
+  onSDKReady(){
+    console.log("onSDKReady from wenzhen")
+  },
   getConversationList(){
     // console.log("getConversationListgetConversationListgetConversationList");
     app.imInit().then(res => {
@@ -294,6 +300,9 @@ Page({
       if(!cloudCustomData) return;
       let cloudCustomDataJson;
       try {
+        if(!cloudCustomData){
+          return
+        }
         cloudCustomDataJson = JSON.parse(cloudCustomData);
       } catch (error) {
         // console.log(error);
@@ -316,6 +325,9 @@ Page({
           if(!cloudCustomData) return;
           let cloudCustomDataJson;
           try {
+            if(!item.lastMessage.cloudCustomData){
+              return
+            }
             cloudCustomDataJson = JSON.parse(item.lastMessage.cloudCustomData);
           } catch (error) {
             return;
@@ -394,7 +406,7 @@ Page({
       if(lastMessage.messageForShow == "[自定义消息]"){
         let text = "自定义消息";
         let payload = lastMessage.payload;
-        if(payload) {
+        if(payload && payload.data) {
           // console.log("payload: ",payload.data);
           let payloadJson = JSON.parse(payload.data);
           text = payloadJson.title.replaceAll(/—/g, "");
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.json b/Pages/yishi/wenzhen_v2/wenzhen.json
index e566533..f52e3e5 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.json
+++ b/Pages/yishi/wenzhen_v2/wenzhen.json
@@ -13,7 +13,8 @@
     "van-tabs": "@vant/weapp/tabs/index",
     "t-dialog": "tdesign-miniprogram/dialog/dialog",
     "van-divider": "@vant/weapp/divider/index",
-    "van-loading": "@vant/weapp/loading/index"
+    "van-loading": "@vant/weapp/loading/index",
+    "van-dialog": "@vant/weapp/dialog/index"
   },
   "enablePullDownRefresh": true,
   "onReachBottomDistance": 100
diff --git a/Pages/yishi/wenzhen_v3/wenzhen.js b/Pages/yishi/wenzhen_v3/wenzhen.js
index 90abf7e..f66f287 100644
--- a/Pages/yishi/wenzhen_v3/wenzhen.js
+++ b/Pages/yishi/wenzhen_v3/wenzhen.js
@@ -469,18 +469,18 @@ Page({
       show: false
     })
 
-    console.log("开始订阅消息");
-    wx.requestSubscribeMessage({
-      tmplIds: ['jhYUf91ULCTX_f69hazqAYwImdFf8ELasRAwB6X-MTM'],
-      success (res) {
-        console.log(res);
-        let from_account = e.currentTarget.dataset.from_account;
-        let order_inquiry_id = e.currentTarget.dataset.order_inquiry_id;
-        let inquiry_type = e.currentTarget.dataset.inquiry_type;
-        let url = e.currentTarget.dataset.url+"?from_account="+from_account+"&order_inquiry_id="+order_inquiry_id+"&inquiry_type="+inquiry_type;
-        app.go(url);
-      }
-    })
+    // console.log("开始订阅消息");
+    // wx.requestSubscribeMessage({
+    //   tmplIds: ['jhYUf91ULCTX_f69hazqAYwImdFf8ELasRAwB6X-MTM'],
+    //   success (res) {
+    //     console.log(res);
+    //   }
+    // })
+    let from_account = e.currentTarget.dataset.from_account;
+    let order_inquiry_id = e.currentTarget.dataset.order_inquiry_id;
+    let inquiry_type = e.currentTarget.dataset.inquiry_type;
+    let url = e.currentTarget.dataset.url+"?from_account="+from_account+"&order_inquiry_id="+order_inquiry_id+"&inquiry_type="+inquiry_type;
+    app.go(url);
   },
   postDoctorInquiry(e){
     this.setData({
diff --git a/Pages/yishi/yizhensetup/index.js b/Pages/yishi/yizhensetup/index.js
index 6102dfe..900c5dd 100644
--- a/Pages/yishi/yizhensetup/index.js
+++ b/Pages/yishi/yizhensetup/index.js
@@ -1,5 +1,6 @@
 import { API } from './../../../utils/network/api'
 import Toast from '@vant/weapp/toast/toast';
+import { requestSubscribeMessage } from './../../../utils/requestSubscribeUtil';
 let api = new API()
 const app = getApp()
 Page({
@@ -35,7 +36,8 @@ Page({
         "5",
         "10"
       ]
-    }
+    },
+    sub_visible: false,
   },
 
   onLoad(){
@@ -96,10 +98,19 @@ Page({
       console.log(response);
     }).then(()=>{
       if(detail){
-        wx.requestSubscribeMessage({
-          tmplIds: ['G1RIs0RYqsTQ2CuPQWalIMyb6_deuEEbJfajfhGvNzc'],
-          success (res) {
-            console.log(res);//同意授权
+        
+        let tmplIds = ['G1RIs0RYqsTQ2CuPQWalIMyb6_deuEEbJfajfhGvNzc']
+        let sub_promise = requestSubscribeMessage(tmplIds)
+        sub_promise.then(res => {
+          console.log("订阅成功")
+          
+        }).catch(err => {
+          console.log(err)
+          let errCode = err.errCode
+          if(errCode == 20004){
+            this.setData({
+              sub_visible: true,
+            })
           }
         })
       }
@@ -112,7 +123,21 @@ Page({
       this.setData({ "info.is_open": detail });
     }).catch(errors => {console.error(errors);})
   },
-
+  subcancelDialog(){
+    this.setData({
+      sub_visible: false
+    })
+  },
+  subconfirmDialog(){
+    this.setData({
+      sub_visible: false
+    })
+    wx.openSetting({
+      success (res) {
+        console.log(res.authSetting)
+      }
+    })
+  },
   putDoctorInquiryConfig(){
     //修改医生问诊配置
     let params = {};
diff --git a/Pages/yishi/yizhensetup/index.json b/Pages/yishi/yizhensetup/index.json
index 24c14a6..8291c87 100644
--- a/Pages/yishi/yizhensetup/index.json
+++ b/Pages/yishi/yizhensetup/index.json
@@ -9,6 +9,7 @@
     "van-stepper": "@vant/weapp/stepper/index",
     "van-switch": "@vant/weapp/switch/index",
     "van-button": "@vant/weapp/button/index",
-    "van-toast": "@vant/weapp/toast/index"
+    "van-toast": "@vant/weapp/toast/index",
+    "t-dialog": "tdesign-miniprogram/dialog/dialog"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/yizhensetup/index.wxml b/Pages/yishi/yizhensetup/index.wxml
index 2767d8f..00a86fd 100644
--- a/Pages/yishi/yizhensetup/index.wxml
+++ b/Pages/yishi/yizhensetup/index.wxml
@@ -73,4 +73,17 @@
 </t-picker>
 
 <van-toast id="van-toast" />
+
+<t-dialog
+    visible="{{ sub_visible }}"
+    title="温馨提示"
+    content="您已关闭订阅消息通知，请点击“确认”按钮在设置中打开订阅通知。"
+  >
+  <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="subcancelDialog">
+    取消
+  </view>
+  <view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="subconfirmDialog">
+    确定
+  </view>
+</t-dialog>
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/yizhensetup/index.wxss b/Pages/yishi/yizhensetup/index.wxss
index 592ac88..8bfbb3a 100644
--- a/Pages/yishi/yizhensetup/index.wxss
+++ b/Pages/yishi/yizhensetup/index.wxss
@@ -121,4 +121,18 @@ page{
 }
 .price{
   color: red;
+}
+.dialog{
+  width: 50%;
+  text-align: center;
+  height: 100rpx;
+  line-height: 100rpx;
+}
+.dialog_cancel_btn{
+  border-top: 1px solid #E9E9E9;
+  border-right: 1px solid #E9E9E9;
+}
+.dialog_confirm_btn{
+  border-top: 1px solid #E9E9E9;
+  color: #3CC7C0;
 }
\ No newline at end of file
diff --git a/Pages/yishi/yizhensetupprice/index.js b/Pages/yishi/yizhensetupprice/index.js
index 411201f..d928480 100644
--- a/Pages/yishi/yizhensetupprice/index.js
+++ b/Pages/yishi/yizhensetupprice/index.js
@@ -1,5 +1,6 @@
 import { API } from './../../../utils/network/api'
 import Toast from '@vant/weapp/toast/toast';
+import { requestSubscribeMessage } from './../../../utils/requestSubscribeUtil';
 let api = new API()
 const app = getApp()
 Page({
@@ -35,7 +36,8 @@ Page({
         "5",
         "10"
       ]
-    }
+    },
+    sub_visible: false,
   },
 
   onShow(){
@@ -98,16 +100,39 @@ Page({
       console.log(response);
     }).then(()=>{
       if(detail){
-        wx.requestSubscribeMessage({
-          tmplIds: ['G1RIs0RYqsTQ2CuPQWalIMyb6_deuEEbJfajfhGvNzc'],
-          success (res) {
-            console.log(res);//同意授权
+
+        let tmplIds = ['G1RIs0RYqsTQ2CuPQWalIMyb6_deuEEbJfajfhGvNzc']
+        let sub_promise = requestSubscribeMessage(tmplIds)
+        sub_promise.then(res => {
+          console.log("订阅成功")
+          
+        }).catch(err => {
+          console.log(err)
+          let errCode = err.errCode
+          if(errCode == 20004){
+            this.setData({
+              sub_visible: true,
+            })
           }
         })
       }
     }).catch(errors => {console.error(errors);})
   },
-
+  subcancelDialog(){
+    this.setData({
+      sub_visible: false
+    })
+  },
+  subconfirmDialog(){
+    this.setData({
+      sub_visible: false
+    })
+    wx.openSetting({
+      success (res) {
+        console.log(res.authSetting)
+      }
+    })
+  },
   putDoctorInquiryConfig(){
     //修改医生问诊配置
     let params = {};
diff --git a/Pages/yishi/yizhensetupprice/index.json b/Pages/yishi/yizhensetupprice/index.json
index 7ebfd9b..e57194f 100644
--- a/Pages/yishi/yizhensetupprice/index.json
+++ b/Pages/yishi/yizhensetupprice/index.json
@@ -8,6 +8,7 @@
     "van-cell-group": "@vant/weapp/cell-group/index",
     "van-stepper": "@vant/weapp/stepper/index",
     "van-button": "@vant/weapp/button/index",
-    "van-toast": "@vant/weapp/toast/index"
+    "van-toast": "@vant/weapp/toast/index",
+    "t-dialog": "tdesign-miniprogram/dialog/dialog"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/yizhensetupprice/index.wxml b/Pages/yishi/yizhensetupprice/index.wxml
index 4259805..df87a1c 100644
--- a/Pages/yishi/yizhensetupprice/index.wxml
+++ b/Pages/yishi/yizhensetupprice/index.wxml
@@ -46,4 +46,17 @@
 </t-picker>
 
 <van-toast id="van-toast" />
+
+<t-dialog
+    visible="{{ sub_visible }}"
+    title="温馨提示"
+    content="您已关闭订阅消息通知，请点击“确认”按钮在设置中打开订阅通知。"
+  >
+  <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="subcancelDialog">
+    取消
+  </view>
+  <view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="subconfirmDialog">
+    确定
+  </view>
+</t-dialog>
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/yizhensetupprice/index.wxss b/Pages/yishi/yizhensetupprice/index.wxss
index 8d256c4..d41f1c7 100644
--- a/Pages/yishi/yizhensetupprice/index.wxss
+++ b/Pages/yishi/yizhensetupprice/index.wxss
@@ -120,4 +120,18 @@ page{
 .van-cell__value{
   font-size: 32rpx !important;
   color: red !important;
+}
+.dialog{
+  width: 50%;
+  text-align: center;
+  height: 100rpx;
+  line-height: 100rpx;
+}
+.dialog_cancel_btn{
+  border-top: 1px solid #E9E9E9;
+  border-right: 1px solid #E9E9E9;
+}
+.dialog_confirm_btn{
+  border-top: 1px solid #E9E9E9;
+  color: #3CC7C0;
 }
\ No newline at end of file
diff --git a/Pages/yishi/zhiye_identity/index.js b/Pages/yishi/zhiye_identity/index.js
index 75b3009..49b2a2d 100644
--- a/Pages/yishi/zhiye_identity/index.js
+++ b/Pages/yishi/zhiye_identity/index.js
@@ -1,5 +1,6 @@
 import { API } from './../../../utils/network/api'
 import { FileUtil } from './../../../utils/fileutil'
+import { requestSubscribeMessage } from './../../../utils/requestSubscribeUtil';
 const api = new API()
 const app = getApp()
 Page({
@@ -15,7 +16,8 @@ Page({
     btn_txt: "提交",
     multi_point_status: "",
     btn_disabled: true,
-    sfz_show: false
+    sfz_show: false,
+    sub_visible: false,
   },
 
   onLoad(){
@@ -99,66 +101,88 @@ Page({
       })
     }
   },
-  add(){
-    let _this = this;
-    wx.requestSubscribeMessage({
-      tmplIds: ['XWfEQYtb8_ubz8pCs3GoCG6TFxpDz9jn52895yvDm3s','bGGoKtDZC23GZtrrxuy6i5V7OhHgRgwXWx4yoDO1tlA'],
-      success (res) { 
-        console.log(res);
-        console.log(_this.data.id_card_front);
-        console.log(_this.data.id_card_back);
-        
-        if(_this.data.id_card_front.length == 0){
-          wx.showToast({
-            title: '身份证正面为空',
-            icon: "error"
-          })
-          return;
-        }
-        
-        if(_this.data.id_card_back.length == 0){
-          wx.showToast({
-            title: '身份证反面为空',
-            icon: "error"
-          })
-          return;
-        }
-        let id_card_front = _this.data.id_card_front[0].url;
-        let id_card_back = _this.data.id_card_back[0].url;
-        let sign_image = _this.data.sign_image[0].url;
-        console.log("id_card_front: ", id_card_front);
-        console.log("id_card_back: ", id_card_back);
-        console.log("sign_image: ", sign_image);
-        if(sign_image == ""){
-          wx.showToast({
-            title: '手写签名为空',
-            icon: "error"
-          })
-          return;
-        }
-        let params = {};
-        params.id_card_front = id_card_front;
-        params.id_card_back = id_card_back;
-        params.sign_image = sign_image;
-        api.postDoctorAuthMulti(params).then(response => {
-          console.log("postDoctorAuthMulti: ",response);
-          wx.showToast({
-            title: '提交成功',
-            icon: "success"
-          })
-          _this.setData({
-            btn_txt: "审核中",
-            btn_disabled: true
-          })
-        }).catch(errors => {
-          console.error(errors);
-        })
-      },
-      fail (res) { console.log(res) },
-      complete (res) { console.log(res) },
+  subcancelDialog(){
+    this.setData({
+      sub_visible: false
     })
-
+    this.goadd()
+  },
+  subconfirmDialog(){
+    this.setData({
+      sub_visible: false
+    })
+    wx.openSetting({
+      success (res) {
+        console.log(res.authSetting)
+      }
+    })
+  },
+  add(){
+    let tmplIds = ['XWfEQYtb8_ubz8pCs3GoCG6TFxpDz9jn52895yvDm3s','bGGoKtDZC23GZtrrxuy6i5V7OhHgRgwXWx4yoDO1tlA']
+    let sub_promise = requestSubscribeMessage(tmplIds)
+    sub_promise.then(res => {
+      console.log("订阅成功")
+      this.goadd()
+    }).catch(err => {
+      console.log(err)
+      let errCode = err.errCode
+      if(errCode == 20004){
+        this.setData({
+          sub_visible: true,
+        })
+      }
+    })
+  },
+  goadd(){
+    let _this = this;
+    console.log(_this.data.id_card_front);
+    console.log(_this.data.id_card_back);
     
+    if(_this.data.id_card_front.length == 0){
+      wx.showToast({
+        title: '身份证正面为空',
+        icon: "error"
+      })
+      return;
+    }
+    
+    if(_this.data.id_card_back.length == 0){
+      wx.showToast({
+        title: '身份证反面为空',
+        icon: "error"
+      })
+      return;
+    }
+    let id_card_front = _this.data.id_card_front[0].url;
+    let id_card_back = _this.data.id_card_back[0].url;
+    let sign_image = _this.data.sign_image[0].url;
+    console.log("id_card_front: ", id_card_front);
+    console.log("id_card_back: ", id_card_back);
+    console.log("sign_image: ", sign_image);
+    if(sign_image == ""){
+      wx.showToast({
+        title: '手写签名为空',
+        icon: "error"
+      })
+      return;
+    }
+    let params = {};
+    params.id_card_front = id_card_front;
+    params.id_card_back = id_card_back;
+    params.sign_image = sign_image;
+    api.postDoctorAuthMulti(params).then(response => {
+      console.log("postDoctorAuthMulti: ",response);
+      wx.showToast({
+        title: '提交成功',
+        icon: "success"
+      })
+      _this.setData({
+        btn_txt: "审核中",
+        btn_disabled: true
+      })
+    }).catch(errors => {
+      console.error(errors);
+    })
   },
   doUploadFile(event) {
     console.log("index douploadFIle: ", event);
diff --git a/Pages/yishi/zhiye_identity/index.json b/Pages/yishi/zhiye_identity/index.json
index 42ec431..0e9bd46 100644
--- a/Pages/yishi/zhiye_identity/index.json
+++ b/Pages/yishi/zhiye_identity/index.json
@@ -9,6 +9,7 @@
     "van-divider": "@vant/weapp/divider/index",
     "van-button": "@vant/weapp/button/index",
     "van-popup": "@vant/weapp/popup/index",
-    "van-image": "@vant/weapp/image/index"
+    "van-image": "@vant/weapp/image/index",
+    "t-dialog": "tdesign-miniprogram/dialog/dialog"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/zhiye_identity/index.wxml b/Pages/yishi/zhiye_identity/index.wxml
index 60d18ee..a062790 100644
--- a/Pages/yishi/zhiye_identity/index.wxml
+++ b/Pages/yishi/zhiye_identity/index.wxml
@@ -97,4 +97,17 @@
   </view>
   </van-popup>
 
+  <t-dialog
+    visible="{{ sub_visible }}"
+    title="温馨提示"
+    content="您已关闭订阅消息通知，请点击“确认”按钮在设置中打开订阅通知。"
+  >
+  <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="subcancelDialog">
+    取消
+  </view>
+  <view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="subconfirmDialog">
+    确定
+  </view>
+</t-dialog>
+
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/zhiye_identity/index.wxss b/Pages/yishi/zhiye_identity/index.wxss
index eb1d61d..a433484 100644
--- a/Pages/yishi/zhiye_identity/index.wxss
+++ b/Pages/yishi/zhiye_identity/index.wxss
@@ -54,4 +54,18 @@
 }
 .zhiye_popup_img{
   margin-top: 30rpx;
+}
+.dialog{
+  width: 50%;
+  text-align: center;
+  height: 100rpx;
+  line-height: 100rpx;
+}
+.dialog_cancel_btn{
+  border-top: 1px solid #E9E9E9;
+  border-right: 1px solid #E9E9E9;
+}
+.dialog_confirm_btn{
+  border-top: 1px solid #E9E9E9;
+  color: #3CC7C0;
 }
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js
index 2146c7e..c6e7118 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.js
@@ -1,6 +1,7 @@
 import logger from '../../../../utils/logger';
 import constant from '../../../../utils/constant';
 import { API } from '../../../../../utils/network/api';
+import { requestSubscribeMessage } from '../../../../../utils/requestSubscribeUtil';
 
 const api = new API()
 let app = getApp()
@@ -79,7 +80,7 @@ Component({
     notShow: false,
     isShow: true,
     commonFunction: [
-      { name: '查看完整病例', key: '10' },
+      { name: '查看完整病历', key: '10' },
       { name: '在线开处方', key: '11' },
     ],
     displayServiceEvaluation: false,
@@ -95,6 +96,7 @@ Component({
     showChangYongYu: false,
     ChangYongYu: [],
     dialog_visible: false,
+    sub_visible: false,
     dialog_message: "在线开处方需先进行多点执业认证",
     message_rounds: 0,
     networkstatus: "wifi"
@@ -456,7 +458,7 @@ Component({
     },
 
     handleCommonFunctions(e) {
-      // console.log("handleCommonFunctions: ", e)
+      console.log("handleCommonFunctions: ", e)
       switch (e.target.dataset.key) {
         case '0':
           this.setData({
@@ -478,26 +480,19 @@ Component({
           break;
         case '11'://在线开方
           let _this = this;
-          // console.log("开始订阅消息");
-          wx.requestSubscribeMessage({
-            tmplIds: ['kUy70xHlr7ADo4aIHiictM4Te7MSec3E5kHsYvFQu40'],
-            success (res) {
-              // console.log(res);
-              let order_inquiry_id = _this.data.order_inquiry_id
-              api.getDoctorPrescriptionCheck({order_inquiry_id: order_inquiry_id}).then(response => {
-                let status = response.data.status
-                if(status == 1){
-                  app.go("/Pages/yishi/onlinechufang/index?order_inquiry_id="+order_inquiry_id)
-                }else{
-                  _this.setData({
-                    dialog_visible: true,
-                    dialog_message: response.data.message
-                  })
-                }
-              }).catch(errors => {
-                console.error(errors);
+          console.log("开始订阅消息");
+          let tmplIds = ['kUy70xHlr7ADo4aIHiictM4Te7MSec3E5kHsYvFQu40']
+          let sub_promise = requestSubscribeMessage(tmplIds)
+          sub_promise.then(res => {
+            console.log("订阅成功")
+            this.goCase()
+          }).catch(err => {
+            console.log(err)
+            let errCode = err.errCode
+            if(errCode == 20004){
+              _this.setData({
+                sub_visible: true,
               })
-              
             }
           })
           break;
@@ -505,6 +500,23 @@ Component({
           break;
       }
     },
+    goCase(){
+
+      let order_inquiry_id = this.data.order_inquiry_id
+      api.getDoctorPrescriptionCheck({order_inquiry_id: order_inquiry_id}).then(response => {
+        let status = response.data.status
+        if(status == 1){
+          app.go("/Pages/yishi/onlinechufang/index?order_inquiry_id="+order_inquiry_id)
+        }else{
+          this.setData({
+            dialog_visible: true,
+            dialog_message: response.data.message
+          })
+        }
+      }).catch(errors => {
+        console.error(errors);
+      })
+    },
     cancelDialog(){
       this.setData({
         dialog_visible: false
@@ -516,6 +528,22 @@ Component({
         dialog_visible: false
       })
     },
+    subcancelDialog(){
+      this.setData({
+        sub_visible: false
+      })
+      this.goCase()
+    },
+    subconfirmDialog(){
+      this.setData({
+        sub_visible: false
+      })
+      wx.openSetting({
+        success (res) {
+          console.log(res.authSetting)
+        }
+      })
+    },
     handleSendOrder() {
       this.setData({
         displayOrderList: true,
@@ -849,7 +877,11 @@ Component({
         event,
       });
     },
-
+    inputBindLinechange(event){
+      this.triggerEvent('inputBindLinechange', {
+        event,
+      });
+    },
     $handleSendTextMessage(event) {
       this.sendTextMessage(event.detail.message, true);
       this.setData({
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxml b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
index 3511119..784a9a5 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
@@ -1,18 +1,20 @@
 <view class="TUI-message-input-container">
     <view class="TUI-commom-function">
-        <view class="TUI-commom-function-item" data-key="10" bindtap="handleCommonFunctions">查看完整病例</view>
+        <view class="TUI-commom-function-item" data-key="10" bindtap="handleCommonFunctions">查看完整病历</view>
         <view class="TUI-commom-function-item" data-key="11" bindtap="handleCommonFunctions" wx:if="{{baseInfo.multi_point_status == 1}}">在线开处方</view>
     </view>
     <view class="TUI-message-input">
         <image class="TUI-icon" bindtap="switchAudio" wx:if="{{has_audio}}"
         src="{{isAudio ? '../../../../static/assets/keyboard.svg' : '../../../../static/assets/audio.svg'}}" />
         <view wx:if="{{!isAudio || isEmoji}}" class="TUI-message-input-main {{ focus && 'TUI-message-input-main-focus'}}" >
-            <textarea hold-keyboard id="mytextarea" class="TUI-message-input-area" adjust-position="{{false}}" cursor-spacing="0"
+            <textarea focus="{{false}}" hold-keyboard id="mytextarea" class="TUI-message-input-area" adjust-position="{{false}}" cursor-spacing="0"
                 value="{{message}}" bindinput="onInputValueChange" maxlength="-1" type="text" auto-height="{{true}}"
                 placeholder="请输入文字" placeholder-class="input-placeholder" confirm-type="return" show-confirm-bar="{{false}}"
                 bindfocus="inputBindFocus"
                 bindblur="inputBindBlur" 
-                bindconfirm="sendTextMessage"/>
+                bindconfirm="sendTextMessage"
+                bindlinechange="inputBindLinechange"
+                />
         </view>
         <view wx:if="{{isAudio}}" class="TUI-message-input-main"
             bind:longpress="handleLongPress"
@@ -114,3 +116,16 @@
     确定
   </view>
   </t-dialog>
+
+<t-dialog
+    visible="{{ sub_visible }}"
+    title="温馨提示"
+    content="您已关闭订阅消息通知，请点击“确认”按钮在设置中打开订阅通知。"
+  >
+  <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="subcancelDialog">
+    取消
+  </view>
+  <view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="subconfirmDialog">
+    确定
+  </view>
+</t-dialog>
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxss b/TUIKit/components/TUIChat/components/MessageInput/index.wxss
index 57f482d..832039d 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxss
@@ -67,7 +67,7 @@
 }
 .TUI-message-input-area {
     width: 100%;
-    max-height: 300rpx;
+    max-height: 100px;
     /* 最多显示10行 */
     line-height: 30rpx;
     overflow: scroll;
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index 80ad454..76fab5a 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -162,6 +162,7 @@ Component({
         this.setData({
           isCompleted: true,
           triggered: false,
+          list_first_loading: false
         });
         return;
       }
@@ -293,8 +294,10 @@ Component({
         if(Number(customMessage.message_type) == GDXZ_CUSTOM_MSEEAGE.TRABECULA && refreshBaseInfo){
           const title = customMessage.title
           if(title.indexOf("问诊已结束") > -1){
-            //收到横条消息去触发父组件getbase方法
-            this.triggerEvent('getInquiryMessageBasic');
+            setTimeout(() => {
+              //收到横条消息去触发父组件getbase方法,演示1秒
+              this.triggerEvent('getInquiryMessageBasic');
+            }, 1000);
           }
         }
       }
diff --git a/TUIKit/components/TUIChat/index.js b/TUIKit/components/TUIChat/index.js
index 814f595..7229435 100644
--- a/TUIKit/components/TUIChat/index.js
+++ b/TUIKit/components/TUIChat/index.js
@@ -2,6 +2,7 @@
 import logger from '../../utils/logger';
 import constant from '../../utils/constant';
 import { API } from './../../../utils/network/api'
+import { rpxTopx } from './../../../utils/util'
 const api = new API()
 // eslint-disable-next-line no-undef
 const app = getApp();
@@ -79,14 +80,19 @@ Component({
           message_rounds: 0
         });
       }
+      //console.log("000")
       this.getNavbarHeight()
-      wx.onKeyboardHeightChange(res => {
-        // console.log("键盘高度：", res.height)
-        this.setData({
-          keysboards_height: res.height
-        })
-        this.getNavbarHeight();
-      })
+
+      // let _this = this
+      // wx.onKeyboardHeightChange(res => {
+      //   let kb_height = res.height
+      //   console.log("键盘高度：", kb_height)
+      //   _this.setData({
+      //     kb_height: kb_height
+      //   })
+      //   console.log("111")
+      //   _this.getNavbarHeight();
+      // })
     },
     
     ready() {
@@ -103,6 +109,12 @@ Component({
           "navbarData.showCapsule": 3
         })
       }
+      this.setData({
+        finsh_btn: false
+      })
+
+      
+
     }
   },
   /**
@@ -137,11 +149,14 @@ Component({
       showCapsule: 2, //是否显示左上角图标   1表示显示    0表示不显示
       title: '', //导航栏 中间的标题
     },
-    navbar_height: 0,
+    navbar_height: 120,
     dialog_visible: false,
+    finsh_btn: false,
     KeysBoardsStatus: "down",
     message_rounds: 0,
-    keysboards_height: 0
+    keysboards_height: 0,
+    kb_height: 0,
+    change_kb: false
   },
 
   /**
@@ -157,6 +172,9 @@ Component({
       })
     },
     getNavbarHeight(addHeight){
+
+      try {
+        //console.log("getNavbarHeight: ", new Date().getTime())
       let rect = null;
       if (wx.getMenuButtonBoundingClientRect) {
           rect = wx.getMenuButtonBoundingClientRect();
@@ -164,32 +182,55 @@ Component({
       // console.log("rect: ", rect)
       wx.getSystemInfo({
         success: (res) => {
-            const { statusBarHeight } = wx.getSystemInfoSync();
+            // const { statusBarHeight } = wx.getSystemInfoSync();
             // console.log("statusBarHeight: ", statusBarHeight);
             // console.log("${rect.height}px: ", `${rect.height}`);
-            let height = Number.parseInt(statusBarHeight) + Number.parseInt(`${rect.height}`) + 50;
-            if(addHeight){
+            let height = Number.parseInt(res.statusBarHeight) + Number.parseInt(`${rect.height}`);
+
+            let KeysBoardsStatus = this.data.KeysBoardsStatus
+            if(KeysBoardsStatus == 'pull'){
+              height = height + rpxTopx(35)
+            }else{
+              height = height + rpxTopx(70)
+            }
+            if(addHeight > 0){
               height = height + addHeight
             }
-            let keysboards_height =  this.data.keysboards_height
-            // console.log("getNavbarHeight 键盘高度：", keysboards_height)
-            if(keysboards_height){
-              height = height + keysboards_height
+            let kb_height =  Number.parseInt(this.data.kb_height)
+            let textarea_height =  Number.parseInt(this.data.textarea_height)
+            //console.log("getNavbarHeight 键盘高度：", kb_height)
+            if(kb_height > 0){
+              //console.log("height 1: ", height)
+              height = height + kb_height
+              //console.log("height 2: ", height)
             }
+            if(textarea_height > 0){
+              //console.log("height 1: ", height)
+              height = height + textarea_height
+              //console.log("height 2: ", height)
+            }
+
             this.setData({
               navbar_height: height
             })
+            //console.log(444)
         },
         fail: (err) => {
             console.error('navbar 获取系统信息失败', err);
         },
       });
+      } catch (error) {
+        console.error(error)
+      }
+      
+
     },
     //结束问诊
     putDoctorInquiryFinish() {
       this.setData({
         dialog_visible: true
       })
+      wx.hideKeyboard()
     },
     cancelDialog(){
       this.setData({
@@ -197,12 +238,25 @@ Component({
       })
     },
     confirmDialog(){
+      let finsh_btn = this.data.finsh_btn
+      if(finsh_btn){
+        return
+      }
+      this.setData({
+        finsh_btn: true
+      })
       api.putDoctorInquiryFinish({order_inquiry_id: this.data.order_inquiry_id}).then(response => {
         // console.log(response);
-        this.getInquiryMessageBasic();
+        // this.getInquiryMessageBasic();
         //调用子组件中的跳到最新消息
+        this.getNavbarHeight()
         this.selectComponent('#MessageList').handleJumpNewMessage();
-      }).catch(errors => {console.error(errors);})
+      }).catch(errors => {
+        console.error(errors);
+        this.setData({
+          finsh_btn: false
+        })
+      })
       this.setData({
         dialog_visible: false
       })
@@ -215,6 +269,10 @@ Component({
         this.setData({
           baseInfo: response.data,
         })
+        if(response.data.inquiry_status > 4){
+          wx.hideKeyboard()
+          this.getNavbarHeight()
+        }
       }).catch(errors => {console.error(errors);})
     },
     init() {
@@ -261,14 +319,14 @@ Component({
       this.getNavbarHeight();
     },
     refreshMessageStatus(message) {
-      console.log("TUIchat refreshMessageStatus", message)
+      //console.log("TUIchat refreshMessageStatus", message)
       this.selectComponent('#MessageList').refreshMessageStatus(message);
     },
     showMessageErrorImage(event) {
       this.selectComponent('#MessageList').sendMessageError(event);
     },
     triggerClose() {
-      // console.log("message-list triggerClose")
+      //console.log("message-list triggerClose")
       if(this.data.baseInfo.inquiry_status == 4){
         this.selectComponent('#MessageInput').handleClose();
       }
@@ -305,13 +363,13 @@ Component({
       this.selectComponent('#MessageInput').onInputValueChange(event);
     },
     myhandleExtensions(e){
-      // console.log("myhandleExtensionsmyhandleExtensions: ", e);
+      //console.log("myhandleExtensionsmyhandleExtensions: ", e);
       wx.hideKeyboard()
       let displayFlag = e.detail.displayFlag;
-      setTimeout(() => {
+      // setTimeout(() => {
         if(displayFlag){
           this.setData({
-            input_area_style: "position: absolute;  bottom: 30px;"
+            input_area_style: "position: absolute;  bottom: 20px;"
           })
           this.getNavbarHeight(100);
           this.selectComponent('#MessageList').handleJumpNewMessage();
@@ -321,39 +379,66 @@ Component({
           })
           this.getNavbarHeight();
         }
-      }, 100);
+      // }, 100);
     },
     // 监听键盘，获取焦点时将输入框推到键盘上方
     pullKeysBoards(event) {
-      // console.log("pullKeysBoardspullKeysBoards")
-      setNewInputStyle(event.detail.event.detail.height);
+      //console.log("pullKeysBoardspullKeysBoards")
+      let value = event.detail.event.detail.value;
+      let height = event.detail.event.detail.height;
       
-      this.getNavbarHeight();
+      //console.log("pullKeysBoards value: ", height)
+      setNewInputStyle(height);
+      if(height){
+        this.setData({
+          kb_height: height
+        })
+      }
+      //console.log("333")
       this.setData({
         'viewData.style': newInputStyle,
-        input_area_style: "position: absolute;  bottom: 52rpx;",
+        // input_area_style: "position: absolute;  bottom: 52rpx;",
         KeysBoardsStatus: "pull"
       });
+      this.getNavbarHeight();
       this.selectComponent('#MessageList').handleJumpNewMessage();
+      
     },
     // 监听键盘，失去焦点时收起键盘
     downKeysBoards(event) {
-      // console.log("downKeysBoardsdownKeysBoards")
-      // console.log(event)
+      //console.log("downKeysBoardsdownKeysBoards")
+      // //console.log(event)
       let value = event.detail.event.detail.value;
-      this.getNavbarHeight();
+      //console.log("downKeysBoards value: ", value)
       if(value){
         this.setData({
           'viewData.style': inputStyle,
-          KeysBoardsStatus: "down"
+          KeysBoardsStatus: "down",
+          kb_height: 0
         });
       }else{
         this.setData({
           'viewData.style': inputStyle,
           input_area_style: "",
-          KeysBoardsStatus: "down"
+          KeysBoardsStatus: "down",
+          kb_height: 0
         });
       }
+      //console.log("444")
+      this.getNavbarHeight();
+    },
+    inputBindLinechange(event){
+      console.log(event)
+      let lineCount = event.detail.event.detail.lineCount;
+      let height = event.detail.event.detail.height;
+      if(height > 100){
+        return
+      }
+      let lineHeight = height / lineCount;
+      this.setData({
+        textarea_height: lineHeight * (lineCount - 1)
+      })
+      this.getNavbarHeight();
     },
     typing(event) {
       const { STRING_TEXT, FEAT_NATIVE_CODE } = constant;
diff --git a/TUIKit/components/TUIChat/index.wxml b/TUIKit/components/TUIChat/index.wxml
index 23064a1..6a4072c 100644
--- a/TUIKit/components/TUIChat/index.wxml
+++ b/TUIKit/components/TUIChat/index.wxml
@@ -1,16 +1,16 @@
 <!--TUIKit-WChat/Chat/index.wxml-->
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container">
-  <view class="info" wx:if="{{ true }}">
-  <view class="left">
-    <view class="name">{{baseInfo.patient_family_name}}</view>
-    <view class="age">{{baseInfo.patient_family_sex==1?'男':'女'}}｜{{baseInfo.patient_family_age}}岁</view>
-    <view class="status {{baseInfo.inquiry_status==5?'status_complete':''}}">{{baseInfo.inquiry_status==1?'待支付':baseInfo.inquiry_status==2?'待分配':baseInfo.inquiry_status==3?'待接诊':baseInfo.inquiry_status==4?'接诊中':baseInfo.inquiry_status==5?'问诊完成':baseInfo.inquiry_status==6?'已结束':baseInfo.inquiry_status==7?'已取消':'未知'}}</view>
+  <view class="info" wx:if="{{ baseInfo.inquiry_status > 0 }}">
+    <view class="left" >
+      <view class="name">{{baseInfo.patient_family_name}}</view>
+      <view class="age">{{baseInfo.patient_family_sex==1?'男':'女'}}｜{{baseInfo.patient_family_age}}岁</view>
+      <view class="status {{baseInfo.inquiry_status==5?'status_complete':''}}">{{baseInfo.inquiry_status==1?'待支付':baseInfo.inquiry_status==2?'待分配':baseInfo.inquiry_status==3?'待接诊':baseInfo.inquiry_status==4?'接诊中':baseInfo.inquiry_status==5?'问诊完成':baseInfo.inquiry_status==6?'已结束':baseInfo.inquiry_status==7?'已取消':'未知'}}</view>
+    </view>
+    <view class="right">
+      <text class="right_txt" bindtap="putDoctorInquiryFinish" wx:if="{{baseInfo.inquiry_status==4}}">结束问诊</text>
+    </view>
   </view>
-  <view class="right">
-    <text class="right_txt" bindtap="putDoctorInquiryFinish" wx:if="{{baseInfo.inquiry_status==4}}">结束问诊</text>
-  </view>
-</view>
 
    <!-- <view class="tui-navigatorbar">
      <image class="tui-navigatorbar-back" bindtap="goBack" src="../../static/assets/ic_back_black.svg" />
@@ -37,6 +37,7 @@
     <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:refreshMessageStatus="refreshMessageStatus" 
+      bind:inputBindLinechange="inputBindLinechange" 
       bind:handleCall="handleCall" message_rounds="{{message_rounds}}"></MessageInput>
     </view>
   </view>
diff --git a/app.js b/app.js
index 2ac21ce..cf33578 100644
--- a/app.js
+++ b/app.js
@@ -1,6 +1,5 @@
 import Aegis from './TUIKit/lib/aegis';
 import TIM from './TUIKit/lib/tim-wx-sdk';
-import { genTestUserSig }  from './TUIKit/debug/GenerateTestUserSig';
 import TIMUploadPlugin from './TUIKit/lib/tim-upload-plugin';
 import { API } from './utils/network/api'
 import constant from './TUIKit/utils/constant';
@@ -69,7 +68,7 @@ App({
     // this.imInit();
   },
   imInit(){
-
+    console.log("imInit")
     let usertype = wx.getStorageSync('usertype');
     let userID = wx.getStorageSync('user_id_'+usertype);
     if(usertype != 2){//只登录医师端
@@ -80,7 +79,7 @@ App({
       return;
     }
     this.globalData.config.userID = userID;
-    let sign = genTestUserSig(this.globalData.config);
+    // let sign = genTestUserSig(this.globalData.config);
     // console.log("sign: ", sign);
     // const userSig = sign.userSig;
 
@@ -194,6 +193,11 @@ App({
     wx.setStorageSync('AUTH_TOKEN_'+usertype, "");
     wx.setStorageSync('user_id_'+usertype, "");
     wx.setStorageSync('client_user_id_'+usertype, "");
+    if(wx.$TUIKit){
+      wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onSystemPushReceived);
+      wx.$TUIKit = undefined
+    }
+    this.globalData.chat_sdk_ready = false
     this.go("/Pages/kickedout/index");
   },
   $onSystemPushReceived(e){
diff --git a/app.json b/app.json
index fdf0412..d997cdf 100644
--- a/app.json
+++ b/app.json
@@ -56,7 +56,8 @@
     "Pages/yishi/onlinesetupprice/index",
     "Pages/yishi/yizhensetupprice/index",
     "Pages/yishi/wenzhenorderV2/index",
-    "Pages/yishi/wenzhen_v3/wenzhen"
+    "Pages/yishi/wenzhen_v3/wenzhen",
+    "Pages/agreement_page/index"
   ],
   "window": {
     "navigationBarBackgroundColor": "#ffffff",
diff --git a/commpents/myprofile/index.js b/commpents/myprofile/index.js
index 39c7331..330531f 100644
--- a/commpents/myprofile/index.js
+++ b/commpents/myprofile/index.js
@@ -238,12 +238,14 @@ Component({
             return item.value == _this.data.select_keshi_id
           })
           console.log("科室：", index)
-          let keshi_note = _this.data.keshi_columns[index].text;
-          console.log("科室 keshi_note：", keshi_note);
-          if(index != undefined){
+          if(index == -1){
+            clearInterval(data_replay);
+            return
+          }
+          if(index > -1){
             _this.setData({
               select_keshi_index: index,
-              keshi_note: keshi_note
+              keshi_note: _this.data.keshi_columns[index].text
             })
           }
           keshi_huixian = true;
@@ -254,6 +256,10 @@ Component({
           let index = _this.data.zhicheng_columns.findIndex(item => {
             return item.value == _this.data.select_zhicheng_id
           })
+          if(index == -1){
+            clearInterval(data_replay);
+            return
+          }
           if(index > -1){
             _this.setData({
               select_zhicheng_index: index,
@@ -299,6 +305,7 @@ Component({
               }
               api.getBasicHospital(params).then(response => {// 请求医院列表
                 _this.setData({
+                  hospital_search_val: "",
                   yiyuan_columns: _this.formatYiYuan(response),
                   city_note: _this.data.hospital.province + "/" + _this.data.hospital.city + "/" + _this.data.hospital.county
                 })
@@ -423,6 +430,7 @@ Component({
         }
         api.getBasicHospital(params).then(response => {// 请求医院列表】
           this.setData({
+            hospital_search_val: "",
             yiyuan_columns: this.formatYiYuan(response),
             city_show: false,
             city_note: this.getCityNote(selectedOptions),
diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js
index ba1f8a0..83ab980 100644
--- a/custom-tab-bar/index.js
+++ b/custom-tab-bar/index.js
@@ -1,5 +1,3 @@
-import _console from "../TUIKit/utils/console"
-
 // custom-tab-bar/index.js
 const app = getApp()
 Component({
@@ -62,17 +60,16 @@ Component({
     info_inter: 0
   },
   ready() {
-    console.log("readyreadyreadyreadyreadyready")
     const usertype = wx.getStorageSync('usertype')
-    if (usertype == 2) {
+    if (usertype == 3) {
       this.setData({
         usertype: usertype,
-        items: this.data.listAll.list2
+        items: this.data.listAll.list1
       })
     }else{
       this.setData({
         usertype: usertype,
-        items: this.data.listAll.list1
+        items: this.data.listAll.list2
       })
     }
     
diff --git a/project.private.config.json b/project.private.config.json
index 922bbc7..ab82809 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -18,5 +18,5 @@
       ]
     }
   },
-  "libVersion": "2.30.2"
+  "libVersion": "2.31.0"
 }
\ No newline at end of file
diff --git a/utils/network/request.js b/utils/network/request.js
index 8df9cab..8aaf6c3 100644
--- a/utils/network/request.js
+++ b/utils/network/request.js
@@ -31,7 +31,7 @@ class HTTP {
         'Authorization': "Bearer " + wx.getStorageSync('AUTH_TOKEN_'+usertype)
       },
       success: (res) => {
-        console.log("header Authorization: ", res.header.Authorization);
+        // console.log("header Authorization: ", res.header.Authorization);
         var Authorization_token = res.header.Authorization;
         if(Authorization_token){
           wx.setStorageSync('AUTH_TOKEN_'+usertype, Authorization_token);//当token快过期时，服务器会返回新token，本地刷新
@@ -58,7 +58,7 @@ class HTTP {
           this._show_error(showLoading, err.data.message)
       },
       complete: (res) => {
-        console.log("res from cmplete： ",res)
+        // console.log("res from cmplete： ",res)
         const code = res.data.code;
         if (code == 200) {
           if(showLoading) wx.hideLoading();
diff --git a/utils/requestSubscribeUtil.js b/utils/requestSubscribeUtil.js
new file mode 100644
index 0000000..eeb90f6
--- /dev/null
+++ b/utils/requestSubscribeUtil.js
@@ -0,0 +1,68 @@
+function requestSubscribeMessage(tmplIds){
+
+  return new Promise((resolve, reject) => {
+    wx.requestSubscribeMessage({
+      tmplIds: tmplIds,
+      success (res) {
+        console.log("succ:", res)
+        resolve(res)
+      },
+      fail(err){
+        console.log("error:", err)
+        let code = err.errCode
+        let title = "未知错误";
+        switch (code) {
+          case 10001:
+            title = "参数传空了"
+            break;
+          case 10002:
+            title = "请检查您的网络"
+            break;
+          case 10003:
+            title = "请检查您的网络"
+            break;
+          case 10004:
+            title = "参数类型错误"
+            break;
+          case 10005:
+            title = "无法展示 UI"
+            break;
+          case 20001:
+            title = "没有模板数据"
+            break;
+          case 20002:
+            title = "模板消息类型错误"
+            break;
+          case 20003:
+            title = "模板消息数量超过上限"
+            break;
+          case 20004:
+            title = "用户关闭了主开关，无法进行订阅"
+            break;
+          case 20005:
+            title = "小程序被禁封"
+            break;
+          case 20013:
+            title = "不允许通过该接口订阅设备消息"
+            break;
+        
+          default:
+            break;
+        }
+
+        // wx.showToast({
+        //   title: title,
+        //   icon: 'error'
+        // })
+
+        
+        reject(err)
+      }
+    })
+  })
+  
+}
+
+module.exports = {
+  requestSubscribeMessage
+}
\ No newline at end of file
diff --git a/utils/util.js b/utils/util.js
index 43b4709..8d629a4 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -148,11 +148,16 @@ const likeWeChatTimeAgoChat = stringTime =>{
 }
 
 // px 转换为 rpx ，传参类型是数字（Number）
-const rpxTopx = px => {
+const pxTorpx = px => {
   let deviceWidth = wx.getSystemInfoSync().windowWidth; //获取设备屏幕宽度
   let rpx = (750 / deviceWidth) * Number(px)
   return Math.floor(rpx);
 }
+// px 转换为 rpx ，传参类型是数字（Number）
+const rpxTopx = rpx => {
+  let px = rpx / 750 * wx.getSystemInfoSync().windowWidth;
+  return Math.floor(px);
+}
 
 module.exports = {
   formatTime,
@@ -160,6 +165,7 @@ module.exports = {
   formatNumber,
   getTimeAgo,
   rpxTopx,
+  pxTorpx,
   getTimeAgoChat,
   likeWeChatTimeAgoChat
 }

From 7ef82dab29f576c5f6aad12feba26200d3f7f40f Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Wed, 10 May 2023 10:49:40 +0800
Subject: [PATCH 28/83] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=9D=99=E6=80=81?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90host?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/agreement_page/index.js                 |  7 ++--
 Pages/index/index.js                          |  5 ++-
 Pages/index/index.wxml                        |  4 +--
 Pages/login/index.js                          |  3 +-
 Pages/login/index.wxml                        |  2 +-
 Pages/mobile_login/index.js                   |  3 +-
 Pages/mobile_login/index.wxml                 |  2 +-
 Pages/yaoshi/index/index.js                   |  8 +++--
 Pages/yaoshi/index/index.wxml                 |  4 +--
 Pages/yishi/bankcard/index.js                 |  3 +-
 Pages/yishi/bankcard/index.wxml               | 12 +------
 Pages/yishi/bindcard/index.js                 |  3 +-
 Pages/yishi/bindcard/index.wxml               |  2 +-
 Pages/yishi/case/index.wxml                   | 28 ++++++++--------
 Pages/yishi/case/index.wxss                   |  2 +-
 Pages/yishi/cash/index.js                     |  3 +-
 Pages/yishi/cash/index.wxml                   |  2 +-
 Pages/yishi/cashrecord/index.js               |  1 +
 Pages/yishi/cashrecord/index.wxml             | 22 +------------
 Pages/yishi/index/index.js                    |  4 +--
 Pages/yishi/index/index.wxml                  | 18 +++++-----
 Pages/yishi/my/index.js                       |  3 +-
 Pages/yishi/myaccount/index.js                |  1 +
 Pages/yishi/myaccount/index.wxml              |  2 +-
 Pages/yishi/mycard/index.js                   |  4 +--
 Pages/yishi/mycard/index.wxml                 | 13 --------
 Pages/yishi/onlinechufang/index.js            |  3 +-
 Pages/yishi/onlinechufang/index.wxml          |  2 +-
 Pages/yishi/service_notice/index.js           |  3 +-
 Pages/yishi/service_notice/index.wxml         | 12 +++----
 Pages/yishi/system_notice/index.js            |  1 +
 Pages/yishi/system_notice/index.wxml          |  6 ++--
 Pages/yishi/wenzhen/wenzhen.js                |  1 +
 Pages/yishi/wenzhen/wenzhen.wxml              |  6 ++--
 Pages/yishi/wenzhen_v2/wenzhen.js             |  1 +
 Pages/yishi/wenzhen_v2/wenzhen.wxml           |  8 ++---
 Pages/yishi/wenzhen_v3/wenzhen.js             |  1 +
 Pages/yishi/wenzhen_v3/wenzhen.wxml           |  8 ++---
 Pages/yishi/zhiye_identity/index.js           |  1 +
 Pages/yishi/zhiye_identity/index.wxml         |  9 +++--
 .../TUIChat/components/MessageInput/index.js  |  3 +-
 .../components/MessageInput/index.wxml        |  8 ++---
 .../TUIChat/components/MessageList/index.js   |  7 ++--
 .../TUIChat/components/MessageList/index.wxml |  4 +--
 commpents/myprofile/index.js                  |  3 +-
 commpents/myprofile/index.wxml                | 13 +++++---
 commpents/upload-cell/index.js                |  4 +++
 commpents/upload-cell/index.wxml              |  2 +-
 custom-tab-bar/index.js                       | 33 ++++++++++++-------
 custom-tab-bar/index.wxml                     |  6 ++--
 project.private.config.json                   |  2 +-
 51 files changed, 155 insertions(+), 153 deletions(-)

diff --git a/Pages/agreement_page/index.js b/Pages/agreement_page/index.js
index aa5596d..ee13914 100644
--- a/Pages/agreement_page/index.js
+++ b/Pages/agreement_page/index.js
@@ -1,17 +1,20 @@
 // Pages/webpage/index.js
+import { API } from './../../utils/network/api'
+const api = new API()
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    src: ""
+    src: "",
+    static_host: api.getStaticHost()
   },
 
   onLoad(options) {
     console.log(options.agreement_id)
     this.setData({
-      src: "https://img.applets.igandanyiyuan.com/basic/file/agreement.htm?id="+options.agreement_id
+      src: this.data.static_host+"/basic/file/agreement.htm?id="+options.agreement_id
     })
   },
 
diff --git a/Pages/index/index.js b/Pages/index/index.js
index 739c841..34f3c2c 100644
--- a/Pages/index/index.js
+++ b/Pages/index/index.js
@@ -1,8 +1,11 @@
 // Pages/index/index.js
+import { API } from './../../utils/network/api'
+const api = new API()
 const app = getApp()
 Page({
   data: {
-    loading: true
+    loading: true,
+    static_host: api.getStaticHost()
   },
   onLoad(option){
     let from = option.from;
diff --git a/Pages/index/index.wxml b/Pages/index/index.wxml
index 789a18c..40cfe2f 100644
--- a/Pages/index/index.wxml
+++ b/Pages/index/index.wxml
@@ -4,7 +4,7 @@
         data-url="/Pages/yishi/index/index" bindtap="goCheck" >
         <t-image 
         class="item_img"  
-        src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yi.png" 
+        src="{{static_host}}/applet/doctor/static/images/yi.png" 
         mode="heightFix" 
         height="220rpx" 
         aria-label="医师端" 
@@ -18,7 +18,7 @@
       data-usertype="3" bindtap="goCheck">
       <t-image 
       class="item_img"  
-      src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yao.png" 
+      src="{{static_host}}/applet/doctor/static/images/yao.png" 
       mode="heightFix" 
       height="220rpx" 
       aria-label="药师端" 
diff --git a/Pages/login/index.js b/Pages/login/index.js
index 5a9b7ab..13f8462 100644
--- a/Pages/login/index.js
+++ b/Pages/login/index.js
@@ -8,7 +8,8 @@ Page({
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '登录', //导航栏 中间的标题
     },
-    checked: false
+    checked: false,
+    static_host: api.getStaticHost()
   },
   onLoad(){
     let usertype =  wx.getStorageSync('usertype');
diff --git a/Pages/login/index.wxml b/Pages/login/index.wxml
index c577cf5..cfdc506 100644
--- a/Pages/login/index.wxml
+++ b/Pages/login/index.wxml
@@ -6,7 +6,7 @@
   <view class="box">
     <view class="top">
       <view class="logo">
-        <van-image fit="heightFix" height="56rpx" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/logo.png" use-loading-slot>
+        <van-image fit="heightFix" height="56rpx" src="{{static_host}}/applet/doctor/static/images/logo.png" use-loading-slot>
           <van-loading slot="loading" type="spinner" size="20" vertical />
         </van-image>
       </view>
diff --git a/Pages/mobile_login/index.js b/Pages/mobile_login/index.js
index 98f456d..6842119 100644
--- a/Pages/mobile_login/index.js
+++ b/Pages/mobile_login/index.js
@@ -13,7 +13,8 @@ Page({
     btn_msg: "获取验证码",
     btn_disabled: false,
     login_disabled: false,
-    btn_color: "#ccc"
+    btn_color: "#ccc",
+    static_host: api.getStaticHost()
   },
   onLoad(){
     let usertype =  wx.getStorageSync('usertype');
diff --git a/Pages/mobile_login/index.wxml b/Pages/mobile_login/index.wxml
index 1c9f1ee..68cf62d 100644
--- a/Pages/mobile_login/index.wxml
+++ b/Pages/mobile_login/index.wxml
@@ -1,6 +1,6 @@
 <m-nav-bar navbarData="{{navbarData}}">
   <view class="logo">
-    <van-image height="196rpx" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/logo2.png" fit="heightFix" />
+    <van-image height="196rpx" src="{{static_host}}/applet/doctor/static/images/logo2.png" fit="heightFix" />
   </view>
   <view class="fields">
     <view class="phone_box">
diff --git a/Pages/yaoshi/index/index.js b/Pages/yaoshi/index/index.js
index 439882c..2034790 100644
--- a/Pages/yaoshi/index/index.js
+++ b/Pages/yaoshi/index/index.js
@@ -1,8 +1,10 @@
 // Pages/index/index.js
+import { API } from './../../../utils/network/api'
+const api = new API()
 Page({
-  /**
-   * 生命周期函数--监听页面显示
-   */
+  data: {
+    static_host: api.getStaticHost()
+  },
   onShow() {
     if (typeof this.getTabBar === 'function' && this.getTabBar()) {
       this.getTabBar().setData({
diff --git a/Pages/yaoshi/index/index.wxml b/Pages/yaoshi/index/index.wxml
index 73e329d..de825d5 100644
--- a/Pages/yaoshi/index/index.wxml
+++ b/Pages/yaoshi/index/index.wxml
@@ -4,7 +4,7 @@
       <t-image 
       bindtap="toGo" data-url="/Pages/yaoshi/home/home" 
       class="item_img"  
-      src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yi.png" 
+      src="{{static_host}}/applet/doctor/static/images/yi.png" 
       mode="heightFix" 
       height="220rpx" 
       aria-label="医师端" 
@@ -17,7 +17,7 @@
       <t-image 
       bindtap="toGo" data-url="/Pages/yaoshi/my/my" 
       class="item_img"  
-      src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yao.png" 
+      src="{{static_host}}/applet/doctor/static/images/yao.png" 
       mode="heightFix" 
       height="220rpx" 
       aria-label="药师端" 
diff --git a/Pages/yishi/bankcard/index.js b/Pages/yishi/bankcard/index.js
index 85b2f81..39f53b8 100644
--- a/Pages/yishi/bankcard/index.js
+++ b/Pages/yishi/bankcard/index.js
@@ -12,7 +12,8 @@ Page({
     bank_card_id: "",
     bank_img_path: "",
     bank_name: "",
-    bank_card_code_mask: ""
+    bank_card_code_mask: "",
+    static_host: api.getStaticHost()
   },
   onShow(){
 
diff --git a/Pages/yishi/bankcard/index.wxml b/Pages/yishi/bankcard/index.wxml
index 9ab18a4..9882fc1 100644
--- a/Pages/yishi/bankcard/index.wxml
+++ b/Pages/yishi/bankcard/index.wxml
@@ -11,7 +11,7 @@
   </view>
   <view class="bankcard_empty_box" wx:if="{{ banklist_empty }}">
     <view class="bankcard_empty">
-      <van-image src="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/yishi/bankcard_empty.png" fit="widthFix" width="500rpx" aria-label="空" />
+      <van-image src="{{static_host}}/applet/doctor/static/images/yishi/bankcard_empty.png" fit="widthFix" width="500rpx" aria-label="空" />
     </view>
       <van-button data-url="/Pages/yishi/bindcard/index" bind:click="go" custom-style="font-size: 30rpx;border-radius: 10rpx;background-color:#3CC7C0;border: none;width: 92vw;margin: 50rpx auto;" type="primary" block>添加结算银行卡</van-button>
     <view class="note">提示：每人只能绑定一张银行卡，银行卡绑定成功后每月只能修改结算银行卡一次，请谨慎绑定。</view>
@@ -22,16 +22,6 @@
       <view class="bankcard_list_item_name">{{bank_name}}</view>
       <view class="bankcard_list_item_num">{{bank_card_code_mask}}</view>
     </view>
-    <!-- <view class="bankcard_list_item">
-      <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/bankcard/ny.png" fit="widthFix" width="100%" aria-label="空" />
-      <view class="bankcard_list_item_name">中国农业银行</view>
-      <view class="bankcard_list_item_num">3034 **** **** **** 2698</view>
-    </view> -->
-   <!--  <view class="bankcard_list_item">
-      <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/bankcard/js.png" fit="widthFix" width="100%" aria-label="空" />
-      <view class="bankcard_list_item_name">中国建设银行</view>
-      <view class="bankcard_list_item_num">3034 **** **** **** 2698</view>
-    </view> -->
 
     <van-button data-url="/Pages/yishi/bindcard/index" bind:click="go" custom-style="font-size: 30rpx;border-radius: 10rpx;background-color:#3CC7C0;border: none;width: 92vw;margin: 50rpx auto;" type="primary" block>更换银行卡</van-button>
     <view class="note">
diff --git a/Pages/yishi/bindcard/index.js b/Pages/yishi/bindcard/index.js
index 9228588..769c472 100644
--- a/Pages/yishi/bindcard/index.js
+++ b/Pages/yishi/bindcard/index.js
@@ -27,7 +27,8 @@ Page({
     area_sub_titles: ["省份","市区","区县"],
     areaprovince_data_ready: false,
     banklist_data_ready: false,
-    bank_card_id: ""
+    bank_card_id: "",
+    static_host: api.getStaticHost()
   },
   onLoad(options){
     console.log("options: ", options);
diff --git a/Pages/yishi/bindcard/index.wxml b/Pages/yishi/bindcard/index.wxml
index cd01bc2..69fce33 100644
--- a/Pages/yishi/bindcard/index.wxml
+++ b/Pages/yishi/bindcard/index.wxml
@@ -2,7 +2,7 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
   <view class="top_note">
-    <van-image style="display: flex;align-items: center;margin-right: 10rpx;" src="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/bell.png" fit="widthFix" width="45rpx" aria-label="qrcode" />
+    <van-image style="display: flex;align-items: center;margin-right: 10rpx;" src="{{static_host}}/applet/doctor/static/images/bell.png" fit="widthFix" width="45rpx" aria-label="qrcode" />
     <text>请确定开户人姓名与账户医生的姓名一致</text>
   </view>
   <view class="info">
diff --git a/Pages/yishi/case/index.wxml b/Pages/yishi/case/index.wxml
index 448e608..32c5296 100644
--- a/Pages/yishi/case/index.wxml
+++ b/Pages/yishi/case/index.wxml
@@ -27,15 +27,15 @@
         <view class="title">医生诊断：</view>
         <view class="conent">{{case_detail.disease_class_name}}</view>
       </view> -->
-      <view class="disease_box_item" wx:if="{{case_detail.diagnosis_hospital != ''}}">
+      <view class="disease_box_item" wx:if="{{case_detail.diagnosis_hospital != '' && case_detail.diagnosis_hospital != null}}">
         <view class="title">确诊医院：</view>
         <view class="conent">{{case_detail.diagnosis_hospital}}</view>
       </view>
-      <view class="disease_box_item">
+      <view class="disease_box_item" wx:if="{{case_detail.drugs_name != '' && case_detail.drugs_name != null}}">
         <view class="title">正在服用的药品信息：</view>
         <view class="conent">{{case_detail.drugs_name==''?'无':''}}</view>
       </view>
-      <view class="disease_info" wx:if="{{case_detail.drugs_name != ''}}">
+      <view class="disease_info" wx:if="{{case_detail.drugs_name != '' && case_detail.drugs_name != null}}">
         详细描述：{{case_detail.drugs_name}}
       </view>
       <view class="disease_box_item">
@@ -48,7 +48,7 @@
           <text wx:for="{{case_detail.product}}">{{item}};</text>
         </view>
       </view>
-      <view class="disease_box_item">
+      <view class="disease_box_item" wx:if="{{case_detail.diagnose_images.length > 0}}">
         <view class="title">复诊凭证(病例/处方单/检查报告/住院单)：</view>
         <view class="conent" wx:if="{{case_detail.diagnose_images.length == 0}}">无</view>
       </view>
@@ -58,38 +58,38 @@
 
     </view>
   </view>
-  <view class="main_title">其他信息</view>
-  <view class="data_box orther">
+  <view class="main_title" wx:if="{{case_detail.is_allergy_history != null && case_detail.is_family_history != null && case_detail.is_pregnant != null && case_detail.drink_wine_status != null && case_detail.smoke_status != null && case_detail.is_operation != null && case_detail.chemical_compound_status != null  && case_detail.chemical_compound_status != null}}">其他信息</view>
+  <view class="data_box orther" wx:if="{{case_detail.is_allergy_history != null && case_detail.is_family_history != null && case_detail.is_pregnant != null && case_detail.drink_wine_status != null && case_detail.smoke_status != null && case_detail.is_operation != null && case_detail.chemical_compound_status != null  && case_detail.chemical_compound_status != null}}">
     <view class="disease_box">
-      <view class="disease_box_item" wx:if="{{case_detail.is_allergy_history != 0}}">
+      <view class="disease_box_item" wx:if="{{case_detail.is_allergy_history != null}}">
         <view class="title">过敏史：</view>
         <view class="conent">{{case_detail.is_allergy_history==0?'否':case_detail.allergy_history}}</view>
       </view>
-      <view class="disease_box_item" wx:if="{{case_detail.is_family_history != 0}}">
+      <view class="disease_box_item" wx:if="{{ case_detail.is_family_history != null}}">
         <view class="title">家族史：</view>
         <view class="conent">{{case_detail.is_family_history==0?'否':case_detail.family_history}}</view>
       </view>
-      <view class="disease_box_item" wx:if="{{case_detail.is_pregnant != 0}}">
+      <view class="disease_box_item" wx:if="{{case_detail.is_pregnant != null}}">
         <view class="title">是否备孕、妊娠或者哺乳期：</view>
         <view class="conent">{{case_detail.is_pregnant==0?'否':case_detail.pregnant}}</view>
       </view>
-      <view class="disease_box_item" wx:if="{{case_detail.drink_wine_status != 0}}">
+      <view class="disease_box_item" wx:if="{{ case_detail.drink_wine_status != null}}">
         <view class="title">饮酒史：</view>
         <view class="conent">{{case_detail.drink_wine_status==1?'从不':case_detail.drink_wine_status==2?'偶尔':case_detail.drink_wine_status==3?'经常':case_detail.drink_wine_status==4?'每天':case_detail.drink_wine_status==5?'已戒酒':'其他'}}</view>
       </view>
-      <view class="disease_box_item" wx:if="{{case_detail.smoke_status != 0}}">
+      <view class="disease_box_item" wx:if="{{case_detail.smoke_status != null}}">
         <view class="title">吸烟史：</view>
         <view class="conent">{{case_detail.smoke_status==1?'从不':case_detail.smoke_status==2?'偶尔':case_detail.smoke_status==3?'经常':case_detail.smoke_status==4?'每天':case_detail.smoke_status==5?'已戒烟':'其他'}}</view>
       </view>
-      <view class="disease_box_item" wx:if="{{case_detail.is_operation != 0}}">
+      <view class="disease_box_item" wx:if="{{case_detail.is_operation != null}}">
         <view class="title">手术史：</view>
         <view class="conent">{{case_detail.is_operation==0?'否':case_detail.operation}}</view>
       </view>
-      <view class="disease_box_item" wx:if="{{case_detail.chemical_compound_status != 0}}">
+      <view class="disease_box_item" wx:if="{{ case_detail.chemical_compound_status != null}}">
         <view class="title">接触化学物：</view>
         <view class="conent">{{case_detail.chemical_compound_status==1?'从不':case_detail.chemical_compound_status==2?'偶尔':case_detail.chemical_compound_status==3?'经常':case_detail.chemical_compound_status==4?'每天':'其他'}}</view>
       </view>
-      <view class="disease_info" wx:if="{{case_detail.chemical_compound_status != 1}}">
+      <view class="disease_info" wx:if="{{case_detail.chemical_compound_describe != null}}">
         详细描述:{{case_detail.chemical_compound_describe}}
       </view>
     </view>
diff --git a/Pages/yishi/case/index.wxss b/Pages/yishi/case/index.wxss
index a86b47e..c251ea6 100644
--- a/Pages/yishi/case/index.wxss
+++ b/Pages/yishi/case/index.wxss
@@ -38,7 +38,7 @@ page{
 }
 .info_item{
   text-align: center;
-  width: 190rpx;
+  /* width: 190rpx; */
   height: 60rpx;
   display: flex;
   align-items: center;
diff --git a/Pages/yishi/cash/index.js b/Pages/yishi/cash/index.js
index 1b33f6c..a48c6af 100644
--- a/Pages/yishi/cash/index.js
+++ b/Pages/yishi/cash/index.js
@@ -11,7 +11,8 @@ Page({
     },
     height: app.globalData.height,
     bank_card_id: "",
-    bank_icon_path: "https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/bankcard/js_icon.png",
+    static_host: api.getStaticHost(),
+    bank_icon_path: api.getStaticHost()+"/applet/doctor/static/images/yishi/bankcard/js_icon.png",
     bank_card_name: "默认姓名",
     bank_name	: "xx银行",
     bank_card_code_mask: "888 xxxx xxxx 888",
diff --git a/Pages/yishi/cash/index.wxml b/Pages/yishi/cash/index.wxml
index 315ab96..3d17021 100644
--- a/Pages/yishi/cash/index.wxml
+++ b/Pages/yishi/cash/index.wxml
@@ -58,7 +58,7 @@
   </view> -->
 
   <view class="bottom">
-    <van-button bind:click="postDoctorWithdrawal" disabled="{{order_inquiry_ids.length == 0 || sub_btn_disabled}}" custom-style="border-radius: 10rpx;font-size: 30rpx;" block color="#3CC7C0">提取</van-button>
+    <van-button bind:click="postDoctorWithdrawal" disabled="{{order_inquiry_ids.length == 0 || sub_btn_disabled || withdrawal_amount == 0}}" custom-style="border-radius: 10rpx;font-size: 30rpx;" block color="#3CC7C0">提取</van-button>
     <view class="kefu" bindtap="contactKeFu">
       <text>联系客服</text>
     </view>
diff --git a/Pages/yishi/cashrecord/index.js b/Pages/yishi/cashrecord/index.js
index 10460e8..5b43aba 100644
--- a/Pages/yishi/cashrecord/index.js
+++ b/Pages/yishi/cashrecord/index.js
@@ -17,6 +17,7 @@ Page({
     dateVisible: false,
     select_date: '',
     years: [],
+    static_host: api.getStaticHost()
   },
   onLoad(){
     let now_year = (new Date()).Format("yyyy");
diff --git a/Pages/yishi/cashrecord/index.wxml b/Pages/yishi/cashrecord/index.wxml
index af3320d..aade775 100644
--- a/Pages/yishi/cashrecord/index.wxml
+++ b/Pages/yishi/cashrecord/index.wxml
@@ -11,7 +11,7 @@
     <view class="data_item" wx:for="{{record_list}}">
       <view class="data_item_top">
         <view class="data_item_top_icon">
-          <van-image custom-style="" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/bankcard/js_icon.png" fit="heightFix" height="50rpx" aria-label="role" />
+          <van-image custom-style="" src="{{static_host}}/applet/doctor/static/images/yishi/bankcard/js_icon.png" fit="heightFix" height="50rpx" aria-label="role" />
         </view>
         <view class="data_item_top_content">
           <view class="name">{{item.account_name}}<text style="margin-left:20rpx;font-size: 28rpx;color:#999;">（尾号{{item.bank_card_code_four}}）</text></view>
@@ -27,26 +27,6 @@
       </view>
       <view class="data_item_bottom">个人所得税：￥{{item.income_tax}}</view>
     </view>
-
-    <!-- <view class="data_item">
-      <view class="data_item_top">
-        <view class="data_item_top_icon">
-          <van-image custom-style="" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/bankcard/js_icon.png" fit="heightFix" height="50rpx" aria-label="role" />
-        </view>
-        <view class="data_item_top_content">
-          <view class="name">张三三<text style="margin-left:20rpx;font-size: 28rpx;color:#999;">（尾号9900）</text></view>
-          <view class="date">12.09  13:23</view>
-        </view>
-        <view class="data_item_top_num">
-          <view class="jine">￥123.00</view>
-          <view class="status_box">
-            <view class="status status_end">结算成功</view>
-          </view>
-        </view>
-      </view>
-      <view class="data_item_bottom">个人所得税：￥12.00</view>
-    </view> -->
-
     
     <van-empty description="暂无数据" wx:if="{{record_list.length == 0}}" />
     
diff --git a/Pages/yishi/index/index.js b/Pages/yishi/index/index.js
index feffe85..f8cf1a0 100644
--- a/Pages/yishi/index/index.js
+++ b/Pages/yishi/index/index.js
@@ -20,9 +20,10 @@ Page({
       praise_rate: "100%",
       avg_response_time: 0,
       number_of_fans: 0,
-      avatar: "https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/default_photo.png",
+      avatar: api.getStaticHost()+"/applet/doctor/static/images/default_photo.png",
       reject_prescription_number: false,//处方管理小红点
     },
+    static_host: api.getStaticHost(),
     iden_auth_status_txt: "未认证",
     multi_point_status_txt: "未认证",
     shiming_status_url: "",
@@ -230,7 +231,6 @@ Page({
       this.getTabBar().setData({
         active: 0,  //数字是当前页面在tabbar的索引,如我的查询页索引是2，因此这边为2，同理首页就为0，审批页面为1
       })
-
       this.getTabBar().startInterval()
     }
     this.getMenuButtonBound();
diff --git a/Pages/yishi/index/index.wxml b/Pages/yishi/index/index.wxml
index 60e6f93..ac67c59 100644
--- a/Pages/yishi/index/index.wxml
+++ b/Pages/yishi/index/index.wxml
@@ -68,7 +68,7 @@
       <view class="renzheng_content_right">
         <van-image class="renzheng_content_right_img" width="100%" 
           fit="widthFix"
-          src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/yishirenzheng.png"
+          src="{{static_host}}/applet/doctor/static/images/yishi/yishirenzheng.png"
         />
       </view>
     </view>
@@ -87,7 +87,7 @@
       <view class="renzheng_content_right">
         <van-image class="renzheng_content_right_img" width="100%" 
           fit="widthFix"
-          src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/zhiyerenzheng.png"
+          src="{{static_host}}/applet/doctor/static/images/yishi/zhiyerenzheng.png"
         />
       </view>
     </view>
@@ -122,7 +122,7 @@
       <van-image class="fun_box_item_img"
           fit="heightFix"
           height="70rpx"
-          src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/jianjie.png"
+          src="{{static_host}}/applet/doctor/static/images/yishi/jianjie.png"
         />
       <text class="fun_box_item_txt">个人简介管理</text>
     </view>
@@ -130,7 +130,7 @@
       <van-image class="fun_box_item_img"
       fit="widthFix"
       width="70rpx"
-          src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/zaixian.png"
+          src="{{static_host}}/applet/doctor/static/images/yishi/zaixian.png"
         />
       <text class="fun_box_item_txt">在线问诊管理</text>
     </view>
@@ -138,7 +138,7 @@
       <van-image class="fun_box_item_img"
       fit="widthFix"
       width="70rpx"
-          src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/kuaisu.png"
+          src="{{static_host}}/applet/doctor/static/images/yishi/kuaisu.png"
         />
       <text class="fun_box_item_txt">快速问诊管理</text>
     </view>
@@ -146,7 +146,7 @@
       <van-image class="fun_box_item_img"
       fit="widthFix"
       width="70rpx"
-          src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/yizhen.png"
+          src="{{static_host}}/applet/doctor/static/images/yishi/yizhen.png"
         />
       <text class="fun_box_item_txt">公益问诊管理</text>
     </view>
@@ -154,7 +154,7 @@
       <van-image class="fun_box_item_img"
       fit="widthFix"
       width="70rpx"
-          src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/chufang.png"
+          src="{{static_host}}/applet/doctor/static/images/yishi/chufang.png"
         />
       <view class="fun_box_item_txt">
       <t-badge style="display: flex;align-items: center;" dot="{{info.reject_prescription_number ? true : false}}" offset="{{ ['-14rpx', '10rpx'] }}" class="wrapper" content="处方管理" />
@@ -164,7 +164,7 @@
       <van-image class="fun_box_item_img"
           fit="widthFix"
           width="70rpx"
-          src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/kefu.png"
+          src="{{static_host}}/applet/doctor/static/images/yishi/kefu.png"
         />
       <text class="fun_box_item_txt">联系客服</text>
     </view>
@@ -228,7 +228,7 @@
       fit="widthFix"
       style="position: absolute; padding-top: {{stateHeight + navHeight}}px;"
       width="100vw"
-          src="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/collection.png"
+          src="{{static_host}}/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>
diff --git a/Pages/yishi/my/index.js b/Pages/yishi/my/index.js
index 76ea0cd..7ffe33d 100644
--- a/Pages/yishi/my/index.js
+++ b/Pages/yishi/my/index.js
@@ -10,7 +10,8 @@ Page({
     iden_auth_status: "0",
     idcard_status: "0",
     multi_point_status: "0",
-    avatar: "https://img.applets.igandanyiyuan.com/applet/doctor/static/images/default_photo.png",
+    static_host: api.getStaticHost(),
+    avatar: api.getStaticHost()+"/applet/doctor/static/images/default_photo.png",
     balance_account: "0",
     estimate_income: "0",
     doctor_id: ""
diff --git a/Pages/yishi/myaccount/index.js b/Pages/yishi/myaccount/index.js
index 1503f29..bd90fb4 100644
--- a/Pages/yishi/myaccount/index.js
+++ b/Pages/yishi/myaccount/index.js
@@ -16,6 +16,7 @@ Page({
     balance_account: "",
     amount_total_month: "",
     withdrawal_amount_month: "",
+    static_host: api.getStaticHost(),
     bill: [],
     years: [],
     seasons: [
diff --git a/Pages/yishi/myaccount/index.wxml b/Pages/yishi/myaccount/index.wxml
index 43ffae7..cad88ae 100644
--- a/Pages/yishi/myaccount/index.wxml
+++ b/Pages/yishi/myaccount/index.wxml
@@ -23,7 +23,7 @@
     <van-empty description="暂无账单" wx:if="{{ bill.length == 0 }}" />
   </view>
 
-  <van-image bind:click="go" data-url="/Pages/agreement_page/index?agreement_id=13" style="position: fixed; right: 0;bottom: 262rpx;" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/account_rule.png" fit="heightFix" height="84rpx" aria-label="role" />
+  <van-image bind:click="go" data-url="/Pages/agreement_page/index?agreement_id=13" style="position: fixed; right: 0;bottom: 262rpx;" src="{{static_host}}/applet/doctor/static/images/yishi/account_rule.png" fit="heightFix" height="84rpx" aria-label="role" />
 
     <t-picker
       visible="{{dateVisible}}"
diff --git a/Pages/yishi/mycard/index.js b/Pages/yishi/mycard/index.js
index ce78eed..1277699 100644
--- a/Pages/yishi/mycard/index.js
+++ b/Pages/yishi/mycard/index.js
@@ -52,7 +52,7 @@ Page({
         },
         {
           type: 'image',//医生二维码图片 3
-          url: 'https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/qrcode.png',
+          url: '',
           css: {
             left: '215px',
             top: '458px',
@@ -62,7 +62,7 @@ Page({
         },
         {
           type: 'image',//医生头像图片 4
-          url: 'https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/default_photo.png',
+          url: '',
           css: {
             top: '40px',
             left: '327px',
diff --git a/Pages/yishi/mycard/index.wxml b/Pages/yishi/mycard/index.wxml
index 51ea935..5e13948 100644
--- a/Pages/yishi/mycard/index.wxml
+++ b/Pages/yishi/mycard/index.wxml
@@ -25,20 +25,7 @@
       <!-- <view class="title">分享我的名片到</view> -->
     </view>
     <view class="imgbox">
-      <!-- <view class="imgbox_item">
-        <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/wx.png" mode="heightFix" width="90rpx" height="90rpx" aria-label="qrcode" />
-        <text class="imgbox_item_txt">
-          微信好友
-        </text>
-      </view>
-      <view class="imgbox_item">
-        <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/pyq.png" mode="heightFix" width="90rpx" height="90rpx" aria-label="qrcode" />
-        <text class="imgbox_item_txt">
-          朋友圈
-        </text>
-      </view> -->
       <view class="imgbox_item" bindtap="onSave">
-        <!-- <t-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/wx.png" mode="heightFix" width="90rpx" height="90rpx" aria-label="qrcode" /> -->
         <t-icon color="#fff" name="download" size="24" data-name="download" class="t_icon" />
         <text class="imgbox_item_txt">
           保存到相册，分享到朋友圈
diff --git a/Pages/yishi/onlinechufang/index.js b/Pages/yishi/onlinechufang/index.js
index c21a016..5f52d24 100644
--- a/Pages/yishi/onlinechufang/index.js
+++ b/Pages/yishi/onlinechufang/index.js
@@ -39,7 +39,8 @@ Page({
     sub_disabled: false,
     from: "",
     now_filed_focus: 'save_durg_prescription_product_num',
-    page_meta_show: true
+    page_meta_show: true,
+    static_host: api.getStaticHost()
   },
   changeFocus(e){
     let next_filed_focus = e.currentTarget.dataset.next_filed_focus;
diff --git a/Pages/yishi/onlinechufang/index.wxml b/Pages/yishi/onlinechufang/index.wxml
index 1d809fe..658ad10 100644
--- a/Pages/yishi/onlinechufang/index.wxml
+++ b/Pages/yishi/onlinechufang/index.wxml
@@ -104,7 +104,7 @@
             width="300rpx"
             height="300rpx"
             fit="contain"
-            src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/search_drugs.png"
+            src="{{static_host}}/applet/doctor/static/images/yishi/search_drugs.png"
           />
         </view>
         <view class="search_drug_list_noempty" wx:if="{{ !search_drug_list_empty }}">
diff --git a/Pages/yishi/service_notice/index.js b/Pages/yishi/service_notice/index.js
index 28da157..71696a1 100644
--- a/Pages/yishi/service_notice/index.js
+++ b/Pages/yishi/service_notice/index.js
@@ -18,7 +18,8 @@ Page({
     confirmBtn: {
       "openType": "contact",
       "content": "确认",
-    }
+    },
+    static_host: api.getStaticHost()
   },
   onShow(){
     this.getList();
diff --git a/Pages/yishi/service_notice/index.wxml b/Pages/yishi/service_notice/index.wxml
index 75dcfe1..45519cd 100644
--- a/Pages/yishi/service_notice/index.wxml
+++ b/Pages/yishi/service_notice/index.wxml
@@ -5,33 +5,33 @@
       <view class="item_top">
         <view class="item_img" wx:if="{{item.link_params.inquiry_type == 1}}">
           <text style="margin-left: 10rpx;">在线问诊</text> 
-          <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/online.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
+          <van-image class="van_img" src="{{static_host}}/applet/doctor/static/images/yishi/service_notice/online.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
         <view class="item_img" wx:if="{{item.link_params.inquiry_type == 2}}">
           <text style="margin-left: 10rpx;">快速问诊</text> 
-          <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
+          <van-image class="van_img" src="{{static_host}}/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
         <view class="item_img" wx:if="{{item.link_params.inquiry_type == 3}}">
           <text style="margin-left: 10rpx;">公益问诊</text> 
-          <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/yizhen.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
+          <van-image class="van_img" src="{{static_host}}/applet/doctor/static/images/yishi/service_notice/yizhen.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
         <view class="item_img" wx:if="{{item.link_params.inquiry_type == 4}}">
           <text style="margin-left: 10rpx;">问诊购药</text> 
-          <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/drug.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
+          <van-image class="van_img" src="{{static_host}}/applet/doctor/static/images/yishi/service_notice/drug.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
         <view class="item_date">{{item.notice_send_time}}</view>
       </view>
       <view class="item_content">
       {{item.notice_brief_title}}
       <view class="hongdian" wx:if="{{item.read_status == 0}}">
-        <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/honhdian.png" fit="heightFix" height="20rpx" aria-label="qrcode" />
+        <van-image src="{{static_host}}/applet/doctor/static/images/yishi/honhdian.png" fit="heightFix" height="20rpx" aria-label="qrcode" />
       </view>
       </view>
     </view>
   </view>
   <van-empty description="暂无数据" wx:if="{{list.length == 0}}" />
   <van-divider contentPosition="center" wx:if="{{list.length > 0 && current_page == last_page}}">到底了~</van-divider>
-  <van-image bind:click="putMessageReadNoticeAll" style="position: fixed; right: 0;bottom: 262rpx;" src="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/yishi/service_notice/readall.png" fit="heightFix" height="84rpx" aria-label="role" />
+  <van-image bind:click="putMessageReadNoticeAll" style="position: fixed; right: 0;bottom: 262rpx;" src="{{static_host}}/applet/doctor/static/images/yishi/service_notice/readall.png" fit="heightFix" height="84rpx" aria-label="role" />
   <view style="height: 50rpx;"></view>
 
   <t-dialog
diff --git a/Pages/yishi/system_notice/index.js b/Pages/yishi/system_notice/index.js
index d273427..6db00a2 100644
--- a/Pages/yishi/system_notice/index.js
+++ b/Pages/yishi/system_notice/index.js
@@ -14,6 +14,7 @@ Page({
     total: 0,
     per_page: 0,
     last_page: 0,
+    static_host: api.getStaticHost()
   },
   go(e){
     this.putMessageReadNotice(e);
diff --git a/Pages/yishi/system_notice/index.wxml b/Pages/yishi/system_notice/index.wxml
index a954b2d..1e8e45b 100644
--- a/Pages/yishi/system_notice/index.wxml
+++ b/Pages/yishi/system_notice/index.wxml
@@ -4,18 +4,18 @@
     <view class="item" bindtap="go" data-notice_id="{{item.notice_id}}" data-url="/Pages/yishi/notice_deatil/index?notice_id={{item.notice_id}}" wx:for="{{list}}">
       <view class="item_top">
         <view class="item_img">
-          <van-image class="van_img" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
+          <van-image class="van_img" src="{{static_host}}/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
         <view class="item_content">{{item.notice_brief_title}}</view>
       </view>
       <view class="hongdian" wx:if="{{item.read_status == 0}}">
-        <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/honhdian.png" fit="heightFix" height="20rpx" aria-label="qrcode" />
+        <van-image src="{{static_host}}/applet/doctor/static/images/yishi/honhdian.png" fit="heightFix" height="20rpx" aria-label="qrcode" />
       </view>
     </view>
   </view>
   <van-empty description="暂无数据" wx:if="{{list.length == 0}}" />
   <van-divider contentPosition="center" wx:if="{{list.length > 0 && current_page == last_page}}">到底了~</van-divider>
-  <van-image bind:click="putMessageReadNoticeAll" style="position: fixed; right: 0;bottom: 262rpx;" src="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/yishi/service_notice/readall.png" fit="heightFix" height="84rpx" aria-label="role" />
+  <van-image bind:click="putMessageReadNoticeAll" style="position: fixed; right: 0;bottom: 262rpx;" src="{{static_host}}/applet/doctor/static/images/yishi/service_notice/readall.png" fit="heightFix" height="84rpx" aria-label="role" />
   <view style="height: 50rpx;">
     
   </view>
diff --git a/Pages/yishi/wenzhen/wenzhen.js b/Pages/yishi/wenzhen/wenzhen.js
index f53123c..f3fe8b9 100644
--- a/Pages/yishi/wenzhen/wenzhen.js
+++ b/Pages/yishi/wenzhen/wenzhen.js
@@ -17,6 +17,7 @@ Page({
     data_list_4: [],
     data_list_5: [],
     message_inquiry_type: 2,
+    static_host: api.getStaticHost()
   },
   onLoad() {
     console.log("wenzhen onload");
diff --git a/Pages/yishi/wenzhen/wenzhen.wxml b/Pages/yishi/wenzhen/wenzhen.wxml
index dfaa341..b9be12b 100644
--- a/Pages/yishi/wenzhen/wenzhen.wxml
+++ b/Pages/yishi/wenzhen/wenzhen.wxml
@@ -4,20 +4,20 @@
   <view class="top">
       <view class="top_left" bindtap="go" data-url="/Pages/yishi/service_notice/index">
         <t-badge dot offset="{{ [1, 1] }}" class="wrapper">
-          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice.png" fit="heightFix" height="108rpx" aria-label="notice" />
+          <van-image src="{{static_host}}/applet/doctor/static/images/yishi/service_notice.png" fit="heightFix" height="108rpx" aria-label="notice" />
         </t-badge>
         服务通知
       </view>
       <view class="top_right" bindtap="go" data-url="/Pages/yishi/system_notice/index">
         <t-badge count="8" offset="{{ [1, 1] }}" class="wrapper">
-          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/system_notice.png" fit="heightFix" height="108rpx" aria-label="notice" />
+          <van-image src="{{static_host}}/applet/doctor/static/images/yishi/system_notice.png" fit="heightFix" height="108rpx" aria-label="notice" />
         </t-badge>
         系统公告
       </view>
   </view>
 
   <view class="empty" wx:if="{{ !has_data }}" >
-    <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/wnzhen_empty.png" fit="heightFix" height="108rpx" aria-label="empty" />
+    <van-image src="{{static_host}}/applet/doctor/static/images/yishi/wnzhen_empty.png" fit="heightFix" height="108rpx" aria-label="empty" />
     <view class="empty_note">您还未设置在线问诊价格</view>
   </view>
   <van-button color="#3CC7C0" custom-style="width: 92vw;margin: 0 auto;border-radius: 10rpx;" block wx:if="{{ !has_data }}">开通图文问诊</van-button>
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index b3cb159..f292d24 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -10,6 +10,7 @@ Page({
       title: '问诊消息', //导航栏 中间的标题
     },
     height: app.globalData.height, 
+    static_host: api.getStaticHost(),
     has_data: false,
     data_list_1: [],
     data_list_2: [],
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml
index 932823c..a7a0df2 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxml
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml
@@ -6,17 +6,17 @@
   <view class="top">
       <view class="top_left" bindtap="go" data-name="service_notice_unreadnnum" data-url="/Pages/yishi/service_notice/index">
         <t-badge dot="{{service_notice_unreadnnum > 0}}" offset="{{ [1, 1] }}" class="wrapper">
-          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice.png" fit="heightFix" height="108rpx" aria-label="notice" />
+          <van-image src="{{static_host}}/applet/doctor/static/images/yishi/service_notice.png" fit="heightFix" height="108rpx" aria-label="notice" />
         </t-badge>
         服务通知
       </view>
       <view class="top_right" bindtap="go" data-name="system_notice_unreadnnum" data-url="/Pages/yishi/system_notice/index">
         <t-badge offset="{{ [1, 1] }}" class="wrapper" wx:if="{{system_notice_unreadnnum == ''}}">
-          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/system_notice.png" fit="heightFix" height="108rpx" aria-label="notice" />
+          <van-image src="{{static_host}}/applet/doctor/static/images/yishi/system_notice.png" fit="heightFix" height="108rpx" aria-label="notice" />
         </t-badge>
 
         <t-badge count="{{system_notice_unreadnnum}}" offset="{{ [1, 1] }}" class="wrapper" wx:else>
-          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/system_notice.png" fit="heightFix" height="108rpx" aria-label="notice" />
+          <van-image src="{{static_host}}/applet/doctor/static/images/yishi/system_notice.png" fit="heightFix" height="108rpx" aria-label="notice" />
         </t-badge>
         系统公告
       </view>
@@ -24,7 +24,7 @@
 
   <view class="empty" wx:if="{{ has_data==false }}" >
     <view wx:if="{{!data_list_5_loading}}" class="empty_box">
-      <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/wnzhen_empty.png" fit="heightFix" height="108rpx" aria-label="empty" />
+      <van-image src="{{static_host}}/applet/doctor/static/images/yishi/wnzhen_empty.png" fit="heightFix" height="108rpx" aria-label="empty" />
       <view class="empty_note">未收到任何消息</view>
     </view>
     <van-loading size="24px" wx:if="{{data_list_5_loading}}">加载中...</van-loading>
diff --git a/Pages/yishi/wenzhen_v3/wenzhen.js b/Pages/yishi/wenzhen_v3/wenzhen.js
index f66f287..e87db45 100644
--- a/Pages/yishi/wenzhen_v3/wenzhen.js
+++ b/Pages/yishi/wenzhen_v3/wenzhen.js
@@ -17,6 +17,7 @@ Page({
     data_list_4: [],
     data_list_5: [],
     data_list_5_loading: false,
+    static_host: api.getStaticHost(),
     conversationList: [],
     message_inquiry_type: 99999,
     now_message_inquiry_type: 5,
diff --git a/Pages/yishi/wenzhen_v3/wenzhen.wxml b/Pages/yishi/wenzhen_v3/wenzhen.wxml
index 1a15d4e..4cfe4d1 100644
--- a/Pages/yishi/wenzhen_v3/wenzhen.wxml
+++ b/Pages/yishi/wenzhen_v3/wenzhen.wxml
@@ -6,17 +6,17 @@
   <view class="top">
       <view class="top_left" bindtap="go" data-name="service_notice_unreadnnum" data-url="/Pages/yishi/service_notice/index">
         <t-badge dot="{{service_notice_unreadnnum > 0}}" offset="{{ [1, 1] }}" class="wrapper">
-          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/service_notice.png" fit="heightFix" height="108rpx" aria-label="notice" />
+          <van-image src="{{static_host}}/applet/doctor/static/images/yishi/service_notice.png" fit="heightFix" height="108rpx" aria-label="notice" />
         </t-badge>
         服务通知
       </view>
       <view class="top_right" bindtap="go" data-name="system_notice_unreadnnum" data-url="/Pages/yishi/system_notice/index">
         <t-badge offset="{{ [1, 1] }}" class="wrapper" wx:if="{{system_notice_unreadnnum == ''}}">
-          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/system_notice.png" fit="heightFix" height="108rpx" aria-label="notice" />
+          <van-image src="{{static_host}}/applet/doctor/static/images/yishi/system_notice.png" fit="heightFix" height="108rpx" aria-label="notice" />
         </t-badge>
 
         <t-badge count="{{system_notice_unreadnnum}}" offset="{{ [1, 1] }}" class="wrapper" wx:else>
-          <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/system_notice.png" fit="heightFix" height="108rpx" aria-label="notice" />
+          <van-image src="{{static_host}}/applet/doctor/static/images/yishi/system_notice.png" fit="heightFix" height="108rpx" aria-label="notice" />
         </t-badge>
         系统公告
       </view>
@@ -24,7 +24,7 @@
 
   <view class="empty" wx:if="{{ has_data==false }}" >
     <view wx:if="{{!data_list_5_loading}}">
-      <van-image src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/wnzhen_empty.png" fit="heightFix" height="108rpx" aria-label="empty" />
+      <van-image src="{{static_host}}/applet/doctor/static/images/yishi/wnzhen_empty.png" fit="heightFix" height="108rpx" aria-label="empty" />
       <view class="empty_note">未收到任何消息</view>
     </view>
     <van-loading size="24px" wx:if="{{data_list_5_loading}}">加载中...</van-loading>
diff --git a/Pages/yishi/zhiye_identity/index.js b/Pages/yishi/zhiye_identity/index.js
index 49b2a2d..d237f62 100644
--- a/Pages/yishi/zhiye_identity/index.js
+++ b/Pages/yishi/zhiye_identity/index.js
@@ -18,6 +18,7 @@ Page({
     btn_disabled: true,
     sfz_show: false,
     sub_visible: false,
+    static_host: api.getStaticHost()
   },
 
   onLoad(){
diff --git a/Pages/yishi/zhiye_identity/index.wxml b/Pages/yishi/zhiye_identity/index.wxml
index a062790..a1fa8ad 100644
--- a/Pages/yishi/zhiye_identity/index.wxml
+++ b/Pages/yishi/zhiye_identity/index.wxml
@@ -14,6 +14,7 @@
     data-file_multiple="true"
     bindUploadFile="doUploadFile"
     bindDeleteFile="doDeleteFile"
+    static_host="{{static_host}}"
     />
 
   <m-upload-cell
@@ -30,6 +31,7 @@
     data-file_multiple="true"
     bindUploadFile="doUploadFile"
     bindDeleteFile="doDeleteFile"
+    static_host="{{static_host}}"
     />
   
   <van-cell-group border="{{ false }}">
@@ -50,7 +52,7 @@
         <van-button custom-style="height:130rpx;margin-top:20rpx;border-radius: 20rpx;border: 1px dashed #999;width:100%;font-size:30rpx;background-color: #fff;color: #3CC7C0;" icon="edit">点击签名</van-button>
       </view>
       <view style="margin-top:20rpx;border-radius: 20rpx;border: 1px dashed #999;" class="sign_img" wx:if="{{sign_image.length > 0}}">
-        <image mode="heightFix" style="transform: rotate(-0deg);width: 100%;" src="{{sign_image[0].url}}"></image>
+        <image bindtap="{{btn_disabled?'':'go'}}" data-url="/Pages/yishi/signcanvas/index" mode="heightFix" style="transform: rotate(-0deg);width: 100%;" src="{{sign_image[0].url}}"></image>
       </view>
     </view>
 
@@ -69,6 +71,7 @@
       data-file_multiple="true"
       bindUploadFile="doUploadFile"
       bindDeleteFile="doDeleteFile"
+      static_host="{{static_host}}"
       />
     <view class="sign_box">
       <view class="sign_note">提示：平台会在1~3个工作日内审核您提交的资料，审核结果会第一时间通知您。</view>
@@ -89,10 +92,10 @@
   <view class="zhiye_popup">
     <view class="zhiye_popup_title">身份证示例</view>
     <view class="zhiye_popup_img">
-      <van-image lazy-load slot="loading" type="spinner" fit="widthFix" width="420rpx" src="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/yishi/cert/sfz1.png" />
+      <van-image lazy-load slot="loading" type="spinner" fit="widthFix" width="420rpx" src="{{static_host}}/applet/doctor/static/images/yishi/cert/sfz1.png" />
     </view>
     <view class="zhiye_popup_img">
-      <van-image lazy-load slot="loading" type="spinner" fit="widthFix" width="420rpx" src="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/yishi/cert/sfz2.png" />
+      <van-image lazy-load slot="loading" type="spinner" fit="widthFix" width="420rpx" src="{{static_host}}/applet/doctor/static/images/yishi/cert/sfz2.png" />
     </view>
   </view>
   </van-popup>
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js
index c6e7118..9ecf644 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.js
@@ -99,7 +99,8 @@ Component({
     sub_visible: false,
     dialog_message: "在线开处方需先进行多点执业认证",
     message_rounds: 0,
-    networkstatus: "wifi"
+    networkstatus: "wifi",
+    static_host: api.getStaticHost()
   },
 
   lifetimes: {
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxml b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
index 784a9a5..f905fa3 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
@@ -29,7 +29,7 @@
               <image class="TUI-icon" bindtap="handleEmoji" src="../../../../static/assets/face-emoji.svg" />
           </view>
           <view wx:if="{{!sendMessageBtn}}" bindtap="handleExtensions" class="TUI-sendMessage-btn">
-              <image  class="TUI-icon" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/chat/tianjia.png" />
+              <image  class="TUI-icon" src="{{static_host}}/applet/doctor/static/images/chat/tianjia.png" />
           </view>
           <view wx:else class="TUI-sendMessage-btn TUI-sendMessage-btn-input" bindtap="sendTextMessage">
               发送
@@ -41,15 +41,15 @@
     </view>
     <view wx:if="{{displayFlag === 'extension'}}" class="TUI-Extensions">
         <view class="TUI-Extension-slot MY-TUI-Extension-slot" bindtap="handleSendPicture">
-            <image mode="widthFix" class="TUI-Extension-icon MY-TUI-Extension-icon" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/chat/xiangji.png" />
+            <image mode="widthFix" class="TUI-Extension-icon MY-TUI-Extension-icon" src="{{static_host}}/applet/doctor/static/images/chat/xiangji.png" />
             <view class="TUI-Extension-slot-name MY-TUI-Extension-slot-name">相机</view>
         </view>
         <view class="TUI-Extension-slot MY-TUI-Extension-slot" bindtap="handleSendImage">
-            <image mode="widthFix" class="TUI-Extension-icon MY-TUI-Extension-icon" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/chat/picture.png" />
+            <image mode="widthFix" class="TUI-Extension-icon MY-TUI-Extension-icon" src="{{static_host}}/applet/doctor/static/images/chat/picture.png" />
             <view class="TUI-Extension-slot-name MY-TUI-Extension-slot-name">照片</view>
         </view>
         <view class="TUI-Extension-slot MY-TUI-Extension-slot" bindtap="showChangYongYu">
-            <image mode="widthFix" class="TUI-Extension-icon MY-TUI-Extension-icon" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/chat/wenzi.png" />
+            <image mode="widthFix" class="TUI-Extension-icon MY-TUI-Extension-icon" src="{{static_host}}/applet/doctor/static/images/chat/wenzi.png" />
             <view class="TUI-Extension-slot-name MY-TUI-Extension-slot-name">常用语</view>
         </view>
         <!-- <view class="TUI-Extension-slot" bindtap="handleSendPicture">
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index 76fab5a..a37c222 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -1,12 +1,12 @@
 import dayjs from '../../../../utils/dayjs';
 import logger from '../../../../utils/logger';
 import constant from '../../../../utils/constant';
-import { getTimeAgoChat } from './../../../../../utils/util'
 import { wechatTimeFormat } from './../../../../../utils/wechatTime'
-
+import { API } from '../../../../../utils/network/api';
 const { GDXZ_CUSTOM_MSEEAGE } = constant;
 // eslint-disable-next-line no-undef
 const app = getApp();
+const api = new API()
 Component({
   /**
    * 组件的属性列表
@@ -92,7 +92,8 @@ Component({
     autoToButtom: true,
     cachTime: "",
     list_first_loading: false,
-    message_rounds: 0
+    message_rounds: 0,
+    static_host: api.getStaticHost()
   },
 
   lifetimes: {
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxml b/TUIKit/components/TUIChat/components/MessageList/index.wxml
index c1d21df..8881299 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageList/index.wxml
@@ -39,7 +39,7 @@
             </view>
             <TipMessage  wx:if="{{item.type === 'TIMGroupTipElem'}}" message="{{item}}"/>
             <view  wx:if="{{item.type !== 'TIMGroupTipElem'}}"   class="{{item.flow === 'out' ? 't-self-message':'t-recieve-message'}}" >
-                <image class="t-message-avatar" wx:if="{{item.flow === 'in' && !item.no_avatar }}" src="{{item.avatar || 'https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/default_photo.png'}}" data-value="{{item}}" bindtap="getMemberProfile" />
+                <image class="t-message-avatar" wx:if="{{item.flow === 'in' && !item.no_avatar }}" src="{{item.avatar || static_host+'/applet/doctor/static/images/default_photo.png'}}" data-value="{{item}}" bindtap="getMemberProfile" />
                 <!-- <view class="read-receipts" wx:if="{{conversation.type === 'C2C' && item.flow==='out' }}">
                     <view wx:if="{{item.isPeerRead}}" >已读</view>
                     <view wx:else>未读</view>
@@ -63,7 +63,7 @@
                     <MergerMessage wx:if="{{item.type === 'TIMRelayElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}"/>
                 </view>
                 
-                <image class="t-message-avatar" wx:if="{{item.flow === 'out' && !item.no_avatar }}"  src="{{item.avatar || 'https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/default_photo.png'}}"  data-value="{{item}}" bindtap="getMemberProfile"/>
+                <image class="t-message-avatar" wx:if="{{item.flow === 'out' && !item.no_avatar }}"  src="{{item.avatar || static_host+'/applet/doctor/static/images/default_photo.png'}}"  data-value="{{item}}" bindtap="getMemberProfile"/>
             </view>
         </view>
     </view>
diff --git a/commpents/myprofile/index.js b/commpents/myprofile/index.js
index 330531f..4d788f7 100644
--- a/commpents/myprofile/index.js
+++ b/commpents/myprofile/index.js
@@ -27,7 +27,8 @@ Component({
     },
     realname:"",
     idcard:"",
-    avatar: "https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/default_photo.png",
+    static_host: api.getStaticHost(),
+    avatar: api.getStaticHost()+"/applet/doctor/static/images/default_photo.png",
     is_avatar: false,
     city_show: false,
     keshi_show: false,
diff --git a/commpents/myprofile/index.wxml b/commpents/myprofile/index.wxml
index 643fbfc..a329081 100644
--- a/commpents/myprofile/index.wxml
+++ b/commpents/myprofile/index.wxml
@@ -123,10 +123,10 @@
         <view class="zhiye_popup">
           <view class="zhiye_popup_title">医师执业证示例</view>
           <view class="zhiye_popup_img">
-            <van-image lazy-load slot="loading" type="spinner" fit="widthFix" width="420rpx" src="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/yishi/cert/zhiye1.png" />
+            <van-image lazy-load slot="loading" type="spinner" fit="widthFix" width="420rpx" src="{{static_host}}/applet/doctor/static/images/yishi/cert/zhiye1.png" />
           </view>
           <view class="zhiye_popup_img">
-            <van-image lazy-load slot="loading" type="spinner" fit="widthFix" width="420rpx" src="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/yishi/cert/zhiye2.png" />
+            <van-image lazy-load slot="loading" type="spinner" fit="widthFix" width="420rpx" src="{{static_host}}/applet/doctor/static/images/yishi/cert/zhiye2.png" />
           </view>
         </view>
         </van-popup>
@@ -142,10 +142,10 @@
         <view class="zhiye_popup">
           <view class="zhiye_popup_title">医师资格证示例</view>
           <view class="zhiye_popup_img">
-            <van-image lazy-load slot="loading" type="spinner" fit="widthFix" width="420rpx" src="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/yishi/cert/zige1.png" />
+            <van-image lazy-load slot="loading" type="spinner" fit="widthFix" width="420rpx" src="{{static_host}}/applet/doctor/static/images/yishi/cert/zige1.png" />
           </view>
           <view class="zhiye_popup_img">
-            <van-image lazy-load slot="loading" type="spinner" fit="widthFix" width="420rpx" src="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/yishi/cert/zige2.png" />
+            <van-image lazy-load slot="loading" type="spinner" fit="widthFix" width="420rpx" src="{{static_host}}/applet/doctor/static/images/yishi/cert/zige2.png" />
           </view>
         </view>
         </van-popup>
@@ -161,7 +161,7 @@
         <view class="zhiye_popup">
           <view class="zhiye_popup_title">职称证示例</view>
           <view class="zhiye_popup_img">
-            <van-image lazy-load slot="loading" type="spinner" fit="widthFix" width="420rpx" src="https://img.applets.igandanyiyuan.com/applet/doctor/static/images/yishi/cert/zhicheng.png" />
+            <van-image lazy-load slot="loading" type="spinner" fit="widthFix" width="420rpx" src="{{static_host}}/applet/doctor/static/images/yishi/cert/zhicheng.png" />
           </view>
         </view>
         </van-popup>
@@ -310,6 +310,7 @@
         wx:if="{{indentity}}"
         disabled="{{(indentity && iden_auth_disabled)}}"
         is_multiple="true"
+        static_host="{{static_host}}"
         />
 
         <m-upload-cell
@@ -331,6 +332,7 @@
         wx:if="{{indentity}}"
         disabled="{{(indentity && iden_auth_disabled)}}"
         is_multiple="true"
+        static_host="{{static_host}}"
          />
 
         <m-upload-cell
@@ -352,6 +354,7 @@
         wx:if="{{indentity}}"
         disabled="{{(indentity && iden_auth_disabled)}}"
         is_multiple="true"
+        static_host="{{static_host}}"
          />
         
         <view class="sub_button" wx:if="{{indentity}}">
diff --git a/commpents/upload-cell/index.js b/commpents/upload-cell/index.js
index d676116..7edcc27 100644
--- a/commpents/upload-cell/index.js
+++ b/commpents/upload-cell/index.js
@@ -20,6 +20,10 @@ Component({
       type: String,
       value: '示例备注',
     },
+    static_host: {
+      type: String,
+      value: 'static_host',
+    },
     upload_cell_note_show:{
       type: Boolean,
       value: true,
diff --git a/commpents/upload-cell/index.wxml b/commpents/upload-cell/index.wxml
index 4bfcda3..06fcdd2 100644
--- a/commpents/upload-cell/index.wxml
+++ b/commpents/upload-cell/index.wxml
@@ -11,7 +11,7 @@
   </view>
   <view class="upload-cell-input">
     <van-uploader disabled="{{disabled}}" multiple="{{is_multiple}}" preview-full-image="{{true}}" file-list="{{ fileList }}" max-count="{{max_count}}" deletable="{{ deletable }}" bind:after-read="afterRead" bind:delete="delete" >
-      <van-image width="100" height="100" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/upload_button.png" />
+      <van-image width="100" height="100" src="{{static_host}}/applet/doctor/static/images/yishi/upload_button.png" />
     </van-uploader>
   </view>
   <view class="error_box" wx:if="{{ has_error_content != '' }}" >
diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js
index 83ab980..da3d5ba 100644
--- a/custom-tab-bar/index.js
+++ b/custom-tab-bar/index.js
@@ -52,28 +52,37 @@ Component({
     items: [ ],
     dialog_visible: false,
     dialog_content: "",
-    usertype: "",
+    usertype: 2,
     index_info: "",
     wenzhen_info: "",
     my_info: "",
     next_url: "/Pages/yishi/identity/index",
     info_inter: 0
   },
-  ready() {
-    const usertype = wx.getStorageSync('usertype')
-    if (usertype == 3) {
+
+  lifetimes: {
+    attached(){
       this.setData({
-        usertype: usertype,
-        items: this.data.listAll.list1
-      })
-    }else{
-      this.setData({
-        usertype: usertype,
+        usertype: 2,
         items: this.data.listAll.list2
       })
-    }
-    
+    },
+    ready() {
+      const usertype = wx.getStorageSync('usertype')
+      if (usertype == 3) {
+        this.setData({
+          usertype: 3,
+          items: this.data.listAll.list1
+        })
+      }else{
+        this.setData({
+          usertype: 2,
+          items: this.data.listAll.list2
+        })
+      }
+    },
   },
+ 
   methods: {
     startInterval(){
       let _this = this;
diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml
index 1bca8fc..912d2da 100644
--- a/custom-tab-bar/index.wxml
+++ b/custom-tab-bar/index.wxml
@@ -1,6 +1,6 @@
 
-<van-tabbar active="{{ active }}" bind:change="onChange" 
-active-color="#3CC7C0" inactive-color="#999999" wx:if="{{usertype == 2}}" >
+<van-tabbar active="{{ active }}" bind:change="onChange" z-index="9999"
+active-color="#3CC7C0" inactive-color="#999999" wx:if="{{usertype != 3}}" >
 
   <van-tabbar-item info="{{index_info}}" data-url="{{listAll.list2[0].pagePath}}" url="{{listAll.list2[0].pagePath}}">
     <image
@@ -57,7 +57,7 @@ active-color="#3CC7C0" inactive-color="#999999" wx:if="{{usertype == 2}}" >
   </van-tabbar-item>
 </van-tabbar>
 
-<van-tabbar active="{{ active }}" bind:change="onChange" 
+<van-tabbar active="{{ active }}" bind:change="onChange" z-index="9999"
 active-color="#74A2FA" inactive-color="#999999" wx:if="{{usertype == 3}}" >
 <van-tabbar-item info="{{my_info}}" data-url="{{listAll.list1[0].pagePath}}" url="{{listAll.list1[0].pagePath}}">
     <image
diff --git a/project.private.config.json b/project.private.config.json
index ab82809..b0d5439 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -18,5 +18,5 @@
       ]
     }
   },
-  "libVersion": "2.31.0"
+  "libVersion": "2.31.1"
 }
\ No newline at end of file

From c3ef53d33617672d265ccd3b9d59e89c805e3be8 Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Thu, 11 May 2023 11:13:50 +0800
Subject: [PATCH 29/83] =?UTF-8?q?=E5=A4=B4=E5=83=8F=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E8=A3=81=E5=89=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/case/index.js                     |   21 +-
 Pages/yishi/case/index.wxml                   |    9 +-
 Pages/yishi/kuaisusetup/index.js              |    3 +
 Pages/yishi/onlinesetup/index.js              |    3 +
 Pages/yishi/onlinesetupprice/index.js         |    3 +
 Pages/yishi/practicing/index.js               |   24 +-
 Pages/yishi/practicing/index.json             |    3 +-
 Pages/yishi/practicing/index.wxml             |   21 +-
 Pages/yishi/yizhensetup/index.js              |    7 +-
 Pages/yishi/yizhensetupprice/index.js         |    6 +
 .../TUIChat/components/MessageList/index.js   |   19 +-
 commpents/image-cropper/image-cropper.js      | 1142 +++++++++++++++++
 commpents/image-cropper/image-cropper.json    |    3 +
 commpents/image-cropper/image-cropper.wxml    |   32 +
 commpents/image-cropper/image-cropper.wxss    |  144 +++
 commpents/myprofile/index.js                  |   42 +-
 commpents/myprofile/index.json                |    3 +-
 commpents/myprofile/index.wxml                |    4 +-
 18 files changed, 1429 insertions(+), 60 deletions(-)
 create mode 100644 commpents/image-cropper/image-cropper.js
 create mode 100644 commpents/image-cropper/image-cropper.json
 create mode 100644 commpents/image-cropper/image-cropper.wxml
 create mode 100644 commpents/image-cropper/image-cropper.wxss

diff --git a/Pages/yishi/case/index.js b/Pages/yishi/case/index.js
index da1e13b..6ba2470 100644
--- a/Pages/yishi/case/index.js
+++ b/Pages/yishi/case/index.js
@@ -13,18 +13,11 @@ Page({
     imglist: []
   },
   onLoad(options){
+    console.log("onLoad", options)
     this.setData({
       order_inquiry_id: options.order_inquiry_id
     })
-    //获取患者问诊病例
-    api.getDoctorInquiryCase({order_inquiry_id: this.data.order_inquiry_id}).then(response => {
-      console.log(response);
-      this.setData({
-        case_detail: response.data
-      })
-    }).then(res => {
-      this.formatImgList();
-    }).catch(errors => {console.error(errors);})
+
   },
   formatImgList(){
     let diagnose_images = this.data.case_detail.diagnose_images;
@@ -40,7 +33,15 @@ Page({
     })
   },
   onShow(){
-
+    //获取患者问诊病例
+    api.getDoctorInquiryCase({order_inquiry_id: this.data.order_inquiry_id}).then(response => {
+      console.log(response);
+      this.setData({
+        case_detail: response.data
+      })
+    }).then(res => {
+      this.formatImgList();
+    }).catch(errors => {console.error(errors);})
   },
 
 })
\ No newline at end of file
diff --git a/Pages/yishi/case/index.wxml b/Pages/yishi/case/index.wxml
index 32c5296..b6baa97 100644
--- a/Pages/yishi/case/index.wxml
+++ b/Pages/yishi/case/index.wxml
@@ -8,7 +8,7 @@
       <view class="sex">{{case_detail.sex==1?'男':case_detail.sex==2?'女':'未知'}}｜{{case_detail.age}}岁 </view>
     </view>
     <view class="info">
-      <view class="height info_item"><text class="info_title">身高：</text><text class="info_val">{{case_detail.height==null?'未知':case_detail.height}}cm</text></view>
+      <view class="height info_item"><text class="info_title">身高：</text><text class="info_val">{{case_detail.height==null?'未知':case_detail.height}}CM</text></view>
       <view class="weight info_item"><text class="info_title">体重：</text><text class="info_val">{{case_detail.weight==null?'未知':case_detail.weight}}KG</text></view>
       <view class="minzu info_item"><text class="info_title">民族：</text><text class="info_val">{{case_detail.nation_name==''?'未知':case_detail.nation_name}}</text></view>
       <view class="zhiye info_item"><text class="info_title">职业：</text><text class="info_val">{{case_detail.job_name==''?'未知':case_detail.job_name}}</text></view>
@@ -58,8 +58,9 @@
 
     </view>
   </view>
-  <view class="main_title" wx:if="{{case_detail.is_allergy_history != null && case_detail.is_family_history != null && case_detail.is_pregnant != null && case_detail.drink_wine_status != null && case_detail.smoke_status != null && case_detail.is_operation != null && case_detail.chemical_compound_status != null  && case_detail.chemical_compound_status != null}}">其他信息</view>
-  <view class="data_box orther" wx:if="{{case_detail.is_allergy_history != null && case_detail.is_family_history != null && case_detail.is_pregnant != null && case_detail.drink_wine_status != null && case_detail.smoke_status != null && case_detail.is_operation != null && case_detail.chemical_compound_status != null  && case_detail.chemical_compound_status != null}}">
+
+  <view class="main_title" wx:if="{{!(case_detail.is_allergy_history == null && case_detail.is_family_history == null && case_detail.is_pregnant == null && case_detail.drink_wine_status == null && case_detail.smoke_status == null && case_detail.is_operation == null && case_detail.chemical_compound_status == null  && case_detail.chemical_compound_status == null)}}">其他信息</view>
+  <view class="data_box orther" wx:if="{{!(case_detail.is_allergy_history == null && case_detail.is_family_history == null && case_detail.is_pregnant == null && case_detail.drink_wine_status == null && case_detail.smoke_status == null && case_detail.is_operation == null && case_detail.chemical_compound_status == null  && case_detail.chemical_compound_status == null)}}">
     <view class="disease_box">
       <view class="disease_box_item" wx:if="{{case_detail.is_allergy_history != null}}">
         <view class="title">过敏史：</view>
@@ -89,7 +90,7 @@
         <view class="title">接触化学物：</view>
         <view class="conent">{{case_detail.chemical_compound_status==1?'从不':case_detail.chemical_compound_status==2?'偶尔':case_detail.chemical_compound_status==3?'经常':case_detail.chemical_compound_status==4?'每天':'其他'}}</view>
       </view>
-      <view class="disease_info" wx:if="{{case_detail.chemical_compound_describe != null}}">
+      <view class="disease_info" wx:if="{{case_detail.chemical_compound_describe != '' && case_detail.chemical_compound_describe != null}}">
         详细描述:{{case_detail.chemical_compound_describe}}
       </view>
     </view>
diff --git a/Pages/yishi/kuaisusetup/index.js b/Pages/yishi/kuaisusetup/index.js
index 787faa7..9a99ec9 100644
--- a/Pages/yishi/kuaisusetup/index.js
+++ b/Pages/yishi/kuaisusetup/index.js
@@ -66,6 +66,9 @@ Page({
     console.log("onChange: ", detail);
     if(detail){
       this.setData({ note: this.data.open_note });
+      wx.vibrateShort({
+        "type": "heavy"
+      })
     }else{
       this.setData({ note: this.data.close_note });
     }
diff --git a/Pages/yishi/onlinesetup/index.js b/Pages/yishi/onlinesetup/index.js
index d8a1200..e499860 100644
--- a/Pages/yishi/onlinesetup/index.js
+++ b/Pages/yishi/onlinesetup/index.js
@@ -61,6 +61,9 @@ Page({
       let check = this.checkPrice(inquiry_price);
       if(!check) return;
       this.setData({ note: this.data.open_note });
+      wx.vibrateShort({
+        "type": "heavy"
+      })
     }else{
       this.setData({ note: this.data.close_note });
     }
diff --git a/Pages/yishi/onlinesetupprice/index.js b/Pages/yishi/onlinesetupprice/index.js
index 8ac15d0..5918caa 100644
--- a/Pages/yishi/onlinesetupprice/index.js
+++ b/Pages/yishi/onlinesetupprice/index.js
@@ -47,6 +47,9 @@ Page({
   },
   onStepperChange(event) {
     console.log(event.detail);
+    wx.vibrateShort({
+      "type": "heavy"
+    })
     this.setData({ 
       "info.work_num_day": event.detail 
     });
diff --git a/Pages/yishi/practicing/index.js b/Pages/yishi/practicing/index.js
index 7604a9a..14b694c 100644
--- a/Pages/yishi/practicing/index.js
+++ b/Pages/yishi/practicing/index.js
@@ -12,7 +12,6 @@ Page({
     license_cert: [],
     qualification_cert: [],
     work_cert: [],
-    license_cert_visible: false
   },
   onLoad(){
     api.getDoctorCret().then(response => {
@@ -24,20 +23,13 @@ Page({
       })
     }).catch(errors => {console.error(errors);})
   },
-  show_license_cert(){
-    console.log("show_license_cert")
-    this.setData({
-      license_cert_visible: true
+  previewImage(e){
+    let name = e.currentTarget.dataset.name;
+    let name_date = this.data[name]
+
+    wx.previewImage({
+      current: name_date[0], // 当前显示图片的http链接
+      urls: name_date // 需要预览的图片http链接列表
     })
-  },
-  close_license_cert(e) {
-    const {
-      detail: { trigger },
-    } = e;
-    console.log("trigger: ", trigger);
-    console.log("close_license_cert")
-    this.setData({
-      license_cert_visible: false,
-    });
-  },
+  }
 })
\ No newline at end of file
diff --git a/Pages/yishi/practicing/index.json b/Pages/yishi/practicing/index.json
index 8eeb365..ee34b87 100644
--- a/Pages/yishi/practicing/index.json
+++ b/Pages/yishi/practicing/index.json
@@ -2,7 +2,6 @@
   "component": true,
   "usingComponents": {
     "te-nav-bar": "/commpents/te_navbar",
-    "t-image": "tdesign-miniprogram/image/image",
-    "t-image-viewer": "tdesign-miniprogram/image-viewer/image-viewer"
+    "t-image": "tdesign-miniprogram/image/image"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/practicing/index.wxml b/Pages/yishi/practicing/index.wxml
index 0babe0c..cb612c2 100644
--- a/Pages/yishi/practicing/index.wxml
+++ b/Pages/yishi/practicing/index.wxml
@@ -12,7 +12,8 @@
           style="margin: 0 50rpx 0 20rpx;" 
           width="220rpx" height="220rpx" 
           aria-label="img" wx:for="{{license_cert}}"
-          bindtap="show_license_cert" />
+          data-name="license_cert"
+          bindtap="previewImage" />
       </view>
     </view>
     <view class="imgbox_item">
@@ -25,7 +26,9 @@
           mode="heightFix" 
           style="margin: 0 50rpx 0 20rpx;" 
           width="220rpx" height="220rpx" 
-          aria-label="img" wx:for="{{qualification_cert}}" />
+          aria-label="img" wx:for="{{qualification_cert}}" 
+          data-name="qualification_cert"
+          bindtap="previewImage"/>
       </view>
     </view>
     <view class="imgbox_item">
@@ -37,18 +40,10 @@
           mode="heightFix" 
           style="margin: 0 50rpx 20rpx 20rpx;" 
           width="220rpx" height="220rpx" 
-          aria-label="img" wx:for="{{work_cert}}" />
+          aria-label="img" wx:for="{{work_cert}}" 
+          data-name="work_cert"
+          bindtap="previewImage"/>
       </view>
     </view>
   </view>
-
-  <!-- <t-image-viewer
-        deleteBtn="{{false}}"
-        close-btn="{{true}}"
-        show-index="{{true}}"
-        visible="{{license_cert_visible}}"
-        images="{{license_cert}}"
-        bind:close="close_license_cert"
-      ></t-image-viewer> -->
-      
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/yizhensetup/index.js b/Pages/yishi/yizhensetup/index.js
index 900c5dd..bdbd30b 100644
--- a/Pages/yishi/yizhensetup/index.js
+++ b/Pages/yishi/yizhensetup/index.js
@@ -88,7 +88,11 @@ Page({
   onChange({ detail }) {
     console.log("onChange: ", detail);
     
-
+      if(detail){
+        wx.vibrateShort({
+          "type": "heavy"
+        })
+      }
      //修改开关
      let params = {};
      params.inquiry_type = this.data.inquiry_type;//接诊类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药）
@@ -98,7 +102,6 @@ Page({
       console.log(response);
     }).then(()=>{
       if(detail){
-        
         let tmplIds = ['G1RIs0RYqsTQ2CuPQWalIMyb6_deuEEbJfajfhGvNzc']
         let sub_promise = requestSubscribeMessage(tmplIds)
         sub_promise.then(res => {
diff --git a/Pages/yishi/yizhensetupprice/index.js b/Pages/yishi/yizhensetupprice/index.js
index d928480..4af69e5 100644
--- a/Pages/yishi/yizhensetupprice/index.js
+++ b/Pages/yishi/yizhensetupprice/index.js
@@ -150,6 +150,9 @@ Page({
   },
   onStepperChange(event) {
     console.log(event.detail);
+    wx.vibrateShort({
+      "type": "heavy"
+    })
     this.setData({ 
       "info.work_num_day": event.detail 
     });
@@ -160,6 +163,9 @@ Page({
   },
 
   onColumnChange(e) {
+    wx.vibrateShort({
+      "type": "heavy"
+    })
     console.log('picker pick:', e);
   },
 
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index a37c222..ab737e8 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -525,23 +525,26 @@ Component({
     },
     // 获取消息ID
     handleLongPress(e) {
-      for (let index = 0; index < this.data.messageList.length; index++) {
+      // for (let index = 0; index < this.data.messageList.length; index++) {
         
-        if (this.data.messageList[index].status === 'success') {
+        // if (this.data.messageList[index].status === 'success') {
           const { index } = e.currentTarget.dataset;
-          let message = this.data.messageList[index];
+          // let message = this.data.messageList[index];
           // console.log(message)
-          if(message.type === 'TIMCustomElem'){
-            return
-          }
+          // if(message.type === 'TIMCustomElem'){
+          //   return
+          // }
 
           this.setData({
             messageID: e.currentTarget.id,
             selectedMessage: this.data.messageList[index],
             Show: true,
           });
-        }
-      }
+          wx.vibrateShort({
+            "type": "heavy"
+          })
+        // }
+      // }
     },
     // 更新 messagelist
     updateMessageByID(deleteMessageID) {
diff --git a/commpents/image-cropper/image-cropper.js b/commpents/image-cropper/image-cropper.js
new file mode 100644
index 0000000..50a2f62
--- /dev/null
+++ b/commpents/image-cropper/image-cropper.js
@@ -0,0 +1,1142 @@
+Component({
+  properties: {
+    /**     
+     * 图片路径
+     */
+    'imgSrc': {
+      type: String
+    },
+    /**
+     * 裁剪框高度
+     */
+    'height': {
+      type: Number,
+      value: 200
+    },
+    /**
+     * 裁剪框宽度
+     */
+    'width': {
+      type: Number,
+      value: 200
+    },
+    /**
+     * 裁剪框最小尺寸
+     */
+    'min_width': {
+      type: Number,
+      value: 100
+    },
+    'min_height': {
+      type: Number,
+      value: 100
+    },
+    /**
+     * 裁剪框最大尺寸
+     */
+    'max_width': {
+      type: Number,
+      value: 300
+    },
+    'max_height': {
+      type: Number,
+      value: 300
+    },
+    /**
+     * 裁剪框禁止拖动
+     */
+    'disable_width': {
+      type: Boolean,
+      value: false
+    },
+    'disable_height': {
+      type: Boolean,
+      value: false
+    },
+    /**
+     * 锁定裁剪框比例
+     */
+    'disable_ratio':{
+      type: Boolean,
+      value: false
+    },
+    /**
+     * 生成的图片尺寸相对剪裁框的比例
+     */
+    'export_scale': {
+      type: Number,
+      value: 3
+    },
+    /**
+     * 生成的图片质量0-1
+     */
+    'quality': {
+      type: Number,
+      value: 1
+    },
+    'cut_top': {
+      type: Number,
+      value: null
+    },
+    'cut_left': {
+      type: Number,
+      value: null
+    },
+    /**
+     * canvas上边距（不设置默认不显示）
+     */
+    'canvas_top': {
+      type: Number,
+      value: null
+    },
+    /**
+     * canvas左边距（不设置默认不显示）
+     */
+    'canvas_left': {
+      type: Number,
+      value: null
+    },
+    /**
+     * 图片宽度
+     */
+    'img_width': {
+      type: null,
+      value: null
+    },
+    /**
+     * 图片高度
+     */
+    'img_height': {
+      type: null,
+      value: null
+    },
+    /**
+     * 图片缩放比
+     */
+    'scale': {
+      type: Number,
+      value: 1
+    },
+    /**
+     * 图片旋转角度
+     */
+    'angle': {
+      type: Number,
+      value: 0
+    },
+    /**
+     * 最小缩放比
+     */
+    'min_scale': {
+      type: Number,
+      value: 0.5
+    },
+    /**
+     * 最大缩放比
+     */
+    'max_scale': {
+      type: Number,
+      value: 2
+    },
+    /**
+     * 是否禁用旋转
+     */
+    'disable_rotate': {
+      type: Boolean,
+      value: false
+    },
+    /**
+     * 是否限制移动范围(剪裁框只能在图片内)
+     */
+    'limit_move':{
+      type: Boolean,
+      value: false
+    },
+    show_cropper: {
+      type: Boolean,
+      value: false,
+      observer(newVal) {
+        this.setData({
+          show_cropper: newVal
+        })
+      },
+    }
+  },
+  data: {
+    el: 'image-cropper', //暂时无用
+    show_cropper: false,
+    info: wx.getSystemInfoSync(),
+    MOVE_THROTTLE:null,//触摸移动节流settimeout
+    MOVE_THROTTLE_FLAG: true,//节流标识
+    INIT_IMGWIDTH: 0, //图片设置尺寸,此值不变（记录最初设定的尺寸）
+    INIT_IMGHEIGHT: 0, //图片设置尺寸,此值不变（记录最初设定的尺寸）
+    TIME_BG: null,//背景变暗延时函数
+    TIME_CUT_CENTER:null,
+    _touch_img_relative: [{
+      x: 0,
+      y: 0
+    }], //鼠标和图片中心的相对位置
+    _flag_cut_touch:false,//是否是拖动裁剪框
+    _hypotenuse_length: 0, //双指触摸时斜边长度
+    _flag_img_endtouch: false, //是否结束触摸
+    _flag_bright: true, //背景是否亮
+    _canvas_overflow:true,//canvas缩略图是否在屏幕外面
+    _canvas_width:200,
+    _canvas_height:200,
+    origin_x: 0.5, //图片旋转中心
+    origin_y: 0.5, //图片旋转中心
+    _cut_animation: false,//是否开启图片和裁剪框过渡
+    _img_top: wx.getSystemInfoSync().windowHeight / 2, //图片上边距
+    _img_left: wx.getSystemInfoSync().windowWidth / 2, //图片左边距
+    watch: {
+      //监听截取框宽高变化
+      width(value, that) {
+        if (value < that.data.min_width){
+          that.setData({
+            width: that.data.min_width
+          });
+        }
+        that._computeCutSize();
+      },
+      height(value, that) {
+        if (value < that.data.min_height) {
+          that.setData({
+            height: that.data.min_height
+          });
+        }
+        that._computeCutSize();
+      },
+      angle(value, that){
+        //停止居中裁剪框，继续修改图片位置
+        that._moveStop();
+        if(that.data.limit_move){
+          if (that.data.angle % 90) {
+            that.setData({
+              angle: Math.round(that.data.angle / 90) * 90
+            });
+            return;
+          }
+        }
+      },
+      _cut_animation(value, that){
+        //开启过渡300毫秒之后自动关闭
+        clearTimeout(that.data._cut_animation_time);
+        if (value){
+          that.data._cut_animation_time = setTimeout(()=>{
+            that.setData({
+              _cut_animation:false
+            });
+          },300)
+        }
+      },
+      limit_move(value, that){
+        if (value) {
+          if (that.data.angle%90){
+            that.setData({
+              angle: Math.round(that.data.angle / 90)*90
+            });
+          }
+          that._imgMarginDetectionScale();
+          !that.data._canvas_overflow && that._draw();
+        }
+      },
+      canvas_top(value, that){
+        that._canvasDetectionPosition();
+      },
+      canvas_left(value, that){
+        that._canvasDetectionPosition();
+      },
+      imgSrc(value, that){
+        that.pushImg();
+      },
+      cut_top(value, that) {
+        that._cutDetectionPosition();
+        if (that.data.limit_move) {
+          !that.data._canvas_overflow && that._draw();
+        }
+      },
+      cut_left(value, that) {
+        that._cutDetectionPosition();
+        if (that.data.limit_move) {
+          !that.data._canvas_overflow && that._draw();
+        }
+      }
+    }
+  },
+  options: {
+    styleIsolation: 'isolated'
+  },
+  attached() {
+    this.data.info = wx.getSystemInfoSync();
+    //启用数据监听
+    this._watcher();
+    this.data.INIT_IMGWIDTH = this.data.img_width;
+    this.data.INIT_IMGHEIGHT = this.data.img_height;
+    this.setData({
+      _canvas_height: this.data.height,
+      _canvas_width: this.data.width,
+    });
+    this._initCanvas();
+    this.data.imgSrc && (this.data.imgSrc = this.data.imgSrc);
+    //根据开发者设置的图片目标尺寸计算实际尺寸
+    this._initImageSize();
+    //设置裁剪框大小>设置图片尺寸>绘制canvas
+    this._computeCutSize();
+    //检查裁剪框是否在范围内
+    this._cutDetectionPosition();
+    //检查canvas是否在范围内
+    this._canvasDetectionPosition();
+    //初始化完成
+    this.triggerEvent('load', {
+      cropper: this
+    });
+  },
+  methods: {
+    /**
+     * 上传图片
+     */
+    upload() {
+      let that = this;
+      wx.chooseImage({
+        count: 1,
+        sizeType: ['original', 'compressed'],
+        sourceType: ['album', 'camera'],
+        success(res) {
+          const tempFilePaths = res.tempFilePaths[0];
+          that.pushImg(tempFilePaths);
+          wx.showLoading({
+            title: '加载中...'
+          })
+        }
+      })
+    },
+    /**
+     * 返回图片信息
+     */
+    getImg(getCallback) {
+      this._draw(()=>{
+        wx.canvasToTempFilePath({
+          width: this.data.width * this.data.export_scale,
+          height: Math.round(this.data.height * this.data.export_scale),
+          destWidth: this.data.width * this.data.export_scale,
+          destHeight: Math.round(this.data.height) * this.data.export_scale,
+          fileType: 'png',
+          quality: this.data.quality,
+          canvasId: this.data.el,
+          success: (res) => {
+            getCallback({
+              url: res.tempFilePath,
+              width: this.data.width * this.data.export_scale,
+              height: this.data.height * this.data.export_scale
+            });
+          }
+        }, this)
+      });
+    },
+    /**
+     * 设置图片动画
+     * {
+     *    x:10,//图片在原有基础上向下移动10px
+     *    y:10,//图片在原有基础上向右移动10px
+     *    angle:10,//图片在原有基础上旋转10deg
+     *    scale:0.5,//图片在原有基础上增加0.5倍
+     * }
+     */
+    setTransform(transform) {
+      if (!transform) return;
+      if (!this.data.disable_rotate){
+        this.setData({
+          angle: transform.angle ? this.data.angle + transform.angle : this.data.angle
+        });
+      }
+      var scale = this.data.scale;
+      if (transform.scale) {
+        scale = this.data.scale + transform.scale;
+        scale = scale <= this.data.min_scale ? this.data.min_scale : scale;
+        scale = scale >= this.data.max_scale ? this.data.max_scale : scale;
+      }
+      this.data.scale = scale;
+      let cutX = this.data.cut_left;
+      let cutY = this.data.cut_top;
+      if (transform.cutX){
+        this.setData({
+          cut_left: cutX + transform.cutX
+        });
+        this.data.watch.cut_left(null, this);
+      }
+      if (transform.cutY){
+        this.setData({
+          cut_top: cutY + transform.cutY
+        });
+        this.data.watch.cut_top(null, this);
+      }
+      this.data._img_top = transform.y ? this.data._img_top + transform.y : this.data._img_top;
+      this.data._img_left = transform.x ? this.data._img_left + transform.x : this.data._img_left;
+      //图像边缘检测,防止截取到空白
+      this._imgMarginDetectionScale();
+      //停止居中裁剪框，继续修改图片位置
+      this._moveDuring();
+      this.setData({
+        scale: this.data.scale,
+        _img_top: this.data._img_top,
+        _img_left: this.data._img_left
+      });
+      !this.data._canvas_overflow && this._draw();
+      //可以居中裁剪框了
+      this._moveStop();//结束操作
+    },
+    /**
+     * 设置剪裁框位置
+     */
+    setCutXY(x,y){
+      this.setData({
+        cut_top: y,
+        cut_left:x
+      });
+    },
+    /**
+     * 设置剪裁框尺寸
+     */
+    setCutSize(w,h){
+      this.setData({
+        width: w,
+        height:h
+      });
+      this._computeCutSize();
+    },
+    /**
+     * 设置剪裁框和图片居中
+     */
+    setCutCenter() {
+      let cut_top = (this.data.info.windowHeight - this.data.height) * 0.5;
+      let cut_left = (this.data.info.windowWidth - this.data.width) * 0.5;
+      console.log(cut_top, "-" ,cut_left )
+      //顺序不能变
+      this.setData({
+        _img_top: this.data._img_top - this.data.cut_top + cut_top,
+        cut_top: cut_top, //截取的框上边距
+        _img_left: this.data._img_left - this.data.cut_left + cut_left,
+        cut_left: cut_left, //截取的框左边距
+      });
+    },
+    _setCutCenter(){
+      let cut_top = (this.data.info.windowHeight - this.data.height) * 0.5;
+      let cut_left = (this.data.info.windowWidth - this.data.width) * 0.5;
+      console.log(cut_top, "-" ,cut_left )
+      this.setData({
+        cut_top: cut_top, //截取的框上边距
+        cut_left: cut_left, //截取的框左边距
+      });
+    },
+    /**
+     * 设置剪裁框宽度-即将废弃
+     */
+    setWidth(width) {
+      this.setData({
+        width: width
+      });
+      this._computeCutSize();
+    },
+    /**
+     * 设置剪裁框高度-即将废弃
+     */
+    setHeight(height) {
+      this.setData({
+        height: height
+      });
+      this._computeCutSize();
+    },
+    /**
+     * 是否锁定旋转
+     */
+    setDisableRotate(value){
+      this.data.disable_rotate = value;
+    },
+    /**
+     * 是否限制移动
+     */
+    setLimitMove(value){
+      this.setData({
+        _cut_animation: true,
+        limit_move: !!value
+      });
+    },
+    /**
+     * 初始化图片，包括位置、大小、旋转角度
+     */
+    imgReset() {
+      this.setData({
+        scale: 1,
+        angle: 0,
+        _img_top: wx.getSystemInfoSync().windowHeight / 2,
+        _img_left: wx.getSystemInfoSync().windowWidth / 2,
+      })
+    //   console.log(wx.getSystemInfoSync().windowHeight / 2, "-", wx.getSystemInfoSync().windowWidth / 2,)
+    },
+    /**
+     * 加载（更换）图片
+     */
+    pushImg(src) {
+      if (src) {
+        this.setData({
+          imgSrc: src
+        });
+        //发现是手动赋值直接返回，交给watch处理
+        return;
+      }
+      
+      // getImageInfo接口传入 src: '' 会导致内存泄漏
+      
+      if (!this.data.imgSrc) return;
+      wx.getImageInfo({
+        src: this.data.imgSrc,
+        success: (res) => {
+          this.data.imageObject = res;
+          //图片非本地路径需要换成本地路径
+          if (this.data.imgSrc.search(/tmp/) == -1){
+            this.setData({
+              imgSrc: res.path
+            });
+          }
+          //计算最后图片尺寸
+          this._imgComputeSize();
+          if (this.data.limit_move) {
+            //限制移动，不留空白处理
+            this._imgMarginDetectionScale();
+          }
+          this._draw();
+        },
+        fail: (err) => {
+          this.setData({
+            imgSrc: ''
+          });
+        }
+      });
+    },
+    imageLoad(e){
+      setTimeout(()=>{
+      this.triggerEvent('imageload', this.data.imageObject);
+
+      },1000)
+    },
+    /**
+     * 设置图片放大缩小
+     */
+    setScale(scale) {
+      if (!scale) return;
+      this.setData({
+        scale: scale
+      });
+      !this.data._canvas_overflow && this._draw();
+    },
+    /**
+     * 设置图片旋转角度
+     */
+    setAngle(angle) {
+      if (!angle) return;
+      this.setData({
+        _cut_animation: true,
+        angle: angle
+      });
+      this._imgMarginDetectionScale();
+      !this.data._canvas_overflow && this._draw();
+    },
+    _initCanvas() {
+      //初始化canvas
+      if (!this.data.ctx){
+        this.data.ctx = wx.createCanvasContext("image-cropper", this);
+      }
+    },
+    /**
+     * 根据开发者设置的图片目标尺寸计算实际尺寸
+     */
+    _initImageSize(){
+      //处理宽高特殊单位 %>px
+      if (this.data.INIT_IMGWIDTH && typeof this.data.INIT_IMGWIDTH == "string" && this.data.INIT_IMGWIDTH.indexOf("%") != -1) {
+        let width = this.data.INIT_IMGWIDTH.replace("%", "");
+        this.data.INIT_IMGWIDTH = this.data.img_width = this.data.info.windowWidth / 100 * width;
+      }
+      if (this.data.INIT_IMGHEIGHT && typeof this.data.INIT_IMGHEIGHT == "string" && this.data.INIT_IMGHEIGHT.indexOf("%") != -1) {
+        let height = this.data.img_height.replace("%", "");
+        this.data.INIT_IMGHEIGHT = this.data.img_height = this.data.info.windowHeight / 100 * height;
+      }
+    },
+    /**
+     * 检测剪裁框位置是否在允许的范围内(屏幕内)
+     */
+    _cutDetectionPosition(){
+      let _cutDetectionPositionTop = () => {
+        //检测上边距是否在范围内
+        if (this.data.cut_top < 0) {
+          this.setData({
+            cut_top: 0
+          });
+        }
+        if (this.data.cut_top > this.data.info.windowHeight - this.data.height) {
+          this.setData({
+            cut_top: this.data.info.windowHeight - this.data.height
+          });
+        }
+      }, _cutDetectionPositionLeft = () => {
+        //检测左边距是否在范围内
+        if (this.data.cut_left < 0) {
+          this.setData({
+            cut_left: 0
+          });
+        }
+        if (this.data.cut_left > this.data.info.windowWidth - this.data.width) {
+          this.setData({
+            cut_left: this.data.info.windowWidth - this.data.width
+          });
+        }
+      };
+      //裁剪框坐标处理（如果只写一个参数则另一个默认为0，都不写默认居中）
+      if (this.data.cut_top == null && this.data.cut_left == null) {
+        this._setCutCenter();
+      } else if (this.data.cut_top != null && this.data.cut_left != null){
+        _cutDetectionPositionTop();
+        _cutDetectionPositionLeft();
+      } else if (this.data.cut_top != null && this.data.cut_left == null) {
+        _cutDetectionPositionTop();
+        this.setData({
+          cut_left: (this.data.info.windowWidth - this.data.width) / 2
+        });
+      } else if (this.data.cut_top == null && this.data.cut_left != null) {
+        _cutDetectionPositionLeft();
+        this.setData({
+          cut_top: (this.data.info.windowHeight - this.data.height) / 2
+        });
+      }
+    },
+    /**
+     * 检测canvas位置是否在允许的范围内(屏幕内)如果在屏幕外则不开启实时渲染
+     * 如果只写一个参数则另一个默认为0，都不写默认超出屏幕外
+     */
+    _canvasDetectionPosition(){
+      if(this.data.canvas_top == null && this.data.canvas_left == null) {
+        this.data._canvas_overflow = false;
+        this.setData({
+          canvas_top: -5000,
+          canvas_left: -5000
+        });
+      }else if(this.data.canvas_top != null && this.data.canvas_left != null) {
+        if (this.data.canvas_top < - this.data.height || this.data.canvas_top > this.data.info.windowHeight) {
+          this.data._canvas_overflow = true;
+        } else {
+          this.data._canvas_overflow = false;
+        }
+      }else if(this.data.canvas_top != null && this.data.canvas_left == null) {
+        this.setData({
+          canvas_left: 0
+        });
+      } else if (this.data.canvas_top == null && this.data.canvas_left != null) {
+        this.setData({
+          canvas_top: 0
+        });
+        if (this.data.canvas_left < -this.data.width || this.data.canvas_left > this.data.info.windowWidth) {
+          this.data._canvas_overflow = true;
+        } else {
+          this.data._canvas_overflow = false;
+        }
+      }
+    },
+    /**
+     * 图片边缘检测-位置
+     */
+    _imgMarginDetectionPosition(scale) {
+      if (!this.data.limit_move) return;
+      let left = this.data._img_left;
+      let top = this.data._img_top;
+      var scale = scale || this.data.scale;
+      let img_width = this.data.img_width;
+      let img_height = this.data.img_height;
+      if (this.data.angle / 90 % 2) {
+        img_width = this.data.img_height;
+        img_height = this.data.img_width;
+      }
+      left = this.data.cut_left + img_width * scale / 2 >= left ? left : this.data.cut_left + img_width * scale / 2;
+      left = this.data.cut_left + this.data.width - img_width * scale / 2 <= left ? left : this.data.cut_left + this.data.width - img_width * scale / 2;
+      top = this.data.cut_top + img_height * scale / 2 >= top ? top : this.data.cut_top + img_height * scale / 2;
+      top = this.data.cut_top + this.data.height - img_height * scale / 2 <= top ? top : this.data.cut_top + this.data.height - img_height * scale / 2;
+      this.setData({
+        _img_left: left,
+        _img_top: top,
+        scale: scale
+      })
+    },
+    /**
+     * 图片边缘检测-缩放
+     */
+    _imgMarginDetectionScale(){
+      if (!this.data.limit_move)return;
+      let scale = this.data.scale;
+      let img_width = this.data.img_width;
+      let img_height = this.data.img_height;
+      if (this.data.angle / 90 % 2) {
+        img_width = this.data.img_height;
+        img_height = this.data.img_width;
+      }
+      if (img_width * scale < this.data.width){
+        scale = this.data.width / img_width;
+      }
+      if (img_height * scale < this.data.height) {
+        scale = Math.max(scale,this.data.height / img_height);
+      }
+      this._imgMarginDetectionPosition(scale);
+    },
+    _setData(obj) {
+      let data = {};
+      for (var key in obj) {
+        if (this.data[key] != obj[key]){
+          data[key] = obj[key];
+        }
+      }
+      this.setData(data);
+      return data;
+    },
+    /**
+     * 计算图片尺寸
+     */
+    _imgComputeSize() {
+      let img_width = this.data.img_width,
+          img_height = this.data.img_height;
+      if (!this.data.INIT_IMGHEIGHT && !this.data.INIT_IMGWIDTH) {
+        //默认按图片最小边 = 对应裁剪框尺寸
+        img_width = this.data.imageObject.width;
+        img_height = this.data.imageObject.height;
+        if (img_width / img_height > this.data.width / this.data.height){
+          img_height = this.data.height;
+          img_width = this.data.imageObject.width / this.data.imageObject.height * img_height;
+        }else{
+          img_width = this.data.width;
+          img_height = this.data.imageObject.height / this.data.imageObject.width * img_width;
+        }
+      } else if (this.data.INIT_IMGHEIGHT && !this.data.INIT_IMGWIDTH) {
+        img_width = this.data.imageObject.width / this.data.imageObject.height * this.data.INIT_IMGHEIGHT;
+      } else if (!this.data.INIT_IMGHEIGHT && this.data.INIT_IMGWIDTH) {
+        img_height = this.data.imageObject.height / this.data.imageObject.width * this.data.INIT_IMGWIDTH;
+      }
+      this.setData({
+        img_width: img_width,
+        img_height: img_height
+      });
+    },
+    //改变截取框大小
+    _computeCutSize() {
+      if (this.data.width > this.data.info.windowWidth) {
+        this.setData({
+          width: this.data.info.windowWidth,
+        });
+      } else if (this.data.width + this.data.cut_left > this.data.info.windowWidth){
+        this.setData({
+          cut_left: this.data.info.windowWidth - this.data.cut_left,
+        });
+      };
+      if (this.data.height > this.data.info.windowHeight) {
+        this.setData({
+          height: this.data.info.windowHeight,
+        });
+      } else if (this.data.height + this.data.cut_top > this.data.info.windowHeight){
+        this.setData({
+          cut_top: this.data.info.windowHeight - this.data.cut_top,
+        });
+      }
+      !this.data._canvas_overflow && this._draw();
+    },
+    //开始触摸
+    _start(event) {
+      this.data._flag_img_endtouch = false;
+      if (event.touches.length == 1) {
+        //单指拖动
+        this.data._touch_img_relative[0] = {
+          x: (event.touches[0].clientX - this.data._img_left),
+          y: (event.touches[0].clientY - this.data._img_top)
+        }
+      } else {
+        //双指放大
+        let width = Math.abs(event.touches[0].clientX - event.touches[1].clientX);
+        let height = Math.abs(event.touches[0].clientY - event.touches[1].clientY);
+        this.data._touch_img_relative = [{
+          x: (event.touches[0].clientX - this.data._img_left),
+          y: (event.touches[0].clientY - this.data._img_top)
+        }, {
+          x: (event.touches[1].clientX - this.data._img_left),
+          y: (event.touches[1].clientY - this.data._img_top)
+        }];
+        this.data._hypotenuse_length = Math.sqrt(Math.pow(width, 2) + Math.pow(height, 2));
+      }
+      !this.data._canvas_overflow && this._draw();
+    },
+    _move_throttle(){
+      //安卓需要节流
+      if (this.data.info.platform =='android'){
+        clearTimeout(this.data.MOVE_THROTTLE);
+        this.data.MOVE_THROTTLE = setTimeout(() => {
+          this.data.MOVE_THROTTLE_FLAG = true;
+        }, 1000 / 40)
+        return this.data.MOVE_THROTTLE_FLAG;
+      }else{
+        this.data.MOVE_THROTTLE_FLAG = true;
+      }
+    },
+    _move(event) {
+      if (this.data._flag_img_endtouch || !this.data.MOVE_THROTTLE_FLAG) return;
+      this.data.MOVE_THROTTLE_FLAG = false;
+      this._move_throttle();
+      this._moveDuring();
+      if (event.touches.length == 1) {
+        //单指拖动
+        let left = (event.touches[0].clientX - this.data._touch_img_relative[0].x),
+            top = (event.touches[0].clientY - this.data._touch_img_relative[0].y);
+        //图像边缘检测,防止截取到空白
+        this.data._img_left = left;
+        this.data._img_top = top;
+        this._imgMarginDetectionPosition();
+        this.setData({
+          _img_left: this.data._img_left,
+          _img_top: this.data._img_top
+        });
+      } else {
+        //双指放大
+        let width = (Math.abs(event.touches[0].clientX - event.touches[1].clientX)),
+            height = (Math.abs(event.touches[0].clientY - event.touches[1].clientY)),
+            hypotenuse = Math.sqrt(Math.pow(width, 2) + Math.pow(height, 2)),
+            scale = this.data.scale * (hypotenuse / this.data._hypotenuse_length),
+            current_deg = 0;
+        scale = scale <= this.data.min_scale ? this.data.min_scale : scale;
+        scale = scale >= this.data.max_scale ? this.data.max_scale : scale;
+        //图像边缘检测,防止截取到空白
+        this.data.scale = scale;
+        this._imgMarginDetectionScale();
+        //双指旋转(如果没禁用旋转)
+        let _touch_img_relative = [{
+          x: (event.touches[0].clientX - this.data._img_left),
+          y: (event.touches[0].clientY - this.data._img_top)
+        }, {
+          x: (event.touches[1].clientX - this.data._img_left),
+          y: (event.touches[1].clientY - this.data._img_top)
+        }];
+        if (!this.data.disable_rotate){
+          let first_atan = 180 / Math.PI * Math.atan2(_touch_img_relative[0].y, _touch_img_relative[0].x);
+          let first_atan_old = 180 / Math.PI * Math.atan2(this.data._touch_img_relative[0].y, this.data._touch_img_relative[0].x);
+          let second_atan = 180 / Math.PI * Math.atan2(_touch_img_relative[1].y, _touch_img_relative[1].x);
+          let second_atan_old = 180 / Math.PI * Math.atan2(this.data._touch_img_relative[1].y, this.data._touch_img_relative[1].x);
+          //当前旋转的角度
+          let first_deg = first_atan - first_atan_old,
+              second_deg = second_atan - second_atan_old;
+          if (first_deg != 0) {
+            current_deg = first_deg;
+          } else if (second_deg != 0) {
+            current_deg = second_deg;
+          }
+        }
+        this.data._touch_img_relative = _touch_img_relative;
+        this.data._hypotenuse_length = Math.sqrt(Math.pow(width, 2) + Math.pow(height, 2));
+        //更新视图
+        this.setData({
+          angle: this.data.angle + current_deg,
+          scale: this.data.scale
+        });
+      }
+      !this.data._canvas_overflow && this._draw();
+    },
+    //结束操作
+    _end(event) {
+      this.data._flag_img_endtouch = true;
+      this._moveStop();
+    },
+    //点击中间剪裁框处理
+    _click(event) {
+      if (!this.data.imgSrc) {
+        //调起上传
+        this.upload();
+        return;
+      }
+      this._draw(()=>{
+        let x = event.detail ? event.detail.x : event.touches[0].clientX;
+        let y = event.detail ? event.detail.y : event.touches[0].clientY;
+        // if ((x >= this.data.cut_left && x <= (this.data.cut_left + this.data.width)) && (y >= this.data.cut_top && y <= (this.data.cut_top + this.data.height))) {
+          //生成图片并回调
+          wx.canvasToTempFilePath({
+            width: this.data.width * this.data.export_scale,
+            height: Math.round(this.data.height * this.data.export_scale),
+            destWidth: this.data.width * this.data.export_scale,
+            destHeight: Math.round(this.data.height) * this.data.export_scale,
+            fileType: 'png',
+            quality: this.data.quality,
+            canvasId: this.data.el,
+            success: (res) => {
+              this.triggerEvent('tapcut', {
+                url: res.tempFilePath,
+                width: this.data.width * this.data.export_scale,
+                height: this.data.height * this.data.export_scale
+              });
+            }
+          }, this)
+        // }
+      });
+    },
+    //渲染
+    _draw(callback) {
+        console.log("_draw")
+      if (!this.data.imgSrc) return;
+      let draw = () => {
+        //图片实际大小
+        let img_width = this.data.img_width * this.data.scale * this.data.export_scale;
+        let img_height = this.data.img_height * this.data.scale * this.data.export_scale;
+        //canvas和图片的相对距离
+        var xpos = this.data._img_left - this.data.cut_left;
+        var ypos = this.data._img_top - this.data.cut_top;
+        //旋转画布
+        this.data.ctx.translate(xpos * this.data.export_scale, ypos * this.data.export_scale);
+        this.data.ctx.rotate(this.data.angle * Math.PI / 180);
+        this.data.ctx.drawImage(this.data.imgSrc, -img_width / 2, -img_height / 2, img_width, img_height);
+        this.data.ctx.draw(false, () => {
+            callback && callback();
+        });
+      }
+      if (this.data.ctx.width != this.data.width || this.data.ctx.height != this.data.height){
+        //优化拖动裁剪框，所以必须把宽高设置放在离用户触发渲染最近的地方
+        this.setData({
+          _canvas_height: this.data.height,
+          _canvas_width: this.data.width,
+        },()=>{
+          //延迟40毫秒防止点击过快出现拉伸或裁剪过多
+          setTimeout(() => {
+            draw();
+          }, 40);
+        });
+      }else{
+        draw();
+      }
+    },
+    //裁剪框处理
+    _cutTouchMove(e) {
+      if (this.data._flag_cut_touch && this.data.MOVE_THROTTLE_FLAG) {
+        if (this.data.disable_ratio && (this.data.disable_width || this.data.disable_height)) return;
+        //节流
+        this.data.MOVE_THROTTLE_FLAG = false;
+        this._move_throttle();
+        let width = this.data.width,
+          height = this.data.height,
+          cut_top = this.data.cut_top,
+          cut_left = this.data.cut_left,
+          size_correct = () => {
+            width = width <= this.data.max_width ? width >= this.data.min_width ? width : this.data.min_width : this.data.max_width;
+            height = height <= this.data.max_height ? height >= this.data.min_height ? height : this.data.min_height : this.data.max_height;
+          },
+          size_inspect = () => {
+            if ((width > this.data.max_width || width < this.data.min_width || height > this.data.max_height || height < this.data.min_height) && this.data.disable_ratio) {
+              size_correct();
+              return false;
+            } else {
+              size_correct();
+              return true;
+            }
+          };
+        height = this.data.CUT_START.height + ((this.data.CUT_START.corner > 1 && this.data.CUT_START.corner < 4 ? 1 : -1) * (this.data.CUT_START.y - e.touches[0].clientY));
+        switch (this.data.CUT_START.corner) {
+          case 1:
+            width = this.data.CUT_START.width + this.data.CUT_START.x - e.touches[0].clientX;
+            if (this.data.disable_ratio) {
+              height = width / (this.data.width / this.data.height)
+            }
+            if (!size_inspect()) return;
+            cut_left = this.data.CUT_START.cut_left - (width - this.data.CUT_START.width);
+            break
+          case 2:
+            width = this.data.CUT_START.width + this.data.CUT_START.x - e.touches[0].clientX;
+            if (this.data.disable_ratio) {
+              height = width / (this.data.width / this.data.height)
+            }
+            if (!size_inspect()) return;
+            cut_top = this.data.CUT_START.cut_top - (height - this.data.CUT_START.height)
+            cut_left = this.data.CUT_START.cut_left - (width - this.data.CUT_START.width)
+            break
+          case 3:
+            width = this.data.CUT_START.width - this.data.CUT_START.x + e.touches[0].clientX;
+            if (this.data.disable_ratio) {
+              height = width / (this.data.width / this.data.height)
+            }
+            if (!size_inspect()) return;
+            cut_top = this.data.CUT_START.cut_top - (height - this.data.CUT_START.height);
+            break
+          case 4:
+            width = this.data.CUT_START.width - this.data.CUT_START.x + e.touches[0].clientX;
+            if (this.data.disable_ratio) {
+              height = width / (this.data.width / this.data.height)
+            }
+            if (!size_inspect()) return;
+            break
+        }
+        if (!this.data.disable_width && !this.data.disable_height) {
+          this.setData({
+            width: width,
+            cut_left: cut_left,
+            height: height,
+            cut_top: cut_top,
+          })
+        } else if (!this.data.disable_width) {
+          this.setData({
+            width: width,
+            cut_left: cut_left
+          })
+        } else if (!this.data.disable_height) {
+          this.setData({
+            height: height,
+            cut_top: cut_top
+          })
+        }
+        this._imgMarginDetectionScale();
+      }
+    },
+    _cutTouchStart(e) {
+      let currentX = e.touches[0].clientX;
+      let currentY = e.touches[0].clientY;
+      let cutbox_top4 = this.data.cut_top + this.data.height - 30;
+      let cutbox_bottom4 = this.data.cut_top + this.data.height + 20;
+      let cutbox_left4 = this.data.cut_left + this.data.width - 30;
+      let cutbox_right4 = this.data.cut_left + this.data.width + 30;
+
+      let cutbox_top3 = this.data.cut_top - 30;
+      let cutbox_bottom3 = this.data.cut_top + 30;
+      let cutbox_left3 = this.data.cut_left + this.data.width - 30;
+      let cutbox_right3 = this.data.cut_left + this.data.width + 30;
+
+      let cutbox_top2 = this.data.cut_top - 30;
+      let cutbox_bottom2 = this.data.cut_top + 30;
+      let cutbox_left2 = this.data.cut_left - 30;
+      let cutbox_right2 = this.data.cut_left + 30;
+
+      let cutbox_top1 = this.data.cut_top + this.data.height - 30;
+      let cutbox_bottom1 = this.data.cut_top + this.data.height + 30;
+      let cutbox_left1 = this.data.cut_left - 30;
+      let cutbox_right1 = this.data.cut_left + 30;
+      if (currentX > cutbox_left4 && currentX < cutbox_right4 && currentY > cutbox_top4 && currentY < cutbox_bottom4) {
+        this._moveDuring();
+        this.data._flag_cut_touch = true;
+        this.data._flag_img_endtouch = true;
+        this.data.CUT_START = {
+          width: this.data.width,
+          height: this.data.height,
+          x: currentX,
+          y: currentY,
+          corner: 4
+        }
+      } else if (currentX > cutbox_left3 && currentX < cutbox_right3 && currentY > cutbox_top3 && currentY < cutbox_bottom3) {
+        this._moveDuring();
+        this.data._flag_cut_touch = true;
+        this.data._flag_img_endtouch = true;
+        this.data.CUT_START = {
+          width: this.data.width,
+          height: this.data.height,
+          x: currentX,
+          y: currentY,
+          cut_top: this.data.cut_top,
+          cut_left: this.data.cut_left,
+          corner: 3
+        }
+      } else if (currentX > cutbox_left2 && currentX < cutbox_right2 && currentY > cutbox_top2 && currentY < cutbox_bottom2) {
+        this._moveDuring();
+        this.data._flag_cut_touch = true;
+        this.data._flag_img_endtouch = true;
+        this.data.CUT_START = {
+          width: this.data.width,
+          height: this.data.height,
+          cut_top: this.data.cut_top,
+          cut_left: this.data.cut_left,
+          x: currentX,
+          y: currentY,
+          corner: 2
+        }
+      } else if (currentX > cutbox_left1 && currentX < cutbox_right1 && currentY > cutbox_top1 && currentY < cutbox_bottom1) {
+        this._moveDuring();
+        this.data._flag_cut_touch = true;
+        this.data._flag_img_endtouch = true;
+        this.data.CUT_START = {
+          width: this.data.width,
+          height: this.data.height,
+          cut_top: this.data.cut_top,
+          cut_left: this.data.cut_left,
+          x: currentX,
+          y: currentY,
+          corner: 1
+        }
+      }
+    },
+    _cutTouchEnd(e) {
+      this._moveStop();
+      this.data._flag_cut_touch = false;
+    },
+    //停止移动时需要做的操作
+    _moveStop() {
+      //清空之前的自动居中延迟函数并添加最新的
+      clearTimeout(this.data.TIME_CUT_CENTER);
+      this.data.TIME_CUT_CENTER = setTimeout(() => {
+        //动画启动
+        if (!this.data._cut_animation) {
+          this.setData({
+            _cut_animation: true
+          });
+        }
+        this.setCutCenter();
+      }, 1000)
+      //清空之前的背景变化延迟函数并添加最新的
+      clearTimeout(this.data.TIME_BG);
+      this.data.TIME_BG = setTimeout(() => {
+        if (this.data._flag_bright) {
+          this.setData({
+            _flag_bright: false
+          });
+        }
+      }, 2000)
+    },
+    //移动中
+    _moveDuring() {
+      //清空之前的自动居中延迟函数
+      clearTimeout(this.data.TIME_CUT_CENTER);
+      //清空之前的背景变化延迟函数
+      clearTimeout(this.data.TIME_BG);
+      //高亮背景
+      if (!this.data._flag_bright) {
+        this.setData({
+          _flag_bright: true
+        });
+      }
+    },
+    //监听器
+    _watcher() {
+      Object.keys(this.data).forEach(v => {
+        this._observe(this.data, v, this.data.watch[v]);
+      })
+    },
+    _observe(obj, key, watchFun) {
+      var val = obj[key];
+      Object.defineProperty(obj, key, {
+        configurable: true,
+        enumerable: true,
+        set:(value) => {
+          val = value;
+          watchFun && watchFun(val, this);
+        },
+        get() {
+          if (val && '_img_top|img_left||width|height|min_width|max_width|min_height|max_height|export_scale|cut_top|cut_left|canvas_top|canvas_left|img_width|img_height|scale|angle|min_scale|max_scale'.indexOf(key)!=-1){
+            let ret = parseFloat(parseFloat(val).toFixed(3));
+            if (typeof val == "string" && val.indexOf("%") != -1){
+              ret+='%';
+            }
+            return ret;
+          }
+          return val;
+        }
+      })
+    },
+    _preventTouchMove() {
+    },
+    cnacle(){
+        this.setData({
+            show_cropper: false
+        })
+    }
+  }
+})
diff --git a/commpents/image-cropper/image-cropper.json b/commpents/image-cropper/image-cropper.json
new file mode 100644
index 0000000..32640e0
--- /dev/null
+++ b/commpents/image-cropper/image-cropper.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
\ No newline at end of file
diff --git a/commpents/image-cropper/image-cropper.wxml b/commpents/image-cropper/image-cropper.wxml
new file mode 100644
index 0000000..a773e40
--- /dev/null
+++ b/commpents/image-cropper/image-cropper.wxml
@@ -0,0 +1,32 @@
+  <view class='image-cropper' catchtouchmove='_preventTouchMove' wx:if="{{show_cropper}}">
+    <view class='main' id="main" bindtouchend="_cutTouchEnd" bindtouchstart="_cutTouchStart" bindtouchmove="_cutTouchMove">
+      <view class='content'>
+        <view class='content_top bg_gray {{_flag_bright?"":"bg_black"}}' style="height:{{cut_top}}px;transition-property:{{_cut_animation?'':'background'}}"></view>
+        <view class='content_middle' style="height:{{height}}px;">
+          <view class='content_middle_left bg_gray {{_flag_bright?"":"bg_black"}}' style="width:{{cut_left}}px;transition-property:{{_cut_animation?'':'background'}}"></view>
+          <view class='content_middle_middle' style="width:{{width}}px;height:{{height}}px;transition-duration: .3s;transition-property:{{_cut_animation?'':'background'}};">
+            <view class="border border-top-left"></view>
+            <view class="border border-top-right"></view>
+            <view class="border border-right-top"></view>
+            <view class="border border-right-bottom"></view>
+            <view class="border border-bottom-right"></view>
+            <view class="border border-bottom-left"></view>
+            <view class="border border-left-bottom"></view>
+            <view class="border border-left-top"></view>
+          </view>
+          <view class='content_middle_right bg_gray {{_flag_bright?"":"bg_black"}}' style="transition-property:{{_cut_animation?'':'background'}}"></view>
+        </view>
+        <view class='content_bottom bg_gray {{_flag_bright?"":"bg_black"}}' style="transition-property:{{_cut_animation?'':'background'}}"></view>
+      </view>
+      <image bindload="imageLoad" bindtouchstart="_start" bindtouchmove="_move" bindtouchend="_end" style="width:{{img_width ? img_width + 'px' : 'auto'}};height:{{img_height ? img_height + 'px' : 'auto'}};transform:translate3d({{_img_left-img_width/2}}px,{{_img_top-img_height/2}}px,0) scale({{scale}}) rotate({{angle}}deg);transition-duration:{{_cut_animation?.4:0}}s;" class='img' src='{{imgSrc}}'></image>
+    </view>
+    <canvas canvas-id='image-cropper' disable-scroll="true" style="width:{{_canvas_width * export_scale}}px;height:{{_canvas_height * export_scale}}px;left:{{canvas_left}}px;top:{{canvas_top}}px" class='image-cropper-canvas'></canvas>
+    <view class="btn_box">
+        <view class="btn">
+            <button bindtap="cnacle" class="btn_cancle">取消</button>
+        </view>
+        <view class="btn">
+            <button bindtap="_click" class="btn_confirm">确定</button>
+        </view>
+    </view>
+  </view>
diff --git a/commpents/image-cropper/image-cropper.wxss b/commpents/image-cropper/image-cropper.wxss
new file mode 100644
index 0000000..5364fb3
--- /dev/null
+++ b/commpents/image-cropper/image-cropper.wxss
@@ -0,0 +1,144 @@
+.image-cropper{
+  background:rgba(14, 13, 13,.8);
+  position: fixed;
+  top:0;
+  left:0;
+  width:100vw;
+  height:100vh;
+  z-index: 2;
+}
+.image-cropper .main{
+  position: absolute;
+  width:100vw;
+  height:100vh;
+  overflow: hidden;
+}
+.image-cropper .content{
+  z-index: 9;
+  position: absolute;
+  width:100vw;
+  height:100vh;
+  display: flex;
+  flex-direction:column;
+  pointer-events:none;
+}
+.image-cropper .bg_black{
+  background: rgba(0, 0, 0, 0.8)!important;
+}
+.image-cropper .bg_gray{
+  background: rgba(0, 0, 0, 0.45);
+  transition-duration: .35s;
+}
+.image-cropper .content>.content_top{
+  pointer-events:none;
+}
+.image-cropper .content>.content_middle{
+  display: flex;
+  height: 200px;
+  width:100%;
+}
+.image-cropper .content_middle_middle{
+  width:200px;
+  box-sizing:border-box;
+  position: relative;
+  transition-duration: .3s;
+}
+.image-cropper .content_middle_right{
+  flex: auto;
+}
+.image-cropper .content>.content_bottom{
+  flex: auto;
+}
+.image-cropper .img{
+  z-index: 2;
+  top:0;
+  left:0;
+  position: absolute;
+  border:none;
+  width:100%;
+  backface-visibility: hidden;
+  transform-origin:center;
+}
+.image-cropper .image-cropper-canvas{
+  position: fixed;
+  background: white;
+  width:150px;
+  height:150px;
+  z-index: 10;
+  top:-200%;
+  pointer-events:none;
+}
+.image-cropper .border{
+  background: white;
+  pointer-events:auto;
+  position:absolute;
+}
+.image-cropper .border-top-left{
+  left:-2.5px;
+  top:-2.5px;
+  height:2.5px;
+  width:33rpx;
+}
+.image-cropper .border-top-right{
+  right:-2.5px;
+  top:-2.5px;
+  height:2.5px;
+  width:33rpx;
+}
+.image-cropper .border-right-top{
+  top:-1px;
+  width:2.5px;
+  height:30rpx;
+  right:-2.5px;
+}
+.image-cropper .border-right-bottom{
+  width:2.5px;
+  height:30rpx;
+  right:-2.5px;
+  bottom:-1px;
+}
+.image-cropper .border-bottom-left{
+  height:2.5px;
+  width:33rpx;
+  bottom:-2.5px;
+  left:-2.5px;
+}
+.image-cropper .border-bottom-right{
+  height:2.5px;
+  width:33rpx;
+  bottom:-2.5px;
+  right:-2.5px;
+}
+.image-cropper .border-left-top{
+  top:-1px;
+  width:2.5px;
+  height:30rpx;
+  left:-2.5px;
+}
+.image-cropper .border-left-bottom{
+  width:2.5px;
+  height:30rpx;
+  left:-2.5px;
+  bottom:-1px;
+}
+.btn_box{
+    z-index: 9;
+    position: absolute;
+    display: flex;
+    bottom: 0rpx;
+    justify-content: center;
+    width: 100vw;
+}
+.btn{
+    font-weight: 600;
+    text-align: center;
+    margin: 60rpx 20rpx;
+    flex: 1;
+}
+.btn_cancle{
+    /* width: 100rpx; */
+}
+.btn_confirm{
+    background-color: #3CC7C0;
+    color: #fff;
+}
diff --git a/commpents/myprofile/index.js b/commpents/myprofile/index.js
index 4d788f7..9c7bd62 100644
--- a/commpents/myprofile/index.js
+++ b/commpents/myprofile/index.js
@@ -85,8 +85,11 @@ Component({
     zhuanchang_note: '请选择专长',
     jianjie_show: false,
     shanchang_show: false,
+    show_cropper: false,
+    img_cropper_src: '',
+    img_cropper_width: 250, //宽度
+    img_cropper_height: 250, //高度
   },
-
   options: {
     addGlobalClass: true,
     styleIsolation: 'apply-shared'
@@ -901,6 +904,16 @@ Component({
       })
     },
     doUploadPhoto(event) {
+      const { file } = event.detail;
+      this.setData({
+        photoEvent: event,
+        img_cropper_src: file.url,
+        show_cropper: true
+      })
+      this.loadimage()
+    },
+    OSSUpload(fileurl){
+      let event = this.data.photoEvent
       console.log("index douploadFIle: ", event);
       const scene = event.currentTarget.dataset.scene;
       const field_name = event.currentTarget.dataset.field_name;
@@ -919,7 +932,7 @@ Component({
         const ossAccessKeyId = response.data.accessid;
         const policy = response.data.policy;
         const key = response.data.dir+filename;
-        const filePath = file.url; // 待上传文件的文件路径。
+        const filePath = fileurl; // 待上传文件的文件路径。
         wx.uploadFile({
           url: host, // 开发者服务器的URL。
           filePath: filePath,
@@ -982,6 +995,29 @@ Component({
     },
     moveZhuanChang(){
       
-    }
+    },
+    cropperload(e) {
+      console.log("cropper初始化完成");
+    },
+    loadimage(e) {
+      this.cropper = this.selectComponent("#image-cropper");
+      //重置图片角度、缩放、位置
+      this.cropper.imgReset();
+      this.triggerEvent('showPageMeta');
+    },
+    clickcut(e) {
+        console.log(e);
+        // //点击裁剪框阅览图片
+        // wx.previewImage({
+        //     current: e.detail.url, // 当前显示图片的http链接
+        //     urls: [e.detail.url] // 需要预览的图片http链接列表
+        // })
+
+      this.OSSUpload(e.detail.url)
+      this.setData({
+        show_cropper: false
+      })
+      this.triggerEvent('hidePageMeta');
+    },
   }
 })
diff --git a/commpents/myprofile/index.json b/commpents/myprofile/index.json
index bda9cf1..5a43e33 100644
--- a/commpents/myprofile/index.json
+++ b/commpents/myprofile/index.json
@@ -21,6 +21,7 @@
     "van-icon": "@vant/weapp/icon/index",
     "van-search": "@vant/weapp/search/index",
     "van-empty": "@vant/weapp/empty/index",
-    "van-image": "@vant/weapp/image/index"
+    "van-image": "@vant/weapp/image/index",
+    "image-cropper": "/commpents/image-cropper/image-cropper"
   }
 }
diff --git a/commpents/myprofile/index.wxml b/commpents/myprofile/index.wxml
index a329081..caf5e1c 100644
--- a/commpents/myprofile/index.wxml
+++ b/commpents/myprofile/index.wxml
@@ -365,4 +365,6 @@
         </view>
 
 
-        <van-toast id="van-toast" />
\ No newline at end of file
+        <van-toast id="van-toast" />
+
+        <image-cropper show_cropper="{{show_cropper}}" id="image-cropper" limit_move="{{true}}" disable_rotate="{{true}}" width="{{img_cropper_width}}" height="{{img_cropper_height}}" imgSrc="{{img_cropper_src}}" disable_height="{{true}}" disable_width="{{true}}" disable_ratio="{{true}}" min_scale="0.1" max_scale="5" bindload="cropperload" bindimageload="loadimage" bindtapcut="clickcut"></image-cropper>
\ No newline at end of file

From 6cc0c9d3b3598f24226e35a4623b5c8b2fe471da Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Fri, 12 May 2023 16:23:36 +0800
Subject: [PATCH 30/83] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/case/index.wxml                   | 10 ++++---
 Pages/yishi/case/index.wxss                   |  2 ++
 Pages/yishi/index/index.wxml                  |  2 +-
 Pages/yishi/index/index.wxss                  |  3 +++
 .../TUIChat/components/MessageList/index.js   | 27 ++++++++++++++++---
 .../TUIChat/components/MessageList/index.wxml |  8 +++---
 .../TUIChat/components/MessageList/index.wxss |  2 +-
 commpents/image-cropper/image-cropper.js      |  3 ++-
 utils/network/config.js                       |  6 ++---
 9 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/Pages/yishi/case/index.wxml b/Pages/yishi/case/index.wxml
index b6baa97..f52c1dc 100644
--- a/Pages/yishi/case/index.wxml
+++ b/Pages/yishi/case/index.wxml
@@ -45,7 +45,7 @@
       <view class="disease_box_item" wx:if="{{case_detail.product.length > 0}}">
         <view class="title">用药意向：</view>
         <view class="conent">
-          <text wx:for="{{case_detail.product}}">{{item}};</text>
+          <view wx:for="{{case_detail.product}}">{{item}};</view>
         </view>
       </view>
       <view class="disease_box_item" wx:if="{{case_detail.diagnose_images.length > 0}}">
@@ -59,9 +59,13 @@
     </view>
   </view>
 
-  <view class="main_title" wx:if="{{!(case_detail.is_allergy_history == null && case_detail.is_family_history == null && case_detail.is_pregnant == null && case_detail.drink_wine_status == null && case_detail.smoke_status == null && case_detail.is_operation == null && case_detail.chemical_compound_status == null  && case_detail.chemical_compound_status == null)}}">其他信息</view>
-  <view class="data_box orther" wx:if="{{!(case_detail.is_allergy_history == null && case_detail.is_family_history == null && case_detail.is_pregnant == null && case_detail.drink_wine_status == null && case_detail.smoke_status == null && case_detail.is_operation == null && case_detail.chemical_compound_status == null  && case_detail.chemical_compound_status == null)}}">
+  <view class="main_title" wx:if="{{!(case_detail.is_taboo == null && case_detail.is_allergy_history == null && case_detail.is_family_history == null && case_detail.is_pregnant == null && case_detail.drink_wine_status == null && case_detail.smoke_status == null && case_detail.is_operation == null && case_detail.chemical_compound_status == null  && case_detail.chemical_compound_status == null)}}">其他信息</view>
+  <view class="data_box orther" wx:if="{{!(case_detail.is_taboo == null && case_detail.is_allergy_history == null && case_detail.is_family_history == null && case_detail.is_pregnant == null && case_detail.drink_wine_status == null && case_detail.smoke_status == null && case_detail.is_operation == null && case_detail.chemical_compound_status == null  && case_detail.chemical_compound_status == null)}}">
     <view class="disease_box">
+      <view class="disease_box_item" wx:if="{{case_detail.is_taboo != null}}">
+        <view class="title">是否服用过您想购买的药品且无相关禁忌：</view>
+        <view class="conent">{{case_detail.is_taboo==0?'否':'是'}}</view>
+      </view>
       <view class="disease_box_item" wx:if="{{case_detail.is_allergy_history != null}}">
         <view class="title">过敏史：</view>
         <view class="conent">{{case_detail.is_allergy_history==0?'否':case_detail.allergy_history}}</view>
diff --git a/Pages/yishi/case/index.wxss b/Pages/yishi/case/index.wxss
index c251ea6..44931d5 100644
--- a/Pages/yishi/case/index.wxss
+++ b/Pages/yishi/case/index.wxss
@@ -67,6 +67,8 @@ page{
   flex: 1;
   font-size: 28rpx;
   color: #666666;
+  word-wrap:break-word;
+  word-break:break-all;
 }
 .disease_info{
   background: #FAFAFA;
diff --git a/Pages/yishi/index/index.wxml b/Pages/yishi/index/index.wxml
index ac67c59..0fc69b1 100644
--- a/Pages/yishi/index/index.wxml
+++ b/Pages/yishi/index/index.wxml
@@ -230,7 +230,7 @@
       width="100vw"
           src="{{static_host}}/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-button color="rgba(0, 0, 0, .1)" style="position: fixed;bottom: 100rpx;left: 50%;transform: translateX(-50%);width: 80vw;border: 1px solid #fff;border-radius: 50px;" block round bind:click="onClickHideOverlay">我知道了</van-button>
   </van-overlay>
 
   <t-dialog
diff --git a/Pages/yishi/index/index.wxss b/Pages/yishi/index/index.wxss
index 5fe6670..e42c8a8 100644
--- a/Pages/yishi/index/index.wxss
+++ b/Pages/yishi/index/index.wxss
@@ -251,4 +251,7 @@ page{
   border-top: 2px solid #E9E9E9 !important;
   border-left: 2px solid var(--td-border-color, #E9E9E9);
   border-top-color: #E9E9E9 !important;
+}
+.overlay_show{
+  
 }
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index ab737e8..2f368f9 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -1,4 +1,3 @@
-import dayjs from '../../../../utils/dayjs';
 import logger from '../../../../utils/logger';
 import constant from '../../../../utils/constant';
 import { wechatTimeFormat } from './../../../../../utils/wechatTime'
@@ -91,6 +90,7 @@ Component({
     typingMessage: {},
     autoToButtom: true,
     cachTime: "",
+    cachRealTime: "",
     list_first_loading: false,
     message_rounds: 0,
     static_host: api.getStaticHost()
@@ -235,7 +235,7 @@ Component({
     },
     refreshMessageRounds(message){
       try {
-        // console.log("messageList refreshMessageRounds message: ", message);
+        console.log("messageList refreshMessageRounds message: ", message);
         let cloudCustomData = "";
         let cloudCustomDataJson = "";
         if(message.cloudCustomData){
@@ -245,6 +245,12 @@ Component({
           cloudCustomDataJson = JSON.parse(cloudCustomData);
         }
 
+        let order_inquiry_id = cloudCustomDataJson.order_inquiry_id;
+        let now_order_inquiry_id = this.data.order_inquiry_id
+        if(order_inquiry_id != now_order_inquiry_id){
+          return
+        }
+
         let payload = message.payload.data;
         if(payload){
           const payloadData = JSON.parse(message.payload.data);
@@ -535,9 +541,16 @@ Component({
           //   return
           // }
 
+          let selectedMessage = this.data.messageList[index]
+          if(selectedMessage.type === 'TIMCustomElem'){
+            return
+          }
+          if(selectedMessage.type === 'TIMImageElem'){
+            return
+          }
           this.setData({
             messageID: e.currentTarget.id,
-            selectedMessage: this.data.messageList[index],
+            selectedMessage: selectedMessage,
             Show: true,
           });
           wx.vibrateShort({
@@ -748,6 +761,14 @@ Component({
     },
     cachMessageTime(messageTime){
       // console.log("cachMessageTime messageTime 参数:", messageTime)
+
+      let cachRealTime = this.data.cachRealTime
+      if(cachRealTime > messageTime){
+        return ["", false]
+      }
+      this.setData({
+        cachRealTime: messageTime
+      })
       let time = wechatTimeFormat(messageTime)
       // console.log("cachMessageTime: ", time)
       if(time){
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxml b/TUIKit/components/TUIChat/components/MessageList/index.wxml
index 8881299..91284d8 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageList/index.wxml
@@ -28,12 +28,10 @@
             <view wx:if="{{Show}}" catchtap="handleEditToggleAvatar">
             <view class="label-pop"  wx:if="{{messageID === concat.connect('ID-',item.ID)}}" class="{{item.flow === 'out' ? 'label-self-body' : 'label-recieve-body'}}" >
                 <view class="label-pop-mask" >
-                    <view class="copymessage" wx:if="{{item.type === 'TIMTextElem'|| item.type === 'TIMFaceElem'}}" catchtap="copyMessage" > <text>复制｜</text>
-                    </view>
-                    <view class="deletemessage" catchtap="deleteMessage" > <text> 删除</text>
-                    </view>
-                    <view  class="revokemessage" wx:if="{{item.flow === 'out'}}" bindtap="revokeMessage"><text> ｜撤回</text>
+                    <view class="copymessage" wx:if="{{item.type === 'TIMTextElem'|| item.type === 'TIMFaceElem'}}" catchtap="copyMessage" > <text>复制</text>
                     </view>
+                    <!-- <view class="deletemessage" catchtap="deleteMessage" > <text> 删除</text></view>
+                    <view  class="revokemessage" wx:if="{{item.flow === 'out'}}" bindtap="revokeMessage"><text> ｜撤回</text></view> -->
                 </view>
                 </view>
             </view>
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxss b/TUIKit/components/TUIChat/components/MessageList/index.wxss
index 640c335..c336701 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageList/index.wxss
@@ -147,7 +147,7 @@
     border-width: 20px;
     position: absolute;
     bottom: -27px;
-    left: 55px;
+    left: 0px;
     border-style: solid dashed dashed;
     border-color: black transparent transparent;
     font-size: 0;
diff --git a/commpents/image-cropper/image-cropper.js b/commpents/image-cropper/image-cropper.js
index 50a2f62..d2728ce 100644
--- a/commpents/image-cropper/image-cropper.js
+++ b/commpents/image-cropper/image-cropper.js
@@ -247,7 +247,7 @@ Component({
         that._canvasDetectionPosition();
       },
       imgSrc(value, that){
-        that.pushImg();
+        // that.pushImg();
       },
       cut_top(value, that) {
         that._cutDetectionPosition();
@@ -471,6 +471,7 @@ Component({
         _img_top: wx.getSystemInfoSync().windowHeight / 2,
         _img_left: wx.getSystemInfoSync().windowWidth / 2,
       })
+      this.pushImg()
     //   console.log(wx.getSystemInfoSync().windowHeight / 2, "-", wx.getSystemInfoSync().windowWidth / 2,)
     },
     /**
diff --git a/utils/network/config.js b/utils/network/config.js
index f9818ff..145061d 100644
--- a/utils/network/config.js
+++ b/utils/network/config.js
@@ -6,14 +6,14 @@ export const dev = {
 }
 // 测试环境url
 export const test = {
-  baseUrl: "http://www.xxx.com",
+  baseUrl: "https://dev.hospital.applets.igandanyiyuan.com",
   staticHost: "https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com",//静态资源host
   appId: 'wxbdb4d63f81d98228' //此处为appId
 }
 
 // 线上环境url
 export const prod = {
-  baseUrl: 'https://www.xxx.com',
-  staticHost: "https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com",//静态资源host
+  baseUrl: 'https://prod.hospital.applets.igandanyiyuan.com',
+  staticHost: "https://oss.prod.applets.igandanyiyuan.com",//静态资源host
   appId: 'wxbdb4d63f81d98228' //此处为appId
 }

From 33fbdf9a66d14710b4a889cd9c9bc3d2a074893a Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Sat, 13 May 2023 17:17:12 +0800
Subject: [PATCH 31/83] =?UTF-8?q?=E6=AD=A3=E5=BC=8F1.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/login/index.wxml                        |  6 ++++--
 Pages/mobile_login/index.js                   |  6 ++++--
 Pages/mobile_login/index.wxml                 |  8 +++++++-
 Pages/yishi/cash/index.wxml                   |  2 +-
 Pages/yishi/cashrecord/index.wxml             |  2 +-
 Pages/yishi/kuaisusetup/index.wxml            |  2 +-
 Pages/yishi/onlinechufang/index.wxml          |  2 +-
 Pages/yishi/onlinechufang/index.wxss          |  6 ++++++
 Pages/yishi/onlinesetup/index.wxml            |  2 +-
 Pages/yishi/yizhensetup/index.wxml            |  2 +-
 .../TUIChat/components/MessageInput/index.js  | 20 ++++++++++++-------
 .../TUIChat/components/MessageList/index.js   |  2 +-
 12 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/Pages/login/index.wxml b/Pages/login/index.wxml
index cfdc506..06d5806 100644
--- a/Pages/login/index.wxml
+++ b/Pages/login/index.wxml
@@ -24,9 +24,11 @@
         bindtap="getPhoneNumber"
         color="#09BB07" custom-style="font-size: 36rpx;" type="primary" round block>微信授权手机号登录</van-button>
       
-      <view style="display: flex;">
+      <view style="display: flex;flex-wrap: wrap;word-wrap: break-word;margin-top: 30rpx;line-height: 50rpx;">
         <van-checkbox value="{{ checked }}" bind:change="onChange">我已阅读并同意协议</van-checkbox>
-        <view style="color: #4384FE;flex: 1;" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=10">《肝胆相照用户服务协议》</view>
+        <view style="color: #4384FE;word-wrap: break-word;" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=10">《肝胆相照用户注册及服务协议》</view>
+        <view style="color: #4384FE;word-wrap: break-word;" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=9">《隐私协议》</view>
+        <view style="color: #4384FE;word-wrap: break-word;" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=11">《劳务协议》</view>
       </view>
     </view>
 
diff --git a/Pages/mobile_login/index.js b/Pages/mobile_login/index.js
index 6842119..412cf1d 100644
--- a/Pages/mobile_login/index.js
+++ b/Pages/mobile_login/index.js
@@ -162,8 +162,10 @@ Page({
         clearInterval(time_index);
       }
     },1000)
-
-
+  },
+  go(e){
+    let url = e.currentTarget.dataset.url;
+    app.go(url);
   }
 
 })
\ No newline at end of file
diff --git a/Pages/mobile_login/index.wxml b/Pages/mobile_login/index.wxml
index 68cf62d..0e2b427 100644
--- a/Pages/mobile_login/index.wxml
+++ b/Pages/mobile_login/index.wxml
@@ -26,7 +26,13 @@
   </view>
   <view class="btn">
     <van-button color="#3CC7C0" disabled="{{login_disabled}}" custom-style="font-size: 36rpx;margin-bottom:30rpx;" type="primary" round block bind:click="mobileLogin">登录</van-button>
-    <van-checkbox value="{{ checked }}" bind:change="onChange">我已阅读并同意协议<text style="color: #4384FE;">《肝胆相照用户服务协议》</text></van-checkbox>
+    <!-- <van-checkbox value="{{ checked }}" bind:change="onChange">我已阅读并同意协议<text style="color: #4384FE;">《肝胆相照用户服务协议》</text></van-checkbox> -->
+    <view style="word-wrap:break-word;word-break:break-all;display: flex;flex-wrap: wrap;word-wrap: break-word;margin-top: 30rpx;line-height: 50rpx;">
+      <van-checkbox value="{{ checked }}" bind:change="onChange">我已阅读并同意协议</van-checkbox>
+      <view style="color: #4384FE;" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=10">《肝胆相照用户注册及服务协议》</view>
+      <view style="color: #4384FE;" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=9">《隐私协议》</view>
+      <view style="color: #4384FE;" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=11">《劳务协议》</view>
+    </view>
   </view>
 
 </m-nav-bar>
\ No newline at end of file
diff --git a/Pages/yishi/cash/index.wxml b/Pages/yishi/cash/index.wxml
index 3d17021..8963a27 100644
--- a/Pages/yishi/cash/index.wxml
+++ b/Pages/yishi/cash/index.wxml
@@ -21,7 +21,7 @@
   <view class="cash" wx:if="{{!skeleton_loading}}">
     <view class="cash_top">
       <view class="cash_left">
-        <view class="cash_left_title">提现金额（元）</view>
+        <view class="cash_left_title">实际到账（元）</view>
         <view class="cash_num">
           <view>
             <text style="font-size: 42rpx;">￥</text>{{withdrawal_amount}}
diff --git a/Pages/yishi/cashrecord/index.wxml b/Pages/yishi/cashrecord/index.wxml
index aade775..c20219e 100644
--- a/Pages/yishi/cashrecord/index.wxml
+++ b/Pages/yishi/cashrecord/index.wxml
@@ -18,7 +18,7 @@
           <view class="date">{{item.created_at}}</view>
         </view>
         <view class="data_item_top_num">
-          <view class="jine">￥{{item.applied_withdrawal_amount}}</view>
+          <view class="jine">￥{{item.actual_withdrawal_amount}}</view>
           <view class="status_box">
             <!-- 审核状态（1:审核中 2:审核通过 3:审核未通过） -->
             <view class="status status_ing">{{item.examine_status==1?'审核中':item.examine_status==2?'审核通过':item.examine_status==3?'审核未通过':'未知'}}</view>
diff --git a/Pages/yishi/kuaisusetup/index.wxml b/Pages/yishi/kuaisusetup/index.wxml
index 960c705..f616403 100644
--- a/Pages/yishi/kuaisusetup/index.wxml
+++ b/Pages/yishi/kuaisusetup/index.wxml
@@ -16,7 +16,7 @@
       <view class="switch_box_note">{{ note }}</view>
     </view>
     <view class="help">
-      <van-cell size="large" url="/Pages/yishi/manual/index" custom-style="font-size:32rpx;" title="图文问诊操作手册" is-link border="{{false}}" />
+      <van-cell size="large" url="/Pages/yishi/manual_detail/index?manual_id=5" custom-style="font-size:32rpx;" title="图文问诊操作手册" is-link border="{{false}}" />
     </view>
   </view>
 
diff --git a/Pages/yishi/onlinechufang/index.wxml b/Pages/yishi/onlinechufang/index.wxml
index 658ad10..30858f6 100644
--- a/Pages/yishi/onlinechufang/index.wxml
+++ b/Pages/yishi/onlinechufang/index.wxml
@@ -32,7 +32,7 @@
   <van-cell-group inset>
     <van-cell use-label-slot bind:click="showZhenDuan" custom-style="font-size:30rpx;color: #333;" title="诊断" >
       <view class="addzhenduan" wx:if="{{from != 'chat'}}">+添加诊断</view>
-      <view slot="label">
+      <view slot="label" style="width: 180%;">
         <view style="margin-top: 20rpx;" class="label_item" wx:for="{{zhenduan_list}}">
           <van-icon name="delete" catchtap="delZhenDuan" color="red" data-disease_class_id="{{item.icd_id}}" wx:if="{{from != 'chat'}}"/>
           <text style="margin-left: 10rpx;">{{item.icd_name}}</text>
diff --git a/Pages/yishi/onlinechufang/index.wxss b/Pages/yishi/onlinechufang/index.wxss
index bc7160b..7e4e112 100644
--- a/Pages/yishi/onlinechufang/index.wxss
+++ b/Pages/yishi/onlinechufang/index.wxss
@@ -61,6 +61,8 @@ page{
   flex: 1;
   color: #666666;
   font-size: 28rpx;
+  word-wrap:break-word;
+  word-break:break-all;
 }
 
 .txt_title{
@@ -195,6 +197,10 @@ page{
   height: 100rpx;
   line-height: 100rpx;
   border-bottom: 1px solid #E7E7E7;
+  width: 90%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 .label_item{
   display: flex;
diff --git a/Pages/yishi/onlinesetup/index.wxml b/Pages/yishi/onlinesetup/index.wxml
index 5d257f7..859b9b6 100644
--- a/Pages/yishi/onlinesetup/index.wxml
+++ b/Pages/yishi/onlinesetup/index.wxml
@@ -16,7 +16,7 @@
       <view class="switch_box_note">{{ note }}</view>
     </view>
     <view class="help">
-      <van-cell size="large" url="/Pages/yishi/manual/index" custom-style="font-size:32rpx;" title="图文问诊操作手册" is-link border="{{false}}" />
+      <van-cell size="large" url="/Pages/yishi/manual_detail/index?manual_id=6" custom-style="font-size:32rpx;" title="图文问诊操作手册" is-link border="{{false}}" />
     </view>
   </view>
 
diff --git a/Pages/yishi/yizhensetup/index.wxml b/Pages/yishi/yizhensetup/index.wxml
index 00a86fd..b8acba0 100644
--- a/Pages/yishi/yizhensetup/index.wxml
+++ b/Pages/yishi/yizhensetup/index.wxml
@@ -16,7 +16,7 @@
       <view class="switch_box_note">{{ note }}</view>
     </view>
     <view class="help">
-      <van-cell size="large" url="/Pages/yishi/manual/index" custom-style="font-size:32rpx;" title="图文问诊操作手册" is-link border="{{false}}" />
+      <van-cell size="large" url="/Pages/yishi/manual_detail/index?manual_id=4" custom-style="font-size:32rpx;" title="图文问诊操作手册" is-link border="{{false}}" />
     </view>
   </view>
 
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js
index 9ecf644..7502196 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.js
@@ -173,7 +173,7 @@ Component({
         wx.setStorageSync('words', "");
       }
 
-      console.log("pageLifetimes show")
+      // console.log("pageLifetimes show")
       let _this = this
       wx.getNetworkType({
         success (res) {
@@ -361,7 +361,7 @@ Component({
     handleSendImageMessage(file) {
 
       let networkstatus = this.data.networkstatus
-      console.log("networkstatus: ", networkstatus)
+      // console.log("networkstatus: ", networkstatus)
       if(networkstatus === 'none'){
         wx.showToast({
           title: '请检查您的网络',
@@ -405,12 +405,15 @@ Component({
           message_rounds = cloudCustomDataJson.message_rounds;
         }
 
+        let cach_message_rounds = this.data.message_rounds
+        message_rounds = cach_message_rounds>message_rounds?cach_message_rounds:message_rounds
+
         const mycloudCustomData = JSON.stringify({
           order_inquiry_id: this.data.order_inquiry_id,
           inquiry_type: this.data.inquiry_type,
           message_type: 0,
           is_system: 0,
-          message_rounds: this.data.message_rounds,
+          message_rounds: message_rounds,
           patient_family_data: patient_family_data
         });
         
@@ -459,7 +462,7 @@ Component({
     },
 
     handleCommonFunctions(e) {
-      console.log("handleCommonFunctions: ", e)
+      // console.log("handleCommonFunctions: ", e)
       switch (e.target.dataset.key) {
         case '0':
           this.setData({
@@ -541,7 +544,7 @@ Component({
       })
       wx.openSetting({
         success (res) {
-          console.log(res.authSetting)
+          // console.log(res.authSetting)
         }
       })
     },
@@ -679,7 +682,7 @@ Component({
     sendTextMessage(msg, flag) {
 
       let networkstatus = this.data.networkstatus
-      console.log("networkstatus: ", networkstatus)
+      // console.log("networkstatus: ", networkstatus)
       if(networkstatus === 'none'){
         wx.showToast({
           title: '请检查您的网络',
@@ -730,6 +733,9 @@ Component({
           message_rounds = cloudCustomDataJson.message_rounds;
         }
         
+        let cach_message_rounds = this.data.message_rounds
+        message_rounds = cach_message_rounds>message_rounds?cach_message_rounds:message_rounds
+
         const to = this.getToAccount();
         const text = flag ? msg : this.data.message;
 
@@ -739,7 +745,7 @@ Component({
           inquiry_type: this.data.inquiry_type,
           message_type: 0,
           is_system: 0,
-          message_rounds: this.data.message_rounds,
+          message_rounds: message_rounds,
           patient_family_data: patient_family_data
         });
 
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index 2f368f9..e13ab40 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -235,7 +235,7 @@ Component({
     },
     refreshMessageRounds(message){
       try {
-        console.log("messageList refreshMessageRounds message: ", message);
+        // console.log("messageList refreshMessageRounds message: ", message);
         let cloudCustomData = "";
         let cloudCustomDataJson = "";
         if(message.cloudCustomData){

From ca34793579268bf2308ada87f8f5d1d40f74b7ce Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Tue, 16 May 2023 14:06:05 +0800
Subject: [PATCH 32/83] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/login/index.js                              |  6 ++++++
 Pages/login/index.wxml                            | 13 ++++++++-----
 Pages/login/index.wxss                            |  4 +++-
 Pages/mobile_login/index.js                       |  6 ++++++
 Pages/mobile_login/index.wxml                     | 15 +++++++++------
 Pages/mobile_login/index.wxss                     |  3 +++
 Pages/yishi/case/index.wxss                       |  2 +-
 Pages/yishi/cashrecord/index.wxss                 |  1 +
 Pages/yishi/identity/index.wxml                   | 10 +++++-----
 Pages/yishi/identity/index.wxss                   |  2 +-
 Pages/yishi/kuaisusetup/index.wxml                |  2 +-
 Pages/yishi/kuaisusetup/index.wxss                |  4 ++--
 Pages/yishi/my/index.wxml                         | 10 +++++-----
 Pages/yishi/myprofile/index.wxss                  |  2 +-
 Pages/yishi/onlinechufang/index.wxml              |  4 ++--
 Pages/yishi/onlinechufang/index.wxss              |  2 +-
 Pages/yishi/onlinesetup/index.wxml                |  2 +-
 Pages/yishi/onlinesetup/index.wxss                |  2 +-
 Pages/yishi/practicing/index.wxss                 |  2 +-
 Pages/yishi/wenzhen_v2/wenzhen.js                 |  6 +++---
 Pages/yishi/wenzhen_v3/wenzhen.js                 |  6 +++---
 Pages/yishi/yizhensetup/index.wxml                |  2 +-
 Pages/yishi/yizhensetup/index.wxss                |  2 +-
 Pages/yishi/zhiye_identity/index.wxss             |  3 ++-
 .../MessageElements/TextMessage/index.wxss        |  4 ++--
 app.js                                            | 11 ++++++-----
 commpents/myprofile/index.wxss                    |  4 ++--
 commpents/textarea-cell/index.wxss                |  3 ++-
 commpents/upload-cell/index.wxss                  |  3 ++-
 .../tdesign-miniprogram/cell/cell.wxss            |  2 +-
 utils/network/api.js                              |  6 ++++++
 utils/network/config.js                           |  9 ++++++---
 utils/network/request.js                          |  4 ++--
 33 files changed, 97 insertions(+), 60 deletions(-)

diff --git a/Pages/login/index.js b/Pages/login/index.js
index 13f8462..bb3c5ed 100644
--- a/Pages/login/index.js
+++ b/Pages/login/index.js
@@ -24,6 +24,12 @@ Page({
       checked: event.detail,
     });
   },
+  changeCheck(){
+    let checked = this.data.checked
+    this.setData({
+      checked: !checked
+    })
+  },
   _navback() {
     wx.navigateBack()
   },
diff --git a/Pages/login/index.wxml b/Pages/login/index.wxml
index 06d5806..6c59b17 100644
--- a/Pages/login/index.wxml
+++ b/Pages/login/index.wxml
@@ -24,11 +24,14 @@
         bindtap="getPhoneNumber"
         color="#09BB07" custom-style="font-size: 36rpx;" type="primary" round block>微信授权手机号登录</van-button>
       
-      <view style="display: flex;flex-wrap: wrap;word-wrap: break-word;margin-top: 30rpx;line-height: 50rpx;">
-        <van-checkbox value="{{ checked }}" bind:change="onChange">我已阅读并同意协议</van-checkbox>
-        <view style="color: #4384FE;word-wrap: break-word;" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=10">《肝胆相照用户注册及服务协议》</view>
-        <view style="color: #4384FE;word-wrap: break-word;" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=9">《隐私协议》</view>
-        <view style="color: #4384FE;word-wrap: break-word;" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=11">《劳务协议》</view>
+      <view style="display: flex;margin-top: 30rpx;line-height: 50rpx;">
+        <van-checkbox value="{{ checked }}" bind:change="onChange"></van-checkbox>
+        <view style="float: left;">
+          <text style="color: #000000;word-wrap: break-word;" bindtap="changeCheck">我已阅读并同意协议</text>
+          <text style="color: #4384FE;word-wrap: break-word;" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=10">《肝胆相照用户注册及服务协议》</text>
+          <text style="color: #4384FE;word-wrap: break-word;" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=9">《隐私协议》</text>
+          <text style="color: #4384FE;word-wrap: break-word;" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=11">《劳务协议》</text>
+        </view>
       </view>
     </view>
 
diff --git a/Pages/login/index.wxss b/Pages/login/index.wxss
index 3a3756a..c8166dc 100644
--- a/Pages/login/index.wxss
+++ b/Pages/login/index.wxss
@@ -75,5 +75,7 @@
   color: #333333;
   margin-bottom: 60rpx;
 }
-
+.van-checkbox {
+  padding-top: 6rpx !important;
+}
 
diff --git a/Pages/mobile_login/index.js b/Pages/mobile_login/index.js
index 412cf1d..53f1ed0 100644
--- a/Pages/mobile_login/index.js
+++ b/Pages/mobile_login/index.js
@@ -29,6 +29,12 @@ Page({
       checked: event.detail,
     });
   },
+  changeCheck(){
+    let checked = this.data.checked
+    this.setData({
+      checked: !checked
+    })
+  },
   phone_change(e){
     let phone = e.detail.value;
     this.setData({
diff --git a/Pages/mobile_login/index.wxml b/Pages/mobile_login/index.wxml
index 0e2b427..2b15655 100644
--- a/Pages/mobile_login/index.wxml
+++ b/Pages/mobile_login/index.wxml
@@ -27,12 +27,15 @@
   <view class="btn">
     <van-button color="#3CC7C0" disabled="{{login_disabled}}" custom-style="font-size: 36rpx;margin-bottom:30rpx;" type="primary" round block bind:click="mobileLogin">登录</van-button>
     <!-- <van-checkbox value="{{ checked }}" bind:change="onChange">我已阅读并同意协议<text style="color: #4384FE;">《肝胆相照用户服务协议》</text></van-checkbox> -->
-    <view style="word-wrap:break-word;word-break:break-all;display: flex;flex-wrap: wrap;word-wrap: break-word;margin-top: 30rpx;line-height: 50rpx;">
-      <van-checkbox value="{{ checked }}" bind:change="onChange">我已阅读并同意协议</van-checkbox>
-      <view style="color: #4384FE;" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=10">《肝胆相照用户注册及服务协议》</view>
-      <view style="color: #4384FE;" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=9">《隐私协议》</view>
-      <view style="color: #4384FE;" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=11">《劳务协议》</view>
-    </view>
+    <view style="display: flex;margin-top: 30rpx;line-height: 50rpx;">
+        <van-checkbox value="{{ checked }}" bind:change="onChange"></van-checkbox>
+        <view style="float: left;">
+          <text style="color: #000000;word-wrap: break-word;" bindtap="changeCheck">我已阅读并同意协议</text>
+          <text style="color: #4384FE;word-wrap: break-word;" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=10">《肝胆相照用户注册及服务协议》</text>
+          <text style="color: #4384FE;word-wrap: break-word;" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=9">《隐私协议》</text>
+          <text style="color: #4384FE;word-wrap: break-word;" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=11">《劳务协议》</text>
+        </view>
+      </view>
   </view>
 
 </m-nav-bar>
\ No newline at end of file
diff --git a/Pages/mobile_login/index.wxss b/Pages/mobile_login/index.wxss
index 5f9ba0d..162f63f 100644
--- a/Pages/mobile_login/index.wxss
+++ b/Pages/mobile_login/index.wxss
@@ -50,4 +50,7 @@
   border-bottom-width: 1px;
   border-bottom-style: solid;
   border-bottom-color: rgb(235, 237, 240);
+}
+.van-checkbox {
+  padding-top: 6rpx !important;
 }
\ No newline at end of file
diff --git a/Pages/yishi/case/index.wxss b/Pages/yishi/case/index.wxss
index 44931d5..3c28708 100644
--- a/Pages/yishi/case/index.wxss
+++ b/Pages/yishi/case/index.wxss
@@ -6,7 +6,7 @@ page{
   padding: 0 4vw;
 }
 .main_title{
-  font-size: 30rpx;
+  font-size: 16px;
   color: #000000;
   margin: 30rpx 0;
 }
diff --git a/Pages/yishi/cashrecord/index.wxss b/Pages/yishi/cashrecord/index.wxss
index 5f863aa..cd48aeb 100644
--- a/Pages/yishi/cashrecord/index.wxss
+++ b/Pages/yishi/cashrecord/index.wxss
@@ -93,6 +93,7 @@ page{
   justify-content: flex-end;
   margin-right: 20rpx;
   color: #666;
+  font-size: 32rpx;
 }
 .t-picker__confirm{
   color: #3CC7C0 !important;
diff --git a/Pages/yishi/identity/index.wxml b/Pages/yishi/identity/index.wxml
index e75409e..880bb2b 100644
--- a/Pages/yishi/identity/index.wxml
+++ b/Pages/yishi/identity/index.wxml
@@ -22,15 +22,14 @@
         
         <van-cell-group>
           <van-field
-          model:value="{{ realname }}"
-            
-            type="text"
+            model:value="{{ realname }}"
             placeholder="请填写真实姓名，提交后不能修改"
             placeholder-style="font-size:28rpx; color: #C5C8CB;"
             input-align="right"
             clearable
             type="text"
-            custom-style="font-size:30rpx;"
+            size="large"
+            custom-style="font-size:16px;"
             disabled="{{next_btn_disabled}}"
           >
           <text slot="label">真实姓名 <text style="color: #e34d59;">*</text> </text>
@@ -42,7 +41,8 @@
             placeholder-style="font-size:28rpx; color: #C5C8CB;"
             input-align="right"
             clearable
-            custom-style="font-size:30rpx;"
+            size="large"
+            custom-style="font-size:16px;"
             disabled="{{next_btn_disabled}}"
           >
           <text slot="label">身份证号 <text style="color: #e34d59;">*</text> </text>
diff --git a/Pages/yishi/identity/index.wxss b/Pages/yishi/identity/index.wxss
index 4062958..add0acc 100644
--- a/Pages/yishi/identity/index.wxss
+++ b/Pages/yishi/identity/index.wxss
@@ -71,7 +71,7 @@
   letter-spacing: 2rpx;
 }
 .t-cell__title-text{
-  font-size: 32rpx !important;
+  font-size: 16px !important;
 }
 .t-input__wrap--suffix-icon{
   padding-left: var(--td-spacer-1, 8rpx) !important;
diff --git a/Pages/yishi/kuaisusetup/index.wxml b/Pages/yishi/kuaisusetup/index.wxml
index f616403..6eb075e 100644
--- a/Pages/yishi/kuaisusetup/index.wxml
+++ b/Pages/yishi/kuaisusetup/index.wxml
@@ -24,7 +24,7 @@
     <view class="price_title">价格设置</view>
     <view class="price_steup_box">
       <view class="price_steup_box_bottom">
-        <view class="price_steup_box_bottom_title">问诊单价（元）</view>
+        <view class="price_steup_box_bottom_title">问诊单价</view>
         <view class="price_steup_box_bottom_num">
           <input class="weui-input" disabled bindblur="onPriceChange" type="digit" value="{{ info.inquiry_price }}" placeholder="请输入问诊单价" />
           <text class="price">元</text>
diff --git a/Pages/yishi/kuaisusetup/index.wxss b/Pages/yishi/kuaisusetup/index.wxss
index 83437f4..968391c 100644
--- a/Pages/yishi/kuaisusetup/index.wxss
+++ b/Pages/yishi/kuaisusetup/index.wxss
@@ -38,7 +38,7 @@ page{
 }
 .switch_box_item_name{
   flex: 1;
-  font-size: 32rpx;
+  font-size: 16px;
 }
 .switch_box_item_btn{
   flex: 1;
@@ -80,7 +80,7 @@ page{
 }
 .price_steup_box_top_title, .price_steup_box_bottom_title{
   flex: 1;
-  font-size: 32rpx;
+  font-size: 16px;
   color: #333;
 }
 .price_steup_box_top::after{
diff --git a/Pages/yishi/my/index.wxml b/Pages/yishi/my/index.wxml
index 119ec21..2b15b8f 100644
--- a/Pages/yishi/my/index.wxml
+++ b/Pages/yishi/my/index.wxml
@@ -48,10 +48,10 @@
   </view>
 
   <view class="content" style="top: calc(20rpx + {{stateHeight}}px);">
-    <van-cell size="large" url="/Pages/yishi/myaccount/index" link-type="navigateTo" title-style="font-size: 30rpx;" title="我的账户" is-link />
-    <van-cell size="large" url="/Pages/yishi/bankcard/index" link-type="navigateTo" title-style="font-size: 30rpx;" title="我的银行卡" is-link />
-    <van-cell size="large" url="/Pages/yishi/mycard/index" link-type="navigateTo" title-style="font-size: 30rpx;" title="我的名片" is-link  />
-    <van-cell size="large" url="/Pages/yishi/appraise/index?doctor_id={{doctor_id}}" link-type="navigateTo" title-style="font-size: 30rpx;" title="患者评价" is-link />
-    <van-cell size="large" url="/Pages/yishi/quickreply/index" link-type="navigateTo" title-style="font-size: 30rpx;" title="常用语" is-link border="{{ false }}"/>
+    <van-cell size="large" url="/Pages/yishi/myaccount/index" link-type="navigateTo" title-style="font-size: 34rpx;" title="我的账户" is-link />
+    <van-cell size="large" url="/Pages/yishi/bankcard/index" link-type="navigateTo" title-style="font-size: 34rpx;" title="我的银行卡" is-link />
+    <van-cell size="large" url="/Pages/yishi/mycard/index" link-type="navigateTo" title-style="font-size: 34rpx;" title="我的名片" is-link  />
+    <van-cell size="large" url="/Pages/yishi/appraise/index?doctor_id={{doctor_id}}" link-type="navigateTo" title-style="font-size: 34rpx;" title="患者评价" is-link />
+    <van-cell size="large" url="/Pages/yishi/quickreply/index" link-type="navigateTo" title-style="font-size: 34rpx;" title="常用语" is-link border="{{ false }}"/>
   </view>
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/myprofile/index.wxss b/Pages/yishi/myprofile/index.wxss
index 4ad7c06..dc3ba9f 100644
--- a/Pages/yishi/myprofile/index.wxss
+++ b/Pages/yishi/myprofile/index.wxss
@@ -1,5 +1,5 @@
 .t-cell__note,.t-class-note,.note{
-  font-size: 30rpx !important;
+  font-size: 16px !important;
 }
 .t-tabs__item--active{
   color: #49B9AD !important;
diff --git a/Pages/yishi/onlinechufang/index.wxml b/Pages/yishi/onlinechufang/index.wxml
index 30858f6..649fa42 100644
--- a/Pages/yishi/onlinechufang/index.wxml
+++ b/Pages/yishi/onlinechufang/index.wxml
@@ -63,7 +63,7 @@
   <form bindsubmit="{{ order_prescription_id == ''?'postDoctorPrescription':'putDoctorPrescription' }}">
     <view class="txt_title">医嘱</view>
     <view class="doctors_advice" bindtap="onDoctorsAdviceFocus">
-      <textarea disabled="{{from == 'chat'}}" auto-height focus="{{doctors_advice_focus}}" maxlength="1000" bindblur="getAdvice" style="width: 100%;" placeholder-style="font-size:24rpx; color:#999" placeholder="请输入医嘱（5-200字）" name="doctors_advice" value="{{doctor_advice}}"></textarea>
+      <textarea disabled="{{from == 'chat'}}" auto-height focus="{{doctors_advice_focus}}" maxlength="1000" bindblur="getAdvice" style="width: 100%;" placeholder-style="font-size:15px; color:#999" placeholder="请输入医嘱（5-200字）" name="doctors_advice" value="{{doctor_advice}}"></textarea>
     </view>
     <!-- 从聊天页面过来的不显示按钮 -->
     <view class="sub_btn" wx:if="{{from != 'chat'}}">
@@ -241,7 +241,7 @@
     custom-style="height: calc(100vh - {{height*2 + 20}}px);"
     bind:close="onZhenduanClose"
   >
-    <view style="padding-left: 20rpx;font-size: 30rpx;color: #999999;margin: 20rpx 0;">诊断</view>
+    <view style="padding-left: 20rpx;font-size: 30rpx;color: #000;margin: 20rpx 0;">诊断</view>
     <van-field
       model:value="{{ disease_class_name }}"
       placeholder="请输入疾病名称"
diff --git a/Pages/yishi/onlinechufang/index.wxss b/Pages/yishi/onlinechufang/index.wxss
index 7e4e112..898fad6 100644
--- a/Pages/yishi/onlinechufang/index.wxss
+++ b/Pages/yishi/onlinechufang/index.wxss
@@ -66,7 +66,7 @@ page{
 }
 
 .txt_title{
-  font-size: 30rpx;
+  font-size: 16px;
   margin: 20rpx 0;
   position: relative;
   left: 4vw;
diff --git a/Pages/yishi/onlinesetup/index.wxml b/Pages/yishi/onlinesetup/index.wxml
index 859b9b6..a493ea3 100644
--- a/Pages/yishi/onlinesetup/index.wxml
+++ b/Pages/yishi/onlinesetup/index.wxml
@@ -28,7 +28,7 @@
           {{info.work_num_day}}
         </view>
       </van-cell>
-      <van-cell size="large" url="/Pages/yishi/onlinesetupprice/index" custom-style="font-size:32rpx;" title="问诊单价（元）" is-link border="{{false}}" >
+      <van-cell size="large" url="/Pages/yishi/onlinesetupprice/index" custom-style="font-size:32rpx;" title="问诊单价" is-link border="{{false}}" >
         <view class="cell_value">
           {{info.inquiry_price}}元
         </view>
diff --git a/Pages/yishi/onlinesetup/index.wxss b/Pages/yishi/onlinesetup/index.wxss
index bb62421..826b82a 100644
--- a/Pages/yishi/onlinesetup/index.wxss
+++ b/Pages/yishi/onlinesetup/index.wxss
@@ -39,7 +39,7 @@ page{
 }
 .switch_box_item_name{
   flex: 1;
-  font-size: 32rpx;
+  font-size: 16px;
 }
 .switch_box_item_btn{
   flex: 1;
diff --git a/Pages/yishi/practicing/index.wxss b/Pages/yishi/practicing/index.wxss
index 6ab4ed9..306c8df 100644
--- a/Pages/yishi/practicing/index.wxss
+++ b/Pages/yishi/practicing/index.wxss
@@ -14,7 +14,7 @@
 }
 .imgbox_title{
   padding: 20rpx;
-  font-size: 30rpx;
+  font-size: 20px;
 }
 .imgbox_item{
   position: relative;
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index f292d24..d247dc7 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -55,9 +55,9 @@ Page({
       // console.log("onNetworkStatusChange from wenzhen: ")
       // console.log(res.isConnected)
       // console.log(res.networkType)
-      wx.showToast({
-        title: '网络类型'+res.networkType,
-      })
+      // wx.showToast({
+      //   title: '网络类型'+res.networkType,
+      // })
     })
 
   },
diff --git a/Pages/yishi/wenzhen_v3/wenzhen.js b/Pages/yishi/wenzhen_v3/wenzhen.js
index e87db45..126379e 100644
--- a/Pages/yishi/wenzhen_v3/wenzhen.js
+++ b/Pages/yishi/wenzhen_v3/wenzhen.js
@@ -55,9 +55,9 @@ Page({
       console.log("onNetworkStatusChange from wenzhen: ")
       console.log(res.isConnected)
       console.log(res.networkType)
-      wx.showToast({
-        title: '网络类型'+res.networkType,
-      })
+      // wx.showToast({
+      //   title: '网络类型'+res.networkType,
+      // })
     })
 
   },
diff --git a/Pages/yishi/yizhensetup/index.wxml b/Pages/yishi/yizhensetup/index.wxml
index b8acba0..ac224f8 100644
--- a/Pages/yishi/yizhensetup/index.wxml
+++ b/Pages/yishi/yizhensetup/index.wxml
@@ -34,7 +34,7 @@
       </van-cell>
       <view class="price_steup_box_bottom">
         <van-cell size="large" custom-style="font-size:32rpx;border-radius: 20rpx;" 
-        title="问诊单价（元）" is-link 
+        title="问诊单价" is-link 
         border="{{false}}" 
         url="/Pages/yishi/yizhensetupprice/index"
         >
diff --git a/Pages/yishi/yizhensetup/index.wxss b/Pages/yishi/yizhensetup/index.wxss
index 8bfbb3a..5c845f9 100644
--- a/Pages/yishi/yizhensetup/index.wxss
+++ b/Pages/yishi/yizhensetup/index.wxss
@@ -38,7 +38,7 @@ page{
 }
 .switch_box_item_name{
   flex: 1;
-  font-size: 32rpx;
+  font-size: 16px;
 }
 .switch_box_item_btn{
   flex: 1;
diff --git a/Pages/yishi/zhiye_identity/index.wxss b/Pages/yishi/zhiye_identity/index.wxss
index a433484..07fd1d8 100644
--- a/Pages/yishi/zhiye_identity/index.wxss
+++ b/Pages/yishi/zhiye_identity/index.wxss
@@ -27,7 +27,8 @@
   margin: 0 auto;
 }
 .sign_title{
-  font-size: 30rpx;
+  font-size: 16px;
+  color: #323233;
 }
 .sign_note{
   margin: 20rpx 0;
diff --git a/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxss b/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxss
index b22385d..6695cd5 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxss
@@ -54,7 +54,7 @@
   /*justify-content: flex-start;*/
   flex-wrap: wrap;
   outline: none;
-  font-size: 28rpx;
+  font-size: 34rpx;
   color: #333333;
   position: relative;
   max-width: 60vw;
@@ -65,7 +65,7 @@
   color: #000000;
   letter-spacing: 0;
   line-height: 40rpx;
-  font-size: 28rpx;
+  /* font-size: 28rpx; */
   word-wrap: break-word;
   word-break: break-all;
 }
diff --git a/app.js b/app.js
index cf33578..bd4f5f8 100644
--- a/app.js
+++ b/app.js
@@ -53,9 +53,9 @@ App({
       // console.log("onNetworkStatusChange: ")
       // console.log(res.isConnected)
       // console.log(res.networkType)
-      wx.showToast({
-        title: '网络类型'+res.networkType,
-      })
+      // wx.showToast({
+      //   title: '网络类型'+res.networkType,
+      // })
     })
 
     wx.onNetworkWeakChange(function(res){
@@ -100,6 +100,7 @@ App({
         wx.$chat_userID = this.globalData.config.userID;
         wx.$chat_SDKAppID = this.globalData.config.SDKAPPID;
         wx.$chat_userSig = userSig;
+
         wx.$TUIKitTIM = TIM;
         console.log("TIM: ", wx.$TUIKitTIM)
         wx.$TUIKit.registerPlugin({ 'tim-upload-plugin': TIMUploadPlugin });            
@@ -272,8 +273,8 @@ App({
     jiesuan_dialog_show: false,
     config: {
       userID: "",
-      SDKAPPID: 1400796919, // Your SDKAppID
-      SECRETKEY: "a5bcd8c583181cf004e9d91a47687d719d4b5d2a10ce33fbee95d587889447d8", // Your secretKey
+      SDKAPPID: api.getIMappId(), // Your SDKAppID
+      SECRETKEY: api.getIMsecretkey(), // Your secretKey
       EXPIRETIME: 604800,
     },
     app_inter: []
diff --git a/commpents/myprofile/index.wxss b/commpents/myprofile/index.wxss
index 90d9957..20ae616 100644
--- a/commpents/myprofile/index.wxss
+++ b/commpents/myprofile/index.wxss
@@ -36,8 +36,8 @@
 }
 
 .title{
-  font-size: 32rpx;
-  color: #1C2023;
+  font-size: 16px;
+  color: #000000E6;
 }
 .right{
   display: flex;
diff --git a/commpents/textarea-cell/index.wxss b/commpents/textarea-cell/index.wxss
index e21d928..e7c0253 100644
--- a/commpents/textarea-cell/index.wxss
+++ b/commpents/textarea-cell/index.wxss
@@ -42,7 +42,8 @@
   left: 32rpx;
 }
 .textarea-cell-name{
-  font-size: 30rpx;
+  font-size: 16px;
+  color: #000000E6;
 }
 .error_box{
   position: relative;
diff --git a/commpents/upload-cell/index.wxss b/commpents/upload-cell/index.wxss
index bc772ad..ac55a8b 100644
--- a/commpents/upload-cell/index.wxss
+++ b/commpents/upload-cell/index.wxss
@@ -70,5 +70,6 @@
   font-weight: 600;
 }
 .upload-cell-name{
-  font-size: 30rpx;
+  font-size: 16px;
+  color: #000000E6;
 }
\ No newline at end of file
diff --git a/miniprogram_npm/tdesign-miniprogram/cell/cell.wxss b/miniprogram_npm/tdesign-miniprogram/cell/cell.wxss
index b4e5ea5..47962de 100644
--- a/miniprogram_npm/tdesign-miniprogram/cell/cell.wxss
+++ b/miniprogram_npm/tdesign-miniprogram/cell/cell.wxss
@@ -79,7 +79,7 @@
 }
 .t-cell__title-text {
   display: flex;
-  font-size: 32rpx;
+  font-size: 16px;
   font-weight: 400;
 }
 .t-cell__left,
diff --git a/utils/network/api.js b/utils/network/api.js
index ddd68b4..a209594 100644
--- a/utils/network/api.js
+++ b/utils/network/api.js
@@ -4,6 +4,12 @@ class API extends HTTP {
   getStaticHost(){
     return `${this.staticHost}`;
   }
+  getIMappId(){
+    return `${this.IMappId}`;
+  }
+  getIMsecretkey(){
+    return `${this.IMsecretkey}`;
+  }
   //获取oss签名数据
   getOssSign(params) {
     return this.request({
diff --git a/utils/network/config.js b/utils/network/config.js
index 145061d..443937f 100644
--- a/utils/network/config.js
+++ b/utils/network/config.js
@@ -2,18 +2,21 @@
 export const dev = {
   baseUrl: "https://dev.hospital.applets.igandanyiyuan.com",
   staticHost: "https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com",//静态资源host
-  appId: 'wxbdb4d63f81d98228' //此处为appId
+  IMappId: '1400798221', //此处为IM appId
+  IMsecretkey: 'fc45ab469ca632a700166973d87b3a6f56a855cb92d7cffb54e4d37135c097da' //此处为IM secretkey
 }
 // 测试环境url
 export const test = {
   baseUrl: "https://dev.hospital.applets.igandanyiyuan.com",
   staticHost: "https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com",//静态资源host
-  appId: 'wxbdb4d63f81d98228' //此处为appId
+  IMappId: '1400798221', //此处为此处为IM appId
+  IMsecretkey: 'fc45ab469ca632a700166973d87b3a6f56a855cb92d7cffb54e4d37135c097da' //此处为IM secretkey
 }
 
 // 线上环境url
 export const prod = {
   baseUrl: 'https://prod.hospital.applets.igandanyiyuan.com',
   staticHost: "https://oss.prod.applets.igandanyiyuan.com",//静态资源host
-  appId: 'wxbdb4d63f81d98228' //此处为appId
+  IMappId: '1400796919', //此处为此处为IM appId
+  IMsecretkey: 'a5bcd8c583181cf004e9d91a47687d719d4b5d2a10ce33fbee95d587889447d8' //此处为IM secretkey
 }
diff --git a/utils/network/request.js b/utils/network/request.js
index 8aaf6c3..06d49db 100644
--- a/utils/network/request.js
+++ b/utils/network/request.js
@@ -3,7 +3,8 @@ class HTTP {
   constructor() {
     this.baseUrl = env.baseUrl,
     this.staticHost = env.staticHost,
-    this.appId = env.appId
+    this.IMappId = env.IMappId,
+    this.IMsecretkey = env.IMsecretkey
   }
 
   request({
@@ -27,7 +28,6 @@ class HTTP {
       data: data,
       header: {
         'content-type': contentType,
-        'appId': this.appId,
         'Authorization': "Bearer " + wx.getStorageSync('AUTH_TOKEN_'+usertype)
       },
       success: (res) => {

From fd6ae7f04d716a1f1dbaac54493d64e2b2b89404 Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Wed, 17 May 2023 11:57:53 +0800
Subject: [PATCH 33/83] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/bindcard/index.wxss         |  4 ++++
 Pages/yishi/case/index.wxml             |  4 ++--
 Pages/yishi/case/index.wxss             |  7 +++++--
 Pages/yishi/cashrecord/index.js         |  2 +-
 Pages/yishi/index/index.js              |  6 +++++-
 Pages/yishi/kuaisusetup/index.wxml      |  2 +-
 Pages/yishi/myaccount/index.js          |  2 +-
 Pages/yishi/myaccount/index.wxml        |  6 +++---
 Pages/yishi/onlinesetup/index.wxml      |  3 ++-
 Pages/yishi/onlinesetupprice/index.wxml |  2 +-
 Pages/yishi/wenzhen_v2/wenzhen.js       |  2 +-
 Pages/yishi/yizhensetup/index.js        |  2 +-
 Pages/yishi/yizhensetup/index.wxml      |  6 ++++--
 Pages/yishi/yizhensetupprice/index.js   |  4 ++--
 Pages/yishi/yizhensetupprice/index.wxml | 10 +++++++---
 app.js                                  |  7 +++++--
 project.config.json                     |  3 ++-
 17 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/Pages/yishi/bindcard/index.wxss b/Pages/yishi/bindcard/index.wxss
index 7036ca0..b2a7dfc 100644
--- a/Pages/yishi/bindcard/index.wxss
+++ b/Pages/yishi/bindcard/index.wxss
@@ -37,4 +37,8 @@
 }
 .van-cell {
   padding: 32rpx !important;
+}
+
+.bankcard input{
+  font-size: 16px !important;
 }
\ No newline at end of file
diff --git a/Pages/yishi/case/index.wxml b/Pages/yishi/case/index.wxml
index f52c1dc..baac024 100644
--- a/Pages/yishi/case/index.wxml
+++ b/Pages/yishi/case/index.wxml
@@ -8,8 +8,8 @@
       <view class="sex">{{case_detail.sex==1?'男':case_detail.sex==2?'女':'未知'}}｜{{case_detail.age}}岁 </view>
     </view>
     <view class="info">
-      <view class="height info_item"><text class="info_title">身高：</text><text class="info_val">{{case_detail.height==null?'未知':case_detail.height}}CM</text></view>
-      <view class="weight info_item"><text class="info_title">体重：</text><text class="info_val">{{case_detail.weight==null?'未知':case_detail.weight}}KG</text></view>
+      <view class="height info_item"><text class="info_title">身高：</text><text class="info_val">{{case_detail.height==null?'未知':case_detail.height + 'CM'}}</text></view>
+      <view class="weight info_item"><text class="info_title">体重：</text><text class="info_val">{{case_detail.weight==null?'未知':case_detail.weight + 'KG'}}</text></view>
       <view class="minzu info_item"><text class="info_title">民族：</text><text class="info_val">{{case_detail.nation_name==''?'未知':case_detail.nation_name}}</text></view>
       <view class="zhiye info_item"><text class="info_title">职业：</text><text class="info_val">{{case_detail.job_name==''?'未知':case_detail.job_name}}</text></view>
       <view class="hunyin info_item"><text class="info_title">婚姻：</text><text class="info_val">{{case_detail.marital_status==0?'未婚':case_detail.marital_status==1?'已婚':case_detail.marital_status==2?'离异':'未知'}}</text></view>
diff --git a/Pages/yishi/case/index.wxss b/Pages/yishi/case/index.wxss
index 3c28708..811db02 100644
--- a/Pages/yishi/case/index.wxss
+++ b/Pages/yishi/case/index.wxss
@@ -37,12 +37,14 @@ page{
   margin: 20rpx 0;
 }
 .info_item{
-  text-align: center;
+  text-align: left;
   /* width: 190rpx; */
-  height: 60rpx;
+  /* height: 60rpx; */
+  margin-top: 10rpx;
   display: flex;
   align-items: center;
   margin-left: 20rpx;
+  align-items: flex-start;
 }
 .info_title{
   font-size: 28rpx;
@@ -50,6 +52,7 @@ page{
 }
 .info_val{
   font-size: 28rpx;
+  flex: 1;
   color: #666666;
 }
 .disease_box{
diff --git a/Pages/yishi/cashrecord/index.js b/Pages/yishi/cashrecord/index.js
index 5b43aba..0133009 100644
--- a/Pages/yishi/cashrecord/index.js
+++ b/Pages/yishi/cashrecord/index.js
@@ -21,7 +21,7 @@ Page({
   },
   onLoad(){
     let now_year = (new Date()).Format("yyyy");
-    let begin_year = 2022;
+    let begin_year = 2023;
     let years = [];
     for(let i=begin_year;i<=now_year;i++){
       years.push({label: i+"年", value: i+""})
diff --git a/Pages/yishi/index/index.js b/Pages/yishi/index/index.js
index f8cf1a0..d0550fa 100644
--- a/Pages/yishi/index/index.js
+++ b/Pages/yishi/index/index.js
@@ -204,6 +204,10 @@ Page({
     if (typeof this.getTabBar === 'function' && this.getTabBar()) {
       this.getTabBar().stopInterval()
     }
+
+    this.setData({
+      contactKeFu: false
+    })
   },
   Copylistener(res){
     setTimeout(()=>{
@@ -226,7 +230,7 @@ Page({
       skeleton_loading: true,
     });
 
-    wx.onCopyUrl(this.Copylistener);
+    // wx.onCopyUrl(this.Copylistener);
     if (typeof this.getTabBar === 'function' && this.getTabBar()) {
       this.getTabBar().setData({
         active: 0,  //数字是当前页面在tabbar的索引,如我的查询页索引是2，因此这边为2，同理首页就为0，审批页面为1
diff --git a/Pages/yishi/kuaisusetup/index.wxml b/Pages/yishi/kuaisusetup/index.wxml
index 6eb075e..d5b1ec4 100644
--- a/Pages/yishi/kuaisusetup/index.wxml
+++ b/Pages/yishi/kuaisusetup/index.wxml
@@ -27,7 +27,7 @@
         <view class="price_steup_box_bottom_title">问诊单价</view>
         <view class="price_steup_box_bottom_num">
           <input class="weui-input" disabled bindblur="onPriceChange" type="digit" value="{{ info.inquiry_price }}" placeholder="请输入问诊单价" />
-          <text class="price">元</text>
+          <text class="price" decode="true">&nbsp;元</text>
         </view>
       </view>
     </view>
diff --git a/Pages/yishi/myaccount/index.js b/Pages/yishi/myaccount/index.js
index bd90fb4..99a476a 100644
--- a/Pages/yishi/myaccount/index.js
+++ b/Pages/yishi/myaccount/index.js
@@ -36,7 +36,7 @@ Page({
   },
   onLoad(){
     let now_year = (new Date()).Format("yyyy");
-    let begin_year = 2022;
+    let begin_year = 2023;
     let years = [];
     for(let i=begin_year;i<=now_year;i++){
       years.push({label: i+"年", value: i+""})
diff --git a/Pages/yishi/myaccount/index.wxml b/Pages/yishi/myaccount/index.wxml
index cad88ae..2981644 100644
--- a/Pages/yishi/myaccount/index.wxml
+++ b/Pages/yishi/myaccount/index.wxml
@@ -6,15 +6,15 @@
         账户当前余额：
       </view> 
       <view style="font-size: 40rpx;">
-        ¥{{balance_account}}
+        ¥ {{balance_account}}
       </view>
     </view>
   </view>
   <view class="monthbox">
     <view class="month" bindtap="showPop">{{dateText}}<van-icon name="arrow-down" color="#999" size="40rpx" /></view>
     <view class="account">
-      <view class="account_left">当月收益：￥{{amount_total_month}}</view>
-      <view class="account_right">当月已提取：￥{{withdrawal_amount_month}}</view>
+      <view class="account_left" style="font-size: 30rpx;">当月收益：<text style="font-size: 40rpx;">￥{{amount_total_month}}</text></view>
+      <view class="account_right" style="font-size: 30rpx;">当月已提取：<text style="font-size: 40rpx;">￥{{withdrawal_amount_month}}</text></view>
     </view>
   </view>
   <view class="txt_title">账单</view>
diff --git a/Pages/yishi/onlinesetup/index.wxml b/Pages/yishi/onlinesetup/index.wxml
index a493ea3..fb2650f 100644
--- a/Pages/yishi/onlinesetup/index.wxml
+++ b/Pages/yishi/onlinesetup/index.wxml
@@ -30,7 +30,8 @@
       </van-cell>
       <van-cell size="large" url="/Pages/yishi/onlinesetupprice/index" custom-style="font-size:32rpx;" title="问诊单价" is-link border="{{false}}" >
         <view class="cell_value">
-          {{info.inquiry_price}}元
+          <text style="color: red;">{{info.inquiry_price}}</text>
+          <text style="color: #000;"> 元</text>
         </view>
       </van-cell>
     </view>
diff --git a/Pages/yishi/onlinesetupprice/index.wxml b/Pages/yishi/onlinesetupprice/index.wxml
index 9d6f26c..ae9c138 100644
--- a/Pages/yishi/onlinesetupprice/index.wxml
+++ b/Pages/yishi/onlinesetupprice/index.wxml
@@ -8,7 +8,7 @@
       </view>
     </view>
     <view class="price_steup_box_bottom">
-      <view class="price_steup_box_bottom_title">问诊单价（元）</view>
+      <view class="price_steup_box_bottom_title">问诊单价</view>
       <view class="price_steup_box_bottom_num"> 
         <input class="weui-input" bindblur="onPriceChange" type="digit" value="{{ info.inquiry_price }}" placeholder="请输入问诊单价" />
         <text class="price">元</text>
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index d247dc7..a198244 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -405,7 +405,7 @@ Page({
       session_item.inquiry_status = item.inquiry_status;//订单状态暂无
       let txt = {};
       if(lastMessage.messageForShow == "[自定义消息]"){
-        let text = "自定义消息";
+        let text = "系统消息";
         let payload = lastMessage.payload;
         if(payload && payload.data) {
           // console.log("payload: ",payload.data);
diff --git a/Pages/yishi/yizhensetup/index.js b/Pages/yishi/yizhensetup/index.js
index bdbd30b..68072b9 100644
--- a/Pages/yishi/yizhensetup/index.js
+++ b/Pages/yishi/yizhensetup/index.js
@@ -82,7 +82,7 @@ Page({
     let valarr = [''+val+'']
     this.setData({
       amountValue: valarr,
-      amountText: val+" 元"
+      amountText: val
     })
   },
   onChange({ detail }) {
diff --git a/Pages/yishi/yizhensetup/index.wxml b/Pages/yishi/yizhensetup/index.wxml
index ac224f8..b0d6329 100644
--- a/Pages/yishi/yizhensetup/index.wxml
+++ b/Pages/yishi/yizhensetup/index.wxml
@@ -38,9 +38,11 @@
         border="{{false}}" 
         url="/Pages/yishi/yizhensetupprice/index"
         >
-          <view class="price">
-            {{ amountText }}
+          <view>
+            <text class="price">{{ amountText }}</text>
+            <text style="color: #000;"> 元</text>
           </view>
+          
         </van-cell>
       </view>
     </view>
diff --git a/Pages/yishi/yizhensetupprice/index.js b/Pages/yishi/yizhensetupprice/index.js
index 4af69e5..f0a7622 100644
--- a/Pages/yishi/yizhensetupprice/index.js
+++ b/Pages/yishi/yizhensetupprice/index.js
@@ -79,7 +79,7 @@ Page({
     let valarr = [''+val+'']
     this.setData({
       amountValue: valarr,
-      amountText: val+" 元"
+      amountText: val
     })
   },
   onChange({ detail }) {
@@ -177,7 +177,7 @@ Page({
     this.setData({
       [`${key}Visible`]: false,
       [`${key}Value`]: value,
-      [`${key}Text`]: value+' 元',
+      [`${key}Text`]: value,
       "info.inquiry_price": value[0]
     });
 
diff --git a/Pages/yishi/yizhensetupprice/index.wxml b/Pages/yishi/yizhensetupprice/index.wxml
index df87a1c..0aa7c5f 100644
--- a/Pages/yishi/yizhensetupprice/index.wxml
+++ b/Pages/yishi/yizhensetupprice/index.wxml
@@ -10,11 +10,15 @@
       </view>
       <view class="price_steup_box_bottom">
         <van-cell size="large" custom-style="font-size:32rpx;border-radius: 20rpx;" 
-        title="问诊单价（元）" is-link 
+        title="问诊单价" is-link 
         border="{{false}}" 
-        value="{{ amountText }}"
         bindtap="onAmountPicker"
-        />
+        >
+          <view>
+            <text class="price">{{ amountText }}</text>
+            <text style="color: #000;"> 元</text>
+          </view>
+        </van-cell>
       </view>
     </view>
   </view>
diff --git a/app.js b/app.js
index bd4f5f8..c775018 100644
--- a/app.js
+++ b/app.js
@@ -66,6 +66,10 @@ App({
   },
   onShow(){
     // this.imInit();
+    // wx.onCopyUrl(() => {
+    //   console.log("onCopyUrlonCopyUrlonCopyUrl")
+    //   return { query: 'a=1&b=2' }
+    // })
   },
   imInit(){
     console.log("imInit")
@@ -376,6 +380,5 @@ App({
       wx.setStorageSync(userID+'_wenzhen_info', wenzhen_info);
 
     }).catch(errors => {console.error(errors);})
-  }
-  
+  },
 })
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index a8c76e3..c7573b0 100644
--- a/project.config.json
+++ b/project.config.json
@@ -38,7 +38,8 @@
     },
     "disableUseStrict": false,
     "useCompilerPlugins": false,
-    "minifyWXML": true
+    "minifyWXML": true,
+    "condition": false
   },
   "condition": {},
   "editorSetting": {

From bd97a69fb47577c4ca9a56ad594e5204dd022ca7 Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Thu, 18 May 2023 10:20:39 +0800
Subject: [PATCH 34/83] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/agreement_page/index.js |  1 +
 Pages/yishi/index/index.js    |  2 +-
 app.js                        | 20 +++++++++++++++-----
 project.private.config.json   |  2 +-
 utils/network/config.js       |  4 ++--
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/Pages/agreement_page/index.js b/Pages/agreement_page/index.js
index ee13914..109118e 100644
--- a/Pages/agreement_page/index.js
+++ b/Pages/agreement_page/index.js
@@ -13,6 +13,7 @@ Page({
 
   onLoad(options) {
     console.log(options.agreement_id)
+    console.log(this.data.static_host+"/basic/file/agreement.htm?id="+options.agreement_id)
     this.setData({
       src: this.data.static_host+"/basic/file/agreement.htm?id="+options.agreement_id
     })
diff --git a/Pages/yishi/index/index.js b/Pages/yishi/index/index.js
index d0550fa..44001c9 100644
--- a/Pages/yishi/index/index.js
+++ b/Pages/yishi/index/index.js
@@ -199,7 +199,7 @@ Page({
   onHide(){
     // console.log("index onHide() onHide() ");
 
-    wx.offCopyUrl(this.Copylistener) // 需传入与监听时同一个的函数对象
+    // wx.offCopyUrl(this.Copylistener) // 需传入与监听时同一个的函数对象
 
     if (typeof this.getTabBar === 'function' && this.getTabBar()) {
       this.getTabBar().stopInterval()
diff --git a/app.js b/app.js
index c775018..f241bc4 100644
--- a/app.js
+++ b/app.js
@@ -23,7 +23,21 @@ App({
         this.globalData.height = res.statusBarHeight
       }
     })
-
+    wx.onCopyUrl(() => {
+      console.log("onCopyUrlonCopyUrlonCopyUrl")
+      setTimeout(()=>{ 
+        wx.setClipboardData({ 
+        data: '暂不支持分享', 
+        success (res) { 
+          
+        }, 
+        complete(){ 
+          wx.hideToast() 
+        } 
+        }) 
+        },1000) 
+      return 
+    })
     // console.log("download fonts from oss ");
     let loadStatus = false;
     if (!loadStatus) {
@@ -66,10 +80,6 @@ App({
   },
   onShow(){
     // this.imInit();
-    // wx.onCopyUrl(() => {
-    //   console.log("onCopyUrlonCopyUrlonCopyUrl")
-    //   return { query: 'a=1&b=2' }
-    // })
   },
   imInit(){
     console.log("imInit")
diff --git a/project.private.config.json b/project.private.config.json
index b0d5439..982700a 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -18,5 +18,5 @@
       ]
     }
   },
-  "libVersion": "2.31.1"
+  "libVersion": "2.32.0"
 }
\ No newline at end of file
diff --git a/utils/network/config.js b/utils/network/config.js
index 443937f..bbf6cfd 100644
--- a/utils/network/config.js
+++ b/utils/network/config.js
@@ -1,14 +1,14 @@
 // 开发环境url 
 export const dev = {
   baseUrl: "https://dev.hospital.applets.igandanyiyuan.com",
-  staticHost: "https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com",//静态资源host
+  staticHost: "https://img.applets.igandanyiyuan.com",//静态资源host
   IMappId: '1400798221', //此处为IM appId
   IMsecretkey: 'fc45ab469ca632a700166973d87b3a6f56a855cb92d7cffb54e4d37135c097da' //此处为IM secretkey
 }
 // 测试环境url
 export const test = {
   baseUrl: "https://dev.hospital.applets.igandanyiyuan.com",
-  staticHost: "https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com",//静态资源host
+  staticHost: "https://img.applets.igandanyiyuan.com",//静态资源host
   IMappId: '1400798221', //此处为此处为IM appId
   IMsecretkey: 'fc45ab469ca632a700166973d87b3a6f56a855cb92d7cffb54e4d37135c097da' //此处为IM secretkey
 }

From 70dca249c31ae1dd899e73dd82d5d90c9a94405d Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Thu, 25 May 2023 09:44:17 +0800
Subject: [PATCH 35/83] =?UTF-8?q?=E6=89=A9=E5=A4=A7=E9=97=AE=E8=AF=8A?=
 =?UTF-8?q?=E5=BC=80=E5=85=B3=E7=9A=84=E7=82=B9=E5=87=BB=E5=8C=BA=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/kuaisusetup/index.js   | 19 +++++++++++-
 Pages/yishi/kuaisusetup/index.wxml |  6 ++--
 Pages/yishi/onlinesetup/index.js   | 19 +++++++++++-
 Pages/yishi/onlinesetup/index.wxml |  5 ++--
 Pages/yishi/yizhensetup/index.js   | 46 +++++++++++++++++++++---------
 Pages/yishi/yizhensetup/index.wxml |  6 ++--
 6 files changed, 76 insertions(+), 25 deletions(-)

diff --git a/Pages/yishi/kuaisusetup/index.js b/Pages/yishi/kuaisusetup/index.js
index 9a99ec9..ab60e35 100644
--- a/Pages/yishi/kuaisusetup/index.js
+++ b/Pages/yishi/kuaisusetup/index.js
@@ -62,17 +62,34 @@ Page({
 
     }).catch(errors => {console.error(errors);})
   },
+  changeON(){
+    let is_open = this.data.info.is_open
+    console.log("changeON:", is_open)
+    let detail = false
+    if(is_open == 0){
+      detail = true
+    }else{
+      detail = false
+    }
+    this.doChange(detail)
+  },
   onChange({ detail }) {
     console.log("onChange: ", detail);
+    this.doChange(detail)
+  },
+  doChange(detail){
+    let is_open = 0;
     if(detail){
       this.setData({ note: this.data.open_note });
       wx.vibrateShort({
         "type": "heavy"
       })
+      is_open = 1
     }else{
       this.setData({ note: this.data.close_note });
+      is_open = 0
     }
-    this.setData({ "info.is_open": detail });
+    this.setData({ "info.is_open": is_open });
 
      //修改开关
      let params = {};
diff --git a/Pages/yishi/kuaisusetup/index.wxml b/Pages/yishi/kuaisusetup/index.wxml
index d5b1ec4..de6c3d4 100644
--- a/Pages/yishi/kuaisusetup/index.wxml
+++ b/Pages/yishi/kuaisusetup/index.wxml
@@ -2,15 +2,15 @@
 <view class="container">
   <view class="switch_box">
     <view class="switch_box_top">
-      <view class="switch_box_item">
+      <view class="switch_box_item" bindtap="changeON">
         <view class="switch_box_item_name">接诊开关</view>
         <view class="switch_box_item_btn">
           <van-switch 
             active-color="#3CC7C0"
             inactive-color="#E7E7E7" 
             size="40rpx" 
-            checked="{{ info.is_open==1  }}" 
-            bind:change="onChange" />
+            checked="{{ info.is_open==1  }}"
+            />
         </view>
       </view>
       <view class="switch_box_note">{{ note }}</view>
diff --git a/Pages/yishi/onlinesetup/index.js b/Pages/yishi/onlinesetup/index.js
index e499860..8e22fd0 100644
--- a/Pages/yishi/onlinesetup/index.js
+++ b/Pages/yishi/onlinesetup/index.js
@@ -54,8 +54,23 @@ Page({
       })
     }).catch(errors => {console.error(errors);})
   },
+  changeON(){
+    let is_open = this.data.info.is_open
+    console.log("changeON:", is_open)
+    let detail = false
+    if(is_open == 0){
+      detail = true
+    }else{
+      detail = false
+    }
+    this.doChange(detail)
+  },
   onChange({ detail }) {
+    this.doChange(detail)
+  },
+  doChange(detail){
     console.log("onChange: ", detail);
+    let is_open = 0;
     if(detail){
       let inquiry_price = this.data.info.inquiry_price;
       let check = this.checkPrice(inquiry_price);
@@ -64,10 +79,12 @@ Page({
       wx.vibrateShort({
         "type": "heavy"
       })
+      is_open = 1
     }else{
       this.setData({ note: this.data.close_note });
+      is_open = 0
     }
-    this.setData({ "info.is_open": detail });
+    this.setData({ "info.is_open": is_open });
 
      //修改开关
      let params = {};
diff --git a/Pages/yishi/onlinesetup/index.wxml b/Pages/yishi/onlinesetup/index.wxml
index fb2650f..a3f2bd4 100644
--- a/Pages/yishi/onlinesetup/index.wxml
+++ b/Pages/yishi/onlinesetup/index.wxml
@@ -2,15 +2,14 @@
 <view class="container">
   <view class="switch_box">
     <view class="switch_box_top">
-      <view class="switch_box_item">
+      <view class="switch_box_item" bindtap="changeON">
         <view class="switch_box_item_name">接诊开关</view>
         <view class="switch_box_item_btn">
           <van-switch 
             active-color="#3CC7C0"
             inactive-color="#E7E7E7" 
             size="40rpx" 
-            checked="{{ info.is_open==1 }}" 
-            bind:change="onChange" />
+            checked="{{ info.is_open==1 }}"  />
         </view>
       </view>
       <view class="switch_box_note">{{ note }}</view>
diff --git a/Pages/yishi/yizhensetup/index.js b/Pages/yishi/yizhensetup/index.js
index 68072b9..667090b 100644
--- a/Pages/yishi/yizhensetup/index.js
+++ b/Pages/yishi/yizhensetup/index.js
@@ -85,20 +85,37 @@ Page({
       amountText: val
     })
   },
+  changeON(){
+    let is_open = this.data.info.is_open
+    console.log("changeON:", is_open)
+    let detail = false
+    if(is_open == 0){
+      detail = true
+    }else{
+      detail = false
+    }
+    this.doChange(detail)
+  },
   onChange({ detail }) {
     console.log("onChange: ", detail);
-    
-      if(detail){
-        wx.vibrateShort({
-          "type": "heavy"
-        })
-      }
-     //修改开关
-     let params = {};
-     params.inquiry_type = this.data.inquiry_type;//接诊类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药）
-     params.inquiry_mode = this.data.inquiry_mode;//接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员）
-     params.is_open = detail?1:0;
-     api.putDoctorInquiryOpen(params).then(response => {
+    this.doChange(detail)
+  },
+  doChange(detail){
+    let is_open = 0;
+    if(detail){
+      wx.vibrateShort({
+        "type": "heavy"
+      })
+      is_open = 1;
+    }else{
+      is_open = 0
+    }
+    //修改开关
+    let params = {};
+    params.inquiry_type = this.data.inquiry_type;//接诊类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药）
+    params.inquiry_mode = this.data.inquiry_mode;//接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员）
+    params.is_open = detail?1:0;
+    api.putDoctorInquiryOpen(params).then(response => {
       console.log(response);
     }).then(()=>{
       if(detail){
@@ -123,8 +140,9 @@ Page({
       }else{
         this.setData({ note: this.data.close_note });
       }
-      this.setData({ "info.is_open": detail });
-    }).catch(errors => {console.error(errors);})
+      this.setData({ "info.is_open": is_open });
+    }).catch(errors => {console.error(errors);})                      
+    
   },
   subcancelDialog(){
     this.setData({
diff --git a/Pages/yishi/yizhensetup/index.wxml b/Pages/yishi/yizhensetup/index.wxml
index b0d6329..79e7df9 100644
--- a/Pages/yishi/yizhensetup/index.wxml
+++ b/Pages/yishi/yizhensetup/index.wxml
@@ -2,15 +2,15 @@
 <view class="container">
   <view class="switch_box">
     <view class="switch_box_top">
-      <view class="switch_box_item">
+      <view class="switch_box_item" bindtap="changeON">
         <view class="switch_box_item_name">接诊开关</view>
         <view class="switch_box_item_btn">
           <van-switch 
             active-color="#3CC7C0"
             inactive-color="#E7E7E7" 
             size="40rpx" 
-            checked="{{ info.is_open==1 }}" 
-            bind:change="onChange" />
+            checked="{{ info.is_open==1 }}"
+           />
         </view>
       </view>
       <view class="switch_box_note">{{ note }}</view>

From 6d442f7563c98d2c16910cb68d00824ed224c955 Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Mon, 26 Jun 2023 18:12:28 +0800
Subject: [PATCH 36/83] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/service_notice/index.wxml         |  8 +--
 .../MessageElements/BannerMessage/index.js    | 23 +++++++
 .../MessageElements/BannerMessage/index.json  |  6 ++
 .../MessageElements/BannerMessage/index.wxml  |  4 ++
 .../MessageElements/BannerMessage/index.wxss  |  1 +
 .../MessageElements/CustomMessage/index.js    |  4 +-
 .../MessageElements/CustomMessage/index.wxml  |  2 +-
 .../TUIChat/components/MessageList/index.js   | 63 +++++++++++++++++++
 .../TUIChat/components/MessageList/index.json |  3 +-
 .../TUIChat/components/MessageList/index.wxml | 16 +++--
 .../TUIChat/components/MessageList/index.wxss |  8 +++
 TUIKit/utils/constant.js                      |  2 +-
 12 files changed, 126 insertions(+), 14 deletions(-)
 create mode 100644 TUIKit/components/TUIChat/components/MessageElements/BannerMessage/index.js
 create mode 100644 TUIKit/components/TUIChat/components/MessageElements/BannerMessage/index.json
 create mode 100644 TUIKit/components/TUIChat/components/MessageElements/BannerMessage/index.wxml
 create mode 100644 TUIKit/components/TUIChat/components/MessageElements/BannerMessage/index.wxss

diff --git a/Pages/yishi/service_notice/index.wxml b/Pages/yishi/service_notice/index.wxml
index 45519cd..948895a 100644
--- a/Pages/yishi/service_notice/index.wxml
+++ b/Pages/yishi/service_notice/index.wxml
@@ -3,19 +3,19 @@
   <view class="list">
     <view class="item" wx:for="{{list}}" bindtap="go" data-item="{{item}}">
       <view class="item_top">
-        <view class="item_img" wx:if="{{item.link_params.inquiry_type == 1}}">
+        <view class="item_img" wx:if="{{item.inquiry_type == 1}}">
           <text style="margin-left: 10rpx;">在线问诊</text> 
           <van-image class="van_img" src="{{static_host}}/applet/doctor/static/images/yishi/service_notice/online.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
-        <view class="item_img" wx:if="{{item.link_params.inquiry_type == 2}}">
+        <view class="item_img" wx:if="{{item.inquiry_type == 2}}">
           <text style="margin-left: 10rpx;">快速问诊</text> 
           <van-image class="van_img" src="{{static_host}}/applet/doctor/static/images/yishi/service_notice/kuaisu.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
-        <view class="item_img" wx:if="{{item.link_params.inquiry_type == 3}}">
+        <view class="item_img" wx:if="{{item.inquiry_type == 3}}">
           <text style="margin-left: 10rpx;">公益问诊</text> 
           <van-image class="van_img" src="{{static_host}}/applet/doctor/static/images/yishi/service_notice/yizhen.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
-        <view class="item_img" wx:if="{{item.link_params.inquiry_type == 4}}">
+        <view class="item_img" wx:if="{{item.inquiry_type == 4}}">
           <text style="margin-left: 10rpx;">问诊购药</text> 
           <van-image class="van_img" src="{{static_host}}/applet/doctor/static/images/yishi/service_notice/drug.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
diff --git a/TUIKit/components/TUIChat/components/MessageElements/BannerMessage/index.js b/TUIKit/components/TUIChat/components/MessageElements/BannerMessage/index.js
new file mode 100644
index 0000000..0def034
--- /dev/null
+++ b/TUIKit/components/TUIChat/components/MessageElements/BannerMessage/index.js
@@ -0,0 +1,23 @@
+// TUIKit/components/TUIChat/components/MessageElements/BannerMessage/index.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+
+  }
+})
diff --git a/TUIKit/components/TUIChat/components/MessageElements/BannerMessage/index.json b/TUIKit/components/TUIChat/components/MessageElements/BannerMessage/index.json
new file mode 100644
index 0000000..e9b6ca8
--- /dev/null
+++ b/TUIKit/components/TUIChat/components/MessageElements/BannerMessage/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "t-message": "tdesign-miniprogram/message/message"
+  }
+}
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/components/MessageElements/BannerMessage/index.wxml b/TUIKit/components/TUIChat/components/MessageElements/BannerMessage/index.wxml
new file mode 100644
index 0000000..c117292
--- /dev/null
+++ b/TUIKit/components/TUIChat/components/MessageElements/BannerMessage/index.wxml
@@ -0,0 +1,4 @@
+<!--TUIKit/components/TUIChat/components/MessageElements/BannerMessage/index.wxml-->
+<view>
+  <t-message id="t-message" />
+</view>
diff --git a/TUIKit/components/TUIChat/components/MessageElements/BannerMessage/index.wxss b/TUIKit/components/TUIChat/components/MessageElements/BannerMessage/index.wxss
new file mode 100644
index 0000000..40474e3
--- /dev/null
+++ b/TUIKit/components/TUIChat/components/MessageElements/BannerMessage/index.wxss
@@ -0,0 +1 @@
+/* TUIKit/components/TUIChat/components/MessageElements/BannerMessage/index.wxss */
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
index 3e2fe0f..a3e5e7d 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
@@ -131,9 +131,9 @@ Component({
           return renderDom;
         }
         //8:消息内页横条(患者->医生)
-        if (customMessage.message_type === GDXZ_CUSTOM_MSEEAGE.TRABECULA_PATIENT) {
+        if (customMessage.message_type === GDXZ_CUSTOM_MSEEAGE.BANNER_MESSAGE) {
           const renderDom = [{
-            type: 'trabecula_patient',
+            type: 'banner_message',
             title: customMessage.title,
             desc: customMessage.desc,
           }];
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
index 901f8cf..c793ed4 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
@@ -45,7 +45,7 @@
     <view class="gdxz_custom_message_title">{{renderDom[0].title}}</view>
     <view class="gdxz_custom_message_desc">{{renderDom[0].desc}}</view>
   </view>
-  <!-- <view wx:if="{{renderDom[0].type==='trabecula_patient'}}" class="gdxz_custom_trabecula_message">
+  <!-- <view wx:if="{{renderDom[0].type==='banner_message'}}" class="gdxz_custom_trabecula_message">
     <view class="gdxz_custom_message_title">{{renderDom[0].title}}</view>
     <view class="gdxz_custom_message_desc">{{renderDom[0].desc}}</view>
   </view> -->
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index e13ab40..a1d3f7c 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -2,6 +2,8 @@ import logger from '../../../../utils/logger';
 import constant from '../../../../utils/constant';
 import { wechatTimeFormat } from './../../../../../utils/wechatTime'
 import { API } from '../../../../../utils/network/api';
+import Message from 'tdesign-miniprogram/message/index';
+
 const { GDXZ_CUSTOM_MSEEAGE } = constant;
 // eslint-disable-next-line no-undef
 const app = getApp();
@@ -233,6 +235,64 @@ Component({
         });
       }
     },
+    //检测是不是横幅消息
+    checkNoticeMessage(message){
+      console.log("messageList checkNoticeMessage message: ", message);
+      let cloudCustomData = "";
+      let cloudCustomDataJson = "";
+      if(message.cloudCustomData){
+        cloudCustomData = message.cloudCustomData;
+      }
+      if(cloudCustomData){
+        cloudCustomDataJson = JSON.parse(cloudCustomData);
+      }
+      let is_system = cloudCustomDataJson.is_system;
+      if(is_system != 1){//不是系统消息直接返回
+        return false
+      }
+      let payload = message.payload.data;
+      if(!payload){//没有payload
+        return false
+      }
+      const payloadData = JSON.parse(message.payload.data);
+      if(!payloadData){
+        return false
+      }
+
+      const { GDXZ_CUSTOM_MSEEAGE } = constant;
+      let message_type = payloadData.message_type
+      if (message_type === GDXZ_CUSTOM_MSEEAGE.BANNER_MESSAGE) {
+        let message_title = payloadData.title
+        let message_desc = payloadData.desc
+        let message_path = payloadData.data.message_path
+        this.setData({
+          message_title: message_title,
+          message_desc: message_desc,
+          message_path: message_path,
+        })
+        this.showTextMessage()
+      }
+    },
+    showTextMessage() {
+      Message.info({
+        context: this,
+        offset: [80, 20],
+        duration: 5000,
+        icon: false,
+        closeBtn: true,
+      });
+      wx.vibrateShort({
+        "type": "light"
+      })
+    },
+    handleMessagePath(){
+      console.log("handleMessagePath")
+      let url = this.data.message_path
+      console.log(url)
+      wx.switchTab({
+        url: url,
+      })
+    },
     refreshMessageRounds(message){
       try {
         // console.log("messageList refreshMessageRounds message: ", message);
@@ -364,6 +424,8 @@ Component({
       let autoToButtom = this.data.autoToButtom;
       // console.log("autoToButtom:", autoToButtom)
       const message = value.data[0];
+      //检测是不是横幅消息
+      this.checkNoticeMessage(message)
       //更新会话数
       this.refreshMessageRounds(message)
       if(message.flow == 'out'){
@@ -556,6 +618,7 @@ Component({
           wx.vibrateShort({
             "type": "heavy"
           })
+
         // }
       // }
     },
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.json b/TUIKit/components/TUIChat/components/MessageList/index.json
index 05e95d5..df86679 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.json
+++ b/TUIKit/components/TUIChat/components/MessageList/index.json
@@ -14,6 +14,7 @@
     "MergerMessage": "../MessageElements/MergerMessage/index",
     "RevokeMessage": "../MessageElements/RevokeMessage/index",
     "van-loading": "@vant/weapp/loading/index",
-    "van-icon": "@vant/weapp/icon/index"
+    "van-icon": "@vant/weapp/icon/index",
+    "t-message": "tdesign-miniprogram/message/message"
   }
 }
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxml b/TUIKit/components/TUIChat/components/MessageList/index.wxml
index 91284d8..87963a9 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageList/index.wxml
@@ -80,13 +80,19 @@
 </view>
 <view wx:if="{{showUpJump}}" bindtap="handleJumpUnreadMessage" >
     <view class="unread-message-item" > 
-    <view class="unread-message-box">
-    <image class="icon-left" src="../../../static/assets/up.svg"/>
-    <text wx:if="{{isLostsOfUnread}}"> 99+条未读</text>
-    <text wx:else> {{unreadCount}}条未读</text>
-    </view>
+      <view class="unread-message-box">
+        <image class="icon-left" src="../../../static/assets/up.svg"/>
+        <text wx:if="{{isLostsOfUnread}}"> 99+条未读</text>
+        <text wx:else> {{unreadCount}}条未读</text>
+      </view>
     </view>
 </view>
+<t-message id="t-message" bindtap="handleMessagePath">
+  <view slot="content">
+    <view class="content_title">{{message_title}}</view>
+    <view class="content_desc">{{message_desc}}</view>
+  </view>
+</t-message>
 <wxs src = './concat.wxs' module = 'concat'/>
 
 
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxss b/TUIKit/components/TUIChat/components/MessageList/index.wxss
index c336701..3c1a567 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageList/index.wxss
@@ -260,3 +260,11 @@
   padding-left: 5px;
   color: blue;
 }
+.content_title{
+  font-size: 32rpx;
+  color: #000;
+}
+.content_desc{
+  font-size: 28rpx;
+  color: rgb(146, 144, 144);
+}
\ No newline at end of file
diff --git a/TUIKit/utils/constant.js b/TUIKit/utils/constant.js
index 1386bbf..bbb9fa9 100644
--- a/TUIKit/utils/constant.js
+++ b/TUIKit/utils/constant.js
@@ -48,7 +48,7 @@ const constant = {
     PATIENT_SYSTEM_MESSAGES: 5,//5:患者端系统消息
     PRESCRIBE: 6,//6:处方开具成功（医生端）
     PRESCRIBE_VERIFY: 7,//7:处方审核通过（患者端）
-    TRABECULA_PATIENT: 8,//8:消息内页横条(患者->医生)
+    BANNER_MESSAGE: 8,//8 弹框消息
   },
 
   OPERATING_ENVIRONMENT: 'imWxTuikit'

From 961bb4489769f90368bbd601193cdfb9511f0c74 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Mon, 26 Jun 2023 18:32:23 +0800
Subject: [PATCH 37/83] =?UTF-8?q?zjd=20=E5=8C=BB=E5=B8=88=E7=AB=AF?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=BB=8F=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/mycard/index.wxml | 2 +-
 project.config.json           | 5 +++--
 utils/network/request.js      | 7 ++++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Pages/yishi/mycard/index.wxml b/Pages/yishi/mycard/index.wxml
index 5e13948..1c02a13 100644
--- a/Pages/yishi/mycard/index.wxml
+++ b/Pages/yishi/mycard/index.wxml
@@ -14,7 +14,7 @@
     <t-avatar class="avatar" size="large" image="{{info.avatar}}" />
   </view>
   <view class="qrcode">
-    <van-image bindtap="showVisible" src="{{info.qr_code_url}}" fit="heightFix" width="150" height="150" aria-label="qrcode" />
+    <van-image bindtap="showVisible" src="{{info.qr_code_url+'?v=2.0'}}" fit="heightFix" width="150" height="150" aria-label="qrcode" />
     <text>让您的患者微信扫码，线上复诊更便捷</text>
   </view>
 
diff --git a/project.config.json b/project.config.json
index c7573b0..6bff22f 100644
--- a/project.config.json
+++ b/project.config.json
@@ -38,8 +38,9 @@
     },
     "disableUseStrict": false,
     "useCompilerPlugins": false,
-    "minifyWXML": true,
-    "condition": false
+    "minifyWXML": false,
+    "condition": false,
+    "ignoreUploadUnusedFiles": true
   },
   "condition": {},
   "editorSetting": {
diff --git a/utils/network/request.js b/utils/network/request.js
index 06d49db..791282c 100644
--- a/utils/network/request.js
+++ b/utils/network/request.js
@@ -1,4 +1,9 @@
-const env = require('./config').dev
+const { envVersion } = wx.getAccountInfoSync().miniProgram;
+if(envVersion=="develop" || envVersion=="trial"){
+  let env = require('./config').dev
+}else{
+  let env = require('./config').prod
+};
 class HTTP {
   constructor() {
     this.baseUrl = env.baseUrl,

From e9b5eca7ec8d10fd6e692c29d0423eb608a93280 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Mon, 26 Jun 2023 18:47:12 +0800
Subject: [PATCH 38/83] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 utils/network/request.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/utils/network/request.js b/utils/network/request.js
index 791282c..7542bc1 100644
--- a/utils/network/request.js
+++ b/utils/network/request.js
@@ -1,8 +1,9 @@
 const { envVersion } = wx.getAccountInfoSync().miniProgram;
+let env='';
 if(envVersion=="develop" || envVersion=="trial"){
-  let env = require('./config').dev
+  env = require('./config').dev
 }else{
-  let env = require('./config').prod
+  env = require('./config').prod
 };
 class HTTP {
   constructor() {

From 34e177d957d47bb04d7096a7e22c1777bcba683d Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Mon, 26 Jun 2023 18:50:14 +0800
Subject: [PATCH 39/83] test git

---
 Pages/index/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Pages/index/index.js b/Pages/index/index.js
index 34f3c2c..e79b0df 100644
--- a/Pages/index/index.js
+++ b/Pages/index/index.js
@@ -59,5 +59,6 @@ Page({
     }else{
       app.go(app.globalData.login_url);
     }
+    //test git
   }
 })

From 833def112c107249e2cdac378d884932661aa22c Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Thu, 10 Aug 2023 16:17:27 +0800
Subject: [PATCH 40/83] =?UTF-8?q?8.10=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=20=E7=B3=96=E7=BB=84=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/case/index.js                     |   5 +-
 Pages/yishi/case/index.json                   |   1 +
 Pages/yishi/case/index.wxml                   |  11 +-
 Pages/yishi/case/index.wxss                   |  17 ++
 Pages/yishi/medince_list/index.js             | 136 ++++++++++++++
 Pages/yishi/medince_list/index.json           |   9 +
 Pages/yishi/medince_list/index.wxml           |  35 ++++
 Pages/yishi/medince_list/index.wxss           | 117 ++++++++++++
 Pages/yishi/my/index.wxml                     |   7 +-
 Pages/yishi/my/index.wxss                     |  12 +-
 Pages/yishi/mycard/index.js                   |   2 +
 Pages/yishi/mycard/index.wxml                 |   2 +-
 Pages/yishi/onlinechufang/index.js            |  21 ++-
 Pages/yishi/onlinechufang/index.wxml          | 171 +++---------------
 Pages/yishi/wenzhen_v2/wenzhen.js             |  52 ++++--
 Pages/yishi/wenzhen_v2/wenzhen.wxml           |  58 +++++-
 .../MessageElements/CustomMessage/index.js    |  34 ++++
 .../MessageElements/CustomMessage/index.json  |   3 +-
 .../MessageElements/CustomMessage/index.wxml  |  31 +++-
 .../MessageElements/CustomMessage/index.wxss  | 100 ++++++++++
 .../TUIChat/components/MessageList/concat.wxs |  10 +-
 .../TUIChat/components/MessageList/index.js   |   8 +-
 .../TUIChat/components/MessageList/index.wxml |   3 +-
 .../TUIChat/components/MessageList/index.wxss |   8 +
 TUIKit/static/images/back.png                 | Bin 0 -> 462 bytes
 TUIKit/static/images/patient_bg.png           | Bin 0 -> 7969 bytes
 TUIKit/utils/constant.js                      |   2 +
 app.json                                      |   3 +-
 .../images/yishi/tabbar_icon/medinceList.png  | Bin 0 -> 27425 bytes
 static/images/yishi/tabbar_icon/ss.png        | Bin 0 -> 1235 bytes
 static/images/yishi/tabbar_icon/zhiyao.png    | Bin 0 -> 2673 bytes
 utils/debounce.js                             |  10 +
 utils/network/api.js                          |  10 +
 33 files changed, 688 insertions(+), 190 deletions(-)
 create mode 100644 Pages/yishi/medince_list/index.js
 create mode 100644 Pages/yishi/medince_list/index.json
 create mode 100644 Pages/yishi/medince_list/index.wxml
 create mode 100644 Pages/yishi/medince_list/index.wxss
 create mode 100644 TUIKit/static/images/back.png
 create mode 100644 TUIKit/static/images/patient_bg.png
 create mode 100644 static/images/yishi/tabbar_icon/medinceList.png
 create mode 100644 static/images/yishi/tabbar_icon/ss.png
 create mode 100644 static/images/yishi/tabbar_icon/zhiyao.png
 create mode 100644 utils/debounce.js

diff --git a/Pages/yishi/case/index.js b/Pages/yishi/case/index.js
index 6ba2470..84ebf13 100644
--- a/Pages/yishi/case/index.js
+++ b/Pages/yishi/case/index.js
@@ -19,8 +19,11 @@ Page({
     })
 
   },
+  goReport(event){
+    const url=event.currentTarget.dataset.url;
+  },
   formatImgList(){
-    let diagnose_images = this.data.case_detail.diagnose_images;
+    let diagnose_images = this.data.case_detail.diagnose_images?this.data.case_detail.diagnose_images:[];
     let img_list = [];
     diagnose_images.forEach(item => {
       let img = {};
diff --git a/Pages/yishi/case/index.json b/Pages/yishi/case/index.json
index 3e38f1a..a00e82d 100644
--- a/Pages/yishi/case/index.json
+++ b/Pages/yishi/case/index.json
@@ -2,6 +2,7 @@
   "component": true,
   "usingComponents": {
     "te-nav-bar": "/commpents/te_navbar",
+    "van-icon": "@vant/weapp/icon/index",
     "van-uploader": "@vant/weapp/uploader/index"
   }
 }
\ No newline at end of file
diff --git a/Pages/yishi/case/index.wxml b/Pages/yishi/case/index.wxml
index baac024..56cf2e2 100644
--- a/Pages/yishi/case/index.wxml
+++ b/Pages/yishi/case/index.wxml
@@ -58,7 +58,16 @@
 
     </view>
   </view>
-
+  <view class="sugarbox" wx:if="{{case_detail.detection_project}}" bindtap="goReport" data-url="{{case_detail.detection_link}}">
+    <view class="main_title">{{case_detail.detection_project_name}}</view>
+  <view class="data_box sugar">
+     <view class="sugar_left">
+        <view class="name">糖组检测</view>
+        <view class="date">{{case_detail.detection_time}}</view>
+     </view>
+     <van-icon name="arrow" />
+  </view>
+  </view>
   <view class="main_title" wx:if="{{!(case_detail.is_taboo == null && case_detail.is_allergy_history == null && case_detail.is_family_history == null && case_detail.is_pregnant == null && case_detail.drink_wine_status == null && case_detail.smoke_status == null && case_detail.is_operation == null && case_detail.chemical_compound_status == null  && case_detail.chemical_compound_status == null)}}">其他信息</view>
   <view class="data_box orther" wx:if="{{!(case_detail.is_taboo == null && case_detail.is_allergy_history == null && case_detail.is_family_history == null && case_detail.is_pregnant == null && case_detail.drink_wine_status == null && case_detail.smoke_status == null && case_detail.is_operation == null && case_detail.chemical_compound_status == null  && case_detail.chemical_compound_status == null)}}">
     <view class="disease_box">
diff --git a/Pages/yishi/case/index.wxss b/Pages/yishi/case/index.wxss
index 811db02..e416964 100644
--- a/Pages/yishi/case/index.wxss
+++ b/Pages/yishi/case/index.wxss
@@ -100,3 +100,20 @@ page{
   margin-bottom: 50rpx;
 }
 
+.sugar{
+  display: flex;
+  align-items: center;
+  justify-content:space-between ;
+}
+.sugar .name{
+  color:#333;
+ 
+  font-size: 30rpx;
+}
+.sugar .date{
+  margin-top: 12rpx;
+  font-size: 24rpx;
+  font-weight: 400;
+  color: rgba(0,0,0,0.45);
+  
+}
\ No newline at end of file
diff --git a/Pages/yishi/medince_list/index.js b/Pages/yishi/medince_list/index.js
new file mode 100644
index 0000000..b3c975b
--- /dev/null
+++ b/Pages/yishi/medince_list/index.js
@@ -0,0 +1,136 @@
+// Pages/yishi/medince_list/index.js
+import { API } from './../../../utils/network/api'
+import debounce from "./../../../utils/debounce"
+let api = new API()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    navbarData: {
+    
+      showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
+      title: '药品清单', //导航栏 中间的标题
+    },
+    page:1,
+    list:[],
+    isLock:false,
+    per_page:10,
+    keyword:'',
+  },
+  changeInput:debounce(function(event){
+    const { value }= event.detail;
+    this.setData({
+      isLock:false,
+      page:1,
+      list:[],
+      keyword:value
+    })
+    this.handleGetList();
+  },600),
+  goSearch(){
+    this.setData({
+      isLock:false,
+      list:[],
+      page:1
+    })
+    this.handleGetList();
+  },
+  confirmSearch(event){
+    const { value }= event.detail;
+    this.setData({
+      isLock:false,
+      list:[],
+      page:1,
+      keyword:value
+    })
+    this.handleGetList();
+  },
+  lower(){
+    console.log('===触底了！！===');
+  let {page,isLock}=this.data;
+   if(!isLock){
+        page++;
+      this.setData({
+        page:page
+      });
+      this.handleGetList();
+   }
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  handleGetList(){
+    const {page,per_page,keyword}=this.data;
+    api.getMedinceList({
+      page,
+      per_page,
+      keyword,
+
+    }).then(data=>{
+      let result=data.data.data;
+      if(result.length==0){
+         this.setData({
+          isLock:true
+        });
+        return false;
+      }     
+      this.setData({
+        list:this.data.list.concat(result)
+      });
+    }).catch(errors => {console.error(errors);})
+  },
+  onLoad(options) {
+    this.handleGetList();
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/Pages/yishi/medince_list/index.json b/Pages/yishi/medince_list/index.json
new file mode 100644
index 0000000..152dd7f
--- /dev/null
+++ b/Pages/yishi/medince_list/index.json
@@ -0,0 +1,9 @@
+{
+  "component": true,
+  "usingComponents": {
+    "te-nav-bar": "/commpents/te_navbar",
+    "van-image": "@vant/weapp/image/index",
+    "van-divider": "@vant/weapp/divider/index",
+    "van-empty": "@vant/weapp/empty/index"
+  }
+}
\ No newline at end of file
diff --git a/Pages/yishi/medince_list/index.wxml b/Pages/yishi/medince_list/index.wxml
new file mode 100644
index 0000000..3e27bea
--- /dev/null
+++ b/Pages/yishi/medince_list/index.wxml
@@ -0,0 +1,35 @@
+<!--Pages/yishi/medince_list/index.wxml-->
+<te-nav-bar navbar-data='{{navbarData}}'></te-nav-bar>
+<view class="container">
+  <view class="searchCon">
+    <view class="searchbox">
+      <input type="text" 	value="" class="searchIpt" placeholder="请输入药品名称" 	confirm-type="search" 	bindinput="changeInput"	bindconfirm="confirmSearch"/>
+      <image src="../../../static/images/yishi/tabbar_icon/ss.png" mode="" class="searchImg" bindtap="goSearch"/>
+    </view>
+  </view>
+  <scroll-view scroll-y="true" class="scrollbox"  bindscrolltolower="lower" wx:if="{{list.length>0}}" >
+    <view class="cell" wx:for="{{list}}" wx:key="product_id" >
+    <view class="medimgbox">
+        <view class="tips">
+         <view class="desc">处方药品</view>
+         <view class="desc">依据法规不展示包装</view>
+        </view>
+       <image class="medImg" src="../../../static/images/yishi/tabbar_icon/zhiyao.png" mode=""/>
+    </view>
+
+      <view class="rightbox">
+        <view class="info">
+           <view class="name">{{item.product_name}}/{{item.packaging_unit}}</view>
+           <view class="company">{{item.manufacturer}}</view>
+        </view>
+        <view class="bottombox">
+          <view class="price">¥ {{item.product_price}}</view>
+          <view class="num">库存：{{item.stock}}</view>
+        </view>
+      </view>
+    </view>
+    <van-divider contentPosition="center" wx:if="{{list.length > 0 && isLock}}">到底了~</van-divider>
+  </scroll-view>
+  <van-empty description="暂无数据" wx:if="{{list.length == 0}}" />
+ 
+</view>
\ No newline at end of file
diff --git a/Pages/yishi/medince_list/index.wxss b/Pages/yishi/medince_list/index.wxss
new file mode 100644
index 0000000..baefab1
--- /dev/null
+++ b/Pages/yishi/medince_list/index.wxss
@@ -0,0 +1,117 @@
+/* Pages/yishi/medince_list/index.wxss */
+page{
+  height:100vh;
+  background-color: #F6F6F6;
+}
+ .container{
+  height:calc(100vh - 135rpx);
+  display: flex; 
+  overflow: hidden;
+   /* overflow-y: scroll; */
+  /* -webkit-overflow-scrolling: touch;  */
+  flex-direction: column;
+}
+.searchCon{
+  width:100%;
+  
+  background:#fff;
+}
+.searchbox{
+  display: flex;
+  margin:32rpx;
+  align-items: center;
+  height: 80rpx;
+background: #FFFFFF;
+border-radius: 40rpx;
+border: 2rpx solid #3CC7C0;
+
+}
+.searchIpt{
+  flex:1;
+  margin-left: 32px;
+}
+.searchImg{
+  width: 40rpx;
+  height:40rpx;
+  padding:30rpx;
+}
+.tips{
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  position: absolute;
+  width: 200rpx;
+  height:200rpx;
+  font-size: 22rpx;
+font-weight: 400;
+color: #666666;
+}
+.desc{
+  text-align: center;
+}
+.medimgbox{
+  position: relative;
+  width: 200rpx;
+  height:200rpx;
+  margin-left: 30rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius:5rpx;
+}
+.medImg{
+ width:120rpx;
+ height:128rpx;
+ 
+}
+.cell{
+  padding:20rpx 0;
+  background: #FFFFFF;
+box-shadow: 0rpx 2rpx 16rpx 2rpx rgba(0,0,0,0.02);
+border-radius: 12rpx;
+  margin:0 32rpx 20rpx;
+  display: flex;
+}
+.rightbox{
+  flex:1;
+  margin-left: 24rpx;
+  margin-right: 20rpx;
+}
+.scrollbox{
+  margin-top: 20rpx;
+  flex:1;
+   overflow-y: scroll;
+  -webkit-overflow-scrolling: touch; 
+}
+.bottombox{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.info .name{
+  word-break: break-all;
+font-size: 32rpx;
+ font-weight: 600;
+color: rgba(0,0,0,0.85);
+}
+.company{
+  margin-top: 5rpx;
+  font-size: 26rpx;
+font-weight: 400;
+color: rgba(0,0,0,0.45);
+}
+.price{
+  font-size: 28rpx;
+color: #EF4F20;
+}
+.rightbox{
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+
+}
+.num{
+  font-size: 28rpx;
+font-weight: 400;
+color: rgba(0,0,0,0.65);
+}
\ No newline at end of file
diff --git a/Pages/yishi/my/index.wxml b/Pages/yishi/my/index.wxml
index 2b15b8f..f264281 100644
--- a/Pages/yishi/my/index.wxml
+++ b/Pages/yishi/my/index.wxml
@@ -1,7 +1,7 @@
 <view class="container">
   <view class="top"></view>
   <view class="title" style="top: {{stateHeight}}px;height: {{navHeight}}px;line-height: {{navHeight}}px;">{{ title }}</view>
-  <view class="info_box" style="top: {{stateHeight}}px;">
+  <view class="info_box" >
     <!-- 跳转我的信息 -->
     <view class="photo" bindtap="go" data-url="/Pages/yishi/myinfo/index">
       <t-avatar class="avatar" size="large" image="{{avatar}}" />
@@ -18,7 +18,7 @@
     </view>
   </view>
 
-  <view class="account" style="top: {{stateHeight}}px;">
+  <view class="account" >
     <view class="account_top">
       <view class="account_top_left">
         <view class="account_title">
@@ -47,7 +47,8 @@
     </view>
   </view>
 
-  <view class="content" style="top: calc(20rpx + {{stateHeight}}px);">
+  <view class="content">
+    <van-cell size="large" url="/Pages/yishi/medince_list/index" link-type="navigateTo" title-style="font-size: 34rpx;" title="药品清单" is-link />
     <van-cell size="large" url="/Pages/yishi/myaccount/index" link-type="navigateTo" title-style="font-size: 34rpx;" title="我的账户" is-link />
     <van-cell size="large" url="/Pages/yishi/bankcard/index" link-type="navigateTo" title-style="font-size: 34rpx;" title="我的银行卡" is-link />
     <van-cell size="large" url="/Pages/yishi/mycard/index" link-type="navigateTo" title-style="font-size: 34rpx;" title="我的名片" is-link  />
diff --git a/Pages/yishi/my/index.wxss b/Pages/yishi/my/index.wxss
index 09dd19c..1d4d4ec 100644
--- a/Pages/yishi/my/index.wxss
+++ b/Pages/yishi/my/index.wxss
@@ -2,6 +2,10 @@ page{
   background-color: #F5F5F5;
 }
 .container{
+  background: linear-gradient(180deg, #3CC7C0 0%, rgba(60,199,192,0) 50%);
+
+  padding-bottom: 100rpx;
+  min-height:100vh;
   width: 100vw;
   color: #fff;
   position: relative;
@@ -9,7 +13,7 @@ page{
 .top{
   width: 100%;
   height: 500rpx;
-  background-color: #3CC7C0;
+  /* background-color: #3CC7C0; */
   position: absolute;
 }
 .title{
@@ -17,6 +21,7 @@ page{
   text-align: center;
 }
 .info_box{
+  margin-top: 24rpx;
   width: 100%;
   height: 200rpx;
   position: relative;
@@ -62,6 +67,7 @@ page{
   width: 92vw;
   margin: 0 auto;
   height: 272rpx;
+  margin-top: 24rpx;
   position: relative;
   border-radius: 20rpx;
   display: flex;
@@ -104,8 +110,8 @@ page{
 .content{
   width: 92vw;
   background-color: #fff;
-  margin: 0 auto;
-  position: relative;
+  margin: 24rpx auto 0;
+  position: static;
   border-radius: 20rpx;
   padding: 20rpx 0;
 }
diff --git a/Pages/yishi/mycard/index.js b/Pages/yishi/mycard/index.js
index 1277699..c733b4b 100644
--- a/Pages/yishi/mycard/index.js
+++ b/Pages/yishi/mycard/index.js
@@ -12,6 +12,7 @@ Page({
     showText: false,
     saveImgPath: "",
     info: {},
+    codeImg:'',
     //  https://github.com/Kujiale-Mobile/Painter
     template: {
       width: '750px',
@@ -160,6 +161,7 @@ Page({
       console.log(response);
       this.setData({
        info: response.data,
+       codeImg:response.data.qr_code_url+"?v=3.0",
        "template.views[3].url" : response.data.qr_code_url,
        "template.views[4].url" : response.data.avatar,
        "template.views[5].text" : response.data.user_name,
diff --git a/Pages/yishi/mycard/index.wxml b/Pages/yishi/mycard/index.wxml
index 1c02a13..e04e41c 100644
--- a/Pages/yishi/mycard/index.wxml
+++ b/Pages/yishi/mycard/index.wxml
@@ -14,7 +14,7 @@
     <t-avatar class="avatar" size="large" image="{{info.avatar}}" />
   </view>
   <view class="qrcode">
-    <van-image bindtap="showVisible" src="{{info.qr_code_url+'?v=2.0'}}" fit="heightFix" width="150" height="150" aria-label="qrcode" />
+    <van-image bindtap="showVisible" src="{{codeImg}}" fit="heightFix" width="150" height="150" aria-label="qrcode" />
     <text>让您的患者微信扫码，线上复诊更便捷</text>
   </view>
 
diff --git a/Pages/yishi/onlinechufang/index.js b/Pages/yishi/onlinechufang/index.js
index 5f52d24..5ba3f6b 100644
--- a/Pages/yishi/onlinechufang/index.js
+++ b/Pages/yishi/onlinechufang/index.js
@@ -10,6 +10,8 @@ Page({
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '在线开方', //导航栏 中间的标题
     },
+    autoHeight:{ minHeight: 100},
+    add_disease_desc:'',//医生填写的病情主诉
     height: app.globalData.height,   
     zhenduan_popshow: false,
     drugs_popshow: false,
@@ -323,6 +325,11 @@ Page({
       })
     }
   },
+  onChangeTextAraa(event){
+    this.setData({
+      add_disease_desc:event.detail
+    })
+  },
   getAdvice(e){
     console.log(e.detail.value)
     this.setData({
@@ -351,7 +358,19 @@ Page({
     params.prescription_product = this.data.drugs_box_item_list;
 
     console.log(params);
-
+    //糖组检测需要填病情主诉；
+    let disease_desc=this.data.case_detail.disease_desc;
+    params.disease_desc=disease_desc?disease_desc:this.data.add_disease_desc;
+    if(!params.disease_desc){
+      wx.showToast({
+        title: '请填写病情主诉',
+        icon: "error"
+      })
+      this.setData({
+        sub_disabled: false
+      })
+      return;
+    }
     if(prescription_icd.length == 0){
       wx.showToast({
         title: '请选择诊断',
diff --git a/Pages/yishi/onlinechufang/index.wxml b/Pages/yishi/onlinechufang/index.wxml
index 649fa42..8e0ea30 100644
--- a/Pages/yishi/onlinechufang/index.wxml
+++ b/Pages/yishi/onlinechufang/index.wxml
@@ -1,5 +1,5 @@
 <!-- <page-meta page-style="{{ page_meta_show ? 'overflow: hidden;' : '' }}" /> -->
-<te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
+<te-nav-bar navbar-data='{{navbarData}}'></te-nav-bar>
 <view class="container">
   <view class="item">
     <!-- 头部 -->
@@ -12,7 +12,8 @@
     <view class="item_content">
       <view class="item_content_li">
         <view class="item_content_li_title">病情主诉：</view>
-        <view class="item_content_li_txt">{{case_detail.disease_desc}}</view>
+      <van-field value="{{add_disease_desc}}" class="item_content_li_txt" label="" custom-style="border:1px solid #dfdfdf;border-radius:8rpx;" type="textarea" maxlength="500" placeholder="请填写患者病情"  show-word-limit="{{true}}" autosize="{{autoHeight}}" wx:if="{{!case_detail.disease_desc}}" bind:change="onChangeTextAraa"/>
+        <view class="item_content_li_txt" wx:else>{{case_detail.disease_desc}}</view> 
       </view>
       <view class="item_content_li" wx:if="{{case_detail.product.length > 0}}">
         <view class="item_content_li_title">用药意向：</view>
@@ -30,11 +31,11 @@
   </view>
 
   <van-cell-group inset>
-    <van-cell use-label-slot bind:click="showZhenDuan" custom-style="font-size:30rpx;color: #333;" title="诊断" >
+    <van-cell use-label-slot bind:click="showZhenDuan" custom-style="font-size:30rpx;color: #333;" title="诊断">
       <view class="addzhenduan" wx:if="{{from != 'chat'}}">+添加诊断</view>
       <view slot="label" style="width: 180%;">
         <view style="margin-top: 20rpx;" class="label_item" wx:for="{{zhenduan_list}}">
-          <van-icon name="delete" catchtap="delZhenDuan" color="red" data-disease_class_id="{{item.icd_id}}" wx:if="{{from != 'chat'}}"/>
+          <van-icon name="delete" catchtap="delZhenDuan" color="red" data-disease_class_id="{{item.icd_id}}" wx:if="{{from != 'chat'}}" />
           <text style="margin-left: 10rpx;">{{item.icd_name}}</text>
         </view>
       </view>
@@ -77,140 +78,38 @@
   </form>
 
 
-  <van-popup
-    show="{{ drugs_popshow }}"
-    closeable
-    round
-    position="bottom"
-    custom-style=""
-    bind:close="onClose"
-  >
+  <van-popup show="{{ drugs_popshow }}" closeable round position="bottom" custom-style="" bind:close="onClose">
     <view class="pop_title">添加药品</view>
 
     <view class="search_drug">
       <view class="search_drug_btn">
         <text class="search_drug_btn_title">药品名称</text>
-        <van-search model:value="{{ product_name }}" 
-        class="search_drug_btn_input" 
-        clearable shape="round" 
-        placeholder="请输入药品名称或拼音码搜索"
-        bind:change="onDrugChange"
-         />
+        <van-search model:value="{{ product_name }}" class="search_drug_btn_input" clearable shape="round" placeholder="请输入药品名称或拼音码搜索" bind:change="onDrugChange" />
       </view>
 
       <view class="search_drug_list" wx:if="{{ !drug_content_show }}">
         <view class="search_drug_list_empty" wx:if="{{ search_drug_list_empty }}">
-          <van-image
-            width="300rpx"
-            height="300rpx"
-            fit="contain"
-            src="{{static_host}}/applet/doctor/static/images/yishi/search_drugs.png"
-          />
+          <van-image width="300rpx" height="300rpx" fit="contain" src="{{static_host}}/applet/doctor/static/images/yishi/search_drugs.png" />
         </view>
         <view class="search_drug_list_noempty" wx:if="{{ !search_drug_list_empty }}">
-          <view class="search_drug_list_item" 
-            data-product_name="{{item.product_name}}" 
-            data-product_id="{{item.product_id}}" 
-            data-single_use="{{item.single_use}}" 
-            data-frequency_use="{{item.frequency_use}}" 
-            data-single_unit="{{item.single_unit}}" 
-            data-available_days="{{item.available_days}}" 
-            data-packaging_unit="{{item.packaging_unit}}" 
-            bindtap="select_drug" 
-            wx:for="{{search_drug_list}}">
-          <view>{{item.product_name}}</view>
-          <view style="font-size: 26rpx;color: #3CC7C0;">{{item.manufacturer}}</view>
+          <view class="search_drug_list_item" data-product_name="{{item.product_name}}" data-product_id="{{item.product_id}}" data-single_use="{{item.single_use}}" data-frequency_use="{{item.frequency_use}}" data-single_unit="{{item.single_unit}}" data-available_days="{{item.available_days}}" data-packaging_unit="{{item.packaging_unit}}" bindtap="select_drug" wx:for="{{search_drug_list}}">
+            <view>{{item.product_name}}</view>
+            <view style="font-size: 26rpx;color: #3CC7C0;">{{item.manufacturer}}</view>
           </view>
           <!-- <view class="search_drug_list_item" data-search_value="恩替卡韦分散片" bindtap="select_drug">恩替卡韦分散片  0.5mg*7粒*3版</view>
           <view class="search_drug_list_item" data-search_value="恩替卡韦片" bindtap="select_drug">恩替卡韦片 0.5mg*7粒*3版</view> -->
         </view>
       </view>
     </view>
-    
+
     <van-cell-group wx:if="{{ drug_content_show }}">
-      <van-field
-        label="用法"
-        type="text"
-        model:value="{{save_durg_single_use}}"
-        input-align="left"
-        placeholder="请输入用法（口服）"
-        custom-style="font-size: 30rpx;"
-        clearable
-        confirm-type="next"
-        bind:confirm="changeFocus"
-        data-next_filed_focus="save_durg_frequency_use"
-        focus="{{now_filed_focus == 'save_durg_single_use'}}"
-        border="{{ true }}"
-      />
-      <van-field
-        label="用次"
-        type="text"
-        model:value="{{save_durg_frequency_use}}"
-        input-align="left"
-        placeholder="请输入服用次（一日1次）"
-        custom-style="font-size: 30rpx;"
-        clearable
-        confirm-type="next"
-        bind:confirm="changeFocus"
-        data-next_filed_focus="save_durg_single_unit"
-        focus="{{now_filed_focus == 'save_durg_frequency_use'}}"
-        border="{{ true }}"
-      />
-      <van-field
-        label="用量"
-        type="text"
-        model:value="{{save_durg_single_unit}}"
-        input-align="left"
-        placeholder="请输入用量（一次3粒）"
-        custom-style="font-size: 30rpx;"
-        clearable
-        confirm-type="next"
-        bind:confirm="changeFocus"
-        data-next_filed_focus="save_durg_available_days"
-        focus="{{now_filed_focus == 'save_durg_single_unit'}}"
-        border="{{ true }}"
-      />
-      <van-field
-        label="用药天数"
-        type="text"
-        model:value="{{save_durg_available_days}}"
-        input-align="left"
-        placeholder="请输入时长"
-        custom-style="font-size: 30rpx;"
-        clearable
-        confirm-type="next"
-        bind:confirm="changeFocus"
-        data-next_filed_focus="save_durg_prescription_product_num"
-        focus="{{now_filed_focus == 'save_durg_available_days'}}"
-        border="{{ true }}"
-      />
-      <van-field
-        label="药品数量"
-        type="number"
-        bind:input="get_save_durg_prescription_product_num"
-        value="{{save_durg_prescription_product_num}}"
-        input-align="left"
-        placeholder="请输入数量"
-        custom-style="font-size: 30rpx;"
-        clearable
-        confirm-type="next"
-        bind:confirm="changeFocus"
-        data-next_filed_focus="save_durg_packaging_unit"
-        focus="{{now_filed_focus == 'save_durg_prescription_product_num'}}"
-        border="{{ true }}"
-      />
-      <van-field
-        label="单位"
-        type="text"
-        model:value="{{save_durg_packaging_unit}}"
-        input-align="left"
-        placeholder="盒/袋"
-        custom-style="font-size: 30rpx;"
-        clearable
-        confirm-type="done"
-        border="{{ true }}"
-      />
- 
+      <van-field label="用法" type="text" model:value="{{save_durg_single_use}}" input-align="left" placeholder="请输入用法（口服）" custom-style="font-size: 30rpx;" clearable confirm-type="next" bind:confirm="changeFocus" data-next_filed_focus="save_durg_frequency_use" focus="{{now_filed_focus == 'save_durg_single_use'}}" border="{{ true }}" />
+      <van-field label="用次" type="text" model:value="{{save_durg_frequency_use}}" input-align="left" placeholder="请输入服用次（一日1次）" custom-style="font-size: 30rpx;" clearable confirm-type="next" bind:confirm="changeFocus" data-next_filed_focus="save_durg_single_unit" focus="{{now_filed_focus == 'save_durg_frequency_use'}}" border="{{ true }}" />
+      <van-field label="用量" type="text" model:value="{{save_durg_single_unit}}" input-align="left" placeholder="请输入用量（一次3粒）" custom-style="font-size: 30rpx;" clearable confirm-type="next" bind:confirm="changeFocus" data-next_filed_focus="save_durg_available_days" focus="{{now_filed_focus == 'save_durg_single_unit'}}" border="{{ true }}" />
+      <van-field label="用药天数" type="text" model:value="{{save_durg_available_days}}" input-align="left" placeholder="请输入时长" custom-style="font-size: 30rpx;" clearable confirm-type="next" bind:confirm="changeFocus" data-next_filed_focus="save_durg_prescription_product_num" focus="{{now_filed_focus == 'save_durg_available_days'}}" border="{{ true }}" />
+      <van-field label="药品数量" type="number" bind:input="get_save_durg_prescription_product_num" value="{{save_durg_prescription_product_num}}" input-align="left" placeholder="请输入数量" custom-style="font-size: 30rpx;" clearable confirm-type="next" bind:confirm="changeFocus" data-next_filed_focus="save_durg_packaging_unit" focus="{{now_filed_focus == 'save_durg_prescription_product_num'}}" border="{{ true }}" />
+      <van-field label="单位" type="text" model:value="{{save_durg_packaging_unit}}" input-align="left" placeholder="盒/袋" custom-style="font-size: 30rpx;" clearable confirm-type="done" border="{{ true }}" />
+
       <!-- <van-cell title="备注" bind:click="showNotePopup" is-link value="请选择" /> -->
 
       <van-button bind:click="saveDrugs" custom-style="width: 90%;border-radius: 10rpx; margin: 20rpx auto;" type="primary" color="#3CC7C0" block>保存</van-button>
@@ -218,35 +117,13 @@
     </van-cell-group>
   </van-popup>
 
-  <van-popup
-    show="{{ note_popshow }}"
-    round
-    position="bottom"
-    custom-style=""
-    bind:close="onCloseNote"
-  >
-    <van-picker 
-      show-toolbar
-      columns="{{ note_columns }}" 
-      title="选择备注"
-      bind:cancel="onCancelNote"
-      bind:confirm="onConfirmNote" 
-      bind:change="onChangeNote" />
+  <van-popup show="{{ note_popshow }}" round position="bottom" custom-style="" bind:close="onCloseNote">
+    <van-picker show-toolbar columns="{{ note_columns }}" title="选择备注" bind:cancel="onCancelNote" bind:confirm="onConfirmNote" bind:change="onChangeNote" />
   </van-popup>
 
-  <van-popup
-    show="{{ zhenduan_popshow }}"
-    closeable
-    position="bottom"
-    custom-style="height: calc(100vh - {{height*2 + 20}}px);"
-    bind:close="onZhenduanClose"
-  >
+  <van-popup show="{{ zhenduan_popshow }}" closeable position="bottom" custom-style="height: calc(100vh - {{height*2 + 20}}px);" bind:close="onZhenduanClose">
     <view style="padding-left: 20rpx;font-size: 30rpx;color: #000;margin: 20rpx 0;">诊断</view>
-    <van-field
-      model:value="{{ disease_class_name }}"
-      placeholder="请输入疾病名称"
-      bind:change="onZhenDuanChange"
-    />
+    <van-field model:value="{{ disease_class_name }}" placeholder="请输入疾病名称" bind:change="onZhenDuanChange" />
     <view class="zhenduan_data_list">
       <view bindtap="addZhenDuan" class="zhenduan_item" data-icd_name="{{item.icd_name}}" data-icd_id="{{item.icd_id}}" wx:for="{{zhenduan_search_list}}">
         {{item.icd_name}}
@@ -258,4 +135,4 @@
 <view style="height: 50rpx;">
 
 </view>
-<van-dialog id="van-dialog" confirm-button-color="#3CC7C0"/>
\ No newline at end of file
+<van-dialog id="van-dialog" confirm-button-color="#3CC7C0" />
\ No newline at end of file
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index a198244..f7e768b 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -12,15 +12,16 @@ Page({
     height: app.globalData.height, 
     static_host: api.getStaticHost(),
     has_data: false,
-    data_list_1: [],
-    data_list_2: [],
-    data_list_3: [],
-    data_list_4: [],
-    data_list_5: [],
-    data_list_5_loading: false,
+    data_list_1: [],//在线问诊
+    data_list_2: [],//快速问诊
+    data_list_3: [],//公益问诊
+    data_list_4: [], //问诊购药
+    data_list_5: [],//糖组检测
+    data_list_6: [],//问诊结束
+    data_list_6_loading: false,
     conversationList: [],
     message_inquiry_type: 99999,
-    now_message_inquiry_type: 5,
+    now_message_inquiry_type: 6,
     system_notice_unreadnnum: "",
     service_notice_unreadnnum: "",
     hasOnShow: false,
@@ -37,9 +38,10 @@ Page({
     dot_2: false,
     dot_3: false,
     dot_4: false,
+    dot_5: false,
   },
   onLoad() {
-    // console.log("wenzhen onloadddd");
+    console.log("wenzhen onloadddd");
 
     // if(wx.$TUIKit){
     //   wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
@@ -73,7 +75,7 @@ Page({
         service_notice_unreadnnum: service_notice_unreadnnum,
       })
 
-      if(_this.data.data_list_1.length > 0 || _this.data.data_list_2.length > 0 || _this.data.data_list_3.length > 0 || _this.data.data_list_4.length > 0 || _this.data.data_list_5.length > 0){
+      if(_this.data.data_list_1.length > 0 || _this.data.data_list_2.length > 0 || _this.data.data_list_3.length > 0 || _this.data.data_list_4.length > 0 || _this.data.data_list_5.length > 0 || _this.data.data_list_6.length > 0){
         _this.setData({
           has_data: true
         })
@@ -141,6 +143,7 @@ Page({
       data_list_3: [],
       data_list_4: [],
       data_list_5: [],
+      data_list_6: [],
       message_inquiry_type: 9999,
       now_message_inquiry_type: 5,
       unreadnnum_inter: 0,
@@ -153,6 +156,7 @@ Page({
       dot_2: false,
       dot_3: false,
       dot_4: false,
+      dot_5: false,
     })
     wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived);
     wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady);
@@ -162,7 +166,7 @@ Page({
     this.setData({
       hasOnShow: false,
       message_inquiry_type: 9999,
-      now_message_inquiry_type: 5,
+      now_message_inquiry_type: 6,
     })
   },
   onSDKReady(){
@@ -350,7 +354,8 @@ Page({
           item.patient_sex = order.patient_sex;
           new_conversationList.push(item);
         })
-      }
+      };
+      //console.log(new_conversationList);
       this.setData({
         conversationList: new_conversationList
       })
@@ -361,22 +366,26 @@ Page({
   },
   formatConversationList(){
     let session_list = [];
+  
     let session_data_list_1 = [];
     let session_data_list_2 = [];
     let session_data_list_3 = [];
     let session_data_list_4 = [];
     let session_data_list_5 = [];
+    let session_data_list_6 = [];
     session_list.push(session_data_list_1);
     session_list.push(session_data_list_2);
     session_list.push(session_data_list_3);
     session_list.push(session_data_list_4);
     session_list.push(session_data_list_5);
+    session_list.push(session_data_list_6);
 
     let usertype =  wx.getStorageSync('usertype');
     let userID = wx.getStorageSync('user_id_'+usertype);
     let totalUnreadCount = 0;
     let message_inquiry_type = this.data.message_inquiry_type;
-
+    console.log("conversationList---------");
+    console.log(this.data.conversationList);
     this.data.conversationList.forEach(item => {
       let conversationID = item.conversationID;
       if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过
@@ -391,7 +400,7 @@ Page({
       if(!order_inquiry_id) return;
       let inquiry_type = cloudCustomDataJson.inquiry_type;
       if(!inquiry_type) return;
-      if(inquiry_type > 4) return;
+      if(inquiry_type > 5) return;
       if(inquiry_type < message_inquiry_type){
         message_inquiry_type = inquiry_type;
       }
@@ -452,17 +461,20 @@ Page({
         }
       }
       session_list[inquiry_type - 1].push(session_item);
+      console.log("--------------------")
+      console.log(session_list)
     })
 
     
     wx.setStorageSync(userID+'_wenzhen_info', totalUnreadCount);
     
-
+     console.log(session_data_list_3)
     this.setData({
       data_list_1: session_data_list_1,
       data_list_2: session_data_list_2,
       data_list_3: session_data_list_3,
       data_list_4: session_data_list_4,
+      data_list_5: session_data_list_5,
       message_inquiry_type: message_inquiry_type
     })
     wx.stopPullDownRefresh()
@@ -559,21 +571,21 @@ Page({
   onReachBottom() {
     // console.log('===触底了！！===');
     let now_message_inquiry_type = this.data.now_message_inquiry_type;
-    if(now_message_inquiry_type == 5){
+    if(now_message_inquiry_type == 6){
       if(this.data.current_page < this.data.last_page){//最后一页时停止分页
         this.getDoctorInquiryFinishMessage()
       }
     }
   },
   getDoctorInquiryFinishMessage(){
-    let data_list_5 = this.data.data_list_5;
+    let data_list_6= this.data.data_list_6;
     let params = {};
     params.page = this.data.current_page + 1;
-    this.setData({data_list_5_loading: true})
+    this.setData({data_list_6_loading: true})
     api.getDoctorInquiryFinishMessage(params).then(response => {
       // console.log(response);
       this.setData({
-        "data_list_5": data_list_5.concat(response.data.data),
+        "data_list_6": data_list_6.concat(response.data.data),
         current_page: response.data.current_page,
         total: response.data.total,
         per_page: response.data.per_page,
@@ -581,9 +593,9 @@ Page({
       })
       // this.selectComponent('#tabs').resize();
     }).then(res =>{
-      this.setData({ data_list_5_loading: false})
+      this.setData({ data_list_6_loading: false})
     }).catch(errors => {
-      this.setData({ data_list_5_loading: false})
+      this.setData({ data_list_6_loading: false})
       console.error(errors);
     })
   }
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml
index a7a0df2..6155ac1 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxml
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml
@@ -23,11 +23,11 @@
   </view>
 
   <view class="empty" wx:if="{{ has_data==false }}" >
-    <view wx:if="{{!data_list_5_loading}}" class="empty_box">
+    <view wx:if="{{!data_list_6_loading}}" class="empty_box">
       <van-image src="{{static_host}}/applet/doctor/static/images/yishi/wnzhen_empty.png" fit="heightFix" height="108rpx" aria-label="empty" />
       <view class="empty_note">未收到任何消息</view>
     </view>
-    <van-loading size="24px" wx:if="{{data_list_5_loading}}">加载中...</van-loading>
+    <van-loading size="24px" wx:if="{{data_list_6_loading}}">加载中...</van-loading>
   </view>
   <!-- <van-button color="#3CC7C0" custom-style="width: 92vw;margin: 0 auto;border-radius: 10rpx;" block wx:if="{{ !has_data }}">开通图文问诊</van-button> -->
 
@@ -334,8 +334,52 @@
           <view class="content_4" wx:if="{{ item.inquiry_status == 3 }}">不接诊24小时后自动取消</view>
         </view>  
       </van-tab>
-      <van-tab title="问诊结束" name="5" wx:if="{{data_list_5.length > 0}}">
-         <view class="content" wx:for="{{ data_list_5 }}" bindtap="goChat" data-from_account="{{item.from_account}}" data-inquiry_type="{{item.inquiry_type}}" data-order_inquiry_id="{{item.order_inquiry_id}}" data-url="/Pages/yishi/chat/index">
+      <van-tab title="糖组检测" dot="{{dot_5}}" name="5" wx:if="{{data_list_5.length > 0}}">
+        <!-- <wenzhen-data 
+          name="{{ item.patient_name }}"
+          sex="{{ item.patient_sex==1?'男':'女' }}"
+          age="{{ item.patient_age }}"
+          date="{{ item.message_send_time }}"
+          desc="{{ item.last_message_content.Text }}"
+          status="{{ item.inquiry_status }}"
+          order_inquiry_id="{{ item.order_inquiry_id }}"
+          inquiry_type="{{item.inquiry_type}}"
+          from_account="{{item.from_account}}"
+          status_text="{{ 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?'已取消':'其他' }}"
+          note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
+          message_dot="{{item.message_dot}}"
+          wx:for="{{ data_list_2 }}"
+         /> -->
+
+         <view class="content" wx:for="{{ data_list_5 }}">
+          <view class="content_1">
+            <view class="name">
+              <text style="font-size: 34rpx;color: #333;">就诊人：</text>
+              {{item.patient_name}}  {{item.patient_sex==1?'男':'女'}}｜{{item.patient_age}}<t-badge dot="{{item.message_dot || item.inquiry_status==3}}" offset="{{ [-4, 4] }}" content="岁" />
+            </view>
+            <view class="date"> {{item.message_send_time}}</view>
+          </view>
+          <view class="content_2">{{item.last_message_content.Text}}</view>
+          <view class="content_3">
+            <view class="status">{{ 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="btn" wx:if="{{ item.inquiry_status == 3 }}">
+              <van-button bind:click="go" data-url="/Pages/yishi/case/index?order_inquiry_id={{item.order_inquiry_id}}" plain custom-style="padding:0 35rpx; height:67rpx;  border-radius: 10rpx;" color="#3CC7C0">查看病历</van-button>
+              <van-button type="default" bindtap="tabShow" 
+              data-show_dialog_from_account="{{item.from_account}}"
+              data-show_dialog_order_inquiry_id="{{item.order_inquiry_id}}"
+              data-show_dialog_inquiry_type="{{item.inquiry_type}}"
+              custom-style="padding:0 35rpx; height:67rpx; border-radius: 10rpx;margin-left:20rpx;" color="#3CC7C0">去接诊</van-button>
+            </view>
+            <view class="btn" wx:if="{{ item.inquiry_status >= 4 }}">
+              <van-button bind:click="goChat" data-from_account="{{item.from_account}}" data-inquiry_type="{{item.inquiry_type}}" data-order_inquiry_id="{{item.order_inquiry_id}}" data-url="/Pages/yishi/chat/index" plain custom-style="padding:0 35rpx; height:67rpx;  border-radius: 10rpx;" color="#3CC7C0">问诊详情</van-button>
+              <!-- <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 }}">不接诊72小时后自动取消</view>
+        </view>  
+      </van-tab>
+      <van-tab title="问诊结束" name="6" wx:if="{{data_list_6.length > 0}}">
+         <view class="content" wx:for="{{ data_list_6 }}" bindtap="goChat" data-from_account="{{item.from_account}}" data-inquiry_type="{{item.inquiry_type}}" data-order_inquiry_id="{{item.order_inquiry_id}}" data-url="/Pages/yishi/chat/index">
           <view class="content_1" >
             <view class="name">
               <text style="font-size: 34rpx;color: #333;">就诊人：</text>
@@ -351,10 +395,10 @@
         </view>  
 
         <view style="width: 100%;text-align: center;">
-          <van-loading size="24px" wx:if="{{data_list_5_loading}}">加载中...</van-loading>
+          <van-loading size="24px" wx:if="{{data_list_6_loading}}">加载中...</van-loading>
         </view>
-        <van-empty description="暂无数据" wx:if="{{data_list_5.length == 0}}" />
-        <van-divider contentPosition="center" wx:if="{{data_list_5.length > 0 && current_page == last_page}}">到底了~</van-divider>
+        <van-empty description="暂无数据" wx:if="{{data_list_6.length == 0}}" />
+        <van-divider contentPosition="center" wx:if="{{data_list_6.length > 0 && current_page == last_page}}">到底了~</van-divider>
       </van-tab>
     </van-tabs>
   </view>
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
index a3e5e7d..76f7bab 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
@@ -17,6 +17,15 @@ Component({
         });
       },
     },
+    patient_family_data:{
+      type: Object,
+      value: {},
+      observer(newVal) {
+        this.setData({
+          patient_family_data: newVal,
+        });
+      }
+    },
     isMine: {
       type: Boolean,
       value: true,
@@ -174,6 +183,25 @@ Component({
           }];
           return renderDom;
         }
+         // 10:糖组检测
+         if (customMessage.message_type === GDXZ_CUSTOM_MSEEAGE.SUGAR_CHECK) {
+          let data = customMessage.data;
+          const renderDom = [{
+            type: 'sugar_check',
+            title:customMessage.title,
+            disease_class_names:data.disease_class_names
+          }];
+          return renderDom;
+        }
+        // 11:患者信息
+        if (customMessage.message_type === GDXZ_CUSTOM_MSEEAGE.PATIENT_INFO) {
+          let data = customMessage.data;
+          const renderDom = [{
+            type: 'patient_info',
+            path:data.message_path
+          }];
+          return renderDom;
+        }
       } catch (error) {
       }
       // 客服咨询
@@ -223,6 +251,12 @@ Component({
       } catch (error) {
       }
     },
+    
+   goSick(event){
+    const url=event.currentTarget.dataset.url;
+    console.log(url);
+    app.go(url);
+   },
     openLink(e) {
       if (e.currentTarget.dataset.value.key === '立即前往') {
         wx.navigateTo({
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.json b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.json
index 785d068..769c6ad 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.json
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.json
@@ -1,6 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "van-rate": "@vant/weapp/rate/index"
+    "van-rate": "@vant/weapp/rate/index",
+    "van-icon": "@vant/weapp/icon/index"
   }
 }
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
index c793ed4..eaa7050 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
@@ -1,4 +1,4 @@
-<view>
+<view class="custom_wrap">
   <view wx:if="{{renderDom[0].type ==='order'}}"  class="custom-message {{isMine?'my-custom':''}}">
     <image class="custom-image" src="{{renderDom[0].imageUrl}}" />
     <view class="custom-content">
@@ -86,5 +86,34 @@
       </view>
     </view>
   </view>
+  <view wx:if="{{renderDom[0].type==='sugar_check'}}" class="sugarbox">
+    <view class="sugarcon">
+      <view class="title">
+        {{renderDom[0].title}}报告
+      </view>
+      <view class="patient_info">
+        <view class="name">就诊人：{{patient_family_data.patient_name}}（<text wx:if="{{patient_family_data.patient_sex==1}}">男</text><text wx:elif="{{patient_family_data.patient_sex==2}}">女</text><text wx:else>未知</text>｜{{patient_family_data.patient_age}}岁）</view>
+        <view class="sick"> 所患疾病：{{renderDom[0].disease_class_names}}</view>
+      </view>
+    </view>
+    <view class="detail">
+       <view class="left">查看报告</view>
+       <image src="../../../../../static/images/back.png" class="back" mode="widthFix"/>
+    </view>
+  </view>
+  <view wx:if="{{renderDom[0].type==='patient_info'}}" class="patientbox" >
+    <image src="../../../../../static/images/patient_bg.png" 
+    class="bg" mode=""/>
+    <view class="title">患者信息</view>
+    <view class="patient_info">
+        <view class="name">就诊人：{{patient_family_data.patient_name}}（<text wx:if="{{patient_family_data.patient_sex==1}}">男</text><text wx:elif="{{patient_family_data.patient_sex==2}}">女</text><text wx:else>未知</text>｜{{patient_family_data.patient_age}}岁）</view>
+        <view class="look" bindtap="goSick" data-url="{{renderDom[0].path}}">
+           <view class="see">查看详情</view>
+           <van-icon name="arrow" color="rgba(0,0,0,0.45)" style="margin-top:4rpx;margin-left:8rpx;"/>
+        </view>
+      </view>
+  
+     
+  </view>
 </view>
 
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss
index dda23ff..225c55e 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss
@@ -233,4 +233,104 @@ line-height: 42rpx;
   padding: 15rpx 30rpx;
   border-radius: 40rpx;
   font-size: 30rpx;
+}
+/* 糖组检测 */
+
+.back{
+  width:24rpx;
+  height:48rpx;
+  transform: rotate(180deg);
+}
+.sugarbox{
+  position: relative;
+  width: 420rpx;
+  background: rgb(255, 255, 255);
+  border: 1rpx solid #D8D8D8;
+  border-radius: 12rpx;
+}
+.sugarbox::after{
+  content:'';
+  position: absolute;
+  top: 35rpx;
+  left: 0;
+  transform: translate(-50%,-50%) rotate(45deg);
+  width: 16rpx;
+  height: 16rpx;
+  background: rgb(255, 255, 255);
+  border: 1rpx solid #D8D8D8;
+  border-style: none none solid solid;
+}
+.sugarcon{
+  margin:0rpx 24rpx 0;
+
+}
+.patient_info{
+  font-size: 28rpx;
+font-weight: 400;
+color: rgba(0,0,0,0.65);
+line-height: 40rpx;
+}
+.sugarcon{
+  border-bottom: 1rpx solid rgba(0,0,0,0.12);
+  padding-bottom: 24rpx;
+}
+.sugarcon .title{
+  margin:24rpx 0 20rpx;
+  font-size: 32rpx;
+ font-weight: 500;
+color: #3CC7C0;
+}
+.sugarbox .detail{
+  display: flex;
+  margin:0 24rpx;
+  height:88rpx;
+  font-size: 32rpx;
+font-weight: 400;
+color: rgba(0,0,0,0.85);
+  justify-content: space-between;
+  align-items: center;
+}
+/* 患者信息 */
+.patientbox{
+  display: flex;
+    flex-direction: column;
+    width: calc(100vw - 40rpx);
+    text-align: center;
+   background-color: #fff;
+   border-radius: 12rpx;
+   overflow: hidden;
+  position: relative;
+  box-shadow: 0 0 6rpx 0 #ccc;
+}
+.patientbox .title{
+  position: relative;
+  text-align: left;
+  padding:0 24rpx;
+  height: 90rpx;
+font-size: 32rpx;
+border-bottom: 1rpx solid rgba(0,0,0,0.12);
+font-weight: 550;
+color: rgba(0,0,0,0.85);
+line-height: 90rpx;
+}
+.patientbox .name{
+  color: rgba(0,0,0,0.85);
+  font-size: 32rpx;
+}
+.bg{
+  position: absolute;
+  z-index:0;
+  width:100%;
+  height:90rpx;
+}
+.patientbox .patient_info{
+  padding:40rpx 0;
+  margin:0 24rpx;
+display: flex;
+justify-content:space-between;
+}
+.look{
+  display: flex;
+  color:rgba(0,0,0,0.45);
+  align-items: center;
 }
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/components/MessageList/concat.wxs b/TUIKit/components/TUIChat/components/MessageList/concat.wxs
index 107669b..cad2a6c 100644
--- a/TUIKit/components/TUIChat/components/MessageList/concat.wxs
+++ b/TUIKit/components/TUIChat/components/MessageList/concat.wxs
@@ -7,7 +7,15 @@ var concat = function() {
 var connect = function() {
     return arguments[0] + arguments[1]
 }
+var formateText=function (value){
+  if(!value){
+    return {}
+  }else{
+    return JSON.parse(value)
+  }
+}
 module.exports = {
     concat: concat,
-    connect: connect
+    connect: connect,
+    formateText:formateText
 };
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index a1d3f7c..da76b75 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -355,7 +355,7 @@ Component({
       let show_avatar = true;
       if(type === "TIMCustomElem"){
         const customMessage = JSON.parse(message.payload.data);
-        if(Number(customMessage.message_type) != GDXZ_CUSTOM_MSEEAGE.PRESCRIBE && Number(customMessage.message_type) != GDXZ_CUSTOM_MSEEAGE.PRESCRIBE_VERIFY){
+        if(Number(customMessage.message_type) != GDXZ_CUSTOM_MSEEAGE.PRESCRIBE && Number(customMessage.message_type) != GDXZ_CUSTOM_MSEEAGE.PRESCRIBE_VERIFY && Number(customMessage.message_type) != GDXZ_CUSTOM_MSEEAGE.SUGAR_CHECK){
           show_avatar = false;
         }
         if(Number(customMessage.message_type) == GDXZ_CUSTOM_MSEEAGE.TRABECULA && refreshBaseInfo){
@@ -374,6 +374,7 @@ Component({
     },
     // 历史消息渲染
     $handleMessageRender(messageList, currentMessageList) {
+      console.log(messageList);
       // console.log("handleMessageRenderhandleMessageRenderhandleMessageRender");
       // this.showHistoryMessageTime(currentMessageList);
       if (messageList.length > 0) {
@@ -944,6 +945,11 @@ Component({
         });
       }
     },
+    goMedinceList(){
+     wx.navigateTo({
+       url: '/Pages/yishi/medince_list/index',
+     })
+    },
   },
 
 });
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxml b/TUIKit/components/TUIChat/components/MessageList/index.wxml
index 87963a9..ece4633 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageList/index.wxml
@@ -55,7 +55,7 @@
                     <ImageMessage wx:if="{{item.type === 'TIMImageElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}" />
                     <VideoMessage wx:if="{{item.type === 'TIMVideoFileElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}"/>
                     <AudioMessage wx:if="{{item.type === 'TIMSoundElem'}}"  message="{{item}}" data-index ='{{index}}' messageList="{{messageList}}" isMine="{{item.flow === 'out'}}"/>
-                    <CustomMessage wx:if="{{item.type === 'TIMCustomElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}" bindtap="handleJumpLink" data-value = "{{item}}"/>
+                    <CustomMessage wx:if="{{item.type === 'TIMCustomElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}" bindtap="handleJumpLink" data-value = "{{item}}" patient_family_data="{{concat.formateText(item.cloudCustomData).patient_family_data}}"/>
                     <FaceMessage wx:if="{{item.type === 'TIMFaceElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}"/>
                     <FileMessage wx:if="{{item.type === 'TIMFileElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}"/>
                     <MergerMessage wx:if="{{item.type === 'TIMRelayElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}"/>
@@ -69,6 +69,7 @@
         <SystemMessage  message="{{item}}" bind:changeSystemMessageList="changeSystemMessageList"></SystemMessage>
     </view>
 </scroll-view>
+  <image src="../../../../../static/images/yishi/tabbar_icon/medinceList.png" class="medList" mode="" bindtap="goMedinceList"/>
 </view>
 <view wx:if="{{showDownJump}}" bindtap="handleJumpNewMessage">
     <view class="new-message-item" > 
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxss b/TUIKit/components/TUIChat/components/MessageList/index.wxss
index 3c1a567..2aa17b1 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageList/index.wxss
@@ -1,6 +1,7 @@
 .container{
   width: 100%;
   height: 100%;
+  position: relative;
   background-color: #F4F4F4;
 }
 .message-list-container {
@@ -267,4 +268,11 @@
 .content_desc{
   font-size: 28rpx;
   color: rgb(146, 144, 144);
+}
+.medList{
+  position: absolute;
+  left:0;
+  bottom:10rpx;
+  width:153rpx;
+  height: 159rpx;
 }
\ No newline at end of file
diff --git a/TUIKit/static/images/back.png b/TUIKit/static/images/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..4eafa0d6b8a24ced4419de25946a73172133d474
GIT binary patch
literal 462
zcmV;<0WtoGP)<h;3K|Lk000e1NJLTq000;O001xu1^@s63y8X-0004%Nkl<ZSV!&G
zTT2yD7>Dtn^(p#H-4+%_WSVrOh)PHdwIGN@FS`$-n<xl^Ac!CcK?5)S8m5(<jDcCO
z81{A!d)}`0T+YDrto2`q_nisB&qOfaSWuhrIHDBMLu}(&HM2e<TE+|xa0kzG$*6++
zxRe23;8tIPd0fq4FL48Z`w+~Pu*7<eYgKshu}eg^D>1ym75o`=DB22c;%)|dTdu+H
zVJEJQporjJ26~5!7z%F_(Pb=T@b{R;ue!UU$qb57E@hw(n8MFGc#|1iz=Lcve8hR|
zH-Xm)&f!r8|AgY*kEZa$1ZVI#gMY?Zd~X9ECYZzuj+C%<6vA(9;e!Mxu$I9$a2k7E
z;8nqKJjKxx_N9b>?Fz37HgT+kZJ~&2XB7B<7YvH%6n00MMfD_~#A?(cr-2rueiF4!
zlO*(@B}wR2ktCs)U6RaVG3vTb+|YuPB%viUNkWT$l7zM`Nm6aRUg3IQjaQO{wvI^>
z+WaO-X#1Wdp+6vpmWw8x-6-{@Q~TaZIG#amT;UP@1BiiQF<k547ytkO07*qoM6N<$
Ef*O_2WB>pF

literal 0
HcmV?d00001

diff --git a/TUIKit/static/images/patient_bg.png b/TUIKit/static/images/patient_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..90a1d93821163ad217c6305c472e985d36d09064
GIT binary patch
literal 7969
zcmYj$2|Uw({6C8*cZ!@NA-5tVjF2RhLe5E!!pL2Wg-Yd^a+UkOmMb@95+;Q?=SWk?
zImZm!Z2SDy_xJxl{{P40^VsL}c<l4}JRW=R^*rCNZd#e~92Y&#!otF1e$B*&g#}c@
zymsU~%KUtCe_V=rVhy%2yTVd4B)-bRA~|brVsz)RD<Rjn;;gwH#(KPC?N?r29$|A8
zN05Za6hv>wNO2}e^-~S`*-Radvfbhrf+!aiC|4A`jOFBtt!RBM#W~OpHhCn#2Il-&
zz^Uqg@Of@bzjpKerqh<$H4l$FrdK_^Ogy|i?d<5g76;XjbNZoqFM}^!_`_D5wtjy3
zz|I8H{VF=;WoP<JfBswY)rl6O@<Swe;^}Y&`#X~T9Kiia^r__yINZEp;<~$=B;A^H
zXC!h@Qfzfldb%-0astxNfmp7WpoWjrkpjgWbk<N&OYija8r_VoQhL6?2!{#j)KyYA
zPZ9bvW@@1%UferqMS8hKWTaMLr2NuI#tZf7&}W3#Iys$a?+HEVC3A{2M2vO2wuOP#
zmKgiqs|P3ha9)cD*Bles!R~n6AOV)T%S7bh*68=CA@K6Vm1uYX8{(VkDhFxn-61~7
zKi@T=={G{W6KL`<K@7YyI1svTJy;+3Jus?=!Y42S4lYuf{+TsyQx^I<G$&lj-u4*f
zR_i?4*fXKBJ%}!*B1{_cIO`IF9Z}{o8ZUef--e?1(u!iSki8;>_`>#8ygAA=JR(l7
z-G)N;)s)=F5j90dl+HvPvfhV|H(c$?4Q2%AthBtUxK|mlOU<@Sy6GD9y{dJdBl;J$
zVO}Xhr@bUy-Qmh!_xsy>dl#FP)<vr<BUYDW9CP*+v<vkX%emR+(YGvC@<sQ~&<{>i
zq1or#@sLtEE@#0h^ukAk(pA#*VPcdk&(ZaJJJQSfXNu5|9yvC&Rh?r8N!?V4370b#
zRS^nIeo9kuKKwfBTCSNY(2l11#B>#X_&)n1;XN<qR&?MDh~b;cL+9$qYtCA{d5F(t
z9OKEVzK*fxtWA45m9mo>aDKmZFL5w32QMl}zbvm?-T0877bI0D2m-5kk-m6{H#8`o
zl+WpFU8<Q0C^J?P=YYNPU8(aA^RFaTfc-W%VrhF8N659%g2`MKYKvFU2l|#{xiRiC
zJvT9-qS1iu^oVEvN{9c2edW_al7Wm!6VljT8++qPHp8y;u8^jpgb~jW`BLgHIRjmv
zJkK@n$aptU4eYr5<2VP`exy}w$BoCe-V*SqVo&0}Ic>)?2!X(srf3M_QPvYnm*mZu
zqC@j}F22);+?SVWL$6mL;+dT9?)!||&AZH9STy?<3)E<;bpD!I&A*wFup?_}{|8|n
zDR?FP;=41pcxuw>xVo+(TbFKPMq8cjVAa~~mw_79S9KTTAS5+-sxjcpUwjxR=<_|a
zI&jOU4uSCoGI)x%_><RXb5^v+zlXmO@7d@3Y@iZmWs*3MnU>dNnZn1w)F8I3<w@?+
zR~BDA_?AtM5@<O6qRFvb9zLjjw`?euO#)I8em__WOiR}?1R8C%RuD0(+L(N?TvZoB
zNJAFjcDP!P1mYh9JVj71zDoc|hU(!(Ff`(4iTQk1-C1Sj+k<yMo3Tcx^4A6h44P9e
z#fWwi{3Wgx3@4QgzA|J`Z|jqNMKen@u#jU9BQI#t?_VF~ti#Z^N~ViC=&7H@?MEtn
zjy)<;YcR_Jl;qoOVYj6u*bED<fh>krM^;X$;0i(R;&H8Nl)v`TW0xkp?=NTxu4)S`
zKd7MIShmabRc)NGKV!%UQ<nmp@zEA2Mt~M?U@yH^!3rblT<GQVIQ5K~#kj3JC~@We
zyFhw=$$e*7m;%An3JkV2z*FJ7vy0@(<!mrfHs-8<r(V=<9Pk3I<1rs(V4d7Ap0_WW
zhAq}g!1v<Upbe?(t6mN}Ev~ASyy?~xJQT5kc|Q7OA|pIpy}+m;_ko$8mCy$AY+7^i
zmp=8u<k^9YE`+L=Gk}}qFNtH}9FOlxpd|Lp*sYiLvNiop`u>zSqJ0tik_puIcour0
zFM)S%Wgl)X1-ucssZnE!51ah<v1o>svZLl=y3;gqgmG#of9F&#pPB=Ij{e7WsQ!i7
zmay5O56?(@%cgYYCqnIB)DFmEIbxjyAhex{YK>v^5-&Yv;2vtNe1KkCQJTtsy<t6d
zJA4SLQv<+uulxv^_1AZ5uhr{Eo~YYtDvd)JfV4WBN$}C7d#DHrMNy9B9MwMKtZI`D
zR8kDyvN3s)>Uk&y)tB2=)8a0-MEkAwk{~OHx6$6e)gI*W936*ESz|sX)i#sd^MEp;
z283~^lV<#fVWaI+7VMoxDi%K+GXvU6mV`U^JO=qFPMweJ(%uim0K8;0BpaJB9kQSy
znq91A=AqTvc{+X9wvOjYcH^r?tMr5t%!XgG_?P!typ(yg0}Bt`80eTLj5LMqW9{?o
zIQP9d_Av`0i+|Oa>pf;H^)Z%(b3;02$KA@hthis(&|M?7^Qze=+_MQfl@}pvc&Wcn
zQ+-jMp9LUKuwc=IoA&L;SK&V<w9Be4Ju93Y9ePbZ$X00|1HZgh6RGpD$o%k{;g8nW
zw;OC~8x5q6&xF01UTY~ej@Fgl&V&b{`()jIh0_HKYgPMd9~4^UUHCdZrTfkz!g=Ew
z`&^@T3R>i(%T)U!D^O8*zEjSG{|ew!jQA6xEI_SFKSA}uW1v%bBBAz?Gcf4+(?pVq
zF8W!iD^Q-ygvCCQdzIwZ4}xF2Utd9;H8bEYZK{z`*+{QALX?rlbb+by40(>s**SyU
z=9$Awbw#$37KX~F$img3&6(LBv`=Wu7h6wOMMy)G?zNaZqy~=$E3}__%(zu#9+UEE
z4_Ja<-KsH$_D02JbkJn@3?+I8mN0JzXKV%7yY|HHfBMk+B!DTnEBRV11ps^8kM(M;
zj*<0snc@R76N7GuFb_o4A2o3tBJ5=6(BBT<A#HTEe&-(LZ#*0&EZ%|AuRKW>?)YxA
zlM`&UykOy|LWywWmD3)ybU4Xl(fjP{z)O>j7^&KQO<ZcR;@snkGjrSxr^ba{ndF5<
z*J(TpcqUF)6Ti0zasTu{TVzhSu=YYu@{+GLeD^D33r!ccU}t>WFF1a~I_sh0O%os6
z6t$f@O~)l^Tz}AKtdJPvEag3!I=>^yciCp8ti;S(J|xSh^Af*+so@)RYZDFKb-oH*
zV|=ILV|XlGp`YOaSAD)CtWg8Js~0$TlqqilF??l$)CUGUCCl{A=IDfDK=J<LX@8Z6
zw_~ewn93$Cu$@WWsK8<&mD<UzCptW*>01#UX1Mm!=bc1}<P`K#ww}aw$aq2SgEO2@
z4X+vc^+f239F5GI%&-6!^Bcb-)}wIFxB0!clTH)}eJiW}nFIqbnn@NAr@A0BIM^*v
z0fPDjJc}PYK}o{{M+fER*7Mz!IbxjIo-I%h*grK=w2D4h8krMfX|S>RL+;&04j_@1
z*|Q4QENPp{%G>$MwUDzaMyF68+#NPMPC4;zxm%2>UJ~~K-;YN>Pe2O)?srdqO6|)#
zg0n+DheKm2#N}qdy|OFwLZkGmQW7CND*0U8RH#6<_-%pUxC^3Ol<dkg5=lv1c?do2
z<<4zC-6H!2)2{cgmSP=GdUn1=_(f;lR)L>#8S^PC*Zu}C$)+*|rVx?Mh+$+JFn(?x
ztTavte6@5n8}agX1B!)~=4s&Ht<fXXK7W7QC2bnu{~AWucg%jlBMn{Yk!_sD(6%ki
zYfbgFx)Tb<>mkBCDw0Zzm!&l{V$eaPQYb5Z_Z_PC2@qL5R_HXBXRn!cBUicf=C2*?
zfJiB{4q(iLgBT%Z>erngA{xU;4`1_#sNa9Qwr}KqBfmL8GzQJ98BP5%NhNiJ(6e`B
zbNS+pIF*EYV$yaT?r&YmAH!}Ls@$9Sj%q5uF<yZQ<XLY?M;3EZcE0O$L93KV0b>Yc
z0T3#hxXEW_p7WOdPzFDJg}135^5TeHJ6&TbK?H{$I+TkcO0j@CWTdXX!Yo*1sb&gD
z2Xfd=^VWZC8ZFmbG~?|#j-_rVL<$)!eF4*YO+G|ZR;(SU;ggV3|AvQR5h=W&p?{ME
zy|jGwDw7{ZkHK}aM|Y=tZq-oBR^ENy_DfNl!&Rwna{%-av~@@X=_*HIZIvhwuWb#J
zR){wPcn{b?q4Mgks;fI5r`wW3$4fqNiFEVnf4Op`jU+|C&@Eup*^}NsxG&8^I}(jW
zf89iUwo4s~kPijNjxhAkN@X0UJ-OcDd?RZZCQCSaqv{Bepvq3}5UfaNsMss*KhP^O
zZB6hbK>R0rpAd$Y^hizP4y$4QMppXVCEQN@HKRebX1a<gYEdrX{!HOSc>=y#qND;y
zft;z3#<&kHlrv=cBEx5|Eh7#{bt`86*!)suq2_EY2u5*T{MKYxTGO<0WmF1SHf|YQ
zt56>tVl98aJ!km7#nj}-S0QZ)QNi`<&KYFc6J{5<QN4Gjls$cII(4ov_Nmu%FOrRc
z<Tl{*^!f->XE(qb&>l8fo$Jj3cbs~eK$1V7-lpj68bA8Czk&)2knAMX#dOm<LUo{<
ziV(8JiC0v>=Tf<MYW<Io$B#6x^OjN&W8XA$hF=y}{y}H$`R93^25aT`K8HVXJ3_YL
z8A&&%gQ>z2T*y|y<zdT;T|kPLm^#C$4{=121{Ul$9s<sx4q}3sBhf4PuGTK(yyU12
zj5v~eBx)-OxjTcs(wjY2dLGg6LP%DexJ0U2Er~&lzp)H<Wx}ZV3U4dW)O#W(RnUDz
z7Szl4wqmE^*h>){M9&A*`h<T<2IQ{z$34hA)l`!-A$d{2l9iP?F)E-x`kSsmS_Eel
zJ7MZPD-&_9slPiOx3By)>O8yF{#cBbAbYco5v87s-KBhZyF7eN)jWkmAPr$;z+Akw
zS-?M}BcwW4iDbL95TLVWdx7CO^~shb<s!z|$k~N#e?CmF*Rlqx&aK(3{@v;fdP_8p
z4uPE|n@P~y*YJ;<isVxTs(;9W?v>j>@jr?$#92zsEMxZGul`{_=kHQhWlhUY^Y2eY
zLHDfxDGt6&jmc5#^+I!7Ow$`GfpDP<lED*)VE4Yg0~heSjN#@d-!k%yJW5_xM?2{*
zF3Y$r_*x9hM@3%MT_1VkFng~9;zZ5(x#VNIoGS2Yue#Yn@_k#I$vXvlfD=_WpzrQp
zGZnU)0zSb4-0)_fB7M)`r7PJ1qKQ-VUkc3oe=q4Xru+0{=IqcabGLumg*nliL;8o!
zo+jwjpvA;*yZ$-#;;)m%Gx)aJE&81Yqn}67<zweR+Z5J1|J;7`74b-L4WPQtrIC&b
zTCi$~*y(YyquZn)Rmp)~oV2F7Xh%P&k-y-weUK(ekQ#oMzBOo-U(-B0WURA+7AWIq
zWVQeb;y8TZq>cw0EC0EiE>v&MF9~GPW!&?$R+pK;-|?i=_<Qfibx`ISQPiO){}v6}
zSc@^u;J=jI3gm`4hM*G0>W^z5uTW2adRKAV$&HPvXgo3O)hi>9S{-m}v)r@hEdPl$
zjg-m>e?tAsf!IchTP>jsr*~Uo$Lg&rVzBnp(nTI}pzc8W;0@VZoNR_t+A#^=UdmaZ
zvGzV^eoVN&r|eR7Q`Eqh$sLu<uu`QKj|HA>=I<Sj`!@beV`(!iFa$B>q!vZ}c$Kw|
zaOTF$bMM*Q<%s+gHC(@(K4cq-XLo2~MCoML@p&~gWfcRSTu0&=NCtAJ_U8`ZSZ;>9
zoa?r61uzDbI)GOqxZyV4myQN_m*7qc%#v6=tj+Yig4;{0*}y!-+K#LJbW-!?n3kB#
zg0r03Ch~HU#zPI09OZuNd~<f@Sk)h(Q|%J)36iTmv(9ll5Z%$)#}c3D4RZyuxm=h%
z`(V32&dws(kHwr7N3V2-JnlmOJjYwc2z0DBD;7{OSwXexR8h-LJN2K<4-we1<#evr
zIwHUL9dkc|Hsf7UZ5c#;$-!8at}Ze=X$<)M0!(^P4ZjpZwF+z90EuH=z_}rS--125
z*BRxBJgbnO=D#bR@8YM`k9226Xv3;djL(-vM!xsLB}}^-S$PYcJpnFOHp+r{Ma5WM
z;1J0)zB^n?S8DO{8klU6&-5{x^ewMiYkQ}lSB5SaXhZl{pdufT_HssigT1?|$^`x=
zHdSGb2yb0p)cLZ@>6p{nZ{;o(QvL3Y)+mhC-^KA!-mKbfBZsb?^F)s2w_a4hLc*h+
zYM|S)J)hz1v|3H4kdAn){Sz3=z_PrQIBq!0cb;gU?HWg^6eTvmu79KEbV1th6e!aL
zoBzVe*Odj_+UI^JU9I%KufZHiSRXgjqIx&T{<-tv&}aok6W*}CxNoN4W;{PUbO|tp
z+TNHkT{-Nib%ueY!i4n~F<btP1S%<tw=+i?YLLl<6j)WLvvq-px>#kNE$NIHo)PNL
zTy(x9zXJmN*a{G`Yx$4tw)U+nz%>fp<SlRSd%$S1Dw&rxww#&xZVa$&IF+lQw+sVN
z!`c$W;vT=FU758izz7jxkUJWm@Nkjw<nefZn}q}2KW;TU?<@zgnD-oc%WL-xNzHY5
z|1<D;WNmcM9~a*G>N}!w0l|6X0Ga|wi{qd-L)-GCbHc-&ZJzXpU;cWUwo9;5b^^*!
zr(6<MaoJ<GpC$=9AOEB-dHLqOuc1~d<N3>Bp2txjiVdO*pBTW+Ofd<`kU6io%{}YN
z%1h#PkiCzPzhWlS`vJm4(>pQw))DE7KDYv}M{z*LXJ1L8EGvF_H5<QwebXsFfDx4r
zJPK($7PVAGTZ^GAhO^G!&Q}>vwajC-arpt!PLc5SU1rQ$W&01>z!i$ND37ifcZEy;
zfZY@r8u>RHZ%XIu1x{$xKzuvy{R^ocGTXmGu7lO&M|27UZQFVTEMIFCTrHMz`H}R@
ztiO+-XVuQrk8JtirOA;CRfhgEl2@5YOaeO*c6qid-bSj<7{nxK@36a&s-rQ*vg(dQ
ztE(Yzqk-<eRs8RPGIk16`jt9xutmZ{;4-Xbbug?}S2cwjq`+o!C#J>a*pmLN{??{$
zzc#Lf@_YmYz&pgENY+!uW~tIDnKN1Sw&x%^Uj_ij=SveMK3^LoZGW}o_$VyK)75hB
z>@9IJu!xaN_+Hrt1Lvo;VzlM49yQ}lvmjTT6yxa+J^Ktkg(y{GvQc?c1?at2WXZX_
zb&+00@M6cldkcIXyp&b~eZG$G^|-dMbfG(6AR&GDRlM0wUwMcA8o{~hSEzS9d>eU7
zZUs!uzsYscV2;4^0ITdFD!E^N=1}mp{#^!>Cl!K~gXiY*=L*WU2IAl?E1>!Oq^B@@
zKc<;IpN-|%b-?OGiIhw_O4gVrv2`QO?S1Vu&{!je*Qz49_Lw2C=*>lfz{YB@$xN#f
zRWzpI+M2+FY+m2Nd7Y9%GZ>jnE*EU(NDAR+VbunuF1_vX^KI3avAH&Quc!2Vldlu}
zC)?%4SopDHG{OLg9y}&^`I}{O)E0t%HFa~ZC6kl<Q-&C8DDuxwA~U5qFBr~ak8#GY
zxWmoAd$#*}l*x%`;*g={d$Kz(Xy-(>k>M+a2!EN$LK3=xp%D7o;mrI|-Zn!i8CC(?
zdCVP$&=)WV@0M)X3pmC6D6IkJIxxjC*-Ko*?@lKgI1k8z98{Z~FWh4j8}uq0baL=m
z^ZYLlV5R~8Fe)jc;n?AkLnp5PeEP_zqkOy%(hOZW&TZ{Jr4gYleeSQiLQd-GHghj&
zTZD8q)#);$;TJA-Qtc<<F3|(DQnl*bW(YAWw_A>dsKvHl3qKTo&vFcT0l&nS!(6DZ
ze-lxbfqvQceydf{IJj4&-;&>IirTT(AP{hlHFY+q&4aI8#_<`RJNw1gx|7Kt+8)%2
z_zk~4Jt>vnN(yLPyIf)yjbc11xS60W4SAtNHWP+j0kA-9c(&Xem^)V5>=L{VSY`7I
z8_VDYWYEADRUKg5M#LbyPbjU^vrZbaTeG8#WTWw5<jNWP?~@-iI_p4=Z>wdXHOT5R
z<T!MV2F4HA<h81>U{bh)FcnON{$j|B<G|-E?n!g7@g{Zc_NM*Hx8fr-KY}nFBZt+z
zBg#U%W9|sr;^!~v6HGPf1o#8E57<B*a_Xh*%mC9N6h}2;VfJV@L7(jshT7$yPre#3
zEKmlWsp>jNm*oyJoKNA@dw=7>$4AgJkFFggM=~v9g<1?pdHHx%!0rf9MxJT+;WqbE
zLWRp5Wfq)%IXf*lxn7hY${vG8&x0jcawwnCcd=#(<~JkSQnIVER3MD19G~v?PsHaE
zDqR0sOFsH=D6Q?++DMa~daE04Scf4NEki@TrSl2!u17}YhT~j<t6cH4=KcRI;Kq)T
ziKIdF77b%UgA;w`ZfGGdov61o*{#!VNs@t^Myu%WN8cWO;vD5A`>!2<P_&SYmS}18
zsLxogof^(d8Nc&W8|Xv=od*lq;DdkzNRLg-R(*`3;^$LCoT@>ae}-lx`!jh@lD#33
zkw#n*7bLk}WLp5nH$2{Hl>Nr*<-GCy%?<n0qWcD#4@*MfGgKYRiH4maZe5TSfZ0X>
z@=+r?SO#vRh3r%v{qu&eUFw=G@4oPU%enuC*I$ib?8UF+4nkt?i=ryWkL$cN*F68;
zapFJHLscDoLvlJ$(9>&UzJw2@s1EOIM_E(<8ME9j5J<{RetQRQWxY%cQ4UlP<d1$c
zN1gi+csbwIIQwrN@A*ZG?s@P;<5?UV)jLQxj}hLaU$Fkjkr1aBG#>l!B?K5?sV@-s
z`;b>#JL9-vC%#Ow)M0=>1`UONFG9rb6;ob%mF*n}N-X+g^*;9bnZlMW?}_xlPQ}2t
zap@px_!P61wG1iO$3h!r7Wg*QHUfk?Y)S!X<{)GT6h{q%_6GxekpWSi%ng&=r)t)C
z+F?KN&F^Yv@U*Si?*!by&hueyG=UNI|BDV{+gfJ6*g98hB>TfxtC=snO;=n~qA<aD
znil=wKkN3tEly|Yic5fbOD<D=lU$ZB&wM({*vWxW58Sniy&K-c^cu>tHN<@WYOjX-
zKF<@8f>3E+p#C<ojNbL<-UlDOYKwrmwU8CZa=}KP1w``>p6Vu{@e~nA>$Qmqu={zr
zPi$KGON<TW?I>*cd?hn)gO$mcEr!}{z)Q2(Y~UeJ6wWUG`wF*)9Hh;>LrU$98Lj%T
zO;NuRe)rA<s_OWf_PWp)(0{bGg2>oeZZr<*2yXXGzK1Byy+}}^A*p2W#`$HuN3iA_
zUJ&N`yziL3rv79$ChA}D`_?e?<z`523Rzf~Q(Tm_{?7b5AEAs1=9_FW2W7XZ?-p0@
zZrUUJI}#%a`#H?v?$q_gDISPp(NS3R;T-Cb<6OGXCEu%0qmp)8dT!qCEq!6%UmMHt
zddv>M7+`^s2J>`Y!;8ACl}virliQ9!t_V$=g-$^!IfRn1V!rwOTu5X$<^B5oTOGT1
zqVX=TpM)P6MTZQ^lMe}R_eRjQ$rz_O_rC6n)%UK)e{ZU($yD5OvYOzd%-61G)k+!x
zB@A*9>Nc=`a2TR}&yXkr{Hc0Me@>s+E4mICKl|E_5_MB7Lm62Oc+XbDbh}dW>E}jU
zy;&IkBceCxXih8403wtJ6Xv7Sc|G>O-3i$ga8x}DP_e*APi5n+1m<Llj37Fb7tg<b
zdMU4qVR4xiC^lfk-&K6Hes+BE9(hYDQB_@0M>+LvvF__CW?lbyJ5#)B9DNXP93irX
zXmF$3AHDyu5}%Pb@#Z<)ysHnF!ONg<PLXFucg-O`ml3xUbL9uJ{BOt7({Icpu9<xv
zVhBeLP?A0!VI7F;lICwcTU4HzX>ukukz8EG^{*kcx7|X)0HAM-fVH16dgj4DCGqdC
zOPaGqW*HS2u&J(;zJs|yYcFZJqzh1b0oc;0hoJ#k38bZOLn%PK?Wx~~1a5gx-ogZ`
z8*A}bu(Iyw?4qi2!SVT5YlT8IbGGQlozC|`jOgqd_@1&V00@jIQP0hz3viSs^)W7$
z28Pp5z;v>eR;KqxzDDo=kZL%Mq6^derXkeL=w?jz0&ZJ@uH=K~pE`thLkw;S5j{Cb
zb9<SY9g0vh24Fir_+3Wx2xIrPD~t5M5)Ly0^t9UrS3@N*cu+ia3cxbNKmMyx7llmD
z1kEKD2@T7qH<Y4+YA82Ko0(U}ooD9<R<RW5GwrFspNSVW#BCaKR9tpK2EB<b|M&Z2
zv|={DpMI-Yv^&YVw_cObyxzK*wS~nX$dJ8V;PkS1dG{$wdwjc(={%~*M@5ti#GKT(
zUD_;coZ<@1Dxx`=^eb>y$`Cqv8a_H-Se_npoLHRp1<hSO+y9g?VFvv0wyh~M6y>~Q
qVW?B{B|^`c`TYMo>W0}E;Io*XTj6}zI_91?i@B+lNzE0v*#7}*+Gm^q

literal 0
HcmV?d00001

diff --git a/TUIKit/utils/constant.js b/TUIKit/utils/constant.js
index bbb9fa9..59612aa 100644
--- a/TUIKit/utils/constant.js
+++ b/TUIKit/utils/constant.js
@@ -49,6 +49,8 @@ const constant = {
     PRESCRIBE: 6,//6:处方开具成功（医生端）
     PRESCRIBE_VERIFY: 7,//7:处方审核通过（患者端）
     BANNER_MESSAGE: 8,//8 弹框消息
+    SUGAR_CHECK:10,//糖组检测
+    PATIENT_INFO:11,//患者信息
   },
 
   OPERATING_ENVIRONMENT: 'imWxTuikit'
diff --git a/app.json b/app.json
index d997cdf..ff1d525 100644
--- a/app.json
+++ b/app.json
@@ -57,7 +57,8 @@
     "Pages/yishi/yizhensetupprice/index",
     "Pages/yishi/wenzhenorderV2/index",
     "Pages/yishi/wenzhen_v3/wenzhen",
-    "Pages/agreement_page/index"
+    "Pages/agreement_page/index",
+    "Pages/yishi/medince_list/index"
   ],
   "window": {
     "navigationBarBackgroundColor": "#ffffff",
diff --git a/static/images/yishi/tabbar_icon/medinceList.png b/static/images/yishi/tabbar_icon/medinceList.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f9d0c88bec1e486b89a677bac67ba0c1f36ef6e
GIT binary patch
literal 27425
zcmV))K#ISKP)<h;3K|Lk000e1NJLTq005Z)005r|1^@s6>IHkJ00001b5ch_0Itp)
z=>PyA07*naRCr$OeFvOfWtskS>OJ?|GWSlO%w*Cgoss|n5u}MCps+52>x#O6bwLyh
z&7~;Bid|XDTG#IGDz0KfL0U*4B#?xX-ZRPcOuzk{^ZkGC`+eu$J26N|h`>50zx%tB
znOnc}oVPsh^S+;k$zyT_j`9j<NBQ+9Uw(20FbT3r5FGUtm;~8TU*gF(m;~7*29Ej)
zOoHsFFY)9XOoD6@14n%YCP8-8mw56GCP6ldfup_xlOQ|lOFa1olOUVKz)@d;Nst}&
zC7yhPNsvuq;Ha;_B*>2X5>LLtB*-Q)aMV{|5@bhxi6`G+5@eGYIO;1f39=(t;)OS@
zS)hB~$vU*-G>F++pf&0O^`@a|j%oOgrH@7|W3Odsdu+>E<J$V_?|op_dT5$Bg13Fy
zJ#`Xf&-0YcyXmo0^+3EsgLb|qM7t(57Uk*cp8qcZ+tA_IIvmqL#L^M54A`ay+cdik
zOaHB98$bX0yW8&vKl=anF$uCmIlq_w+?YLk>e~z<u7kia1SFlFr|v^w5!?tebgx50
z#MBWbfSC$pmJZw0VOa(&Q-^69n{-S2niws7_p2Y6T{x7F@^XC4B*>oQtaaS7;$lsR
z&jQ+90uX@*bk7z`TCosV)%Wx`x)I16OIb71fL#U}gAAsn!!V3px~YHkOP5di$;%N$
z&-IxnLG~;wG;8UKMl;a9<_E#0f~*tYBybpH3@)}^>Tk+|3Av;agn+5*h_c(1){Lwg
z0j*-qbQl%^PKRb0_W<JEUwTVx=X0I7m($-TL3WU{wdm8UPxCzgPCp2meP6&2L^*N_
z!K2_+2A{NO70X6o4F4a|Wqd{;3&BS2lE6mbGA)Deb-G#lux^@f{rsC6|L}4G(qH?m
zlOQ`_bx!*1>Ua6R_=X<@HUTUM1iT<X;FG1Q22u#9%Dt}QvA?ix&=_1!mFujyO$ji%
z84NUofaV*f{%@bVr0I+Q7l1YivZ}NAiZ85re;|T80zc5aKp?bY5^Mp2Kmo1nB4q*)
zy3KN|M!!?P53^2F(>TkFQnpD}%`{+fd`9=0jL*tIV~YkD`qD34()6*HJJ2RUrq1A5
zUtRYe&kMfc`+>&RO95*F*a86&R0sbu4lBD!1wH~69UQ}j)=dDGA+t?N1jv$w@tLjM
zr39MB){NpbjVzpwn?G|&^X)HZpiP1dz<J+z>RiwF@Ad;>Qv5}?zz_JIz!v^4{FyA)
z!Dx#xIjGPW6CX!bkAM}%W#m2yU`%VMOf$4*>^dz2nyHCYM7!i8Z)p0}%N1yU_aJ-y
zx7N4&!dvGDB2Dg4x<vvOB)I&5fhGYaf2QBdjI+XvX`zKX2r*mDpBZ6%Mj5997`agb
z8M)7Ld}bLOqmeZ;Ons~|8oc8A3tBe39D(+C53-BDxBlKB2+k#7(M<@tC$LE{c?x7D
zz7OF00R2pH8j-QQfFW-d#%E<0IWak?j?V~SWXUEHwURfRkO)`?XPprn>o08FvE-Gn
zd}Z$C2DHCxkX`zt4ettk@m&Izyh*@FfXP6gfK?((76=qeK3lS)CoLL14uRy&BzIQL
zn^nq9<@l^BJGF^FJ0LzI?u<D!Sq<R0i~tr|w3scv`LT;zu9^hd%VY)K@Y^moJ~FaR
z2+_hIVRQkSCP5~cx&XUN0vTDaLP`EyDES8k+QE3TGBJAq{ZWa}49TIX8Ycmaz$W=K
zY1KFpV6s*hjjn&m4d+jJS;c36x0dW}|FiifEfAk(5QLP2x+lO<7RjzM07_nff)}7z
z3Xm`P3^uy4MI%7^WCg3rO)ASQTeqqVlk1vcQN3Jt3PGmIPRg2*C8Jm^v}W>N8=M>W
z7rpbmmrqsT?-FEJeCu(`udUeyh$#dxLj!b8g8{+!v?$~{Ln}sL$}4~o$g;%%`62<&
zXW&tMMj#_#hV{)daa*m<2x*Nft7dAIvJ=H=6#P@1R!#({w#lwjqZ%h=o5Zs%JHGhP
zIhS2_ng4Qd9DkP}``2G>y-XMQABv#}V5Y7S9|cR(pflj4_oTpIy2k+7qK{mW07mx#
zvIS28Pg=B~+L~37wbfMuu6wF1w3_B%SrAbhwybSZ`KerXDsyP6?4&Zzv?G?@@`jd|
z1yTEV39|Rywc{=g;vz%SK*T!TC=j;|0-FR{m;e-gX~hUw;{^|yf{*dMk4(Xn7LDDf
z&tT+=K=7C4ri1Ct4wMB^rWp;3=v9&+;?QJlCgZYlB48O_ljWU#{Y6ujztpYS-yO)V
z_-&W#pfI3oB5G*_Fmg{CA_m<g(8#)l2|&>k$dV-^a1}g^<h(M-#tYKAk?RaI&XA}*
z6unvXV+rsCva&2lacEpbud-$#(5UQWnOf&D4Ta<1`l@L|FJ++p-GS`dyLVk60`YsY
zUR+N!HAD>=2RWo%En72<vrKZ8xe@`)$7tTeXwJiE-p5$Z!&u&93rBya*o=S{(jXJ{
zW(QiguryU&`;>r}w1!Lsxb##-)DplrK9gz<wrWvR{PGiTY<bfp$X-G#aQ)r8mui~0
zjR0or;1fz9BY?T2_hOKdC6gc{cS&xM07U>B$@>_|miXtf0=Z3T%@|~gxDD%@6U2<6
zV)g*NnPk=~bxsC*NYpCcj9n&6gCxMJWI+tHx@hp88!w#lt(VX;PxvT*cb4qK_w4?i
z23$x%J^?BOmrE9nEJu|kqrji6Q>G{_8M#UV*HG5OaJIz13qclA8pNlSWkJu90EF`G
z31unuSS~v$YgR5hsge_Ao|F*CY?BnV%$>osv~1ceoP6U&)7HNff%bO?vK#N+vq1;u
zleHp1Q5-}!*OE8-oyEbw#@QwDV+=B~V0jsn4HL-NU6v%s3VxYKqXeK*+nlIBdp0#~
zInz{h2U*$BnuV@Y0!+HlvLuM<4e2%`miF|ysocqDpFJc0QUlumd5{Sq<^VVmz_9?1
zx%I()=Zip)qDEOV0vWkV9gcFF1TuD)LdImFB_k_F;G&z1%{)#B$XymnWc9)<Q)<yD
zK6@^`S+!NGl%{01OS0{-5>Tc!xFS#~JB1)4ixxBdZ+z^Ht?!!z*->5rA;e4ouM<MN
zM$@#@f*@!hz))?HYT8R5>MC<%6q8X#>8hZgB{)?yM(8dnCJO`qGQd>eU!gH%;4i6+
zis12}O(s=(vod*GRTYpmP?817BD$0YRrs@Ve?Zxi$*O=(Whcjb;|&+K-gT6h`FXwk
z{|QSbgqRlu!JBnmzf=gZuzCduT;Wj)1U|W<M>cq9WG!Si=_vXlVoK04g#m!--{dZd
zCnJ!_;9q8$^z(rfMp$MF1&^fIAZs`=0jO@9dp2E~1R1$a$(^Yt6xE0lN`hE}rZUYk
zhh}N}JDjma|9Zjfz0V5?NAbZgTaXDMTmb(B;N3!qQx9CDYH*c7<_moK(OzgmmXFwF
zDxigcqgahND_R(Gd8L3T3gXEm8A};u2r%g?E9E6tYbf0r>(P|(k+o-kp*IV=oDOWO
zt5VYv&_Y^6fsHauE<1(2o64G%`vasb=)q53-1KTqqj!DrkCz?Dgb+0VDDL=>5TfB=
zOE|%LA;7NU81{J?bbA?Wc_smkx{s8lAfQnUCU4Sugo_eV7zIyo+(kit7@rZqsKms@
za&nXE7AiMFHEr08BIC1(?Q<2?#>6i4N?~2OO(om@i}*~%X570O_6Lw`+t5*Cd$)e{
z;<it`_z;s`;bn0MA?g8q5Wv+!h}5%vXkP@_T^h%>(g?N}N3gpz248A<_=xRnhgLFV
zAzK3sRUjv@kp+{*@~}XzBtD)jE0NnIU~&DD%1QJ)QfGt!Q@XS229%1NTLQb%$@JIt
zX4Uitfs^7grdU*?aM+1nE<2H%57o31bY4@$JM+5Nw?6V>pWv4~$b=9Ufa?I<B7}%P
z+k$nL#<3>fkF|vXWP;MOuB*GZ6?)F*+9bP8lHO?Yo&YC-ATvW*AeSJb?2!OP;G!}T
z*DRI%hpd=KirGLaGRnYG%33O(llvsgSSDT-0ZSiLN`Jyw?Jwgr`fN;V99VWzycvre
zRp}`dI#MEFo7(Or>D;0>o;_pu#RS?*8e~F<a{zoz2r>U)i<ApItjzb~@mwGJ{E8}>
zPMD~&Ue(Wa`s-nhBstq;ks_aLY3ZteX0A)AFeuiNK%<*qwq9X2DM2=|>4bpA{hBH^
zBi&gjh78@NoTZ^+vI%W=5^$m04CURj+o>Yk4$DqdJP&D&>O_FtW?e%2#ZBioT{a1_
z16Du?(FEX20Nx^44LI=_4@!7A+l5DRJ;)1R%Aczr6)IiJPg8%S_-izYNMAjtj^)^m
z(nzHtBNN8>JBY@gVlx7ibdM5vC7&eOGRS8jRavsI5v3BJQ3q5wJEPK0M_)j;&xL*I
z6%toxRfhx}4{_mXL8=p-td&jOP9zPIy_*C!s%vuj$<}e&u_kIG!4+rBZ2r!R1+<rx
zB~yTUwE%tsA)3NSN@7NUz;%CSA0Er~phRXUv_G7_$t%B%uktsO0aj?)bk9O!Z@bdx
zhl*CIgylz(TjORD<@S{HT4s&`N+iK13&++=>HouwlDIhfxePSfR#(lNaqj?Un+If-
ztk9L}+AtoQ;6~Me7m6Ec9F^qHr~(jXo8j04S>GhLxv0ayj8+4Ire~s}wB*$3Q#QUB
zKzm7mOo7V?g5Wl2+RZ`;>WSr(9p10b_2Q4?oyY|xX5;_T9ZHl{@K$A=7-tm}CcCFX
zD_Rni1OmF}pXL9{z^Ecs$sKYADFS#3U}U+%ZYF81B&b4=(dQ3ojB>*;1bn5|n9wT6
z*#>>-Dv&Yglobnf1wNSxOQ0P%El74dQH<8wpyTZ0P58PFPvg47lWnDuQ)bWp+mEPv
z(LtsF)*^tP20?HZ*(bIn>b9>mj^B*!L}w`@O;zaDsxC=c0;2PwlYm<O4EmYCDDMOH
zGwH-qLmHfsG=qwP#y4_xGT1M>OOC5TzDvek6x?%b905!O2z0>L1Ofx#OGBls!X(o~
zvRnB<`J&JPoo*&z*nnkgupJE%m&#c3QKf>0!F@i)_j(xFmZcY$;0pBexGG)fvh2iG
zta`|v1Xwa|;Ekv1a3ThLjX-8F&`b?qJ!4wq2maR9>~9XT17oaWu{htfth<Xr(7w+r
zAshI7%LD;-6vnVBKfsQ$5}Hd;K+|Cb<0$Ge7@Elt3ZX=SJWb53+>>-iW_DRPFf)Tl
z^|e88JDZe5Gceh;$(m)wT`G_Xff59~dJTG9z)bqkZ9<?-5JGb(KZk&B2<ST9OYkV9
zO*p?5Vnqg()%;#QZ(w-H#@=P4D2@3bU=h$NV3XyhsA=*&yG=!L{NpJ)rqt^QbaIu3
zv}VxZ8-}nv|KeB8Z2s-v5@<&qWYwVh*vCGm;kMhb{ujT{`WrTA|9ko^r^I#ru0V*o
zKV?SoNUj&UAe#f^L<uF~EAWINR|qu?MWG>IECQyBgkC(@IaKi(1v$zU0mz65g7F?C
z#~NVg;}Wm|HG$AcmH_5PUsVzc-CQZI0qp@CD+9w+$wmb}mG@VfYW0lHFs9^hK_7*z
zWth&E@mKu}d0NQQ4i3B6b<YrjEPXHoI$1P|=Y#=6kUWW!00Nl2z2+DVC(a^sX+RLj
z7-%|t-C&>vx;Bu~^2eXh-rn`M0@_gpSqLx!*ZKtuv>ii3dM=&TvYCwj$R(G&F73KM
z@q-{nmgBC>2p-Sv4p}OhE~)^ls{B}9mx3@*$c@2>)*_}!bqi<x%JqfunaoYey2yW{
zfrFrwhaoIP3bBwFgOKSPgb_ewOgLRcKS<%C7t<ixONd4?5|qmQ$)BZrmG4~*l+fZz
zs>Id}IGPSeHxShgL^K05x6Fbrl^U9?nRXVl*j>m-I)#Ok2KH??(Yta4@CjgK%_P{!
zs#(<Sq=0tvOdW4HL4!tJO$uZTG-b^~*9qW(v!*qi`?o4P9W{`J0K4oLztH;|8nnLt
ze!T`TM$m8Eb>3V4q0x!`r!NAF0G1B|{4P6+4aI#71kUpK#Ho9wX_ih!%5VySfqX#H
zX$_9<@kwqnBA8*uCBZ5*kP|Iw0qz^?=I3y`8_9UozY6y;(Q)O5YY^G%BcL`n0L2as
zt}|K&va9KsWyfJtK&{?~#D*p)?$Kbu;J<OB3dce^hiBn;W4eMq55jU5fkor2b<8he
zU2Z>CjP}9Mb?CZ=g6Cr6Z-)?M0L?d)+ccmP=!DK-o!g}2-Dha*HVI$^Gy)h5Y01c<
z5y*Us&vXN(@NYR|dNcQ(9_{0(f{ZNK#<yNFLvy0<(GWy5Er=(fw@<SpXXS)%WPA@9
zcx(Y|1kh2Cz#^?qbP9+9qmyPpN8B`U*XSPX_Y1uEWzeuIl+Ri0r16^A6b_2{WNSL^
z-oF?3?B54n$}V7pAY*`3sE-QIrXe?!fYn8xOM_QuBGQ<FZV>1MW>_(t?9?N!TS%G~
z>+%U81SGD1s`m|lPoMMo9vjC-@$K#F(QOo9*d~16MCa22Bb&3(e4T-&2c`s@uVYF=
z!w1e1NJb6l2Hi{s83%+6Hk|=S0FyU%pQVV%pLyE!wnv}u=X<`7fBq|Qi0?p_jI5Y;
z>f*OFXk(u>G=GW=L!_lrghItFR>e0oS?9*aV^D8K_#~1==qcpznQd!1tINhT23iOh
zZf6t%Cr9h>&W4T&pYS_dHsX=K9t1HRBCf-vlc1~`xh!&D^xQF3iXykgAnPeY_!|6n
z8_}9E#l8b?OU=ZIi8KTGXdP53`0~c5v3jT<NSm-s3;VWP=wCYmtwe6pgzk|=Gf*4R
zaP?_E>Rb($WpM+rZko^;U{owOCCD@b!l;0(L>HN+?@V~3i%*(0YvgEsmoW4^DzCqE
z=~Df{GtbnUI;LLLs0}aGHPos^z7p4v1!A<xpoZfb%FF@{A89!j&33f>+4}N1EPY}X
z;<kl+osPI=BW_sb_=a51G%JSlYg;FLpWk<NV$|~xu}o&hWdjM_E7uEPTWJ&zj`px?
z(ivoNSiMDgLCmw^=vn?;<RafzI|D6|%IA8%i&rG+kmsQg`0&)A7Xoa9Gx0S)w|*U#
z_w~T6v0z6n^z4qHZ_O}t-v9_;zKI%B$G<M|FoiB2vfhTlATtPLY|+S?5nmz`fiT+)
zm^+iSh9-jlIeSJkNv4k4anvjsf$ZlCU><wwTW@SO#%>nEkI=WM*CVJkY<6W7$0$C6
zgI{us6iY=k9j{C_qP6N|?#*SfJu}W$h=3Ue#$oZ8UN3D~nC`|VEY?t|Sc!coJ|b6p
zz;b?V`vyEb*bCD!VY?=BLowL>MRqy*91{^Ok3a-CDO!tnHFmIN4UevDhPktX?_sb|
zz;LmEu~HEk&totVsF;)us8SFhPZW*k@!vCEiEnS4Js%fOoj&1Hed5U{u%f>QcG5;9
zW}~k&g8p^GtRR7JAgLR8$MHS`j5^Q>sBGO8$k?K(1c2i+0-UCRriZbaytjn^u2)TO
z{?DU@vZDsFOMm`zV{N?0JmHx0Z)-M&Z=x?i2J4(?6PmOr431%BJVO8}|E%Jvlx1<8
z^S3y@u;D2z>+eA%X~BuvD2>En4HTe7Oc>KmSVo?+%#+<(T+uXp!bkez(`)fy*Ip)L
zNyfo37~Nz}pg2AOLH`dkU`5aI|22WzI!?k_buANK_oHhb!=nRzh@@;pT>_bd{--3!
z;<}DE&kxWVqr``j41-67(gmb5*r=OHS~YT)ln794#<WJ52yn(3lC@eU>6cDiGP8B_
z(OB=J3bNIijP-`so%1ct?|XY#9=bHyjx&=~|9<HlpL%)?9`5Ufn<A?bK`;`7JyZmu
zHmo)crcq>Tbeda-|JO7z=KCyJoSrUZqXM2yN>)R;UADF5FG=8&xvGj%_)o;m1^Duu
zQ!y`2T1<IROm^erk7CWxehIRugTCDs_HP(LjiKYB89o}LI$T51A>{rId7%=>$nBHM
zl-5kTP68Oy8f4YNY_kk9j?dP%6^Bnf8fB-W2C}o3E;YaTzV|I!Zu-lg%yhD=B$shj
z-5ea_KC9;Nc_EKZeAf4n_kDInHI@z6RCOExBgG>6a#@U&iWn&5F;pyKtR!7j-t)LD
zM5lf8=m`3Y1-NM&PBaP(M`4YYfJ6jVlYpU@*j>Ih(Tq1YRNNY6#h+TY8fymnk&Oum
zrHCL)!Uin_*?~VZ7b6*dvhH`xJ{eP;iklxS7I4$!k7CQ%D4etn%W}}a%YfcFidVOK
zsIzsBMPr7^i3{~85V+ZrQBp(qWZ8@mXwssQHIw|Aq%>s4S&7dK5!`X+jOGtLuaj^H
z4?Zd&qs;ObdmnW!Y(8oAk46R-ZpiQBstc)BZ)#k~StG?JTs&6v1972r$_Y3W^Ryfg
zTm5FwPHY|yM?O&Jk<#D$GRC3jeDIh>XpdENje9cVc*_HS<SSdV<rPlZqegW`u1rbJ
zjjaF?nh^`8=|CTjz#8=-QV#685;Q}8)=SgvIKP&YWIo2d5^i6&8e2w2kc$JFV<BRY
zRUwdt5DW8Y6-Y|5PiEJ=CIVlcc_OAnsAWMOo!JcjZS^DQ%I6TRjleJ*Xx#yhD~%wo
zYluRFs~dca8YahNWW|_|Q<hBLQ|nwM31HXBNr1`RSy&M$15MY3<#}&7V^+)W4*@%e
z{E(vtvSJW?*bjowd~>)LJM!I}oza5MGGlB-^0^|skrGCV1&o%83_6NWs7`r$(-d64
zVDW@6L2l`x?!EABz_*FQ2xA|rSPD#y#&GNGC72$KvsI(Ode8V6-oNr8ZWlvJUg_K<
z!ok0i+7J&%CxfQ?m?nf~L5!B*4o4BxMPa3>nm`3{A6GZd!HJ2w^5^Q!=WzSl)#%A(
zkx6PWBNig$rpRS-a!|#?DL2WCo&uUw-v;>d%#$W$th+Mfc>klzFzS17>mqP07p;SN
z)Qx2sV05GEflDGrsvamS#z_rj$ZXM++a%D_AidCSvNcn*#=*)?n%190_V|;gPwzft
z6g|fSj|#|gxm>#$iL5XAe*8;=`_NPD=XIqMMe#<FQuw0B&9KG5lh#bp7-Y%Lub+y`
zT4q(oYWe|wyloTK?jJzW74RLINl`{M%}H?Z+iXQ~VzM6OY98(GMlN4s_t>4w!XPV_
zGRrQ7Ef^^qWQxkbqZ30`&ev>Yh6hnsaDYSutmHU@n82{K^;k@IDwc9@HiM5nv63y?
zXhMT!n}}EzY~4i6kQ`i8CzmF{Agchfj6_5)m652d^xE_kv_~tJY<FfH?|Asn?A8cm
zF*}adzHy|p1rX5@rSg=ZN{5`|L3|&rhs73@lpa-XldV|=WLym}D`ls!wi#9gh}sYu
z?m1^#<9RP>kO?8~^n&0LvM3)P*o`r7h<yV!bjXqAl+IJPHMt>T(!nQhUNp^%?&v0)
z{y=#6$;J(3*G6v5j~dV-()yf|Xv8bx&9VW62ij@4Xa8>8-?x{aL++7Xp-CAcsYeZY
zl2r!i!$3}R;pH+w;K^b<ea_qnzgAsx1`Ib>rXW5u^?0;YxwWob7AppNVUgt`0U-ll
za&aoISM;+KB+4wha?e!)O-EzIW@{84<mNAX@K3NU3$Z!}ZX}NB-J?k6if~D^NFXDX
ztooTN9O_m9n6%hDL6VwGC_YnQ<0OER0ZsxcF<Mv+ApT6(@y@f_8^8ZT0PO|0WI~AZ
zgb;rWW2Wo+wm}cZRgf#YxXGGPR>k5#5imgBR@Z@ru@qnJ6km*cMclr54Yp@SNI8JO
z0=qN15nu=eZ?Esbd3BW-iLBPOt5>l5^`jazhk{??k<@ckoFeO=s(}|8#!DtL{nQIf
z@*L@k$=bQ87Q`d6@J&|uv+au~5X3~L=6tVQQhK2%mtEsyc=JQ|AY$8y)kP3>lIYko
zh`8s&C3ndn(_urvW^!4^WAt6wO_nV)S?Dkkkg;O9>{MmV2vH$X>nWl((DWg*=*>N2
zc1!<}0_|vkY^4z56ml`t>GSpBZakCQFE?Qz5g@q<!-R{h5+(v?#~bmQnpQMNoN@|(
z=dNw|-JV^1;)mmcb?YI(D3h9EM{!ltJWP*Pva&zy-HqSu*#*}!ne&QS6o{L$G!@24
z8qinDV`qUxkkZ=uLc{QQ5v9=qby5__YNsG>$$gb<Xt=fYShPA7w|1n9|7_3SHaddK
zm){55wh*s%5OHfTZ$~ep0oale$RZS%k#%GXNj2UIPsVlKvdfgo4gH^o9ILu!$e~F|
zkg9D~%YwMRsekF*_6F({JEG$S1(^`yTmbj7%9OG{5#UR`>(E&klQLy$#BdrAC;b;a
zhDtS79IsEdVPO?d^yJ_GzVh@setymo@LUZEGlC?Ql1v+eei3IR8ktV0b~BF*4lu*c
zE`mpON_P~xDEd9U=5VQq?S)bNerT_%f$GS^!D!EJIWv|m0^ruS!6k)<5J>A5u5Fo*
zw&w{lS_eu(m}Vg*ZB=I!R{}Uo_AyL!OCgW_g*<w5S^R3xF4&HRSSo_3o5q~&-Eah?
zC8MnkX;ubEDg+ojc7Z@9!-x=6bk9~<)oRI#F|EO1Q!Z1N8E090rhrDVnXl`)lBRXM
zw!Ptqv}Z3g$Q}T27K04Hx@<qbzkg$S>zIO>MpXA%5KaFQnu&`O?Kriju3V}aDi-jW
zb&q5B_!v4;DV#NJ2D?)^Fj!+T<1hE`#<f!xVs0#X*jE^psP5SM4EAa{L?V=J*%%!f
zgdnXMgG@uLaVnxHastwBNAZq^nH<2=zDsn`&}SXU=T#}G#ICbIai#(fg#}cj%yRk2
zV@@wqDq)-+7x=tJbfHP+UsZMq5X5nDlZb_=Yr!!hh`~W??|fCUl>h)B07*naR3K^!
zMddDK`Hetksp&x+n^p(?6dSS?3lkfPQDp)Bz_L?V+mv9FB1a_+`q<gi8kQdRLLbmb
zb|kMuSNmxImWRSUTDULtt;L?g7&lhrwHQna=t<h6dL1uHwBeP>2Gp3eRKR$tgzs!#
zk4JmES?ziG{9|xVLvy*jM498~H$R2x@dV!7HVagGI^2V-$fwq?!$SkTsHu0DPs(IV
z@UkOZPqyPJxbYg;LbCl_dn9m_JUF=k0nLi_JeFiLP{NH#CX|nq0Dw{owV%B>K>DMU
zN;1=B5w8S<%oa`7hw-{mCaJlYv2Q<Wibame92(@uIyPz$mN&9oQinzsO=g<Xk|~~0
zWud&UCY7IvyspxpRV<ngG6x>C&c4SVo^d4O++Q$DCWQD6fH%-dC!lS}58|5x>)8sF
zV8hd0L_|?GY>>Hg8*zHP0qrWLqO1OQojdX4t+IUfhK>$g*fI?b5iS<6yZO<!O?b4w
z7w=zqJWfbg_$vB)G4L_2+!9$5I>Ij(x~OWRmj1r<sV8t>UpHz}4qVqprXb*Fh7hZ5
zf$Nwsg~zWGg3R-&YurPLZq#o{+@50XWi~0_QQpZye1-X!<e2PFkR9u;ZgOeJB{d1%
z6Wu{sFlCw=Fys}nEuSg7bOKD$cQ9{HF9R&hFfA5N%IQJe318;Qq!lA-M&3)Yq%5Kn
z?P1DITtn?ymHvzXM&ftMxl5XM&bb|J<fRVlctJoWgdlwlMd@7Ap@qMr|4D2sjIx9|
ztEb=up+s8X*hme|iML=uyyEV*kB;E3-8=ZKq+(H=+R%deRexXJ(}k~WcnYUBHRJM*
zd1z8e0=?Hyc5KDkf!?x9q6$EcDglavqkfUsv`od)<4&5eNFQ0Z8h`HXLbAp|BJLnp
z1Z%RAE@@k3$%$h}ZY&8P{6NNd0-Oa`_%DNhPcD6TK7*b4aoHIjs&N4(TTf0jqRDod
zKVwo@@f>s~H?63|kVNZ{`|T=b@zdTND(fW`tc~gW^JpB)A<7hn4E{}u%hcx$c|TSH
zPe=kP)=gFesE95r0%0|PEE&-nWC*zVgzvS_pEGazhYt&3FO<6!LVN_kCqh@*?PYO$
z&l7xda!9}=)vG#LZB`WL$6IkyGA$Jg%2KQy8RE7zQoz<)HX7`RV$Ff=W25-Q+SObg
zxPH+|IIX_1{C)RjGkEVK4>AcWB1BtAUWm&_WqT&@>bh3k(lN1$@Na8Y;{Kj))TA9G
zVo{V}A>lfRXws$A$vZ7p&+??WNx+*>;^vwG{f-k1U1NP10pqFh{jA897R5l?vhj|_
z4$O9wXpBUdM?2JGPcDQ1*s&RFGJ}XZlqs8NF4~ycH^?BX&N3+hpm>*NBXBkyTCb{@
zjNE1zr%{Ly#%7dt5|zPig}Q7d3^e*q8d<a_&t5od(V>3k10Q$j-}bM(gAigP4WbJt
z8s0Us6Mr7<WRg`{u_A}J1iF8!nTA)@G#;|Dl#1M+e)4fVJ+vREH&4Mk<}5&KmB8<t
zo7UrJ+cz_>g_JA`m({O|*{AnDH{FVBrcaoUhig`^z_R{cq-&#a-KcCz5#*j^ALl=$
zTCp&i!VK4)ki|aNVs9BA#rJn?!lu$Vgr(u!+9`NP^GqaE?D<^JKk)B&Y}tUHb?!u}
zCIZ*CP_Ma|vu}Ty{U=h^7G%-XxC5m;E@zeHj5F+WsFa;p=*V#y(Kh6!CC~_9q+ceN
z=>uLaYQ!%%%*Nm&2AL4zH~>#p2mBxHdJMyUf#b2fQ42fB%T_ZX@QEqM9kQ~N+#bbY
zzuvur3(watJ_)a?tH^{%E&E^Fw{ZDLr}?T;6Aun`ONA)8q^jAk7o^+p?$(MHj556s
zty+P{hxVhkHj1e0!ipy0iacNG4W^CvHqJpuRl)sG!9i>Bl}*p!k%3+m;ySKsn~U=s
zCMtI6waBGYpF^0D((~xOla_^)WtZRXmz}%t$qnm}h&iZ<N071-SlHPw>zLH7RFwdb
zHIq9C%ea&Se>G@1RQ?`FafISVdMqa<To=~avoOeHLUF>Gix#du)HSGn+zSCR+TZ8a
zaDg`D2J!X&XJmj+ok)5bc2MB=qzvtXniiawYDL^I`R~LJ<$Vv1L4!eLkRQ6xyZ7$K
zzpsCi7wU|*R{YDX1!$>?#a8VffMJ<3PEs7$PkXjvb9Pj298YdjRtj-RZ96V)npS@O
z?tBg(TD2To#>Y@!A4N18N5rAzq`(Wj#7*Pf&9hieQ+-eZ!c>J)yz=*kh9nWERhH_G
zjnClEJ$n(jI=-~<6wIyS0g0aZ>ZYg43fZhD!8Ya*4dUaMXT28F+)9n~+uJtb-#4#E
z+>M~NCW^G3#DdO#P}h`8oEawplFpz{%T3K{{6g5F74|iRrKYfJD|D$$&Qjk3YyT-5
zR_)R>1)LQ!+M8ap<oI8{SRh*^gjf>3`Hu%TV`ZjS&6psNrC<v=FO2GxG(Tdd?Q*21
zXFT+dXR)xZ4rjKsp}k7pv%I$(pLz0elxV>m9cQ++v4!HyF-!BoO6bq!@X<v}&`cUI
zr8@n|u5I}5T{~dcT5@v*()9p%SK}<ay0*EzMmsa(c<;)G&{HU&zTSlsO~AHIL^T=k
zpBk^l)l=q{A5W6%pYPZTV&e&9WC?Sglo=&#3rkOU1*TV7z1yE&g9m%MphXRQ`@~nF
zJz4?H%Kl!wcjYpc9O(`P-;!b=BN8($eCzl#Frx}&x37N^Kiav4K~`VmqQOjJPS5^w
ziHX2QK%=SzTQag>YHCq<@mJzA`97R+s>GuVM7Da$nlbG{3K#M~>@web-l-@3$KM=e
zYMf>d4M+*!{FZ$yG3-lji83-z*a)lyEWf~dGAfW4NoZIqp;+>8MxqI?YnqPZlNBN3
z`r$!*V(ls>I%ztMmo&H?KVjJz^-4fdvg95D+&p_R&aJPwqV3~jxN+?&<m`Z@)S<TP
zmbQgBCSG}u9hq^wb=kehi2zNFaYUjC4&Eb@J;3R)I$YIC)7j-g#qgz1tYrDnSR~;6
z3pozdG|Y)5v2^Z|G95#Y|M-)S;~@f>YvKn>&O}?4DDl^wyYTUKt7WMyCS%A@=-6mE
zxP9J|2_U;^-D>=*b0@pY+GG?hMh!Z8_m@jd5@b}%RGgWzW}Fc#bxY_n!=RrfmHhG5
zB%!M0Kqh3>AY<{}Ew4TOl*8)NJR)}~g!o4xMA?M)c{wcIx4JxWhrT2cu|*>(8#stk
zP;wvQnoe+Q@tX8hoKTZ4b6Q>5EN*?`Q6^^Rq|$H`5lo3D(Bj0fF4K>PhI&+dCl~OP
zng-l7a}m=5bdbBDcC!2XyAi96aJ`cj?Ta%{n4mr-InC?u`vbe%=7u;T@f0lK@m4r=
zytbwZ|I$3G46@El2G_587^9@Fb%o@bxV;Wol&HhavlgM&uEbFvUAqd)`?{gWO#I-)
zvsmvI9^c!x3E$ZC46KL&CvL;GY(;5kXpgwKW!7;MKI^qlti<oS_8=8=kWNO?rYA9@
ze~2v^xl1mXQ$3S7Fp8fP$mGPLK+ft=fRfyuq&C8z!^ICN4;G3mrAj!5B!IZ(g0s$e
zQ9$-ZA;h)e;ypapg`W*>t?)}~grz5R1d%i>pArB$Zt1va4bDln;DjnFg8)L!6J%XT
z@ks^lI?G0#ZF3{-r?;-d6GQvK13szV2Ehw@$DC6pxT8l0`a$$WtR@17I4@ntzjrK|
zpg!F>K8Dvna5u|<S{mc9Vzr0_1)ho{f&g!-or+5u+snWp?bwye?`O9*78kHhtDMEY
zqNV{iPCte(Bn}INV2%E&!G0u@4!*kR^a+LhFK>JbKi#nvwqx=|RO_Tr;8+lt=O%F7
z)CFi%u_wLWhn{#8f9UE&IuS)G?x0;uVEX=HxR5cK1eq)|aUGLm2RR6aKqe<V%Dt~c
za##XQjR{dMmYx;@Ff2jH@iF{@|8~K-=X~yO?k<BMprN<r@#f#{-+;$6QW+8k{>=EB
zDcGbYQ{u!qP6Fq~TX14BUFO2VlSA&1%1lyOS~*Ck|LLdJVrym;eq8O6MtqI{E=;%L
zT~(PQwa<O#=`~oN8%4Z^teJtYcAShURmJViBg1&(GLq9+Xs(aJjMXt=OkF=@fv;-r
zz?tbvCc8H?jw@E&&lE`}PTSJhtZJZ>a$2$h*H2qe{;<T^-Te4UY#bfNl)40NUwAU6
zSH)PLe0mLjy=NyPu8mkcg4$>egN$BlaV&-F+ZS*JAUv*Ky#n|4>_fW7MUCrVnij{j
z!4c3v2F@;N`yS0;cS+YD2ma+LMLvHY7KR2iT3(hR!fHhL9$eK@vuXHu<*^E3$CY-)
z#jktKVNGj1Y<EdIejx-6h$u(2H+DXXAzvyixag~{q>^0^+our(5`6D#n1jWM^o0J!
z=ej~DCc16iYV;NgKvHKFDoK9mHJi-{Zk=&F>Mfa_(tCVw#}@qO_RUD99W=O6e0tVI
zcX?mWK3u(O1)@<KO?5GtZXH~aV{lVE`SJE+Clug!jgR8Jk37UR&Rl|qoLFoH>4d#1
z*?<pComX+KN~2F;pW9T6+vcA*LA^nhhP(H5A{vt*OGncvi9Da!Q{uI_zI}fAA|r6T
z=dop2HqeW@q>H2*#SATm_Q6raNcKbOS?YwRz+V;2d4eF%Ta%*|SZ1YeA&^3lac*25
z6eG_Y|G(-Y=b4rPE_mZb7u@|^=jmX7KN6756hdqdUz8?JU%Punx#=skT4bfYNFyvi
zD=!cMd~)h>XsPNBKiCJOt|GEtRD^zXpckFvW9&*PR?t%xXMzMWy85Z6cx~H!oLW;E
z>%Vn;3?E#*0(nbdZe0pD&o~}at1Q{Kwr;{#Ha-Q{ji52@!f<O5Lyog9`s`nvv3LS7
zo*o>)zdima4BJ34Zo;u`C3n_vX0icSw^cGx(&)dBHTor-G^Gi*&O3ow|M0kJ?JE4K
zyAy8AK|B^=$u?660A87_!*%VIIn0B_BHsJhGOQgQLVe0bO*D#`!ok#$ai%cHlEs+D
z&{@DpLuRxf;B^kDS%+t?DUi_)c5-fMxtXQ1_G)g{UrZ-bW3D`X{+r(PhE0EKkX;~z
zD0j7N$q(ZT-RsID2<V&eoG%)0=`?UW#<Svr0GHIZ;oMXUb5KM?l6#>mZm3Yes)1f~
zWilAZ=df*Tg!v=Rb}WsvF_Xp(I20^XLo1yaxtrU(XacW@*KzCH;CP;O_nSsXurrsz
z>FrIpVcM~%vnxE@$Ddw<pY7U)L@a`alnXst3%3li0C&thaRO;fg2=CKc$!IHFK)qM
zOD2c1pPz2QyQWl<1d>m`b=jZ!f;eMZD?UE=gmSz_CyC<4d%E|r6^pqM7AMjLL&xdK
z23$9-ViosfGkDL+W!RA&M}18UDL0A^-^P@&EXQMH#RzN^^oNQJ;>h?S=fq0_ivUNW
z(J)4n<Fw>d60%&Jg|d&8o**RG6(UDBKJ!$1>C&Z#wZqAgShDvDA-*0Wd--TLemFo1
zipsbr$?^yA$X!;ImP($Fj!2BTviw*9dqzjGFT?YF;1f?}fF;)yK+srB;&>Ls)0i2n
z!H8eNlbK;9fgu8s2H44DqToqdB%h-`Nu}{O4V=}`f}3U?JE0@}`ZX)@+kJbGN;vF>
zj949_ewJU4ip`&!v1oz{_CL37#LstbgGM7VU9w~Z404yirS((smgY)7CTsK`x`(aP
zxznfOV{=cKU;wUp{1H6R(}hIBL4CqSjZL-D2y4}jkEd|?lo{p6Z_kY3Usl|Y{$dFY
zX&32e46}<mnzIGO2w>DAM;%L`(vl)$)p&T4xN|(lmQ2QGq=n;)pDkM0Y#h!ak%M!?
z>WrG!On`gf@_+s(8h3wK$B}^Sb3%w4!gu}E;7<I0cvpEE6K6CGnh1O=2{R}`7xIe|
zAc!j~5?AJV2ugDJ2+dw)m#P5`Rul^oX*5P+nCaGVg`hbS#V>kyVCBewV)SL{h`ZBS
z@8yF497=FP9o5<CX5292m<bC+8Qa}mdyr1LNGDuaZY>;<Wy_e-O?+h9!U;6O9UGp)
zgWY=(bt8zzBdD<*X84IZIV;_WSEedOd&*q@>7jdhbFK4cOv9~nCKl%Z*xSwE<c{wu
zr3Td}5~ewUGbG;cA0PY^sAkew8$;TOVQwC1%oh=(-b)paIrMrYZD(DX1Pfa+_9mXP
zXv%d`tVW<K8?OqV#zHJrtqC(!05`tlZEyYTVIk~DR2aVR|4`Gkw})^1{l1M@KGvhA
z^T;cMby$%Gn7-QQQz=HPf#xYtq)Z!g-5R8=2&OqT+zn2&1(lIV)<g0YGT|TJuokQL
z?}r&TVMYwpm^Nlb<Jg)V!-!X805b`xrYq9PJg>GD?{BZTAkwZ~wd!Fmj#HeIh{ae(
z9}zh&t4uW`xTbC1gqUo_{(decaf(lye5nbE1QhB`sBUT7I6TDGhvrdSFnu~cGUu=b
z44}%yYySK@PBI8&DJOx286WjUuN;f9<c9|EDJeF^WCSuf+Fe<&(4z7BsEm_lmX;?f
zg>8v+FS#|zu?6H|=3n{${@-E6V=7TSJbVfvekX*uFnspEcRz)7nF0PUe{OX(2&WOI
zmoJZn;@<}W>I@t0wu_i%VTv6?4YhyiCIgCYG(GUZgUUI#KKVGF8X1O_uwX|_%#GFH
zf)p|S8iu_BdW$)Xcm<wV*j>nR)5zPKXW@-a70#<Gm%~+$EyJd<5j57u5qINo+&E0N
ztI2|B0v~LhH-TJzKCATS?!CBa&0{ca6K|S13)jt>XhomTYwZ{x!)x#RJ;!a0sTh)O
z4Hl2)QR4}jU8>-p+$BkqbPoCzNH`87`XY3bWZe|Ns=!B}l0C<ALNi~YbfNOaiZxff
z>z%YI?O`8B;x1PRAzmp#C2;$`HQ1UTL99^3G2LC5GBk*qYz9R$f)U%smgY9>Yng_#
zYo;Kj%RWO2{2T2E6ORW2)q&rtCr>oS<JguNhn=)on@<hB*R;(?+%&m!e6Umkjf)y7
zl~5q}ECgDdDCWizl{ja74FCM_pE2xvXsL_CbrXm<QMR}g2rr4HaP8E2?9LA7_`&wg
z`1+=27-au4XCAJcR>?dMd_7vbEU7U_)l1o6m8zHiMkMgNRxU#%VsYIv5l>;sKn4kF
zDk+1E>Xtgkk_HWSrof%Yz!SJas}%x_GR_cmvhOua5@fKi1e#%`An@P)p7*@xdxx_Q
z;d71zWKReo$`S3Cwmgi5Pd$NCcJGAYm!SC`z_%jc6(EXvWSl7cv)+W3GvCBP@pByn
zknVhz2dCV#uM<1QM)B0h5UVn1+D*hZaayX88S(?k+rReO+r~!my8C|*)3nf9A4fEv
zW)jv2<P_~!#_Moxm3yszEy{+aJcsJC(k)XgMJI>=LazAEJv;HgojYMhOuTveEVQ{X
z3{lpbEn=jYN0FLM)II<t8z&XUxL-o1<Z)Kav(0>u`v!PlP8y?bTd0XSh$YfEwU^lb
ziWMWtk4<fHw5KK$u@gZ?r98H1Jb$FheTF})d$}WvvS88^^%irrGp@b%vdYF)&vnuc
z^7q3ASr7!z0ALlMw{Itge*GOdxh#0lE6*n<pp^hmf()esP|N|PJj}T#!g=?npt%#f
zjp#)6<a11GJk;C8iU%r|)2s<*scHWpnw;YhPbSMcXQi8P&D4YL@Aa(9@#RfV<LjH(
z!-?2z$s+Mu*7IAccW8l=z_f_VN?hc99;ZM<?&x!|0)sk_JdeAM!eMsQP!i6&<wg+N
z=ZLsGTV6~Qgy#z-KFQ@FGpfOu{w|Z0YBpY;n(C$!ipx^*6c%?6N|_HglY|W=1TqOQ
zQpR#j#bB-gO#XkO6$}3!#%bkvOvbfWfAH$7%M8L{;ESJfBp};BySMqhoyh+8*BDF`
z3qW|#7-VF{B*-)ZSuxM;W+>%YfoXIc2mi`1U_@xlk1gx#LT@&UEu$mYn;qv57m(6{
z&XK9fJ+^sz4UHS9bcDA?T+DZqI5w8T^hlgf7P-gjX^7Q}^T<FS>&VDeCSwt%FHAQL
zOO#+KnGcUrpm`mh2d&_9CQPc2uzij7R<gB7E@Bls9;zHjRYBYr)lGS(EpLmXPO>WT
zaB-(<Dz;QcD5kUwJlVY@=bjm8a1uDSX9!WA?h}FxumZvEk}R1Z7pUHkfu(}|GT_R;
zQ(0#f5Xq9M#A%Bgi5zp~l~+FdzK(~8x+4ME+MrliH2%ZS1H%K*xU+`>M_+-A04Cif
zfs6rGEI^|Hz)l2u)WwF5CHVN%Q`klD*eDw5L{muAtvqW>^%KfgFDXXkVziQ}c!3<=
zlFJoQZ`e#dIG_^}#hgS9X2jwgr`_M(h2QMmi4mS5YoQ?(WuYQ8+SNnu+$-r2d19Cn
z;a%W7xzAHoAvwH6!_juK8c51ksn-fWYsHPrJ)1(JQ<9%@`K9o&inc0uJXPjdxR%3;
zky_2h+^zxHM8Ympk+2+(i89E_u~;?8s)By$HbeL6^L|g#nsJQgYld;=HSd4_ibKTF
zUwzn-fb6l%pZ@1$|H((Bi=^E{_&#7skBrAk(3HDmka-1Ywgt^`pp#BN>f)MX&&LMR
zdC}M`x{|~BT51kHUBv_f-F7&x&<z{5$a8O`Y%#0!M3Q`nz(!>zxtSLIEH~6*5|Rm8
zxkXIOp_tBsX2sy=vPi_E+<`4YM)3%p0GY<qYlRGWm7P%wtI95_URYK!P^L$g7&;6m
z#_A3FJfxHeih1P7%G1Q|nmTku6Kr{D9{@^-99_fbcWqEJE#!c^Ry~HM;ZZn#z}@2n
zFyh8|CWfG<7XgD>i+Gzm8St}f4u{$(K(V{@q#F%^R{1|YkDF+|aKm-il{wHO1=?YQ
zEWdHhefhh-e-69EGRP>ip<S@Nvb(H+tN@J`J>o!%I?$Xbbl1g$Q|90c(-teGrc{U$
z5k;V)_3}z3_=N&W`Edx6X(v)h*49fmOnOa4iO}Lv&`kgfK_(e*DFc^~ltM#_<)|cO
zIyLZ$Mc9tR@fbJ4sEP$$(bV)Rc{jSk<!jJ(%>12|689a=Gk6LS6{mTJ5lzRY%rJi5
zyIXZ`8-N+bU{4o!Q6<t1uyu;dsDlgm*vw;@j|(N_1h#MN*oftWecUyaGc?4V7^aRF
zQ9C-$N(;J4X%AU5*+I@-<iwBhF0Rt$5eGTZT9KYlW|<7I0|7{G*7xtrX0xwbx^$^*
zI(-3-!vfjJ`t`NqzMt&C*l-QSU^4zvmW)O)aq#a+E9RG^s|<YT4goA$xy9nh)wbYY
zI!@#67-l)GI6TU*_V@CF@dRqRaZEz;VA)+0q3&+SMJb<!UZU-2B*;!p)Nwk`O{_xW
zhKwKX+akASR%4X7b6UM-c{W)XpsIn~WVs5yj)A?qWlfKRCxQCb8L(B$96jcwL>kw%
z&*Rcg7@O_NW^l)rr?J<|W1K8BT{KGnFUL~_ENea`S&J)LW^tQbc+eb-o7b%3e#b#G
zK;F>!f{5BtGz2=@NUZ1ws#Ym28Uc)gexffzfU&y_Em>&A4gl9gE9X&WxykqZSKf5f
zP2ot(7XV_18TgNUbLkJo{@%A!2FU>9I85Hl|0`D+W|!nPZCkoY*OefndlD?xHsb@W
z$D@}9f2awFfo?$<HaFOkrDAeX%?^|Cwv1syYf@Hx2!WfYF5tm)3?2=f5#G3A6`$xL
z@7gBY!Q_-5!Zq(~RGB9hmh&_qUjhd9?N%(mj+%xRxUrbbmN|x!7UT9=$6;ZWw3~*$
z5asfReY>ztFL9SP&qY(;Pq9(>VCx*5Ti;yyE<)h@+cx3%d-t%_?>7UcFL+3bnm^WH
z$1%67A8rsJLgVPkx)R99GE&C}af2RNqzYx>EB8pQkVmNU{X}c#6TnKPb8flimKSWo
zVu;Y^ZOKM{_Vw3c_xe8w&(oL#Ba0QrU<zQ&kr4oyBcqwCnzCL5FjoRCk%X3RgqCW=
zucw`ayYhKt36w0TQ}ST-bM@sEx-$u|>d}}|@$uE!CvuIGfd}w}92!?nUF6-7K#ufO
z<1S;wKdDgxWQnLbWM7fwKJxvkqkO2RlPzgu+YIQUq{91(2!LXn<6||rZPu|o053df
z?(2VUdInGB$1rRN28tZ#1g>|^ipKDv_Ia36)k8`HTz<K0J4?@nNm~bM=qnYmc6_)z
zbBx^TbS;Wmy#oxe2z9dy!In(ti(GcPQ-;ZnJIZBp@<P9>j>kMHhxY^j3BTlDc*`xf
z^u8db>wp(|ULX^F>*K>e{lR)IGuqDl7jt1DpcG}nprg!Efs8U9iox8Nv|dpcS}YDd
z)c`Hsz#!Y*aRzn?9h<WwSU%d1OyH^R9odW;2HW&uDR3r0@Tg3U2J_0@*TONGmo>Jt
zo<1BgK*GW0{k=TPRZ<{w8X~pOg*x{zURyi1AAcO|E*Guyo`&Jxy=a^|6PCtNwaNrF
zwAoQKTM^c9k+r?NWd>TRMsgAt_E3K>59A||Qr{?zHQ-rk>LOa4OjT7C1dp`p%w^TQ
zF^voT#KmpQjN|+Jc9v(XC8IGc>KR6|P-Ku<LNJ9vF&W(`b|q^j<1()tmz4oV;3`kK
z6hG-T%`3iq?X^clxc)V8J};0BedkkO)A~B!SLVOS@`NBGP_gwYDa%%r0E|S+;L-_b
zu^78aJ>4WNSxp`E`LBhqo7k2e$G%(^8?wV#G2DlY@EL4W1izxCgOwW0SE`^}c2!dL
zRT+^<!bGZrh6j~uh@B5-lpSnGlJK!#*|HuF4fMdbboi!*qOYNp%OX`*#}^K7;1!AC
zg4z~PL7#w30YAMz^&(VTC3;QjSs+Ir28DTGxBvhk07*naRQ1(-+JuwBR#$}vve#bm
z8Jz24Z!VAT?A(RN#)shXu6P#a_y*egon6ygB@WlkcBjdhjFWBKuF1CT$+q3e)?`~#
zQ<F~SWZU)rzJKAn+t0q-&$BPqUTd%QBrh*Tq>FK_NW&n-A%S-vx$0>>>7R&QGH@3O
z@wJ8?^juC#gnFj=krRp1JUBSG&}#HKF8*VdsrMXil9+7{&@m;<5Ev&BZr;0rhi44R
zt#vR(E?-&{Z*YoSHpCAT`)1q?wf;Jdp%r)UW^lWljh$X6ZDu0Wze^{uu?;<2K871=
zBlNo&Q}v_Q{G;9`Ki&-6CgUH`4ahcJpbYrVyYVYWJlOf`6k>bjZ?y1(yV(Z0)cAnC
zV2sV1F9s&mBFO6RJF@W4LHm9hQ7uKYw7N`On80fzi2ASVNZ}2)k?ma!!<{6NHn$@s
znq-;Uy9oG0slXRb>;2(5|24_@+9gObb;p#|pv*mHsLY-d^U(>(WiIg=o1YoA;oxQn
z&*}?iA$r~Ti&Yd~H~jZzE8O}ko*va4jZe@Y`vUcvTC#wXskGsup6n69O}{1+bG$w?
z3~k75Y?;z|j4~qZrr3SXj;>Z{RLy*e$i}gtmn621(%J}W7B$pVAqrJOm<~SEh~Fa6
zecf)Pm**R(vs@TDaOK&o)5qr_*ccN~p8v_Ue^D(^;tb~DcFVx!Y9mQppA8@j1rDQf
ztH@qEc@kkwz`?;eK7H(rVL?{f(U|ssakcnI1ZySqitTBRnh|tPW;Gi(d9Nz64XB~c
z*`2Z;mtPwQh9eXH_=~BibUcTsZM<-eG0W(;Fum%kL6zLl2P4&C@(p%ML!7eRV|Nk%
zAi>o)-mjbQ=9fcm=OL{$$}{a;w1)UuX<gEJcOI65NQGcJFxP5wj4rnnS#EAFL#n6W
z;W3O23tbfLfE9$LgTNHB@P`J#@JGJv0Icf22`%{6SlyuQ_^!D%R}&WJ`-g!r*JX1f
zyE$ZN7WsO#&hI)h!0)>~w&=)+`-0?KK|s_qWVgI$b{~3ZNRYB?`Ve~9)tlYNKsPpI
zpz{nTxMwGOA4K-RE6T;e(Xw*aqdA&lrG_C}+qKn+-x~DJ)FP&p5no-2^eK$W_uV+0
zHH$EkL|LS!gr`=vYf^$y=t#Oz3@1KwWTB(QhmX%x7A<9Xzpq~D-T1fEKaXIhx+q^0
z7ivik$R%t#qKdy4_mbaAZC!>#u&LwtpFg%Xy=&VesWz#KcWEJx3<Ul;lDL;-U9Izj
z%|;k*5EOHqt#vVr^DyG2IuxY79X+%%cDSC7^rnBB?JszjR>+5B`4MW`#DqbU4@h3H
z-+cOvSEDf@o-{b>CmLO>q2+j_QAlZVibM<q?E};n{#1@waNxKuIBqQbN)&}#AJP~W
zz58!Ka8L<qN=b8Wasmlm=2)#&fE+@CD@Plf&K;GX&K#t7+M?89EKgV4{nh_`VtZ3y
zbnvYW*8jR+JsF$BX}-u<rb>)Vp`_@SHXEC8>B^_Uc24pMSkl~t`<F@Sl)jc7?ccjo
zY_VB<vm8y$^Z5WLFh0**=5IK4G&UuNS{D<0cjJx{Pcmj%RGc!XdHiRc0FPNRY*=M$
zWzfoQu!QE(8%|X3yJrG8_P_g-p;myxPcGoP0Fp7lJK5yLv@2CvzfAT9*w2{hv<E@-
z(iV$g1D3MNS$I25Uj_7e-RkYvR9Kgf3VaBHHo7ArGbnt;F*{w&e-0d|TkSzF`~Xap
zzV$c^I||H!Q88INIjr!w;JTise5(mEozLD!d3yV*1a9=;9hIn4+esB6h^OqnG?P%#
z(6%(_(}fJ+v^nSGNLoOKEn8m(67Y{QvgoP=8H}5hsHD3*Ks3heJsyP$Z=i0Z0x%vO
zM**dViGW~eXvZSHZ(MTg*ID@vqr<PpT07>;tJ9HlcSfeGtl2sXc*hQBTBG|0!HBS6
zC!;`N?7~snc=C3WdGAMSB9d^}(&Fm?eO?P{Cfn+fM2(fN<5OwfqvaADQTFTM-gs*h
zo7e$#58wb{u52d*osQTj^P{`z+c7ONRHeyStMxOBgAql0b^%WO-aP?5-sDbU@#I<I
zTCip)^f^5$RG*_s(321+mY8GA&4T(LsXAi1P!v&THTrblJsI$kOyO5886h!oz8)=L
zIbC3uE<Fv_EGa!}r^N5I*Jz^T<;JMQXE@-To>EcOCEZs)xjs#mp8JIpb2KUS-;8v-
z<#^ecEKaemWeFv#MoBJ#3v15I{$dxkzw?$$WStf&F8zjXg6S{kVfC2&`X4VWb^|??
zd3=oAT8+Q)Nt|>A9Z3FE)^Wtmt<?B+Ke=Y&D8^B90|&{^vM8ymT7lE?oz1SG+Ew;_
zvpnxCg1>}|7t#Qf4+S!8wXxyNoB7_ucZe&acGTQ)sU2yV5~)J@VPjIN$mZPL5qCjH
zJ#VP16lp))m59HoapQWNiu|=)Z4|It4|jz)=5J3|Uj|hgT}hGGBs=utU|qPvqwj0o
z#O&ZNlB&JNX>xpfMC&TPV+CCqhDUSCXyt=oa9OT*%<kg`o>s!+e`2LPPL*ja%~@xa
z=?`8HM(?Y8A6KQI&U8D|3>im@|MZ+rlmUN9owh?9N``IcDR@@OpJgv|&YGsuA*89C
zkX}P82i?qck);B1M$D{T&zFv@NE6Ml(kDem)>ZEuS}myNSOWCZMW>e8CVe#7#$qh?
zx3xb6VYIDZ;N+pSg_<BY!v*|vUzI3|+*kxe1aa8P-v-XjoE;a^*d~DDUyh0bF5%R$
zw#=t4DoLm)ad|{hdsAvnrLsxs8UlxRvnKkFxQ;CvVhh(y(*#>l9BfmHa!PT{lVSq#
zc1YB(|M4Q+O2fijZJ-8~fwptJwz$Nd-Ce_TMvbVW=AH;HyGDCzk#TuRN+gkpr+VP+
zI~&qF-Goq0Cl0Bg@$+?^oz`waZ+9na7Ui^ytxglLqZ}4oRAcA}FMdP%arrrDxCIIg
zv{LhlL3*!NedNE(EUJrHYRKzEs+@x0#jC9LZi+5ahxmtF9Yd<Vb9U$ceph0bOylD<
z61LwlVZn|^N@7Z*VAk5_vv*P%&m*9?&Z_u)Z3ND$?LDGGZoa(SVtx+xGN{C`V4<@c
zBP(Gr>Qu6sDSe~N6sy*B<vuY+aln%@7zs_65laN`bvxfkD|6AmuP^#|OIG*!7aY@<
zNiE0k59@F(#u{SrsP&j;$=pOdE>aoTjH2sx9@8VrOFB3bIpzL1`B#qn<z|FF&e0r3
zNwa#5ck4W!;ta-8+?Pr?EAWX+C*{D&p%l?528G^R3-cYOAuf1|$y2N%c0Pz7c*PKX
z56Cb6e(W?7iK<Se<lwHX0UsYxF^21N=N#xpV3TiO)8ZLW5Y7$si!+mQ%~axun7(FV
z+c$e(HC$Q=dGeS(LXN^BA8+vuT5dO8gSRvyV|Zb{by1OTa|2&;ibair%(H;FdJP!X
znnkJonFACS&@+`}MUuoh@mE9fd@^ey4Td8XW7123a*%x+O?d3p<>(P-jogL%hQkm0
zp&h@x(3u?bV)n5-ES$sEyTi(IPJ4gTp;b2!NM8GcGq8TP3%!y-$5B)Mz|6$y-<TqW
zd7f-)sEp&=Q7wfP*jS%gPM0y-+a21Jp&Z59nd1GWqAa8_svRIn>SXjuD^-Q?XU|Z}
zE+Z0d?y383F?G&-YLN3jvpyv}HltxLHgm&5pkTz<iTT#2`4x(L)+kQ$gb$W2Lo(oo
z(QCtHKa{zM`uwH-z-`Q&u-*Pb6oVt2n8!62*P=-b>?4vVg`2N<r$@&SyAsu@+M${=
zdg@&Cnr%<&yMiM}b*8Cqxto^riWn+0gf1m7kH20~5C~P#-nyHAfz6#MoWlGLE|3qs
z`Fu%+*I^aK#=3~2K>pJLn^3>ckDTEguLidcX%(d{e9O{(24wZD4o?7(mb%n7IlMbh
z(peu)`m$Y~G9v2V?y$Ahh7uTLsrim@gh8BAV7`0bh;iVn@ygGx>$13<l-T(=L=VYO
z+RZJjA~xuVNs|ZX9x|uADJ4^}GyXLq6246Rt>ySWYLST<|6EK8-)eqV;BSjJXKNk{
zX!VsXh+-s|ltyc`zUPmH10~h8IFM+Q#PXrAjJr64WpGIv6&zzzgL^d^mD)=>Dw|Ln
zWH_D2y&sy~>;a@k-AG?7CD6Fab<XNR4x<w(N&1l-=76+co`#rOX)~%DQbA|T|NhSU
zk>hm!laPhbCFv4e+@|1;PRwbvKLsQOd!*Xz|GxVMN>Jjkih*1{-%ivk&>1bYWtPLX
zJW91IufKI72@)WfN#evlW<uz(S#=FOPr76e5H*wA&zK3QWH)p1FJcV$4c%yIF+UsQ
z=sAnFS}_=EN|FPE+|INdjr^|8VR@?B413`)C&vo^JkL0NnaBdQd}Tw=n=}&}aK(TK
z-L6Bj0UAOeU`<XM)sF0@04h}54i86FL@gd9a4NRH#ZS=m;o|zv^{wAo0aABdtSZdM
z5i7G*VO;jaw~zcpXK6c@S@;*4Qvqir_ieF_;Aru9uBGaLa`tz~2>7l_HZ+U){l#t_
zde=PmOPpsHP(s!M&^GD-zm6}nJjw!{kZ)*a*T<EM^~<vqrCB#2R@n<Efr{NbPcO*U
zNcz<qz@SWUi$d(8ce(bPoypoUXMZOil~V?DBJJAMXmGr%2?~1>bFIj*#3tF*v`^(C
zY<$#ue7g~a%K7ONg4D;7ojc_ilQ235@aVW6v0NETct{cpqgbqwQOlnhbaB9c8RY#c
z-rWoD*gX?83HSLsgYnA+!o`P&zeT`RBsi}1o?fXWHogw8Q+7Rsu!ILV#flGkc^9D9
z_?<t-T9JZ*pvP3H)lT++8oP0djY+QjX4ZjNC#`xE+Q9E-;X*G74CBkO#vmac&$6;M
zH)i1Q7tc*?ciB(>oq7^|G@Ro=Dm~shheI&o36F+YHytYjX+atNVIMbt9Y3n)txm02
zu1M1S3H|5(zAP}GH?!h6?3<+?b?7HKCk%WKHiAjCqs3+Hqm-8n3R5aXF&C{yQK8RK
zlI`gpGu!OccK`OpZjGK7%k@K4xDI)A{RRK^vJHDvX&a;qESvg*c8|{sDU)l&yT9q5
zygglXLBNLRy2IWm+?wd-0qIrm6Bfb-zFexsBjA!%A}@KK61I3s@kf+Y$$Sjm&(VFC
zjm*tNr;DwDaszH4&m<pS1Z;njCb4AtA$qgDIi0dB_w8~}jh}DQQgC4YE8IXTx)FFW
zp-U!hQmGkEUyc53Qe#r)!ew%uIWkC{eAL!Ue%r>1DVG1qetcFIF!AfFY$Llpy^Y-7
z;P|~Tqjr>$-I8taN5)RtOJnGr@qC@ulq`;l<^lklN-%v&goi_FC)Q8y`J{ex`hJ1&
zbj;-GX+M9#>K6`$S8gNFo)kauY$j1Kuz`5?;Ah01*ud9IStc9)n<>;q5t-jkF#Po2
zo9Ts|@|o0ni7lRjJ=WxAMFq=L9BzCsgM{JdL!QdIIt#A%&@*jgc&m)&U%C~#`Y2q)
zhTmxjjV3SB2}#X+6Dr}<2GkTA2R*L`@sS%Vsb>}f4JSe)4tn#O<xCeQ4;BKUO6{HP
zy~Cl5$QtS$Mk3d3tbap(JBBElGz?Q&SEUjH+6@B`e`^8r7!Bx1)59W6$(}gKZ$llo
zx7cI8Ho=ISDO6?ViUh>v@zmo7u_on~MW}13SN`U!WywW61$XCpxP<iX96+XCK<(-;
zwok7upCcckYj}eN4-%Kjl3epV5&7X(-rtr<s$8-uc+IBY2j)*&rX#`z*v-T{O!iBf
zJ2f9zQoxmV`H;ee`HiH!+<c9v!53E9+rEkc$XmhzTVZ=o!6GG3dz-t~kJ$uczqOm1
zM+9obU@BYl5xWcLIK&Cm6biwvz^$X^1~=|<g+j<gE;wYEKQ(qEt?E^9x)!Y~UGTKG
zm))*G9#iyG|1Ik2OiG?2sNiWt=O?GQ*@QP_4VO1=n@Hn(lo$1l9Fg)ok9r16GFW8^
z0SbRS<{y`)lpOBf%S_$iTtV;E=gXh?8i!$mJ5FJ<dD=31yT_DY=DU+`le2+R>$3q`
zCAyF%?Y~azK+JO4l;bA#$jzp#U8DM#v7N$l)Tvjr-MSD)t2cnpm3C=O9jGi!+#7R7
zD9gn`=uKP2SiN5Flwaj0UQD5X{4;_dAD6Se{p>8DOq7|%kx-G&%OF%OBY8FHk$y|<
zM(;_HDE`=M0P><*akQne$}NtLqGL@ctklPwSEId5<FTI!1@w^(xHM7n6*JA=D8mx;
zD|cWsD;|KTvu@*1((4R4JP3q%C^Rjap!{v#5I*g|XpZ(bE8#Ut-timN1VKgTWv*@;
zsyL1<qlC4$)DO)U%(gmNn9A=j!I})h7l;8G2tgdCw)?!yxp$_;_A_W+fFtBx)&h0q
z#}CqvV<SnjJ|xA&Fn&!HXZt4DShA^A^SnA8fx|;0n%nxv$H%W*fh(o&BUC0}47zXi
zftI{ouK1pbH*3@dgQQS54)GTPR)s<s2KnYLGMI1o&j{=f?Vd!j>}T|&Hsng%k8^_d
zuwzw|;%JpeDM*@#v^!pkohEcR@pQ*DychwIUJ8Ywu$ufub103mr0*sFo;MK4+Zeft
zs0{S2VR5u&vRmadBD<C*d)*LJTW8#!^U0hK;?Q~;;v+&MEh-=iH~8ZIW4J<#p|a1Z
zG}o!C{~m!tG7V!=FmsM&0MaS@4G3JRl_K#HGAo!}fqkuJAFtalLQ)*W6v5PE_B{A{
z3%AQ5`ZuWkXOBknWF^e6`B(l{eLwp&j@PJiEb+{H&!bRj_Q<|@V8%+vI&wV59)CGq
z{V+b~skwXk3cB1l61o)XVP3c6KYOrr7&o+6z+_Z{K}3WVMOM^P)wD&fN}*<yv<U}@
z?)`*1z^RrIdBvbDv&C))K&nR3%I1yW!DFqnZmlF-Y_8l~`WksXZSi{<ewFZj3A>Rd
zl+0o5&+J7n=XO7_vU~l>bNjr?y9=OuQx_K(H%s2F1&9?%m@sj*?Eis!zt}CbJ_dP=
z(yM?#2GV1Peqg8YR*yBg<El%Z=eWSYkg)3|MW=8OA1089*AJ;8$-P~|;lO%CVJ3aK
zMgFy-O=ci`0Exd0mUi#L+XXVvDG@QVN`c;1pJNM3Fy17QYZ0DR%i3GV?jDxa2Z@B)
zQ@seZ-Q~&XUrFp#_QUb9Z~>5z`Rze5c;VRQcgyn*y04Q!AIC5gS{}yu>`=r{84MM;
zBn6Ja3z~9wVr-`@4K_|@pXZrqY?{Ihxo=TFB~^N88P$}^*OFZYI$Ye-n0+W>na4h!
zwzomndutl=hJ^~$dJ8A_`t<oeO%&Vj$B!55xU*h$Vo|xJX;0t=rG9>1I3wXZ@_+ok
z-|tyT)f+j%NbPk$8f;kiFD9!HJHDPPscD21dHwzVwS)SV_{Lh8z~xDw!tdrsq({Lo
zy3Z2}!VzH(XG%K5QVycpe9*(I)Qkf~(m$I7rJtffyE)s|04`4Cv=tqUw_-W50>qV~
z^&#6mR%r$hli+u+aGNX9m6Fe<MYY-I_6R;}7?<f3w2s}PY}iqZoJsS;(9zMLoO~WX
z5m#Ldpen>SrYVs$;J;QU=%CV#8D=V$x18Nu?fA*OyDt^FkK_mu_Y{U*<kX6tRa4NE
z-D~%Mzjt@l!Eof=eu+d-8ZpRt!MyalpbLJZGU&b5L<|PVERpe6$@Aj@s-PZ0|3{9E
z&-1?OWGdCO3DfJX1d@&}UK^CyWiw+LXDobp-`ojfLrA9)l3GU`d@mag5yF0r@d#Zd
zg-RvwE4Tfwz8KEE^76xCH^<klq4#svvPA*NRuS<g5eKb%1{F|^mJh|j?JXBunFjU|
zkuE;CB>DUEYuz4^02`>J8jZJ*w4*xs247yNFz~X%7w*?I03mj;--fq82Vptx$kw&T
z1{~fw7io%N+a{(kv2Q7H@5uvSgza7nVZ5nH|9qO@WzARREiTGP6e*5gE{IQnUv?c_
zZ}{x()EBdCH&&c=S`Qf*WfCtXQ+yb0S_||I3RN8?sX4r;b`V)&?X>nlLK>5R_uuJs
znZb%iPS05G;rBY6wt6>x;m9;CkWnil!<Ct$kC424m%_t0oFGGJgZlm!mR8k_as8BP
z=3LLyAZ`&v4_&CwzKDUOdjFXb;CJ6R4pg5@{xcAux3x?b@-Ps+@4S61I^!S8z}ZV1
zo$^JGg@YMmGM_jpd?*`m0`zzFhJkbCL|bJ}APET)bWu3UUYk%^k5+q@Q6}|oK{nDx
z&oYEK>caRD1bG!MHH9Mr0T2UlF0?|7e8xLhRn-yDmJCn<IznKXOp+OB!_{WV0Ai4d
zGkFV3*!SiR4i|gpfB*KUicMFlOv@YJ^(RY3L>$5m7Shx8w{F)YIVmL!$3-d#Al1(_
z{M6HKaGIn18f!8d@ETJ-=_yH4ah7a@6>7g>M2(2*sf|3ejH4{FxM$gylHjQ9hzrw%
zR4?FQko4!6pI;;Ee?JkQ9SUX6udL5#l8E40tgCt36?c#&K5XJ;lb~nlP2oVriV8P*
z21k770fs?+6Ni*!D#DX{{wM&pB)j4~6lTgk4@IX~ri|Qh`ztHR0Xf4|FJu-Xh&_rW
zZNFPu)UL)jm&F}fQx(<q2HcblM_#EEA<0eg4lRWkmnM}~1F*IS^UjqEveCCWqQC5{
zgmD95V*)li{J1}ko_enyH~$PBeH|U7TCO%wZZwrQIgt#nZNfhegN6j2<9^y<;!S!D
z7!bBupFVgG_p!qm)_j;Br6+MTP5H>VHF&;PD&6*G8ii=UOzzNQOVV;3{qTrYra~a2
zQTWoKyY^tlJM_*PAhcLN_R`0U)@s}SsEeOdlrINiuKSyR6MA1T%hAP3N4-Bb9=XS6
zXdeX#!?6B}I%OBS%%ay&H<G;9e(?`{zrTwVsz?LMNFs$yz>3wvo>ZkM+Jtj*zBpAc
z9W<DlgU{DSH;DP!2qTyC@^!L)n`Hd8q1w4*;Nlj+rG0s7>P@t%Z<d_F{e7PWu1D2l
z;(34bO|1G1pcTKn9?8y0HtCQMRJ1s4;R%m_x0@i2EvS*I);`;*BoHe_kA|v2cQk-z
zK)BtOBCc=7uMc{~6~SAQD(`h3>5RAn*EFsP$LqJecII%itE&Qj{Ln*BAm+KoDV9-1
zXcfVB4W`us<fSX3x>0wy0Ja1$#?E?+yf!^>KLVA}^}L4v5ccftfrrSBhmk!L?cg_-
z`};%{KKsX%hqx0+mL*Spkddzuy|t~-&k1^}cjd>`lITQo>k;13gLRdivu*-5*)7*X
z8Wpf@?a>5hMbz2-?_*F=3m?G3>&U`+d^M|$3zMZxn>+v7sR8vzFEP$daF;8{N!a^O
zEqv+0PWBVx@E#Nh(8hAD1E_w9$8L8n?~GWM@q;=rK`!$$USGDF#``Cf^N4EKv}K5L
zRg#D<2qKsWjF{ii5=jN_G2k_!Bx93|B}a?WOy_0G!r`$oKHtl8pHmnadJRjegGeK$
z3?TlkCvIfot$Ke5ryc&;tWGnvHZRoaC8@uvP4{a2`e26-LZgM5WvmvbGK_k1e;lZQ
z<K`y%Qx82mkVs<$hdX{t5z6x66e0Z$7aER>RWY)QCV{r2-j8bIEu$K(_H$bAQ5g1%
zU$CkMmzFi^ZDdc-70!l?i{LUoo&Q=;Q=?B#)MAcI+_=`52Ml9$(q5FErA6i*YbC+p
zZ~UdY37Dh{EnohoNcXdF$%e+HvP$yqhN3EeY{xm7?0I#(yn-aFA?-+v+r8812Jn3%
zC*&Xk1K|cSwSI3pS&nbM*n%)@p9X~0a}EPdF?xMd!|Y(RDmgwmH^HJ2aYZ8Q<x%Ii
zO!sYhKXc7e*Lik8GaiIx@$@K!2AL59ga|LO`L+<@J^q^Gj&f*Pxbnpzz|M^-l<*=A
z5<lWmRSPZs&yrySrBaahfY0|QG^(*dJ-%aKv8vSxbI>cLfFO6>+xGlqnj_MpLFL1H
zHKvpOw42lElZ$qY$(+rFHGGA=z<EN3fPdS1I7j?_tjJ(f5&q}%5lw3{qCS3G`|!#B
z_-=KEfIfJkLc2f9Y|IUX377f(cQnP5!nb@Zt~N}`^np>1z^X7AIx05VaD9xzAB$yb
z9eK$}9;H?Xowy3o&ZXVCX5F*RkLE6w`feBe4Nv*=;Lw4yVP`kRK4M2b!Ie49n-BK=
zF2Zl9H9trAbi~b3gjSZ|3w5-y!+4H5o!{8~cCB4Rnb9~5sOL47nm8WI=C4O*)*mD|
zl^{*Vp~YZ)en+IAxGyn~e|u^QP#%ySkM8ni$LL@J939PIv2~#~c@y91FWxqIFGKfI
z4h&pVSMpc}-k-L4cKj-V(6EysAaW>NfC}>P)+fwv0S+jo$1B0MwX|r$hq`da%_&M=
z7y7@<xp~cY;ozdmSwFy+Be0Vfr>&{!$g$9MP}06LK&3PbHfEy-U--2Vd*UFyf25}F
zsc|zIYA7#b&~x`5$;YxUwEt8CXs5S7p`WtgIU(c)9`4NU*btfgqSXK{%*RLHNWU%*
zDc0DPIIeKsaK9CX$j*ijkPoo5i&Bq9MM4Qqb}4)l@;X4M?b^vRXS^k0U>bTO4T7On
z(xFOC`pqe7<G73$>#6<s8?uB1dP#jn1cp$H4{};kponY-s25sjRS5mN=N%L@8i0hE
zdiNJ|-r^h7?~n(EuAO`+ccqxS6og^p;2>6nKDXK64<q{UU>f{`G;H$@bqO}uK!}lM
zK!pUBTv=J#4&s;ti7S;lq!rNK#--!z&}XB?o32;KgYi!4pCRsR9FNAWmxI&k@s9`n
zvW^ZoH_Fn%9zWv+SaB*}qDagc!%$-iCa{xUFNx4bcXbysN^nrq6KgytEFyA_o}MTS
zq<K#600ZGZ-W1nh{U8=6H!1`KQv3g91StN<|F^`Yfg-ikDNSR@HF{H87s)}bls`w@
z#YZj$6y!v+5=X|cvT#`$VVfO@_)g28;D~zKnmT8(u5urM&`7=uPXKj;@kb;iT>`4D
z_Bf*5rK%g4)Xy~oJd&`vx%=`y-a$v8RbC~>$a9&hEN!bBs3RNvRh-9=xgO(Ok7ve~
zojL^jU2Q-TlTVWUr_Ntq`i3oN`Sy?3c(yJcjrxGuKZN;vd$>NwPetJV`b~&No;ge>
zJo<jue?{e<IaU$781X3LJA$FPyTlHh0WKP2AHy_3r6<cDFyYH>Tv-A>Sj&c;n0Z)x
zY7xq&^7WDop8r}#Ow>}ryBYwrJR)7-z-P8wW02?CA|!T(<ISXHGs_EB%&-(W#@ZZ;
zQ{5K%=FGE+z4@dDlGalLEcmV^8Glrt5>86Y*j}4^vj4Av7}-(?v4LQtAVybwB$n%5
z@`72RudC@^Wg|A4=7uI4K4lsf&hKOn8HOBG006><3@{+TB3zSoRCRAFU*PvwmF{;6
z<7BCR=IrnIk`kohQr>^^@|w<nhb&MANG23@^&%U-*7nX93v)3_b~4h>j4jwu7y6I`
zF@}n-hTYuQoohRaDguc(nrUJ7APpCmZPKKZGDGB@hcF&z3KqtKrIt75q14UH=7im;
zI@VH0V#p&tcnj+1QRb5G73?WpxS<K$>GOjJ=!Q*A`nu#CSXj&~FjEt5EY{ZPU_0&6
zy8QgUqoC9UFTW=2pwCp1jvCfc{Y1tY+wto1HMXNYD83SYufsKZ_Wk={1*suRZJn)l
zB6|YQsFX5`x`s72(^p$xZ{1Eaz~ohP-xU&K1(^d!qj@ylSj}BuW^9bhseh{SGJ*{R
z=Ux><%xcMvGHrlPX4pR7Wh_%NCR!88DuT&jZqM~Hj59`2OqHis2<umdqp0;$XYeg0
zVo+mN^Bgk`d07w&VlTuw69PVj6d4>Bc~Gk4|D}=RaMgjsEUFaX{v_nHHB?2&?oYO`
zF5zeS=)YBzmEo+d^V_~A6HKw(Rj)Ce{wUAJOH6(v&fmno+poA>{|_eL6`3cq`C;OT
z`5BJdHW>sJMA$9Y?&h<zKdgd2i8#uirJ@D3W>yV<%;JzrKY0K78YX<;K}*-}c{1Q;
zo>mI_aos4`ch;ILdHoXv!R=q)#S|I#z3RRes~9@jWkJLCzJ=4y4TdTUIs85s0Cz_`
zaAaxHSBJVGR~Dmr@+28ib_7ShHZ$>IEk24Uo0qFlw!p$GR6eZd|4__Ym@{5&7t3{|
z=3z0HGb?UnR7f&8oQAqSsj7*qN72NHFxslZFRMO?rN(>d=T}})QJ9mPB`_`CZ;x36
zBaxmqGvzqwWg#8OJ-1o~FUn-Gc@y6l8H>gAQ0)q4x}Cdj^f+i!L}!|w^=A=U!K>xq
zjm5lP1dZt6M_{Gf+2-HV9~ce`M8$sTG;Vqio)Tj{bY2~wM<k1g4Yn0c&?>-?<UI;1
z%2h0FC4o87(lG_owW$8)q;Y9XS!Ctr#95Nph})=s;!u4N46$h85aJ4n>E^e$c?_)c
zcN_a1A=QaTo9I5hmH0LmC`iwn2u7;#UZjx(JWoGA{rRR!ynM?#m?^=F1*8!z#iq6n
zPfw%q&4b8AW#$}fEsaM(-g7nIPa^eA>{imXx={5Nbq!RO1&mQz0%hfgcEsk35u_=x
zxEj*rV%W;>)n$H#Vy#2SB1xDdl;KM;n!k#IqJ%V_chr~(S~gHkAHt5C=VR-kE1*fs
z#Yip1(gfn@A;m(j{BlAj!@vmG3(zzVFItTH#gV6q7CTcJS}PF|OMhVrbM)>NLke`g
z&ZIaHSIDBN>LH#eBwc#+U$5X3`>%U%T$?Bnk~Qc+z;8cOCV~!FV>^Kso#`;%7Ym{g
z>tsEPy)RB-!3HgPK&4j`^E))t1>saNI38EJG;_88Oz8Em$p9b(-X}4p4pL_(!IMtM
z0iRB~?KOvW&lvcP19InKmiv&HBe(54F)FH|dT{;eb~ER;i-R;<YqY8yikc%W$ejtd
z^>IYw^qG)m409s?P9O`}pWRh!=~K$r&EBs(X#^6$0Qn-JmiXtvvbm8jH=J|Ta#L0B
z>T@4tHIqyo2NpAnrLGuL%9QWE`Wn647W_f)E20`8*6>&=LzX1hi4npu7|QYcRU%4+
z^G!5KkFZ`rm;xij`&Z;ttfM)6c{#AVn}5*fJCzLiOb?4Z;*4Aw11%j$<!#thj_zJN
zrcwnmLun5y#*?|SiC`Cwbq@qa0GtdT@ca7mH|VW?UH0iOaN3N${)c=h8O(aDG+v|S
zMUr`J^FHk)<!pNj9SLJFyae;>gQn9`FEgTU$DYv=(UkqHHy=yVPc=Y8!=!mSI`4lN
z{ete<6Ws2?*e3B*O=M)qL6sQv2>z35vdJoHVJ0DNVnYgTLk#)&TY&-?2;#s<6(7}j
zl-ND=i!BRXLoSfc^0#PrHE$x^R61jN*^Wk4YZba!Hu5MH1<0*Kmy<BoGG49+Ep=Mz
zXD`9U?>OU)p~4e7%(VRv)yWK7^MCt(QKb7+%+%HurQv{a6-~y0<a+>?PbgE<o(_0L
zH`C)!j)l~6oUoF@R}3sde2AV(gcp<Sw?rXl@B7Ih;Z|iW>lD}#Q~ZK5wp~mcs;FCk
zF*R99pGs@I>M+T&RAVgBMfbs!*c$)8u46m;^1+72lacZY?}aO!sR@aRda`ubBhB_=
zg6ntLim6G)`Z{bNT4y-`ZkUb&_}{&ghy#SiV!eZo+@Lfh8;jIeq6H3lSo0iVX-Wue
zA4(}8PW1);ERu~>pSQ7&G2g#N@>nZ2$pk_t8q@<PD8ZJI961zTXo#`Hq1I9v)vLW>
zfD8dEHgN~xjPRe?HiX}QmoZ&|ZHnPx^YUM*3bWI5G5d1`_8BlI9EixUL+Vu67FH0o
z<<#jD-BX@-w(~9;)Vb*=Vxr%dJsy_4rua+JuGK;-<+moTAy{98p$2|HtoT=%uhMP1
zV$;P!o3x#=P6CUeq@v=9FCiYvQcn@J=nt=s99(q6sXI--r6b15j+@NOrIk8($^X8q
zzS=Fr3Re1=3%|A1Q&;1l$S(g-fmNG{H9rQhu}U+?1MwuK6@@uVMWMs!%N^&zvcOlG
zW+^1R^a*GDJ}?AHheZ&Q{>Q^hNh6+bAeQZqBii#{?QnYYRYE*MKvh1UtHG#dwj`hE
z(}u7XtRTAkTIy`C&e&(Xm=L1!R?N4_re0_<E78diiVx2tIv&}K=cvi`%$$AwwMeH{
z)-AX}IntLda}}Rw%B+#;2;Aj@c+xPuVwgB!f>@V0?tG*UMH-w1>t$4NcNjgAGvX#b
z*dF<*IybLOTzi?}t%`^06Yd`6Ak;$cu&<te)+tH%HoLomhJ_$KgW5wV4m*G7TBr;b
z2+r}^%P~Cb3t}aVV+IjKw7x3$&7Ix690cA3t>*4%2W(2RH~Wgm#-m>LU?-e!)jjcs
z?v^@=?|av!Rxy_?_CLNiPgy|w)H&UP-`*uTn~koj^taa4KH!)LSJisiejj)ISFm+u
h$v<fP|2m)O%YBw`P*kHU|7Bi5$Vw_n)QcI1{0~`thxGse

literal 0
HcmV?d00001

diff --git a/static/images/yishi/tabbar_icon/ss.png b/static/images/yishi/tabbar_icon/ss.png
new file mode 100644
index 0000000000000000000000000000000000000000..6276d5d4798db89d3e07d1f3602de3c0736f9d1e
GIT binary patch
literal 1235
zcmV;^1T6cBP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700001b5ch_0Itp)
z=>Px(jY&j7R9Hvtm|biXRTRhnXLi??r7b23v>G3XsZlF5v9+DuopyGN!2~o7NNb2D
zDv1$|CMFsaVhoTV22msRE2s&+fYA6Rp_E2;ww;}6OA*C{L?ymhk@^6}mVU6ibIj~V
z-7f6T%(e}UVIKFM^S{4)?mg$8yM#sl(IV%=O~ASC(Em4rEyH~^95>rRP{3FXLNyp=
z0LB3Nje%1HJ~rvAIDWdZF<xpUT}RLYLjpUQ&F27k?Ivd64=`<yjf{SUj*g_Aeg3#B
zz!oF2m5JU1W2xJT0Gt(wHuZ_}uWo!D0k$)HE)Mj4$l#ar#3u>V%YY8z3(Pc4gc>l{
zf$$g@HF@@z1cBQ7n&p#DAsqpRjOa&{1INHW1bWvyW$sfIW&FC6F;mNs+QuyG2J?M6
zHj}0aSr3IzIf1kVY%$d58TkA^G5X$1W}7N1BTgm=M<U*YpE_aU#jL$`E`_-8P=9Od
zpLQBW0mDO)>O_*PGgFZk;@G5beC_GR$0zKB^T#D4x*gyhIlmv$0^z6ZbczB>hWaUx
zSvlc%GwEy8L!rOyL<@~eM)U~49jT=fnJjo4^rp}c#q<gS24k@mf)Ka1(Ps$|@#cO}
zIb157<rj?gtPq5<^8hMSIs$cR&GM5a0ZIevOJIDGasEjY<$8;9E`XM=WJGrX{ANaH
z%I}}P{Y3qvR|@GCj9|!!d_$lo(vI|&7La$%70&W+9geOx<9v1|VF+tuVz}2epk$~&
z1GvX>G(Bk2o1B#eCyS7D^#ZJVnf_kW0^tuz0UXO_uj%)#)ay%6j%zboH2{d|&7t=-
zQGUG?K<k1}-L>8+_Nj`Ja1tFSHj*Aa3gY#aErUOf1(a7@1GWsPe=}p5<rt?#^`Q93
zsFTT^*hofB1i?GBfU?sypk$~&0$8)qXOIQj8f%vKy9Nvy>Hz|tUFa-MGCgPn<uk4U
zrNREqFq4Nejtf->M>SEdDOO(#*1<JBJxi;Wm5qRLYdYB$;3i?(rv>F#i=Eq|cX4Py
z-A0Vv>2fg7cQJ4^L45b1O;=PDuwnRH|B`s+F97aLuX6sn87AzFiQzZwvfj2IY#oZW
znkIU|d`l)_-1md!)H%}?rD`9}T&`L!o~x_7I%hyjAT$_#ff%2GIkh0GqZS10@l0^1
zT}N%2^bP^{=7JE>NzY1iy}C-7nis$nq!D?BnD&EGPs{A*_DwS5NJJ+*lV+Q$6o<6k
z;@lO=gK8kj^d*?@w_ADMID>EiOcmLNHGQP1r*ionZQZrC)2{1aA&2&^F3-igs<$wi
z+rU_51DXKir~umA7nJqX`=nerI17@{U3uHYhVI&R*M)Qy!C5fO6x5@lAkf1AKal=s
zfqVd80x)6{>mIM?yZ*-652F-h8GQ}HrmP+V$3`ztY&^g2TFBA?UG8zNxdj<77Y-9R
z(-2!_mJap@<frpxZwR0T(J(yhTM{2X0$@X?e2r-VxoXh>W+DB_D_^k58v)v*1?0CE
x6`+$-a>KUR37lnf6VPd-=B-fAbwaoP{{m_S+c?`S&3XU;002ovPDHLkV1mQMLAn3{

literal 0
HcmV?d00001

diff --git a/static/images/yishi/tabbar_icon/zhiyao.png b/static/images/yishi/tabbar_icon/zhiyao.png
new file mode 100644
index 0000000000000000000000000000000000000000..e357366d784af7fed33485867e5ebe65bb372c12
GIT binary patch
literal 2673
zcmV-%3Xb)OP)<h;3K|Lk000e1NJLTq002Ay002M;1^@s6MjRB#00001b5ch_0Itp)
z=>Px<D@jB_RA@u(TWgRMR~0_z_RQ>)01Lzg3}Q@)#vm%o?#%4;JPfcH6MtBOA!Q(@
z60lVM1@Vu7sq%;Z@kdN)BA66K3~XK~1SJIK)ibjTyHX+YNMdQi0`3NOdF*p$y6>@W
z@AlR{=FvSf%Tgu%XJPI+-#y<weeXT@oZARlo)y7hZAB$(BEm($IqG7}5FY)9{sR#W
zx94~!sdAXC!+<ykKq3;b0HC6Tm&lHPi+;m<C0`$A+A|vJiAHBLiEjpkax)-PEki&9
z1AXZi+E=Z*QEXos3Cr<F6C$~a1uvyO2c{@4`Q2hMGkZ85evBb}u~_g@>T^bClm`E6
z#bRbA91A_p7=EEx@KWj%=jWr1fqlhdX7lg{hH!7O;HA_j#Pd<7_YPsJgL=oqV#GWx
zp~o5hKh5FR=z7Na605JvRLXOrGm3kPR%tnY+=nOyrjmeFYz^7FF{i9p)te}vaSq>q
z=8R)*-_=Kf-ySP9C%Djav1{+yb?Z`7Lf8Pkzq#3Q_q=&5SyqNAM>hh@hjh323jnpl
zQX_vxRL1{L{Fv(L$s1=I{W)rC2%r->I|1x-QshVtQp$0!+Fn<eE|#dFZ`znrbvWHP
zcL-0n2d29JoE~melo`y<y~O$W1MpN^H4&ePDywRO?<`x^Uu@S|34bjZoK;<J+rWU=
z6x&Hj^a(m5uCA8>*J;JzWhCs1$7^hu+K7NNCxUa4i9qN84k|-f1OT>T46vfh8NH`8
z_}{XklXoBXx3$gXYX3$cm@x^MppV%q_J-=~J4M^_wxcsEQjQ-mgn7jnVMVvt0A!qp
z-S5Tjmip5h5wR+Z5&I)9-?_1EuK2NqcC<Zh#pq&W#T%vqG`CE!!z|_~VSg}KtCiyh
z1gy-a+<*G~ui7_no)iRl65(wOpu%jY#mW)G6i*Mm9P_NcY!yo<yu2+qw=#`S<{~Rb
zR&n`$nW+Og5&Bs!U8_c!k{8pfg6|4_J#gKW{D=^`;_(Uz(wi8<>|Bb3$fHj0vl$7u
zMz$iSY}3GsJ=SCiu3Wy}zw2KQJ(M)7i0+o~Y8!z&p8_HAsMDXBa6GaVaT*8%00$mY
zT!BzN`;B&#6QL~#I47S%Zo;9hITpHn&_%U#g3F5A_o7)4lv^UdKq4uhLN3DImhdw`
zP@NBBD%uHfAnNk|#w<3<@z8ce%o{r9BpeSv12{c|Il!Re^8MN}VWEhi9#yI0<5YjY
zW}A^Fn|hb1?|^-Fn&4A_P$1Bk3HYl=j#Slr)`973c74@XZ8s612GrhOv{%Cd8<ek_
ziV&56x>Oq4pKvu@^Clt>5aY`T*c{*hAkn8>rT61U!)IaVPVtNW=pH6SOe5dj>I_^o
zJ5pBU#34kIv>!tW_i9aov)4ZEI#Bba`BgB$*D`_y8Erzi!We%eR3Ffz!(qaJ7Ztbf
zPgY1+mG#7f4>M$SR`n*z>#;nru;P+K-q!HvIfr%mf*uZ#W)kd))cZPy2}{yPN`w4r
zvBu=mm*dADM3m%W`VbKo5FCg)y=Q%~&<ZZGHD(rE(I@B7+jFVwIh0#M+lesQ)6w<Y
zQY6W;5t0+3rx9>rp@fOy4M@Vi=<(xS-Zg<WKu~WLOGD}JVq4mdL}Hab*Ke<Svy=%l
z-5?_LwnkQgiQpz10Rnze8Uj&QQq>AvTX2zppkpjy5QS$1x+H)Bn7%?A&q!$bdM2ZM
ziRdE)eA3~8Gm?<lXOL)?Rc{#b;tXsXpo0UNHnXhKu^y4;7K%kcDfA@5I~ZiRelP)b
zS^^J(D-pNv`Q-->R#wiP`BMbSdXh6U2x7rAO*rRiDL!?fB{Dh|ZtzFtSmfKtXoVSK
zS*HdOFAd=-JS`CsCr#Zu-}B%nU5Ut3fH1#M(gfILnlLb+NW(2U4|C|{462Q(MhyE?
z<amMc>oz;9*aTGAWg8+4nkNhZ5tnagrqL~B0)QiZGH9#bUzxhOVr)TA1V_=1&X?px
zwM&R-t(kRa+@cF~LmHyrqc;)WAtEj_uSw)c@Y%6(siEU-3IDv%QJ=6AoQhuPJOt~8
zQ?Z`b(0aykv}{WZPevQOZ#O1F-;w|u%-F2&jDQ1@r0o&mr6s~cEdAVxhLzo8JG$@i
z;j;NP)!Rn)a<ev!lM@RfAwL##2F8^`{lQ?l>cCBm;b?B05Z{bm=sY9eQ~M+W<qc#w
z!L>mLf2F-Ha8-1Q-q!FA$aE_%gXtqhX|WfN?$L5<qzQT9ce+HJi->QDa52+p>6z3a
z?J4Bs5bZ)fjp<z#Wm1w4!jAx1_RDh!7y4~g``YX31`KTB;f(V#tE(9NhbVmt$(|;}
zuOQI_1-VrpZs<#M`>P4JTLe2<A8$Oo6cD~^Og#?NV;iCulVz}2LiYVk^I7HE`wQKH
z1Fs>Dt5jGgTrj)wibVXXQ~`U<W*sNaTjLtj#9M=Ua6wuq>i%Xpld01}n1H$m?7h3&
z>mC_>)$)!b5%aW0o?xVxcl1XOO6q+vZzA$TK)5I0^cbGQR$uA7mgN=@9<U+b9V#H%
zpeGV++GZnvW&|aJL)2Y)SJ`?<!e63Z?|*YyaO(*pTu_{aCmWoJ;9@)B1|tt=1SPFb
z=S?%dxaEX3jlwaHKWN6dY%<<>*bNA)jdmj_G4}7<%EOw*55+uzwqghiU0+Lh6OGAZ
z89_-t+*|KqCLM}3c+3%QZkFmlS2K%HvX?UnIb+C&7)p>_%8)rHkUJM~`S#y-gn>gm
z(&&39mtmqHFG0$O2wz4(J>bak5C;}hT=KE80Z}&jTkc^3?2Nj+f5<vN+rmqE8ot8-
z?D@PU+Qmu@$d4gOdh{p0mrx}e0i*%ZHmGURhY7cPaC9rPa(FOffEgLCruQiF%70Ik
zZ9J(gK~;Oy>PaY9pJHzY;4#JN4+En4jE5N_W@U)*`i<VfKb~%C8oiYx4hmYOv}H`$
zRU9Zj0FX}ebh1yi+eWJgq8~|vSvJPLXSPob;2$xU@2{55!)C$F$cbnxh2_nyPG^^p
zmlMYu5u{b4uO71<2{$w*vSG=Q!}HKy^%FCFjmjXrqUWWN@)y%A0h<&iM2!$nVY0s+
zr1FQ64d<;z5<qeKU&;kj5Mc%%nl6``<WLeZmDAhtM*qoD6Bda8u}W_%Ws$2Cj8)EG
zk2ePXS!%-imu_+*@&p1cE`_0`!r;Ia#TCf;QC1<ZG!b4!cP!+xF>ET8v8BM#KfSZ}
z{w~+?u@J%<QVj3==y2JB?y4=*b!8#j0C8lOQ+>%dPOKcCLo?*95*CAa<7V=CJzFX2
ztia(hQS2{;hf0MZq9_Es#DNAFqOlL_5f$fDX7=kjal3&@@Mpa~Y#6uVM6kA;gC7VN
zA)p|R;%0!}E<UH#Z-KC^pUzIYBr^5~lSx8L1I2*!s|~}6J^evM5`|!3j6{ej1_~Mb
fAVrR-abEr(1}dRb0ULWW00000NkvXXu0mjfYn|*H

literal 0
HcmV?d00001

diff --git a/utils/debounce.js b/utils/debounce.js
new file mode 100644
index 0000000..3306bdf
--- /dev/null
+++ b/utils/debounce.js
@@ -0,0 +1,10 @@
+function debounce(fn, delay){
+	let timer = null;
+	return function(){
+		clearTimeout(timer);
+		timer = setTimeout(()=> {
+			fn.apply(this, arguments);
+		}, delay)
+	}
+}
+export default debounce
\ No newline at end of file
diff --git a/utils/network/api.js b/utils/network/api.js
index a209594..2a58a49 100644
--- a/utils/network/api.js
+++ b/utils/network/api.js
@@ -798,6 +798,16 @@ class API extends HTTP {
     }
   })
 }
+//药品清单
+ getMedinceList(params) {
+  return this.request({
+    url: `${this.baseUrl}/basic/product`,
+    method: 'GET',
+    data: {
+      ...params
+    }
+  })
+}
 }
 
 export { API }

From 97df1b464687db2e3dd9c3a718ecc6d494451b80 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Thu, 17 Aug 2023 15:05:46 +0800
Subject: [PATCH 41/83] =?UTF-8?q?=E6=82=A3=E8=80=85=E7=AB=AF=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=20=E7=B3=96=E7=BB=84=E5=8A=9F=E8=83=BD=208.1?=
 =?UTF-8?q?7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/wenzhen_v2/wenzhen.js             |  1 -
 Pages/yishi/wenzhen_v2/wenzhen.wxml           |  2 +-
 .../TUIChat/components/MessageList/index.js   |  1 +
 TUIKit/components/TUIChat/index.js            | 83 +++++++++++++++++--
 TUIKit/components/TUIChat/index.json          |  1 +
 TUIKit/components/TUIChat/index.wxml          | 27 +++++-
 TUIKit/components/TUIChat/index.wxss          | 36 ++++++--
 utils/network/api.js                          |  4 +
 8 files changed, 139 insertions(+), 16 deletions(-)

diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index f7e768b..3432a8e 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -384,7 +384,6 @@ Page({
     let userID = wx.getStorageSync('user_id_'+usertype);
     let totalUnreadCount = 0;
     let message_inquiry_type = this.data.message_inquiry_type;
-    console.log("conversationList---------");
     console.log(this.data.conversationList);
     this.data.conversationList.forEach(item => {
       let conversationID = item.conversationID;
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml
index 6155ac1..93f9eba 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxml
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml
@@ -389,7 +389,7 @@
           </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?'问诊购药':'其他' }}</view>
+            <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>
           </view>
           <view class="content_4" wx:if="{{ item.inquiry_status == 3 }}">不接诊24小时后自动取消</view>
         </view>  
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index da76b75..0359fe1 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -362,6 +362,7 @@ Component({
           const title = customMessage.title
           if(title.indexOf("问诊已结束") > -1){
             setTimeout(() => {
+              console.log('aaaaaaaaaaaaaaaaaaaaaa')
               //收到横条消息去触发父组件getbase方法,演示1秒
               this.triggerEvent('getInquiryMessageBasic');
             }, 1000);
diff --git a/TUIKit/components/TUIChat/index.js b/TUIKit/components/TUIChat/index.js
index 7229435..50aef6f 100644
--- a/TUIKit/components/TUIChat/index.js
+++ b/TUIKit/components/TUIChat/index.js
@@ -3,6 +3,7 @@ import logger from '../../utils/logger';
 import constant from '../../utils/constant';
 import { API } from './../../../utils/network/api'
 import { rpxTopx } from './../../../utils/util'
+const dayjs = require("../../utils/dayjs.js");
 const api = new API()
 // eslint-disable-next-line no-undef
 const app = getApp();
@@ -65,6 +66,7 @@ Component({
       type: Object,
       value: {},
       observer(baseInfo) {
+        this.dealBasic(baseInfo);
         this.setData({
           "navbarData.title": baseInfo.patient_family_name
         });
@@ -121,6 +123,9 @@ Component({
    * 组件的初始数据
    */
   data: {
+    rest_time:0,
+    total_rounds:0,
+    timeData:{},
     conversationName: '',
     conversation: {},
     messageList: [],
@@ -170,6 +175,23 @@ Component({
       this.setData({
         message_rounds: message_rounds
       })
+      let total_rounds=this.data.total_rounds;
+      if(total_rounds>=0){
+        if(total_rounds-message_rounds<=0 && this.data.baseInfo.inquiry_status==4){
+          wx.showToast({
+            title: '沟通已达到限制的'+total_rounds+'个回合',
+            icon:"none"
+          })
+          this.finishConsult();
+        }
+      }
+      
+    },
+    onChangeTime(e) {
+      console.log(e.detail)
+      this.setData({
+        'timeData': e.detail,
+      });
     },
     getNavbarHeight(addHeight){
 
@@ -237,11 +259,7 @@ Component({
         dialog_visible: false
       })
     },
-    confirmDialog(){
-      let finsh_btn = this.data.finsh_btn
-      if(finsh_btn){
-        return
-      }
+    finishConsult(){
       this.setData({
         finsh_btn: true
       })
@@ -257,14 +275,69 @@ Component({
           finsh_btn: false
         })
       })
+    },
+    confirmDialog(){
+      let finsh_btn = this.data.finsh_btn
+      if(finsh_btn){
+        return
+      }
+      this.finishConsult();
       this.setData({
         dialog_visible: false
       })
     },
+    dealBasic(obj){
+      let data=obj;
+      console.log(data.duration)
+      if(data.inquiry_status==4){
+        if(data.times_number==0){
+          this.setData({
+            total_rounds:-1,//无线沟通
+          })
+        }else{
+          this.setData({
+            total_rounds:data.times_number,//无线沟通
+          })
+        }
+       
+        if (data.duration != 0) {
+          if (data.reception_time){
+            let endtime = dayjs(data.reception_time).add(data.duration, 'minute').format('YYYY-MM-DD HH:mm:ss');
+            let nowtime = dayjs().format('YYYY-MM-DD HH:mm:ss');
+            let countdown = dayjs(endtime).diff(nowtime, "millisecond");
+            let countdownTime = countdown > 0 ? countdown : 0;
+            console.log("countdownTime--------");
+            console.log(countdownTime);
+            this.setData({
+              "rest_time": countdownTime
+            });
+            if(countdownTime==0){
+              wx.showToast({
+                title: '沟通时长已超过限制时间',
+                icon:"none"
+              })
+              this.finishConsult();
+            }
+          } else {
+
+            this.setData({
+              "rest_time": 0
+            })
+          }
+        } else {
+          console.log("wwww")
+          this.setData({
+            "rest_time": -1 //接诊不限时间
+          })
+        }
+      }
+
+    },
     //获取问诊订单消息内页基础数据
     getInquiryMessageBasic() {
       // console.log("order_inquiry_id: ", this.data.order_inquiry_id);
       api.getInquiryMessageBasic({order_inquiry_id: this.data.order_inquiry_id}).then(response => {
+        console.log("11111111111111111111111111111111111111")
         // console.log(response);
         this.setData({
           baseInfo: response.data,
diff --git a/TUIKit/components/TUIChat/index.json b/TUIKit/components/TUIChat/index.json
index 261ad03..617f126 100644
--- a/TUIKit/components/TUIChat/index.json
+++ b/TUIKit/components/TUIChat/index.json
@@ -4,6 +4,7 @@
     "MessageList": "./components/MessageList/index",
     "MessageInput": "./components/MessageInput/index",
     "TUIGroup": "../TUIGroup/index",
+    "van-count-down": "@vant/weapp/count-down/index",
     "te-nav-bar": "/commpents/te_navbar",
     "t-dialog": "tdesign-miniprogram/dialog/dialog"
   },
diff --git a/TUIKit/components/TUIChat/index.wxml b/TUIKit/components/TUIChat/index.wxml
index 6a4072c..924f8d8 100644
--- a/TUIKit/components/TUIChat/index.wxml
+++ b/TUIKit/components/TUIChat/index.wxml
@@ -3,12 +3,33 @@
 <view class="container">
   <view class="info" wx:if="{{ baseInfo.inquiry_status > 0 }}">
     <view class="left" >
-      <view class="name">{{baseInfo.patient_family_name}}</view>
-      <view class="age">{{baseInfo.patient_family_sex==1?'男':'女'}}｜{{baseInfo.patient_family_age}}岁</view>
-      <view class="status {{baseInfo.inquiry_status==5?'status_complete':''}}">{{baseInfo.inquiry_status==1?'待支付':baseInfo.inquiry_status==2?'待分配':baseInfo.inquiry_status==3?'待接诊':baseInfo.inquiry_status==4?'接诊中':baseInfo.inquiry_status==5?'问诊完成':baseInfo.inquiry_status==6?'已结束':baseInfo.inquiry_status==7?'已取消':'未知'}}</view>
+      <view class="circle_top"></view>
+      <view class="name" wx:if="{{baseInfo.inquiry_status!=4}}">{{baseInfo.patient_family_name}}</view>
+<view class="age" wx:if="{{baseInfo.inquiry_status!=4}}">{{baseInfo.patient_family_sex==1?'男':'女'}} | {{baseInfo.patient_family_age}}岁</view>
+     
+      <view class="count_time" wx:else="{{baseInfo.inquiry_status==4}}">
+     
+        问诊中｜<text wx:if="{{rest_time==-1}}" class="time_desc">不限时间</text>
+        <view wx:else="{{rest_time!=-1}}" class="time_desc">
+          <text>剩余</text>
+          <van-count-down class="control-count-down" use-slot time="{{rest_time}}" bind:change="onChangeTime" format="HH:mm:ss">
+              
+                <text class="item" hidden="{{timeData.hours== 0 && timeData.days==0}}">{{(timeData.days*24)+timeData.hours }}小时</text>
+                <text class="item" wx:if="{{timeData.hours==0}}">{{timeData.minutes }}分</text>
+                <text class="item" wx:if="{{timeData.hours==0}}">{{ timeData.seconds }}秒</text>
+              </van-count-down>
+        </view> 
+
+        <text wx:if="{{total_rounds==-1}}" class="time_desc">不限沟通次数</text>
+        <text wx:else class="time_desc">
+        <text wx:if="{{total_rounds-message_rounds>0}}">{{total_rounds-message_rounds}}</text>
+        <text wx:else>0</text>个沟通回合
+        </text>
+      </view>
     </view>
     <view class="right">
       <text class="right_txt" bindtap="putDoctorInquiryFinish" wx:if="{{baseInfo.inquiry_status==4}}">结束问诊</text>
+      <view class="status {{baseInfo.inquiry_status==5?'status_complete':''}}" wx:else="{{baseInfo.inquiry_status!=4}}">{{baseInfo.inquiry_status==1?'待支付':baseInfo.inquiry_status==2?'待分配':baseInfo.inquiry_status==3?'待接诊':baseInfo.inquiry_status==4?'接诊中':baseInfo.inquiry_status==5?'问诊完成':baseInfo.inquiry_status==6?'已结束':baseInfo.inquiry_status==7?'已取消':'未知'}}</view>
     </view>
   </view>
 
diff --git a/TUIKit/components/TUIChat/index.wxss b/TUIKit/components/TUIChat/index.wxss
index 72ec143..57ab792 100644
--- a/TUIKit/components/TUIChat/index.wxss
+++ b/TUIKit/components/TUIChat/index.wxss
@@ -134,22 +134,41 @@
   height: 100rpx;
   background-color: rgb(255, 255, 255);
   display: flex;
-  justify-content: space-around;
+  padding:0 20rpx;
+  justify-content: space-between;
   align-items: center;
   box-shadow: 0px 2px 4px 0px rgba(0,0,0,0.08);
 }
 .left{
   display: flex;
-  justify-content: space-around;
+   justify-content:space-between;
   align-items: center;
-  flex: 3;
+ 
 }
 .right{
-  flex: 1;
-  text-align: right;
+  
   font-size: 28rpx;
   color: #FFFFFF;
-  padding-right: 20rpx;
+  /* padding-right: 20rpx; */
+}
+.time_desc{
+ color:#E34D59;
+ display: flex;
+}
+
+.time_desc .item{
+  color:#E34D59;
+  font-size: 32rpx;
+}
+.count_time{
+  display: flex;
+}
+.circle_top{
+  width: 10rpx;
+  height: 10rpx;
+  margin-right: 10rpx;
+  background: #3CC7C0;
+  border-radius: 50%;
 }
 .right_txt{
   background: #3CC7C0;
@@ -162,10 +181,15 @@
   text-align: center;
 }
 .age{
+  display: flex;
+  align-items: center;
+  margin-left: 20rpx;
   font-size: 34rpx;
   color: #666666;
 }
 .status{
+  display: flex;
+  justify-content: center;
   background: #FFF2E8;
   box-shadow: 0px 2px 4px 0px rgba(0,0,0,0.08);
   border-radius: 10rpx;
diff --git a/utils/network/api.js b/utils/network/api.js
index 2a58a49..cbc8a7f 100644
--- a/utils/network/api.js
+++ b/utils/network/api.js
@@ -808,6 +808,10 @@ class API extends HTTP {
     }
   })
 }
+
+
+
+
 }
 
 export { API }

From 469bdd058a575f5fc116a6bb2974e26eab2f45e4 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Thu, 24 Aug 2023 13:46:58 +0800
Subject: [PATCH 42/83] =?UTF-8?q?8.24=20=E5=8C=BB=E7=94=9F=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/case/index.js                     | 16 +++++
 Pages/yishi/case/index.wxml                   | 16 ++---
 Pages/yishi/case/index.wxss                   |  9 ++-
 Pages/yishi/linkPage/linkPage.js              | 68 +++++++++++++++++++
 Pages/yishi/linkPage/linkPage.json            |  3 +
 Pages/yishi/linkPage/linkPage.wxml            |  2 +
 Pages/yishi/linkPage/linkPage.wxss            |  1 +
 Pages/yishi/my/index.js                       |  2 +-
 Pages/yishi/my/index.wxml                     | 46 +++++++------
 Pages/yishi/my/index.wxss                     | 45 +++++++++---
 .../MessageElements/CustomMessage/index.js    | 25 ++++++-
 .../MessageElements/CustomMessage/index.wxml  | 18 ++++-
 .../MessageElements/CustomMessage/index.wxss  | 29 ++++++++
 .../TUIChat/components/MessageList/index.js   |  1 -
 TUIKit/components/TUIChat/index.js            |  1 -
 TUIKit/components/TUIChat/index.wxss          |  6 ++
 app.json                                      |  3 +-
 17 files changed, 245 insertions(+), 46 deletions(-)
 create mode 100644 Pages/yishi/linkPage/linkPage.js
 create mode 100644 Pages/yishi/linkPage/linkPage.json
 create mode 100644 Pages/yishi/linkPage/linkPage.wxml
 create mode 100644 Pages/yishi/linkPage/linkPage.wxss

diff --git a/Pages/yishi/case/index.js b/Pages/yishi/case/index.js
index 84ebf13..6414560 100644
--- a/Pages/yishi/case/index.js
+++ b/Pages/yishi/case/index.js
@@ -21,6 +21,22 @@ Page({
   },
   goReport(event){
     const url=event.currentTarget.dataset.url;
+    const randfile = new Date().getTime() + '检测报告';
+  const newPath = `${wx.env.USER_DATA_PATH}/${randfile}`;
+  wx.downloadFile({
+    // 示例 url，并非真实存在
+    url:url,
+    filePath: newPath,
+    success: function (res) {
+      //const filePath = res.tempFilePath
+      wx.openDocument({
+        filePath: newPath,
+        success: function (res) {
+          console.log('打开文档成功')
+        }
+      })
+    }
+  })
   },
   formatImgList(){
     let diagnose_images = this.data.case_detail.diagnose_images?this.data.case_detail.diagnose_images:[];
diff --git a/Pages/yishi/case/index.wxml b/Pages/yishi/case/index.wxml
index 56cf2e2..be3cbc5 100644
--- a/Pages/yishi/case/index.wxml
+++ b/Pages/yishi/case/index.wxml
@@ -15,13 +15,13 @@
       <view class="hunyin info_item"><text class="info_title">婚姻：</text><text class="info_val">{{case_detail.marital_status==0?'未婚':case_detail.marital_status==1?'已婚':case_detail.marital_status==2?'离异':'未知'}}</text></view>
     </view>
     <view class="disease_box">
-      <view class="disease_box_item">
+      <view class="disease_box_item" wx:if="{{case_detail.disease_class_name}}">
         <view class="title">所患疾病：</view>
         <view class="conent">{{case_detail.disease_class_name}}</view>
       </view>
-      <view class="disease_box_item">
+      <view class="disease_box_item"  wx:if="{{case_detail.diagnosis_date}}">
         <view class="title">确诊日期：</view>
-        <view class="conent">{{dateSubstr.substring(case_detail.diagnosis_date,0,10)}}</view>
+        <view class="conent" >{{dateSubstr.substring(case_detail.diagnosis_date,0,10)}}</view>
       </view>
       <!-- <view class="disease_box_item">
         <view class="title">医生诊断：</view>
@@ -38,7 +38,7 @@
       <view class="disease_info" wx:if="{{case_detail.drugs_name != '' && case_detail.drugs_name != null}}">
         详细描述：{{case_detail.drugs_name}}
       </view>
-      <view class="disease_box_item">
+      <view class="disease_box_item" wx:if="{{case_detail.disease_desc}}">
         <view class="title">病情描述：</view>
         <view class="conent">{{case_detail.disease_desc}}</view>
       </view>
@@ -52,18 +52,18 @@
         <view class="title">复诊凭证(病例/处方单/检查报告/住院单)：</view>
         <view class="conent" wx:if="{{case_detail.diagnose_images.length == 0}}">无</view>
       </view>
-      <view class="img_box">
+      <view class="img_box" >
         <van-uploader image-fit="aspectFit" file-list="{{ imglist }}" show-upload="{{false}}" deletable="{{false}}" />
       </view>
 
     </view>
   </view>
-  <view class="sugarbox" wx:if="{{case_detail.detection_project}}" bindtap="goReport" data-url="{{case_detail.detection_link}}">
+  <view class="sugarbox" wx:if="{{case_detail.detection_project}}" data-url="{{case_detail.detection_project.detection_link}}" bindtap="goReport">
     <view class="main_title">{{case_detail.detection_project_name}}</view>
-  <view class="data_box sugar">
+  <view class="data_box sugar" >
      <view class="sugar_left">
         <view class="name">糖组检测</view>
-        <view class="date">{{case_detail.detection_time}}</view>
+        <view class="date">{{case_detail.detection_project.detection_time}}</view>
      </view>
      <van-icon name="arrow" />
   </view>
diff --git a/Pages/yishi/case/index.wxss b/Pages/yishi/case/index.wxss
index e416964..3754649 100644
--- a/Pages/yishi/case/index.wxss
+++ b/Pages/yishi/case/index.wxss
@@ -34,7 +34,8 @@ page{
   border-radius: 10rpx;
   display: flex;
   flex-wrap: wrap;
-  margin: 20rpx 0;
+  margin: 20rpx 0 0;
+  padding-bottom: 20rpx;
 }
 .info_item{
   text-align: left;
@@ -62,6 +63,12 @@ page{
   margin-bottom: 30rpx;
   display: flex;
 }
+.data_box .disease_box_item:first-child{
+  margin-top: 20rpx;
+}
+.orther .disease_box_item:first-child{
+  margin-top: 0rpx;
+}
 .title{
   font-size: 30rpx;
   color: #333333;
diff --git a/Pages/yishi/linkPage/linkPage.js b/Pages/yishi/linkPage/linkPage.js
new file mode 100644
index 0000000..c7f9a88
--- /dev/null
+++ b/Pages/yishi/linkPage/linkPage.js
@@ -0,0 +1,68 @@
+// pages/linkPage/linkPage.js
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    url:''
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+     if(options.url){
+       this.setData({
+         url:decodeURIComponent(options.url)
+       });    
+     }
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+   
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  
+})
\ No newline at end of file
diff --git a/Pages/yishi/linkPage/linkPage.json b/Pages/yishi/linkPage/linkPage.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/Pages/yishi/linkPage/linkPage.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/Pages/yishi/linkPage/linkPage.wxml b/Pages/yishi/linkPage/linkPage.wxml
new file mode 100644
index 0000000..4df1dbb
--- /dev/null
+++ b/Pages/yishi/linkPage/linkPage.wxml
@@ -0,0 +1,2 @@
+<!--pages/linkPage/linkPage.wxml-->
+<web-view src="{{url}}" ></web-view>
\ No newline at end of file
diff --git a/Pages/yishi/linkPage/linkPage.wxss b/Pages/yishi/linkPage/linkPage.wxss
new file mode 100644
index 0000000..cdd32c4
--- /dev/null
+++ b/Pages/yishi/linkPage/linkPage.wxss
@@ -0,0 +1 @@
+/* pages/linkPage/linkPage.wxss */
\ No newline at end of file
diff --git a/Pages/yishi/my/index.js b/Pages/yishi/my/index.js
index 7ffe33d..dc2a552 100644
--- a/Pages/yishi/my/index.js
+++ b/Pages/yishi/my/index.js
@@ -3,7 +3,7 @@ let api = new API()
 const app = getApp();
 Page({
   data: {
-    title: "个人中心",
+    title: "我的",
     navHeight: 0,
     stateHeight: 0,
     user_name: "医师姓名",
diff --git a/Pages/yishi/my/index.wxml b/Pages/yishi/my/index.wxml
index f264281..e635942 100644
--- a/Pages/yishi/my/index.wxml
+++ b/Pages/yishi/my/index.wxml
@@ -1,58 +1,64 @@
 <view class="container">
   <view class="top"></view>
   <view class="title" style="top: {{stateHeight}}px;height: {{navHeight}}px;line-height: {{navHeight}}px;">{{ title }}</view>
-  <view class="info_box" >
+  <view class="info_box">
     <!-- 跳转我的信息 -->
     <view class="photo" bindtap="go" data-url="/Pages/yishi/myinfo/index">
       <t-avatar class="avatar" size="large" image="{{avatar}}" />
     </view>
     <view class="info">
-      <view class="name" bindtap="go" data-url="/Pages/yishi/myinfo/index">{{user_name}}</view>
+      <view class="namebox">
+       
+        <view class="name" bindtap="go" data-url="/Pages/yishi/myinfo/index">{{user_name}}</view>
+        <view class="iconbox"  bindtap="go" data-url="/Pages/yishi/myinfo/index">
+          <text>设置</text>
+          <van-icon name="arrow" class="arrow"/>
+        </view>
+      </view>
+      
       <view class="renzheng">
         <view class="yishi" bindtap="go" data-url="/Pages/yishi/identity/index">{{iden_auth_status==1?'已医师认证':'未医师认证'}}></view>
         <view class="zhiye" bindtap="go" data-url="/Pages/yishi/zhiye_identity/index">{{multi_point_status==1?'已多点执业认证':'未多点执业认证'}}></view>
       </view>
     </view>
-    <view class="icon" bindtap="go" data-url="/Pages/yishi/myinfo/index">
-      <van-icon name="arrow" />
-    </view>
+
   </view>
 
-  <view class="account" >
+  <view class="account">
     <view class="account_top">
       <view class="account_top_left">
         <view class="account_title">
-        <view>
-        账户余额（元）
-        </view>
+          <view>
+            账户余额（元）
+          </view>
         </view>
         <view class="account_num">
           <view>
-          <text style="font-size: 42rpx;">￥</text>
-          <text style="font-size: 64rpx;">{{balance_account}}</text>
+            <text style="font-size: 42rpx;">￥</text>
+            <text style="font-size: 64rpx;">{{balance_account}}</text>
           </view>
         </view>
       </view>
       <view class="account_top_right">
         <navigator url="/Pages/yishi/cash/index" open-type="navigate" hover-class="other-navigator-hover">
-          <van-button custom-style="text-indent: 20rpx;letter-spacing: 20rpx;text-align: center;border-radius: 10rpx;padding: 20rpx 50rpx;" color="linear-gradient(310deg, #FF931A 0%, #FF931A 0%, #FCB75D 100%);font-size: 32rpx;">
+          <van-button custom-style="text-indent: 20rpx;letter-spacing: 20rpx;text-align: center;height:70rpx;border-radius: 40rpx;padding: 0rpx 44rpx;" color="linear-gradient(310deg, #FF931A 0%, #FF931A 0%, #FCB75D 100%);font-size: 32rpx;">
             提现
           </van-button>
         </navigator>
       </view>
     </view>
     <view class="account_bottom">
-      <view style="font-size: 30rpx;color: #666666;">当日预计收益金额：</view>
-      <view style="font-size: 42rpx;color: #333333;">￥{{estimate_income}}</view>
+      <view style="font-size: 28rpx;color: #666666;">当日预计收益金额：</view>
+      <view style="font-size: 28rpx;color: rgba(0,0,0,0.85);">￥{{estimate_income}}</view>
     </view>
   </view>
 
   <view class="content">
-    <van-cell size="large" url="/Pages/yishi/medince_list/index" link-type="navigateTo" title-style="font-size: 34rpx;" title="药品清单" is-link />
-    <van-cell size="large" url="/Pages/yishi/myaccount/index" link-type="navigateTo" title-style="font-size: 34rpx;" title="我的账户" is-link />
-    <van-cell size="large" url="/Pages/yishi/bankcard/index" link-type="navigateTo" title-style="font-size: 34rpx;" title="我的银行卡" is-link />
-    <van-cell size="large" url="/Pages/yishi/mycard/index" link-type="navigateTo" title-style="font-size: 34rpx;" title="我的名片" is-link  />
-    <van-cell size="large" url="/Pages/yishi/appraise/index?doctor_id={{doctor_id}}" link-type="navigateTo" title-style="font-size: 34rpx;" title="患者评价" is-link />
-    <van-cell size="large" url="/Pages/yishi/quickreply/index" link-type="navigateTo" title-style="font-size: 34rpx;" title="常用语" is-link border="{{ false }}"/>
+    <van-cell size="large" url="/Pages/yishi/medince_list/index" link-type="navigateTo" title-style="font-size: 30rpx;color: rgba(0,0,0,0.65);" title="药品清单" is-link />
+    <van-cell size="large" url="/Pages/yishi/myaccount/index" link-type="navigateTo" title-style="font-size: 30rpx;color: rgba(0,0,0,0.65);" title="我的账户" is-link />
+    <van-cell size="large" url="/Pages/yishi/bankcard/index" link-type="navigateTo" title-style="font-size: 30rpx;color: rgba(0,0,0,0.65);" title="我的银行卡" is-link />
+    <van-cell size="large" url="/Pages/yishi/mycard/index" link-type="navigateTo" title-style="font-size: 30rpx;color: rgba(0,0,0,0.65);" title="我的名片" is-link />
+    <van-cell size="large" url="/Pages/yishi/appraise/index?doctor_id={{doctor_id}}" link-type="navigateTo" title-style="font-size: 30rpx;color: rgba(0,0,0,0.65);" title="患者评价" is-link />
+    <van-cell size="large" url="/Pages/yishi/quickreply/index" link-type="navigateTo" title-style="font-size: 30rpx;color: rgba(0,0,0,0.65);" title="常用语" is-link border="{{ false }}" />
   </view>
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/my/index.wxss b/Pages/yishi/my/index.wxss
index 1d4d4ec..0fa6814 100644
--- a/Pages/yishi/my/index.wxss
+++ b/Pages/yishi/my/index.wxss
@@ -4,7 +4,7 @@ page{
 .container{
   background: linear-gradient(180deg, #3CC7C0 0%, rgba(60,199,192,0) 50%);
 
-  padding-bottom: 100rpx;
+  padding-bottom: 70rpx;
   min-height:100vh;
   width: 100vw;
   color: #fff;
@@ -17,6 +17,7 @@ page{
   position: absolute;
 }
 .title{
+  color: #000000;
   position:relative;
   text-align: center;
 }
@@ -34,7 +35,8 @@ page{
 }
 .name{
   height: 50rpx;
-  font-size: 36rpx;
+  font-size: 34rpx;
+  color: rgba(0,0,0,0.85);
   line-height: 50rpx;
 }
 .renzheng{
@@ -50,6 +52,12 @@ page{
   padding: 0 20rpx;
   margin-right: 20rpx;
 }
+.zhiye{
+  background: #999999;
+}
+.yishi{
+  background: #FAAD14;
+}
 .photo{
   flex: 3;
   text-align: center;
@@ -62,11 +70,26 @@ page{
   text-align: right;
   padding-right: 20rpx;
 }
+.namebox{
+  justify-content: space-between;
+  display: flex;
+}
+.iconbox{
+  align-items: center;
+  font-size: 30rpx;
+  color: rgba(0,0,0,0.65);
+  margin-right: 24rpx;
+  display: flex;
+}
+.iconbox .arrow{
+  margin-top: 4rpx;
+  margin-left: 4px;
+}
 .account{
   background-color: rgb(255, 255, 255);
   width: 92vw;
   margin: 0 auto;
-  height: 272rpx;
+  height: 280rpx;
   margin-top: 24rpx;
   position: relative;
   border-radius: 20rpx;
@@ -85,12 +108,16 @@ page{
   margin-left: 20rpx;
 }
 .account_title{
-  flex: 9;
+ margin-top: 32rpx;
   display: flex;
+  font-size: 30rpx;
+font-weight: 400;
+color: rgba(0,0,0,0.65);
   align-items: center;
 }
 .account_num{
-  flex: 10;
+ margin-top: 10rpx;
+  font-weight: bold;
   display: flex;
   align-items: center;
 }
@@ -98,7 +125,8 @@ page{
   flex: 2;
   display: flex;
   justify-content: center;
-  align-items: center;
+  align-items:flex-end;
+  margin-bottom: 20rpx;
 }
 .account_bottom{
   flex: 1;
@@ -112,14 +140,15 @@ page{
   background-color: #fff;
   margin: 24rpx auto 0;
   position: static;
+  overflow: hidden;
   border-radius: 20rpx;
-  padding: 20rpx 0;
+  padding: 0rpx 0 20rpx;
 }
 .t-badge__content-text {
   line-height: 70rpx !important;
 }
 .van-cell {
-  padding: 32rpx !important;
+  padding: 30rpx !important;
 }
 
 
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
index 76f7bab..65bdd6e 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
@@ -198,7 +198,9 @@ Component({
           let data = customMessage.data;
           const renderDom = [{
             type: 'patient_info',
-            path:data.message_path
+            disease_desc:data.disease_desc,
+            path:data.message_path,
+            detection_link:data.detection_link
           }];
           return renderDom;
         }
@@ -251,12 +253,31 @@ Component({
       } catch (error) {
       }
     },
-    
+    goReport(event){
+      const url=event.currentTarget.dataset.url;
+      const randfile = new Date().getTime() + '检测报告';
+    const newPath = `${wx.env.USER_DATA_PATH}/${randfile}`;
+    wx.downloadFile({
+      // 示例 url，并非真实存在
+      url:url,
+      filePath: newPath,
+      success: function (res) {
+        //const filePath = res.tempFilePath
+        wx.openDocument({
+          filePath: newPath,
+          success: function (res) {
+            console.log('打开文档成功')
+          }
+        })
+      }
+    })
+    },
    goSick(event){
     const url=event.currentTarget.dataset.url;
     console.log(url);
     app.go(url);
    },
+
     openLink(e) {
       if (e.currentTarget.dataset.value.key === '立即前往') {
         wx.navigateTo({
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
index eaa7050..e8a283e 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
@@ -96,7 +96,7 @@
         <view class="sick"> 所患疾病：{{renderDom[0].disease_class_names}}</view>
       </view>
     </view>
-    <view class="detail">
+    <view class="detail" data-url="{{renderDom[0].detection_link}}" bindtap="goReport">
        <view class="left">查看报告</view>
        <image src="../../../../../static/images/back.png" class="back" mode="widthFix"/>
     </view>
@@ -105,13 +105,25 @@
     <image src="../../../../../static/images/patient_bg.png" 
     class="bg" mode=""/>
     <view class="title">患者信息</view>
-    <view class="patient_info">
-        <view class="name">就诊人：{{patient_family_data.patient_name}}（<text wx:if="{{patient_family_data.patient_sex==1}}">男</text><text wx:elif="{{patient_family_data.patient_sex==2}}">女</text><text wx:else>未知</text>｜{{patient_family_data.patient_age}}岁）</view>
+    <view class="sickinfo" wx:if="{{renderDom[0].disease_desc}}">
+        <view class="name">{{patient_family_data.patient_name}}（<text wx:if="{{patient_family_data.patient_sex==1}}">男</text><text wx:elif="{{patient_family_data.patient_sex==2}}">女</text><text wx:else>未知</text>｜{{patient_family_data.patient_age}}岁）</view>
+        <view class="sick_desc">
+          <text class="sickname">病情描述：</text>{{renderDom[0].disease_desc}}
+        </view>
+        <view class="look sicklook" bindtap="goSick" data-url="{{renderDom[0].path}}">
+           <view class="see">查看详情</view>
+           <van-icon name="arrow" color="rgba(0,0,0,0.45)" style="margin-top:4rpx;margin-left:8rpx;"/>
+        </view>
+      </view>
+    <view class="patient_info" wx:else>
+        <view class="name">{{patient_family_data.patient_name}}（<text wx:if="{{patient_family_data.patient_sex==1}}">男</text><text wx:elif="{{patient_family_data.patient_sex==2}}">女</text><text wx:else>未知</text>｜{{patient_family_data.patient_age}}岁）</view>
+      
         <view class="look" bindtap="goSick" data-url="{{renderDom[0].path}}">
            <view class="see">查看详情</view>
            <van-icon name="arrow" color="rgba(0,0,0,0.45)" style="margin-top:4rpx;margin-left:8rpx;"/>
         </view>
       </view>
+    
   
      
   </view>
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss
index 225c55e..8f390db 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss
@@ -333,4 +333,33 @@ justify-content:space-between;
   display: flex;
   color:rgba(0,0,0,0.45);
   align-items: center;
+}
+.sick_desc{
+  font-size: 28rpx;
+  margin:20rpx 32rpx 0;
+  text-align: left;
+  
+  border-bottom: 1rpx solid rgba(0,0,0,0.12);
+  padding-bottom: 30rpx;
+
+}
+.sickname{
+  font-size: 28rpx;
+font-weight: 400;
+color: rgba(0,0,0,0.45);
+}
+.sicklook{
+  justify-content: space-between;
+  margin:0 32rpx;
+  align-items: center;
+  height: 100rpx;
+}
+.sickinfo .name{
+  margin: 20rpx 32rpx 0;
+  
+  text-align: left;
+}
+.sicklook .see{
+ 
+  font-size: 32rpx;
 }
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index 0359fe1..da76b75 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -362,7 +362,6 @@ Component({
           const title = customMessage.title
           if(title.indexOf("问诊已结束") > -1){
             setTimeout(() => {
-              console.log('aaaaaaaaaaaaaaaaaaaaaa')
               //收到横条消息去触发父组件getbase方法,演示1秒
               this.triggerEvent('getInquiryMessageBasic');
             }, 1000);
diff --git a/TUIKit/components/TUIChat/index.js b/TUIKit/components/TUIChat/index.js
index 50aef6f..2ecaf8a 100644
--- a/TUIKit/components/TUIChat/index.js
+++ b/TUIKit/components/TUIChat/index.js
@@ -188,7 +188,6 @@ Component({
       
     },
     onChangeTime(e) {
-      console.log(e.detail)
       this.setData({
         'timeData': e.detail,
       });
diff --git a/TUIKit/components/TUIChat/index.wxss b/TUIKit/components/TUIChat/index.wxss
index 57ab792..8c01347 100644
--- a/TUIKit/components/TUIChat/index.wxss
+++ b/TUIKit/components/TUIChat/index.wxss
@@ -154,14 +154,20 @@
 .time_desc{
  color:#E34D59;
  display: flex;
+ align-items: center;
 }
 
 .time_desc .item{
   color:#E34D59;
+ 
+  display: flex;
+  align-items: center;
   font-size: 32rpx;
 }
 .count_time{
   display: flex;
+  height:100rpx;
+  align-items: center;
 }
 .circle_top{
   width: 10rpx;
diff --git a/app.json b/app.json
index ff1d525..12a4604 100644
--- a/app.json
+++ b/app.json
@@ -58,7 +58,8 @@
     "Pages/yishi/wenzhenorderV2/index",
     "Pages/yishi/wenzhen_v3/wenzhen",
     "Pages/agreement_page/index",
-    "Pages/yishi/medince_list/index"
+    "Pages/yishi/medince_list/index",
+    "Pages/yishi/linkPage/linkPage"
   ],
   "window": {
     "navigationBarBackgroundColor": "#ffffff",

From c52bb75828782cb27f5f7d99f5ae86e6af41a04f Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Mon, 28 Aug 2023 14:26:56 +0800
Subject: [PATCH 43/83] =?UTF-8?q?8.28=E4=BF=AE=E6=94=B9=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/case/index.js                     | 45 ++++++++++++-------
 Pages/yishi/onlinechufang/index.wxml          |  6 +--
 Pages/yishi/onlinechufang/index.wxss          |  3 ++
 Pages/yishi/wenzhen_v2/wenzhen.wxml           |  2 +-
 .../MessageElements/CustomMessage/index.js    | 17 ++++++-
 5 files changed, 53 insertions(+), 20 deletions(-)

diff --git a/Pages/yishi/case/index.js b/Pages/yishi/case/index.js
index 6414560..7453198 100644
--- a/Pages/yishi/case/index.js
+++ b/Pages/yishi/case/index.js
@@ -22,21 +22,36 @@ Page({
   goReport(event){
     const url=event.currentTarget.dataset.url;
     const randfile = new Date().getTime() + '检测报告';
-  const newPath = `${wx.env.USER_DATA_PATH}/${randfile}`;
-  wx.downloadFile({
-    // 示例 url，并非真实存在
-    url:url,
-    filePath: newPath,
-    success: function (res) {
-      //const filePath = res.tempFilePath
-      wx.openDocument({
-        filePath: newPath,
-        success: function (res) {
-          console.log('打开文档成功')
-        }
-      })
-    }
-  })
+    const newPath = `${wx.env.USER_DATA_PATH}/${randfile}`;
+    wx.downloadFile({
+      // 示例 url，并非真实存在
+      url:url,
+      filePath: newPath,
+      success: function (res) {
+        //const filePath = res.tempFilePath
+        wx.openDocument({
+          fileType:"pdf",
+          showMenu:true,
+          filePath: newPath,
+          success: function (res) {
+            console.log('打开文档成功')
+          },
+          fail:function(error){
+            wx.showToast({
+              title:res,
+              icon:"none"
+            })
+          }
+        })
+      },
+      fail:function(error){
+        wx.showToast({
+          title:error,
+          icon:"none"
+        })
+      }
+     
+    })
   },
   formatImgList(){
     let diagnose_images = this.data.case_detail.diagnose_images?this.data.case_detail.diagnose_images:[];
diff --git a/Pages/yishi/onlinechufang/index.wxml b/Pages/yishi/onlinechufang/index.wxml
index 8e0ea30..7d3f0a1 100644
--- a/Pages/yishi/onlinechufang/index.wxml
+++ b/Pages/yishi/onlinechufang/index.wxml
@@ -10,10 +10,10 @@
     </view>
     <!-- 中间内容部分 -->
     <view class="item_content">
-      <view class="item_content_li">
+      <view class="item_content_li {{!case_detail.disease_desc?'active':''}}">
         <view class="item_content_li_title">病情主诉：</view>
-      <van-field value="{{add_disease_desc}}" class="item_content_li_txt" label="" custom-style="border:1px solid #dfdfdf;border-radius:8rpx;" type="textarea" maxlength="500" placeholder="请填写患者病情"  show-word-limit="{{true}}" autosize="{{autoHeight}}" wx:if="{{!case_detail.disease_desc}}" bind:change="onChangeTextAraa"/>
-        <view class="item_content_li_txt" wx:else>{{case_detail.disease_desc}}</view> 
+      <van-field  wx:if="{{!case_detail.disease_desc}}" value="{{add_disease_desc}}" class="item_content_li_txt" label="" custom-style="border:1px solid #dfdfdf;border-radius:8rpx;margin-top:20rpx" type="textarea" maxlength="500" placeholder="请填写患者病情"  show-word-limit="{{true}}" autosize="{{autoHeight}}" bind:change="onChangeTextAraa"/>
+       <view class="item_content_li_txt" wx:else>{{case_detail.disease_desc}}</view> 
       </view>
       <view class="item_content_li" wx:if="{{case_detail.product.length > 0}}">
         <view class="item_content_li_title">用药意向：</view>
diff --git a/Pages/yishi/onlinechufang/index.wxss b/Pages/yishi/onlinechufang/index.wxss
index 898fad6..31d3ad7 100644
--- a/Pages/yishi/onlinechufang/index.wxss
+++ b/Pages/yishi/onlinechufang/index.wxss
@@ -52,6 +52,9 @@ page{
   display: flex;
   padding-bottom: 20rpx;
 }
+.item_content_li.active{
+  flex-direction: column;
+}
 .item_content_li_title{
   font-size: 30rpx;
   color: #333333;
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml
index 93f9eba..9c20c00 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxml
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml
@@ -334,7 +334,7 @@
           <view class="content_4" wx:if="{{ item.inquiry_status == 3 }}">不接诊24小时后自动取消</view>
         </view>  
       </van-tab>
-      <van-tab title="糖组检测" dot="{{dot_5}}" name="5" wx:if="{{data_list_5.length > 0}}">
+      <van-tab title="报告解读" dot="{{dot_5}}" name="5" wx:if="{{data_list_5.length > 0}}">
         <!-- <wenzhen-data 
           name="{{ item.patient_name }}"
           sex="{{ item.patient_sex==1?'男':'女' }}"
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
index 65bdd6e..294bb38 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
@@ -255,7 +255,7 @@ Component({
     },
     goReport(event){
       const url=event.currentTarget.dataset.url;
-      const randfile = new Date().getTime() + '检测报告';
+    const randfile = new Date().getTime() + '检测报告';
     const newPath = `${wx.env.USER_DATA_PATH}/${randfile}`;
     wx.downloadFile({
       // 示例 url，并非真实存在
@@ -264,12 +264,27 @@ Component({
       success: function (res) {
         //const filePath = res.tempFilePath
         wx.openDocument({
+          fileType:"pdf",
+          showMenu:true,
           filePath: newPath,
           success: function (res) {
             console.log('打开文档成功')
+          },
+          fail:function(error){
+            wx.showToast({
+              title:res,
+              icon:"none"
+            })
           }
         })
+      },
+      fail:function(error){
+        wx.showToast({
+          title:error,
+          icon:"none"
+        })
       }
+     
     })
     },
    goSick(event){

From ecb43ec855de7f42d9a7eb4b2ff433656c8c1a43 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Mon, 28 Aug 2023 17:39:11 +0800
Subject: [PATCH 44/83] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8C=BB=E7=94=9F?=
 =?UTF-8?q?=E7=AB=AF=20=E7=BB=93=E6=9D=9F=E6=8E=A5=E5=8F=A3=E4=B8=A4?=
 =?UTF-8?q?=E6=AC=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/my/index.js                       |   2 ++
 Pages/yishi/my/index.wxml                     |  22 ++++++------
 Pages/yishi/my/index.wxss                     |  14 ++++----
 Pages/yishi/service_notice/index.wxml         |   4 +++
 .../components/MessageInput/index.wxml        |   2 +-
 TUIKit/components/TUIChat/index.js            |  32 +++++++++---------
 TUIKit/components/TUIChat/index.wxml          |   3 +-
 TUIKit/components/TUIChat/index.wxss          |   2 ++
 .../images/yishi/tabbar_icon/check_sugar.png  | Bin 0 -> 3920 bytes
 9 files changed, 45 insertions(+), 36 deletions(-)
 create mode 100644 static/images/yishi/tabbar_icon/check_sugar.png

diff --git a/Pages/yishi/my/index.js b/Pages/yishi/my/index.js
index dc2a552..e3558fd 100644
--- a/Pages/yishi/my/index.js
+++ b/Pages/yishi/my/index.js
@@ -6,6 +6,7 @@ Page({
     title: "我的",
     navHeight: 0,
     stateHeight: 0,
+    doctor_title:'',
     user_name: "医师姓名",
     iden_auth_status: "0",
     idcard_status: "0",
@@ -59,6 +60,7 @@ Page({
     api.getDoctorCenter().then(response => {
       this.setData({
         user_name: response.data.user_name,
+        doctor_title:response.data.doctor_title,
         iden_auth_status: response.data.iden_auth_status,
         idcard_status: response.data.idcard_status,
         multi_point_status: response.data.multi_point_status,
diff --git a/Pages/yishi/my/index.wxml b/Pages/yishi/my/index.wxml
index e635942..9132616 100644
--- a/Pages/yishi/my/index.wxml
+++ b/Pages/yishi/my/index.wxml
@@ -9,7 +9,7 @@
     <view class="info">
       <view class="namebox">
        
-        <view class="name" bindtap="go" data-url="/Pages/yishi/myinfo/index">{{user_name}}</view>
+        <view class="name" bindtap="go" data-url="/Pages/yishi/myinfo/index">{{user_name}} <text decode="true">&nbsp;{{doctor_title}}</text></view>
         <view class="iconbox"  bindtap="go" data-url="/Pages/yishi/myinfo/index">
           <text>设置</text>
           <van-icon name="arrow" class="arrow"/>
@@ -17,8 +17,8 @@
       </view>
       
       <view class="renzheng">
-        <view class="yishi" bindtap="go" data-url="/Pages/yishi/identity/index">{{iden_auth_status==1?'已医师认证':'未医师认证'}}></view>
-        <view class="zhiye" bindtap="go" data-url="/Pages/yishi/zhiye_identity/index">{{multi_point_status==1?'已多点执业认证':'未多点执业认证'}}></view>
+        <view class="yishi {{iden_auth_status==1?'active':''}}" bindtap="go" data-url="/Pages/yishi/identity/index">{{iden_auth_status==1?'已医师认证':'未医师认证'}}></view>
+        <view class="zhiye {{multi_point_status==1?'active':''}}" bindtap="go" data-url="/Pages/yishi/zhiye_identity/index">{{multi_point_status==1?'已多点执业认证':'未多点执业认证'}}></view>
       </view>
     </view>
 
@@ -48,17 +48,17 @@
       </view>
     </view>
     <view class="account_bottom">
-      <view style="font-size: 28rpx;color: #666666;">当日预计收益金额：</view>
-      <view style="font-size: 28rpx;color: rgba(0,0,0,0.85);">￥{{estimate_income}}</view>
+      <view style="font-size: 30rpx;color: #666666;">当日预计收益金额：</view>
+      <view style="font-size: 42rpx;color: rgba(0,0,0,0.85);">￥{{estimate_income}}</view>
     </view>
   </view>
 
   <view class="content">
-    <van-cell size="large" url="/Pages/yishi/medince_list/index" link-type="navigateTo" title-style="font-size: 30rpx;color: rgba(0,0,0,0.65);" title="药品清单" is-link />
-    <van-cell size="large" url="/Pages/yishi/myaccount/index" link-type="navigateTo" title-style="font-size: 30rpx;color: rgba(0,0,0,0.65);" title="我的账户" is-link />
-    <van-cell size="large" url="/Pages/yishi/bankcard/index" link-type="navigateTo" title-style="font-size: 30rpx;color: rgba(0,0,0,0.65);" title="我的银行卡" is-link />
-    <van-cell size="large" url="/Pages/yishi/mycard/index" link-type="navigateTo" title-style="font-size: 30rpx;color: rgba(0,0,0,0.65);" title="我的名片" is-link />
-    <van-cell size="large" url="/Pages/yishi/appraise/index?doctor_id={{doctor_id}}" link-type="navigateTo" title-style="font-size: 30rpx;color: rgba(0,0,0,0.65);" title="患者评价" is-link />
-    <van-cell size="large" url="/Pages/yishi/quickreply/index" link-type="navigateTo" title-style="font-size: 30rpx;color: rgba(0,0,0,0.65);" title="常用语" is-link border="{{ false }}" />
+    <van-cell size="large" url="/Pages/yishi/medince_list/index" link-type="navigateTo" title-style="font-size: 34rpx;color: rgba(0,0,0,0.65);" title="药品清单" is-link />
+    <van-cell size="large" url="/Pages/yishi/myaccount/index" link-type="navigateTo" title-style="font-size: 34rpx;color: rgba(0,0,0,0.65);" title="我的账户" is-link />
+    <van-cell size="large" url="/Pages/yishi/bankcard/index" link-type="navigateTo" title-style="font-size: 34rpx;color: rgba(0,0,0,0.65);" title="我的银行卡" is-link />
+    <van-cell size="large" url="/Pages/yishi/mycard/index" link-type="navigateTo" title-style="font-size: 34rpx;color: rgba(0,0,0,0.65);" title="我的名片" is-link />
+    <van-cell size="large" url="/Pages/yishi/appraise/index?doctor_id={{doctor_id}}" link-type="navigateTo" title-style="font-size: 34rpx;color: rgba(0,0,0,0.65);" title="患者评价" is-link />
+    <van-cell size="large" url="/Pages/yishi/quickreply/index" link-type="navigateTo" title-style="font-size: 34rpx;color: rgba(0,0,0,0.65);" title="常用语" is-link border="{{ false }}" />
   </view>
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/my/index.wxss b/Pages/yishi/my/index.wxss
index 0fa6814..32bb99e 100644
--- a/Pages/yishi/my/index.wxss
+++ b/Pages/yishi/my/index.wxss
@@ -4,7 +4,7 @@ page{
 .container{
   background: linear-gradient(180deg, #3CC7C0 0%, rgba(60,199,192,0) 50%);
 
-  padding-bottom: 70rpx;
+  padding-bottom: 120rpx;
   min-height:100vh;
   width: 100vw;
   color: #fff;
@@ -22,7 +22,7 @@ page{
   text-align: center;
 }
 .info_box{
-  margin-top: 24rpx;
+  margin-top: 110rpx;
   width: 100%;
   height: 200rpx;
   position: relative;
@@ -45,17 +45,17 @@ page{
   margin-top: 15rpx;  
 }
 .yishi,.zhiye{
-  background-color: #00A59D;
+  background: #999999;
   border-radius: 20rpx;
   height: 44rpx;
   line-height: 44rpx;
   padding: 0 20rpx;
   margin-right: 20rpx;
 }
-.zhiye{
-  background: #999999;
+.zhiye.active{
+  background: #FAAD14;
 }
-.yishi{
+.yishi.active{
   background: #FAAD14;
 }
 .photo{
@@ -148,7 +148,7 @@ color: rgba(0,0,0,0.65);
   line-height: 70rpx !important;
 }
 .van-cell {
-  padding: 30rpx !important;
+  padding: 32rpx !important;
 }
 
 
diff --git a/Pages/yishi/service_notice/index.wxml b/Pages/yishi/service_notice/index.wxml
index 948895a..9c93255 100644
--- a/Pages/yishi/service_notice/index.wxml
+++ b/Pages/yishi/service_notice/index.wxml
@@ -19,6 +19,10 @@
           <text style="margin-left: 10rpx;">问诊购药</text> 
           <van-image class="van_img" src="{{static_host}}/applet/doctor/static/images/yishi/service_notice/drug.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
+        <view class="item_img" wx:if="{{item.inquiry_type == 5}}">
+          <text style="margin-left: 10rpx;">糖组检测</text> 
+          <van-image class="van_img" src="../../../static/images/yishi/tabbar_icon/check_sugar.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
+        </view>
         <view class="item_date">{{item.notice_send_time}}</view>
       </view>
       <view class="item_content">
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxml b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
index f905fa3..979e3a0 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
@@ -1,7 +1,7 @@
 <view class="TUI-message-input-container">
     <view class="TUI-commom-function">
         <view class="TUI-commom-function-item" data-key="10" bindtap="handleCommonFunctions">查看完整病历</view>
-        <view class="TUI-commom-function-item" data-key="11" bindtap="handleCommonFunctions" wx:if="{{baseInfo.multi_point_status == 1}}">在线开处方</view>
+        <view class="TUI-commom-function-item" data-key="11" bindtap="handleCommonFunctions" wx:if="{{baseInfo.multi_point_status == 1 && baseInfo.inquiry_status!=4}}">在线开处方</view>
     </view>
     <view class="TUI-message-input">
         <image class="TUI-icon" bindtap="switchAudio" wx:if="{{has_audio}}"
diff --git a/TUIKit/components/TUIChat/index.js b/TUIKit/components/TUIChat/index.js
index 2ecaf8a..1de2dcb 100644
--- a/TUIKit/components/TUIChat/index.js
+++ b/TUIKit/components/TUIChat/index.js
@@ -176,15 +176,15 @@ Component({
         message_rounds: message_rounds
       })
       let total_rounds=this.data.total_rounds;
-      if(total_rounds>=0){
-        if(total_rounds-message_rounds<=0 && this.data.baseInfo.inquiry_status==4){
-          wx.showToast({
-            title: '沟通已达到限制的'+total_rounds+'个回合',
-            icon:"none"
-          })
-          this.finishConsult();
-        }
-      }
+      // if(total_rounds>=0){
+      //   if(total_rounds-message_rounds<=0 && this.data.baseInfo.inquiry_status==4){
+      //     wx.showToast({
+      //       title: '沟通已达到限制的'+total_rounds+'个回合',
+      //       icon:"none"
+      //     })
+      //     this.finishConsult();
+      //   }
+      // }
       
     },
     onChangeTime(e) {
@@ -310,13 +310,13 @@ Component({
             this.setData({
               "rest_time": countdownTime
             });
-            if(countdownTime==0){
-              wx.showToast({
-                title: '沟通时长已超过限制时间',
-                icon:"none"
-              })
-              this.finishConsult();
-            }
+            //if(countdownTime==0){
+              // wx.showToast({
+              //   title: '沟通时长已超过限制时间',
+              //   icon:"none"
+              // })
+             // this.finishConsult();
+           // }
           } else {
 
             this.setData({
diff --git a/TUIKit/components/TUIChat/index.wxml b/TUIKit/components/TUIChat/index.wxml
index 924f8d8..047ce8d 100644
--- a/TUIKit/components/TUIChat/index.wxml
+++ b/TUIKit/components/TUIChat/index.wxml
@@ -54,7 +54,8 @@
   <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}}">
+  <!-- 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:refreshMessageStatus="refreshMessageStatus" 
diff --git a/TUIKit/components/TUIChat/index.wxss b/TUIKit/components/TUIChat/index.wxss
index 8c01347..a7665af 100644
--- a/TUIKit/components/TUIChat/index.wxss
+++ b/TUIKit/components/TUIChat/index.wxss
@@ -154,6 +154,7 @@
 .time_desc{
  color:#E34D59;
  display: flex;
+ font-size: 32rpx;
  align-items: center;
 }
 
@@ -165,6 +166,7 @@
   font-size: 32rpx;
 }
 .count_time{
+  font-size: 32rpx;
   display: flex;
   height:100rpx;
   align-items: center;
diff --git a/static/images/yishi/tabbar_icon/check_sugar.png b/static/images/yishi/tabbar_icon/check_sugar.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfed72ac4c3e2daa537d947b39f57268e48f4777
GIT binary patch
literal 3920
zcmV-W53lfvP)<h;3K|Lk000e1NJLTq001@s001@!1^@s6j74hQ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91HlPCl1ONa40RR91HUIzs0P{mGqyPX8x=BPqRA>doT5YhERTW<Q+zaw?
zMbH7|Tk+-x3Vx88nIo7p{qaxHk2IQ^$;OB=yw+%c{L!FXpb5M&r1mrUGR@K{2fvcC
zp+-d$luGf63WDM{T)14$eczsE?X~vV=iCEc(Wy0a&R%=1XMOFx-~I0QJtxR#NM%_D
zx##Y$Ng1w|qMR-vjF+-#6A3K>AwB{*zRG^c_Dg@c8{xM}C9IQgfA{wx1n52+La<Lq
zTFh_PUXKD6z*9SNuZZSuIg)p3l)FylQb>^P_^gueT)Xnq7J1Bt#o1ZCLZmVuGcYt2
z<H>3<oE$JJ%XzD`D7@r|i3P%?^hr_NA>aE!$FUZ8Oof&At?9rrT7;xW#-y1a6F)-o
zfveE;3I*@279G0@qiTMI9tq_w;oA8az)wb>sIc<hdoPos?{`RGtR~^HN{qbaS}%vt
z6K^cc<@BLCWoq~&SI2vC9nKBk|KXDq4~8m(0TEN)w|=4YAKHi{vZ9zcms67&VY0r|
zyeQ`AJe`u*_qLI*^~XxJe`9&)%7qd9@!x}*vGU$EtFftFgG3|Vlk>pM5^I!s-&^&;
z4v7QArtzAiOcex?O60IMELb=%c8~mh)WXWU?iwOv+BU=a3~bZUOVeUJF~bn4iD&(M
z_B@{)lk;xh*wUTiimftq#H?`Lb%)(mV|(<a$fAm(Nl}QvL_L`-f0en;6C=*~$VJ<x
zJcJ2vyvA`ke1$MW`g%6Id9(J2g_ZYU`4yNcPdXI=fzKX2x;!r?-vwQtTG%)?mpShN
z8ACTEwi(ZustYs9u3xNXw;44pOg9RVYic8B&gp?cQt<4WaPQPJagt)Kr5QIFw`Ero
zG=Di(2M%(zF%$A?Zg^FOYs#+WO*fPQ*O+eU)!vP86HgFe>JzkRo=C3uf;eO2Cx}d%
zEHZku$Z^9&hK~^GuZkQzAaVeoJ$poUz9#bC`!)YskjFzD3zaq%ttkmjk7=zGv%`;W
zs=F1mGOs%7$9;-LxmOmD7vW&a8kgMA<3!G#A#%o9BCR|gX13%jLqvw0AaeXDk#Q%B
z%sfwI-$x?PKQHpic6bIxDQne-iB)ep%1LEek!oPh<Fs#Ibu(7pvkoVU!^<@Q?cA7P
z4Un8gbC<EeGf~WW7b0;auXcv@S?K2m1{|>@w^c0q@4qMVk4++P@1>Fm^TXD7$Fijx
zU$S6v(!4SJ<fav5Nfw1ZaQa?<_dYmjI3@v=JERr+E@PsXd|71LG{`dS9vs|Xe@$ff
zE|LBFMGm7d+6)^mG72*`aiYlNDI#sh*ZdVY^#2{jz48j9fGm#3YSuC)sVsWr$2TAE
zXUke)>+il@`iq6Nks#Qu!29*1GMI74s$j)l`BjmVPa!zsS<ur@iM;zxgFSr_gN9K#
z+H9wtj+w@i96r+UkZ;~B^5WKrRRhDLF=51de%=<+6>j?J4Mgd#sIyg+IHiMp={T6J
z^9sP1pAas&ROA#Cr5MOJKO?f?AuGzj$(|J%=^&Zk?YOocd_d$)%&f<`085%14~b?f
zS0?tEBfBJTRaVZ|S|HZKumtfug+~u3PbP1v^FDcAQ`6dO1F`XOkr%d5V>ryH<JsnN
z=QSDN4)uvV{-{WIxA_D9QY`O$nYxV*D)hN;pNxPSmUUiFXe_Lh1q$Ry`e;(?lsh5M
z4dVP+(K#{CJ}t82)oANM+?H*!CvTrzP9fuN`WrTnx2X|n!G?Xo`H^>f_GqsJrcO>D
z`r!kwRN^u$F!UMeNH#H~BhtAuMTXi0@5VK?1>1E_N3=)s%#5S%zUb223OA1@H;PoT
z(eV14JXPex6TyIp_d#?2QBm{7ekj{nQz+N`=Ie0CXDo%KmOaW`?tSip-<*g06h@S~
zKRqb2*G8Ex#*Y^{`y7!Iu=DZ0cAy6v!3!cUzZCJ8Um-F9H*Xg4(MKX5e285WEe9%K
z0db(lpqS}rGor|=-6;02k=K04T3(Dt@@t-aEPie)gjcgapa9AU;>hI%@<cJjisBCF
zMG<@1<sxSxA;n`>xV(--aTk9{WEZ#neIoB*5GG?|sKD`<F&F@xOne53=MMYOA8Un8
zz-@t~30oze7v+q_B=h3R@@gKNrbnfL6zB$M87!AEDLSUV*LUCxME&^}SW#Ax+C{aV
zLN5Md#J%_;Hj6`%r;jxH+7WpUTYc}rc&*Vdujg@gs362(8dHmb!1L3*6fhly30{$z
zvawBG=#Ut+Ct#FG?C;uHEBuTzDU2Am^O+!a;-t7VtJQepRv!(6#--Wa9er?y6$9JR
zSejmh4>ZIY#*3-TUB+Wkmu;zHcSNxB$p8ZKBXDw1kKlQtAQ8@kZVH0F`%u04^Lx`9
zZ$w|oH}&}ZYg=qt1bwpz(s1}D5wC<+3$-q7sp4g$OwopGtZY$Um1anQJ9TH81mrxW
z6V}&PJ0_v4I~g|sPnNRe!xGdT4#ppRP>-X{yErSp{Brb7TW&f|!)(xEqGn4a>@+{N
z?D7i~q=nZQue_R&N*`?pvZaj{Y*-$r(hNb?YuAnXLLok)c{|Js@4=FzKN9skM{e2_
zd5s079+nx4z6dshj7>U~xgIUv%^*A4m{8X*`{qmyT(1T;lHgg`P+Zs~+8^r8?9lfF
zQw!V>?2sG`xKA+-<C^=+6PQKJnC3w}KAa^qN<El8@@nh3u{FKgf!9HV5Pi%T&{WV!
z$y;^^G6yc!AlBh2owocOWMR=Hx-q%S=!ZoR#I2q-yk|YK0p~=t>L;_W^Nn3HRiWN%
zU5}sViHce=dbm^aXvGXbTA=YXa&iZ}Z~4KO_ZU9{^<gQ}hX%;)vVq}!jKs6yy0s`2
zt;bLk+Vca<#0d&je(zqBD=4!uERm*){)+wzjv)J^Gibahf>J;lBRRDM&wCg3q$#IH
z9Q!^CJ^<R%4&?UxP#Ce)X;I|;!vR2t{WknSGa9!Q_PL2@VUBBTY2zRBfnRcXAKR@8
z;Okm~^_oLVV$o#xycL5{f6__u@q&r-ai21h2cnJJ?ZiFrKmUe~#X_!_jCVWgX3k^}
z1fI7BWgW{FL_c{vm8pih-B^NQn<lJVvn8T|35pwLbO4<K(QMrkozn5FFT{;Rk4EUH
zfW(8?=OOvAN8-yIioICX+n38YQ>WwMlfIeL3tKG~eGv=tO-?%|^hr>=%C=T4p><L%
zzM&WgQmJ^hW=NgN(cgw+(R3ViN8p||1}|rLT;dz3*4m{iue}~09$)RwZshc5k<_pC
zJqFK}m(Kx!_Z8?~dP(F%+!~xbKKr?Sa%%E2tPA?s^6Ot!0pzlzhF@lAtp}!@Bg?o`
zrijeBl9EU~0*xCh^41=aXP&}!fmZ`0y7MHopZV8BDFpFp;fk+dW5U}jQqO_-WPK1j
zVu}x2<++lKcb&GBg+dnH)>_e*A0cdy-lzbV8|8+aZUWfu*dg-IXAO%!A6L4&MIObH
zV^PVE+0c(KH*Ym4<a|=T>MHm+CED>k`S@eFg=9t5*~6#jMIX*HW+=C_CJYlhVHK2J
zF&QReL<553R}^ZWA~1aEG7>vjdwcA+e-4iw7;(z^o{(6_tF?E~(tZd|B7Bi^HXe0&
zR?q}Z#{+=IcbgbKIm~rx=X(6q3*w@JJ&sj(t?b1e4Us6Y;@lv2LcK3Xm!F46_zOQD
z6JaIHg*S5E8g{)IuQ6`hOqSQ>C|sA5C&jnLEiGmTn>;S>iw|@58}4C%MO?NVRfeDe
zKk+W=9L5>b!c>0es@tVnT^O^Xv5k}_uZVh?JM(rD620i+_)1%stog|OI5x?$0p!wV
zVN*|wEwOxV+wd?B$Se;1WS8YeT$1DU+u|iRP*f|7v$pD&cwt(OR4)nK;Doc~M2zAb
z0|lSU&Y51j!6rXh5o!l4Uk`9bpL-57gZm@XnLQgD(^T;0v$q$;Z9sAFLPjzCm`Y>2
zf2<L?ZOOnFrfPG?$_||8mM2R(@a3TZ2-GQCWwMr7%1k#38^WZixE<ippUaQWREJRr
zmt^`;VrQHcwb1~m4aLp5BECNGnJ51K`{Se1fVh^2wA>gLFJ3_}q%>o(i?mjDy^a5u
zjMeLi!a7IhB+Z%?;W&@s#j!uY9w8e?J=vRs3a-03voSDO-md$@1NddeXRRS_2z$fg
zrQ;$ve&cFxpq4NflDKXLBn6GiG~>t{8)wq=#HgHKCQ|{6GM&n~tk}1YV|lZG;?MCF
z0(HDc@<$8TQ|3H#Ei25qjt0yawU{;hL*VcV1dMv0p*#Vd74xOb)n-B+Fi~Y9Ah(Z-
zsIN~DGLEMgZ^`pz4mS}c_lr)nEu|%Ngj<((86Y)H3!}E|TCp0(q;EwB7KDvobLu!x
zVnEOsTyeR*^I1Efz$Q9P3i2Eq!kW;zY#vpObi~34ESE3a0!K5{hz{K;XMmPTW(Ddj
z5~tSII-l9ApL|fvmqHtH6oOJL<8c%ZOMX66bxpnoUSm1vtaC5IF10lsg_y7=&6WvR
z--EhL3p7WRaUc@5nGN;Xho<a%%iXbFzg13apA`YkzmGa&Zc?sTx*AUa{INaM1x&#W
znXVBg0-5WnR-VZ_mb`VEwaxIf4q@$)mY;dn=IAqK$k1`~JpARb18#YB*JeO3bPAB5
zjw)Fzin4sUGEuF=vD%5Y>VmF`aXE!H?vw?b+FL6fgDEPrB>VA%Ywj}XtKtWY!v0Ui
zL|~UEqXnq&D7wr>ZOso;NcI^9_bL3YG&gj1K1s-6Xi!VB(NVdq6F<Tii=?RH_iEEN
zOOUEOQSW=3>(t)xuIJzSDwSJs{!1qcss=;HR2UuW6Twm(Vfw4{u{qdNL6e!v6V7?h
zu32$7JmG=y4(VL-zx^Yo=adTUT*RMx7vNCajz4JDuG>862#%&nZcC7TUPHpa&X%j>
z)}{Zyzs|-C>%VmtZ~Ynm>@4`RbAcm%IUb)jEL;3OkRFj(O+O0RkD10BGQ3Qx$U0fH
e_%r>p^M3&>+8PROjCDi+0000<MNUMnLSTZCiEiHj

literal 0
HcmV?d00001


From 024efc19d87f2f3e9b8a71370dcca2057c97da12 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Mon, 28 Aug 2023 17:47:08 +0800
Subject: [PATCH 45/83] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=8C=BB=E7=94=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TUIKit/components/TUIChat/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TUIKit/components/TUIChat/index.js b/TUIKit/components/TUIChat/index.js
index 1de2dcb..291325f 100644
--- a/TUIKit/components/TUIChat/index.js
+++ b/TUIKit/components/TUIChat/index.js
@@ -175,7 +175,7 @@ Component({
       this.setData({
         message_rounds: message_rounds
       })
-      let total_rounds=this.data.total_rounds;
+      //let total_rounds=this.data.total_rounds;
       // if(total_rounds>=0){
       //   if(total_rounds-message_rounds<=0 && this.data.baseInfo.inquiry_status==4){
       //     wx.showToast({

From 139701fd68604ba91a7a11691b5c4242adbf744d Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Tue, 29 Aug 2023 08:44:43 +0800
Subject: [PATCH 46/83] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=BC=80=E5=A4=84?=
 =?UTF-8?q?=E6=96=B9=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TUIKit/components/TUIChat/components/MessageInput/index.wxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxml b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
index 979e3a0..daaad41 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
@@ -1,7 +1,7 @@
 <view class="TUI-message-input-container">
     <view class="TUI-commom-function">
         <view class="TUI-commom-function-item" data-key="10" bindtap="handleCommonFunctions">查看完整病历</view>
-        <view class="TUI-commom-function-item" data-key="11" bindtap="handleCommonFunctions" wx:if="{{baseInfo.multi_point_status == 1 && baseInfo.inquiry_status!=4}}">在线开处方</view>
+        <view class="TUI-commom-function-item" data-key="11" bindtap="handleCommonFunctions" wx:if="{{baseInfo.multi_point_status == 1 && baseInfo.inquiry_status==4}}">在线开处方</view>
     </view>
     <view class="TUI-message-input">
         <image class="TUI-icon" bindtap="switchAudio" wx:if="{{has_audio}}"

From 6531a7a4756189ac89545374b268f38abba7d5bc Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Tue, 29 Aug 2023 09:36:00 +0800
Subject: [PATCH 47/83] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/case/index.wxss          | 1 +
 TUIKit/components/TUIChat/index.wxml | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Pages/yishi/case/index.wxss b/Pages/yishi/case/index.wxss
index 3754649..992f24c 100644
--- a/Pages/yishi/case/index.wxss
+++ b/Pages/yishi/case/index.wxss
@@ -32,6 +32,7 @@ page{
 .info{
   background: #FAFAFA;
   border-radius: 10rpx;
+  padding-top: 10rpx;
   display: flex;
   flex-wrap: wrap;
   margin: 20rpx 0 0;
diff --git a/TUIKit/components/TUIChat/index.wxml b/TUIKit/components/TUIChat/index.wxml
index 047ce8d..f29e289 100644
--- a/TUIKit/components/TUIChat/index.wxml
+++ b/TUIKit/components/TUIChat/index.wxml
@@ -37,7 +37,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 {{baseInfo.inquiry_status==4?'- 197rpx':'- 97px'}} - 100rpx - {{navbar_height}}px);"><!-- 100vh -input-area高度 - info高度 -navbar高度  -->
     <!-- <view wx:if="{{showTips}}" class="safetytips-box"> -->
     <!-- <view class="safetytips">
       <text>【安全提示】本 APP 仅用于体验腾讯云即时通信 IM 产品功能，不可用于业务洽谈与拓展。请勿轻信汇款、中奖等涉及钱款等信息，勿轻易拨打陌生电话，谨防上当受骗。</text>
@@ -56,7 +56,8 @@
   </view>
   <!-- wx:if="{{baseInfo.inquiry_status==4}}" -->
   <view class="input-area" style="{{input_area_style}}" >
-    <view class="message-input" style="{{viewData.style}}" wx:if="{{showChat}}">
+    <!-- wx:if="{{showChat}}" -->
+    <view class="message-input" style="{{viewData.style}}" >
       <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:refreshMessageStatus="refreshMessageStatus" 
       bind:inputBindLinechange="inputBindLinechange" 

From ac0b6aa204efa0959b36aba3eeff2e9096ba19a6 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Tue, 29 Aug 2023 09:41:42 +0800
Subject: [PATCH 48/83] console

---
 Pages/yishi/wenzhen_v2/wenzhen.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index 3432a8e..cad0aa1 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -176,8 +176,11 @@ Page({
     // console.log("getConversationListgetConversationListgetConversationList");
     app.imInit().then(res => {
       // console.log("wenzhen onload imInit: ", res);
+    
       wx.$TUIKit.getConversationList().then((imResponse) => {
         // console.log("imResponse.data.conversationList from wenzhen_v2: ", imResponse.data.conversationList);
+        console.log("监听会话接口列表")
+        console.log(imResponse.data.conversationList)
         this.setData({
           conversationList: imResponse.data.conversationList,
         });

From 26486d9d6db15d49c1d92df0971d08aecbeb63b0 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Tue, 29 Aug 2023 09:46:49 +0800
Subject: [PATCH 49/83] =?UTF-8?q?=E6=B7=BB=E5=8A=A0wx:key=3D"order=5Finqui?=
 =?UTF-8?q?ry=5Fid"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/wenzhen_v2/wenzhen.wxml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml
index 9c20c00..2f062ca 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxml
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml
@@ -173,7 +173,7 @@
          /> -->
 
          <!-- aa -->
-         <view class="content" wx:for="{{ data_list_1 }}">
+         <view class="content" wx:for="{{ data_list_1 }}" wx:key="order_inquiry_id">
           <view class="content_1">
             <view class="name">
               <text style="font-size: 34rpx;color: #333;">就诊人：</text>
@@ -219,7 +219,7 @@
           wx:for="{{ data_list_2 }}"
          /> -->
 
-         <view class="content" wx:for="{{ data_list_2 }}">
+         <view class="content" wx:for="{{ data_list_2 }}" wx:key="order_inquiry_id">
           <view class="content_1">
             <view class="name">
               <text style="font-size: 34rpx;color: #333;">就诊人：</text>
@@ -263,7 +263,7 @@
           wx:for="{{ data_list_3 }}"
          /> -->
 
-         <view class="content" wx:for="{{ data_list_3 }}">
+         <view class="content" wx:for="{{ data_list_3 }}" wx:key="order_inquiry_id">
           <view class="content_1">
             <view class="name">
               <text style="font-size: 34rpx;color: #333;">就诊人：</text>
@@ -307,7 +307,7 @@
           wx:for="{{ data_list_4 }}"
          /> -->
 
-         <view class="content" wx:for="{{ data_list_4 }}">
+         <view class="content" wx:for="{{ data_list_4 }}" wx:key="order_inquiry_id">
           <view class="content_1">
             <view class="name">
               <text style="font-size: 34rpx;color: #333;">就诊人：</text>
@@ -351,7 +351,7 @@
           wx:for="{{ data_list_2 }}"
          /> -->
 
-         <view class="content" wx:for="{{ data_list_5 }}">
+         <view class="content" wx:for="{{ data_list_5 }}" wx:key="order_inquiry_id">
           <view class="content_1">
             <view class="name">
               <text style="font-size: 34rpx;color: #333;">就诊人：</text>
@@ -379,7 +379,7 @@
         </view>  
       </van-tab>
       <van-tab title="问诊结束" name="6" wx:if="{{data_list_6.length > 0}}">
-         <view class="content" wx:for="{{ data_list_6 }}" bindtap="goChat" data-from_account="{{item.from_account}}" data-inquiry_type="{{item.inquiry_type}}" data-order_inquiry_id="{{item.order_inquiry_id}}" data-url="/Pages/yishi/chat/index">
+         <view class="content" wx:for="{{ data_list_6 }}" wx:key="order_inquiry_id" bindtap="goChat" data-from_account="{{item.from_account}}" data-inquiry_type="{{item.inquiry_type}}" data-order_inquiry_id="{{item.order_inquiry_id}}" data-url="/Pages/yishi/chat/index">
           <view class="content_1" >
             <view class="name">
               <text style="font-size: 34rpx;color: #333;">就诊人：</text>

From d34a4c5b3353f187b409f9c3e95cee4e6fc695f8 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Tue, 29 Aug 2023 14:31:02 +0800
Subject: [PATCH 50/83] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E5=91=8Abug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/case/index.js                           | 13 ++++++++++---
 Pages/yishi/service_notice/index.wxml               |  2 +-
 Pages/yishi/wenzhen_v2/wenzhen.js                   | 11 ++++++++---
 .../MessageElements/CustomMessage/index.js          | 12 ++++++++++--
 TUIKit/components/TUIChat/index.wxml                |  5 +++--
 5 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/Pages/yishi/case/index.js b/Pages/yishi/case/index.js
index 7453198..05f5261 100644
--- a/Pages/yishi/case/index.js
+++ b/Pages/yishi/case/index.js
@@ -1,4 +1,5 @@
 import { API } from './../../../utils/network/api'
+import debounce from './../../../utils/debounce'
 let api = new API()
 const app = getApp()
 Page({
@@ -19,7 +20,11 @@ Page({
     })
 
   },
-  goReport(event){
+  goReport:debounce(function(event){
+    wx.showLoading({
+      mask:true,
+      title: '正在打开文件...',
+    })
     const url=event.currentTarget.dataset.url;
     const randfile = new Date().getTime() + '检测报告';
     const newPath = `${wx.env.USER_DATA_PATH}/${randfile}`;
@@ -34,9 +39,11 @@ Page({
           showMenu:true,
           filePath: newPath,
           success: function (res) {
-            console.log('打开文档成功')
+            console.log('打开文档成功');
+            wx.hideLoading()
           },
           fail:function(error){
+            wx.hideLoading()
             wx.showToast({
               title:res,
               icon:"none"
@@ -52,7 +59,7 @@ Page({
       }
      
     })
-  },
+  }),
   formatImgList(){
     let diagnose_images = this.data.case_detail.diagnose_images?this.data.case_detail.diagnose_images:[];
     let img_list = [];
diff --git a/Pages/yishi/service_notice/index.wxml b/Pages/yishi/service_notice/index.wxml
index 9c93255..de4389e 100644
--- a/Pages/yishi/service_notice/index.wxml
+++ b/Pages/yishi/service_notice/index.wxml
@@ -21,7 +21,7 @@
         </view>
         <view class="item_img" wx:if="{{item.inquiry_type == 5}}">
           <text style="margin-left: 10rpx;">糖组检测</text> 
-          <van-image class="van_img" src="../../../static/images/yishi/tabbar_icon/check_sugar.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
+          <van-image class="van_img" src="{{static_host}}/applet/doctor/static/images/yishi/service_notice/check_sugar.png" fit="heightFix" height="54rpx" aria-label="qrcode" />
         </view>
         <view class="item_date">{{item.notice_send_time}}</view>
       </view>
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index cad0aa1..6dbefb8 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -95,7 +95,7 @@ Page({
     // console.log("app.globalData.unreadnnum_inter: ", app.globalData.unreadnnum_inter);
   },
   onShow: function () {
-    // console.log("onShow from wenzhen V2")
+    //console.log("onShow from wenzhen V2")
     if(this.data.hasOnShow){
       wx.stopPullDownRefresh()
       return;
@@ -120,12 +120,16 @@ Page({
 
 
     if(wx.$TUIKit){
-      wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
+      console.log("1111");
+     
       wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady);
       wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady, this);
+      wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
     }else{
+      console.log("222")
       app.imInit().then(res => {
         // console.log("wenzhen onload imInit");
+        wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady, this);
         wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
       });
     }
@@ -170,7 +174,8 @@ Page({
     })
   },
   onSDKReady(){
-    console.log("onSDKReady from wenzhen")
+    console.log("onSDKReady from wenzhen");
+    this.getConversationList();
   },
   getConversationList(){
     // console.log("getConversationListgetConversationListgetConversationList");
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
index 294bb38..862f845 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
@@ -1,5 +1,6 @@
 import formateTime from '../../../../../utils/formate-time';
 import constant from '../../../../../utils/constant';
+import debounce from '../../../../../../utils/debounce';
 const app = getApp()
 // eslint-disable-next-line no-undef
 Component({
@@ -189,6 +190,7 @@ Component({
           const renderDom = [{
             type: 'sugar_check',
             title:customMessage.title,
+            detection_link:data.detection_link,
             disease_class_names:data.disease_class_names
           }];
           return renderDom;
@@ -253,7 +255,11 @@ Component({
       } catch (error) {
       }
     },
-    goReport(event){
+    goReport:debounce(function(event){
+      wx.showLoading({
+        mask:true,
+        title: '正在打开文件...'
+      })
       const url=event.currentTarget.dataset.url;
     const randfile = new Date().getTime() + '检测报告';
     const newPath = `${wx.env.USER_DATA_PATH}/${randfile}`;
@@ -268,9 +274,11 @@ Component({
           showMenu:true,
           filePath: newPath,
           success: function (res) {
+            wx.hideLoading();
             console.log('打开文档成功')
           },
           fail:function(error){
+            wx.hideLoading();
             wx.showToast({
               title:res,
               icon:"none"
@@ -286,7 +294,7 @@ Component({
       }
      
     })
-    },
+    }),
    goSick(event){
     const url=event.currentTarget.dataset.url;
     console.log(url);
diff --git a/TUIKit/components/TUIChat/index.wxml b/TUIKit/components/TUIChat/index.wxml
index f29e289..09fdfdd 100644
--- a/TUIKit/components/TUIChat/index.wxml
+++ b/TUIKit/components/TUIChat/index.wxml
@@ -37,7 +37,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':'- 97px'}} - 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 {{baseInfo.inquiry_status==4?'- 197rpx':'- 196rpx'}} - 100rpx - {{navbar_height}}px);"><!-- 100vh -input-area高度 - info高度 -navbar高度  -->
     <!-- <view wx:if="{{showTips}}" class="safetytips-box"> -->
     <!-- <view class="safetytips">
       <text>【安全提示】本 APP 仅用于体验腾讯云即时通信 IM 产品功能，不可用于业务洽谈与拓展。请勿轻信汇款、中奖等涉及钱款等信息，勿轻易拨打陌生电话，谨防上当受骗。</text>
@@ -64,7 +64,8 @@
       bind:handleCall="handleCall" message_rounds="{{message_rounds}}"></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}}">
+  <!-- wx:if="{{baseInfo.inquiry_status==4}}" -->
+  <view style="height: 40px;position: fixed;bottom: 0;width: 100%;background-color: #fff;z-index: 1;" >
     
   </view>
 </view>

From b76f5354e180e10947b1dea36317d31904234d8f Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Wed, 30 Aug 2023 08:56:34 +0800
Subject: [PATCH 51/83] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/wenzhen_v2/wenzhen.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index 6dbefb8..4fd3d53 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -303,6 +303,7 @@ Page({
   formatStatus(){
     let order_inquiry_id_list = [];
     order_inquiry_id_list.push("");//初始化一个，防止失败
+    console.log(this.data.conversationList.length)
     this.data.conversationList.forEach(item => {
       let conversationID = item.conversationID;
       console.warn("conversationID: ", conversationID)

From f6663d275c20c64acf3bce420ab2aae15f95024d Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Wed, 30 Aug 2023 14:27:05 +0800
Subject: [PATCH 52/83] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=93=E6=9D=9F?=
 =?UTF-8?q?=E9=97=AE=E8=AF=8A=E8=AF=B7=E6=B1=82=EF=BC=8C=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/medince_list/index.js   | 12 ++++++++++--
 Pages/yishi/medince_list/index.wxml |  5 +++--
 Pages/yishi/medince_list/index.wxss |  7 ++++++-
 Pages/yishi/wenzhen_v2/wenzhen.js   | 14 ++++++++++++--
 Pages/yishi/wenzhen_v2/wenzhen.wxml |  1 +
 custom-tab-bar/index.wxml           |  2 +-
 6 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/Pages/yishi/medince_list/index.js b/Pages/yishi/medince_list/index.js
index b3c975b..93b04c2 100644
--- a/Pages/yishi/medince_list/index.js
+++ b/Pages/yishi/medince_list/index.js
@@ -14,6 +14,7 @@ Page({
       title: '药品清单', //导航栏 中间的标题
     },
     page:1,
+    isLoding:false,
     list:[],
     isLock:false,
     per_page:10,
@@ -62,13 +63,20 @@ Page({
    * 生命周期函数--监听页面加载
    */
   handleGetList(){
-    const {page,per_page,keyword}=this.data;
+    const {page,per_page,keyword,isLoding}=this.data;
+    if(isLoding)return false;
+    this.setData({
+      isLoding:true
+    })
     api.getMedinceList({
       page,
       per_page,
       keyword,
 
     }).then(data=>{
+      this.setData({
+        isLoding:false
+      })
       let result=data.data.data;
       if(result.length==0){
          this.setData({
@@ -89,7 +97,7 @@ Page({
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady() {
-
+  
   },
 
   /**
diff --git a/Pages/yishi/medince_list/index.wxml b/Pages/yishi/medince_list/index.wxml
index 3e27bea..20ca023 100644
--- a/Pages/yishi/medince_list/index.wxml
+++ b/Pages/yishi/medince_list/index.wxml
@@ -1,5 +1,6 @@
 <!--Pages/yishi/medince_list/index.wxml-->
-<te-nav-bar navbar-data='{{navbarData}}'></te-nav-bar>
+<view class="page">
+  <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container">
   <view class="searchCon">
     <view class="searchbox">
@@ -32,4 +33,4 @@
   </scroll-view>
   <van-empty description="暂无数据" wx:if="{{list.length == 0}}" />
  
-</view>
\ No newline at end of file
+</view></view>
\ No newline at end of file
diff --git a/Pages/yishi/medince_list/index.wxss b/Pages/yishi/medince_list/index.wxss
index baefab1..2721dde 100644
--- a/Pages/yishi/medince_list/index.wxss
+++ b/Pages/yishi/medince_list/index.wxss
@@ -2,9 +2,14 @@
 page{
   height:100vh;
   background-color: #F6F6F6;
+}
+.page{
+  height:100vh;
+  display: flex;
+  flex-direction: column;
 }
  .container{
-  height:calc(100vh - 135rpx);
+  /* height:calc(100vh - 135rpx); */
   display: flex; 
   overflow: hidden;
    /* overflow-y: scroll; */
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index 4fd3d53..8f52fe4 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -565,11 +565,21 @@ Page({
       show: false
     })
   },
+  onTabClick(e){
+    if(e.detail.name==6){
+      this.setData({
+        current_page:0,
+        data_list_6:[]
+      })
+      this.getDoctorInquiryFinishMessage();
+    }
+  },
   vanTabsChange(e){
-    // // console.log(e)
+    //console.log(e)
     this.setData({
       now_message_inquiry_type: e.detail.name
-    })
+    });
+   
   },
   onPullDownRefresh(){
     // console.log("用户下拉动作")
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml
index 2f062ca..e3661c5 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxml
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml
@@ -153,6 +153,7 @@
     border="{{true}}"
     id="tabs"
     bind:change="vanTabsChange"
+    bind:click="onTabClick"
     wx:if="{{ has_data }}" 
     >
       <van-tab title="在线问诊" dot="{{dot_1}}" name="1" wx:if="{{data_list_1.length > 0}}">
diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml
index 912d2da..e5d1f3f 100644
--- a/custom-tab-bar/index.wxml
+++ b/custom-tab-bar/index.wxml
@@ -1,6 +1,6 @@
 
 <van-tabbar active="{{ active }}" bind:change="onChange" z-index="9999"
-active-color="#3CC7C0" inactive-color="#999999" wx:if="{{usertype != 3}}" >
+active-color="#3CC7C0" inactive-color="#999999" wx:if="{{usertype != 3}}">
 
   <van-tabbar-item info="{{index_info}}" data-url="{{listAll.list2[0].pagePath}}" url="{{listAll.list2[0].pagePath}}">
     <image

From a938838bcdefb54de7da1d98e3f2d67b8e03228a Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Wed, 30 Aug 2023 15:37:50 +0800
Subject: [PATCH 53/83] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=81=8A=E5=A4=A9?=
 =?UTF-8?q?=E9=A1=B5=E9=87=8C=E7=9A=84=E8=AE=A2=E5=8D=95=E6=8E=A5=E5=8D=95?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=E5=88=97=E8=A1=A8=E9=87=8C=EF=BC=8C=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TUIChat/components/MessageList/index.js   | 22 +++++++++++++++++++
 TUIKit/components/TUIChat/index.wxml          |  6 ++---
 TUIKit/components/TUIChat/index.wxss          |  6 +++--
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index da76b75..f104ea5 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -372,9 +372,31 @@ Component({
 
       return show_avatar;
     },
+    //获取问诊订单状态
+    getInquiryMessageBasic(order_inquiry_id) {
+      // console.log("order_inquiry_id: ", this.data.order_inquiry_id);
+      api.getInquiryMessageBasic({order_inquiry_id:order_inquiry_id}).then(response => {
+        let result=response.data;
+        if(result.inquiry_status==3){
+          wx.redirectTo({
+            url: '/Pages/yishi/wenzhen_v2/wenzhen',
+          })
+        }
+      }).then(res => {
+
+      }).catch(errors => {console.error(errors);})
+    },
     // 历史消息渲染
     $handleMessageRender(messageList, currentMessageList) {
+      //console.log("order_inquiry_id:"+this.data.order_inquiry_id)
       console.log(messageList);
+      if(messageList.length>0){
+        let last_cloudCustomData=messageList[messageList.length-1].cloudCustomData;
+        if(last_cloudCustomData){
+          let cloudCustomData=JSON.parse(last_cloudCustomData);
+          this.getInquiryMessageBasic(cloudCustomData.order_inquiry_id)
+        }
+      }
       // console.log("handleMessageRenderhandleMessageRenderhandleMessageRender");
       // this.showHistoryMessageTime(currentMessageList);
       if (messageList.length > 0) {
diff --git a/TUIKit/components/TUIChat/index.wxml b/TUIKit/components/TUIChat/index.wxml
index 09fdfdd..d5f904b 100644
--- a/TUIKit/components/TUIChat/index.wxml
+++ b/TUIKit/components/TUIChat/index.wxml
@@ -11,10 +11,9 @@
      
         问诊中｜<text wx:if="{{rest_time==-1}}" class="time_desc">不限时间</text>
         <view wx:else="{{rest_time!=-1}}" class="time_desc">
-          <text>剩余</text>
+          <text class="time_desc">剩余</text>
           <van-count-down class="control-count-down" use-slot time="{{rest_time}}" bind:change="onChangeTime" format="HH:mm:ss">
-              
-                <text class="item" hidden="{{timeData.hours== 0 && timeData.days==0}}">{{(timeData.days*24)+timeData.hours }}小时</text>
+                <text class="item" wx:if="{{timeData.hours!= 0 && timeData.days!=0}}">{{(timeData.days*24)+timeData.hours }}小时</text>
                 <text class="item" wx:if="{{timeData.hours==0}}">{{timeData.minutes }}分</text>
                 <text class="item" wx:if="{{timeData.hours==0}}">{{ timeData.seconds }}秒</text>
               </van-count-down>
@@ -47,6 +46,7 @@
     <scroll-view  class="message-list" bindtap="triggerClose">
     <MessageList 
     bind:getInquiryMessageBasic="getInquiryMessageBasic" 
+   
     bind:refreshMessageRounds="refreshMessageRounds" 
     id="MessageList" conversation="{{conversation}}" unreadCount="{{unreadCount}}" bind:changeMemberCount="changeMemberCount" bind:resendMessage="resendMessage" bind:typing="typing" order_inquiry_id="{{order_inquiry_id}}"></MessageList>
   </scroll-view>
diff --git a/TUIKit/components/TUIChat/index.wxss b/TUIKit/components/TUIChat/index.wxss
index a7665af..271b13d 100644
--- a/TUIKit/components/TUIChat/index.wxss
+++ b/TUIKit/components/TUIChat/index.wxss
@@ -155,13 +155,15 @@
  color:#E34D59;
  display: flex;
  font-size: 32rpx;
+ white-space: nowrap;
  align-items: center;
 }
 
 .time_desc .item{
   color:#E34D59;
- 
-  display: flex;
+
+  display:inline-flex;
+  white-space: nowrap;
   align-items: center;
   font-size: 32rpx;
 }

From 2d170eaa284ef09055aeed62df22dd246e806aa7 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Thu, 31 Aug 2023 14:45:15 +0800
Subject: [PATCH 54/83] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E7=BA=A2=E7=82=B9=E4=B8=BA=E6=B6=88=E9=99=A4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/service_notice/index.js   | 12 +++++++++---
 Pages/yishi/service_notice/index.wxml |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Pages/yishi/service_notice/index.js b/Pages/yishi/service_notice/index.js
index 71696a1..5389a28 100644
--- a/Pages/yishi/service_notice/index.js
+++ b/Pages/yishi/service_notice/index.js
@@ -78,16 +78,22 @@ Page({
       })
     }).catch(errors => {console.error(errors);})
   },
-  putMessageReadNotice(notice_id){
+  putMessageReadNotice(notice_id,index){
     api.putMessageReadNotice({notice_id: notice_id}).then(response => {
+      if(response.code==200){
+        let currentItem=`list[${index}].read_status`
+        this.setData({
+          [currentItem]:1
+        })
+      }
       console.log(response);
       
     }).catch(errors => {console.error(errors);})
   },
   go(e){
     let item = e.currentTarget.dataset.item;
-    this.putMessageReadNotice(item.notice_id);
-    console.log(item);
+    let index=e.currentTarget.dataset.index;
+    this.putMessageReadNotice(item.notice_id,index);
     let link_type = item.link_type;
     link_type = Number(link_type);
     // 跳转页面类型（1:聊天详情页 2:问诊结束列表页 3:问诊消息列表页 4:我的名片 5:我的简介 6:我的账户 7:我的福利 8:药品订单详情页 9:物流详情 10:问诊订单详情 11:联系客服 12:协议详情 13:处方详情）
diff --git a/Pages/yishi/service_notice/index.wxml b/Pages/yishi/service_notice/index.wxml
index de4389e..a367fc9 100644
--- a/Pages/yishi/service_notice/index.wxml
+++ b/Pages/yishi/service_notice/index.wxml
@@ -1,7 +1,7 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container">
   <view class="list">
-    <view class="item" wx:for="{{list}}" bindtap="go" data-item="{{item}}">
+    <view class="item" wx:for="{{list}}" bindtap="go" data-index="{{index}}"  data-item="{{item}}" >
       <view class="item_top">
         <view class="item_img" wx:if="{{item.inquiry_type == 1}}">
           <text style="margin-left: 10rpx;">在线问诊</text> 

From 95d15479dc6ccdc54c4dd04e14c7aab8c8420f29 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Thu, 31 Aug 2023 15:32:18 +0800
Subject: [PATCH 55/83] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/chufangsetup/index.js     |  1 +
 Pages/yishi/chufangsetup/index.wxml   | 48 ++++++++++++++++++++++++++-
 Pages/yishi/chufangsetup/index.wxss   |  5 +--
 Pages/yishi/wenzhenorderV2/index.wxml |  2 +-
 4 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/Pages/yishi/chufangsetup/index.js b/Pages/yishi/chufangsetup/index.js
index e474089..10fcb32 100644
--- a/Pages/yishi/chufangsetup/index.js
+++ b/Pages/yishi/chufangsetup/index.js
@@ -14,6 +14,7 @@ Page({
     },
     prescription_status: 0,
     chufang_list_0: [],
+    chufang_list_1: [],
     chufang_list_2: [],
     current_page: 0,
     total: 0,
diff --git a/Pages/yishi/chufangsetup/index.wxml b/Pages/yishi/chufangsetup/index.wxml
index f9ce70f..26a3001 100644
--- a/Pages/yishi/chufangsetup/index.wxml
+++ b/Pages/yishi/chufangsetup/index.wxml
@@ -8,6 +8,7 @@
       bind:scroll="onStickyScroll"
       t-class="custom-tabs"
     >
+     
       <t-tab-panel label="审核中" value="0" style="overflow: scroll;">
         <view class="item_list" style="overflow: scroll;">
           <view class="item" wx:for="{{chufang_list_0}}">
@@ -53,7 +54,52 @@
           <van-empty description="暂无数据" wx:if="{{chufang_list_0.length == 0}}" />
         </view>
       </t-tab-panel>
-
+       <!-- 审核通过面板 -->
+       <t-tab-panel label="审核通过" value="1" style="overflow: scroll;">
+        <view class="item_list" style="overflow: scroll;">
+          <view class="item" wx:for="{{chufang_list_1}}">
+          
+            <!-- 头部 -->
+            <view class="item_top">
+              <view class="item_top_name">{{item.patient_name}}</view>
+              <view class="item_top_sex">{{item.patient_sex==1?'男':'女'}} | {{item.patient_age}}岁</view>
+              <view class="item_top_status_box">
+                <!-- 药师审核状态（0:审核中 1:审核成功 2:审核驳回） -->
+                <view class="item_top_status">
+                {{item.pharmacist_audit_status==0?'审核中':item.pharmacist_audit_status==1?'审核成功':'审核驳回'}}
+                </view>
+              </view>
+            </view>
+            <!-- 中间内容部分 -->
+            <view class="item_content">
+              <view class="item_content_li">
+                <view class="item_content_li_title">开方时间：</view>
+                <view class="item_content_li_txt">{{item.created_at}}</view>
+              </view>
+              <view class="item_content_li">
+                <view class="item_content_li_title">病情描述：</view>
+                <view class="item_content_li_txt">{{item.disease_desc}}</view>
+              </view>
+              <view class="item_content_li">
+                <view class="item_content_li_title">确诊日期：</view>
+                <view class="item_content_li_txt">{{item.diagnosis_date}}</view>
+              </view>
+              <view class="item_content_li">
+                <view class="item_content_li_title">病情诊断：</view>
+                <view class="item_content_li_txt">
+                  <text wx:for="{{item.order_prescription_icd}}" wx:for-item="icd">{{icd.icd_name}};</text>
+                </view>
+              </view>
+            </view>
+            <!-- 底部按钮 -->
+            <view class="item_bottom" bindtap="gochat" data-order_inquiry_id="{{item.order_inquiry_id}}">
+              <view class="item_bottom_btn">问诊记录</view>
+            </view>
+          </view>
+          
+          <van-empty description="暂无数据" wx:if="{{chufang_list_1.length == 0}}" />
+        </view>
+      </t-tab-panel>
       <!-- 驳回面板 -->
       <t-tab-panel label="驳回" value="2" style="overflow: scroll;">
         <view class="item_list" style="overflow: scroll;">
diff --git a/Pages/yishi/chufangsetup/index.wxss b/Pages/yishi/chufangsetup/index.wxss
index 7dd3d59..fc8f212 100644
--- a/Pages/yishi/chufangsetup/index.wxss
+++ b/Pages/yishi/chufangsetup/index.wxss
@@ -42,16 +42,17 @@ page{
   transform: scaleY(0.5);
 }
 .item_top_name{
-  flex: 1;
+ 
   color: #3CC7C0;
   font-size: 34rpx;
 }
 .item_top_sex{
-  flex: 1;
+ 
   font-size: 34rpx;
   color: #666;
 }
 .item_top_status_box{
+ 
 }
 .item_top_status{
   padding: 10rpx;
diff --git a/Pages/yishi/wenzhenorderV2/index.wxml b/Pages/yishi/wenzhenorderV2/index.wxml
index c6ae831..36d44e5 100644
--- a/Pages/yishi/wenzhenorderV2/index.wxml
+++ b/Pages/yishi/wenzhenorderV2/index.wxml
@@ -5,7 +5,7 @@
         <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_type==2?'快速问诊':item.inquiry_type==3?'公益问诊':item.inquiry_type==4?'问诊购药':'未知'}}</view>
+            <view class="order_item_content_top">{{item.inquiry_type==1?'专家问诊':item.inquiry_type==2?'快速问诊':item.inquiry_type==3?'公益问诊':item.inquiry_type==4?'问诊购药':item.inquiry_type==5?'糖组检测':'未知'}}</view>
             <view class="order_item_content_data">
               <view class="order_id">订单编号：<text style="font-size: 30rpx;color: #666666;">{{item.inquiry_no	}}</text></view>
               <view class="order_id">就诊患者：<text style="font-size: 30rpx;color: #666666;">{{item.patient_name}}（{{item.patient_sex==1?'男':'女'}}，{{item.patient_age}}岁）</text></view>

From c5cf4c67ebffa0d54dd313edb5ef5da7c7704cd2 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Thu, 31 Aug 2023 17:44:01 +0800
Subject: [PATCH 56/83] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=B7=E5=BC=8F,?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E7=BB=93=E6=9D=9F=E9=97=AE=E8=AF=8A=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/chufangsetup/index.js             | 24 ++++++++++++++++---
 Pages/yishi/chufangsetup/index.wxml           | 22 ++++++++++-------
 Pages/yishi/chufangsetup/index.wxss           |  7 +++++-
 .../TUIChat/components/MessageList/index.js   | 14 +++++------
 TUIKit/components/TUIChat/index.wxml          |  5 ++--
 utils/network/api.js                          | 10 ++++++++
 6 files changed, 61 insertions(+), 21 deletions(-)

diff --git a/Pages/yishi/chufangsetup/index.js b/Pages/yishi/chufangsetup/index.js
index 10fcb32..e38c4cf 100644
--- a/Pages/yishi/chufangsetup/index.js
+++ b/Pages/yishi/chufangsetup/index.js
@@ -84,9 +84,27 @@ Page({
     console.log(url);
     app.go(url);
   },
+  handlegetLastInquiry(patient_id,doctor_id,order_inquiry_id){
+    api. getLastInquiry({
+      patient_id:patient_id,
+      doctor_id:doctor_id
+    }).then(data=>{
+      let result=data.data;
+      let url='';
+      if(result.data){
+        url = "/Pages/yishi/chat/index?order_inquiry_id="+result.data;
+      }else{
+        url = "/Pages/yishi/chat/index?order_inquiry_id="+order_inquiry_id;
+       
+      }
+      app.go(url);
+      console.log(result);
+
+    })
+  },
   gochat(e){
-    let order_inquiry_id = e.currentTarget.dataset.order_inquiry_id;
-    let url = "/Pages/yishi/chat/index?order_inquiry_id="+order_inquiry_id;
-    app.go(url);
+    let {order_inquiry_id,patient_id,doctor_id} = e.currentTarget.dataset;
+     this.handlegetLastInquiry(patient_id,doctor_id,order_inquiry_id);
+   
   }
 })
\ No newline at end of file
diff --git a/Pages/yishi/chufangsetup/index.wxml b/Pages/yishi/chufangsetup/index.wxml
index 26a3001..6155939 100644
--- a/Pages/yishi/chufangsetup/index.wxml
+++ b/Pages/yishi/chufangsetup/index.wxml
@@ -15,8 +15,10 @@
           
             <!-- 头部 -->
             <view class="item_top">
+              <view class="namebox">
               <view class="item_top_name">{{item.patient_name}}</view>
               <view class="item_top_sex">{{item.patient_sex==1?'男':'女'}} | {{item.patient_age}}岁</view>
+             </view>
               <view class="item_top_status_box">
                 <!-- 药师审核状态（0:审核中 1:审核成功 2:审核驳回） -->
                 <view class="item_top_status">
@@ -34,9 +36,9 @@
                 <view class="item_content_li_title">病情描述：</view>
                 <view class="item_content_li_txt">{{item.disease_desc}}</view>
               </view>
-              <view class="item_content_li">
+              <view class="item_content_li" wx:if="{{item.diagnosis_date}}">
                 <view class="item_content_li_title">确诊日期：</view>
-                <view class="item_content_li_txt">{{item.diagnosis_date}}</view>
+                <view class="item_content_li_txt" >{{item.diagnosis_date}}</view>
               </view>
               <view class="item_content_li">
                 <view class="item_content_li_title">病情诊断：</view>
@@ -46,8 +48,8 @@
               </view>
             </view>
             <!-- 底部按钮 -->
-            <view class="item_bottom" bindtap="gochat" data-order_inquiry_id="{{item.order_inquiry_id}}">
-              <view class="item_bottom_btn">问诊记录</view>
+            <view class="item_bottom" bindtap="gochat" data-order_inquiry_id="{{item.order_inquiry_id}}" data-doctor_id="{{item.doctor_id}}"  data-patient_id="{{item.patient_id}}">
+              <view class="item_bottom_btn" >问诊记录</view>
             </view>
           </view>
           
@@ -61,8 +63,10 @@
           
             <!-- 头部 -->
             <view class="item_top">
+              <view class="namebox">
               <view class="item_top_name">{{item.patient_name}}</view>
               <view class="item_top_sex">{{item.patient_sex==1?'男':'女'}} | {{item.patient_age}}岁</view>
+             </view>
               <view class="item_top_status_box">
                 <!-- 药师审核状态（0:审核中 1:审核成功 2:审核驳回） -->
                 <view class="item_top_status">
@@ -80,7 +84,7 @@
                 <view class="item_content_li_title">病情描述：</view>
                 <view class="item_content_li_txt">{{item.disease_desc}}</view>
               </view>
-              <view class="item_content_li">
+              <view class="item_content_li" wx:if="{{item.diagnosis_date}}">
                 <view class="item_content_li_title">确诊日期：</view>
                 <view class="item_content_li_txt">{{item.diagnosis_date}}</view>
               </view>
@@ -92,7 +96,7 @@
               </view>
             </view>
             <!-- 底部按钮 -->
-            <view class="item_bottom" bindtap="gochat" data-order_inquiry_id="{{item.order_inquiry_id}}">
+            <view class="item_bottom" bindtap="gochat" data-order_inquiry_id="{{item.order_inquiry_id}}" data-doctor_id="{{item.doctor_id}}"  data-patient_id="{{item.patient_id}}">
               <view class="item_bottom_btn">问诊记录</view>
             </view>
           </view>
@@ -107,8 +111,10 @@
           <view class="item" wx:for="{{chufang_list_2}}">
             <!-- 头部 -->
             <view class="item_top">
+             <view class="namebox">
               <view class="item_top_name">{{item.patient_name}}</view>
               <view class="item_top_sex">{{item.patient_sex==1?'男':'女'}} | {{item.patient_age}}岁</view>
+             </view>
               <view class="item_top_status_box">
                 <!-- 药师审核状态（0:审核中 1:审核成功 2:审核驳回） -->
                 <view class="item_top_status item_top_status_no">
@@ -126,7 +132,7 @@
                 <view class="item_content_li_title">病情描述：</view>
                 <view class="item_content_li_txt">{{item.disease_desc}}</view>
               </view>
-              <view class="item_content_li">
+              <view class="item_content_li" wx:if="{{item.diagnosis_date}}">
                 <view class="item_content_li_title">确诊日期：</view>
                 <view class="item_content_li_txt">{{item.diagnosis_date}}</view>
               </view>
@@ -141,7 +147,7 @@
             </view>
             <!-- 底部按钮 -->
             <view class="item_bottom">
-              <view class="item_bottom_btn" bindtap="gochat" data-order_inquiry_id="{{item.order_inquiry_id}}">问诊记录</view>
+              <view class="item_bottom_btn" bindtap="gochat" data-order_inquiry_id="{{item.order_inquiry_id}}" data-doctor_id="{{item.doctor_id}}"  data-patient_id="{{item.patient_id}}">问诊记录</view>
               <view class="item_bottom_btn item_bottom_btn_repeat" bindtap="go" data-url="/Pages/yishi/onlinechufang/index?order_inquiry_id={{item.order_inquiry_id}}&order_prescription_id={{item.order_prescription_id}}">
                   重开处方
               </view>
diff --git a/Pages/yishi/chufangsetup/index.wxss b/Pages/yishi/chufangsetup/index.wxss
index fc8f212..4038cff 100644
--- a/Pages/yishi/chufangsetup/index.wxss
+++ b/Pages/yishi/chufangsetup/index.wxss
@@ -23,10 +23,14 @@ page{
   background-color: #fff;
   margin: 20rpx 0;
 }
+.namebox{
+  display: flex;
+}
 .item_top{
   position: relative;
   height: 100rpx;
   display: flex;
+  justify-content:space-between;
   align-items: center;
   padding: 0 32rpx;
 }
@@ -47,7 +51,7 @@ page{
   font-size: 34rpx;
 }
 .item_top_sex{
- 
+ margin-left: 30rpx;
   font-size: 34rpx;
   color: #666;
 }
@@ -79,6 +83,7 @@ page{
 .item_content_li_txt{
   margin-left: 10rpx;
   flex: 1;
+  word-break: break-all;
   color: #666666;
   font-size: 28rpx;
 }
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index f104ea5..5b04e38 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -390,13 +390,13 @@ Component({
     $handleMessageRender(messageList, currentMessageList) {
       //console.log("order_inquiry_id:"+this.data.order_inquiry_id)
       console.log(messageList);
-      if(messageList.length>0){
-        let last_cloudCustomData=messageList[messageList.length-1].cloudCustomData;
-        if(last_cloudCustomData){
-          let cloudCustomData=JSON.parse(last_cloudCustomData);
-          this.getInquiryMessageBasic(cloudCustomData.order_inquiry_id)
-        }
-      }
+      // if(messageList.length>0){
+      //   let last_cloudCustomData=messageList[messageList.length-1].cloudCustomData;
+      //   if(last_cloudCustomData){
+      //     let cloudCustomData=JSON.parse(last_cloudCustomData);
+      //     this.getInquiryMessageBasic(cloudCustomData.order_inquiry_id)
+      //   }
+      // }
       // console.log("handleMessageRenderhandleMessageRenderhandleMessageRender");
       // this.showHistoryMessageTime(currentMessageList);
       if (messageList.length > 0) {
diff --git a/TUIKit/components/TUIChat/index.wxml b/TUIKit/components/TUIChat/index.wxml
index d5f904b..241a7d6 100644
--- a/TUIKit/components/TUIChat/index.wxml
+++ b/TUIKit/components/TUIChat/index.wxml
@@ -12,8 +12,9 @@
         问诊中｜<text wx:if="{{rest_time==-1}}" class="time_desc">不限时间</text>
         <view wx:else="{{rest_time!=-1}}" class="time_desc">
           <text class="time_desc">剩余</text>
+        
           <van-count-down class="control-count-down" use-slot time="{{rest_time}}" bind:change="onChangeTime" format="HH:mm:ss">
-                <text class="item" wx:if="{{timeData.hours!= 0 && timeData.days!=0}}">{{(timeData.days*24)+timeData.hours }}小时</text>
+                <text class="item" wx:if="{{timeData.hours!= 0 || timeData.days!=0}}">{{(timeData.days*24)+timeData.hours }}小时</text>
                 <text class="item" wx:if="{{timeData.hours==0}}">{{timeData.minutes }}分</text>
                 <text class="item" wx:if="{{timeData.hours==0}}">{{ timeData.seconds }}秒</text>
               </van-count-down>
@@ -46,7 +47,7 @@
     <scroll-view  class="message-list" bindtap="triggerClose">
     <MessageList 
     bind:getInquiryMessageBasic="getInquiryMessageBasic" 
-   
+    bind:freshInfo="freshInfo"
     bind:refreshMessageRounds="refreshMessageRounds" 
     id="MessageList" conversation="{{conversation}}" unreadCount="{{unreadCount}}" bind:changeMemberCount="changeMemberCount" bind:resendMessage="resendMessage" bind:typing="typing" order_inquiry_id="{{order_inquiry_id}}"></MessageList>
   </scroll-view>
diff --git a/utils/network/api.js b/utils/network/api.js
index cbc8a7f..a1988a1 100644
--- a/utils/network/api.js
+++ b/utils/network/api.js
@@ -808,6 +808,16 @@ class API extends HTTP {
     }
   })
 }
+//获取患者最后一条问诊订单id
+getLastInquiry(params) {
+  return this.request({
+    url: `${this.baseUrl}/inquiry/last`,
+    method: 'GET',
+    data: {
+      ...params
+    }
+  })
+}
 
 
 

From 68d817d1351f1abf631585f79af1160cdf3c23d2 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 1 Sep 2023 13:46:37 +0800
Subject: [PATCH 57/83] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=81=8A=E5=A4=A9?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=9D=A5=E6=BA=90=EF=BC=8C=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E5=B8=A6=E6=8E=A5=E8=AF=8A=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/chat/index.js                     |   3 +
 Pages/yishi/chat/index.wxml                   |   2 +-
 Pages/yishi/chufangsetup/index.js             |  20 +-
 Pages/yishi/my/index.js                       |   2 +-
 Pages/yishi/my/index.wxml                     |   2 +-
 Pages/yishi/my/index.wxss                     |   7 +-
 Pages/yishi/wenzhen_v2/wenzhen.js             |  21 +-
 Pages/yishi/wenzhen_v2/wenzhen.wxml           |   6 +-
 .../TUIChat/components/MessageInput/index.js  |  75 +-
 TUIKit/components/TUIChat/index.js            |   9 +
 TUIKit/components/TUIChat/index.wxml          |   2 +-
 TUIKit/utils/runtime.js                       | 717 ++++++++++++++++++
 project.config.json                           |   2 +-
 13 files changed, 833 insertions(+), 35 deletions(-)
 create mode 100644 TUIKit/utils/runtime.js

diff --git a/Pages/yishi/chat/index.js b/Pages/yishi/chat/index.js
index ff4240e..fa2efc9 100644
--- a/Pages/yishi/chat/index.js
+++ b/Pages/yishi/chat/index.js
@@ -6,13 +6,16 @@ Page({
     title: '',
     height: app.globalData.height,
     order_inquiry_id: "",
+    from:'',
     baseInfo: {}
   },
   onLoad(option) {
     // console.log("chat onload", option);
     let order_inquiry_id = option.order_inquiry_id;
+    let from=option.from;
     this.setData({
       order_inquiry_id: order_inquiry_id,
+      from:from?from:''
     })
     this.getInquiryMessageBasic();
   },
diff --git a/Pages/yishi/chat/index.wxml b/Pages/yishi/chat/index.wxml
index d2bcb23..c7f201e 100644
--- a/Pages/yishi/chat/index.wxml
+++ b/Pages/yishi/chat/index.wxml
@@ -1,5 +1,5 @@
 <!-- 一对一聊天  不带会话列表 -->
 <view>
     <TUIChat id="TUIChat" currentConversationID="C2C{{baseInfo.patient_user_id}}" inquiry_type="{{baseInfo.inquiry_type}}" order_inquiry_id="{{order_inquiry_id}}" baseInfo="{{baseInfo}}"
-    hasCallKit="{{ true }}" bind:handleCall="handleCall"></TUIChat>
+    hasCallKit="{{ true }}" from="{{from}}" bind:handleCall="handleCall"></TUIChat>
 </view>
diff --git a/Pages/yishi/chufangsetup/index.js b/Pages/yishi/chufangsetup/index.js
index e38c4cf..a63df51 100644
--- a/Pages/yishi/chufangsetup/index.js
+++ b/Pages/yishi/chufangsetup/index.js
@@ -26,9 +26,9 @@ Page({
     this.getList();
   },
   onTabsChange(e) {
-    console.log(e);
+   // console.log(e);
     let list_name = "chufang_list_" + e.detail.value;
-    console.log(list_name)
+    //console.log(list_name)
     this.setData({
       prescription_status: e.detail.value,
       current_page: 0,
@@ -64,10 +64,10 @@ Page({
     params.pharmacist_audit_status = this.data.prescription_status;//处方审核状态（0:审核中 2:审核驳回）
     params.page = this.data.current_page + 1;
     api.getDoctorPrescription(params).then(response => {
-      console.log(response);
+      //console.log(response);
       if(response.data.total > 0){
         let list_name = "chufang_list_" + this.data.prescription_status;
-        console.log(list_name);
+        //console.log(list_name);
         let apprise_list = this.data[list_name];
         this.setData({
           [list_name]: apprise_list.concat(response.data.data),
@@ -81,25 +81,23 @@ Page({
   },
   go(e){
     let url = e.currentTarget.dataset.url;
-    console.log(url);
+    //console.log(url);
     app.go(url);
   },
   handlegetLastInquiry(patient_id,doctor_id,order_inquiry_id){
-    api. getLastInquiry({
+    api.getLastInquiry({
       patient_id:patient_id,
       doctor_id:doctor_id
     }).then(data=>{
       let result=data.data;
       let url='';
-      if(result.data){
-        url = "/Pages/yishi/chat/index?order_inquiry_id="+result.data;
+      if(result){
+        url = "/Pages/yishi/chat/index?order_inquiry_id="+result+"&from=prescription";
       }else{
-        url = "/Pages/yishi/chat/index?order_inquiry_id="+order_inquiry_id;
+        url = "/Pages/yishi/chat/index?order_inquiry_id="+order_inquiry_id+"&from=prescription";
        
       }
       app.go(url);
-      console.log(result);
-
     })
   },
   gochat(e){
diff --git a/Pages/yishi/my/index.js b/Pages/yishi/my/index.js
index e3558fd..312aa72 100644
--- a/Pages/yishi/my/index.js
+++ b/Pages/yishi/my/index.js
@@ -41,7 +41,7 @@ Page({
     });
   },
   onLoad(){
-    console.log("onLoad ");
+    //console.log("onLoad ");
   },
   onShow: function () {
     // console.log("onshow ");
diff --git a/Pages/yishi/my/index.wxml b/Pages/yishi/my/index.wxml
index 9132616..2e0a600 100644
--- a/Pages/yishi/my/index.wxml
+++ b/Pages/yishi/my/index.wxml
@@ -41,7 +41,7 @@
       </view>
       <view class="account_top_right">
         <navigator url="/Pages/yishi/cash/index" open-type="navigate" hover-class="other-navigator-hover">
-          <van-button custom-style="text-indent: 20rpx;letter-spacing: 20rpx;text-align: center;height:70rpx;border-radius: 40rpx;padding: 0rpx 44rpx;" color="linear-gradient(310deg, #FF931A 0%, #FF931A 0%, #FCB75D 100%);font-size: 32rpx;">
+          <van-button custom-style="text-indent: 20rpx;letter-spacing: 20rpx;text-align: center;height:70rpx;border-radius: 40rpx;padding: 0rpx 44rpx;" color="linear-gradient(310deg, #FF931A 0%, #FF931A 0%, #FCB75D 100%);font-size: 32rpx;margin-bottom:20rpx">
             提现
           </van-button>
         </navigator>
diff --git a/Pages/yishi/my/index.wxss b/Pages/yishi/my/index.wxss
index 32bb99e..656ac6f 100644
--- a/Pages/yishi/my/index.wxss
+++ b/Pages/yishi/my/index.wxss
@@ -99,11 +99,13 @@ page{
 .account_top{
   flex: 2;
   display: flex;
+  align-items: stretch;
 }
 .account_top_left{
   flex: 3;
   display: flex;
   flex-direction: column;
+  justify-content: space-between;
   color: black;
   margin-left: 20rpx;
 }
@@ -116,17 +118,18 @@ color: rgba(0,0,0,0.65);
   align-items: center;
 }
 .account_num{
- margin-top: 10rpx;
+ margin-bottom: 10rpx;
   font-weight: bold;
   display: flex;
   align-items: center;
 }
 .account_top_right{
+  
   flex: 2;
   display: flex;
   justify-content: center;
   align-items:flex-end;
-  margin-bottom: 20rpx;
+ 
 }
 .account_bottom{
   flex: 1;
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index 8f52fe4..819a833 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -41,8 +41,6 @@ Page({
     dot_5: false,
   },
   onLoad() {
-    console.log("wenzhen onloadddd");
-
     // if(wx.$TUIKit){
     //   wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
     // }else{
@@ -120,13 +118,10 @@ Page({
 
 
     if(wx.$TUIKit){
-      console.log("1111");
-     
       wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady);
       wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady, this);
       wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
     }else{
-      console.log("222")
       app.imInit().then(res => {
         // console.log("wenzhen onload imInit");
         wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady, this);
@@ -174,7 +169,7 @@ Page({
     })
   },
   onSDKReady(){
-    console.log("onSDKReady from wenzhen");
+    //console.log("onSDKReady from wenzhen");
     this.getConversationList();
   },
   getConversationList(){
@@ -184,7 +179,7 @@ Page({
     
       wx.$TUIKit.getConversationList().then((imResponse) => {
         // console.log("imResponse.data.conversationList from wenzhen_v2: ", imResponse.data.conversationList);
-        console.log("监听会话接口列表")
+        //console.log("监听会话接口列表")
         console.log(imResponse.data.conversationList)
         this.setData({
           conversationList: imResponse.data.conversationList,
@@ -513,8 +508,18 @@ Page({
 
     let from_account = e.currentTarget.dataset.from_account;
     let order_inquiry_id = e.currentTarget.dataset.order_inquiry_id;
+    let from= e.currentTarget.dataset.from;
     let inquiry_type = e.currentTarget.dataset.inquiry_type;
-    let url = e.currentTarget.dataset.url+"?from_account="+from_account+"&order_inquiry_id="+order_inquiry_id+"&inquiry_type="+inquiry_type;
+    let url='';
+
+    //from=end代表从问诊接触过来，from=prescription 代表从处方管理进来
+    //主要处理有新的问诊还停留在老的聊天问诊里的bug。
+    if(from){
+       url = e.currentTarget.dataset.url+"?from_account="+from_account+"&order_inquiry_id="+order_inquiry_id+"&inquiry_type="+inquiry_type+"&from="+from;
+    }else{
+       url = e.currentTarget.dataset.url+"?from_account="+from_account+"&order_inquiry_id="+order_inquiry_id+"&inquiry_type="+inquiry_type;
+    }
+  
     app.go(url);
   },
   postDoctorInquiry(e){
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml
index e3661c5..8797461 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxml
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml
@@ -195,7 +195,7 @@
               custom-style="padding:0 35rpx; height:67rpx; border-radius: 10rpx;margin-left:20rpx;" color="#3CC7C0">去接诊</van-button>
             </view>
             <view class="btn" wx:if="{{ item.inquiry_status >= 4 }}">
-              <van-button bind:click="goChat" data-from_account="{{item.from_account}}" data-inquiry_type="{{item.inquiry_type}}" data-order_inquiry_id="{{item.order_inquiry_id}}" data-url="/Pages/yishi/chat/index" plain custom-style="padding:0 35rpx; height:67rpx;  border-radius: 10rpx;" color="#3CC7C0">问诊详情</van-button>
+              <van-button bind:click="goChat" data-from_account="{{item.from_account}}" data-inquiry_type="{{item.inquiry_type}}" data-order_inquiry_id="{{item.order_inquiry_id}}"  data-url="/Pages/yishi/chat/index" plain custom-style="padding:0 35rpx; height:67rpx;  border-radius: 10rpx;" color="#3CC7C0">问诊详情</van-button>
               <!-- <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>
@@ -380,7 +380,9 @@
         </view>  
       </van-tab>
       <van-tab title="问诊结束" name="6" wx:if="{{data_list_6.length > 0}}">
-         <view class="content" wx:for="{{ data_list_6 }}" wx:key="order_inquiry_id" bindtap="goChat" data-from_account="{{item.from_account}}" data-inquiry_type="{{item.inquiry_type}}" data-order_inquiry_id="{{item.order_inquiry_id}}" data-url="/Pages/yishi/chat/index">
+         <view class="content" wx:for="{{ data_list_6 }}" wx:key="order_inquiry_id" bindtap="goChat" data-from_account="{{item.from_account}}" data-inquiry_type="{{item.inquiry_type}}" data-order_inquiry_id="{{item.order_inquiry_id}}" 
+         data-from="end"
+         data-url="/Pages/yishi/chat/index">
           <view class="content_1" >
             <view class="name">
               <text style="font-size: 34rpx;color: #333;">就诊人：</text>
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js
index 7502196..33f23b6 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.js
@@ -2,7 +2,6 @@ import logger from '../../../../utils/logger';
 import constant from '../../../../utils/constant';
 import { API } from '../../../../../utils/network/api';
 import { requestSubscribeMessage } from '../../../../../utils/requestSubscribeUtil';
-
 const api = new API()
 let app = getApp()
 // eslint-disable-next-line no-undef
@@ -24,6 +23,15 @@ Component({
       type: String,
       value: {},
     },
+    from:{
+      type: String,
+      value: '',
+      observer(from) {
+        this.setData({
+          from: from,
+        });
+      }
+    },
     inquiry_type: {
       type: String,
       value: {},
@@ -358,9 +366,10 @@ Component({
     },
 
     // 发送图片消息
-    handleSendImageMessage(file) {
+    async handleSendImageMessage(file) {
 
       let networkstatus = this.data.networkstatus
+      let {from}=this.data;
       // console.log("networkstatus: ", networkstatus)
       if(networkstatus === 'none'){
         wx.showToast({
@@ -369,7 +378,9 @@ Component({
         })
         return
       }
-      
+      if(from){
+        await this.handlegetLastInquiry();
+      }
       let _this = this;
       let conversationID = this.data.conversation.conversationID
       let promise = wx.$TUIKit.getConversationProfile(conversationID);
@@ -431,6 +442,7 @@ Component({
         this.$sendTIMMessage(message);
       })
     },
+   
 
     // 发送视频消息
     handleSendVideoMessage(file) {
@@ -525,6 +537,53 @@ Component({
       this.setData({
         dialog_visible: false
       })
+    },
+      //获取问诊订单状态
+    async getInquiryMessageBasic(order_inquiry_id) {
+        // console.log("order_inquiry_id: ", this.data.order_inquiry_id);
+      await api.getInquiryMessageBasic({order_inquiry_id:order_inquiry_id}).then(response => {
+          let result=response.data;
+          console.log(result.inquiry_status)
+          if(result.inquiry_status==3){
+            wx.showToast({
+              title: '暂时不能发送消息',
+            });
+            return false;
+          }
+        }).then(res => {
+  
+        }).catch(errors => {console.error(errors);})
+      },
+    //获取最新问诊id;
+    async handlegetLastInquiry(){
+    let {baseInfo,order_inquiry_id}=this.data;
+    const {data} =await api.getLastInquiry({
+        patient_id:baseInfo.patient_id,
+        doctor_id:baseInfo.doctor_id
+      })
+      if(data){
+           if(data!=order_inquiry_id){
+            const result=await api.getInquiryMessageBasic({order_inquiry_id:data});
+            if(result.data.inquiry_status==3){
+              wx.showToast({
+                title: '暂时不能发送消息',
+              });
+              return false;
+            }
+            //this.getInquiryMessageBasic(data);
+          }
+      }
+      // .then(data=>{
+       
+      //   let result=data.data;
+      //   console.log(result,order_inquiry_id)
+      //   if(result){
+      //     if(result!=order_inquiry_id){
+      //       this.getInquiryMessageBasic(result);
+      //     }
+      //   }
+    
+      // })
     },
     confirmDialog(){
       // app.go("/Pages/yishi/zhiye_identity/index")
@@ -679,9 +738,9 @@ Component({
       });
     },
 
-    sendTextMessage(msg, flag) {
-
+   async sendTextMessage(msg, flag) {
       let networkstatus = this.data.networkstatus
+      let {from}=this.data;
       // console.log("networkstatus: ", networkstatus)
       if(networkstatus === 'none'){
         wx.showToast({
@@ -690,7 +749,9 @@ Component({
         })
         return
       }
-
+      if(from){
+        await this.handlegetLastInquiry();  
+      };
       wx.aegis.reportEvent({
         name: 'messageType',
         ext1: 'messageType-text',
@@ -748,7 +809,7 @@ Component({
           message_rounds: message_rounds,
           patient_family_data: patient_family_data
         });
-
+        
         // console.log("mycloudCustomData: ", mycloudCustomData);
         // console.log("text: ", text);
         const message = wx.$TUIKit.createTextMessage({
diff --git a/TUIKit/components/TUIChat/index.js b/TUIKit/components/TUIChat/index.js
index 291325f..5b1ad44 100644
--- a/TUIKit/components/TUIChat/index.js
+++ b/TUIKit/components/TUIChat/index.js
@@ -40,6 +40,15 @@ Component({
       type: String,
       value: ''
     },
+    from:{
+      type: String,
+      value: '',
+      observer(from) {
+        this.setData({
+          from: from,
+        });
+      },
+    },
     inquiry_type: {
       type: String,
       value: ''
diff --git a/TUIKit/components/TUIChat/index.wxml b/TUIKit/components/TUIChat/index.wxml
index 241a7d6..86b13ce 100644
--- a/TUIKit/components/TUIChat/index.wxml
+++ b/TUIKit/components/TUIChat/index.wxml
@@ -59,7 +59,7 @@
   <view class="input-area" style="{{input_area_style}}" >
     <!-- wx:if="{{showChat}}" -->
     <view class="message-input" style="{{viewData.style}}" >
-      <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" 
+      <MessageInput bind:myhandleExtensions="myhandleExtensions" id="MessageInput" inquiry_type="{{inquiry_type}}" baseInfo="{{baseInfo}}" order_inquiry_id="{{order_inquiry_id}}" conversation="{{conversation}}" from="{{from}}" hasCallKit="{{hasCallKit}}" bind:sendMessage="sendMessage" bind:downKeysBoards="downKeysBoards" bind:pullKeysBoards="pullKeysBoards" bind:showMessageErrorImage="showMessageErrorImage" 
       bind:refreshMessageStatus="refreshMessageStatus" 
       bind:inputBindLinechange="inputBindLinechange" 
       bind:handleCall="handleCall" message_rounds="{{message_rounds}}"></MessageInput>
diff --git a/TUIKit/utils/runtime.js b/TUIKit/utils/runtime.js
new file mode 100644
index 0000000..e444703
--- /dev/null
+++ b/TUIKit/utils/runtime.js
@@ -0,0 +1,717 @@
+/**
+ * 编程小石头
+ * wechat：2501902696
+ */
+
+!(function (global) {
+  // "use strict";
+
+  var Op = Object.prototype;
+  var hasOwn = Op.hasOwnProperty;
+  var undefined; // More compressible than void 0.
+  var $Symbol = typeof Symbol === "function" ? Symbol : {};
+  var iteratorSymbol = $Symbol.iterator || "@@iterator";
+  var asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator";
+  var toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag";
+
+  var inModule = typeof module === "object";
+  var runtime = global.regeneratorRuntime;
+  if (runtime) {
+    if (inModule) {
+      // If regeneratorRuntime is defined globally and we're in a module,
+      // make the exports object identical to regeneratorRuntime.
+      module.exports = runtime;
+    }
+    // Don't bother evaluating the rest of this file if the runtime was
+    // already defined globally.
+    return;
+  }
+
+  // Define the runtime globally (as expected by generated code) as either
+  // module.exports (if we're in a module) or a new, empty object.
+  runtime = global.regeneratorRuntime = inModule ? module.exports : {};
+
+  function wrap(innerFn, outerFn, self, tryLocsList) {
+    // If outerFn provided and outerFn.prototype is a Generator, then outerFn.prototype instanceof Generator.
+    var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator;
+    var generator = Object.create(protoGenerator.prototype);
+    var context = new Context(tryLocsList || []);
+
+    // The ._invoke method unifies the implementations of the .next,
+    // .throw, and .return methods.
+    generator._invoke = makeInvokeMethod(innerFn, self, context);
+
+    return generator;
+  }
+  runtime.wrap = wrap;
+
+  // Try/catch helper to minimize deoptimizations. Returns a completion
+  // record like context.tryEntries[i].completion. This interface could
+  // have been (and was previously) designed to take a closure to be
+  // invoked without arguments, but in all the cases we care about we
+  // already have an existing method we want to call, so there's no need
+  // to create a new function object. We can even get away with assuming
+  // the method takes exactly one argument, since that happens to be true
+  // in every case, so we don't have to touch the arguments object. The
+  // only additional allocation required is the completion record, which
+  // has a stable shape and so hopefully should be cheap to allocate.
+  function tryCatch(fn, obj, arg) {
+    try {
+      return { type: "normal", arg: fn.call(obj, arg) };
+    } catch (err) {
+      return { type: "throw", arg: err };
+    }
+  }
+
+  var GenStateSuspendedStart = "suspendedStart";
+  var GenStateSuspendedYield = "suspendedYield";
+  var GenStateExecuting = "executing";
+  var GenStateCompleted = "completed";
+
+  // Returning this object from the innerFn has the same effect as
+  // breaking out of the dispatch switch statement.
+  var ContinueSentinel = {};
+
+  // Dummy constructor functions that we use as the .constructor and
+  // .constructor.prototype properties for functions that return Generator
+  // objects. For full spec compliance, you may wish to configure your
+  // minifier not to mangle the names of these two functions.
+  function Generator() { }
+  function GeneratorFunction() { }
+  function GeneratorFunctionPrototype() { }
+
+  // This is a polyfill for %IteratorPrototype% for environments that
+  // don't natively support it.
+  var IteratorPrototype = {};
+  IteratorPrototype[iteratorSymbol] = function () {
+    return this;
+  };
+
+  var getProto = Object.getPrototypeOf;
+  var NativeIteratorPrototype = getProto && getProto(getProto(values([])));
+  if (NativeIteratorPrototype &&
+    NativeIteratorPrototype !== Op &&
+    hasOwn.call(NativeIteratorPrototype, iteratorSymbol)) {
+    // This environment has a native %IteratorPrototype%; use it instead
+    // of the polyfill.
+    IteratorPrototype = NativeIteratorPrototype;
+  }
+
+  var Gp = GeneratorFunctionPrototype.prototype =
+    Generator.prototype = Object.create(IteratorPrototype);
+  GeneratorFunction.prototype = Gp.constructor = GeneratorFunctionPrototype;
+  GeneratorFunctionPrototype.constructor = GeneratorFunction;
+  GeneratorFunctionPrototype[toStringTagSymbol] =
+    GeneratorFunction.displayName = "GeneratorFunction";
+
+  // Helper for defining the .next, .throw, and .return methods of the
+  // Iterator interface in terms of a single ._invoke method.
+  function defineIteratorMethods(prototype) {
+    ["next", "throw", "return"].forEach(function (method) {
+      prototype[method] = function (arg) {
+        return this._invoke(method, arg);
+      };
+    });
+  }
+
+  runtime.isGeneratorFunction = function (genFun) {
+    var ctor = typeof genFun === "function" && genFun.constructor;
+    return ctor
+      ? ctor === GeneratorFunction ||
+      // For the native GeneratorFunction constructor, the best we can
+      // do is to check its .name property.
+      (ctor.displayName || ctor.name) === "GeneratorFunction"
+      : false;
+  };
+
+  runtime.mark = function (genFun) {
+    if (Object.setPrototypeOf) {
+      Object.setPrototypeOf(genFun, GeneratorFunctionPrototype);
+    } else {
+      genFun.__proto__ = GeneratorFunctionPrototype;
+      if (!(toStringTagSymbol in genFun)) {
+        genFun[toStringTagSymbol] = "GeneratorFunction";
+      }
+    }
+    genFun.prototype = Object.create(Gp);
+    return genFun;
+  };
+
+  // Within the body of any async function, `await x` is transformed to
+  // `yield regeneratorRuntime.awrap(x)`, so that the runtime can test
+  // `hasOwn.call(value, "__await")` to determine if the yielded value is
+  // meant to be awaited.
+  runtime.awrap = function (arg) {
+    return { __await: arg };
+  };
+
+  function AsyncIterator(generator) {
+    function invoke(method, arg, resolve, reject) {
+      var record = tryCatch(generator[method], generator, arg);
+      if (record.type === "throw") {
+        reject(record.arg);
+      } else {
+        var result = record.arg;
+        var value = result.value;
+        if (value &&
+          typeof value === "object" &&
+          hasOwn.call(value, "__await")) {
+          return Promise.resolve(value.__await).then(function (value) {
+            invoke("next", value, resolve, reject);
+          }, function (err) {
+            invoke("throw", err, resolve, reject);
+          });
+        }
+
+        return Promise.resolve(value).then(function (unwrapped) {
+          // When a yielded Promise is resolved, its final value becomes
+          // the .value of the Promise<{value,done}> result for the
+          // current iteration.
+          result.value = unwrapped;
+          resolve(result);
+        }, function (error) {
+          // If a rejected Promise was yielded, throw the rejection back
+          // into the async generator function so it can be handled there.
+          return invoke("throw", error, resolve, reject);
+        });
+      }
+    }
+
+    var previousPromise;
+
+    function enqueue(method, arg) {
+      function callInvokeWithMethodAndArg() {
+        return new Promise(function (resolve, reject) {
+          invoke(method, arg, resolve, reject);
+        });
+      }
+
+      return previousPromise =
+        // If enqueue has been called before, then we want to wait until
+        // all previous Promises have been resolved before calling invoke,
+        // so that results are always delivered in the correct order. If
+        // enqueue has not been called before, then it is important to
+        // call invoke immediately, without waiting on a callback to fire,
+        // so that the async generator function has the opportunity to do
+        // any necessary setup in a predictable way. This predictability
+        // is why the Promise constructor synchronously invokes its
+        // executor callback, and why async functions synchronously
+        // execute code before the first await. Since we implement simple
+        // async functions in terms of async generators, it is especially
+        // important to get this right, even though it requires care.
+        previousPromise ? previousPromise.then(
+          callInvokeWithMethodAndArg,
+          // Avoid propagating failures to Promises returned by later
+          // invocations of the iterator.
+          callInvokeWithMethodAndArg
+        ) : callInvokeWithMethodAndArg();
+    }
+
+    // Define the unified helper method that is used to implement .next,
+    // .throw, and .return (see defineIteratorMethods).
+    this._invoke = enqueue;
+  }
+
+  defineIteratorMethods(AsyncIterator.prototype);
+  AsyncIterator.prototype[asyncIteratorSymbol] = function () {
+    return this;
+  };
+  runtime.AsyncIterator = AsyncIterator;
+
+  // Note that simple async functions are implemented on top of
+  // AsyncIterator objects; they just return a Promise for the value of
+  // the final result produced by the iterator.
+  runtime.async = function (innerFn, outerFn, self, tryLocsList) {
+    var iter = new AsyncIterator(
+      wrap(innerFn, outerFn, self, tryLocsList)
+    );
+
+    return runtime.isGeneratorFunction(outerFn)
+      ? iter // If outerFn is a generator, return the full iterator.
+      : iter.next().then(function (result) {
+        return result.done ? result.value : iter.next();
+      });
+  };
+
+  function makeInvokeMethod(innerFn, self, context) {
+    var state = GenStateSuspendedStart;
+
+    return function invoke(method, arg) {
+      if (state === GenStateExecuting) {
+        throw new Error("Generator is already running");
+      }
+
+      if (state === GenStateCompleted) {
+        if (method === "throw") {
+          throw arg;
+        }
+
+        // Be forgiving, per 25.3.3.3.3 of the spec:
+        // https://people.mozilla.org/~jorendorff/es6-draft.html#sec-generatorresume
+        return doneResult();
+      }
+
+      context.method = method;
+      context.arg = arg;
+
+      while (true) {
+        var delegate = context.delegate;
+        if (delegate) {
+          var delegateResult = maybeInvokeDelegate(delegate, context);
+          if (delegateResult) {
+            if (delegateResult === ContinueSentinel) continue;
+            return delegateResult;
+          }
+        }
+
+        if (context.method === "next") {
+          // Setting context._sent for legacy support of Babel's
+          // function.sent implementation.
+          context.sent = context._sent = context.arg;
+
+        } else if (context.method === "throw") {
+          if (state === GenStateSuspendedStart) {
+            state = GenStateCompleted;
+            throw context.arg;
+          }
+
+          context.dispatchException(context.arg);
+
+        } else if (context.method === "return") {
+          context.abrupt("return", context.arg);
+        }
+
+        state = GenStateExecuting;
+
+        var record = tryCatch(innerFn, self, context);
+        if (record.type === "normal") {
+          // If an exception is thrown from innerFn, we leave state ===
+          // GenStateExecuting and loop back for another invocation.
+          state = context.done
+            ? GenStateCompleted
+            : GenStateSuspendedYield;
+
+          if (record.arg === ContinueSentinel) {
+            continue;
+          }
+
+          return {
+            value: record.arg,
+            done: context.done
+          };
+
+        } else if (record.type === "throw") {
+          state = GenStateCompleted;
+          // Dispatch the exception by looping back around to the
+          // context.dispatchException(context.arg) call above.
+          context.method = "throw";
+          context.arg = record.arg;
+        }
+      }
+    };
+  }
+
+  // Call delegate.iterator[context.method](context.arg) and handle the
+  // result, either by returning a { value, done } result from the
+  // delegate iterator, or by modifying context.method and context.arg,
+  // setting context.delegate to null, and returning the ContinueSentinel.
+  function maybeInvokeDelegate(delegate, context) {
+    var method = delegate.iterator[context.method];
+    if (method === undefined) {
+      // A .throw or .return when the delegate iterator has no .throw
+      // method always terminates the yield* loop.
+      context.delegate = null;
+
+      if (context.method === "throw") {
+        if (delegate.iterator.return) {
+          // If the delegate iterator has a return method, give it a
+          // chance to clean up.
+          context.method = "return";
+          context.arg = undefined;
+          maybeInvokeDelegate(delegate, context);
+
+          if (context.method === "throw") {
+            // If maybeInvokeDelegate(context) changed context.method from
+            // "return" to "throw", let that override the TypeError below.
+            return ContinueSentinel;
+          }
+        }
+
+        context.method = "throw";
+        context.arg = new TypeError(
+          "The iterator does not provide a 'throw' method");
+      }
+
+      return ContinueSentinel;
+    }
+
+    var record = tryCatch(method, delegate.iterator, context.arg);
+
+    if (record.type === "throw") {
+      context.method = "throw";
+      context.arg = record.arg;
+      context.delegate = null;
+      return ContinueSentinel;
+    }
+
+    var info = record.arg;
+
+    if (!info) {
+      context.method = "throw";
+      context.arg = new TypeError("iterator result is not an object");
+      context.delegate = null;
+      return ContinueSentinel;
+    }
+
+    if (info.done) {
+      // Assign the result of the finished delegate to the temporary
+      // variable specified by delegate.resultName (see delegateYield).
+      context[delegate.resultName] = info.value;
+
+      // Resume execution at the desired location (see delegateYield).
+      context.next = delegate.nextLoc;
+
+      // If context.method was "throw" but the delegate handled the
+      // exception, let the outer generator proceed normally. If
+      // context.method was "next", forget context.arg since it has been
+      // "consumed" by the delegate iterator. If context.method was
+      // "return", allow the original .return call to continue in the
+      // outer generator.
+      if (context.method !== "return") {
+        context.method = "next";
+        context.arg = undefined;
+      }
+
+    } else {
+      // Re-yield the result returned by the delegate method.
+      return info;
+    }
+
+    // The delegate iterator is finished, so forget it and continue with
+    // the outer generator.
+    context.delegate = null;
+    return ContinueSentinel;
+  }
+
+  // Define Generator.prototype.{next,throw,return} in terms of the
+  // unified ._invoke helper method.
+  defineIteratorMethods(Gp);
+
+  Gp[toStringTagSymbol] = "Generator";
+
+  // A Generator should always return itself as the iterator object when the
+  // @@iterator function is called on it. Some browsers' implementations of the
+  // iterator prototype chain incorrectly implement this, causing the Generator
+  // object to not be returned from this call. This ensures that doesn't happen.
+  // See https://github.com/facebook/regenerator/issues/274 for more details.
+  Gp[iteratorSymbol] = function () {
+    return this;
+  };
+
+  Gp.toString = function () {
+    return "[object Generator]";
+  };
+
+  function pushTryEntry(locs) {
+    var entry = { tryLoc: locs[0] };
+
+    if (1 in locs) {
+      entry.catchLoc = locs[1];
+    }
+
+    if (2 in locs) {
+      entry.finallyLoc = locs[2];
+      entry.afterLoc = locs[3];
+    }
+
+    this.tryEntries.push(entry);
+  }
+
+  function resetTryEntry(entry) {
+    var record = entry.completion || {};
+    record.type = "normal";
+    delete record.arg;
+    entry.completion = record;
+  }
+
+  function Context(tryLocsList) {
+    // The root entry object (effectively a try statement without a catch
+    // or a finally block) gives us a place to store values thrown from
+    // locations where there is no enclosing try statement.
+    this.tryEntries = [{ tryLoc: "root" }];
+    tryLocsList.forEach(pushTryEntry, this);
+    this.reset(true);
+  }
+
+  runtime.keys = function (object) {
+    var keys = [];
+    for (var key in object) {
+      keys.push(key);
+    }
+    keys.reverse();
+
+    // Rather than returning an object with a next method, we keep
+    // things simple and return the next function itself.
+    return function next() {
+      while (keys.length) {
+        var key = keys.pop();
+        if (key in object) {
+          next.value = key;
+          next.done = false;
+          return next;
+        }
+      }
+
+      // To avoid creating an additional object, we just hang the .value
+      // and .done properties off the next function object itself. This
+      // also ensures that the minifier will not anonymize the function.
+      next.done = true;
+      return next;
+    };
+  };
+
+  function values(iterable) {
+    if (iterable) {
+      var iteratorMethod = iterable[iteratorSymbol];
+      if (iteratorMethod) {
+        return iteratorMethod.call(iterable);
+      }
+
+      if (typeof iterable.next === "function") {
+        return iterable;
+      }
+
+      if (!isNaN(iterable.length)) {
+        var i = -1, next = function next() {
+          while (++i < iterable.length) {
+            if (hasOwn.call(iterable, i)) {
+              next.value = iterable[i];
+              next.done = false;
+              return next;
+            }
+          }
+
+          next.value = undefined;
+          next.done = true;
+
+          return next;
+        };
+
+        return next.next = next;
+      }
+    }
+
+    // Return an iterator with no values.
+    return { next: doneResult };
+  }
+  runtime.values = values;
+
+  function doneResult() {
+    return { value: undefined, done: true };
+  }
+
+  Context.prototype = {
+    constructor: Context,
+
+    reset: function (skipTempReset) {
+      this.prev = 0;
+      this.next = 0;
+      // Resetting context._sent for legacy support of Babel's
+      // function.sent implementation.
+      this.sent = this._sent = undefined;
+      this.done = false;
+      this.delegate = null;
+
+      this.method = "next";
+      this.arg = undefined;
+
+      this.tryEntries.forEach(resetTryEntry);
+
+      if (!skipTempReset) {
+        for (var name in this) {
+          // Not sure about the optimal order of these conditions:
+          if (name.charAt(0) === "t" &&
+            hasOwn.call(this, name) &&
+            !isNaN(+name.slice(1))) {
+            this[name] = undefined;
+          }
+        }
+      }
+    },
+
+    stop: function () {
+      this.done = true;
+
+      var rootEntry = this.tryEntries[0];
+      var rootRecord = rootEntry.completion;
+      if (rootRecord.type === "throw") {
+        throw rootRecord.arg;
+      }
+
+      return this.rval;
+    },
+
+    dispatchException: function (exception) {
+      if (this.done) {
+        throw exception;
+      }
+
+      var context = this;
+      function handle(loc, caught) {
+        record.type = "throw";
+        record.arg = exception;
+        context.next = loc;
+
+        if (caught) {
+          // If the dispatched exception was caught by a catch block,
+          // then let that catch block handle the exception normally.
+          context.method = "next";
+          context.arg = undefined;
+        }
+
+        return !!caught;
+      }
+
+      for (var i = this.tryEntries.length - 1; i >= 0; --i) {
+        var entry = this.tryEntries[i];
+        var record = entry.completion;
+
+        if (entry.tryLoc === "root") {
+          // Exception thrown outside of any try block that could handle
+          // it, so set the completion value of the entire function to
+          // throw the exception.
+          return handle("end");
+        }
+
+        if (entry.tryLoc <= this.prev) {
+          var hasCatch = hasOwn.call(entry, "catchLoc");
+          var hasFinally = hasOwn.call(entry, "finallyLoc");
+
+          if (hasCatch && hasFinally) {
+            if (this.prev < entry.catchLoc) {
+              return handle(entry.catchLoc, true);
+            } else if (this.prev < entry.finallyLoc) {
+              return handle(entry.finallyLoc);
+            }
+
+          } else if (hasCatch) {
+            if (this.prev < entry.catchLoc) {
+              return handle(entry.catchLoc, true);
+            }
+
+          } else if (hasFinally) {
+            if (this.prev < entry.finallyLoc) {
+              return handle(entry.finallyLoc);
+            }
+
+          } else {
+            throw new Error("try statement without catch or finally");
+          }
+        }
+      }
+    },
+
+    abrupt: function (type, arg) {
+      for (var i = this.tryEntries.length - 1; i >= 0; --i) {
+        var entry = this.tryEntries[i];
+        if (entry.tryLoc <= this.prev &&
+          hasOwn.call(entry, "finallyLoc") &&
+          this.prev < entry.finallyLoc) {
+          var finallyEntry = entry;
+          break;
+        }
+      }
+
+      if (finallyEntry &&
+        (type === "break" ||
+          type === "continue") &&
+        finallyEntry.tryLoc <= arg &&
+        arg <= finallyEntry.finallyLoc) {
+        // Ignore the finally entry if control is not jumping to a
+        // location outside the try/catch block.
+        finallyEntry = null;
+      }
+
+      var record = finallyEntry ? finallyEntry.completion : {};
+      record.type = type;
+      record.arg = arg;
+
+      if (finallyEntry) {
+        this.method = "next";
+        this.next = finallyEntry.finallyLoc;
+        return ContinueSentinel;
+      }
+
+      return this.complete(record);
+    },
+
+    complete: function (record, afterLoc) {
+      if (record.type === "throw") {
+        throw record.arg;
+      }
+
+      if (record.type === "break" ||
+        record.type === "continue") {
+        this.next = record.arg;
+      } else if (record.type === "return") {
+        this.rval = this.arg = record.arg;
+        this.method = "return";
+        this.next = "end";
+      } else if (record.type === "normal" && afterLoc) {
+        this.next = afterLoc;
+      }
+
+      return ContinueSentinel;
+    },
+
+    finish: function (finallyLoc) {
+      for (var i = this.tryEntries.length - 1; i >= 0; --i) {
+        var entry = this.tryEntries[i];
+        if (entry.finallyLoc === finallyLoc) {
+          this.complete(entry.completion, entry.afterLoc);
+          resetTryEntry(entry);
+          return ContinueSentinel;
+        }
+      }
+    },
+
+    "catch": function (tryLoc) {
+      for (var i = this.tryEntries.length - 1; i >= 0; --i) {
+        var entry = this.tryEntries[i];
+        if (entry.tryLoc === tryLoc) {
+          var record = entry.completion;
+          if (record.type === "throw") {
+            var thrown = record.arg;
+            resetTryEntry(entry);
+          }
+          return thrown;
+        }
+      }
+
+      // The context.catch method must only be called with a location
+      // argument that corresponds to a known catch block.
+      throw new Error("illegal catch attempt");
+    },
+
+    delegateYield: function (iterable, resultName, nextLoc) {
+      this.delegate = {
+        iterator: values(iterable),
+        resultName: resultName,
+        nextLoc: nextLoc
+      };
+
+      if (this.method === "next") {
+        // Deliberately forget the last sent value so that we don't
+        // accidentally pass it on to the delegate.
+        this.arg = undefined;
+      }
+
+      return ContinueSentinel;
+    }
+  };
+})(
+  // In sloppy mode, unbound `this` refers to the global object, fallback to
+  // Function constructor if we're in global strict mode. That is sadly a form
+  // of indirect eval which violates Content Security Policy.
+  (function () { return this })() || Function("return this")()
+);
diff --git a/project.config.json b/project.config.json
index 6bff22f..b54bdc4 100644
--- a/project.config.json
+++ b/project.config.json
@@ -39,7 +39,7 @@
     "disableUseStrict": false,
     "useCompilerPlugins": false,
     "minifyWXML": false,
-    "condition": false,
+    "condition": true,
     "ignoreUploadUnusedFiles": true
   },
   "condition": {},

From 0d1af8ef0e45dac21759f09f37a36b386b345ba8 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Mon, 4 Sep 2023 09:10:35 +0800
Subject: [PATCH 58/83] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/wenzhen_v2/wenzhen.js             | 23 ++++++++++++-------
 Pages/yishi/wenzhen_v2/wenzhen.wxml           |  1 +
 .../MessageElements/ImageMessage/index.json   |  6 ++++-
 .../MessageElements/ImageMessage/index.wxml   | 11 +++++++--
 .../TUIChat/components/MessageInput/index.js  |  1 +
 TUIKit/components/TUIChat/index.js            | 16 ++++++++++++-
 6 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index 819a833..2897e4a 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -169,7 +169,7 @@ Page({
     })
   },
   onSDKReady(){
-    //console.log("onSDKReady from wenzhen");
+    console.log("onSDKReady from wenzhen");
     this.getConversationList();
   },
   getConversationList(){
@@ -299,10 +299,12 @@ Page({
     let order_inquiry_id_list = [];
     order_inquiry_id_list.push("");//初始化一个，防止失败
     console.log(this.data.conversationList.length)
-    this.data.conversationList.forEach(item => {
+    let arr=this.data.conversationList.filter(item => item.conversationID != 'C2Cadministrator');
+   
+    arr.forEach(item => {
       let conversationID = item.conversationID;
       console.warn("conversationID: ", conversationID)
-      if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过
+     // if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过
       let lastMessage = item.lastMessage;
       if(!lastMessage) return;
       let cloudCustomData = lastMessage.cloudCustomData;
@@ -320,14 +322,14 @@ Page({
       let order_inquiry_id = cloudCustomDataJson.order_inquiry_id;
       order_inquiry_id_list.push(order_inquiry_id);//准备去请求后端那订单状态
     })
-    let conversationList =  this.data.conversationList;
+    let conversationList = arr; //this.data.conversationList;
     //获取医生问诊消息用户属性
     api.getDoctorInquiryMessageAttr({order_inquiry_ids: order_inquiry_id_list.join(",")}).then(response => {
       let new_conversationList = [];
       if(response.data.length > 0){
         conversationList.forEach(item => {
           let conversationID = item.conversationID;
-          if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过
+          //if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过
           let lastMessage = item.lastMessage;
           if(!lastMessage) return;
           let cloudCustomData = lastMessage.cloudCustomData;
@@ -359,7 +361,7 @@ Page({
           new_conversationList.push(item);
         })
       };
-      //console.log(new_conversationList);
+      console.log(new_conversationList);
       this.setData({
         conversationList: new_conversationList
       })
@@ -576,7 +578,8 @@ Page({
         current_page:0,
         data_list_6:[]
       })
-      this.getDoctorInquiryFinishMessage();
+      //点击请求数据为0，则重新渲染页面
+      this.getDoctorInquiryFinishMessage('end');
     }
   },
   vanTabsChange(e){
@@ -600,13 +603,14 @@ Page({
       }
     }
   },
-  getDoctorInquiryFinishMessage(){
+  getDoctorInquiryFinishMessage(from=''){
     let data_list_6= this.data.data_list_6;
     let params = {};
     params.page = this.data.current_page + 1;
     this.setData({data_list_6_loading: true})
     api.getDoctorInquiryFinishMessage(params).then(response => {
       // console.log(response);
+    
       this.setData({
         "data_list_6": data_list_6.concat(response.data.data),
         current_page: response.data.current_page,
@@ -614,6 +618,9 @@ Page({
         per_page: response.data.per_page,
         last_page: response.data.last_page
       })
+      if(from && response.data.data.length==0){
+        this.formatStatus();
+      }
       // this.selectComponent('#tabs').resize();
     }).then(res =>{
       this.setData({ data_list_6_loading: false})
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml
index 8797461..82259ab 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxml
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml
@@ -404,6 +404,7 @@
         <van-divider contentPosition="center" wx:if="{{data_list_6.length > 0 && current_page == last_page}}">到底了~</van-divider>
       </van-tab>
     </van-tabs>
+    
   </view>
   <view style="height: 200rpx;"></view>
 
diff --git a/TUIKit/components/TUIChat/components/MessageElements/ImageMessage/index.json b/TUIKit/components/TUIChat/components/MessageElements/ImageMessage/index.json
index e8cfaaf..2d67c18 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/ImageMessage/index.json
+++ b/TUIKit/components/TUIChat/components/MessageElements/ImageMessage/index.json
@@ -1,4 +1,8 @@
 {
   "component": true,
-  "usingComponents": {}
+  "usingComponents": {
+    "van-image": "@vant/weapp/image/index",
+    "van-loading": "@vant/weapp/loading/index"
+   
+  }
 }
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/components/MessageElements/ImageMessage/index.wxml b/TUIKit/components/TUIChat/components/MessageElements/ImageMessage/index.wxml
index a2e9964..7d57c93 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/ImageMessage/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageElements/ImageMessage/index.wxml
@@ -1,5 +1,12 @@
 <view class="TUI-ImageMessage" bindtap="previewImage">
-  <image class="image-message {{isMine?'my-image':''}}"  mode="aspectFill" src="{{renderDom[0].src}}" />
-  <image wx:if="{{showSave}}" class="image-message {{isMine?'my-image':''}}"  mode="aspectFill" src="{{renderDom[0].src}}" show-menu-by-longpress="{{true}}"/>
+  <!-- <image class="image-message {{isMine?'my-image':''}}"  mode="aspectFill" src="{{renderDom[0].src}}" /> -->
+
+  <!-- <image wx:if="{{showSave}}" class="image-message {{isMine?'my-image':''}}"  mode="aspectFill" src="{{renderDom[0].src}}" show-menu-by-longpress="{{true}}"/> -->
+  <van-image use-loading-slot fit="cover" class="image-message {{isMine?'my-image':''}}" width="100%" height="100" src="{{renderDom[0].src}}" radius="6px">
+    <van-loading slot="loading" type="spinner" size="20" vertical />
+  </van-image>
+  <van-image wx:if="{{showSave}}" use-loading-slot fit="cover" class="image-message {{isMine?'my-image':''}}" width="100%" height="100" src="{{renderDom[0].src}}" radius="6px" show-menu-by-longpress="{{true}}">
+    <van-loading slot="loading" type="spinner" size="20" vertical />
+  </van-image>
 </view>
 
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js
index 33f23b6..e8fb78d 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.js
@@ -152,6 +152,7 @@ Component({
         // wx.showToast({
         //   title: '网络类型：'+res.networkType,
         // })
+
         _this.setData({
           networkstatus: res.networkType
         })
diff --git a/TUIKit/components/TUIChat/index.js b/TUIKit/components/TUIChat/index.js
index 5b1ad44..5d1ac3e 100644
--- a/TUIKit/components/TUIChat/index.js
+++ b/TUIKit/components/TUIChat/index.js
@@ -124,7 +124,20 @@ Component({
         finsh_btn: false
       })
 
-      
+      wx.onNetworkStatusChange((res) => {
+        let msg = ''
+        if (!res.isConnected) {
+          msg = '当前网络不可用，请检查你的网络设置'
+        } else if (res.networkType === 'none') {
+          msg = '网络开小差了,请在网络良好后重试'
+        }
+        if (msg) {
+          wx.showToast({
+            title: msg,
+            icon: 'none',
+          })
+        }
+      })
 
     }
   },
@@ -280,6 +293,7 @@ Component({
       }).catch(errors => {
         console.error(errors);
         this.setData({
+          message_rounds:this.data.total_rounds,
           finsh_btn: false
         })
       })

From 53738fe428ab7a5f343096e2653decafffc153c5 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Tue, 5 Sep 2023 15:35:27 +0800
Subject: [PATCH 59/83] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/index/index.js   | 19 +++++++++++++++++++
 Pages/index/index.json |  3 ++-
 Pages/index/index.wxml | 17 +++++++++++++++++
 Pages/index/index.wxss | 12 ++++++++++++
 Pages/login/index.js   | 17 ++++++++++++++++-
 Pages/login/index.json |  1 +
 Pages/login/index.wxml | 19 ++++++++++++++++++-
 Pages/login/index.wxss | 13 ++++++++++++-
 8 files changed, 97 insertions(+), 4 deletions(-)

diff --git a/Pages/index/index.js b/Pages/index/index.js
index e79b0df..fe00a7c 100644
--- a/Pages/index/index.js
+++ b/Pages/index/index.js
@@ -5,8 +5,20 @@ const app = getApp()
 Page({
   data: {
     loading: true,
+    showEntryTip:false,
     static_host: api.getStaticHost()
   },
+  onConfirmEntry(){
+    wx.setStorageSync('hasEntry', true);
+  },
+  onCloseEntry(){
+    wx.setStorageSync('hasEntry', true);
+    wx.exitMiniProgram({success: (res) => {}})
+  },
+  go(e){
+    let url = e.currentTarget.dataset.url;
+    app.go(url);
+  },
   onLoad(option){
     let from = option.from;
     let usertype = wx.getStorageSync('usertype');
@@ -29,6 +41,13 @@ Page({
       })
     }
     this.setData({ loading: false });
+    let isEntry=wx.getStorageSync('hasEntry');
+    if(!isEntry){
+      this.setData({
+        showEntryTip:true
+       });
+     
+     }
   },
   
   goCheck(e){
diff --git a/Pages/index/index.json b/Pages/index/index.json
index 6ffda42..40f6b9e 100644
--- a/Pages/index/index.json
+++ b/Pages/index/index.json
@@ -1,6 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "t-image": "tdesign-miniprogram/image/image"
+    "t-image": "tdesign-miniprogram/image/image",
+    "van-dialog": "@vant/weapp/dialog/index"
   }
 }
\ No newline at end of file
diff --git a/Pages/index/index.wxml b/Pages/index/index.wxml
index 40cfe2f..e3e0d46 100644
--- a/Pages/index/index.wxml
+++ b/Pages/index/index.wxml
@@ -28,4 +28,21 @@
   </view>
   
 </view>
+<van-dialog
+  use-slot
+  title="温馨提示"
+  show="{{ showEntryTip }}"
+  show-cancel-button
+  confirm-button-text="同意并继续"
+  cancel-button-text="不同意"
+  confirm-button-color="#3CC7C0"
+  bind:confirm="onConfirmEntry"
+  bind:cancel="onCloseEntry"
+>
+<view class="entrymsg" >
+ <view> 亲爱的用户，感谢您信任并使用肝胆相照互联网医院医师端！我们依据最新法律法规的要求，制定了<text class="navigator" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=9">《隐私协议》</text>。请您仔细阅《隐私协议》，并确认了解我们对您的个人信息处理原则。</view>
+<view>如您同意《隐私协议》，请点击“同意”开始使用我们的产品和服务。</view>
+</view>
+
+</van-dialog>
 
diff --git a/Pages/index/index.wxss b/Pages/index/index.wxss
index a665326..44d680b 100644
--- a/Pages/index/index.wxss
+++ b/Pages/index/index.wxss
@@ -19,3 +19,15 @@
   display: flex;
   justify-content: center;
 }
+.entrymsg{
+  -webkit-overflow-scrolling: touch;
+    font-size: 28rpx;
+    line-height: 40rpx;
+    max-height: 60vh;
+    overflow-y: auto;
+    padding: 48rpx;
+    text-align: left;
+}
+.navigator{
+  color:#3CC7C0
+}
\ No newline at end of file
diff --git a/Pages/login/index.js b/Pages/login/index.js
index bb3c5ed..9008005 100644
--- a/Pages/login/index.js
+++ b/Pages/login/index.js
@@ -4,6 +4,7 @@ const api = new API()
 const app = getApp()
 Page({
   data: {
+    showEntryTip:false,
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '登录', //导航栏 中间的标题
@@ -17,7 +18,14 @@ Page({
       wx.navigateTo({
         url: "/Pages/index/index"
       })
-    }
+    };
+    let isEntry=wx.getStorageSync('hasEntry');
+    if(!isEntry){
+      this.setData({
+        showEntryTip:true
+       });
+     
+     }
   },
   onChange(event) {
     this.setData({
@@ -33,6 +41,13 @@ Page({
   _navback() {
     wx.navigateBack()
   },
+  onConfirmEntry(){
+    wx.setStorageSync('hasEntry', true);
+  },
+  onCloseEntry(){
+    wx.setStorageSync('hasEntry', true);
+    wx.exitMiniProgram({success: (res) => {}})
+  },
   go(e){
     let url = e.currentTarget.dataset.url;
     app.go(url);
diff --git a/Pages/login/index.json b/Pages/login/index.json
index be41440..41e6df9 100644
--- a/Pages/login/index.json
+++ b/Pages/login/index.json
@@ -3,6 +3,7 @@
     "van-button": "@vant/weapp/button/index",
     "van-image": "@vant/weapp/image/index", 
     "van-checkbox": "@vant/weapp/checkbox/index",
+    "van-dialog": "@vant/weapp/dialog/index",
     "van-checkbox-group": "@vant/weapp/checkbox-group/index"
   }
 }
\ No newline at end of file
diff --git a/Pages/login/index.wxml b/Pages/login/index.wxml
index 6c59b17..e462411 100644
--- a/Pages/login/index.wxml
+++ b/Pages/login/index.wxml
@@ -39,4 +39,21 @@
       <text class="bottom_txt" bindtap="go" data-url="/Pages/mobile_login/index">输入手机号登录/注册</text>
     </view>
   </view>
-</view>
\ No newline at end of file
+</view>
+<van-dialog
+  use-slot
+  title="温馨提示"
+  show="{{ showEntryTip }}"
+  show-cancel-button
+  confirm-button-text="同意并继续"
+  cancel-button-text="不同意"
+  confirm-button-color="#3CC7C0"
+  bind:confirm="onConfirmEntry"
+  bind:cancel="onCloseEntry"
+>
+<view class="entrymsg" >
+ <view> 亲爱的用户，感谢您信任并使用肝胆相照互联网医院医师端！我们依据最新法律法规的要求，制定了<text class="navigator" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=9">《隐私协议》</text>。请您仔细阅《隐私协议》，并确认了解我们对您的个人信息处理原则。</view>
+<view>如您同意《隐私协议》，请点击“同意”开始使用我们的产品和服务。</view>
+</view>
+
+</van-dialog>
\ No newline at end of file
diff --git a/Pages/login/index.wxss b/Pages/login/index.wxss
index c8166dc..326efc0 100644
--- a/Pages/login/index.wxss
+++ b/Pages/login/index.wxss
@@ -78,4 +78,15 @@
 .van-checkbox {
   padding-top: 6rpx !important;
 }
-
+.entrymsg{
+  -webkit-overflow-scrolling: touch;
+    font-size: 28rpx;
+    line-height: 40rpx;
+    max-height: 60vh;
+    overflow-y: auto;
+    padding: 48rpx;
+    text-align: left;
+}
+.navigator{
+  color:#3CC7C0
+}

From 9ad154f86b1f75e6cfcc10ed27974bb745f3abc8 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Wed, 6 Sep 2023 14:03:55 +0800
Subject: [PATCH 60/83] =?UTF-8?q?=E5=8C=BB=E7=94=9F=E7=AB=AF=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/index/index.js   | 22 ++++++++++++++++++++--
 Pages/index/index.wxml | 12 ++++++++++++
 Pages/login/index.js   | 27 +++++++++++++++++++++------
 Pages/login/index.wxml | 12 ++++++++++++
 4 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/Pages/index/index.js b/Pages/index/index.js
index fe00a7c..8524254 100644
--- a/Pages/index/index.js
+++ b/Pages/index/index.js
@@ -6,15 +6,33 @@ Page({
   data: {
     loading: true,
     showEntryTip:false,
+    showEntryTip_second:false,
     static_host: api.getStaticHost()
   },
   onConfirmEntry(){
     wx.setStorageSync('hasEntry', true);
   },
   onCloseEntry(){
-    wx.setStorageSync('hasEntry', true);
-    wx.exitMiniProgram({success: (res) => {}})
+    this.setData({
+      showEntryTip_second:true
+    }) 
   },
+  onConfirmEntry_second(){
+    this.setData({
+      showEntryTip_second:false,
+      showEntryTip:false,
+    });
+    wx.setStorageSync('hasEntry', true);
+    
+  },
+  onCloseEntry_second(){
+    
+     this.setData({
+      showEntryTip_second:false,
+      showEntryTip:false,
+    });
+     wx.exitMiniProgram({success: (res) => {}})
+   },
   go(e){
     let url = e.currentTarget.dataset.url;
     app.go(url);
diff --git a/Pages/index/index.wxml b/Pages/index/index.wxml
index e3e0d46..3836330 100644
--- a/Pages/index/index.wxml
+++ b/Pages/index/index.wxml
@@ -45,4 +45,16 @@
 </view>
 
 </van-dialog>
+<van-dialog
+  title="温馨提示"
+  show="{{ showEntryTip_second }}"
+  message="很抱歉，如您不同意《隐私协议》，可能无法继续正常使用我们的服务，请您先同意哦~"
+  show-cancel-button
+  confirm-button-text="好的"
+  cancel-button-text="不同意"
+  confirm-button-color="#3CC7C0"
+  bind:confirm="onConfirmEntry_second"
+  bind:cancel="onCloseEntry_second"
+>
+</van-dialog>
 
diff --git a/Pages/login/index.js b/Pages/login/index.js
index 9008005..5a628a8 100644
--- a/Pages/login/index.js
+++ b/Pages/login/index.js
@@ -5,6 +5,7 @@ const app = getApp()
 Page({
   data: {
     showEntryTip:false,
+    showEntryTip_second:false,
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '登录', //导航栏 中间的标题
@@ -22,7 +23,7 @@ Page({
     let isEntry=wx.getStorageSync('hasEntry');
     if(!isEntry){
       this.setData({
-        showEntryTip:true
+        showEntryTip:true,
        });
      
      }
@@ -41,13 +42,27 @@ Page({
   _navback() {
     wx.navigateBack()
   },
-  onConfirmEntry(){
-    wx.setStorageSync('hasEntry', true);
-  },
   onCloseEntry(){
-    wx.setStorageSync('hasEntry', true);
-    wx.exitMiniProgram({success: (res) => {}})
+    this.setData({
+      showEntryTip_second:true
+    }) 
   },
+  onConfirmEntry_second(){
+    this.setData({
+      showEntryTip_second:false,
+      showEntryTip:false,
+    });
+    wx.setStorageSync('hasEntry', true);
+    
+  },
+  onCloseEntry_second(){
+    
+     this.setData({
+      showEntryTip_second:false,
+      showEntryTip:false,
+    });
+     wx.exitMiniProgram({success: (res) => {}})
+   },
   go(e){
     let url = e.currentTarget.dataset.url;
     app.go(url);
diff --git a/Pages/login/index.wxml b/Pages/login/index.wxml
index e462411..7a90d19 100644
--- a/Pages/login/index.wxml
+++ b/Pages/login/index.wxml
@@ -56,4 +56,16 @@
 <view>如您同意《隐私协议》，请点击“同意”开始使用我们的产品和服务。</view>
 </view>
 
+</van-dialog>
+<van-dialog
+  title="温馨提示"
+  show="{{ showEntryTip_second }}"
+  message="很抱歉，如您不同意《隐私协议》，可能无法继续正常使用我们的服务，请您先同意哦~"
+  show-cancel-button
+  confirm-button-text="好的"
+  cancel-button-text="不同意"
+  confirm-button-color="#3CC7C0"
+  bind:confirm="onConfirmEntry_second"
+  bind:cancel="onCloseEntry_second"
+>
 </van-dialog>
\ No newline at end of file

From 8d57f72f74802f1205a75a04058b87a5098a6578 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Thu, 7 Sep 2023 10:04:35 +0800
Subject: [PATCH 61/83] =?UTF-8?q?=E5=BC=B9=E6=A1=86=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/index/index.js   | 26 +++++++++++++++++++++++---
 Pages/index/index.wxml |  1 +
 Pages/login/index.js   | 28 ++++++++++++++++++++++++----
 Pages/login/index.wxml |  1 +
 4 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/Pages/index/index.js b/Pages/index/index.js
index 8524254..2afd403 100644
--- a/Pages/index/index.js
+++ b/Pages/index/index.js
@@ -7,6 +7,16 @@ Page({
     loading: true,
     showEntryTip:false,
     showEntryTip_second:false,
+    beforeClose(action){
+      return new Promise((resolve) => {
+        if (action === 'confirm') {
+          resolve(true);
+        } else {
+          // 拦截取消操作
+          resolve(false);
+        }
+    })
+  },
     static_host: api.getStaticHost()
   },
   onConfirmEntry(){
@@ -14,15 +24,16 @@ Page({
   },
   onCloseEntry(){
     this.setData({
-      showEntryTip_second:true
+      showEntryTip_second:true,
+      showEntryTip:true
     }) 
   },
   onConfirmEntry_second(){
     this.setData({
       showEntryTip_second:false,
-      showEntryTip:false,
+      //showEntryTip:false,
     });
-    wx.setStorageSync('hasEntry', true);
+    //wx.setStorageSync('hasEntry', true);
     
   },
   onCloseEntry_second(){
@@ -41,6 +52,9 @@ Page({
     let from = option.from;
     let usertype = wx.getStorageSync('usertype');
     console.log("index onload: ", from, usertype)
+    this.setData({
+      beforeClose: this.data.beforeClose.bind(this),
+  })
     if(from === "navbar"){
       //切换身份
     }else{
@@ -60,11 +74,17 @@ Page({
     }
     this.setData({ loading: false });
     let isEntry=wx.getStorageSync('hasEntry');
+
+    console.log("onshow:"+isEntry)
     if(!isEntry){
       this.setData({
         showEntryTip:true
        });
      
+     }else{
+      this.setData({
+        showEntryTip:false
+       });
      }
   },
   
diff --git a/Pages/index/index.wxml b/Pages/index/index.wxml
index 3836330..6b83382 100644
--- a/Pages/index/index.wxml
+++ b/Pages/index/index.wxml
@@ -38,6 +38,7 @@
   confirm-button-color="#3CC7C0"
   bind:confirm="onConfirmEntry"
   bind:cancel="onCloseEntry"
+  before-close="{{beforeClose}}"
 >
 <view class="entrymsg" >
  <view> 亲爱的用户，感谢您信任并使用肝胆相照互联网医院医师端！我们依据最新法律法规的要求，制定了<text class="navigator" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=9">《隐私协议》</text>。请您仔细阅《隐私协议》，并确认了解我们对您的个人信息处理原则。</view>
diff --git a/Pages/login/index.js b/Pages/login/index.js
index 5a628a8..0bbfb07 100644
--- a/Pages/login/index.js
+++ b/Pages/login/index.js
@@ -6,6 +6,16 @@ Page({
   data: {
     showEntryTip:false,
     showEntryTip_second:false,
+    beforeClose(action){
+      return new Promise((resolve) => {
+        if (action === 'confirm') {
+          resolve(true);
+        } else {
+          // 拦截取消操作
+          resolve(false);
+        }
+    })
+  },
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '登录', //导航栏 中间的标题
@@ -15,6 +25,9 @@ Page({
   },
   onLoad(){
     let usertype =  wx.getStorageSync('usertype');
+    this.setData({
+      beforeClose: this.data.beforeClose.bind(this),
+  })
     if(!usertype){
       wx.navigateTo({
         url: "/Pages/index/index"
@@ -25,7 +38,10 @@ Page({
       this.setData({
         showEntryTip:true,
        });
-     
+     }else{
+      this.setData({
+        showEntryTip:false
+       });
      }
   },
   onChange(event) {
@@ -42,17 +58,21 @@ Page({
   _navback() {
     wx.navigateBack()
   },
+  onConfirmEntry(){
+    wx.setStorageSync('hasEntry', true);
+  },
   onCloseEntry(){
     this.setData({
-      showEntryTip_second:true
+      showEntryTip_second:true,
+      showEntryTip:true
     }) 
   },
   onConfirmEntry_second(){
     this.setData({
       showEntryTip_second:false,
-      showEntryTip:false,
+     // showEntryTip:false,
     });
-    wx.setStorageSync('hasEntry', true);
+    //wx.setStorageSync('hasEntry', true);
     
   },
   onCloseEntry_second(){
diff --git a/Pages/login/index.wxml b/Pages/login/index.wxml
index 7a90d19..b890e15 100644
--- a/Pages/login/index.wxml
+++ b/Pages/login/index.wxml
@@ -50,6 +50,7 @@
   confirm-button-color="#3CC7C0"
   bind:confirm="onConfirmEntry"
   bind:cancel="onCloseEntry"
+  before-close="{{beforeClose}}"
 >
 <view class="entrymsg" >
  <view> 亲爱的用户，感谢您信任并使用肝胆相照互联网医院医师端！我们依据最新法律法规的要求，制定了<text class="navigator" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=9">《隐私协议》</text>。请您仔细阅《隐私协议》，并确认了解我们对您的个人信息处理原则。</view>

From b4db6596209e2fe37fd5479c34c525be3e61699b Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 8 Sep 2023 09:35:36 +0800
Subject: [PATCH 62/83] =?UTF-8?q?=E5=BC=B9=E6=A1=86=E9=9A=90=E7=A7=81?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/index/index.js        | 43 ++++++++++++++++++++++++++-----------
 Pages/index/index.wxml      |  1 +
 Pages/login/index.js        | 40 ++++++++++++++++++++++++----------
 Pages/login/index.wxml      |  1 +
 app.json                    |  1 +
 project.private.config.json |  2 +-
 6 files changed, 63 insertions(+), 25 deletions(-)

diff --git a/Pages/index/index.js b/Pages/index/index.js
index 2afd403..78bf2f1 100644
--- a/Pages/index/index.js
+++ b/Pages/index/index.js
@@ -20,7 +20,7 @@ Page({
     static_host: api.getStaticHost()
   },
   onConfirmEntry(){
-    wx.setStorageSync('hasEntry', true);
+    //wx.setStorageSync('hasEntry', true);
   },
   onCloseEntry(){
     this.setData({
@@ -72,20 +72,37 @@ Page({
         tabBarShow:false,  //true/false
       })
     }
+    wx.getPrivacySetting({
+      success: res => {
+        console.log(res) // 返回结果为: res = { needAuthorization: true/false, privacyContractName: '《xxx隐私保护指引》' }
+        if (res.needAuthorization) {
+          // 需要弹出隐私协议
+          this.setData({
+            showEntryTip:true
+          })
+        } else {
+          this.setData({
+            showEntryTip:false
+          })
+          // 用户已经同意过隐私协议，所以不需要再弹出隐私协议，也能调用已声明过的隐私
+        }
+      },
+      fail: () => {},
+      complete: () => {}
+    })
     this.setData({ loading: false });
-    let isEntry=wx.getStorageSync('hasEntry');
-
-    console.log("onshow:"+isEntry)
-    if(!isEntry){
-      this.setData({
-        showEntryTip:true
-       });
+    // let isEntry=wx.getStorageSync('hasEntry');
+    // console.log("onshow:"+isEntry)
+    // if(!isEntry){
+    //   this.setData({
+    //     showEntryTip:true
+    //    });
      
-     }else{
-      this.setData({
-        showEntryTip:false
-       });
-     }
+    //  }else{
+    //   this.setData({
+    //     showEntryTip:false
+    //    });
+    //  }
   },
   
   goCheck(e){
diff --git a/Pages/index/index.wxml b/Pages/index/index.wxml
index 6b83382..5954550 100644
--- a/Pages/index/index.wxml
+++ b/Pages/index/index.wxml
@@ -39,6 +39,7 @@
   bind:confirm="onConfirmEntry"
   bind:cancel="onCloseEntry"
   before-close="{{beforeClose}}"
+  confirm-button-open-type="agreePrivacyAuthorization"
 >
 <view class="entrymsg" >
  <view> 亲爱的用户，感谢您信任并使用肝胆相照互联网医院医师端！我们依据最新法律法规的要求，制定了<text class="navigator" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=9">《隐私协议》</text>。请您仔细阅《隐私协议》，并确认了解我们对您的个人信息处理原则。</view>
diff --git a/Pages/login/index.js b/Pages/login/index.js
index 0bbfb07..c89a801 100644
--- a/Pages/login/index.js
+++ b/Pages/login/index.js
@@ -33,16 +33,34 @@ Page({
         url: "/Pages/index/index"
       })
     };
-    let isEntry=wx.getStorageSync('hasEntry');
-    if(!isEntry){
-      this.setData({
-        showEntryTip:true,
-       });
-     }else{
-      this.setData({
-        showEntryTip:false
-       });
-     }
+    wx.getPrivacySetting({
+      success: res => {
+        console.log(res) // 返回结果为: res = { needAuthorization: true/false, privacyContractName: '《xxx隐私保护指引》' }
+        if (res.needAuthorization) {
+          // 需要弹出隐私协议
+          this.setData({
+            showEntryTip:true
+          })
+        } else {
+          this.setData({
+            showEntryTip:false
+          })
+          // 用户已经同意过隐私协议，所以不需要再弹出隐私协议，也能调用已声明过的隐私
+        }
+      },
+      fail: () => {},
+      complete: () => {}
+    })
+    // let isEntry=wx.getStorageSync('hasEntry');
+    // if(!isEntry){
+    //   this.setData({
+    //     showEntryTip:true,
+    //    });
+    //  }else{
+    //   this.setData({
+    //     showEntryTip:false
+    //    });
+    //  }
   },
   onChange(event) {
     this.setData({
@@ -59,7 +77,7 @@ Page({
     wx.navigateBack()
   },
   onConfirmEntry(){
-    wx.setStorageSync('hasEntry', true);
+   // wx.setStorageSync('hasEntry', true);
   },
   onCloseEntry(){
     this.setData({
diff --git a/Pages/login/index.wxml b/Pages/login/index.wxml
index b890e15..8c29100 100644
--- a/Pages/login/index.wxml
+++ b/Pages/login/index.wxml
@@ -51,6 +51,7 @@
   bind:confirm="onConfirmEntry"
   bind:cancel="onCloseEntry"
   before-close="{{beforeClose}}"
+  confirm-button-open-type="agreePrivacyAuthorization"
 >
 <view class="entrymsg" >
  <view> 亲爱的用户，感谢您信任并使用肝胆相照互联网医院医师端！我们依据最新法律法规的要求，制定了<text class="navigator" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=9">《隐私协议》</text>。请您仔细阅《隐私协议》，并确认了解我们对您的个人信息处理原则。</view>
diff --git a/app.json b/app.json
index 12a4604..09137e7 100644
--- a/app.json
+++ b/app.json
@@ -105,5 +105,6 @@
       }
     ]
   },
+  "__usePrivacyCheck__": true,
   "sitemapLocation": "sitemap.json"
 }
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 982700a..f83046b 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -18,5 +18,5 @@
       ]
     }
   },
-  "libVersion": "2.32.0"
+  "libVersion": "3.0.1"
 }
\ No newline at end of file

From 64ac0905daf18d574631148fd9524f69e0dc8a7a Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Mon, 11 Sep 2023 15:11:50 +0800
Subject: [PATCH 63/83] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=84=E6=96=B9?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=93=BE=E6=8E=A5=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/chufangsetup/index.js   | 10 ++++++++++
 Pages/yishi/chufangsetup/index.wxml |  8 ++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Pages/yishi/chufangsetup/index.js b/Pages/yishi/chufangsetup/index.js
index a63df51..faec7f1 100644
--- a/Pages/yishi/chufangsetup/index.js
+++ b/Pages/yishi/chufangsetup/index.js
@@ -22,7 +22,17 @@ Page({
     last_page: 0,
     
   },
+  onLoad(options){
+    console.log(options.status)
+     if(options.status){
+       this.setData({
+        pharmacist_audit_status:options.status,
+        prescription_status:options.status
+       })
+     }
+  },
   onShow(){
+
     this.getList();
   },
   onTabsChange(e) {
diff --git a/Pages/yishi/chufangsetup/index.wxml b/Pages/yishi/chufangsetup/index.wxml
index 6155939..33ec2bf 100644
--- a/Pages/yishi/chufangsetup/index.wxml
+++ b/Pages/yishi/chufangsetup/index.wxml
@@ -2,14 +2,14 @@
 <view class="container">
   <view class="tabs">
     <t-tabs
-      defaultValue="{{0}}"
+      value="{{prescription_status}}"
       bind:change="onTabsChange"
       bind:click="onTabsClick"
       bind:scroll="onStickyScroll"
       t-class="custom-tabs"
     >
      
-      <t-tab-panel label="审核中" value="0" style="overflow: scroll;">
+      <t-tab-panel label="审核中" name ="0" value="0" style="overflow: scroll;">
         <view class="item_list" style="overflow: scroll;">
           <view class="item" wx:for="{{chufang_list_0}}">
           
@@ -57,7 +57,7 @@
         </view>
       </t-tab-panel>
        <!-- 审核通过面板 -->
-       <t-tab-panel label="审核通过" value="1" style="overflow: scroll;">
+       <t-tab-panel label="审核通过" value="1"  name ="1" style="overflow: scroll;">
         <view class="item_list" style="overflow: scroll;">
           <view class="item" wx:for="{{chufang_list_1}}">
           
@@ -105,7 +105,7 @@
         </view>
       </t-tab-panel>
       <!-- 驳回面板 -->
-      <t-tab-panel label="驳回" value="2" style="overflow: scroll;">
+      <t-tab-panel label="驳回" value="2"  name ="2" style="overflow: scroll;">
         <view class="item_list" style="overflow: scroll;">
 
           <view class="item" wx:for="{{chufang_list_2}}">

From eab9fbcb915215dcbdb011f03ab423c7cb71af9d Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Tue, 19 Sep 2023 09:36:04 +0800
Subject: [PATCH 64/83] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TUIKit/components/TUIChat/index.wxss |  4 ++--
 app.js                               | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/TUIKit/components/TUIChat/index.wxss b/TUIKit/components/TUIChat/index.wxss
index 271b13d..dab6632 100644
--- a/TUIKit/components/TUIChat/index.wxss
+++ b/TUIKit/components/TUIChat/index.wxss
@@ -134,7 +134,7 @@
   height: 100rpx;
   background-color: rgb(255, 255, 255);
   display: flex;
-  padding:0 20rpx;
+  padding:0 10rpx;
   justify-content: space-between;
   align-items: center;
   box-shadow: 0px 2px 4px 0px rgba(0,0,0,0.08);
@@ -162,7 +162,7 @@
 .time_desc .item{
   color:#E34D59;
 
-  display:inline-flex;
+  display:flex;
   white-space: nowrap;
   align-items: center;
   font-size: 32rpx;
diff --git a/app.js b/app.js
index f241bc4..aa8d1e7 100644
--- a/app.js
+++ b/app.js
@@ -131,7 +131,7 @@ App({
     
         });
     
-        wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady);
+        //wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady);
         wx.$TUIKit.setLogLevel(3);//设置日志级别
         wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady, this);
         wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.TOTAL_UNREAD_MESSAGE_COUNT_UPDATED, this.onTotalUnreadMessageCountUpdated);
@@ -165,7 +165,7 @@ App({
       // console.log("未读消息数量：", totalUnreadCount)
   },
   onSDKReady(){
-    // console.log("onSDKReady from app.js");
+    console.log("onSDKReady from app.js");
     this.globalData.chat_sdk_ready = true;
 
     // let promise =  wx.$TUIKit.deleteConversation('C2C500318318078251008');
@@ -196,11 +196,16 @@ App({
     if(!index_info) wx.setStorageSync(userID+'_index_info',"");
     if(!my_info) wx.setStorageSync(userID+'_my_info', "");
     this.formatWenZhenInfo();
-
-    wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onSystemPushReceived);
     wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onSystemPushReceived, this);
     //互踢
-    wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.KICKED_OUT, this.onKickedOut);
+    console.log("互踢");
+    wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.KICKED_OUT, this.onKickedOut,this);
+  },
+  onUnload(){
+    wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady);
+    wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onSystemPushReceived);
+    wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.TOTAL_UNREAD_MESSAGE_COUNT_UPDATED, this.onTotalUnreadMessageCountUpdated);
+    wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.KICKED_OUT,this.$onKickedOut);
   },
   onKickedOut(){
     // console.log("onKickedOutonKickedOutonKickedOutonKickedOut");

From 2c99d357f7d8c4bd41fcc95b8fd89adb3c4e8d0f Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Mon, 25 Sep 2023 15:23:07 +0800
Subject: [PATCH 65/83] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5switch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/myinfo/index.js    |  1 +
 Pages/yishi/myinfo/index.wxml  |  2 +
 Pages/yishi/notify/notify.js   | 93 ++++++++++++++++++++++++++++++++++
 Pages/yishi/notify/notify.json |  9 ++++
 Pages/yishi/notify/notify.wxml | 19 +++++++
 Pages/yishi/notify/notify.wxss | 10 ++++
 app.json                       |  3 +-
 utils/network/api.js           | 17 +++++++
 8 files changed, 153 insertions(+), 1 deletion(-)
 create mode 100644 Pages/yishi/notify/notify.js
 create mode 100644 Pages/yishi/notify/notify.json
 create mode 100644 Pages/yishi/notify/notify.wxml
 create mode 100644 Pages/yishi/notify/notify.wxss

diff --git a/Pages/yishi/myinfo/index.js b/Pages/yishi/myinfo/index.js
index 308d71f..09763d3 100644
--- a/Pages/yishi/myinfo/index.js
+++ b/Pages/yishi/myinfo/index.js
@@ -63,6 +63,7 @@ Page({
     })
   },
   go(e){
+    console.log(2222)
     if(this.data.idcard_status != 1){
       this.setData({
         v_show: true,
diff --git a/Pages/yishi/myinfo/index.wxml b/Pages/yishi/myinfo/index.wxml
index 20f2995..f2b65cf 100644
--- a/Pages/yishi/myinfo/index.wxml
+++ b/Pages/yishi/myinfo/index.wxml
@@ -7,6 +7,8 @@
     value="{{idcard_status==0?'未认证':idcard_status==1?'已认证':'认证失败'}}" is-link />
     <van-cell size="large" bindtap="go2" data-url="/Pages/yishi/practicing/index" link-type="navigateTo" title="医师认证" 
     value="{{iden_auth_status==0?'未认证':iden_auth_status==1?'已认证':iden_auth_status==2?'审核中':'认证失败'}}" is-link />
+    <van-cell size="large" bindtap="go" data-url="/Pages/yishi/notify/notify" link-type="navigateTo" title="消息通知" 
+    is-link />
   </van-cell-group>
 
   <van-button bind:click="logOut" custom-style="width: 92vw;margin: 50rpx auto;border-radius: 10rpx;" type="primary" color="#3CC7C0" block>退出登录</van-button>
diff --git a/Pages/yishi/notify/notify.js b/Pages/yishi/notify/notify.js
new file mode 100644
index 0000000..91460c9
--- /dev/null
+++ b/Pages/yishi/notify/notify.js
@@ -0,0 +1,93 @@
+// pages/notify/notigy.js
+import { API } from './../../../utils/network/api'
+let api = new API()
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    navbarData: {
+      showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
+      title: '消息通知', //导航栏 中间的标题
+    },
+    checked:true,
+  },
+  onChangeSwitch({ detail }){
+    this.setData({ checked: detail });
+    this.handleEditConfig(detail);
+   },
+  handleEditConfig(detail){
+    let is_accept_im_message_push=detail?1:0;
+    api.editConfig({is_accept_im_message_push:is_accept_im_message_push}).then(data=>{
+        wx.showToast({
+          title: '设置成功',
+          icon:"none"
+        })
+    })
+  },
+  handleGetConfig(){
+    api.getConfig().then(data=>{
+     let result=data.data;
+     this.setData({
+       checked:result.is_accept_im_message_push==1?true:false
+     })
+    })
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    this.handleGetConfig();
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/Pages/yishi/notify/notify.json b/Pages/yishi/notify/notify.json
new file mode 100644
index 0000000..4085181
--- /dev/null
+++ b/Pages/yishi/notify/notify.json
@@ -0,0 +1,9 @@
+{
+  "usingComponents": {
+    "te-nav-bar": "/commpents/te_navbar",
+    "van-cell": "@vant/weapp/cell/index",
+    "van-cell-group": "@vant/weapp/cell-group/index",
+    "van-switch": "@vant/weapp/switch/index"
+  },
+  "navigationStyle":"custom"
+}
\ No newline at end of file
diff --git a/Pages/yishi/notify/notify.wxml b/Pages/yishi/notify/notify.wxml
new file mode 100644
index 0000000..d7c38b7
--- /dev/null
+++ b/Pages/yishi/notify/notify.wxml
@@ -0,0 +1,19 @@
+<!--pages/notify/notigy.wxml-->
+<te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
+<view class="page">
+  <van-cell-group>
+  <van-cell title="消息提醒" size="large" title-style="display:flex;align-items: center;">
+    <view class="right">
+      <van-switch checked="{{ checked }}" active-color="#3CC7C0" bind:change="onChangeSwitch" inactive-color="#ccc" size="24px"/>
+  </view>
+  </van-cell>
+</van-cell-group>
+  <!-- <view class="cellbox">
+  <view class="cell">
+      <view class="left">患者消息提醒</view>
+      <view class="right" >
+        <van-switch checked="{{ checked }}" active-color="#3CC7C0" bind:change="onChangeSwitch" inactive-color="#ccc" size="24px"/>
+      </view>
+    </view> 
+</view>-->
+</view>
diff --git a/Pages/yishi/notify/notify.wxss b/Pages/yishi/notify/notify.wxss
new file mode 100644
index 0000000..1109b94
--- /dev/null
+++ b/Pages/yishi/notify/notify.wxss
@@ -0,0 +1,10 @@
+/* pages/notify/notigy.wxss */
+.page{
+  position: relative;
+  overflow: hidden;
+  background: #F2F2F2;
+}
+.right,.title-class{
+
+  margin-top: 10rpx;
+}
diff --git a/app.json b/app.json
index 09137e7..11f31d9 100644
--- a/app.json
+++ b/app.json
@@ -59,7 +59,8 @@
     "Pages/yishi/wenzhen_v3/wenzhen",
     "Pages/agreement_page/index",
     "Pages/yishi/medince_list/index",
-    "Pages/yishi/linkPage/linkPage"
+    "Pages/yishi/linkPage/linkPage",
+    "Pages/yishi/notify/notify"
   ],
   "window": {
     "navigationBarBackgroundColor": "#ffffff",
diff --git a/utils/network/api.js b/utils/network/api.js
index a1988a1..a48f620 100644
--- a/utils/network/api.js
+++ b/utils/network/api.js
@@ -818,7 +818,24 @@ getLastInquiry(params) {
     }
   })
 }
+//获取配置
+getConfig() {
+  return this.request({
+    url: `${this.baseUrl}/user/system`,
+    method: 'GET'
+  })
+}
 
+//获取配置
+editConfig(params) {
+  return this.request({
+    url: `${this.baseUrl}/user/system`,
+    method: 'PUT',
+    data: {
+      ...params
+    }
+  })
+}
 
 
 

From f25a49376dc1067302879c907aaf1152910f3526 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Wed, 11 Oct 2023 15:02:44 +0800
Subject: [PATCH 66/83] =?UTF-8?q?=E5=8C=BB=E7=94=9F=E7=AB=AF=E5=90=B4?=
 =?UTF-8?q?=E5=B7=A5=E6=8E=A5=E5=8F=A3=E5=AD=97=E6=AE=B5=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/index/index.js                    | 45 +++++++++++--------
 .../components/MessageInput/index.wxml        |  2 +-
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/Pages/yishi/index/index.js b/Pages/yishi/index/index.js
index 44001c9..b81ea3e 100644
--- a/Pages/yishi/index/index.js
+++ b/Pages/yishi/index/index.js
@@ -10,6 +10,7 @@ Page({
     title: "肝胆相照互联网医院",
     navHeight: 0,
     stateHeight: 0,
+    doctor_inquiry_config:null,
     info:{
       user_name: "医师姓名",
       not_accepted_inquiry_num: 0,
@@ -249,6 +250,7 @@ Page({
         "info.praise_rate": response.data.info.praise_rate,
         "info.avg_response_time": response.data.info.avg_response_time,
         "info.number_of_fans": response.data.info.number_of_fans,
+        doctor_inquiry_config:response.data.doctor_inquiry_config
       })
       if(avatar){
         this.setData({
@@ -264,21 +266,21 @@ Page({
       let multi_point_status = response.data.info.multi_point_status;
       //绑定结算银行卡
       let is_bind_bank = response.data.info.is_bind_bank;
-      //是否参加专家图文接诊（0:否 1:是）
-      let is_img_expert_reception = response.data.info.is_img_expert_reception;
-      //是否参加专家快速接诊（0:否 1:是）
-      let is_img_quick_reception = response.data.info.is_img_quick_reception;
-      //是否参加专家公益接诊（0:否 1:是）
-      let is_img_welfare_reception = response.data.info.is_img_welfare_reception;
+      // //是否参加专家图文接诊（0:否 1:是）
+      // let is_img_expert_reception = response.data.info.is_img_expert_reception;
+      // //是否参加专家快速接诊（0:否 1:是）
+      // let is_img_quick_reception = response.data.info.is_img_quick_reception;
+      // //是否参加专家公益接诊（0:否 1:是）
+      // let is_img_welfare_reception = response.data.info.is_img_welfare_reception;
 
       this.setData({
         "info.idcard_status": idcard_status,
         "info.iden_auth_status": iden_auth_status,
         "info.multi_point_status": multi_point_status,
         "info.is_bind_bank": is_bind_bank,
-        "info.is_img_expert_reception": is_img_expert_reception,
-        "info.is_img_quick_reception": is_img_quick_reception,
-        "info.is_img_welfare_reception": is_img_welfare_reception,
+        // "info.is_img_expert_reception": is_img_expert_reception,
+        // "info.is_img_quick_reception": is_img_quick_reception,
+        // "info.is_img_welfare_reception": is_img_welfare_reception,
       });
 
       //iden_auth_status 0:未认证 1:认证通过 2:审核中 3:认证失败
@@ -411,11 +413,12 @@ Page({
       //绑定结算银行卡
      var is_bind_bank = this.data.info.is_bind_bank;
         //是否参加专家图文接诊（0:否 1:是）
-    let is_img_expert_reception = this.data.info.is_img_expert_reception;
-    //是否参加专家快速接诊（0:否 1:是）
-    let is_img_quick_reception = this.data.info.is_img_quick_reception;
-    //是否参加专家公益接诊（0:否 1:是）
-    let is_img_welfare_reception = this.data.info.is_img_welfare_reception;
+
+    // let is_img_expert_reception = this.data.info.is_img_expert_reception;
+    // //是否参加专家快速接诊（0:否 1:是）
+    // let is_img_quick_reception = this.data.info.is_img_quick_reception;
+    // //是否参加专家公益接诊（0:否 1:是）
+    // let is_img_welfare_reception = this.data.info.is_img_welfare_reception;
 
      let usertype =  wx.getStorageSync('usertype');
      let userID = wx.getStorageSync('user_id_'+usertype);
@@ -581,8 +584,14 @@ Page({
       });
       wx.setStorageSync('jiesuan_dialog_show', true);
     }
-
-    if((is_img_expert_reception + is_img_quick_reception + is_img_welfare_reception) == 0){
+    // (is_img_expert_reception + is_img_quick_reception + is_img_welfare_reception) == 0
+    let flag=false;
+    if(this.data.doctor_inquiry_config){
+      flag=this.data.doctor_inquiry_config.every((item)=>{
+        return item.is_enable==0
+      })
+    };
+    if(!this.data.doctor_inquiry_config || flag){
       if(!this.data.default_dialog_show){
         this.setData({
           // dialog_visible: true,
@@ -596,8 +605,8 @@ Page({
       });
       return false;
     }
-
-    if((is_img_expert_reception + is_img_quick_reception + is_img_welfare_reception) > 0){
+    //(is_img_expert_reception + is_img_quick_reception + is_img_welfare_reception) > 0
+    if(this.data.doctor_inquiry_config && !flag){
       if(!this.data.default_dialog_show){
         this.setData({
           // dialog_visible: true,
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxml b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
index daaad41..de5a1cb 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
@@ -1,7 +1,7 @@
 <view class="TUI-message-input-container">
     <view class="TUI-commom-function">
         <view class="TUI-commom-function-item" data-key="10" bindtap="handleCommonFunctions">查看完整病历</view>
-        <view class="TUI-commom-function-item" data-key="11" bindtap="handleCommonFunctions" wx:if="{{baseInfo.multi_point_status == 1 && baseInfo.inquiry_status==4}}">在线开处方</view>
+        <view class="TUI-commom-function-item" data-key="11" bindtap="handleCommonFunctions" wx:if="{{baseInfo.multi_point_status == 1 && baseInfo.inquiry_status==4 && baseInfo.multi_point_enable==1}}">在线开处方</view>
     </view>
     <view class="TUI-message-input">
         <image class="TUI-icon" bindtap="switchAudio" wx:if="{{has_audio}}"

From edb10af38054ed24b8c02282fac257d4d2334696 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Thu, 9 Nov 2023 17:24:46 +0800
Subject: [PATCH 67/83] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TUIKit/components/TUIChat/index.wxss | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/TUIKit/components/TUIChat/index.wxss b/TUIKit/components/TUIChat/index.wxss
index dab6632..a06e00c 100644
--- a/TUIKit/components/TUIChat/index.wxss
+++ b/TUIKit/components/TUIChat/index.wxss
@@ -158,11 +158,13 @@
  white-space: nowrap;
  align-items: center;
 }
-
+.control-count-down{
+  display: flex;
+}
 .time_desc .item{
   color:#E34D59;
 
-  display:flex;
+  display:inline-flex;
   white-space: nowrap;
   align-items: center;
   font-size: 32rpx;

From aabe8da62109d8a6d702ce5e46adc2dd6b7f41e7 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 17 Nov 2023 14:06:08 +0800
Subject: [PATCH 68/83] =?UTF-8?q?=E6=89=AB=E7=A0=81=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=BA=AB=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/login/index.js | 19 +++++++++++++++++++
 app.js               |  1 +
 2 files changed, 20 insertions(+)

diff --git a/Pages/login/index.js b/Pages/login/index.js
index c89a801..c8601e3 100644
--- a/Pages/login/index.js
+++ b/Pages/login/index.js
@@ -6,6 +6,7 @@ Page({
   data: {
     showEntryTip:false,
     showEntryTip_second:false,
+    isLogin:false,
     beforeClose(action){
       return new Promise((resolve) => {
         if (action === 'confirm') {
@@ -23,6 +24,20 @@ Page({
     checked: false,
     static_host: api.getStaticHost()
   },
+  onHide: function() {
+    let isLogin=this.data.isLogin;
+    if(!isLogin){
+      wx.setStorageSync('usertype','');
+    }
+    // 页面从前台变为后台时执行
+  },
+  onUnload: function() {
+    let isLogin=this.data.isLogin;
+    if(!isLogin){
+      wx.setStorageSync('usertype','');
+    }
+    // 页面销毁时执行
+  },
   onLoad(){
     let usertype =  wx.getStorageSync('usertype');
     this.setData({
@@ -115,6 +130,7 @@ Page({
       })
       return;
     }
+    let THIS=this;
     let usertype =  wx.getStorageSync('usertype');
     let next_url =  wx.getStorageSync('next_url');
     wx.login({
@@ -129,6 +145,9 @@ Page({
         api.wechatMobileLogin(params).then(response => {
           console.log(response);
           wx.setStorageSync('AUTH_TOKEN_'+usertype, response.data.token);
+          THIS.setData({
+            isLogin:true
+          })
           wx.setStorageSync('user_id_'+usertype, response.data.user_id);
           wx.setStorageSync('client_user_id_'+usertype, response.data.client_user_id);
           app.globalData.config.userID = response.data.user_id;
diff --git a/app.js b/app.js
index aa8d1e7..a835498 100644
--- a/app.js
+++ b/app.js
@@ -151,6 +151,7 @@ App({
       wx.$TUIKit.logout();
       wx.$TUIKit = undefined;
     }
+    wx.setStorageSync('usertype','');
     this.clearAllInterval();
     this.globalData.chat_sdk_ready = false;
   },

From 7c0f376058d2b69d4fa6a77ffd94cab35a61ea64 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 17 Nov 2023 15:01:05 +0800
Subject: [PATCH 69/83] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=89=AB=E6=8F=8F?=
 =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E8=BF=9B=E5=85=A5=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E8=BA=AB=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/login/index.js        |  8 +-------
 Pages/mobile_login/index.js | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Pages/login/index.js b/Pages/login/index.js
index c8601e3..d850aa2 100644
--- a/Pages/login/index.js
+++ b/Pages/login/index.js
@@ -24,13 +24,7 @@ Page({
     checked: false,
     static_host: api.getStaticHost()
   },
-  onHide: function() {
-    let isLogin=this.data.isLogin;
-    if(!isLogin){
-      wx.setStorageSync('usertype','');
-    }
-    // 页面从前台变为后台时执行
-  },
+
   onUnload: function() {
     let isLogin=this.data.isLogin;
     if(!isLogin){
diff --git a/Pages/mobile_login/index.js b/Pages/mobile_login/index.js
index 53f1ed0..09869af 100644
--- a/Pages/mobile_login/index.js
+++ b/Pages/mobile_login/index.js
@@ -8,6 +8,7 @@ Page({
       title: '手机号登录', //导航栏 中间的标题
     },
     checked: false,
+    isLogin:false,
     phone: "",
     sms: "",
     btn_msg: "获取验证码",
@@ -51,6 +52,13 @@ Page({
       })
     }
   },
+  onUnload: function() {
+    let isLogin=this.data.isLogin;
+    if(!isLogin){
+      wx.setStorageSync('usertype','');
+    }
+    // 页面销毁时执行
+  },
   getCodePhone(e){
     let phone_reg = /^1[3-9]\d{9}$/;
     let phone = this.data.phone;
@@ -91,7 +99,7 @@ Page({
     })
   },
   mobileLogin(e){
-
+    let THIS=this;
     let phone_reg = /^1[3-9]\d{9}$/;
     let phone = this.data.phone;
     let sms = this.data.sms;
@@ -128,6 +136,9 @@ Page({
           params.wx_code = res.code;
       
           api.mobileLogin(params).then(response => {
+            THIS.setData({
+              isLogin:true
+            })
             console.log(response);
             wx.setStorageSync('AUTH_TOKEN_'+usertype, response.data.token);
             wx.setStorageSync('user_id_'+usertype, response.data.user_id);

From 63d7cb402d946e723e2b7adde1d3a42571a10d27 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 17 Nov 2023 16:40:45 +0800
Subject: [PATCH 70/83] =?UTF-8?q?=E6=82=A3=E8=80=85=E7=AB=AF=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/index/index.js        |  1 +
 Pages/login/index.js        | 13 +------------
 Pages/mobile_login/index.js | 13 ++-----------
 Pages/yaoshi/my/my.js       |  2 ++
 Pages/yishi/myinfo/index.js |  3 +++
 app.js                      |  7 ++++++-
 6 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/Pages/index/index.js b/Pages/index/index.js
index 78bf2f1..9e3e34b 100644
--- a/Pages/index/index.js
+++ b/Pages/index/index.js
@@ -126,6 +126,7 @@ Page({
     }
     let token = wx.getStorageSync('AUTH_TOKEN_'+usertype);
     console.log(token);
+    console.log(url);
     if(token){
       wx.switchTab({
         url: url
diff --git a/Pages/login/index.js b/Pages/login/index.js
index d850aa2..225520f 100644
--- a/Pages/login/index.js
+++ b/Pages/login/index.js
@@ -6,7 +6,6 @@ Page({
   data: {
     showEntryTip:false,
     showEntryTip_second:false,
-    isLogin:false,
     beforeClose(action){
       return new Promise((resolve) => {
         if (action === 'confirm') {
@@ -24,14 +23,6 @@ Page({
     checked: false,
     static_host: api.getStaticHost()
   },
-
-  onUnload: function() {
-    let isLogin=this.data.isLogin;
-    if(!isLogin){
-      wx.setStorageSync('usertype','');
-    }
-    // 页面销毁时执行
-  },
   onLoad(){
     let usertype =  wx.getStorageSync('usertype');
     this.setData({
@@ -139,12 +130,10 @@ Page({
         api.wechatMobileLogin(params).then(response => {
           console.log(response);
           wx.setStorageSync('AUTH_TOKEN_'+usertype, response.data.token);
-          THIS.setData({
-            isLogin:true
-          })
           wx.setStorageSync('user_id_'+usertype, response.data.user_id);
           wx.setStorageSync('client_user_id_'+usertype, response.data.client_user_id);
           app.globalData.config.userID = response.data.user_id;
+          app.globalData.isLogin=true;
           app.imInit();
           //跳转页面
           wx.switchTab({
diff --git a/Pages/mobile_login/index.js b/Pages/mobile_login/index.js
index 09869af..28d5687 100644
--- a/Pages/mobile_login/index.js
+++ b/Pages/mobile_login/index.js
@@ -8,7 +8,6 @@ Page({
       title: '手机号登录', //导航栏 中间的标题
     },
     checked: false,
-    isLogin:false,
     phone: "",
     sms: "",
     btn_msg: "获取验证码",
@@ -52,13 +51,7 @@ Page({
       })
     }
   },
-  onUnload: function() {
-    let isLogin=this.data.isLogin;
-    if(!isLogin){
-      wx.setStorageSync('usertype','');
-    }
-    // 页面销毁时执行
-  },
+ 
   getCodePhone(e){
     let phone_reg = /^1[3-9]\d{9}$/;
     let phone = this.data.phone;
@@ -136,9 +129,7 @@ Page({
           params.wx_code = res.code;
       
           api.mobileLogin(params).then(response => {
-            THIS.setData({
-              isLogin:true
-            })
+            app.globalData.isLogin=true;
             console.log(response);
             wx.setStorageSync('AUTH_TOKEN_'+usertype, response.data.token);
             wx.setStorageSync('user_id_'+usertype, response.data.user_id);
diff --git a/Pages/yaoshi/my/my.js b/Pages/yaoshi/my/my.js
index df59c91..0f2c357 100644
--- a/Pages/yaoshi/my/my.js
+++ b/Pages/yaoshi/my/my.js
@@ -38,6 +38,8 @@ Page({
           wx.setStorageSync('AUTH_TOKEN_'+usertype, "");
           wx.setStorageSync('user_id_'+usertype, "");
           wx.setStorageSync('client_user_id_'+usertype, "");
+          app.globalData.isLogin=false;
+          wx.setStorageSync('usertype','')
           app.go("/Pages/index/index");
         } else if (res.cancel) {
           console.log('用户点击取消')
diff --git a/Pages/yishi/myinfo/index.js b/Pages/yishi/myinfo/index.js
index 09763d3..9c80c64 100644
--- a/Pages/yishi/myinfo/index.js
+++ b/Pages/yishi/myinfo/index.js
@@ -53,8 +53,11 @@ Page({
           let usertype =  wx.getStorageSync('usertype');
           wx.setStorageSync('AUTH_TOKEN_'+usertype, "");
           wx.setStorageSync('user_id_'+usertype, "");
+         
           wx.setStorageSync('client_user_id_'+usertype, "");
           app.imLogout();
+          app.globalData.isLogin=false;
+          wx.setStorageSync('usertype','')
           app.go("/Pages/index/index");
         } else if (res.cancel) {
           console.log('用户点击取消')
diff --git a/app.js b/app.js
index a835498..a777328 100644
--- a/app.js
+++ b/app.js
@@ -151,7 +151,6 @@ App({
       wx.$TUIKit.logout();
       wx.$TUIKit = undefined;
     }
-    wx.setStorageSync('usertype','');
     this.clearAllInterval();
     this.globalData.chat_sdk_ready = false;
   },
@@ -219,6 +218,7 @@ App({
       wx.$TUIKit = undefined
     }
     this.globalData.chat_sdk_ready = false
+     this.globalData.isLogin=false;
     this.go("/Pages/kickedout/index");
   },
   $onSystemPushReceived(e){
@@ -307,6 +307,11 @@ App({
   formatWenZhenInfo(){
     this.getConversationList();
   },
+  onHide(){
+    if(!this.globalData.isLogin){
+      wx.setStorageSync('usertype','');
+    }
+  },
   getConversationList(){
     wx.$TUIKit.getConversationList().then((imResponse) => {
       // console.log("getConversationList from app js: ", imResponse.data.conversationList);

From 1e9ea2a70fc8a99a9a01b34c9e4146e6fc0cfce4 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Mon, 4 Dec 2023 14:49:14 +0800
Subject: [PATCH 71/83] =?UTF-8?q?12.4=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/login/index.js                          |  11 +-
 Pages/mobile_login/index.js                   |  11 +-
 Pages/yishi/case copy/index.js                |  88 +++++++
 Pages/yishi/case copy/index.json              |   8 +
 Pages/yishi/case copy/index.wxml              | 114 +++++++++
 Pages/yishi/case copy/index.wxss              | 127 ++++++++++
 Pages/yishi/case/index.js                     |  50 ++--
 Pages/yishi/case/index.wxml                   |  33 ++-
 Pages/yishi/case/index.wxss                   |  14 +-
 Pages/yishi/patient_sick/index.js             | 173 +++++++++++++
 Pages/yishi/patient_sick/index.json           |   9 +
 Pages/yishi/patient_sick/index.wxml           |  49 ++++
 Pages/yishi/patient_sick/index.wxss           | 160 ++++++++++++
 Pages/yishi/sickform/index.js                 |  79 ++++++
 Pages/yishi/sickform/index.json               |   8 +
 Pages/yishi/sickform/index.wxml               | 229 ++++++++++++++++++
 Pages/yishi/sickform/index.wxss               | 143 +++++++++++
 Pages/yishi/write_sickform/index.js           | 154 ++++++++++++
 Pages/yishi/write_sickform/index.json         |   9 +
 Pages/yishi/write_sickform/index.wxml         |  61 +++++
 Pages/yishi/write_sickform/index.wxss         |  68 ++++++
 .../MessageElements/AudioMessage/index.wxml   |   2 +-
 .../MessageElements/AudioMessage/index.wxss   |  38 ++-
 .../MessageElements/CustomMessage/index.js    |  30 ++-
 .../MessageElements/CustomMessage/index.wxml  |  16 ++
 .../MessageElements/CustomMessage/index.wxss  |  57 +++++
 .../TUIChat/components/MessageInput/index.js  |  95 +++++++-
 .../components/MessageInput/index.wxml        |  10 +-
 .../components/MessageInput/index.wxss        |   1 +
 .../TUIChat/components/MessageList/index.js   |   2 +-
 TUIKit/utils/constant.js                      |   1 +
 app.js                                        |  10 +-
 app.json                                      |   5 +-
 static/images/yishi/tabbar_icon/empty.png     | Bin 0 -> 13659 bytes
 utils/network/api.js                          |  62 +++++
 utils/network/request.js                      |   4 +-
 36 files changed, 1873 insertions(+), 58 deletions(-)
 create mode 100644 Pages/yishi/case copy/index.js
 create mode 100644 Pages/yishi/case copy/index.json
 create mode 100644 Pages/yishi/case copy/index.wxml
 create mode 100644 Pages/yishi/case copy/index.wxss
 create mode 100644 Pages/yishi/patient_sick/index.js
 create mode 100644 Pages/yishi/patient_sick/index.json
 create mode 100644 Pages/yishi/patient_sick/index.wxml
 create mode 100644 Pages/yishi/patient_sick/index.wxss
 create mode 100644 Pages/yishi/sickform/index.js
 create mode 100644 Pages/yishi/sickform/index.json
 create mode 100644 Pages/yishi/sickform/index.wxml
 create mode 100644 Pages/yishi/sickform/index.wxss
 create mode 100644 Pages/yishi/write_sickform/index.js
 create mode 100644 Pages/yishi/write_sickform/index.json
 create mode 100644 Pages/yishi/write_sickform/index.wxml
 create mode 100644 Pages/yishi/write_sickform/index.wxss
 create mode 100644 static/images/yishi/tabbar_icon/empty.png

diff --git a/Pages/login/index.js b/Pages/login/index.js
index 225520f..fd4ed00 100644
--- a/Pages/login/index.js
+++ b/Pages/login/index.js
@@ -134,11 +134,14 @@ Page({
           wx.setStorageSync('client_user_id_'+usertype, response.data.client_user_id);
           app.globalData.config.userID = response.data.user_id;
           app.globalData.isLogin=true;
-          app.imInit();
+          let handleGo=function(){
+            wx.switchTab({
+              url: next_url
+            })
+          }
+          app.imInit({path:'Pages/login/index'},1,handleGo);
           //跳转页面
-          wx.switchTab({
-            url: next_url
-          })
+         
         }).catch(errors => {
           console.error(errors);
         })
diff --git a/Pages/mobile_login/index.js b/Pages/mobile_login/index.js
index 28d5687..8837194 100644
--- a/Pages/mobile_login/index.js
+++ b/Pages/mobile_login/index.js
@@ -135,10 +135,13 @@ Page({
             wx.setStorageSync('user_id_'+usertype, response.data.user_id);
             wx.setStorageSync('client_user_id_'+usertype, response.data.client_user_id);
             app.globalData.config.userID = response.data.user_id;
-            app.imInit();
-            wx.switchTab({
-              url:  wx.getStorageSync('next_url')
-            })
+            let handleGo=function(){
+              wx.switchTab({
+                url:  wx.getStorageSync('next_url')
+              })
+            }
+            app.imInit({path:'Pages/mobile_login/index'},1,handleGo);
+          
           }).catch(errors => {console.error(errors);})
         } else {
           wx.showToast({
diff --git a/Pages/yishi/case copy/index.js b/Pages/yishi/case copy/index.js
new file mode 100644
index 0000000..a456036
--- /dev/null
+++ b/Pages/yishi/case copy/index.js	
@@ -0,0 +1,88 @@
+import { API } from './../../../utils/network/api'
+import debounce from './../../../utils/debounce'
+let api = new API()
+const app = getApp()
+Page({
+  data: {
+    navbarData: {
+      showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
+      title: '病历信息', //导航栏 中间的标题
+    },
+    height: app.globalData.height,
+    order_inquiry_id: "",
+    case_detail: {},
+    imglist: []
+  },
+  onLoad(options){
+    console.log("onLoad", options)
+    this.setData({
+      order_inquiry_id: options.order_inquiry_id
+    })
+
+  },
+  goReport:debounce(function(event){
+    wx.showLoading({
+      mask:true,
+      title: '正在打开文件...',
+    })
+    const url=event.currentTarget.dataset.url;
+    const randfile = new Date().getTime() + '检测报告';
+    const newPath = `${wx.env.USER_DATA_PATH}/${randfile}`;
+    wx.downloadFile({
+      // 示例 url，并非真实存在
+      url:url,
+      filePath: newPath,
+      success: function (res) {
+        //const filePath = res.tempFilePath
+        wx.openDocument({
+          fileType:"pdf",
+          showMenu:true,
+          filePath: newPath,
+          success: function (res) {
+            console.log('打开文档成功');
+            wx.hideLoading()
+          },
+          fail:function(error){
+            wx.hideLoading()
+            wx.showToast({
+              title:res,
+              icon:"none"
+            })
+          }
+        })
+      },
+      fail:function(error){
+        wx.showToast({
+          title:error,
+          icon:"none"
+        })
+      }
+     
+    })
+  }),
+  formatImgList(){
+    let diagnose_images = this.data.case_detail.diagnose_images?this.data.case_detail.diagnose_images:[];
+    let img_list = [];
+    diagnose_images.forEach(item => {
+      let img = {};
+      img.isImage = true;
+      img.url = item;
+      img_list.push(img);
+    })
+    this.setData({
+      imglist: img_list
+    })
+  },
+  onShow(){
+    //获取患者问诊病例
+    api.getInquiryDetail({order_inquiry_id: this.data.order_inquiry_id}).then(response => {
+      console.log(response);
+      this.setData({
+        case_detail: response.data
+      })
+    }).then(res => {
+      this.formatImgList();
+    }).catch(errors => {console.error(errors);})
+  },
+
+})
\ No newline at end of file
diff --git a/Pages/yishi/case copy/index.json b/Pages/yishi/case copy/index.json
new file mode 100644
index 0000000..a00e82d
--- /dev/null
+++ b/Pages/yishi/case copy/index.json	
@@ -0,0 +1,8 @@
+{
+  "component": true,
+  "usingComponents": {
+    "te-nav-bar": "/commpents/te_navbar",
+    "van-icon": "@vant/weapp/icon/index",
+    "van-uploader": "@vant/weapp/uploader/index"
+  }
+}
\ No newline at end of file
diff --git a/Pages/yishi/case copy/index.wxml b/Pages/yishi/case copy/index.wxml
new file mode 100644
index 0000000..be3cbc5
--- /dev/null
+++ b/Pages/yishi/case copy/index.wxml	
@@ -0,0 +1,114 @@
+<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>
+  <view class="data_box">
+    <view class="data_box_top">
+      <view class="name">{{case_detail.name}}</view>
+      <view class="sex">{{case_detail.sex==1?'男':case_detail.sex==2?'女':'未知'}}｜{{case_detail.age}}岁 </view>
+    </view>
+    <view class="info">
+      <view class="height info_item"><text class="info_title">身高：</text><text class="info_val">{{case_detail.height==null?'未知':case_detail.height + 'CM'}}</text></view>
+      <view class="weight info_item"><text class="info_title">体重：</text><text class="info_val">{{case_detail.weight==null?'未知':case_detail.weight + 'KG'}}</text></view>
+      <view class="minzu info_item"><text class="info_title">民族：</text><text class="info_val">{{case_detail.nation_name==''?'未知':case_detail.nation_name}}</text></view>
+      <view class="zhiye info_item"><text class="info_title">职业：</text><text class="info_val">{{case_detail.job_name==''?'未知':case_detail.job_name}}</text></view>
+      <view class="hunyin info_item"><text class="info_title">婚姻：</text><text class="info_val">{{case_detail.marital_status==0?'未婚':case_detail.marital_status==1?'已婚':case_detail.marital_status==2?'离异':'未知'}}</text></view>
+    </view>
+    <view class="disease_box">
+      <view class="disease_box_item" wx:if="{{case_detail.disease_class_name}}">
+        <view class="title">所患疾病：</view>
+        <view class="conent">{{case_detail.disease_class_name}}</view>
+      </view>
+      <view class="disease_box_item"  wx:if="{{case_detail.diagnosis_date}}">
+        <view class="title">确诊日期：</view>
+        <view class="conent" >{{dateSubstr.substring(case_detail.diagnosis_date,0,10)}}</view>
+      </view>
+      <!-- <view class="disease_box_item">
+        <view class="title">医生诊断：</view>
+        <view class="conent">{{case_detail.disease_class_name}}</view>
+      </view> -->
+      <view class="disease_box_item" wx:if="{{case_detail.diagnosis_hospital != '' && case_detail.diagnosis_hospital != null}}">
+        <view class="title">确诊医院：</view>
+        <view class="conent">{{case_detail.diagnosis_hospital}}</view>
+      </view>
+      <view class="disease_box_item" wx:if="{{case_detail.drugs_name != '' && case_detail.drugs_name != null}}">
+        <view class="title">正在服用的药品信息：</view>
+        <view class="conent">{{case_detail.drugs_name==''?'无':''}}</view>
+      </view>
+      <view class="disease_info" wx:if="{{case_detail.drugs_name != '' && case_detail.drugs_name != null}}">
+        详细描述：{{case_detail.drugs_name}}
+      </view>
+      <view class="disease_box_item" wx:if="{{case_detail.disease_desc}}">
+        <view class="title">病情描述：</view>
+        <view class="conent">{{case_detail.disease_desc}}</view>
+      </view>
+      <view class="disease_box_item" wx:if="{{case_detail.product.length > 0}}">
+        <view class="title">用药意向：</view>
+        <view class="conent">
+          <view wx:for="{{case_detail.product}}">{{item}};</view>
+        </view>
+      </view>
+      <view class="disease_box_item" wx:if="{{case_detail.diagnose_images.length > 0}}">
+        <view class="title">复诊凭证(病例/处方单/检查报告/住院单)：</view>
+        <view class="conent" wx:if="{{case_detail.diagnose_images.length == 0}}">无</view>
+      </view>
+      <view class="img_box" >
+        <van-uploader image-fit="aspectFit" file-list="{{ imglist }}" show-upload="{{false}}" deletable="{{false}}" />
+      </view>
+
+    </view>
+  </view>
+  <view class="sugarbox" wx:if="{{case_detail.detection_project}}" data-url="{{case_detail.detection_project.detection_link}}" bindtap="goReport">
+    <view class="main_title">{{case_detail.detection_project_name}}</view>
+  <view class="data_box sugar" >
+     <view class="sugar_left">
+        <view class="name">糖组检测</view>
+        <view class="date">{{case_detail.detection_project.detection_time}}</view>
+     </view>
+     <van-icon name="arrow" />
+  </view>
+  </view>
+  <view class="main_title" wx:if="{{!(case_detail.is_taboo == null && case_detail.is_allergy_history == null && case_detail.is_family_history == null && case_detail.is_pregnant == null && case_detail.drink_wine_status == null && case_detail.smoke_status == null && case_detail.is_operation == null && case_detail.chemical_compound_status == null  && case_detail.chemical_compound_status == null)}}">其他信息</view>
+  <view class="data_box orther" wx:if="{{!(case_detail.is_taboo == null && case_detail.is_allergy_history == null && case_detail.is_family_history == null && case_detail.is_pregnant == null && case_detail.drink_wine_status == null && case_detail.smoke_status == null && case_detail.is_operation == null && case_detail.chemical_compound_status == null  && case_detail.chemical_compound_status == null)}}">
+    <view class="disease_box">
+      <view class="disease_box_item" wx:if="{{case_detail.is_taboo != null}}">
+        <view class="title">是否服用过您想购买的药品且无相关禁忌：</view>
+        <view class="conent">{{case_detail.is_taboo==0?'否':'是'}}</view>
+      </view>
+      <view class="disease_box_item" wx:if="{{case_detail.is_allergy_history != null}}">
+        <view class="title">过敏史：</view>
+        <view class="conent">{{case_detail.is_allergy_history==0?'否':case_detail.allergy_history}}</view>
+      </view>
+      <view class="disease_box_item" wx:if="{{ case_detail.is_family_history != null}}">
+        <view class="title">家族史：</view>
+        <view class="conent">{{case_detail.is_family_history==0?'否':case_detail.family_history}}</view>
+      </view>
+      <view class="disease_box_item" wx:if="{{case_detail.is_pregnant != null}}">
+        <view class="title">是否备孕、妊娠或者哺乳期：</view>
+        <view class="conent">{{case_detail.is_pregnant==0?'否':case_detail.pregnant}}</view>
+      </view>
+      <view class="disease_box_item" wx:if="{{ case_detail.drink_wine_status != null}}">
+        <view class="title">饮酒史：</view>
+        <view class="conent">{{case_detail.drink_wine_status==1?'从不':case_detail.drink_wine_status==2?'偶尔':case_detail.drink_wine_status==3?'经常':case_detail.drink_wine_status==4?'每天':case_detail.drink_wine_status==5?'已戒酒':'其他'}}</view>
+      </view>
+      <view class="disease_box_item" wx:if="{{case_detail.smoke_status != null}}">
+        <view class="title">吸烟史：</view>
+        <view class="conent">{{case_detail.smoke_status==1?'从不':case_detail.smoke_status==2?'偶尔':case_detail.smoke_status==3?'经常':case_detail.smoke_status==4?'每天':case_detail.smoke_status==5?'已戒烟':'其他'}}</view>
+      </view>
+      <view class="disease_box_item" wx:if="{{case_detail.is_operation != null}}">
+        <view class="title">手术史：</view>
+        <view class="conent">{{case_detail.is_operation==0?'否':case_detail.operation}}</view>
+      </view>
+      <view class="disease_box_item" wx:if="{{ case_detail.chemical_compound_status != null}}">
+        <view class="title">接触化学物：</view>
+        <view class="conent">{{case_detail.chemical_compound_status==1?'从不':case_detail.chemical_compound_status==2?'偶尔':case_detail.chemical_compound_status==3?'经常':case_detail.chemical_compound_status==4?'每天':'其他'}}</view>
+      </view>
+      <view class="disease_info" wx:if="{{case_detail.chemical_compound_describe != '' && case_detail.chemical_compound_describe != null}}">
+        详细描述:{{case_detail.chemical_compound_describe}}
+      </view>
+    </view>
+  </view>
+  <view style="height: 50rpx;">
+    
+  </view>
+</view>
\ No newline at end of file
diff --git a/Pages/yishi/case copy/index.wxss b/Pages/yishi/case copy/index.wxss
new file mode 100644
index 0000000..992f24c
--- /dev/null
+++ b/Pages/yishi/case copy/index.wxss	
@@ -0,0 +1,127 @@
+page{
+  background-color: #F6F6F6;
+}
+.container{
+  /* width: 100vw; */
+  padding: 0 4vw;
+}
+.main_title{
+  font-size: 16px;
+  color: #000000;
+  margin: 30rpx 0;
+}
+.data_box{
+  margin-top: 20rpx;
+  width: calc(92vw - 40rpx);
+  background-color: #fff;
+  border-radius: 20rpx;
+  padding: 20rpx;
+}
+.data_box_top{
+  display: flex;
+}
+.name{
+  font-size: 34rpx;
+  color: #3CC7C0;
+  margin-right: 20rpx;
+}
+.sex{
+  font-size: 34rpx;
+  color: #666666;
+}
+.info{
+  background: #FAFAFA;
+  border-radius: 10rpx;
+  padding-top: 10rpx;
+  display: flex;
+  flex-wrap: wrap;
+  margin: 20rpx 0 0;
+  padding-bottom: 20rpx;
+}
+.info_item{
+  text-align: left;
+  /* width: 190rpx; */
+  /* height: 60rpx; */
+  margin-top: 10rpx;
+  display: flex;
+  align-items: center;
+  margin-left: 20rpx;
+  align-items: flex-start;
+}
+.info_title{
+  font-size: 28rpx;
+  color: #333333;
+}
+.info_val{
+  font-size: 28rpx;
+  flex: 1;
+  color: #666666;
+}
+.disease_box{
+
+}
+.disease_box_item{
+  margin-bottom: 30rpx;
+  display: flex;
+}
+.data_box .disease_box_item:first-child{
+  margin-top: 20rpx;
+}
+.orther .disease_box_item:first-child{
+  margin-top: 0rpx;
+}
+.title{
+  font-size: 30rpx;
+  color: #333333;
+}
+.conent{
+  flex: 1;
+  font-size: 28rpx;
+  color: #666666;
+  word-wrap:break-word;
+  word-break:break-all;
+}
+.disease_info{
+  background: #FAFAFA;
+  border-radius: 10rpx;
+  padding: 10rpx;
+  font-size: 26rpx;
+  color: #999999;
+  margin-bottom: 20rpx;
+}
+.img_box{
+  display: flex;
+  flex-wrap: wrap;
+}
+.van-uploader__wrapper{
+  display: flex !important;
+}
+.van-uploader__preview{
+  padding: 20rpx 15rpx !important;
+  background-color: #E4E4E4 !important;
+  border-radius: 15rpx;
+  width: 150rpx;
+  display: flex;
+  justify-content: center;
+}
+.orther{
+  margin-bottom: 50rpx;
+}
+
+.sugar{
+  display: flex;
+  align-items: center;
+  justify-content:space-between ;
+}
+.sugar .name{
+  color:#333;
+ 
+  font-size: 30rpx;
+}
+.sugar .date{
+  margin-top: 12rpx;
+  font-size: 24rpx;
+  font-weight: 400;
+  color: rgba(0,0,0,0.45);
+  
+}
\ No newline at end of file
diff --git a/Pages/yishi/case/index.js b/Pages/yishi/case/index.js
index 05f5261..0883819 100644
--- a/Pages/yishi/case/index.js
+++ b/Pages/yishi/case/index.js
@@ -1,5 +1,5 @@
-import { API } from './../../../utils/network/api'
-import debounce from './../../../utils/debounce'
+import { API } from '../../../utils/network/api'
+import debounce from '../../../utils/debounce'
 let api = new API()
 const app = getApp()
 Page({
@@ -8,16 +8,44 @@ Page({
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '病历信息', //导航栏 中间的标题
     },
+    pathography_id:'',
     height: app.globalData.height,
-    order_inquiry_id: "",
+    order_inquiry_id:"",
     case_detail: {},
     imglist: []
   },
   onLoad(options){
     console.log("onLoad", options)
-    this.setData({
-      order_inquiry_id: options.order_inquiry_id
-    })
+  
+    if(options.order_inquiry_id){
+      this.setData({
+        order_inquiry_id: options.order_inquiry_id
+      })
+  
+      //获取患者问诊病例
+      api.getInquiryDetail({order_inquiry_id: this.data.order_inquiry_id}).then(response => {
+        console.log(response);
+        this.setData({
+          case_detail: response.data
+        })
+      }).then(res => {
+        this.formatImgList();
+      }).catch(errors => {console.error(errors);})
+    }
+    if(options.pathography_id){
+      this.setData({
+        pathography_id: options.pathography_id
+      })
+        //获取患者问诊病例
+        api.getPathographyDetail(options.pathography_id).then(response => {
+          this.setData({
+            case_detail: response.data
+          })
+        }).then(res => {
+          this.formatImgList();
+        }).catch(errors => {console.error(errors);})
+    }
+     
 
   },
   goReport:debounce(function(event){
@@ -74,15 +102,7 @@ Page({
     })
   },
   onShow(){
-    //获取患者问诊病例
-    api.getDoctorInquiryCase({order_inquiry_id: this.data.order_inquiry_id}).then(response => {
-      console.log(response);
-      this.setData({
-        case_detail: response.data
-      })
-    }).then(res => {
-      this.formatImgList();
-    }).catch(errors => {console.error(errors);})
+ 
   },
 
 })
\ No newline at end of file
diff --git a/Pages/yishi/case/index.wxml b/Pages/yishi/case/index.wxml
index be3cbc5..a0380bc 100644
--- a/Pages/yishi/case/index.wxml
+++ b/Pages/yishi/case/index.wxml
@@ -1,6 +1,7 @@
 <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>
   <view class="data_box">
     <view class="data_box_top">
@@ -10,8 +11,8 @@
     <view class="info">
       <view class="height info_item"><text class="info_title">身高：</text><text class="info_val">{{case_detail.height==null?'未知':case_detail.height + 'CM'}}</text></view>
       <view class="weight info_item"><text class="info_title">体重：</text><text class="info_val">{{case_detail.weight==null?'未知':case_detail.weight + 'KG'}}</text></view>
-      <view class="minzu info_item"><text class="info_title">民族：</text><text class="info_val">{{case_detail.nation_name==''?'未知':case_detail.nation_name}}</text></view>
-      <view class="zhiye info_item"><text class="info_title">职业：</text><text class="info_val">{{case_detail.job_name==''?'未知':case_detail.job_name}}</text></view>
+      <view class="minzu info_item"><text class="info_title">民族：</text><text class="info_val">{{case_detail.nation_name?case_detail.nation_name:'未知'}}</text></view>
+      <view class="zhiye info_item"><text class="info_title">职业：</text><text class="info_val">{{case_detail.job_name?case_detail.job_name:'未知'}}</text></view>
       <view class="hunyin info_item"><text class="info_title">婚姻：</text><text class="info_val">{{case_detail.marital_status==0?'未婚':case_detail.marital_status==1?'已婚':case_detail.marital_status==2?'离异':'未知'}}</text></view>
     </view>
     <view class="disease_box">
@@ -108,7 +109,31 @@
       </view>
     </view>
   </view>
-  <view style="height: 50rpx;">
-    
+  
+  <view  wx:if="{{case_detail.order_prescription}}">
+    <view class="main_title">处方信息</view>
+    <view class="data_box">
+      <view class="disease_box">
+      <view class="disease_box_item" >
+        <view class="title">诊断：</view>
+        <view class="conent">{{case_detail.order_prescription.icd_name}}</view>
+      </view>
+      <view class="disease_box_item" >
+        <view class="title">时间：</view>
+        <view class="conent">{{case_detail.order_prescription.doctor_created_time}}</view>
+      </view>
+      <view class="disease_box_item" >
+        <view class="title">药品：</view>
+        <view class="conent" wx:for="case_detail.order_prescription.product" wx:for-item="itemName">
+        {{itemName}};
+        </view>
+      </view>
+      <view class="disease_box_item" >
+        <view class="title">用法：</view>
+        <view class="conent">{{case_detail.order_prescription.single_use}}</view>
+      </view>
+  </view> 
+    </view>
+
   </view>
 </view>
\ No newline at end of file
diff --git a/Pages/yishi/case/index.wxss b/Pages/yishi/case/index.wxss
index 992f24c..9535db7 100644
--- a/Pages/yishi/case/index.wxss
+++ b/Pages/yishi/case/index.wxss
@@ -30,24 +30,30 @@ page{
   color: #666666;
 }
 .info{
+  
   background: #FAFAFA;
   border-radius: 10rpx;
-  padding-top: 10rpx;
+
+
   display: flex;
   flex-wrap: wrap;
   margin: 20rpx 0 0;
-  padding-bottom: 20rpx;
+  padding:10rpx 20rpx 20rpx;
 }
 .info_item{
   text-align: left;
-  /* width: 190rpx; */
+  width: 203rpx; 
   /* height: 60rpx; */
   margin-top: 10rpx;
+
   display: flex;
   align-items: center;
-  margin-left: 20rpx;
+
   align-items: flex-start;
 }
+.info_item:nth-child(3n){
+   text-indent: 20rpx;
+}
 .info_title{
   font-size: 28rpx;
   color: #333333;
diff --git a/Pages/yishi/patient_sick/index.js b/Pages/yishi/patient_sick/index.js
new file mode 100644
index 0000000..e60e9bc
--- /dev/null
+++ b/Pages/yishi/patient_sick/index.js
@@ -0,0 +1,173 @@
+// Pages/yishi/medince_list/index.js
+import { API } from './../../../utils/network/api'
+import debounce from "./../../../utils/debounce"
+let api = new API()
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    navbarData: {
+    
+      showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
+      title: '患者病例', //导航栏 中间的标题
+    },
+    page:1,
+    family_id:'',
+    currentSick:null,
+    isLoding:false,
+    list:[],
+    isLock:false,
+    per_page:10,
+    keyword:'',
+  },
+  goDetail:debounce(function(event){
+    console.log(event)
+    let id=event.currentTarget.dataset.id;
+    console.log(id);
+    app.go("/Pages/yishi/case/index?order_inquiry_id="+id);
+  }),
+  goDetailbefore:debounce(function(event){
+    let id=event.currentTarget.dataset.id;
+    app.go("/Pages/yishi/case/index?pathography_id="+id);
+  },600),
+  changeInput:debounce(function(event){
+    const { value }= event.detail;
+    this.setData({
+      isLock:false,
+      page:1,
+      list:[],
+      keyword:value
+    })
+    this.handleGetList();
+  },600),
+  goSearch(){
+    this.setData({
+      isLock:false,
+      list:[],
+      page:1
+    })
+    this.handleGetList();
+  },
+  confirmSearch(event){
+    const { value }= event.detail;
+    this.setData({
+      isLock:false,
+      list:[],
+      page:1,
+      keyword:value
+    })
+    this.handleGetList();
+  },
+  lower(){
+    console.log('===触底了！！===');
+  let {page,isLock}=this.data;
+   if(!isLock){
+        page++;
+      this.setData({
+        page:page
+      });
+      this.handleGetList();
+   }
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  handleGetCurrent(){
+    const {order_inquiry_id}=this.data;
+    api.getSimpleInquiry({
+      order_inquiry_id
+    }).then(data=>{
+      this.setData({
+        currentSick:data.data
+      })
+      console.log(data);
+    })
+  },
+  handleGetList(){
+    const {page,per_page,family_id,isLoding}=this.data;
+    if(isLoding)return false;
+    this.setData({
+      isLoding:true
+    })
+    api.getPathography({
+      page,
+      per_page,
+      family_id,
+
+    }).then(data=>{
+      this.setData({
+        isLoding:false
+      })
+      let result=data.data.data;
+      if(result.length==0){
+         this.setData({
+          isLock:true
+        });
+        return false;
+      }     
+      this.setData({
+        list:this.data.list.concat(result)
+      });
+    }).catch(errors => {console.error(errors);})
+  },
+  onLoad(options) {
+     this.setData({
+      family_id:options.family_id,
+      order_inquiry_id:options.order_inquiry_id
+     })
+    this.handleGetCurrent();
+    this.handleGetList();
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/Pages/yishi/patient_sick/index.json b/Pages/yishi/patient_sick/index.json
new file mode 100644
index 0000000..7c7df28
--- /dev/null
+++ b/Pages/yishi/patient_sick/index.json
@@ -0,0 +1,9 @@
+{
+  "component": true,
+  "usingComponents": {
+    "te-nav-bar": "/commpents/te_navbar",
+    "van-empty": "@vant/weapp/empty/index",
+    "van-icon": "@vant/weapp/icon/index",
+    "van-divider": "@vant/weapp/divider/index"
+  }
+}
\ No newline at end of file
diff --git a/Pages/yishi/patient_sick/index.wxml b/Pages/yishi/patient_sick/index.wxml
new file mode 100644
index 0000000..9bfae37
--- /dev/null
+++ b/Pages/yishi/patient_sick/index.wxml
@@ -0,0 +1,49 @@
+<!--Pages/yishi/patient_sick/index.wxml-->
+<!--Pages/yishi/medince_list/index.wxml-->
+<view class="page">
+  <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
+<view class="container">
+  <!-- <view class="searchCon">
+    <view class="searchbox">
+      <input type="text" 	value="" class="searchIpt" placeholder="请输入药品名称" 	confirm-type="search" 	bindinput="changeInput"	bindconfirm="confirmSearch"/>
+      <image src="../../../static/images/yishi/tabbar_icon/ss.png" mode="" class="searchImg" bindtap="goSearch"/>
+    </view>
+  </view> -->
+  <scroll-view scroll-y="true" class="scrollbox"  bindscrolltolower="lower" wx:if="{{list.length>0 ||  currentSick}}" >
+    <view class="cell" bindtap="goDetail" data-id="{{order_inquiry_id}}">
+      <view class="titlebox">
+        <view class="title">
+         <view class="name">{{currentSick.patient_name}}</view>
+         <view class="age">{{currentSick.patient_sex==1?'男':'女'}}｜{{currentSick.patient_age}}岁</view>
+       </view>
+       <van-icon name="arrow" class="icon" />
+      </view>
+      <view class="row">
+       <text class="desc">病情描述:</text>
+       <text class="descdetail"> {{currentSick.disease_desc}} </text>
+      </view>
+      <view class="date">您于{{currentSick.reception_time}}接诊</view>
+      <view class="mark">本次问诊</view>
+    </view>
+
+    <view class="cell" wx:for="{{list}}" wx:key="pathography_id"  bindtap="goDetailbefore" data-id="{{item.pathography_id}}">
+      <view class="titlebox">
+        <view class="title">
+         <view class="name">{{item.name}}</view>
+         <view class="age">{{item.sex==1?'男':'女'}}｜{{item.age}}岁</view>
+       </view>
+       <van-icon name="arrow" />
+      </view>
+      <view class="row">
+       <text class="desc">病情描述:</text>
+       <text class="descdetail"> {{item.disease_desc}} </text>
+      </view>
+      <view class="date">您与{{item.reception_time}}接诊</view>
+     
+    </view>
+  
+    <van-divider contentPosition="center" wx:if="{{list.length > 0 && isLock}}">到底了~</van-divider>
+  </scroll-view>
+  <van-empty description="暂无数据" wx:if="{{list.length == 0 && !currentSick}}" />
+ 
+</view></view>
diff --git a/Pages/yishi/patient_sick/index.wxss b/Pages/yishi/patient_sick/index.wxss
new file mode 100644
index 0000000..a1846a5
--- /dev/null
+++ b/Pages/yishi/patient_sick/index.wxss
@@ -0,0 +1,160 @@
+/* Pages/yishi/patient_sick/index.wxss *//* Pages/yishi/medince_list/index.wxss */
+page{
+  height:100vh;
+  background-color: #F6F6F6;
+}
+.page{
+  height:100vh;
+  display: flex;
+  flex-direction: column;
+}
+ .container{
+  /* height:calc(100vh - 135rpx); */
+  display: flex; 
+  overflow: hidden;
+   /* overflow-y: scroll; */
+  /* -webkit-overflow-scrolling: touch;  */
+  flex-direction: column;
+}
+.searchCon{
+  width:100%;
+  
+  background:#fff;
+}
+.searchbox{
+  display: flex;
+  margin:32rpx;
+  align-items: center;
+  height: 80rpx;
+background: #FFFFFF;
+border-radius: 40rpx;
+border: 2rpx solid #3CC7C0;
+
+}
+.searchIpt{
+  flex:1;
+  margin-left: 32px;
+}
+.searchImg{
+  width: 40rpx;
+  height:40rpx;
+  padding:30rpx;
+}
+.tips{
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  position: absolute;
+  width: 200rpx;
+  height:200rpx;
+  font-size: 22rpx;
+font-weight: 400;
+color: #666666;
+}
+.desc{
+  text-align: center;
+}
+.medimgbox{
+  position: relative;
+  width: 200rpx;
+  height:200rpx;
+  margin-left: 30rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius:5rpx;
+}
+.medImg{
+ width:120rpx;
+ height:128rpx;
+ 
+}
+.titlebox{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.cell{
+  position: relative;
+  padding:20rpx 0;
+  background: #FFFFFF;
+box-shadow: 0rpx 2rpx 16rpx 2rpx rgba(0,0,0,0.02);
+border-radius: 12rpx;
+  margin:0 32rpx 20rpx;
+
+}
+.rightbox{
+  flex:1;
+  margin-left: 24rpx;
+  margin-right: 20rpx;
+}
+.scrollbox{
+  margin-top: 20rpx;
+  flex:1;
+   overflow-y: scroll;
+  -webkit-overflow-scrolling: touch; 
+}
+.bottombox{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.info .name{
+  word-break: break-all;
+font-size: 32rpx;
+ font-weight: 600;
+color: rgba(0,0,0,0.85);
+}
+.company{
+  margin-top: 5rpx;
+  font-size: 26rpx;
+font-weight: 400;
+color: rgba(0,0,0,0.45);
+}
+.cell .title{
+display: flex;
+font-size: 34rpx;
+color: #333333;
+}
+.cell{
+  padding:20rpx;
+}
+.cell .name{
+margin-right: 20rpx;
+}
+.row{
+  overflow: hidden;
+  display: -webkit-box;
+  -webkit-line-clamp: 2; /* 设置最大显示行数 */
+  -webkit-box-orient: vertical;
+  text-overflow: ellipsis;
+  word-break: break-all;
+  margin-top: 20rpx;
+  font-size: 30rpx;
+  line-height: 42rpx;
+color: #666666;
+}
+.date{
+margin-top: 20rpx;
+font-size: 26rpx;
+font-weight: 400;
+color: #999999;
+}
+.mark{
+  position: absolute;
+  bottom:0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  right:0px;
+  font-size: 24rpx;
+font-weight: 400;
+color: #3CC7C0;
+  width: 126rpx;
+height: 54rpx;
+background: #E9FFFE;
+border-radius: 10rpx 0rpx 0rpx 10rpx;
+}
+.icon{
+  color:#c3c3c3;
+}
\ No newline at end of file
diff --git a/Pages/yishi/sickform/index.js b/Pages/yishi/sickform/index.js
new file mode 100644
index 0000000..3aabba6
--- /dev/null
+++ b/Pages/yishi/sickform/index.js
@@ -0,0 +1,79 @@
+// Pages/sickform/index.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    navbarData: {
+      showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
+      title: '问诊表', //导航栏 中间的标题
+    },
+    params:null,
+    basic:[],
+    preson:[]
+  },
+  
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    if(options.params){
+      this.setData({
+        params:options.params
+      });
+      let data=JSON.parse(options.params);
+      console.log(options.params)
+    }
+    
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/Pages/yishi/sickform/index.json b/Pages/yishi/sickform/index.json
new file mode 100644
index 0000000..6a36619
--- /dev/null
+++ b/Pages/yishi/sickform/index.json
@@ -0,0 +1,8 @@
+{
+  "usingComponents": {
+    "te-nav-bar": "/commpents/te_navbar",
+    "van-radio": "@vant/weapp/radio/index",
+    "van-radio-group": "@vant/weapp/radio-group/index"
+    
+  }
+}
\ No newline at end of file
diff --git a/Pages/yishi/sickform/index.wxml b/Pages/yishi/sickform/index.wxml
new file mode 100644
index 0000000..7ff733d
--- /dev/null
+++ b/Pages/yishi/sickform/index.wxml
@@ -0,0 +1,229 @@
+<!--Pages/sickform/index.wxml-->
+<!--Pages/yishi/patient_sick/index.wxml-->
+<!--Pages/yishi/medince_list/index.wxml-->
+<view class="page">
+  <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
+  <view class="container"> 
+    <view class="questionbox">
+    <view class="cellbox">
+   <view class="basictitle">基本信息</view>
+    <view class="cell" >
+        <view class="cellrow">
+          <view class="name">
+           1、身高（CM）
+          </view>
+          <view class="iptbox">
+            <input type="text" value="{{user_info.name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请输入身高" placeholder-class="placeholder" class="ipt" disabled="{{notallowEdit?true:false}}" />
+
+          </view>
+        </view>
+      </view>
+      <view class="cell" >
+        <view class="cellrow">
+          <view class="name">
+          2、体重（KG）
+          </view>
+          <view class="iptbox">
+            <input type="text" value="{{user_info.name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请请输入体重" placeholder-class="placeholder" class="ipt" disabled="{{notallowEdit?true:false}}" />
+
+          </view>
+        </view>
+      </view>
+      <view class="cell" >
+        <view class="cellrow">
+          <view class="name">
+           3、婚姻状况
+          </view>
+          <view class="iptbox">
+            <input type="text" value="{{user_info.name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请选择婚姻状况" placeholder-class="placeholder" class="ipt" disabled="{{notallowEdit?true:false}}" />
+            <image src="{{img_host+'/righticon.png'}}"  class="righticon"></image>
+
+          </view>
+        </view>
+      </view>
+      <view class="cell" >
+        <view class="cellrow">
+          <view class="name">
+           4、民族
+          </view>
+          <view class="iptbox">
+            <input type="text" value="{{user_info.name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请选择民族" placeholder-class="placeholder" class="ipt" disabled="{{notallowEdit?true:false}}" />
+            <image src="{{img_host+'/righticon.png'}}"  class="righticon"></image>
+          </view>
+        </view>
+      </view>
+      <view class="cell" >
+        <view class="cellrow">
+          <view class="name">
+           5、职业
+          </view>
+          <view class="iptbox">
+            <input type="text" value="{{user_info.name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请请选择职业" placeholder-class="placeholder" class="ipt" disabled="{{notallowEdit?true:false}}" />
+            <image src="{{img_host+'/righticon.png'}}"  class="righticon"></image>
+          </view>
+        </view>
+      </view>
+     
+   </view>
+   <view class="cellbox">
+     <view class="basictitle">个人情况</view>
+     <view class="sickHis">
+        <view class="list">
+          <view class="qa">
+            <view class="num">1、</view>
+            <view class="titlebox">
+              <view class="title">您是否有过敏史？</view>
+              <view class="radio" >
+                <van-radio-group value="{{ filter.numberTOstring(personInfo.is_allergy_history) }}" class="singlegroup" data-id="is_allergy_history" bind:change="onChangeRadio" direction="horizontal">
+                  <van-radio name="1" checked-color="#3cc7c0">是</van-radio>
+                  <van-radio name="0" checked-color="#3cc7c0">否</van-radio>
+                </van-radio-group>
+              </view>
+              <!-- hidden="{{checkGuomin!=1}}" -->
+              <view class="radiotip" hidden="{{personInfo.is_allergy_history!=1}}">
+                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done" bindinput="handelFocus"  value="{{personInfo.allergy_history}}" data-id="hideGuomin" data-value="allergy_history"></textarea>
+                <view class="textbox" hidden="{{hideGuomin}}">
+                  <view class="desc"><text>过敏史：</text>请填写过敏源，如药物，请写出药名；如食物，请写具体如鸡蛋、牛奶等（限制50个字）</view>
+                </view>
+              </view>
+            </view>
+          </view>
+          <view class="qa">
+            <view class="num">2、</view>
+            <view class="titlebox">
+              <view class="title">您是否有家族病史？</view>
+              <view class="radio">
+                <van-radio-group class="singlegroup" value="{{filter.numberTOstring(personInfo.is_family_history)}}"   data-id="is_family_history" bind:change="onChangeRadio" direction="horizontal">
+                  <van-radio name="1" checked-color="#3cc7c0">是</van-radio>
+                  <van-radio name="0" checked-color="#3cc7c0">否</van-radio>
+                </van-radio-group>
+              </view>
+              <view class="radiotip" hidden="{{personInfo.is_family_history!=1}}">
+                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.family_history}}" data-id="hideFamilysick" data-value="family_history"></textarea>
+                <view class="textbox" hidden="{{hideFamilysick}}">
+                  <view class="desc"><text>家族病史：</text>请详细填写相关家族病史（限制50个字）</view>
+                </view>
+              </view>
+            </view>
+          </view>
+          <view class="qa" wx:if="{{sex==2}}">
+            <view class="num">{{startIndex}}、</view>
+            <view class="titlebox">
+              <view class="title">您是否处于备孕、妊娠、哺乳期？</view>
+              <view class="radio">
+                <van-radio-group value="{{ filter.numberTOstring(personInfo.is_pregnant) }}"  bind:change="onChangeRadio"   data-id="is_pregnant"  direction="horizontal" class="singlegroup">
+                  <van-radio name="1" checked-color="#3cc7c0">是</van-radio>
+                  <van-radio name="0" checked-color="#3cc7c0">否</van-radio>
+                </van-radio-group>
+              </view>
+              <view class="radiotip" hidden="{{personInfo.is_pregnant!=1}}">
+                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.pregnant}}" data-id="hidePregnant" data-value="pregnant"></textarea>
+                <view class="textbox" hidden="{{hidePregnant}}">
+                  <view class="desc">请描述您目前所处阶段，如备孕中、哺乳期中、妊娠月份。（限制50个字）</view>
+                </view>
+              </view>
+            </view>
+          </view>
+          <view class="qa">
+            <view class="num">{{startIndex+1}}、</view>
+            <view class="titlebox">
+              <view class="title">是否做过手术</view>
+              <view class="radio">
+                <van-radio-group  value="{{ filter.numberTOstring(personInfo.is_operation) }}"  data-id="is_operation"  bind:change="onChangeRadio" direction="horizontal" class="singlegroup">
+                  <van-radio name="1" checked-color="#3cc7c0">是</van-radio>
+                  <van-radio name="0" checked-color="#3cc7c0">否</van-radio>
+                </van-radio-group>
+              </view>
+              <view class="radiotip" hidden="{{personInfo.is_operation !=1}}">
+                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.operation}}" data-id="hideOperation" data-value="operation"></textarea>
+                <view class="textbox" hidden="{{hideOperation}}">
+                  <view class="desc">请描述具体手术名称和做手术医院</view>
+                </view>
+              </view>
+            </view>
+          </view>
+          <view class="qa">
+            <view class="num">{{startIndex+2}}、</view>
+            <view class="titlebox">
+              <view class="title">是否有饮酒史</view>
+              <view class="radio">
+                <van-radio-group value="{{ filter.numberTOstring(personInfo.drink_wine_status) }}"   data-id="drink_wine_status"  bind:change="onChangeRadio" direction="horizontal" class="group">
+                  <van-radio name="1" checked-color="#3cc7c0">从不</van-radio>
+                  <van-radio name="2" checked-color="#3cc7c0">偶尔</van-radio>
+                  <van-radio name="3" checked-color="#3cc7c0">经常</van-radio>
+                  <van-radio name="4" checked-color="#3cc7c0">每天</van-radio>
+                  <van-radio name="5" checked-color="#3cc7c0">已戒酒</van-radio>
+                </van-radio-group>
+              </view>
+            </view>
+          </view>
+          <view class="qa">
+            <view class="num">{{startIndex+3}}、</view>
+            <view class="titlebox">
+              <view class="title">是否有吸烟史</view>
+              <view class="radio">
+                <van-radio-group value="{{ filter.numberTOstring(personInfo.smoke_status) }}"  data-id="smoke_status" bind:change="onChangeRadio" direction="horizontal" class="group">
+                  <van-radio name="1" checked-color="#3cc7c0">从不</van-radio>
+                  <van-radio name="2" checked-color="#3cc7c0">偶尔</van-radio>
+                  <van-radio name="3" checked-color="#3cc7c0">经常</van-radio>
+                  <van-radio name="4" checked-color="#3cc7c0">每天</van-radio>
+                  <van-radio name="5" checked-color="#3cc7c0">已戒烟</van-radio>
+                </van-radio-group>
+              </view>
+            </view>
+          </view>
+          <view class="qa">
+            <view class="num">{{startIndex+4}}、</view>
+            <view class="titlebox">
+              <view class="title">是否有接触过化学物</view>
+              <view class="radio">
+                <van-radio-group value="{{filter.numberTOstring(personInfo.chemical_compound_status)}}"   data-id="chemical_compound_status"    bind:change="onChangeRadio" direction="horizontal" class="group">
+                  <van-radio name="1" checked-color="#3cc7c0">从不</van-radio>
+                  <van-radio name="2" checked-color="#3cc7c0">偶尔</van-radio>
+                  <van-radio name="3" checked-color="#3cc7c0">经常</van-radio>
+                  <van-radio name="4" checked-color="#3cc7c0">每天</van-radio>
+                </van-radio-group>
+              </view>
+             
+              <view class="radiotip" wx:if="{{(personInfo.chemical_compound_status!=1 && personInfo.chemical_compound_status)}}">
+                <textarea placeholder=" "  show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done" value="{{personInfo.chemical_compound_describe}}" bindinput="handelFocus"  data-id="hideChemical" data-value="chemical_compound_describe"></textarea>
+                <view class="textbox" hidden="{{hideChemical}}">
+                  <view class="desc"><text>化学物：</text>请详细填写接触过的相关化学物（限制50个字）</view>
+                </view>
+              </view>
+
+            </view>
+          </view>
+          <view class="qa">
+            <view class="num">{{startIndex+45}}、</view>
+            <view class="titlebox">
+              <view class="title">确诊医院是？</view>
+             
+              <view class="radiotip" >
+                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.family_history}}" data-id="hideFamilysick" data-value="family_history"></textarea>
+                <view class="textbox" hidden="{{hideFamilysick}}">
+                  <view class="desc"><text></text>请填写确诊医院名称</view>
+                </view>
+              </view>
+            </view>
+          </view>
+          <view class="qa">
+            <view class="num">{{startIndex+6}}、</view>
+            <view class="titlebox">
+              <view class="title">服用药品是？</view>
+             
+              <view class="radiotip" >
+                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.family_history}}" data-id="hideFamilysick" data-value="family_history"></textarea>
+                <view class="textbox" hidden="{{hideFamilysick}}">
+                  <view class="desc"><text></text>请详细填写所服药物（限制50个字）</view>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+   </view>
+   </view>
+ </view>
+</view>
+
diff --git a/Pages/yishi/sickform/index.wxss b/Pages/yishi/sickform/index.wxss
new file mode 100644
index 0000000..c6c0877
--- /dev/null
+++ b/Pages/yishi/sickform/index.wxss
@@ -0,0 +1,143 @@
+page{
+  overflow: hidden;
+}
+.container{
+ height:100vh;
+ overflow: scroll;
+ background-color: #F6F6F6;
+}
+.cellbox{
+  background-color: #fff;
+}
+.questionbox{
+  overflow-y: scroll;
+}
+.cellbox .cell{
+  background-color: #fff;
+  align-items: center;
+  display: flex;
+  padding:0 32rpx;
+ }
+ .cellrow{
+   height:105rpx;
+   width:100%;
+   justify-content: space-between;
+   align-items: center;
+   display: flex;
+   border-bottom:1rpx solid #E3E4E5;
+ }
+ .cell:last-child .cellrow{
+   border-bottom: none;
+ }
+ .iptbox{
+   display: flex;
+   flex:1;
+  
+   justify-content: flex-end;
+ }
+ .righticon{
+   width:24rpx;
+   height: 48rpx;
+ }
+ .name{
+   display: flex;
+   align-items: center;
+ }
+ .name .red{
+   margin-top: 20rpx;
+   color:#E34D59;
+ }
+ .placeholder{
+   text-align: right;
+   font-size: 28rpx;
+ font-weight: 400;
+ color: #C5C8CB;
+ }
+ .ipt{
+   width:100%;
+   text-align: right;
+   color: #666666;
+   font-size: 28rpx;
+ }
+ .basictitle{
+   margin-top: 30rpx;
+  font-size: 34rpx;
+  padding:30rpx 32rpx 10rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  color: #1C2023;
+ }
+ .sickHis{
+  background-color: #fff;
+  /* margin-top: 20rpx; */
+  padding:1rpx 52rpx 40rpx;
+
+}
+.list .qa{
+  display: flex;
+  margin-top: 30rpx; 
+  border-bottom:1rpx solid  #E3E4E5;
+}
+.titlebox{
+  flex:1;
+
+}
+textarea{
+  position: relative;
+  z-index:1;
+  width:100%;
+  color:#333;
+  height:132rpx;
+}
+.radio{
+  margin: 30rpx 0rpx 30rpx 0;
+}
+.group .van-radio--horizontal{
+  margin-right: 11rpx;
+}
+.singlegroup .van-radio--horizontal{
+  margin-right:44rpx;
+}
+.singlegroup .van-radio--horizontal:nth-child(2n){
+  margin-right: 0rpx;
+}
+.group .van-radio--horizontal:nth-child(3n){
+  margin-right: 0;
+}
+.radiotip{
+  position: relative;
+  padding:24rpx 20rpx;
+  justify-content: center;
+  margin-top: 20rpx;
+  line-height: 42rpx;
+background: #F2F2F2;
+border-radius: 10rpx;
+font-size: 28rpx;
+color:#999;
+margin-bottom: 20rpx;
+}
+.radiotip .textbox{
+  top:20rpx;
+  left:20rpx;
+  margin-top: 0;
+  width:auto;
+  height: 100rpx;
+  font-weight: normal;
+  z-index: 0;
+  position: absolute;
+  right:20rpx;
+}
+
+.radiotip text{
+  white-space: nowrap;
+  color:#333;
+}
+.van-radio__label{
+   padding-right:40rpx!important;
+}
+/* .van-radio__label:nth-child(3){
+  padding-right:0rpx!important;
+} */
+.van-radio{
+  margin-bottom: 10rpx!important;
+}
\ No newline at end of file
diff --git a/Pages/yishi/write_sickform/index.js b/Pages/yishi/write_sickform/index.js
new file mode 100644
index 0000000..c718c74
--- /dev/null
+++ b/Pages/yishi/write_sickform/index.js
@@ -0,0 +1,154 @@
+// Pages/yishi/write_sickform/index.js
+import { API } from './../../../utils/network/api'
+import debounce from "./../../../utils/debounce"
+let api = new API()
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    navbarData: {
+      showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
+      title: '问诊表', //导航栏 中间的标题
+    },
+    obj:{
+      height:'身高',
+      weight:'体重',
+      nation_name:'民族',
+      job_name:'职业',
+      marital_status:'婚姻状态',
+      allergy_history:'是否有过敏史？',
+      family_history:'是否有家族病史？',
+      is_pregnant:'是否处于备孕、妊娠、哺乳期？',
+      is_operation:'是否做过手术？',
+      drink_wine_status:'是否有饮酒史?',
+      smoke_status:'是否有吸烟史？',
+      chemical_compound_status:'是否有接触过化学物?',
+      diagnosis_hospital:'确诊医院是？',
+      is_take_medicine:'服用药品是？'
+ 
+    },
+    order_inquiry_id:'',
+    list1: [],
+    list2: [],
+    result: [],
+  },
+  onChange(event) {
+    this.setData({
+      result: event.detail,
+    });
+  },
+
+  toggle(event) {
+    const { item } = event.currentTarget.dataset;
+    const checkbox = this.selectComponent(`.checkboxes-${item}`);
+    checkbox.toggle();
+  },
+ handleList(order_inquiry_id){
+  api.getUnfilled({
+    order_inquiry_id
+  }).then(data=>{
+   let result=data.data;
+   let {obj}=this.data;
+   
+   let arr1=[];
+   let arr2=[];
+   result.forEach(item => {
+     if(item=="weight" || item=="height" || item=="marital_status" || item=="nation_name" || item=="job_name"){
+      if(obj[item]){
+        arr1.push(item);
+       }
+     }else{
+      if(obj[item]){
+        arr2.push(item);
+       }
+     }
+    
+   })
+    this.setData({
+      list1:arr1,
+      list2:arr2,
+    })
+  })
+ },
+ handleSend(){
+   let {order_inquiry_id,result}=this.data;
+     if(result.length==0){
+       wx.showToast({
+         title: '请至少选择一项',
+         icon:'none'
+       })
+       return false;
+     }
+     console.log(this.data.result);
+  api.doctorSendUnfilled({
+    order_inquiry_id,
+    fields:this.data.result
+  }).then(data=>{
+    if(data.code==200){
+      wx.navigateBack();
+    }
+  })
+ },
+  noop() {},
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    this.setData({
+      order_inquiry_id:options.order_inquiry_id,
+    })
+    this.handleList(options.order_inquiry_id);
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/Pages/yishi/write_sickform/index.json b/Pages/yishi/write_sickform/index.json
new file mode 100644
index 0000000..14785a0
--- /dev/null
+++ b/Pages/yishi/write_sickform/index.json
@@ -0,0 +1,9 @@
+{
+  "usingComponents": {
+    "te-nav-bar": "/commpents/te_navbar",
+    "van-checkbox": "@vant/weapp/checkbox/index",
+    "van-cell": "@vant/weapp/cell/index",
+    "van-cell-group": "@vant/weapp/cell-group/index",
+    "van-checkbox-group": "@vant/weapp/checkbox-group/index"
+  }
+}
\ No newline at end of file
diff --git a/Pages/yishi/write_sickform/index.wxml b/Pages/yishi/write_sickform/index.wxml
new file mode 100644
index 0000000..199fcad
--- /dev/null
+++ b/Pages/yishi/write_sickform/index.wxml
@@ -0,0 +1,61 @@
+<!--Pages/yishi/write_sickform/index.wxml-->
+<te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
+<view class="container" wx:if="{{list1.length>0 || list2.length>0}}">
+    <view class="listbox">
+      <van-checkbox-group value="{{ result }}" bind:change="onChange" >
+    <view class="box" wx:if="{{list1.length>0}}">
+      <view class="title">基本信息</view>
+     <van-cell-group >
+    <van-cell
+      wx:for="{{ list1 }}"
+      wx:key="index"
+      title="{{obj[item]}}"
+      value-class="value-class"
+      clickable
+      data-item="{{ item }}"
+      bind:click="toggle"
+    >
+    <van-checkbox
+        catch:tap="noop"
+        checked-color="#3CC7C0"
+        class="checkboxes-{{ item }}"
+        name="{{ item }}"
+      />
+    </van-cell>
+  </van-cell-group>
+    </view>
+
+    <view class="box" wx:if="{{list2.length>0}}">
+      <view class="title">个人情况</view>
+     <van-cell-group >
+    <van-cell
+      wx:for="{{ list2 }}"
+      wx:key="index"
+      title="{{obj[item]}}"
+      value-class="value-class"
+      clickable
+      data-item="{{ item }}"
+      bind:click="toggle"
+    >
+    <van-checkbox
+        catch:tap="noop"
+        checked-color="#3CC7C0"
+        class="checkboxes-{{ item }}"
+        name="{{ item }}"
+      />
+    </van-cell>
+  </van-cell-group>
+    </view>
+
+  </van-checkbox-group>
+    </view>
+  <view class="bottom">
+     <view class="btn" bindtap="handleSend">
+     发送给患者
+     </view>
+  </view>
+</view>
+<view class="nocontainer" wx:else>
+    <image src="../../../static/images/yishi/tabbar_icon/empty.png" class="empty"/>
+    <view>暂无可询问内容</view>
+</view>
\ No newline at end of file
diff --git a/Pages/yishi/write_sickform/index.wxss b/Pages/yishi/write_sickform/index.wxss
new file mode 100644
index 0000000..6218821
--- /dev/null
+++ b/Pages/yishi/write_sickform/index.wxss
@@ -0,0 +1,68 @@
+/* Pages/yishi/write_sickform/index.wxss */
+page{
+  overflow: hidden;
+  background-color: #F6F6F6;
+}
+.van-hairline--top-bottom:after {
+  border-top-width: 0px!important;
+}
+.van-hairline--bottom:after {
+  border-top-width: 0px!important;
+}
+.listbox{
+  flex:1;
+  overflow-y: scroll;
+}
+.container{
+  width: 100vw;
+  height:100vh;
+  display:flex;
+  flex-direction: column;
+}
+.value-class {
+  order:-1!important;
+  flex: none !important;
+}
+.title-class{
+  order:2!important;
+}
+.box .title{
+  padding: 25rpx 30rpx 10rpx;
+  margin-top: 20rpx;
+font-size: 34rpx;
+font-weight: 500;
+color: #1C2023;
+background:#fff;
+}
+.bottom{
+  background-color: #FFFFFF;
+ height:274rpx;
+  width:100%;
+}
+.bottom .btn{
+
+  margin:40rpx 30rpx;
+  height: 80rpx;
+  font-size: 30rpx;
+color: #FFFFFF;
+display: flex;
+align-items: center;
+justify-content: center;
+background: #3CC7C0;
+border-radius: 8rpx;
+}
+.empty{
+  margin-top: 400rpx;
+  width:161rpx;
+  height:162rpx;
+}
+.nocontainer{
+  margin-top: 20rpx;
+  background-color: #fff;
+  height:100vh;
+  display: flex;
+  font-size: 24rpx;
+  color: #999999;
+  align-items: center;
+  flex-direction: column;
+}
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.wxml b/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.wxml
index a9764ea..797419b 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.wxml
@@ -1,5 +1,5 @@
 <block>
-    <view class="audio-message {{isMine?'my-audio':''}}">
+    <view class="audio-message {{isMine?'my-audio':'your-audio'}}">
     <!-- 默认状态 未播放 -->
     <view class='audio' wx:if="{{!isPlay}}" bindtap='audioPlay' data-id="{{message.ID}}"  >
     <image class="image {{isMine?'my-image':''}}" src="../../../../../static/images/sendingaudio.png"/> {{renderDom[0].second}}s
diff --git a/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.wxss b/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.wxss
index 4bfe7d2..5528738 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.wxss
@@ -3,10 +3,42 @@
   border-radius: 2px 10px 10px 10px;
   border: 1px solid #D9D9D9;
 }
+
 .my-audio {
-  border-radius: 10px 2px 10px 10px;
-  background: rgba(0,110,255,0.10);
-  border: 1px solid rgba(0,110,255,0.30);
+  position: relative;
+  border-radius: 10px 10px 10px 10px;
+  background: rgb(212, 239, 241);
+  border: 1rpx solid #1ACAD3;
+}
+.my-audio::after{
+  content:'';
+  position: absolute;
+  top: 35rpx;
+  right: -19rpx;
+  transform: translate(-50%,-50%) rotate(-135deg);
+  width: 16rpx;
+  height: 16rpx;
+  background: rgb(212, 239, 241);
+  border: 1rpx solid #1ACAD3;
+  border-style: none none solid solid
+}
+.your-audio {
+  position: relative;
+  border-radius: 10px 10px 10px 10px;
+  background: rgb(255, 255, 255);
+  border: 1rpx solid #D8D8D8;
+}
+.your-audio::after{
+  content:'';
+  position: absolute;
+  top: 35rpx;
+  left: 0;
+  transform: translate(-50%,-50%) rotate(45deg);
+  width: 16rpx;
+  height: 16rpx;
+  background: rgb(255, 255, 255);
+  border: 1rpx solid #D8D8D8;
+  border-style: none none solid solid
 }
 .audio {
   /*border-radius: 2px 10px 10px 10px;*/
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
index 862f845..5064003 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
@@ -206,6 +206,21 @@ Component({
           }];
           return renderDom;
         }
+
+        //12：问诊表
+        if (customMessage.message_type === GDXZ_CUSTOM_MSEEAGE.WENZHEN_FORM) {
+          let data = customMessage.data;
+          console.log(data)
+          const renderDom = [{
+            type: 'wenzhen_form',
+            order_inquiry_id:data.order_inquiry_id,
+            message_path:data.message_path,
+            case_patient_message_path:data.case_patient_message_path,
+            case_filled_fields:data.case_filled_fields,
+            case_not_fill_fields:data. case_not_fill_fields
+          }];
+          return renderDom;
+        }
       } catch (error) {
       }
       // 客服咨询
@@ -296,9 +311,9 @@ Component({
     })
     }),
    goSick(event){
-    const url=event.currentTarget.dataset.url;
-    console.log(url);
-    app.go(url);
+    // const url=event.currentTarget.dataset.url;
+    // console.log(url);
+    // app.go(url);
    },
 
     openLink(e) {
@@ -315,6 +330,15 @@ Component({
     go(e){
       let url = e.currentTarget.dataset.url;
       app.go(url);
+    },
+    goList(event){
+      console.log(event);
+      const {ismine,params}=event.currentTarget.dataset;
+      console.log(params);
+      if(!ismine){
+        app.go('/Pages/yishi/sickform/index?params='+params)
+      }
+     // app.go(url);
     }
   },
 });
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
index e8a283e..24e350a 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
@@ -126,6 +126,22 @@
     
   
      
+  </view>
+  <view wx:if="{{renderDom[0].type==='wenzhen_form'}}"  class="wenzhen_form {{isMine?'my-custom':'your-custom'}}" bindtap="goList" data-ismine="{{isMine}}" data-params="{{isMine?renderDom[0].case_not_fill_fields:renderDom[0].case_filled_fields}}">
+    <view class="title" wx:if="{{renderDom[0].case_not_fill_fields}}">
+      <image src="../../../../../../static/images/yishi/tabbar_icon/wenzhenform.png" mode="" class="wzicon" />
+     <view class="name">问诊表</view>
+    </view>
+    <view class="title" wx:else>
+      <image src="../../../../../../static/images/yishi/tabbar_icon/wenzhenform.png" mode="" class="wzicon"/>
+     <view class="name">问诊表-已填写</view>
+    </view>
+    <view class="descform" wx:if="{{renderDom[0].case_not_fill_fields}}">
+      等待填写
+    </view>
+    <view class="descform" wx:else>
+      点击查看
+    </view>
   </view>
 </view>
 
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss
index 8f390db..a9afbe1 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss
@@ -362,4 +362,61 @@ color: rgba(0,0,0,0.45);
 .sicklook .see{
  
   font-size: 32rpx;
+}
+.wenzhen_form{
+  width: 60vw;
+  position: relative;
+  z-index:2;
+  border-radius: 10px 10px 10px 10px;
+  border: 1rpx solid #1ACAD3; 
+}
+.wenzhen_form .title{
+  border-radius: 16rpx 16rpx 0 0;
+  padding:20rpx;
+  display: flex;
+  align-items: center;
+  font-size: 30rpx;
+color: #FFFFFF;
+ background-color: #3CC7C0;
+}
+.wzicon{
+  margin-right: 10rpx;
+  width:42rpx;
+  height:46rpx;
+}
+.my-custom .wenzhen_form{
+  background: rgb(212, 239, 241);
+}
+.wenzhen_form .descform{
+  padding:15rpx 20rpx;
+  background-color: #ffff;
+  font-size: 28rpx;
+color: #666666;
+  border-radius: 0 0 16rpx 16rpx;
+}
+.wenzhen_form.my-custom::after{
+  content:'';
+  position: absolute;
+  top: 35rpx;
+  right: -19rpx;
+  transform: translate(-50%,-50%) rotate(-135deg);
+  width: 16rpx;
+  height: 16rpx;
+  background: #3CC7C0; 
+  border: 1rpx solid #1ACAD3;
+  /* background: rgb(255, 255, 255);
+  border: 1rpx solid #E7E7E7; */
+  border-style: none none solid solid;
+}
+.wenzhen_form.your-custom::after{
+  content:'';
+  position: absolute;
+  top: 35rpx;
+  left: 0;
+  transform: translate(-50%,-50%) rotate(45deg);
+  width: 16rpx;
+  height: 16rpx;
+  background: #3CC7C0; 
+  border: 1rpx solid #1ACAD3;
+  border-style: none none solid solid
 }
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js
index e8fb78d..282e635 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.js
@@ -55,7 +55,12 @@ Component({
     },
     baseInfo: {
       type: Object,
-      value: {}
+      value: {},
+      observer(newVal) {
+        this.setData({
+          family_id: newVal.family_id,
+        });
+      },
     },
     message_rounds:{
       type: Number,
@@ -74,6 +79,7 @@ Component({
   data: {
     conversation: {},
     message: '',
+    family_id:'',
     extensionArea: false,
     sendMessageBtn: false,
     displayFlag: '',
@@ -113,26 +119,85 @@ Component({
 
   lifetimes: {
     attached() {
+      let _this = this;
       // 加载声音录制管理器
       this.recorderManager = wx.getRecorderManager();
-      this.recorderManager.onStop((res) => {
+      this.recorderManager.onStop(async(resData) => {
         wx.hideLoading();
         if (this.data.canSend) {
-          if (res.duration < 1000) {
+          if (resData.duration < 1000) {
             wx.showToast({
               title: '录音时间太短',
               icon: 'none',
             });
           } else {
+            let {from}=this.data;
             // res.tempFilePath 存储录音文件的临时路径
-            const message = wx.$TUIKit.createAudioMessage({
-              to: this.getToAccount(),
-              conversationType: this.data.conversation.type,
-              payload: {
-                file: res,
-              },
+            if(from){
+              await this.handlegetLastInquiry();
+            }
+           
+            let conversationID = this.data.conversation.conversationID
+            let promise = wx.$TUIKit.getConversationProfile(conversationID);
+            promise.then((imResponse)=> {
+              // console.log("getConversationProfile 正在执行")
+              // 获取成功
+              // console.log(imResponse.data.conversation); // 会话资料
+              _this.setData({
+                conversation: imResponse.data.conversation
+              })
+            }).catch(function(imError) {
+              console.warn('getConversationProfile error:', imError); // 获取会话资料失败的相关信息
             });
-            this.$sendTIMMessage(message);
+      
+            Promise.all([promise]).then(res => {
+              // 获取最后一条消息
+              let last_message = this.data.conversation.lastMessage;
+              // console.log("last_message: ", last_message);
+              let cloudCustomData = "";
+              let cloudCustomDataJson = "";
+              if(last_message.cloudCustomData){
+                cloudCustomData = last_message.cloudCustomData;
+              }
+              if(cloudCustomData){
+                cloudCustomDataJson = JSON.parse(cloudCustomData);
+              }
+              let message_rounds = 0;
+              let patient_family_data = {};
+              patient_family_data.patient_name = this.data.baseInfo.patient_family_name;
+              patient_family_data.patient_sex = this.data.baseInfo.patient_family_sex;
+              patient_family_data.patient_age = this.data.baseInfo.patient_family_age;
+              if(cloudCustomDataJson){
+                message_rounds = cloudCustomDataJson.message_rounds;
+              }
+      
+              let cach_message_rounds = this.data.message_rounds
+              message_rounds = cach_message_rounds>message_rounds?cach_message_rounds:message_rounds
+      
+              const mycloudCustomData = JSON.stringify({
+                order_inquiry_id: this.data.order_inquiry_id,
+                inquiry_type: this.data.inquiry_type,
+                message_type: 0,
+                is_system: 0,
+                message_rounds: message_rounds,
+                patient_family_data: patient_family_data
+              });
+             
+              const message = wx.$TUIKit.createAudioMessage({
+                to: this.getToAccount(),
+                conversationType: this.data.conversation.type,
+                payload: {
+                  file: resData,
+                },
+              cloudCustomData:mycloudCustomData
+            });
+          
+            _this.$sendTIMMessage(message);
+
+          }).catch(err=>{
+           
+            console.log(err)
+          })
           }
         }
         this.setData({
@@ -144,7 +209,6 @@ Component({
           text: '按住说话',
         });
       });
-      let _this = this
       wx.onNetworkStatusChange(function (res) {
         // console.log("onNetworkStatusChange from wenzhen: ")
         // console.log(res.isConnected)
@@ -222,6 +286,9 @@ Component({
         text: '按住说话',
         focus: false,
       });
+      this.setData({
+        displayFlag: '',
+      });
     },
 
     // 长按录音
@@ -493,7 +560,8 @@ Component({
           });
           break;
         case '10'://查看完整病历
-          app.go("/Pages/yishi/case/index?order_inquiry_id="+this.data.order_inquiry_id)
+          // app.go("/Pages/yishi/case/index?order_inquiry_id="+this.data.order_inquiry_id)
+          app.go("/Pages/yishi/patient_sick/index?order_inquiry_id="+this.data.order_inquiry_id+"&family_id="+this.data.family_id)
           break;
         case '11'://在线开方
           let _this = this;
@@ -1073,6 +1141,9 @@ Component({
     showChangYongYu(){
       app.go("/Pages/yishi/quickreply/index?from=chat")
     },
+    showWenZhenBiao(){
+      app.go("/Pages/yishi/write_sickform/index?order_inquiry_id="+this.data.order_inquiry_id)
+    },
 
   },
 });
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxml b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
index de5a1cb..827f1ed 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
@@ -4,7 +4,7 @@
         <view class="TUI-commom-function-item" data-key="11" bindtap="handleCommonFunctions" wx:if="{{baseInfo.multi_point_status == 1 && baseInfo.inquiry_status==4 && baseInfo.multi_point_enable==1}}">在线开处方</view>
     </view>
     <view class="TUI-message-input">
-        <image class="TUI-icon" bindtap="switchAudio" wx:if="{{has_audio}}"
+        <image class="TUI-icon" bindtap="switchAudio" 
         src="{{isAudio ? '../../../../static/assets/keyboard.svg' : '../../../../static/assets/audio.svg'}}" />
         <view wx:if="{{!isAudio || isEmoji}}" class="TUI-message-input-main {{ focus && 'TUI-message-input-main-focus'}}" >
             <textarea focus="{{false}}" hold-keyboard id="mytextarea" class="TUI-message-input-area" adjust-position="{{false}}" cursor-spacing="0"
@@ -28,12 +28,14 @@
           <view class="TUI-sendMessage-btn" wx:if="{{ has_emoji }}">
               <image class="TUI-icon" bindtap="handleEmoji" src="../../../../static/assets/face-emoji.svg" />
           </view>
-          <view wx:if="{{!sendMessageBtn}}" bindtap="handleExtensions" class="TUI-sendMessage-btn">
+           <view class="TUI-sendMessage-btn" wx:if="{{!isAudio || isEmoji}}">
+            <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>
           <view wx:else class="TUI-sendMessage-btn TUI-sendMessage-btn-input" bindtap="sendTextMessage">
               发送
           </view>
+           </view>
         </view>
     </view>
     <view wx:if="{{displayFlag === 'emoji'}}" class="TUI-Emoji-area">
@@ -52,6 +54,10 @@
             <image mode="widthFix" class="TUI-Extension-icon MY-TUI-Extension-icon" src="{{static_host}}/applet/doctor/static/images/chat/wenzi.png" />
             <view class="TUI-Extension-slot-name MY-TUI-Extension-slot-name">常用语</view>
         </view>
+        <view class="TUI-Extension-slot MY-TUI-Extension-slot" bindtap="showWenZhenBiao">
+            <image mode="widthFix" class="TUI-Extension-icon MY-TUI-Extension-icon" src="{{static_host}}/applet/doctor/static/images/chat/wenzi.png" />
+            <view class="TUI-Extension-slot-name MY-TUI-Extension-slot-name">问诊表</view>
+        </view>
         <!-- <view class="TUI-Extension-slot" bindtap="handleSendPicture">
             <image class="TUI-Extension-icon" src="../../../../static/assets/take-photo.svg" />
             <view class="TUI-Extension-slot-name">相机</view>
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxss b/TUIKit/components/TUIChat/components/MessageInput/index.wxss
index 832039d..91973af 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxss
@@ -7,6 +7,7 @@
 .TUI-message-input {
   display: flex;
   padding-bottom: 16rpx;
+  align-items: center;
   background-color: #fff;
   width: 95vw;
   overflow: scroll;
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index 5b04e38..2c15bd3 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -355,7 +355,7 @@ Component({
       let show_avatar = true;
       if(type === "TIMCustomElem"){
         const customMessage = JSON.parse(message.payload.data);
-        if(Number(customMessage.message_type) != GDXZ_CUSTOM_MSEEAGE.PRESCRIBE && Number(customMessage.message_type) != GDXZ_CUSTOM_MSEEAGE.PRESCRIBE_VERIFY && Number(customMessage.message_type) != GDXZ_CUSTOM_MSEEAGE.SUGAR_CHECK){
+        if(Number(customMessage.message_type) != GDXZ_CUSTOM_MSEEAGE.PRESCRIBE && Number(customMessage.message_type) != GDXZ_CUSTOM_MSEEAGE.PRESCRIBE_VERIFY && Number(customMessage.message_type) != GDXZ_CUSTOM_MSEEAGE.SUGAR_CHECK && Number(customMessage.message_type) != GDXZ_CUSTOM_MSEEAGE.WENZHEN_FORM){
           show_avatar = false;
         }
         if(Number(customMessage.message_type) == GDXZ_CUSTOM_MSEEAGE.TRABECULA && refreshBaseInfo){
diff --git a/TUIKit/utils/constant.js b/TUIKit/utils/constant.js
index 59612aa..48f6535 100644
--- a/TUIKit/utils/constant.js
+++ b/TUIKit/utils/constant.js
@@ -51,6 +51,7 @@ const constant = {
     BANNER_MESSAGE: 8,//8 弹框消息
     SUGAR_CHECK:10,//糖组检测
     PATIENT_INFO:11,//患者信息
+    WENZHEN_FORM:12,//问诊表；
   },
 
   OPERATING_ENVIRONMENT: 'imWxTuikit'
diff --git a/app.js b/app.js
index a777328..5b9f7a3 100644
--- a/app.js
+++ b/app.js
@@ -81,7 +81,7 @@ App({
   onShow(){
     // this.imInit();
   },
-  imInit(){
+  imInit(options={},type=1,callback=()=>{}){
     console.log("imInit")
     let usertype = wx.getStorageSync('usertype');
     let userID = wx.getStorageSync('user_id_'+usertype);
@@ -125,9 +125,15 @@ App({
   
         login_promise.then(function(imResponse) {
           // console.log(imResponse.data); // 登录成功
-          
+          callback();
         }).catch(function(imError) {
           console.warn('login error:', imError); // 登录失败的相关信息
+          if(type==1 && imError.indexOf("重复登录")!=-1){
+            wx.showToast({
+              title: '登陆失败',
+              icon:"none"
+            })
+          };
     
         });
     
diff --git a/app.json b/app.json
index 11f31d9..b0c5fe1 100644
--- a/app.json
+++ b/app.json
@@ -60,7 +60,10 @@
     "Pages/agreement_page/index",
     "Pages/yishi/medince_list/index",
     "Pages/yishi/linkPage/linkPage",
-    "Pages/yishi/notify/notify"
+    "Pages/yishi/notify/notify",
+    "Pages/yishi/patient_sick/index",
+    "Pages/yishi/write_sickform/index",
+    "Pages/yishi/sickform/index"
   ],
   "window": {
     "navigationBarBackgroundColor": "#ffffff",
diff --git a/static/images/yishi/tabbar_icon/empty.png b/static/images/yishi/tabbar_icon/empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..4958f707dc63c90f603cfb133f6657c30680f842
GIT binary patch
literal 13659
zcmW-oRa9GTw}pcT55<dnaMu<K?(XjH?iO51ixn@lIK_%n`~!+xaW4+Vi`&`%VT_QA
z<RW{ocgbAy+41VCa@ZJeF+d;?wt~F0Ch%SayqdwN!2kNllMLVu!AnyP2CA7LKLmlO
zK?>56+Ww{|A?U$*0~vM{8@JbM-)BFuj|zy@u?M>gK_(V^EjqCvnWO}t+_8}Vgh%1?
z4A)u67e9IarSEvm%}!;b8D`5ir>1iw!5JcjVd4K0q9-|zh_)U@>!MehpY{vWn|m>>
zGHP5|J7Q@vWdHgSdiYDew#u~g_I14~@cM{QHlvI-f=3CI)%L1*ONjmj1I$Vd?LcOs
zX6wLU!P1t{@0D0$P)D#>(owhgg4l<FI>Hfw0UoW1#6Tj1=yIw1qH9Zh*6dyH4B}Ur
z%~LI#b#`@4$ui-cjf-%=giW-0-kn=;4z}iaQP#PvL~#!$6uXZ$z>?}i5{cMn%J7Ir
z1b#ap_1)a~1`ZJF2|2ISl%_wptlaPpYOgeVjr25BpBKv{`dTF!EH(0~h`dNdxi8e1
z6i85SqB+HK->56{*ZIav)1I}e%qmxk+2Fk+<}?j<%rP%=?thYqa34ycsGQu#Y&EU{
z?f*>hI-TN6*3XP)AAPI!%i-JxkHYw;|HVavgI$hyux`|OhMuX0Zngdv4r<g~Wo6&b
z38xhS1gES9+j7WVI0rF^HPiiaJ^Tj-JkRTLFV{_Ee=K{ug{=x>&u7!Jcg7}B89DeK
z1nw?NA0%Saufw-;Rx1!GwNulggfpq;xoatgT=@T#o#n%A)vxnz3rAyNBMN3Ffv>vW
zb}5$IdYUFMqru$kiH+SOI6umVmqZ2Rr$Jy>5gb~|w4kxwK<1KW8v{I**~l0REDqD3
zLWTx}ALM->Z%#N&7LXE(?|e*Rg(_Wh_Ii%ys?fLwgK5nTeIb#FCue7VWHA~8BvrKV
zJ88)*qHyrtOd|*eqJYWo=iwS<@{=daN)elQf8^JI<%0*(E3kiB4dK}M`!Ak(wtafw
zQkg|BU=p1~?Gl0}r<&W@+3i1EAItTj%e=Qiv2b&%9cn)Dq6v<il8^k3^+ozn(w@Ys
zzxgDt7#f8WOULK6H|CGx4UX8)=C+FAeVYs;VKpa-`Jkydgke>3F-SsY{KHm7uHKW4
z3@p6A+|$#e*w2+$Z2rlk6C?tY7kZnFlU+)BbabTH*xao8C?jiRMAmlqC$W<wYxK-r
z2;}dYRG%{=*{iNwinF=f?DDwQ<g|c8U;!S@S`YhoFwGd-?~x*prDnaW#B7sPUtV)8
zsiT7y8xvz$rTaZ{a}z#hlz`{i*4^QAtSe__^_8kRztn-NCF<^wH1QoNXL@N#I;F`E
z+wm>SL45(G#f62IsfOxo9;C^}&*4IKzThH@!Nv2wXv`?cCF?vt0o_=|rHOm}wEb^A
zBO^@7M@M)nD{p8{qMC-N^{j?s(0sMQtjXBoC~DvK&<8=Qr2T~IKwidvMk}^RZc2>U
z{-VrGBK-l?ASJZNKZ(SgzI_~cZ0ADzp%eFT8G=DWkmtn4<KmE*?@l%HR*_U}o>-xq
z3>%Tx4jG8%zi;U=+ZX=ylpkV^3=R88wu|+w2EfiN!Nl_h6ciK%_IyVuJsOHzWth5k
zsi`0BFfaM$W!N|LuY6$OSw5FrLOo+V4p|PHAMhS;Gqb{lhH8dPo3@$x6wSBwY^*|j
ze0<g`zTR_{IyPt&`Z-FRo!UzDZz?TF5=tHF0_owY-=0XUR{2!++=c%7zsE_W;w8r+
zbDFOv4eB?9d7Ye`7+P6b_3U3sE`GzXs^%V)_r*^`kvP!PnX{t0|0Rc`fJMjTU?BM!
zk@E2L^d{1h?xTETNlA(EmB{M)x~e&64mWD%KtG8WKFk=>f{dAl$4ZuAR4NnkYzsoD
ze!I1i#7$OAQR*-#w69S(Ni6L9SKs;iXl`op^DG$j@^pXIS?U1mvT7=Z_Mi=C1u`Ov
zEkUKloU)fk-iKb#=|z!o1d3?;LWmxT2(Lmu3;Ou^NhJ_NmvOmy21y8Av<6E`5I`JB
zUX(@YG0L;#Sh4*Yb)O-xYYjGuKPoCJFldnHIY6W~v_IoO>M;xCiMal?%Kcol;3CO5
zT+^VFCj89vcPA3yL(>Qekgu)8Qp7*)FC+|vh>Bg!gfa+K6;+iOS`dBx*4~-;OHGz@
z1hXXWxcBsCM1%VNz*TTjaVq5bEQi<q_%T}sRYbC?CPLiJ?!nV(uYQ+SLcA-59NZ8R
zRWZwlO%z__F7$qJb@jc&)deme*n+UlZKKOjN5_tPFc`u*+H6>yKwLt`n)h+ia->mI
z1B5&kkr*vh)xSkjSy}m(V<Gqn2_3eW(|$c~bS$+0gVd^yGh~qNt3Ros0Ve%yGZ-}F
zsHQ=HPm7ajgAGIM%i(u2Ptm*CM?!(s1)u%An!u`Ec!y6!N_d_uAFk<0664`)ZvLga
zsflneQ0wTvCmdp#5)~D7rK1yFeH_em0Ecs0<y)`SI<E{Eii5svoQ2u#j$~*Q^=3sJ
zRHM<r4cgn=_o(5v7D<zzuQFytGaFp+&g1{7fe*WmDysrV!r8YtCLJNC8{HdfU|~TD
z+ltnWSq2a$ZsFwZp7x^8Tg;F6IIz!IKs=oiiZ=tU_DD<Q)704C=Rjayp5OhIPH1J=
zQrU1F0`V}RM>B*n@n#+agzw-gGeTgCcX*}wrnOngg5jbx)b9iTm1AE1-sJk!zjgjL
z=Hq*WGKU<zWZ4hw1`Rv^2@Pglu|D3O`Kc=sm-!NS&cv}Opek=8WI(BCd(w6ZALjW~
zx-UmqH=vC&(640R8>t8J9Y&G-iExLU)NsTO<vK#rS-z90A+Z~7`6~R-1VjtR+bv_E
zt6ULcPuZb#%|*G8+KP(9axT39FwJJQ!}84Up2;t7fD-_-IkdU^Y!9-%!8U@&OIuDh
zEtrzMt^M2kL-h6OsxHeEC3_J}0}f!gow;gsAd8vynN<-)w=?=c22T|Vm=NA)V}eUC
zj(xU*hxkq08|~+LsapQ*TkH-C6NTB+Sh4MgI?_<`JZ2QJ3xaI?$EAWiPnMe=rFU_(
z^4q-j9eHiX$~6fX0{-9~Nhc$;&*q>~Qlr$CmF=rcOQ~<8Zq-{2+2X_Y;>qI>IPl}8
z{gjkOTXh}s^YiO2^9#kW_zl8Y2tiEC56J^e&WZGI;-wbM!bFwhJ#ByX{G2%P4Kn7?
z!&df!mJEwJFEPvSDQ$X-bS!)~V)}OG5p}-V8^ubE@MVfDlSruK-~Z}xiOFSG$m5=t
zq8*`@jpSes0iC~w0YP!vmR>s1CkTlZQ&EF78<7>|2eeDNt@qseBJu@7bV2gpPJ;R1
zsl8;btrl)Y^?e&dn6Ti3siKU$tGtdkhbf8Q-F-HD5aM3Phf%-8xm)-0Q3jHVG0r~N
zu!^Or)g^JMso7cVBgP-JVoYJL`fn#wlpxcHxNm~;h+TipDKz(Nodg|!Z}A-=Z$kzd
zW};BPKas&BOs!_k0J8UM-ewv_8dgZrg;mmR$kR5JxPd05>*eA2Wp8iKroE=ncJN0u
z4$~hJD+;AdHaxM|R5u)b`_1io+lCFiU4-RlYD9JGCwS_AMsA(gzD7p5Qx`E8?c3i@
zaVXy}N`MVOOTQc<fC7X5vAKT>EJyp%-ObJI49Hx#-av=%NzRtL5K&3XrZlRk0Vbh_
zX({WSW?;B={KWjc?v}oV1~pvO@9*MP&G+y5MGkM%|1=d(L-UYu3jNjtQmYt!UO<1s
z(`RfBxsu9fY*yo{chg*giV>i6NCu`dhnN>2v`(S@%wniiXJ@C}LaiAUzDK`9PO&6(
zc1gdn4&QR+#xu#|a>t}7LXH2J=_pi*pCjAXW+%7G1Vr&SRX>x^Pb5Dop%|;5hCf?4
ztn{T68Lag<&JHwvO?0h!#F2CE>3KC&`i92hf7#ni@Sb7GQfPwfiZA46elfHtenchj
z4fSe=-x;}##sqj^=SLn72#>IxO<soGjQNo>nq2c8<sn@adJ;E528J+s$^o|EDrk=L
zTd6*6LBn6__dp2K>E5aRE4N`r4r@lJBj5oMW0oBX?Yk53+ppYk!JuNM#H@&2%-l?H
zr1jBE_NXs@6JFFyNX*gaHVAhJ-ksb+a>`)R8~^uP@zrl>F#c;W>=O;T;d9E-t%J^J
zgEr9So@wDJW`1ivXfg;|80`%a5RP__j<r$jet9DMyubH_SaqWg&(?S8^+$)kgfjK9
zv9TL%KzSa@Kh<I50w#&)$J-W?7>##Jn`tIcWj>IN1cTH&N>FJxk`7T#$Eipw%%zW*
zf)>P%3HCc%$0n3Ax-8in#W0I8jnPF8=Q+tp(A^st8Ip3$`f7&Ehp)nWNUf|Rqi<o5
zDZXHCO~8-WH#ramzO#PFEXtthwqJ=}-pw2GJy}M1>`V(S+W8h$S5<|{LdQ1I92pJQ
z9#b?Zb-@FTH0rS|Tdum*5aYu5(r2EFvpMk{u$c(q<|wyk8{IQ}<J0e@Ng3k1u6ZyN
zXA{EJO2e`}hNm(U&`87wg(gUXf_N;WvZ)KSA$`IYi&Uycy_)D|vKsi<V%c3b4mJle
zHo3x~^1d?Qla9mE+y};)8A3-VP07W%Ih2x!V;K}a%0$N58#KJ|fs{f`5pSU6NgBR<
z`<~8(4OfSXev~)1Cy8-q(9RZowO$Me{m$C(W6DVI<7pOmG3oDxaJ=g`)&<4B?jV5&
z%nNEH0#ednjk#wiaI4~Jd++^|mJKn7CMQO0I51avsm#K?LyF{NzaVkDm_qmLU25Jw
zgcc3TRBz~qP?71{qFANu&V^0}*DeI<ytfeGim4m=x`_PM4~*O5WP5gF9Q-RuVG#3I
zBP&nnM1Y!;laq#D8o^Bew@Gv@h7}IWBnB@OOi>;f%JSFVoY+o7Z>=UJsw-O>JQRYX
zTs+tx`%^zl^v4GEv7XFf^`0`CS|u6xIl&kw&eVIp`0iUF;{$4>Qsp*+KUVKg5|XHv
zRVaoRxeYMW73$&deE)`jjZUpItn0o2ziN*)6;DuX<m0Xu_Yt4GleBwfD6Zk8o=COf
z{XI)1#St6noJ*tfwR~j1QO8*{<<D9-#6^n;I6ny~;<ML4U-1~C@B`~<K&|x$AA%&+
z31<BtI)Kb8m=umhlntOFEh=?zNm4NT^=fAK5ZTRv8r~3MHJ~LU>J>JDS4o3hWWFeo
zqliaOj*IF;a9#oWua)%d^-T8eZiR=3U`qzhxVG;P`iy9`;nK1;&(Qzq@1TSOb02u;
zcWNvHR#@N5e*OjK%e}Gw_Q1(D(W%n46*lgwr+ruaY&YxhvezUQ_N+(xL+8C`nX0Gg
zu#nux@_1v_1n|HkO!REsE$8A+`e%6YPncQp_GDvd_WQnZ1E5ER6(mule~N<Oa1Lx=
z5W3@yNh3}*qz2L&Uio3K7oCYfsn{b}S%OKU_llz{WXuPjMxS4DCf`Kb_2<*M*W>RG
z2NXGGGt#CnPoMYPK72TPybY!%*p*6G^?q^)y==l{%JMb|+n;!M2H%<gB*uWYRb$d&
z%bLK$`6D5+T;i&;<UA+}4^5#UNaE{4N<51>?Sq<=%<O8;>~?O2x(=_3XbK5TwWVx$
zyVkU<e1cVFbT#11_BH2+1<YUPEFv%UJ2?aU(`uoYX)-2stdZ-(pe-IaB%MG>%nE&u
zFaAn;(JMCXG9^Z0rzyCRsehfHh^|Q`V(L|?g|!l-QIasTONOui5@UeLajv(p?(^4t
zNNU>N{vUab{YtSn{#K}01PVusvx^I1N@oIygIGmD60B!)vet1+yV9Ibizv#o^XL@a
zfbTPL-dwlqoWk@gQZ~%mh;e%hZZ&Vd`okmBuT@2dbd^lc{V#1u;!pbRY}LD}V@F{9
zVYOA13Z-&rr;|&$GYh$%bNV`cAY56A!)DxiK37%KUdfw=`|)Blg?&wY43l3a$f;O$
zZdXfNL9#XE(Kl;yzeB=1Yv=q+m{h0TK^fN&=Fw@}R_nus>{$<;yMaX@=sXCHhhtyg
zPm2N338rBcr3BfA%B6qcTf5jE5}ka1H700PzZk1|?Jq<_-w=F%=~ivj!eM}@Z~Zio
zgn9Exct1$|`A`j)FnBhR8p;f&3CPe4ERe^Rf^@l9!I;%tgYpyFIDfOB{A7GR$3NeI
zqzIE@G|sp7O==X7cr`IU?u|kf36vY&Temz8lDUlq-0x<+W_z9f!m51;?#eoA-A-|H
z%3;*rmx<XhZj7-YzZ<g?<F(i=U|OSiy`KzIrL<<z-u3!-f{SwM{10C6%^ZE(kgoUh
zUETva$lR^`fg|$oR^UQU?dCQ4@c^st`TcUHLyNw75P`891MCB(P_Xr&*Xs*Ug0viq
zlX=p2gCDlfg=)cn@V{PdS>97P8CO;owC-ja0Ydr!BedyT=Kq#1iR_~}G%Vk?iz<UC
z5?&r1)rxsZJUD7D{@aK?JIbuGrB>vqx<C%Y#<8RYL6M-O%Y1jx67_|EF(dA)Cd{ou
zOk)1EJ+F7CF~M<#uFFZG*T-296`3}2oS_af0cU+qmIccl8D@&7-(_M9+J76UmoFjd
zSn!HxOCgo4A307ODDXEa*-{?2qGIgz!nPe^Z{7bZz$QJ-b)4&>(#rXX#dSu9l&(2#
zYbahei*6tlQ1vl+K&t1sQZ&qBR-AfbulL<;hu&+P?`a6JOVG7XIa=~l=xd_iM#!z7
zC%TlkbFp_qu{5AJd^33LO%x$Bg6sa<FvUZMcMQ>}g<Sk*W@A4JJosWQMK+6zR1oC6
zmHpJq$CYh>_WAoc;ilW!beq2k;kJMHp3CZ>ZNphgJfN7OCR)g2$tEkr2hh#2j8?{Z
zUUZZnx)}_SL*CEVSyRK08Az<C5L@WqDNrQ^W_C2*g`ymy9KTIq(MeY&0Q5sR7Oodr
zWo91lk3EfvtrSQ~LGa$fO}ES1&At*x+fFR7Eb6sCamyAM;uTnFHh>Z=*L!RaqIVpM
zl9e+cZL!w={8L?9+bzFvz2lo-UiUz^uC(fC{Xuq&+i5kvnQ69#?K@T{wEM6waiPMV
zn4{o|P^IV<#noIq_|I>@4bhnv6P>x~ZwAu>Hg{tJB<`5OY(!DV)ZZL&M)d#FjGQtu
zF$w9aIfjLVpR@0r-^d`DRe9w<<jCqzuxcnV_ydz%dd^zSXh{H44$%R&Y>FMLBj2f9
zl_Q(W{C6=l!<88bE;;3w>aVe<Qtw}K-(LS#TEy8M4`hTxlj^6>RqD49A(lyg84a)~
zh=jFzeyPenBq5xO{V8oa$4GnR!-7z(DXZ;_36?xYvW|AelDEqBI%D^!sGDrlnOFL!
z!3guap$^=FV8(#wK*xnxNMuG&-)Oz&vjnW=Xd4}qG&9*die}a_j&3a5=C*?V-?qr^
zf1_~vL><P$hqr2*Ptji8-&jUINp(KIZm&g&zLN=H=QC+=2|8N??v1{@!1i;{umm{5
z5qhr+mHkY5t>&)R6OkluE8BqeMNxru*0=eRxny~lb>cojODl`%jV#!r1`40}@ZUeP
zllT6Aho;M2HILLye3VZ27H2WuDYp-Nbk+aG<@_y|j=GU8<}dweUB%Yo2eSNFK_oLT
zyZH%I9=E*(D9lG-A5TZaiOu$GWhvm`ap)l?n&sdFivC2vzKP$OPQwuv5c|THe`SV>
zhcm&{W9yzG8Rd_x#Ms??8rQRM#w&rWgk}=ZUIPw7Eo+@;Z?zk9dbKjieBrvV_usSa
z<vu5Zxge^fUM^C_1Azt-sTfzfHA|?);x9hA(x_p_&b-^XcOPoItrf0|g|8!OB`C6M
zzINhLoF0l#>1*+)8O2eF`dlJg4O`^}P~l~3D0aAZKi_<!Kw>8ahuwB;%<1ar<RkPM
zKjw3f&I;w7J6HQ$hxLC<KuZ9ZrIInvmn252#Vq{0s|x0LjZVyY)zvxB5!e^S%ZH1g
zJtwMQUbt(=mM8IGz|v^e8a3!`J<zP(y<#{`<cmjhJYp4xF;YAZrY>IGP7cLb@-Arm
zf7lp2p0@2%(j<ydW*PH9TsOKp8Fl{IH+~2vI}NGN>Hb}}q_d0BO;>sMgEZV>JwKt?
zr19ImK<&!C0=!-z{Y!mH+Js*e9tB>pDc?~FduC%wJ)DB>*K&(@^N~@fb~Y{<G{(Wl
zkLu)ky^AiSFAJK02stpf_#{u?e%g7v{$uh@*YnMayVOoY<GTqoiP>*BDps<A;`*`@
z#cuibxeYy;4t~{1S@%DVi05_M^lq?a*F}O^rq9X^ZhrXp<@hY;O<Bizkn04TZ3x_>
zzRMbSYEM%C^H*f`Dz;Z$`!1;tJekc0g2Ch!a78o5-n?w#hMf!NPh?oxO!ZJ6UdXTY
z>!kep`WB;*1*KdXUa(XP?gXo}t4w=WHKM79sCW@huD({0Wmb~i9P}Zx(O9i&-k<v&
zQw)VM^+zT74Z9Lc#6gy|M)+PoML;~!b#ywpD5@t=>Rwu3>4+Bg7MwaiB!bjs&v_aL
zpv+Vo4Vy|W+m$As4AYL?_-dcQ5}zAm7}a7N*%IlZ=|gqpZk}P%ruf`7+I0^n*kl6I
z(vRsStfb&AoHao2;_kA-(UWjU`Kf%jwnQ-mFxv4o)Z=F|Mz3vIp}A&$&m)suf4lm*
z*wd#hBoQs%#$bV`7wcl}ob!vkUpnK8Wvn&gP*1sN;D1}MCf;GX7A2ggCzb-0Hg}5x
zXDB*}dnh|n4r-6gal<V2PN5(l&mi^J&+7&kVomM6yFn)exn=e8mWxP%wCN8?`n?}<
zTP;CFE?&~9&$dwww-GQ5;w=L>>YLUNRN^nXMn*;x6xFccxTj8fYB+1(=dxbGRWJJr
zJWP#NDmtwTi%~%)*PydXoxpBh-Gt09sh?Cvr$(j{n~litWWPzp?VXSPJQ!;4CF<cA
zexz>v=x|{jjh5u^$G+xQtC*CBj#B)TFhc{kjF6Bx$}z{=w3$(cg8kfU=JVs$Qn((B
z>0R08uvg}Nsz&AEugSTcVgFUoPj>w`=GL0=YqC@EuG1Jx30zLUnRXaP+mn?UafG4W
z=9u}aWGq;P5Duvm7{gPtU#81U<(=13+31-3F0INsO*8TXN^y>C1#E;5PCL$2V<r@@
zl}W%I9YJ=GmfNspq7MF=+?@~_9_!w|3BKm?n|e6{=VJ@ry8pgMw|m+sBw{F}b7;BK
zZr~Luv<QC$!3FqV^H3_w?#s~Ew7u6<Pe0L1+Fw|YlPxlDCE-3E#$$`wsEgz)c{^us
z)58CSo_ZCon6ZFh9ovY2x8R@cdIcKPwp(<pQ}$-wKhRCP5N@~FQvXk)C@!9yMd8$^
zZ{3d1BD+6I>ce=|Y~ig?H7{dZG2$nW5-p3<EKv?c=B+#!sRTHgvGDizY<ub?ac#k%
zfmd01DfC%ckhDHw6l;u(!W(#8?DM~!{pUvU?B6W3f_OQ>oS8NTu>!8E{>~#2=MrHD
z#%QylHjDF?6RjAhFhLdTw{$@TMW5qiBGCzwSB5<u5@2nU!vYJfsxRdv$4o5$Dx9Au
z#9yEI`T3h#mhxmE`;w!LQOzzmMwxRP>+9?1j|-;VJ{OmxQ`N$wAN!3GxqKv3MGg~G
zMx_J2&*i;b?o0=8Vr9ZLus~bCfJNh3=*v|hr-M(8hXIV_X<aHL8N=f#&Ek^Gr+-Sd
zAmOX}Z|UB;l%KBHZ6=DB<H^TKdI1^vuD`GR2oB2za;%Z*rC5=4r+t}5u50w`|6G#t
zzCER?7<}xy6aKSPveC8kQWo|gCr(4syY!~8`)xpoP8<u4kZr88Xbgn6y|&|&^VFx!
z_(A_?VhXG1?I?;pEN<6bXr05x-*)v>Xq-!1-#_TJM-CtTMrL+LkI{SOD;W{ZXDewa
zea`?oPfJDl852w52U8;kI%?8o&2Tq1hGaX9CjW~+S9X&H&nS1Udu@{EB$MK=KVQql
zpB+NlebY-Fex3M!@I~s$d*^4mb8Pnda2zlFBmsRRJQa4ivt`aDM3O8!zH@z?Ipwi4
zEr9vcxc(71uqt?oMp)ym>=wRdoSnXwDKbk8&EvY3DaJ&Wv2o*J`wh4x3B^hCjOlov
zuuhgh5}O{qktmqC`(yWSR0$dP$=_tjC8WEp|7^P%W-83f5c^wG$#Utx-VGv@Xmy;c
zEP6cK@W<kDpdKZ(_>XOcQo!e`Q=Y!@cCo(T^yS60Jl`dmK^$)s$0kb9c~Skcp%)*u
zFW9XwlijHDIaGZ0NYxrx&KO~U5}*pcTS)&@fIq+oeX#Uw$g{ve@K+PP{ylbcb0h2k
z>C4PsI36cp@4i`f`tUM0E_j<~D=Vi+$LNDzMLyb~Cc9l9g7o~HFZY2`6ib)q2j0i}
z2pt`Q60hfn>%O3e?WPz8Gz(xE=(!8Hn&4eF>CbE^ch<`U8dLr~S$joY_4T$(GbLu>
zow&$8JDRxAKk+KLIfX$tOVOm%JIoNqYvldIv$p*L(S0-jEeI(J_mcy?8~@tdC-!Hf
zl?Jr0)AD*|W@bYl>Eu+UziQBgjSIIB$^?8(mlNe3;)qNxwl@vF7+^@Bd8mK;5g`E!
zY`x6R4~lT>-Z*R9jKn-0%|sy?P{}ROKkvijY)lGI{aRYO)PLc>iff8|u;%Lbrzn;(
zw5g^>ck-t#G6r^%kCa`5E7PFz!ga*U%gch_>1uYh^T%U_QB14%!LQG^XUvKhk!Boi
z49H@p0lOI@qYarmta%)OAZRtU*CGfXxU6)@@w^zw3KpoKdT-eYPA44%i#9pTwso&J
z?DnNISnHWRPp1Idl}$iJEBbzOESvX{>g8df1rMHfvCw!aBnjq)&xrT_VsxQXx<5#t
zj^4N~JX(3V$#vTs>zN?Wby-=%eSa?TfjT9DHkS>;lIPV5gN^Pr>zAZl3na?R5(M*X
za!LmQN^c{xQv+oFv`|)PdI?-Tu^eYM2t<hfKNi3kf!bS$Jig<!{dm`|Aiy@c=6JYD
z5I8>b9%nJwufuFk)-PFW;BSU@tGj7zD{1_<|66We0rs-cS7i56%AS+k+uJj!%?zy6
zl@SF#wdEG}xFQ2jl_k~787_zF%N$x)o6)Ebcj;5L?|eFD9(43H`IPh1Liuj~d$;M`
zzgaaCTxu+2L?m3XyUp(B13B?_;kU`CT!YTQ(!cwEKTAY*KeQr%T3<FUHhF@F)cm7`
ze7_~>m8$JhJa7k}=V6{D=>^Mm7E-2J?3bRSQ_63_Ev{=vz#3Pb`Y;Lc$cmc{gGHm=
zGm=wuB9Wv0fDVi|6o*e40OAT-4=6jOdflS>@+RvI82N!R@SsTLgV@6X6R`5MdjlII
zbNlIWwVP!Y3fT*9v(7|jvWl}?-Av)Nr~CNpqGcmAXw2(<ol+$CdJv%LG8(yT4cKVF
zt}D$hqwJ$21|?M_Erzb3k$<?`#$BGfvCu)B^sXuDUD(&@*2|{a=d~Dl`k5~dhW~hP
zSFa`kN9v{?DAXlz$aV~w>(hO#c<_Zh%~kp_N{_{zI9S_@tkBoPJOP!6o%$8<a{VZT
zJ->B>x<4+M2D#ksjpq)rIWbusVoa;%Fd)ko1ngy#iWQ!%!qEQMtQJB+Biy&6x0d<9
z4t<n5!2Lf4`YeWX-a{Bwz|Kdqj*i>!F@e(y)ke3R&rFY#!v1xSj-W061>>t(z;+F$
zlEPwD(0gZjzo|gWXo7?1sNTzIe;HO`wo?A}tCd<2B-tS+_I1zg#g<R13=+=x=PV85
ze}Ki&)xG(3)|F*GP=HxlHyVp)ILCkl?+Aw`T)vQ}B<l;nr>b5rs4xpdZkB3$oIMmq
zKkbv*@!_1Vwq4a0!H#XROl}sBs%qCWBHBNaZh&LF#4FIP`{e0G-idhbx!DF!larIL
zE&;wlgZ7KDvMLKWBI3JI%fukb<S5QUoFSh^yJm!1>8ta3$!pO1&ww9sm72CW3inLJ
z5Maw0iWVig|5f~Hs|B!$tXy19$g1>eLtlV+zlbb0*^FjB`>(b8yrMUrcWS@Y_eA*Q
znror|#~nw!7o*g1ZPQ(dTqNLf=QHv4Vsps92sBFQeJ8_`M4mT9>}JvGC{NgHVzM!&
zIDxPv4dIJ&E>GkCNDVi8`*M`(odyh0UE%XzJ3pZGzC@QgbPBF{&kD8x7z%qom*f6q
z;p^S?f>}3%Xud+gYU4fyf9hd?g>BQHt}Zcf@P4%~=C&pQO0~Jd<fk34wKN=<`OW~b
zSza#*eh%44t3B!YaN|3TO(oW%%F2-{sG{ag+lXQJ)8!~D;HzA)CwV;0C~-ay0(QP@
z;(#UV@$s>sS=jTnIB^?0{|}SRFmrQiyBCW<=gLaT*4LLuCBu?1#fZA^-;<3!hZ)rK
zEygk$k}hS4DS2E*rfe}<r*5^&w3IkVWYzCp^wKaf$gcnWyK8Y?y6je-bvCUt@4aOk
z74h@;Z=Kt}>TCrvx=XEx;sd#2*lPp<$6dZneu2yP9>P|ES+BpOW%uy*-)Wt+6V{z<
znOyvWa8Zp`&%cf3kx9`k8M|q_7HkW-&o@zjFb#NS`G&nFMg7js&(Ftwe0*|k$3A=1
zwY1zG=ahEVyRM1oH|_*qMu>+5Qxg|Lkk#nlP?$X*=`pc$d>#*8k^m<;FE!YRm3Zsg
z{whr+93~GhzfMEQP=4jvOxr@Re<vbBRJr=pys*E-4^ez_e0_Nq*RBY(zn0SrTi<fe
z6KF}>63)$p%-jxehT<hKCmX;xsLq-G+}fbfXgh=l@*j4j+Q6AHB(eo;?3pmaQ}b~c
zLixvc)ph22h4oZsf3F7~Cj;Z18)hus;%-&oX~R{Pshx*_Gn9X0fiH)8wc$@`g;Bh8
zU$YDA%JObQ&r)~P;x=%p1<lRPpXR<2AvhRFfW7*1a^5!8*G~f&Mvn4q^&5*DXP@r2
zLDbEwK%}|PmHY|C607MvDfI<$6`aq$$460UxYbSUqX-P}=g=_s-GF`A0hi%|(3#m@
z-jBL0UQFIr2Q->oFM`B@D5(p1WEj^O6LYD^#I+}aJ#z^fBdeAz+p{VW_yRZd9I0Fd
zX^C1VT@$zD_ki#M5MnFU&xsZqqfEy)iZ;&}O~>AWRs0{EC}jwi{yq;3Pqb_p*V!#h
z%q0{Lx~x?5U|Au+pJw7~e6F#>e!j%K-gx^aQ+-~ErY-7^msdYfG;;4ZyXzyqNzRCc
zI+7&(Pq10|(L=yO!uz4Kd^DKII7&jBtL$S4n9LQwy~GXbMq15!>osZx)nnr{lc6)v
z;?H!s>Xkf^=&`)?CKMD`sHm#^T!ZD~!oA?DoaN<p2Bj=Y<x8ZY)ZT9%-;M*Fg@`Z;
z8&XkXl?MMqv0@{Nm+ryNs_sg{;$p&rZ(0I`3pqdl^^;U-5)6!zAUUBib*degrKS!d
z{eO&YdYCZ(ru#5eRyw9T4hz!|SV{muS2O1r5x3NEdGol7zR;q;50}wKHdneRuXh$)
zNPE$B>I&^!FsrChL~Wgu#a55)gF`vep7h9OC<JCZ2$b~a2#Fpy1ESWYZ;9hsU)1F#
zwh;>BHhEVvwj@yjA0*Ss5rKn@#@n4`42jo=#}(3tP>LIN*M9{q@oBHAie69sA*ry9
z;KV%0Fk1?BaisBNBf+9%-nEI3c27M%1H5v#(5u`4aM4oqOoMcEx~=MOMZgx4Vs$jI
zStg)Jv)|aRpGu!e+j4IWsziVc@^C=<cH>1wMXR_54T9v#wx66e(yLL}Zd;`v(L{dL
z6{X`KNA*6txVXTEM2D=#6YeKkCGLP)gYxI%?(#26Y&DO~cQa<T=p>zwCuYA96CxE$
zU%hhyvo!`*R8xV`<6#67;<PlFPcWt?AcPWN^pHr!r$Vethb*~2lsbq3e4e4+w6Dye
zB8r&CW=7@fzq?+<<z`XHhap_$40UBOCt(gHutgTo0%{^N>dLR9;<>|9yePdy^84Fs
z<dkQV)`G9b8IhG~YV31L3pLxhu8Lhr)rY4N3<-fe1wm(Ppe{t9M=em^Ck}s@?hxnC
za~OV!w`tc~-il7;MT|I$B)UAW@?PTOgM+D|9P*Zy7O6mDZ5nmyXikiBO#>?XmORkd
zCwwiPCOZI=J5%{>QIhM{mHofTbOOMkzNSBz|7>=VnjhbkX7e7jL61O>!xOt2;|2Z4
z2*T1%<w@EZP!^$~FFp?B`X~?2SG6l{YSKB{(G3cEv|MSni&OTs31|7AuCnRTOL*bE
zhkF5g%df!bM7>(_{<NB8(Lel4Td4zOKNn(U<%96P>Y%<Y6sNgnYj3hxZ*?2h;w^Re
z-2mr%fSTNQ7Xmw@MI-{zVt0I3-q}fkGt8Oy>-+<>TpF0!3YBw<8<)KEuKtHPWOYB;
zlvlE#^za=(V5(W8yK_Di;rps5C;OsII9C(;Y|XD78_%v9S)4@JFgzy)rK{gsYW&cI
z276jxQ|a#?$}fTRSZ*2PqsdkKeA9#R8RB`MWcHwGEIYqB-gQ6j1}mx*fyKo_ir>J>
zlh_Dk4#N(LVnu8o#!K@*Q3wBtXCh)r;Ne~90d%DztD+tYDB-5C{~<e}m>lR^3u;Mr
zFAMYY0&25-P;(K-6X^hj<3XTE2cGw$C9;t6>`Jsc%rc78?EL&I(OT^;eFzMtK(K+7
zxcL+170LoE$OYGV`+(bM4)9{hgMl*lzXY)0sZqG%Ph4Y?L(j^jkiMVR)5S6fuwRI9
z^#+U#0D~$bCVbE~^zR`DAT7@};~_wQap@~_Y_@bipV-2{&YeVKKZj#E6c49@&N>&a
z(+Z#H_cb&%v@;3e?x>`?=BWoqo^6PEUU#?lpQ@nh)*#l|QY?_oGGWR1H!T7N9KkEp
zsNR?O#b<jbr(6}Vup9x@K?FMX4XXINp;~gZK~)u*6PUBKCyI;~d<rWob(p6dQjZD(
z5LL7lfF>5QJ&NA*?@lX&&^yVawz4vWOwe^KpfH~;HN5Nl_i+_)n|Tr<?coSSor3n%
zT?p1*gNqi`YflX!;hkq4o%|LK(Y44GaB=i*Gfs}Npr6!Iww;@|zP$LQRmYZ(b!Qz8
zh)9I|%1TI7B4AaDwOW^HuedTh2?=7xrFwx^DlGcBU?1h_53U0dyct#kvI!t!&;Mqx
zz%(j{%cJ+}1R65&`Vy_+!Dbh59vaZU7MopGc0K1TlB%3n#J*ZqkM&8R2J<wgUSoNQ
z!PU*^-;i>Y{L$k14>+%Lt}Pw93qB}T<X_Wca419w0{+$ynY)>>tV5j;X8*}VK=!=n
z=H}d25=$#9+ng3^<eN7s!=5f!%4U~79jA6AMPeY}HpDQOc#Jmm)ydfB*fy4x4FR_~
zYAxp**R14HHm_Y@CzektmxY0D1MG7-N_v2Xw7tuUDx-&fCcgwTb}Xz2-Nz@g2gKF4
zpOh9DxxtyB{1y(Bi^w2<f1%9_|4I@o%D759?f3+I7!ClErWD*g>~e;+g?ovy5@*pW
zjy#z%hOp2e>e^T+I!raNsasnDGI~=0qpO!o#((Fd9AC={wvm<&9I}Y-v(jwxPn%|=
zRr5VBOddFG7D?E0w0NzK*ru5cpfAvW%2Qd<l3-oy`^(*N06IK0v`J#;w{mxP2NWFH
zr`yHn%dBqW5#id=Jw2juQgl3xL47E|BRxJm6mQ%O3Vt#W8W=%p@DB_MqH*Zkb{E>*
z_3V{o7oq`ofVpB-GTfpxorQNZ6^qo?m$P$Xmosg8V?>nyZr4@5_c_uAn8|_kH8oD(
zV6FSdKI-6`CA(bg{?C{rP-N<ffY&my>xvy+oG~;!*m(4+10_wbwrXs^8-0=TdcmL@
zXRA*Hac*7rwhg`~hBLFXQcjMJe2eo9Y)VDyi`ib5rAL^+2)lhD<RwH761n?~jg8%I
zLE`J<!|&wcg2JlzFOerBLL18sMh*9*02d|F&r~HDxwh?2niuti#P)Ax&~Bg{1Go`2
zI_-!s6@a_eXJ%&p2argz`#u9$&6jHx%m_3PvHP7g0KYEKgI3viH$~Oo#{<r!nuFl|
zfB0%WVqD0wYE{i3RFrB|7&x*}65yey?fG7oCPRH^bZxb?*k==2EdbZZLcE1qwAHco
z)6u+<o9Kxmi@dH)68}LvP6w^Kn;~-ezGqt>fN#uu7kpOZ{FN`f9Qh@(_GuGM-2L~$
zf>}D}*e6oQX+G?uHJ^0=Y-n@E90C~D;qVLk@nei5LBbwiEL>bBR%-e;=s><fA%amT
zB+7J}RG*PxO~|RFV~G~z4)?vmxSExp9dd@lq?YVuG^%&Taq^@Zn2pU{N^8RT%@+`8
zkUMBJ(YsO5youg`BOrrw>+3kDjm#?yb{v}2y7FM*)#YUjg%o@-y#2fmt9lZ6jQJ?%
zeME>I3~c@Kuo=Z2Lt_50VeUhdlKs?k%RPARR{n9j$2|)Sv!XQ0N6uePO-|uPRfo+5
zLuUmZA~N^~g)oYsNgkiMi6RQ~yud2aBvz1uNJry-2vu~QT1ZI9#7s{bSEh##4H9gG
zB&zZ;+29=&DjR)I6U=iL;9hVL@dF<o9)7Bpc>xPj?8-`*h&aJ(wj?;aS2)&sbh%n>
zy^0Agk|!q3HHoUm7tS5?n1Cj<e}0yhR4)btlf;X`rxZpT0xPSkhN_Ru9P81eAS4l>
zvotj^^!d`aifO$se=4-f`T$1M_9hSK6Fw>$+CI>1Vj(=S+yZDc$i#|LZy1nkx3)R2
zL98dlnV`III2Hwb3Vq@pJ?TPY;vO&QA}G^_qN1iI6xZr~JAy{5j4%c>#8wbHb8Pz}
zZ&cU}V9we|w(r3-ztG@?*xTRFsRiK}*YpbJsa~NVn)E00qz*ioNmBg;K*SawnP5h^
z19Bq;Foua>zdVyJJSXlklDPk(Md{!>T75#+IV^quMkt;;hTv5c=pKJlhPKc61OzZt
z#wS3K*45tL-jej0Q80~r4~63do7((%)q6tpI3<wobDh%->V7cV{?oMtbseuBA2oWP
zyU=PMNe3!TBdS$!fFn2cx=C~cEdn=s560_<ysHf@#js=Fj*Uq6fYz(O;Qe54H@)ib
z7&<bD__PtBuwP{!P=cIu|8;nso`bcae7IMr9146EHmBv6N(fOkSyLvPV4=<vs4Qql
z`X26nbY#2iu8XkMsB!(9!X5>#r6)KW^8*81mRwnOD#1#f*WR8jkf$Rd<f1L=gJy`Z
z^?Po-af=PRuM=EUl968R@b$KWZ%T?}yW^7q9}*JM4}j@q%bCl&V&xtj{uBSd$4cVU
zLFujAd9MgoPeBv+ZqK2wV)o*8FqUwhe6=`;VKk&2LW6vps9lhNEX@FtS)~a(#~xh7
zfkSriPbaT!imL79y|GcFu4c36fN0gkV7d|YRq$)nuy|9+qe~!EN`Z^~xCeurSJtJN
z*G{ejZ{sQL2oWvBrhBg~i_{OulP=!C)i0CKt(+x~s?l5jDGJ=6A^EwpUE3cyE9{Y`
zsn#y6U@r_1@{Sct2<Z;Fmj?q?I<vCUz0VbA|NVV0$>g8Bes*>DWgL!i=G(Rn%bi=v
zI}QS;Bc=QXrGnO|S>L33I(X`iLkDnFtklt}w4(rvQ-%cfi|p6wz*#;r?m=FzLG1Jy
zQuiAYn)KsU4;7R~6b4MYcbnuM57i!*tK2YfXdk~h)7EOejX_9GX+F^3-Q_EQ>EqYQ
z5=mx+RjFw$vEs|#_a0CN$rlWyL6Re^6kSt!J@fFOWz9Kaa+~V^QVjwSMm8h~W02GT
zs^lZZ6kh!9{;KYSkb)%XF|N&kDpZRX*)D$0jYVe=QB+!r8XBf+GnzH`CgCSTnhcWe
z{bIdU%F+)z)?RanBZSdu`k=k0-I$~DSY(wewaW(ND3!09h?+1-4WA)gPP+zE;KUNf
zOS6^DW>?E>-#!-cAnH>{dC!O$Y;)R)6GAez9x}Sp-js*eA;KG!fG36;s=o9|puh>S
z(oGP7k4;brQCX;~&A<Hp-*^79lyd<O7oi~8WC7o?(UXjhc*T8>)BKq06TksHEd^4L
LQI)QNnMeK~7!ON&

literal 0
HcmV?d00001

diff --git a/utils/network/api.js b/utils/network/api.js
index a48f620..8f85611 100644
--- a/utils/network/api.js
+++ b/utils/network/api.js
@@ -836,6 +836,68 @@ editConfig(params) {
     }
   })
 }
+//获取问诊订单病例详情-基础
+getSimpleInquiry(params) {
+  return this.request({
+    url: `${this.baseUrl}/case/inquiry/simple`,
+    method: 'GET',
+    data: {
+      ...params
+    }
+  })
+}
+getInquiryDetail(params) {//获取问诊订单病例详情
+  return this.request({
+    url: `${this.baseUrl}/case/inquiry`,
+    method: 'GET',
+    data: {
+      ...params
+    }
+  })
+}
+getPathography(params) {//获取家庭成员病情记录列表-分页
+  return this.request({
+    url: `${this.baseUrl}/patient/pathography`,
+    method: 'GET',
+    data: {
+      ...params
+    }
+  })
+}
+getPathographyDetail(id) {//获取家庭成员病情记录列表-分页
+  return this.request({
+    url: `${this.baseUrl}/patient/pathography/${id}`,
+    method: 'GET'
+  })
+}
+
+getUnfilled(params) {//获取问诊订单病例缺少字段
+  return this.request({
+    url: `${this.baseUrl}/case/fields/unfilled`,
+    method: 'GET',
+    data: {
+      ...params
+    }
+  })
+}
+doctorSendUnfilled(params) {//医生发送缺少字段至患者
+  return this.request({
+    url: `${this.baseUrl}/case/fields/doctor`,
+    method: 'POST',
+    data: {
+      ...params
+    }
+  })
+}
+ patientSendFilled(params) {//患者填写缺少字段至医生
+  return this.request({
+    url: `${this.baseUrl}/case/fields/patient`,
+    method: 'POST',
+    data: {
+      ...params
+    }
+  })
+}
 
 
 
diff --git a/utils/network/request.js b/utils/network/request.js
index 7542bc1..b9a55d8 100644
--- a/utils/network/request.js
+++ b/utils/network/request.js
@@ -17,7 +17,7 @@ class HTTP {
     url,
     data = {},
     method = 'GET',
-    contentType = 'application/x-www-form-urlencoded',
+    contentType = 'application/json',
     showLoading = true
   }){
       return new Promise((resolve, reject) => {
@@ -25,7 +25,7 @@ class HTTP {
       })
     }
 
-  _request(url, resolve, reject, data = {}, method = 'GET', contentType = 'application/x-www-form-urlencoded', showLoading = true) {
+  _request(url, resolve, reject, data = {}, method = 'GET', contentType = 'application/json', showLoading = true) {
     if(showLoading) wx.showLoading();
     let usertype =  wx.getStorageSync('usertype');
     wx.request({

From 89be7ccae1a6fb1a770d1d932de05c8d9fe20028 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Tue, 12 Dec 2023 10:58:58 +0800
Subject: [PATCH 72/83] =?UTF-8?q?=E5=8C=BB=E7=94=9F=E6=8F=90=E4=BA=A41212?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/index/index.js                          |   4 +
 Pages/yishi/case/index.wxml                   |   6 +-
 Pages/yishi/case/index.wxss                   |   7 +-
 Pages/yishi/cash/index.js                     |   2 +
 Pages/yishi/cash/index.wxml                   |  28 +-
 Pages/yishi/cash/index.wxss                   |  50 +-
 Pages/yishi/cashrecord/index.wxml             |  22 +-
 Pages/yishi/cashrecord/index.wxss             |  68 +-
 Pages/yishi/myaccount/index.js                |  23 +-
 Pages/yishi/myaccount/index.json              |   1 +
 Pages/yishi/myaccount/index.wxml              |  50 +-
 Pages/yishi/myaccount/index.wxss              | 128 +++-
 Pages/yishi/onlinechufang/index.js            |   2 +-
 Pages/yishi/orderdetail/index.wxml            |   5 +-
 Pages/yishi/orderdetail/index.wxss            |  12 +
 Pages/yishi/patient_sick/index.js             |   1 -
 Pages/yishi/sickform/index.js                 | 594 +++++++++++++++++-
 Pages/yishi/sickform/index.wxml               | 120 ++--
 Pages/yishi/sickform/index.wxss               |  11 +-
 Pages/yishi/wenzhen_v2/wenzhen.wxml           |   5 +-
 Pages/yishi/write_sickform/index.wxss         |   3 +
 .../MessageElements/CustomMessage/index.js    |   7 +-
 .../components/MessageInput/index.wxml        |   2 +-
 app.js                                        |   3 +-
 commpents/upload-cell/index.wxml              |   2 +-
 filters/filter.wxs                            |  70 +++
 .../images/yishi/tabbar_icon/wenzhenform.png  | Bin 0 -> 1209 bytes
 .../images/yishi/tabbar_icon/wenzhenicon.png  | Bin 0 -> 2195 bytes
 utils/network/api.js                          |  13 +
 utils/substr.wxs                              |   1 +
 30 files changed, 1083 insertions(+), 157 deletions(-)
 create mode 100644 filters/filter.wxs
 create mode 100644 static/images/yishi/tabbar_icon/wenzhenform.png
 create mode 100644 static/images/yishi/tabbar_icon/wenzhenicon.png

diff --git a/Pages/index/index.js b/Pages/index/index.js
index 9e3e34b..f6259dd 100644
--- a/Pages/index/index.js
+++ b/Pages/index/index.js
@@ -91,6 +91,10 @@ Page({
       complete: () => {}
     })
     this.setData({ loading: false });
+    if(app.globalData.isLogin){
+      let usertype = wx.getStorageSync('usertype');
+      this.guideTo(usertype)
+    }
     // let isEntry=wx.getStorageSync('hasEntry');
     // console.log("onshow:"+isEntry)
     // if(!isEntry){
diff --git a/Pages/yishi/case/index.wxml b/Pages/yishi/case/index.wxml
index a0380bc..3b5d4d8 100644
--- a/Pages/yishi/case/index.wxml
+++ b/Pages/yishi/case/index.wxml
@@ -124,13 +124,13 @@
       </view>
       <view class="disease_box_item" >
         <view class="title">药品：</view>
-        <view class="conent" wx:for="case_detail.order_prescription.product" wx:for-item="itemName">
-        {{itemName}};
+        <view class="conent" wx:for="{{case_detail.order_prescription.product}}" wx:for-item="itemName">
+        {{itemName.product_name}};
         </view>
       </view>
       <view class="disease_box_item" >
         <view class="title">用法：</view>
-        <view class="conent">{{case_detail.order_prescription.single_use}}</view>
+        <view class="conent">{{case_detail.order_prescription.doctor_advice}}</view>
       </view>
   </view> 
     </view>
diff --git a/Pages/yishi/case/index.wxss b/Pages/yishi/case/index.wxss
index 9535db7..ebd1ea4 100644
--- a/Pages/yishi/case/index.wxss
+++ b/Pages/yishi/case/index.wxss
@@ -42,7 +42,8 @@ page{
 }
 .info_item{
   text-align: left;
-  width: 203rpx; 
+  width: 33.3%; 
+  margin-right: -1rpx;
   /* height: 60rpx; */
   margin-top: 10rpx;
 
@@ -52,8 +53,8 @@ page{
   align-items: flex-start;
 }
 .info_item:nth-child(3n){
-   text-indent: 20rpx;
-}
+  margin-right: 0rpx;
+} 
 .info_title{
   font-size: 28rpx;
   color: #333333;
diff --git a/Pages/yishi/cash/index.js b/Pages/yishi/cash/index.js
index a48c6af..5b366f9 100644
--- a/Pages/yishi/cash/index.js
+++ b/Pages/yishi/cash/index.js
@@ -17,6 +17,7 @@ Page({
     bank_name	: "xx银行",
     bank_card_code_mask: "888 xxxx xxxx 888",
     withdrawal_amount: "xxxx",
+    amount_total:'',
     income_tax: "xx",
     contactKeFu: false,
     sub_visible: false,
@@ -91,6 +92,7 @@ Page({
           bank_name	: response.data.bank.bank_name,
           bank_card_code_mask: response.data.bank.bank_card_code_mask,
           withdrawal_amount: response.data.withdrawal_amount,
+          amount_total:response.data.amount_total,
           order_inquiry_ids: response.data.order_inquiry_ids,
           bank_card_name: response.data.bank.bank_card_name_mask,
           income_tax: response.data.income_tax,
diff --git a/Pages/yishi/cash/index.wxml b/Pages/yishi/cash/index.wxml
index 8963a27..866db00 100644
--- a/Pages/yishi/cash/index.wxml
+++ b/Pages/yishi/cash/index.wxml
@@ -21,30 +21,44 @@
   <view class="cash" wx:if="{{!skeleton_loading}}">
     <view class="cash_top">
       <view class="cash_left">
-        <view class="cash_left_title">实际到账（元）</view>
+        <!-- <view class="cash_left_title">实际到账（元）</view> -->
         <view class="cash_num">
           <view>
-            <text style="font-size: 42rpx;">￥</text>{{withdrawal_amount}}
+            <text style="font-size: 34rpx;">账户余额：￥</text>{{amount_total}}
           </view>
         </view>
         <view class="shui">扣除个人所得税： 
           <text style="color: red;">{{income_tax}}元</text>
         </view>
       </view>
-      <view class="cash_right">
+      <!-- <view class="cash_right">
         <navigator url="/Pages/yishi/wenzhenorderV2/index" open-type="navigate" hover-class="other-navigator-hover">
           <van-button custom-style="text-align: center;border-radius: 10rpx;padding: 20rpx 50rpx;" color="linear-gradient(310deg, #FF931A 0%, #FF931A 0%, #FCB75D 100%);">
             查看订单
           </van-button>
         </navigator>
-      </view>
+      </view> -->
     </view>
     <view class="cash_bottom">
-      <navigator url="/Pages/yishi/cashrecord/index" open-type="navigate" hover-class="other-navigator-hover">
-      提现记录 >
-      </navigator>
+        <view class="title">
+          实际到账（元）
+        </view>
+        <view class="moneybox">
+        <view class="money"><text class="mark">￥</text><text class="moneyNum">{{withdrawal_amount}}</text></view>
+        <navigator url="/Pages/yishi/wenzhenorderV2/index" open-type="navigate" hover-class="other-navigator-hover">
+          <van-button custom-style="text-align: center;border-radius: 10rpx;height:70rpx;width:200rpx;" color="linear-gradient(310deg, #FF931A 0%, #FF931A 0%, #FCB75D 100%);">
+            查看订单
+          </van-button>
+        </navigator>
+        </view>
+    
     </view>
   </view>
+  <view class="tixian">
+    <navigator url="/Pages/yishi/cashrecord/index" open-type="navigate" hover-class="other-navigator-hover">
+      提现记录 <van-icon name="arrow" />
+      </navigator> 
+  </view>
   <view class="cash_loading" wx:if="{{skeleton_loading}}">
     <t-skeleton theme="text" row-col="{{[{width: '30%'},{width: '80%'},{width: '50%'},{width: '30%'}]}}" animation="gradient" loading="{{skeleton_loading}}" />
   </view>
diff --git a/Pages/yishi/cash/index.wxss b/Pages/yishi/cash/index.wxss
index fb7a38c..f02535e 100644
--- a/Pages/yishi/cash/index.wxss
+++ b/Pages/yishi/cash/index.wxss
@@ -66,7 +66,7 @@ page{
 }
 .cash{
   width: 92vw;
-  height: 300rpx;
+
   margin: 20rpx auto;
   background-color: #fff;
   border-radius: 20rpx;
@@ -74,20 +74,26 @@ page{
   flex-direction: column;
 }
 .cash_top{
-  margin-top: 20rpx;
+  margin-top:30rpx;
   display: flex;
   flex: 3;
 }
 .cash_bottom{
+  padding:20rpx 20rpx 30rpx;
   border-top: 1px solid #E5E5E5;
-  flex: 1.2;
-  color: #3CC7C0;
+ 
   font-size: 32rpx;
   display: flex;
-  align-items: center;
-  justify-content: flex-end;
+
+  flex-direction: column;
   padding-right: 20rpx;
 }
+.cash_bottom .title{
+  margin-top: 10rpx;
+  font-size: 30rpx;
+ 
+  color: #000000;
+}
 .cash_left{
   flex: 3;
   display: flex;
@@ -104,10 +110,12 @@ page{
   flex: 2;
   display: flex;
   align-items: center;
-  font-size: 64rpx;
+  font-size: 34rpx;
 }
 .shui{
   flex: 1;
+  margin-top: 20rpx;
+  margin-bottom: 30rpx;
   display: flex;
   align-items: center;
   font-size: 28rpx;
@@ -154,3 +162,31 @@ page{
   color: #3CC7C0;
 }
 
+.moneybox{
+  display: flex;
+}
+.moneybox{
+  display: flex;
+  margin-top: 20rpx;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.money .mark{
+  font-size: 42rpx;
+font-weight: 400;
+color: #333333;
+}
+.moneyNum{
+  font-size: 64rpx;
+font-family: ArialMT;
+color: #333333;
+}
+.tixian{
+  display: flex;
+  margin:0 30rpx;
+  color: #3CC7C0;
+  font-size: 32rpx;
+  align-items: center;
+  justify-content: flex-end;
+}
\ No newline at end of file
diff --git a/Pages/yishi/cashrecord/index.wxml b/Pages/yishi/cashrecord/index.wxml
index c20219e..dc40839 100644
--- a/Pages/yishi/cashrecord/index.wxml
+++ b/Pages/yishi/cashrecord/index.wxml
@@ -1,5 +1,6 @@
 <!-- 提现记录 -->
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
+<wxs src="../../../filters/filter.wxs" module="moduleFilter"></wxs>
 <view class="container">
   <view class="top">
     <view class="top_txt" bindtap="onDatePicker">
@@ -10,19 +11,24 @@
 
     <view class="data_item" wx:for="{{record_list}}">
       <view class="data_item_top">
-        <view class="data_item_top_icon">
+      
+        <view class="data_item_top_content">
+         <view class="namebox">
+          <view class="data_item_top_icon">
           <van-image custom-style="" src="{{static_host}}/applet/doctor/static/images/yishi/bankcard/js_icon.png" fit="heightFix" height="50rpx" aria-label="role" />
         </view>
-        <view class="data_item_top_content">
           <view class="name">{{item.account_name}}<text style="margin-left:20rpx;font-size: 28rpx;color:#999;">（尾号{{item.bank_card_code_four}}）</text></view>
-          <view class="date">{{item.created_at}}</view>
+         </view>
+         <view class="status_box">
+            <!-- 审核状态（1:审核中 2:审核通过 3:审核未通过） -->
+            <view class="status {{item.examine_status==1?'paying':item.examine_status==2?'paysuccess':item.examine_status==3?'payfail':''}}">{{item.examine_status==1?'结算中':item.examine_status==2?'结算成功':item.examine_status==3?'结算失败':'未知'}}</view>
+          </view>
+        
         </view>
         <view class="data_item_top_num">
-          <view class="jine">￥{{item.actual_withdrawal_amount}}</view>
-          <view class="status_box">
-            <!-- 审核状态（1:审核中 2:审核通过 3:审核未通过） -->
-            <view class="status status_ing">{{item.examine_status==1?'审核中':item.examine_status==2?'审核通过':item.examine_status==3?'审核未通过':'未知'}}</view>
-          </view>
+          <view class="date">{{moduleFilter.transforDay(item.created_at,"noyear")}}</view>
+          <view class="jine"><text class="jinename">实际到账金额：</text>￥{{item.actual_withdrawal_amount}}</view>
+          
         </view>
       </view>
       <view class="data_item_bottom">个人所得税：￥{{item.income_tax}}</view>
diff --git a/Pages/yishi/cashrecord/index.wxss b/Pages/yishi/cashrecord/index.wxss
index cd48aeb..f7f7b1a 100644
--- a/Pages/yishi/cashrecord/index.wxss
+++ b/Pages/yishi/cashrecord/index.wxss
@@ -25,46 +25,57 @@ page{
 .data_item{
   display: flex;
   flex-direction: column;
-  margin-bottom: 50rpx;
-  height: 200rpx;
+  margin-bottom: 20rpx;
   background-color: #ffffff;
   border-radius: 20rpx;
-  padding: 20rpx 0 0 0;
+  padding: 30rpx 0 0 0;
 }
 .data_item_top{
-  flex: 2;
-  display: flex;
+  margin:0 30rpx;
   border-bottom: 1px solid #E7E7E7;
 }
 .data_item_top_icon{
-  flex: 1;
+
   text-align: center;
-  height: 70%;
-  align-self: start;
+
 }
 .data_item_top_content{
-  flex: 3;
+ 
+ justify-content: space-between;
   display: flex;
-  flex-direction: column;
 }
 .name{
+  margin-left: 10rpx;
   font-size: 32rpx;
   color: #333333;
-  flex: 1;
+ 
 }
 .date{
-  flex: 1;
   font-size: 28rpx;
+  display: flex;
+ margin-left: 28rpx;
   color: #999999;
+  white-space: nowrap;
 }
 .data_item_top_num{
-  flex: 2;
-  display: flex;
-  flex-direction: column;
   justify-content: space-between;
+  display: flex;
+  align-items: center;
+  margin:0 30rpx 25rpx;
+
   text-align: center;
 }
+.jinename{
+  font-size: 30rpx;
+  font-weight: 400;
+  color: #666666;
+}
+.namebox{
+  display: flex;
+}
 .jine{
+  display: flex;
+  align-items: center;
   color: #FF0000;
   font-size: 34rpx;
 }
@@ -73,27 +84,38 @@ page{
   justify-content: center;
 }
 .status{
-  border-radius: 10px;
-  font-size: 24rpx;
-  padding: 10rpx 40rpx;
+  width: 125rpx;
+  height: 50rpx;
+  background: #FFF2E8;
+  border-radius: 10rpx;
   margin-bottom: 20rpx;
+  font-size: 24rpx;
+ font-weight: 400;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: #FFFFFF;
 }
-.status_ing{
-  background-color: #FFF2E8;
+.status.paying{
+  background: #FFF2E8;
   color: #FA541C;
 }
-.status_end{
+.status.paysuccess{
+  background: #E2FFFE;
+  color: #3CC7C0;
+}
+.status.payfail{
   background-color: #C5C5C5;
   color: #FFFFFF;
 }
 .data_item_bottom{
-  flex: 1;
+  padding:20rpx 30rpx 26rpx;
   display: flex;
   align-items: center;
   justify-content: flex-end;
   margin-right: 20rpx;
   color: #666;
-  font-size: 32rpx;
+  font-size: 28rpx;
 }
 .t-picker__confirm{
   color: #3CC7C0 !important;
diff --git a/Pages/yishi/myaccount/index.js b/Pages/yishi/myaccount/index.js
index 99a476a..48465c5 100644
--- a/Pages/yishi/myaccount/index.js
+++ b/Pages/yishi/myaccount/index.js
@@ -12,9 +12,12 @@ Page({
     dateVisible: false,
     dateText: "",
     dateValue: ['2023','3'],
+    dialog_visible:false,
     select_date: "",
     balance_account: "",
     amount_total_month: "",
+    doctor_today_inquiry_total:'',
+    doctor_day_completed_amount_total:'',
     withdrawal_amount_month: "",
     static_host: api.getStaticHost(),
     bill: [],
@@ -54,7 +57,7 @@ Page({
     let mmdateValue = [''+year+'',''+month+''];
     this.setData({
       dateValue: mmdateValue,
-      dateText: month+"月"
+      dateText: year+"年"
     })
 
     let date = this.data.dateValue.join("-");
@@ -63,7 +66,16 @@ Page({
   onColumnChange(e) {
     console.log('picker onColumnChange:', e);
   },
-
+  confirmDialog(){
+    this.setData({
+      dialog_visible:false
+     })
+  },
+  showDialog(){
+   this.setData({
+    dialog_visible:true
+   })
+  },
   onPickerChange(e) {
     const { key } = e.currentTarget.dataset;
     const { value } = e.detail;
@@ -72,7 +84,7 @@ Page({
     this.setData({
       [`${key}Visible`]: false,
       [`${key}Value`]: value,
-      [`${key}Text`]: value[1]+"月",
+      [`${key}Text`]: value[0]+"年",
     });
 
     let date = value.join("-");
@@ -106,11 +118,16 @@ Page({
       this.setData({
         balance_account: response.data.balance_account,
         amount_total_month: response.data.amount_total_month,
+        doctor_today_inquiry_total:response.data.doctor_today_inquiry_total,
+        doctor_day_completed_amount_total:response.data.doctor_today_inquiry_total,
         withdrawal_amount_month: response.data.withdrawal_amount_month,
         bill: response.data.bill,
       })
     }).catch(errors => {console.error(errors);})
   },
+  goTixian(){
+    app.go('/Pages/yishi/cash/index')
+  },
   goDetail(e){
     let url = e.currentTarget.dataset.url;
     let md = e.currentTarget.dataset.md;
diff --git a/Pages/yishi/myaccount/index.json b/Pages/yishi/myaccount/index.json
index 1ae5130..09bf0e3 100644
--- a/Pages/yishi/myaccount/index.json
+++ b/Pages/yishi/myaccount/index.json
@@ -6,6 +6,7 @@
     "t-picker": "tdesign-miniprogram/picker/picker",
     "t-picker-item": "tdesign-miniprogram/picker-item/picker-item",
     "van-icon": "@vant/weapp/icon/index",
+    "t-dialog": "tdesign-miniprogram/dialog/dialog",
     "van-cell": "@vant/weapp/cell/index",
     "van-cell-group": "@vant/weapp/cell-group/index",
     "van-empty": "@vant/weapp/empty/index"
diff --git a/Pages/yishi/myaccount/index.wxml b/Pages/yishi/myaccount/index.wxml
index 2981644..c3ec3fa 100644
--- a/Pages/yishi/myaccount/index.wxml
+++ b/Pages/yishi/myaccount/index.wxml
@@ -1,6 +1,6 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container">
-  <view class="top">
+  <!-- <view class="top">
     <view class="top_txt">
       <view style="font-size: 30rpx;">
         账户当前余额：
@@ -9,17 +9,38 @@
         ¥ {{balance_account}}
       </view>
     </view>
-  </view>
+  </view> -->
   <view class="monthbox">
-    <view class="month" bindtap="showPop">{{dateText}}<van-icon name="arrow-down" color="#999" size="40rpx" /></view>
+    <view class="titlebox">
+      <view class="name">账户余额（元）</view>
+      <van-icon name="question-o"  class="question" bindtap="showDialog"/>
+    </view>
+    <view class="accoutbox">
+      <view class="accountNum"><text class="mark">￥</text>{{balance_account}}</view>
+      <view class="tixian" bindtap="goTixian">提现</view>
+    </view>
+    <view class="line"></view>
+    <view class="cashbox">
+       <view class="today">
+        <view class="titlename">今日接诊收入</view>
+        <view class="money">¥{{doctor_today_inquiry_total}}</view>
+       </view>
+       <view class="finish">
+        <view class="titlename">已完成待入账</view>
+        <view class="money">¥{{doctor_day_completed_amount_total}}</view>
+       </view>
+    </view>
+    <!-- <view class="month" bindtap="showPop">{{dateText}}<van-icon name="arrow-down" color="#999" size="40rpx" /></view>
     <view class="account">
       <view class="account_left" style="font-size: 30rpx;">当月收益：<text style="font-size: 40rpx;">￥{{amount_total_month}}</text></view>
       <view class="account_right" style="font-size: 30rpx;">当月已提取：<text style="font-size: 40rpx;">￥{{withdrawal_amount_month}}</text></view>
-    </view>
+    </view> -->
+  </view>
+  <view class="txt_title" bindtap="showPop">
+    {{dateText}}<van-icon name="arrow-down" color="#333" size="34rpx" />
   </view>
-  <view class="txt_title">账单</view>
   <view class="content">
-    <van-cell size="large" bindtap="goDetail" data-url="/Pages/yishi/orderdetail/index" data-md="{{item.month}}-{{item.day}}" title-style="font-size: 30rpx;" title="{{item.month}}月{{item.day}}日" value="+{{item.total_amount}}元"  is-link wx:for="{{bill}}" />
+    <van-cell size="large" bindtap="goDetail" data-url="/Pages/yishi/orderdetail/index" data-md="{{item.month}}" title-style="font-size: 30rpx;" title="{{item.month}}月" value=""  is-link wx:for="{{bill}}" />
     <van-empty description="暂无账单" wx:if="{{ bill.length == 0 }}" />
   </view>
 
@@ -37,8 +58,21 @@
       bindcancel="onPickerCancel"
     >
       <t-picker-item options="{{years}}"></t-picker-item>
-      <t-picker-item options="{{seasons}}"></t-picker-item>
+      <!-- <t-picker-item options="{{seasons}}"></t-picker-item> -->
     </t-picker>
 
+    <t-dialog
+    visible="{{ dialog_visible }}"
+    title="温馨提示"
 
-</view>
\ No newline at end of file
+  >
+  <view  slot="content" class="slotcontent">
+     <view class="msg">1、账户余额表示未提现的所有已经结束的订单金额总和</view>
+     <view class="msg">2、今日接诊收入表示今日已经接诊的订单金额总和 </view>
+     <view class="msg">3、已完成待入账表示近期已完成未结束的订单金额总和 </view>
+  </view>
+  <view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="confirmDialog">
+    确定
+  </view>
+  </t-dialog>
+</view>
diff --git a/Pages/yishi/myaccount/index.wxss b/Pages/yishi/myaccount/index.wxss
index e1a2f53..ea4072c 100644
--- a/Pages/yishi/myaccount/index.wxss
+++ b/Pages/yishi/myaccount/index.wxss
@@ -20,9 +20,9 @@ page{
 }
 .monthbox{
   width: 92vw;
-  margin: -40rpx auto 0 auto;
+  margin: 20rpx auto 0 auto;
   background-color: #ffffff;
-  height: 200rpx;
+  padding:26rpx 0 20rpx;
   border-radius: 20rpx;
   display: flex;
   flex-direction: column;
@@ -53,7 +53,7 @@ page{
   text-align: left;
 }
 .txt_title{
-  font-size: 30rpx;
+  font-size: 34rpx;
   margin: 20rpx 0;
   position: relative;
   left: 4vw;
@@ -64,10 +64,126 @@ page{
   background-color: #fff;
   margin: 0 auto;
   border-radius: 20rpx;
-  padding: 20rpx 0;
+ overflow: hidden;
 }
 .t-picker__confirm{
   color: #3CC7C0 !important;
 }
-
-
+.titlebox{
+  margin:0 30rpx;
+  display: flex;
+}
+.titlebox .name{
+  color: #000000;
+}
+.question{
+ color:rgba(0,0,0,0.6);
+}
+.tixian{
+  width: 200rpx;
+height: 70rpx;
+background: linear-gradient(310deg, #FF931A 0%, #FF931A 0%, #FCB75D 100%);
+border-radius: 10rpx;
+font-size: 32rpx;
+display: flex;
+align-items: center;
+justify-content: center;
+font-weight: 400;
+color: #FFFFFF;
+}
+.accoutbox{
+  margin:20rpx 30rpx 0;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding-bottom: 26rpx;
+  
+}
+.line{
+  width:100%;
+  height:1rpx;
+  background-color:#E5E5E5;
+}
+.mark{
+  font-size: 42rpx;
+font-weight: 400;
+color: #333333;
+}
+.cashbox{
+  margin:20rpx 30rpx 0;
+  display: flex;
+}
+.accountNum{
+  font-size: 64rpx;
+font-family: ArialMT;
+color: #333333;
+}
+.titlename{
+  font-size: 28rpx;
+font-weight: 400;
+color: #999999;
+}
+.today,.finish{
+  flex:1;
+}
+.money{
+  margin-top: 16rpx;
+  font-size: 36rpx;
+font-weight: 400;
+color: #000000;
+}
+.van-cell:after{
+  left:0rpx!important;
+  right:0rpx!important;
+}
+.van-cell{
+  padding:35rpx 16rpx!important;
+}
+.dialog{
+  width: 100%;
+  text-align: center;
+  height: 100rpx;
+  line-height: 100rpx;
+}
+.dialog_cancel_btn{
+  position: relative;
+}
+.dialog_cancel_btn::before {
+  content: ' ';
+  position: absolute;
+  box-sizing: border-box;
+  top: 0;
+  left: 0;
+  border-top: 2px solid var(--td-border-color, #e7e7e7);
+  border-right: 2px solid var(--td-border-color, #e7e7e7);
+  transform: scale(0.5);
+  transform-origin: 0 0;
+  width: 200%;
+  height: 200%;
+  border-radius: 0;
+  border-top-left-radius: 0px;
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+.dialog_confirm_btn{
+  border-top: 1px solid #E9E9E9;
+  color: #3CC7C0;
+}
+.t-button__content{
+  color: #3CC7C0 !important;
+}
+.t-dialog__button--text:before {
+  border-top: 2px solid #E9E9E9 !important;
+  border-left: 2px solid var(--td-border-color, #E9E9E9);
+  border-top-color: #E9E9E9 !important;
+}
+.slotcontent{
+  margin-top: 20rpx;
+}
+.slotcontent .msg{
+  font-size: 34rpx;
+font-weight: 400;
+color: #666;
+line-height: 48rpx;
+}
\ No newline at end of file
diff --git a/Pages/yishi/onlinechufang/index.js b/Pages/yishi/onlinechufang/index.js
index 5ba3f6b..d5f2c84 100644
--- a/Pages/yishi/onlinechufang/index.js
+++ b/Pages/yishi/onlinechufang/index.js
@@ -60,7 +60,7 @@ Page({
     let order_inquiry_id = options.order_inquiry_id;
     let order_prescription_id	 = options.order_prescription_id	;
     //获取患者问诊病例
-    api.getDoctorInquiryCase({order_inquiry_id: order_inquiry_id}).then(response => {
+    api.getInquiryDetail({order_inquiry_id: order_inquiry_id}).then(response => {
       console.log(response);
       this.setData({
         case_detail: response.data
diff --git a/Pages/yishi/orderdetail/index.wxml b/Pages/yishi/orderdetail/index.wxml
index 07ef182..bbd0f5d 100644
--- a/Pages/yishi/orderdetail/index.wxml
+++ b/Pages/yishi/orderdetail/index.wxml
@@ -6,13 +6,14 @@
       <view class="order_item_content">
         <view class="order_item_content_top ">
           {{ item.inquiry_type==1?'专家问诊':item.inquiry_type==2?'快速问诊':item.inquiry_type==3?'公益问诊':item.inquiry_type==4?'问诊购药':'其他' }}
-        <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.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>
         <view class="order_item_content_data">
           <view class="order_id">订单编号：<text style="font-size: 30rpx;color: #666666;">{{item.inquiry_no}}</text></view>
           <view class="order_id">就诊患者：<text style="font-size: 30rpx;color: #666666;">{{item.patient_name}}（{{item.patient_sex==1?'男':'女'}}，{{item.patient_age}}岁）</text></view>
           <view class="order_id">接诊时间：<text style="font-size: 30rpx;color: #666666;">{{item.reception_time}}</text></view>
-          <view class="order_id">结束时间：<text style="font-size: 30rpx;color: #666666;">{{item.finish_time}}</text></view>
+          <view class="order_id" wx:if="{{item.finish_time}}">结束时间：<text style="font-size: 30rpx;color: #666666;">{{item.finish_time}}</text></view>
           <view class="order_id">订单金额：<text style="font-size: 30rpx;color: #666666;">￥{{item.amount_total}}</text></view>
           <view class="order_id">预计收入：<text style="font-size: 30rpx;color: #666666;">￥{{item.estimate_income}}</text></view>
         </view>
diff --git a/Pages/yishi/orderdetail/index.wxss b/Pages/yishi/orderdetail/index.wxss
index 1c81f27..03df119 100644
--- a/Pages/yishi/orderdetail/index.wxss
+++ b/Pages/yishi/orderdetail/index.wxss
@@ -46,6 +46,18 @@ page{
   background-color: #C5C5C5;
   color: #fff;
 }
+.order_status.entrying{
+  background: #FFF2E8;
+  color: #FA541C;
+}
+.order_status.entrysuccess{
+  background: #E2FFFE;
+  color: #3CC7C0;
+}
+.order_status.entryfail{
+  background-color: #C5C5C5;
+  color: #fff;
+}
 .order_item_content_data{
   flex: 5;
   display: flex;
diff --git a/Pages/yishi/patient_sick/index.js b/Pages/yishi/patient_sick/index.js
index e60e9bc..85e1d3b 100644
--- a/Pages/yishi/patient_sick/index.js
+++ b/Pages/yishi/patient_sick/index.js
@@ -26,7 +26,6 @@ Page({
   goDetail:debounce(function(event){
     console.log(event)
     let id=event.currentTarget.dataset.id;
-    console.log(id);
     app.go("/Pages/yishi/case/index?order_inquiry_id="+id);
   }),
   goDetailbefore:debounce(function(event){
diff --git a/Pages/yishi/sickform/index.js b/Pages/yishi/sickform/index.js
index 3aabba6..c9fac44 100644
--- a/Pages/yishi/sickform/index.js
+++ b/Pages/yishi/sickform/index.js
@@ -1,4 +1,9 @@
-// Pages/sickform/index.js
+// pages/inquiryForm/inquiryForm.js
+const app = getApp()
+import { API } from './../../../utils/network/api'
+const api = new API()
+
+
 Page({
 
   /**
@@ -9,23 +14,552 @@ Page({
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '问诊表', //导航栏 中间的标题
     },
-    params:null,
-    basic:[],
-    preson:[]
+    obj:{
+      height:'身高',
+      weight:'体重',
+      nation_id:'民族',
+      job_id:'职业',
+      marital_status:'婚姻状态',
+      allergy_history:'是否有过敏史？',
+      family_history:'是否有家族病史？',
+      is_pregnant:'是否处于备孕、妊娠、哺乳期？',
+      is_operation:'是否做过手术？',
+      drink_wine_status:'是否有饮酒史?',
+      smoke_status:'是否有吸烟史？',
+      chemical_compound_status:'是否有接触过化学物?',
+      diagnosis_hospital:'确诊医院是？',
+      is_take_medicine:'服用药品是？'
+
+    },
+    showNation:false,
+    showJob:false,
+    showMarital:false,
+    nationname:'',
+    order_inquiry_id:'',
+    jobname:'',
+    hideGuomin:false,
+    hideFamilysick:false,
+    hidePregnant:false,
+    hideOperation:false,
+    hideChemical:false,
+    hideHospital:false,
+    hideDrug:false,
+    personInfo:{},
+    showBtn:true,
+    maritalColumn: [{
+      text: '未婚',
+      value: 0
+    }, {
+      text: '已婚 ',
+      value: 1
+    }, {
+      text: '离异 ',
+      value: 2
+    }],
+    nationcolumns:[],
+    jobcolumns:[],
+    list1:[],
+    list2:[],
+    startIndex1:1,
+    showList:[{
+      isHas:false,
+      index:1
+    },{
+      isHas:false,
+      index:2
+    },{
+      isHas:false,
+      index:3  
+    },{
+      isHas:false,
+      index:4
+    },{
+      isHas:false,
+      index:5
+    },{
+      isHas:false,
+      index:6
+    },{
+      isHas:false,
+      index:7
+    },{
+      isHas:false,
+      index:8
+    },{
+      isHas:false,
+      index:9
+    }],
+    static_host: ''
+    
+
   },
+  handleSendFields(){
+    const {order_inquiry_id,personInfo,list1,list2,marital_name,jobname,nationname}=this.data;
+    console.log(personInfo)
+    const fields=[];
+  for (let i = 0; i <list1.length; i++) {
+   if(list1[i]=='height' && !personInfo.height){
+      wx.showToast({
+        title: '请填写身高',
+        icon:'none'
+      })
+      return false
+   }
+   if (list1[i]=='height' && personInfo.height) {
+    if (!/^3[5-9](\.\d+)?$|^[4-9][0-9](\.\d+)?$|^1[0-9][0-9](\.\d+)?$|^2[1-4][0-9](\.\d+)?$|250/.test(personInfo.height)) {
+      wx.showToast({
+        title: `请输入范围内身高！`,
+        icon: 'none',
+      });
+      return false;
+    }
+  };
+    if(list1[i]=='weight' && !personInfo.weight){
+      wx.showToast({
+        title: '请填写体重',
+        icon:'none'
+      })
+      return false
+  }
   
+  if (list1[i]=='weight' && personInfo.weight) {
+    if (!/^[2-9](\.\d+)?$|^[1-9][0-9](\.\d+)?$|^1[0-9]{1,2}(\.\d+)?$|200/.test(personInfo.weight)) {
+      wx.showToast({
+        title: `请输入范围内体重！`,
+        icon: 'none',
+      });
+      return false;
+    }
+  }
+  if(list1[i]=='marital_status' && !marital_name){
+    wx.showToast({
+      title: '请选择婚姻状态',
+      icon:'none'
+    })
+    return false
+ }
+ if(list1[i]=='nation_id' && !nationname){
+  wx.showToast({
+    title: '请选择民族',
+    icon:'none'
+  })
+  return false
+}
+if(list1[i]=='job_id' && !jobname){
+  wx.showToast({
+    title: '请选择职业',
+    icon:'none'
+  })
+  return false
+}
+    
+}
+for (let i = 0; i < list2.length; i++) {
+  if( list2[i]=="is_allergy_history"){
+ if(!personInfo.is_allergy_history && personInfo.is_allergy_history!=0){
+    wx.showToast({
+      title: '请选择是否有过敏史',
+      icon:'none'
+    })
+    return false
+  }
+  if(personInfo.is_allergy_history==1 && !personInfo.allergy_history){
+    wx.showToast({
+      title: '请填写过敏源',
+      icon:'none'
+    })
+    return false
+  }
+  
+ 
+  }else if(list2[i]=="is_family_history"){
+    if(!personInfo.is_family_history && personInfo.is_family_history!=0){
+      wx.showToast({
+        title: '请选择是否有家族病史',
+        icon:'none'
+      })
+      return false
+    }
+    if(personInfo.is_family_history==1 && !personInfo.family_history){
+      wx.showToast({
+        title: '请填写家族病史',
+        icon:'none'
+      })
+      return false
+    }
+  
+  }else if(list2[i]=="is_pregnant"){
+    if(!personInfo.is_pregnant && personInfo.is_pregnant!=0){
+      wx.showToast({
+        title: '请选择是否处于备孕、妊娠、哺乳期',
+        icon:'none'
+      })
+      return false
+    }
+    if(personInfo.is_pregnant==1 && !personInfo.is_pregnant){
+      wx.showToast({
+        title: '请填写请描述您目前所处阶段，如备孕中、哺乳期中、妊娠月份',
+        icon:'none'
+      })
+      return false
+    }
+  
+  }else if(list2[i]=="is_operation"){
+    if(!personInfo.is_operation && personInfo.is_operation!=0){
+      wx.showToast({
+        title: '请选择是否做过手术',
+        icon:'none'
+      })
+      return false
+    }
+    if(personInfo.is_operation==1 && !personInfo.operation){
+      wx.showToast({
+        title: '请描述具体手术名称和做手术医院',
+        icon:'none'
+      })
+      return false
+    }
+    
+  }else if(list2[i]=="drink_wine_status"){
+    if(!personInfo.drink_wine_status){
+      wx.showToast({
+        title: '请选择是否有饮酒史',
+        icon:'none'
+      })
+      return false
+    }
+  }else if(list2[i]=="smoke_status"){
+    if(!personInfo.smoke_status){
+      wx.showToast({
+        title: '请选择是否有吸烟史',
+        icon:'none'
+      })
+      return false
+    }
+  }else if(list2[i]=="chemical_compound_status"){
+    if(!personInfo.chemical_compound_status){
+      wx.showToast({
+        title: '是否有接触过化学物',
+        icon:'none'
+      })
+      return false
+    }
+    if(personInfo.chemical_compound_status && personInfo.chemical_compound_status!=1 && !personInfo.chemical_compound_describe){
+      wx.showToast({
+        title: '请详细填写接触过的相关化学物',
+        icon:'none'
+      })
+      return false
+    }
+  }else if(list2[i]=="diagnosis_hospital"){
+    if(!personInfo.diagnosis_hospital){
+      wx.showToast({
+        title: '请填写确诊医院名称',
+        icon:'none'
+      })
+      return false
+    }
+  
+  }else if(list2[i]=="is_take_medicine"){
+    if(!personInfo.is_take_medicine && personInfo.is_take_medicine!=0){
+      wx.showToast({
+        title: '请填写是否正在服药',
+        icon:'none'
+      })
+      return false
+    }
+    if(personInfo.is_take_medicine==1 && !personInfo.drugs_name){
+      wx.showToast({
+        title: '请填服药名称',
+        icon:'none'
+      })
+      return false
+    }
+  }
+  
+}
+    
+    sendFields({
+      order_inquiry_id,
+      fields:personInfo,
+    }).then(data=>{
+      wx.showToast({
+        title: '发送成功',
+        icon:'none'
+      }),
+      wx.navigateBack()
+      
+    })
+  },
+  openMaritalPicker() {
+      this.setData({
+        showMarital: true
+      })
+  },
+  closeMaritalPicker() {
+    this.setData({
+      showMarital: false
+    })
+  },
+  onConfirmMaritalPicker(event) {
+    const {
+      value
+    } = event.detail;
+  
+    this.setData({
+      showMarital: false,
+      marital_name:value.text,
+     'personInfo.marital_status':value.value
+    })
+  },
+  onChangeRadio(event) {
+    let key = event.target.dataset.id;
+    let obj= "personInfo."+key;
+    this.setData({
+       [obj]:Number(event.detail)
+    });
+    if(key=="chemical_compound_status" && event.detail==1){
+      this.setData({
+        "personInfo.chemical_compound_describe":''
+      })
+    }else if(event.detail==0){
+       if(key=="is_allergy_history"){
+         this.setData({
+         "personInfo.allergy_history":'',
+         hideGuomin:false
+         })
+       };
+       if(key=="is_pregnant"){
+        this.setData({
+          "personInfo.pregnant":'',
+           hidePregnant:false
+          })
+       }
+       if(key=="is_family_history"){
+        this.setData({
+          "personInfo.family_history":'',
+           hideFamilysick:false
+          })
+       }
+    }
+  },
+  handelFocus(e) {
+    let key = e.target.dataset.id;
+    let value = e.target.dataset.value;
+    let obj="personInfo."+value;
+    if (!e.detail.value) {
+      this.setData({
+        [key]: false,
+        [obj]: e.detail.value
+      })
+    } else {
+      this.setData({
+        [key]: true,
+        [obj]: e.detail.value
+      })
+    }
+  },
+  onConfirmNation(event) {
+    const {
+      value
+    } = event.detail;
+    this.setData({
+     "nationname": `${value.nation_name}`,
+     "personInfo.nation_id": `${value.nation_id}`,
+     showNation: false
+    })
+  },
+  showNation() {
+   
+      this.setData({
+        showNation: true
+      })
+
+  },
+  onCancelNation() {
+    this.setData({
+      showNation: false
+    })
+  },
+  onConfirmJob(event) {
+    const {
+      value
+    } = event.detail;
+    this.setData({
+     "jobname": `${value.job_name}`,
+     "personInfo.job_id": `${value.job_id}`,
+      showJob: false
+    })
+  },
+  showJob() {
+      this.setData({
+        showJob: true
+      }) 
+  },
+  onCancelJob() {
+    this.setData({
+      showJob: false
+    })
+  },
+  commonMethods(arr1,arr2){
+    this.setData({
+      list1:arr1,
+      list2:arr2
+    });
+    let count=0;
+    arr2.forEach((item)=>{
+       if(item=="allergy_history"){
+         count++;
+        this.setData({
+          'showList[0].isHas':true,
+          'showList[0].index':1
+        })
+       }else if(item=="family_history"){
+         count++;
+        this.setData({
+          'showList[1].isHas':true,
+          'showList[1].index':count
+        })
+       }else if(item=="is_pregnant"){
+        count++;
+        this.setData({
+          'showList[2].isHas':true,
+          'showList[2].index':count
+        })
+       }else if(item=="is_operation"){
+        count++;
+        this.setData({
+          'showList[3].isHas':true,
+          'showList[3].index':count
+        })
+       }else if(item=="drink_wine_status"){
+        count++;
+        this.setData({
+          'showList[4].isHas':true,
+          'showList[4].index':count
+        })
+       }else if(item=="smoke_status"){
+        count++;
+        this.setData({
+          'showList[5].isHas':true,
+          'showList[5].index':count
+        })
+       }else if(item=="chemical_compound_status"){
+        count++;
+        this.setData({
+          'showList[6].isHas':true,
+          'showList[6].index':count
+        })
+       }else if(item=="diagnosis_hospital"){
+        count++;
+        this.setData({
+          'showList[7].isHas':true,
+          'showList[7].index':count
+        })
+       }else if(item=="is_take_medicine"){
+        count++;
+        this.setData({
+          'showList[8].isHas':true,
+          'showList[8].index':count
+        })
+       }
+    })
+
+  },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    if(options.params){
-      this.setData({
-        params:options.params
-      });
-      let data=JSON.parse(options.params);
-      console.log(options.params)
-    }
-    
+    this.getNation();
+    this.getJob();
+       if(options.order_inquiry_id){
+         this.setData({
+          order_inquiry_id:options.order_inquiry_id
+         })
+       }
+      if(options.case_filled_fields){
+        
+        let data=JSON.parse(options.case_filled_fields);
+        let arr1=[];
+        let arr2=[];
+      
+        this.setData({
+          personInfo:data,
+          showBtn:false
+        });
+        if(data.is_allergy_history==1){
+          this.setData({
+            hideGuomin:true
+          })
+        }
+        if(data.is_family_history==1){
+          this.setData({
+            hideFamilysick:true
+          })
+        }
+        if(data.is_operation==1){
+          this.setData({
+            hideOperation:true
+          })
+        }
+        if(data.is_pregnant==1){
+          this.setData({
+            hidePregnant:true
+          })
+        }
+        if(data.chemical_compound_status && data.chemical_compound_status!=1){
+          this.setData({
+            hideChemical:true
+          })
+        }
+        if(data.diagnosis_hospital){
+          this.setData({
+            hideHospital:true
+          })
+        }
+        if(data.is_take_medicine==1){
+          this.setData({
+           hideDrug:true
+          })
+        }
+        let {maritalColumn,jobcolumns,nationcolumns}=this.data;
+        if(data.marital_status==0 || data.marital_status){
+          let select=maritalColumn.filter(item=>{return item.value==data.marital_status});
+          this.setData({
+            'marital_name':select[0].text
+          })
+        };
+       
+       
+      
+        Object.keys(data).forEach(function(key){
+          if(key=="weight" || key=="height" || key=="marital_status" || key=="nation_id" || key=="job_id"){
+            arr1.push(key);
+         }else{
+            arr2.push(key);
+         }
+          })
+          this.commonMethods(arr1,arr2);
+         
+
+
+      }
+     if(options.params){
+       let data=JSON.parse(options.params);
+       let {obj}=this.data;
+       let arr1=[];
+       let arr2=[];
+        data.forEach(item => {
+        if(item=="weight" || item=="height" || item=="marital_status" || item=="nation_id" || item=="job_id"){
+           arr1.push(item);
+        }else{
+           arr2.push(item);
+        }
+       
+      })
+      this.commonMethods(arr1,arr2);
+     
+     }
   },
 
   /**
@@ -34,12 +568,44 @@ Page({
   onReady() {
 
   },
-
+  getNation(){
+    api.getNation().then(data=>{
+        let result=data.data;
+        this.setData({
+          nationcolumns:result
+        })
+        let {personInfo}=this.data;
+        if(personInfo.nation_id || personInfo.nation_id==0){
+          let select=result.filter(item=>{return item.nation_id==personInfo.nation_id});
+          this.setData({
+            'nationname':select[0].nation_name
+          })
+        }
+    })
+  },
+ getJob(){
+  api.getJob().then(data=>{
+    let result=data.data;
+      this.setData({
+        jobcolumns: result
+      })
+      let {personInfo}=this.data;
+      if(personInfo.job_id || personInfo.job_id==0){
+         let select=result.filter(item=>{return item.job_id==personInfo.job_id});
+        this.setData({
+          'jobname':select[0].job_name
+        })
+      }
+    })
+  },
   /**
    * 生命周期函数--监听页面显示
    */
   onShow() {
-
+    console.log(api.getStaticHost())
+   this.setData({
+     static_host:api.getStaticHost()
+   })
   },
 
   /**
diff --git a/Pages/yishi/sickform/index.wxml b/Pages/yishi/sickform/index.wxml
index 7ff733d..7b2a3ec 100644
--- a/Pages/yishi/sickform/index.wxml
+++ b/Pages/yishi/sickform/index.wxml
@@ -1,65 +1,63 @@
-<!--Pages/sickform/index.wxml-->
-<!--Pages/yishi/patient_sick/index.wxml-->
-<!--Pages/yishi/medince_list/index.wxml-->
+<wxs src="../../../filters/filter.wxs" module="filter"></wxs>
 <view class="page">
   <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
   <view class="container"> 
     <view class="questionbox">
     <view class="cellbox">
    <view class="basictitle">基本信息</view>
-    <view class="cell" >
+    <view class="cell" wx:if="{{filter.formatwenzhenList(list1,'height').ISHAS}}">
         <view class="cellrow">
           <view class="name">
-           1、身高（CM）
+            {{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="{{notallowEdit?true:false}}" />
+            <input type="text" value="{{user_info.name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请输入身高" placeholder-class="placeholder" class="ipt" disabled="{{!showBtn}}" />
 
           </view>
         </view>
       </view>
-      <view class="cell" >
+      <view class="cell" wx:if="{{filter.formatwenzhenList(list1,'weight').ISHAS}}">
         <view class="cellrow">
           <view class="name">
-          2、体重（KG）
+            {{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="{{notallowEdit?true:false}}" />
+            <input type="text" value="{{user_info.name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请请输入体重" placeholder-class="placeholder" class="ipt" disabled="{{!showBtn}}" />
 
           </view>
         </view>
       </view>
-      <view class="cell" >
+      <view class="cell" wx:if="{{filter.formatwenzhenList(list1,'marital_status').ISHAS}}" bindtap="openMaritalPicker">
         <view class="cellrow">
           <view class="name">
-           3、婚姻状况
+            {{filter.formatwenzhenList(list1,'marital_status').NUMBER}}、婚姻状况
           </view>
           <view class="iptbox">
-            <input type="text" value="{{user_info.name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请选择婚姻状况" placeholder-class="placeholder" class="ipt" disabled="{{notallowEdit?true:false}}" />
-            <image src="{{img_host+'/righticon.png'}}"  class="righticon"></image>
+            <input type="text" value="{{marital_name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请选择婚姻状况" placeholder-class="placeholder" class="ipt" disabled="{{!showBtn}}" />
+            <image src="{{static_host}}/applet/patient/static/righticon.png"  class="righticon"></image>
 
           </view>
         </view>
       </view>
-      <view class="cell" >
+      <view class="cell" wx:if="{{filter.formatwenzhenList(list1,'nation_id').ISHAS}}" bindtap="showNation">
         <view class="cellrow">
           <view class="name">
-           4、民族
+            {{filter.formatwenzhenList(list1,'nation_id').NUMBER}}、民族
           </view>
           <view class="iptbox">
-            <input type="text" value="{{user_info.name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请选择民族" placeholder-class="placeholder" class="ipt" disabled="{{notallowEdit?true:false}}" />
-            <image src="{{img_host+'/righticon.png'}}"  class="righticon"></image>
+            <input type="text" value="{{nationname}}"  	bindinput="handleIpt"  data-id="name" placeholder="请选择民族" placeholder-class="placeholder" class="ipt" disabled="{{!showBtn}}" />
+            <image src="{{static_host}}/applet/patient/static/righticon.png"  class="righticon"></image>
           </view>
         </view>
       </view>
-      <view class="cell" >
+      <view class="cell" wx:if="{{filter.formatwenzhenList(list1,'job_id').ISHAS}}" bindtap="showJob">
         <view class="cellrow">
           <view class="name">
-           5、职业
+            {{filter.formatwenzhenList(list1,'job_id').NUMBER}}、职业
           </view>
           <view class="iptbox">
-            <input type="text" value="{{user_info.name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请请选择职业" placeholder-class="placeholder" class="ipt" disabled="{{notallowEdit?true:false}}" />
-            <image src="{{img_host+'/righticon.png'}}"  class="righticon"></image>
+            <input type="text" value="{{jobname}}"  	bindinput="handleIpt"  data-id="name" placeholder="请请选择职业" placeholder-class="placeholder" class="ipt" disabled="{{!showBtn}}" />
+            <image src="{{static_host}}/applet/patient/static/righticon.png"  class="righticon"></image>
           </view>
         </view>
       </view>
@@ -69,85 +67,85 @@
      <view class="basictitle">个人情况</view>
      <view class="sickHis">
         <view class="list">
-          <view class="qa">
-            <view class="num">1、</view>
+          <view class="qa" wx:if="{{showList[0].isHas}}">
+            <view class="num">{{showList[0].index}}、</view>
             <view class="titlebox">
               <view class="title">您是否有过敏史？</view>
               <view class="radio" >
-                <van-radio-group value="{{ filter.numberTOstring(personInfo.is_allergy_history) }}" class="singlegroup" data-id="is_allergy_history" bind:change="onChangeRadio" direction="horizontal">
+                <van-radio-group disabled="{{!showBtn}}" value="{{ filter.numberTOstring(personInfo.is_allergy_history) }}" class="singlegroup" data-id="is_allergy_history" bind:change="onChangeRadio" direction="horizontal">
                   <van-radio name="1" checked-color="#3cc7c0">是</van-radio>
                   <van-radio name="0" checked-color="#3cc7c0">否</van-radio>
                 </van-radio-group>
               </view>
               <!-- hidden="{{checkGuomin!=1}}" -->
               <view class="radiotip" hidden="{{personInfo.is_allergy_history!=1}}">
-                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done" bindinput="handelFocus"  value="{{personInfo.allergy_history}}" data-id="hideGuomin" data-value="allergy_history"></textarea>
+                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	disabled="{{!showBtn}}" confirm-type="done" bindinput="handelFocus"  value="{{personInfo.allergy_history}}" data-id="hideGuomin" data-value="allergy_history"></textarea>
                 <view class="textbox" hidden="{{hideGuomin}}">
                   <view class="desc"><text>过敏史：</text>请填写过敏源，如药物，请写出药名；如食物，请写具体如鸡蛋、牛奶等（限制50个字）</view>
                 </view>
               </view>
             </view>
           </view>
-          <view class="qa">
-            <view class="num">2、</view>
+          <view class="qa" wx:if="{{showList[1].isHas}}">
+            <view class="num">{{showList[1].index}}、</view>
             <view class="titlebox">
               <view class="title">您是否有家族病史？</view>
               <view class="radio">
-                <van-radio-group class="singlegroup" value="{{filter.numberTOstring(personInfo.is_family_history)}}"   data-id="is_family_history" bind:change="onChangeRadio" direction="horizontal">
+                <van-radio-group disabled="{{!showBtn}}" class="singlegroup" value="{{filter.numberTOstring(personInfo.is_family_history)}}"   data-id="is_family_history" bind:change="onChangeRadio" direction="horizontal">
                   <van-radio name="1" checked-color="#3cc7c0">是</van-radio>
                   <van-radio name="0" checked-color="#3cc7c0">否</van-radio>
                 </van-radio-group>
               </view>
               <view class="radiotip" hidden="{{personInfo.is_family_history!=1}}">
-                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.family_history}}" data-id="hideFamilysick" data-value="family_history"></textarea>
+                <textarea placeholder=" " disabled="{{!showBtn}}" show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.family_history}}" data-id="hideFamilysick" data-value="family_history"></textarea>
                 <view class="textbox" hidden="{{hideFamilysick}}">
                   <view class="desc"><text>家族病史：</text>请详细填写相关家族病史（限制50个字）</view>
                 </view>
               </view>
             </view>
           </view>
-          <view class="qa" wx:if="{{sex==2}}">
-            <view class="num">{{startIndex}}、</view>
+          <view class="qa" wx:if="{{showList[2].isHas}}">
+            <view class="num">{{showList[2].index}}、</view>
             <view class="titlebox">
               <view class="title">您是否处于备孕、妊娠、哺乳期？</view>
               <view class="radio">
-                <van-radio-group value="{{ filter.numberTOstring(personInfo.is_pregnant) }}"  bind:change="onChangeRadio"   data-id="is_pregnant"  direction="horizontal" class="singlegroup">
+                <van-radio-group disabled="{{!showBtn}}" value="{{ filter.numberTOstring(personInfo.is_pregnant) }}"  bind:change="onChangeRadio"   data-id="is_pregnant"  direction="horizontal" class="singlegroup">
                   <van-radio name="1" checked-color="#3cc7c0">是</van-radio>
                   <van-radio name="0" checked-color="#3cc7c0">否</van-radio>
                 </van-radio-group>
               </view>
               <view class="radiotip" hidden="{{personInfo.is_pregnant!=1}}">
-                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.pregnant}}" data-id="hidePregnant" data-value="pregnant"></textarea>
+                <textarea placeholder=" " disabled="{{!showBtn}}" show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.pregnant}}" data-id="hidePregnant" data-value="pregnant"></textarea>
                 <view class="textbox" hidden="{{hidePregnant}}">
                   <view class="desc">请描述您目前所处阶段，如备孕中、哺乳期中、妊娠月份。（限制50个字）</view>
                 </view>
               </view>
             </view>
           </view>
-          <view class="qa">
-            <view class="num">{{startIndex+1}}、</view>
+          <view class="qa" wx:if="{{showList[3].isHas}}">
+            <view class="num">{{showList[3].index}}、</view>
             <view class="titlebox">
               <view class="title">是否做过手术</view>
               <view class="radio">
-                <van-radio-group  value="{{ filter.numberTOstring(personInfo.is_operation) }}"  data-id="is_operation"  bind:change="onChangeRadio" direction="horizontal" class="singlegroup">
+                <van-radio-group  disabled="{{!showBtn}}" value="{{ filter.numberTOstring(personInfo.is_operation) }}"  data-id="is_operation"  bind:change="onChangeRadio" direction="horizontal" class="singlegroup">
                   <van-radio name="1" checked-color="#3cc7c0">是</van-radio>
                   <van-radio name="0" checked-color="#3cc7c0">否</van-radio>
                 </van-radio-group>
               </view>
               <view class="radiotip" hidden="{{personInfo.is_operation !=1}}">
-                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.operation}}" data-id="hideOperation" data-value="operation"></textarea>
+                <textarea placeholder=" " disabled="{{!showBtn}}" show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.operation}}" data-id="hideOperation" data-value="operation"></textarea>
                 <view class="textbox" hidden="{{hideOperation}}">
                   <view class="desc">请描述具体手术名称和做手术医院</view>
                 </view>
               </view>
             </view>
           </view>
-          <view class="qa">
-            <view class="num">{{startIndex+2}}、</view>
+          <view class="qa" wx:if="{{showList[4].isHas}}">
+            <view class="num">{{showList[4].index}}、</view>
             <view class="titlebox">
               <view class="title">是否有饮酒史</view>
               <view class="radio">
-                <van-radio-group value="{{ filter.numberTOstring(personInfo.drink_wine_status) }}"   data-id="drink_wine_status"  bind:change="onChangeRadio" direction="horizontal" class="group">
+                <van-radio-group disabled="{{!showBtn}}" value="{{ filter.numberTOstring(personInfo.drink_wine_status) }}"   data-id="drink_wine_status"  bind:change="onChangeRadio" direction="horizontal" class="group">
                   <van-radio name="1" checked-color="#3cc7c0">从不</van-radio>
                   <van-radio name="2" checked-color="#3cc7c0">偶尔</van-radio>
                   <van-radio name="3" checked-color="#3cc7c0">经常</van-radio>
@@ -157,12 +155,12 @@
               </view>
             </view>
           </view>
-          <view class="qa">
-            <view class="num">{{startIndex+3}}、</view>
+          <view class="qa" wx:if="{{showList[5].isHas}}">
+            <view class="num">{{showList[5].index}}、</view>
             <view class="titlebox">
               <view class="title">是否有吸烟史</view>
               <view class="radio">
-                <van-radio-group value="{{ filter.numberTOstring(personInfo.smoke_status) }}"  data-id="smoke_status" bind:change="onChangeRadio" direction="horizontal" class="group">
+                <van-radio-group disabled="{{!showBtn}}" value="{{ filter.numberTOstring(personInfo.smoke_status) }}"  data-id="smoke_status" bind:change="onChangeRadio" direction="horizontal" class="group">
                   <van-radio name="1" checked-color="#3cc7c0">从不</van-radio>
                   <van-radio name="2" checked-color="#3cc7c0">偶尔</van-radio>
                   <van-radio name="3" checked-color="#3cc7c0">经常</van-radio>
@@ -172,12 +170,12 @@
               </view>
             </view>
           </view>
-          <view class="qa">
-            <view class="num">{{startIndex+4}}、</view>
+          <view class="qa" wx:if="{{showList[6].isHas}}">
+            <view class="num">{{showList[6].index}}、</view>
             <view class="titlebox">
               <view class="title">是否有接触过化学物</view>
               <view class="radio">
-                <van-radio-group value="{{filter.numberTOstring(personInfo.chemical_compound_status)}}"   data-id="chemical_compound_status"    bind:change="onChangeRadio" direction="horizontal" class="group">
+                <van-radio-group disabled="{{!showBtn}}" value="{{filter.numberTOstring(personInfo.chemical_compound_status)}}"   data-id="chemical_compound_status"    bind:change="onChangeRadio" direction="horizontal" class="group">
                   <van-radio name="1" checked-color="#3cc7c0">从不</van-radio>
                   <van-radio name="2" checked-color="#3cc7c0">偶尔</van-radio>
                   <van-radio name="3" checked-color="#3cc7c0">经常</van-radio>
@@ -186,7 +184,7 @@
               </view>
              
               <view class="radiotip" wx:if="{{(personInfo.chemical_compound_status!=1 && personInfo.chemical_compound_status)}}">
-                <textarea placeholder=" "  show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done" value="{{personInfo.chemical_compound_describe}}" bindinput="handelFocus"  data-id="hideChemical" data-value="chemical_compound_describe"></textarea>
+                <textarea placeholder=" "  disabled="{{!showBtn}}" show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done" value="{{personInfo.chemical_compound_describe}}" bindinput="handelFocus"  data-id="hideChemical" data-value="chemical_compound_describe"></textarea>
                 <view class="textbox" hidden="{{hideChemical}}">
                   <view class="desc"><text>化学物：</text>请详细填写接触过的相关化学物（限制50个字）</view>
                 </view>
@@ -194,27 +192,31 @@
 
             </view>
           </view>
-          <view class="qa">
-            <view class="num">{{startIndex+45}}、</view>
+          <view class="qa" wx:if="{{showList[7].isHas}}">
+            <view class="num">{{showList[7].index}}、</view>
             <view class="titlebox">
               <view class="title">确诊医院是？</view>
-             
               <view class="radiotip" >
-                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.family_history}}" data-id="hideFamilysick" data-value="family_history"></textarea>
-                <view class="textbox" hidden="{{hideFamilysick}}">
+                <textarea placeholder=" " disabled="{{!showBtn}}" show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.diagnosis_hospital}}" data-id="hideHospital" data-value="diagnosis_hospital"></textarea>
+                <view class="textbox" hidden="{{hideHospital}}">
                   <view class="desc"><text></text>请填写确诊医院名称</view>
                 </view>
               </view>
             </view>
           </view>
-          <view class="qa">
-            <view class="num">{{startIndex+6}}、</view>
+          <view class="qa" wx:if="{{showList[8].isHas}}">
+            <view class="num">{{showList[8].index}}、</view>
             <view class="titlebox">
-              <view class="title">服用药品是？</view>
-             
-              <view class="radiotip" >
-                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.family_history}}" data-id="hideFamilysick" data-value="family_history"></textarea>
-                <view class="textbox" hidden="{{hideFamilysick}}">
+              <view class="title">是否正在服药？</view>
+              <view class="radio">
+                <van-radio-group  disabled="{{!showBtn}}" value="{{filter.numberTOstring(personInfo.is_take_medicine) }}"  data-id="is_take_medicine"  bind:change="onChangeRadio" direction="horizontal" class="singlegroup">
+                  <van-radio name="1" checked-color="#3cc7c0">是</van-radio>
+                  <van-radio name="0" checked-color="#3cc7c0">否</van-radio>
+                </van-radio-group>
+              </view>
+              <view class="radiotip" hidden="{{personInfo.is_take_medicine !=1}}">
+                <textarea placeholder=" " show-confirm-bar="{{false}}" cursor-spacing="70"	confirm-type="done"  bindinput="handelFocus"  value="{{personInfo.drugs_name}}" data-id="hideDrug" data-value="drugs_name"></textarea>
+                <view class="textbox" hidden="{{hideDrug}}">
                   <view class="desc"><text></text>请详细填写所服药物（限制50个字）</view>
                 </view>
               </view>
diff --git a/Pages/yishi/sickform/index.wxss b/Pages/yishi/sickform/index.wxss
index c6c0877..307e6e8 100644
--- a/Pages/yishi/sickform/index.wxss
+++ b/Pages/yishi/sickform/index.wxss
@@ -1,16 +1,19 @@
 page{
-  overflow: hidden;
+  display: flex;
+  flex-direction: column;
 }
 .container{
- height:100vh;
- overflow: scroll;
+
+ flex:1;
+ overflow-y: scroll;
  background-color: #F6F6F6;
 }
 .cellbox{
   background-color: #fff;
 }
 .questionbox{
-  overflow-y: scroll;
+  
+ 
 }
 .cellbox .cell{
   background-color: #fff;
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml
index 82259ab..0da3547 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxml
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml
@@ -199,7 +199,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>         
          <!-- aa -->
       </van-tab>
diff --git a/Pages/yishi/write_sickform/index.wxss b/Pages/yishi/write_sickform/index.wxss
index 6218821..de55aa1 100644
--- a/Pages/yishi/write_sickform/index.wxss
+++ b/Pages/yishi/write_sickform/index.wxss
@@ -65,4 +65,7 @@ border-radius: 8rpx;
   color: #999999;
   align-items: center;
   flex-direction: column;
+}
+.van-cell{
+  align-items: center;
 }
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
index 5064003..739b6ac 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
@@ -311,9 +311,8 @@ Component({
     })
     }),
    goSick(event){
-    // const url=event.currentTarget.dataset.url;
-    // console.log(url);
-    // app.go(url);
+    const url=event.currentTarget.dataset.url;
+    app.go(url);
    },
 
     openLink(e) {
@@ -336,7 +335,7 @@ Component({
       const {ismine,params}=event.currentTarget.dataset;
       console.log(params);
       if(!ismine){
-        app.go('/Pages/yishi/sickform/index?params='+params)
+        app.go('/Pages/yishi/sickform/index?case_filled_fields='+params)
       }
      // app.go(url);
     }
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxml b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
index 827f1ed..5b931b6 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
@@ -55,7 +55,7 @@
             <view class="TUI-Extension-slot-name MY-TUI-Extension-slot-name">常用语</view>
         </view>
         <view class="TUI-Extension-slot MY-TUI-Extension-slot" bindtap="showWenZhenBiao">
-            <image mode="widthFix" class="TUI-Extension-icon MY-TUI-Extension-icon" src="{{static_host}}/applet/doctor/static/images/chat/wenzi.png" />
+            <image mode="widthFix" class="TUI-Extension-icon MY-TUI-Extension-icon" src="../../../../../static/images/yishi/tabbar_icon/wenzhenicon.png" />
             <view class="TUI-Extension-slot-name MY-TUI-Extension-slot-name">问诊表</view>
         </view>
         <!-- <view class="TUI-Extension-slot" bindtap="handleSendPicture">
diff --git a/app.js b/app.js
index 5b9f7a3..0667b27 100644
--- a/app.js
+++ b/app.js
@@ -122,10 +122,11 @@ App({
             userID: this.globalData.config.userID,
             userSig
         });
-  
+        let THIS=this;
         login_promise.then(function(imResponse) {
           // console.log(imResponse.data); // 登录成功
           callback();
+          THIS.globalData.isLogin=true;
         }).catch(function(imError) {
           console.warn('login error:', imError); // 登录失败的相关信息
           if(type==1 && imError.indexOf("重复登录")!=-1){
diff --git a/commpents/upload-cell/index.wxml b/commpents/upload-cell/index.wxml
index 06fcdd2..7b26e20 100644
--- a/commpents/upload-cell/index.wxml
+++ b/commpents/upload-cell/index.wxml
@@ -11,7 +11,7 @@
   </view>
   <view class="upload-cell-input">
     <van-uploader disabled="{{disabled}}" multiple="{{is_multiple}}" preview-full-image="{{true}}" file-list="{{ fileList }}" max-count="{{max_count}}" deletable="{{ deletable }}" bind:after-read="afterRead" bind:delete="delete" >
-      <van-image width="100" height="100" src="{{static_host}}/applet/doctor/static/images/yishi/upload_button.png" />
+      <van-image width="80" height="80" src="{{static_host}}/applet/doctor/static/images/yishi/upload_button.png" />
     </van-uploader>
   </view>
   <view class="error_box" wx:if="{{ has_error_content != '' }}" >
diff --git a/filters/filter.wxs b/filters/filter.wxs
new file mode 100644
index 0000000..40d3c6e
--- /dev/null
+++ b/filters/filter.wxs
@@ -0,0 +1,70 @@
+
+function numberTOstring(value){
+   if(value==null) return null;
+   return value.toString();
+};
+function formatwenzhenList(arr,type){
+  var obj=null;
+  for (var i = 0; i < arr.length; ++i) {
+    if(arr[i]==type){
+      return {NUMBER:i+1,ISHAS:true}
+    }
+   };
+   return {ISHAS:false}
+  };
+ function transforDay(time, type) {
+    if (time == null || type == '') {
+      return ''
+    }
+    if (arguments.length === 0) {
+      return null
+    }
+    var  time_cur=0
+    if(typeof time=="string"){
+      var reg = getRegExp("-", "g");
+    var timeS=time.replace(reg, '/');
+      time_cur = getDate(timeS).getTime();
+    }else{
+      time_cur=time*1000
+    }
+    var date = getDate(time_cur);//在wxs中不能使用new Date()来处理日期
+    console.log("date", date);
+    var y = date.getFullYear();
+    var m = addZero(date.getMonth() + 1);
+    var d = addZero(date.getDate());
+    var h =addZero(date.getHours());
+    var i = addZero(date.getMinutes());
+    var s =addZero(date.getSeconds());
+    var a = addZero(date.getDay());
+    var time_str = "";
+    if (type == 'month') {
+      time_str = y + '-' + m;
+    }else if(type=='day'){
+      time_str = m + '-' + d;
+    } else if(type=='HM'){
+      time_str =h + ':' + s;
+    }else if (type == 'date') {
+      time_str = y + '-' + m + '-' + d;
+    }else if(type=='noyear'){
+      time_str =m + '-' + d + ' ' + h + ':' + i 
+    }else if(type == 'dateminute'){
+      time_str = y + '-' + m + '-' + d + ' ' + h + ':' + i 
+    }else if (type == 'datetime') {
+      time_str = y + '-' + m + '-' + d + ' ' + h + ':' + i + ':' + s;
+    } else if (type == 'onlyMonth') {
+      time_str = m;
+    } else if (type == 'onlyYear') {
+      time_str = y;
+    }
+    return time_str
+  };
+  function addZero(n) {
+    n = n.toString()
+    return n[1] ? n : '0' + n
+  };
+
+module.exports = {
+  formatwenzhenList:formatwenzhenList,
+  numberTOstring:numberTOstring,
+  transforDay:transforDay
+};
\ No newline at end of file
diff --git a/static/images/yishi/tabbar_icon/wenzhenform.png b/static/images/yishi/tabbar_icon/wenzhenform.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1db918bfb1a4ab9e123f60b9b1bb3294f21a592
GIT binary patch
literal 1209
zcmV;q1V;ObP)<h;3K|Lk000e1NJLTq001fg001lq1^@s66PhYU00001b5ch_0Itp)
z=>Px(b4f%&R9HvtnOCS?MHGg=-;N!9&<8~gSg{4Mpn|bSETBfC4;rIr@?w2Zu@N6E
zD1wRwM2tp-1XQpkSTR-<jSx#7gv3M<K@?&ETU_!VW?$ya-RJIo$Uc{V&fA$id(F51
zHD#@JMA0H*f8ZQoUtn86<(LkC{|0;mya6nh^!Fg!V-OLsCGZe%0kBbrFl|kJ1<aE4
zLEQ^I(1_S9ebv!zt&V8iAHWHc-YxA{pmzY*XAc8-3-}WFXGBn&0!IJ`7xvcxdr30%
zSW`so2&@LSO1&O1Q_}Mz0_-yz5oZAlvibe|B1un_ptFF-v(6hNS>Z`*5it{3m`%7y
z(s?E5qrfGp^H*SJN#2c<)*`}7&|cj&O}b3dAtmS%V0!9&S<-3wfQZ-+m<?>+5&6%+
zeUg4C=6MA;DfO+AG^GUn5I8J#-Yx0c!hko`F&#lxX6}`AburHi!0D-PwWQrk(2s#i
z=6RBCEet#i%<UL-j-*Gr2KD;cyF=HnmGpJ_;SsTZigv8zKy&|tcCGY(N70Dz)p~4~
zn+bSRQeO<Q-ik)VGr-v$yZS~+w|9L!Ee1~M81yztHx;0ZfOAvd3Q4{Z$C{(3rUQQ`
z;LMI)zfjWe1*orad(TVlI!Sj81=_Ka6Pk;N?SNe*eNhf<RCF>yCz@-60F8(p9Mz|6
z;!{a~ZBU9v#P+}g&M1IQ65LAQ_%a@7R5T*C0Zwe#Ojf{W<4<juN`ib9IJD-SRX)2V
zIhgLXHlWX?UEjp8RMNDjL4IBX`Dapgk8CbSScdIIT5UjI1p1=>0Wj}NI;sh@2GYso
z3`sAgkC+GCk_sPIbedt?fI3S(qlN32NcwIf&~*H~R=E3n;5bPus&^w|4)7qbaZ1^z
zHi9-O)b@FT^qQ>Fo?ig3e>dk((<Lp-V0}wDGj-rTV^TnCAbXnyxB|E)!L0>OmGoX(
z0xnSem_Fvpk%JC`tafxn+>^mNO?N@!b>K1AqS8m4JW|jm$jr?-tT)%&=}7bt2P@}~
z3^YMHS3f)fjXN9j^<5}iJ$gD-_|}aCbXdr=CSB_MJk@30H3r%09BsR+GdH^U>)qW-
z$qaHnaAC632iZAjM05f9RI28!%SGzc^%3!G+O^djPo_2Idh56r5q5X3WG!T!qT^D8
zVO$>(%Yg#`tKnP4&83^UlKNl=K)N(uTR1KioiFL)Vc?3LTY);ya;o7oaU5(7q?LE^
zc3^eepkDY6<J`Ulrql(lZQwISmnNIO0{dXom6*G`5wddq{lMiJhy&THB=s%kAwic*
zIw&H14VJK5WV_oX@!1n8S<P!jrvjf8|0g*Hd<SsgFj4bn_(+l!a-3PYevPEvQeO#M
z*=r5iQ#2X7(<y2j)oR9gUF|7pWd`bqzZYDjX4oS$F@}Q7K@IG`Zyd1NHN&<8C4CkV
zd3k$~jiDjOKr4$8;bQ-#siwaVuyq5mQ-}qUE=!(qCTZ_fe+A{Q`*`vaySdGpEa&|f
X0OD^-^i)cP00000NkvXXu0mjf?{_cI

literal 0
HcmV?d00001

diff --git a/static/images/yishi/tabbar_icon/wenzhenicon.png b/static/images/yishi/tabbar_icon/wenzhenicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..92bdc460cb5ef2f2bacc41e1cf3f4721b43f2f58
GIT binary patch
literal 2195
zcmV;E2yFL>P)<h;3K|Lk000e1NJLTq002Y)002k`1^@s6PtjA!00001b5ch_0Itp)
z=>Px-O-V#SRCr$PoPTgsR~5&<=e-RHA(S7L3{XhqhapR7)EOYV$)?%0KeQQ(GdiL(
zTD6STKcGtKATpw8wbJrSW~_CzgH~Ioh%=7UinWOBhU{j8({XHCvit~vK;%~jLLi|N
zcK03UZjyF)^LF36`=i;ld;i>b?z!iF-Z|&pd*69WNYFmNf4_QRe)$6cK1;w#1}X`d
zmPkGae%An;2dE3AbupAze0BG{1|pWRjr4>Y+FP25c?W={GRksJmT-cZ_sl)t_xzt$
zuMV5BFBS+hIoeyE2Jjs-o%2P82>x(5{BT>ty{C<AjsfEEdwv7p5u;9ddc6;d>hRVz
zo=j%{yFeW6E#Cn1ukv)Vrp#vGY)}a;|5x38R}*!J0BP`g=aL!{?o?t*b6yMaGhVyv
zyGemK{GMF^Hstj@%^N=y=1CR)`ub~nUC8NnmxW5`5`Zb@b>_X~DzDx7sxFYxN9=*T
zpQ6+RXp7h0^pq|Thu^&upeLmC<-0KBMQ^?HEBZj%JV!ui%=bCU*iYa;w%T1^OyD7&
z0Dx*4g%MdsHxZ6AAePMUe<RET<724|Yy_kaz=tFiKj*bIt&`m+NRDAB?r3XS1LD1g
zf^h;yK*Snfkx^;^FYwr1XJz_iOV;7{TmdjkM!yjdsokI$SRtx9Vrx1jV?<VDNA_M~
z)j2~(f5w3T*f+KR*4JKZZXT8~B-64DZJy0U_^GVkYyc59^b^p<povMU;CTS<l7%7U
zvjrp-TXLdL0f^*NMmnkH#BEN)h=PX{JS4gM6g;HhAq5YSO0n4pnO+8MVU0T#Rhy87
z83FTHQ?`JxT#80E7G}iSr&{Yj@w%)bnU=5j`N|a~*bAUYMt8<NBuJszM{W0AmN6n*
zvJSsT?7Ayu^k*ChgFff8H~m@0h-}E#`~F#}D5`jUqRQycIFQK3j<HQs=oo1eltYN-
zGq4fBM`U0WHg`I-vf&}JHzlX!3qT4h)xt_uDkMK}A+xx&44*Eajf%;om{VMWflv_V
z-noUp^<Bn)Ze0K193f7%Sn$0?)o7S;r>@6{ld$dGCvo7)g`{up{x43<$}AS_vDRYA
zl&ML>M`Ok>&vpCPeRy%bo*+5=o>YMJG4qqEs&s0y3o}Lu6Ezd?m{i~=5jG2BOoaw!
z1@tfx{UKg$N<bL&8K1rBm2@W5=y&g9&==CtA^IkRaV>ZoN3UPQT_uxIJ9S(|so14|
zm55%7wjm`T7M16CR=PxyP0G#D-tq*Pcc!dh6vof2wW!t!lkQtXSRZ&3{lQ>lh%e8r
zz&9%v#1AK+JVHdjAG?qe5C91)aLi87;rF}@K({2pj1J)$iC}cy8pQg}j>yv`x;;2+
zHa0D+f=V&PmjcQfBKloqpOb11Az-Vf;B7@RhiIgfDxhX&UT<dNdNRpi2>D%SPT?<?
zFX*bbPoIgWs%pYTiW0p;7BBoCB%*($3MAFJq}@-z*j-%<Ygyu_iMZuEyHDcPD;E<%
zIkdg{?vDeAem?gASdv#j%)p2y@Qa?)*mqGJsKqw1QaxgGZUxX9S4#0v-T;}Rj^qqI
z&v>@yG|DFxWAz;I{yVn4(A$H(y|JY%V@r2t{x*O;Q9U;21(0Mge%^B$`$xUtvC2id
zP{efsZEV361>{Kp-;V;aHs^tug)ug%L{R>E<q~#upNJI1jfTwg07N-zaTJhya~g;&
z3?nFqulC``T>&`noaNcN*jfi*auf_vYqv0Gfust<2ujDz0g;EoMHKVc9TICRB08Lt
zKm?54*1NH^?2d6sGCF4%J;M`)Ph7tn06s}X?ddGcjBH8y`V>{gZfkAYFpNB9^m+`8
zoCA_+7-LX=QneIKGsjhK3K$O%(b4F;mop)gEf_1O&A_%L%P>iKuM~G!(}Kl{(ijgT
zXFNo}*k!FnO`16)K2G&u428q^(W%ZuJFK<$>&5kid&v6>BZLisw-6W{$ju|fiGa~L
zcq4ZYnV(s*4D~t(!o!+|Z*{&2VZ3b950elc4|E_fcr&6dXJ147eT4(UOZ1wE^$mdz
zDJW)OjE?nNuid#O=W@uw6%I^}0wVSq(Vu0=K#_m}ChYLpoVp)tPiRt&2eRjE7uHrR
zL{Zcu(hL+C7$YHrO|5q4_MG>SN8kE4rWF-oTUCu|D6%jF1aaE$vp4Ne1SFL&s$_GW
zu6(?Qh{X5CKtJlH&ol)^55{09gbl~vOQ3oKCo2gPA#)gjD<d<MR1y#52d6sWzAEky
z456e71B_$ddgro4rc#67vzvg&CFhb6@pvHOy=(Nra3W86q4z8voxdPvIc~-?BH=>3
z*=KW!f56afWN&j<t3=0Szq`u>k$51_o$JQS7tY71)`Jp1wtykR?fB5hIwN5tTo0n8
z@~F+0aDfwfW7Ft&zr>&~Wnz*tI^u!6_}_E*_4za7R3w998peosZ1mY&N#7PmfH+!P
zXFv_Nf>0wfp>$>AfrOY5Oi<KVtSI8+$Cx2yV1Vg>*M84KMxWNcJA$*_Juk#`5P&t^
ziJI;I`U(e16RcE?bO;#h106VF6ef|xfmX{fukyHD*NybXAa}amC81(G4Wf0j#jr*L
z>0RHrunMcn=SX+GIhr#}z+eXU_TMpUZD&o*Z8HPu{wb5F5LU^ujurko7}L!tN<~JT
zojzOhQHT;Kv+Zi|HZ~o9+sHG5U^>XE_CsHt>kYHIg`6&sF$Kb7ZcjqBs`4Ucbukm`
z*DA@3s3SYSq_osRN>W=!JYU1b;o*0NweYwvFo;<c2VGJWK2vN7dk!tXe;^gJ{s%3>
VF!s_H`a1vs002ovPDHLkV1lEn6ZHT9

literal 0
HcmV?d00001

diff --git a/utils/network/api.js b/utils/network/api.js
index 8f85611..5455ddd 100644
--- a/utils/network/api.js
+++ b/utils/network/api.js
@@ -898,6 +898,19 @@ doctorSendUnfilled(params) {//医生发送缺少字段至患者
     }
   })
 }
+getNation() {//获取名族
+  return this.request({
+    url: `${this.baseUrl}/basic/nation`,
+    method: 'GET'
+  })
+}
+getJob() {//获取职业
+  return this.request({
+    url: `${this.baseUrl}/basic/job`,
+    method: 'GET'
+  })
+}
+
 
 
 
diff --git a/utils/substr.wxs b/utils/substr.wxs
index 7a50e2c..83533f7 100644
--- a/utils/substr.wxs
+++ b/utils/substr.wxs
@@ -6,6 +6,7 @@ var filters = {//截取字符串返回
         //也可做一些判断 //我不需要所以没做其他处理，直接返回的
         return str.substring(start,end);
     }
+   
 }
 module.exports = {
     substring:filters.substring

From ce2160abf8c66658c79426a335338bdcf812ff50 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Tue, 12 Dec 2023 13:42:30 +0800
Subject: [PATCH 73/83] =?UTF-8?q?=E5=A4=84=E6=96=B9number?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/onlinechufang/index.js   | 24 ++++++++++++++++++------
 Pages/yishi/onlinechufang/index.wxml |  2 +-
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/Pages/yishi/onlinechufang/index.js b/Pages/yishi/onlinechufang/index.js
index d5f2c84..eccbe47 100644
--- a/Pages/yishi/onlinechufang/index.js
+++ b/Pages/yishi/onlinechufang/index.js
@@ -36,6 +36,7 @@ Page({
     order_inquiry_id: "",
     order_prescription_id: "",
     doctor_advice: "",
+    prescription_num:0,
     doctors_advice_focus: false,
     case_detail: {},
     sub_disabled: false,
@@ -85,6 +86,7 @@ Page({
   select_drug(e){
     this.setData({
       drug_content_show: true,
+      prescription_num:e.currentTarget.dataset.prescription_num,
       product_name: e.currentTarget.dataset.product_name,
       select_drug_id: e.currentTarget.dataset.product_id,
       save_durg_product_id: e.currentTarget.dataset.product_id,
@@ -154,8 +156,18 @@ Page({
         })
       });
       return
-    }
-
+    };
+    let prescription_num=this.data.prescription_num?this.data.prescription_num:5
+    if(save_durg_prescription_product_num>prescription_num){
+      Dialog.alert({
+        message: '药品数量不能超过'+this.data.prescription_num+"个",
+      }).then(() => {
+        this.setData({
+          save_durg_prescription_product_num:''
+        })
+      });
+      return
+    };
     let save_durg = {};
     save_durg.product_name = this.data.product_name;
     save_durg.product_id = this.data.save_durg_product_id;
@@ -445,13 +457,13 @@ Page({
       });
       return
     }
-
-    if(save_durg_prescription_product_num > 5){
+   let prescription_num=this.data.prescription_num?this.data.prescription_num:5
+    if(save_durg_prescription_product_num > prescription_num){
       Dialog.alert({
-        message: '每个药品数量不允许添加超过5个',
+        message: '每个药品数量不允许添加超过'+prescription_num+'个',
       }).then(() => {
         this.setData({
-          save_durg_prescription_product_num: ""
+          save_durg_prescription_product_num:''
         })
       });
       return
diff --git a/Pages/yishi/onlinechufang/index.wxml b/Pages/yishi/onlinechufang/index.wxml
index 7d3f0a1..3678521 100644
--- a/Pages/yishi/onlinechufang/index.wxml
+++ b/Pages/yishi/onlinechufang/index.wxml
@@ -92,7 +92,7 @@
           <van-image width="300rpx" height="300rpx" fit="contain" src="{{static_host}}/applet/doctor/static/images/yishi/search_drugs.png" />
         </view>
         <view class="search_drug_list_noempty" wx:if="{{ !search_drug_list_empty }}">
-          <view class="search_drug_list_item" data-product_name="{{item.product_name}}" data-product_id="{{item.product_id}}" data-single_use="{{item.single_use}}" data-frequency_use="{{item.frequency_use}}" data-single_unit="{{item.single_unit}}" data-available_days="{{item.available_days}}" data-packaging_unit="{{item.packaging_unit}}" bindtap="select_drug" wx:for="{{search_drug_list}}">
+          <view class="search_drug_list_item" data-product_name="{{item.product_name}}" data-product_id="{{item.product_id}}" data-single_use="{{item.single_use}}" data-frequency_use="{{item.frequency_use}}" data-single_unit="{{item.single_unit}}" data-available_days="{{item.available_days}}" data-packaging_unit="{{item.packaging_unit}}"  data-prescription_num="{{item.prescription_num}}" bindtap="select_drug" wx:for="{{search_drug_list}}">
             <view>{{item.product_name}}</view>
             <view style="font-size: 26rpx;color: #3CC7C0;">{{item.manufacturer}}</view>
           </view>

From 5d2fa7524b3c9a3324e59e47d566f0b4b1000a35 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Wed, 13 Dec 2023 08:57:21 +0800
Subject: [PATCH 74/83] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E8=B4=A6=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/my/index.wxml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Pages/yishi/my/index.wxml b/Pages/yishi/my/index.wxml
index 2e0a600..42a6c50 100644
--- a/Pages/yishi/my/index.wxml
+++ b/Pages/yishi/my/index.wxml
@@ -24,7 +24,7 @@
 
   </view>
 
-  <view class="account">
+  <!-- <view class="account">
     <view class="account_top">
       <view class="account_top_left">
         <view class="account_title">
@@ -51,7 +51,7 @@
       <view style="font-size: 30rpx;color: #666666;">当日预计收益金额：</view>
       <view style="font-size: 42rpx;color: rgba(0,0,0,0.85);">￥{{estimate_income}}</view>
     </view>
-  </view>
+  </view> -->
 
   <view class="content">
     <van-cell size="large" url="/Pages/yishi/medince_list/index" link-type="navigateTo" title-style="font-size: 34rpx;color: rgba(0,0,0,0.65);" title="药品清单" is-link />

From 18aac9467a37d794c3391ad07fe526f9234d4f2e Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Wed, 13 Dec 2023 14:50:10 +0800
Subject: [PATCH 75/83] =?UTF-8?q?=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/login/index.js        | 11 +++++++++++
 Pages/mobile_login/index.js |  8 ++++++++
 2 files changed, 19 insertions(+)

diff --git a/Pages/login/index.js b/Pages/login/index.js
index fd4ed00..1f2505f 100644
--- a/Pages/login/index.js
+++ b/Pages/login/index.js
@@ -23,6 +23,17 @@ Page({
     checked: false,
     static_host: api.getStaticHost()
   },
+  onShow(){
+    let usertype =  wx.getStorageSync('usertype');
+    this.setData({
+      beforeClose: this.data.beforeClose.bind(this),
+  })
+    if(!usertype){
+      wx.navigateTo({
+        url: "/Pages/index/index"
+      })
+    };
+  },
   onLoad(){
     let usertype =  wx.getStorageSync('usertype');
     this.setData({
diff --git a/Pages/mobile_login/index.js b/Pages/mobile_login/index.js
index 8837194..89be844 100644
--- a/Pages/mobile_login/index.js
+++ b/Pages/mobile_login/index.js
@@ -24,6 +24,14 @@ Page({
       })
     }
   },
+  onShow(){
+    let usertype =  wx.getStorageSync('usertype');
+    if(!usertype){
+      wx.navigateTo({
+        url: "/Pages/index/index"
+      })
+    }
+  },
   onChange(event) {
     this.setData({
       checked: event.detail,

From c4d5df8782ff96fc6f46e66eb9f77dcd9cc20e06 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Thu, 14 Dec 2023 11:05:58 +0800
Subject: [PATCH 76/83] =?UTF-8?q?=E5=8C=BB=E7=94=9F=E5=BD=95=E9=9F=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MessageElements/AudioMessage/index.wxml   |   4 +--
 .../TUIChat/components/MessageInput/index.js  |  23 ++++++++++++++++++
 .../components/MessageInput/index.wxml        |   6 ++++-
 .../components/MessageInput/index.wxss        |  11 +++++++--
 TUIKit/static/images/play.gif                 | Bin 0 -> 1577 bytes
 TUIKit/static/images/play.png                 | Bin 0 -> 1724 bytes
 TUIKit/static/images/playme.gif               | Bin 0 -> 1610 bytes
 TUIKit/static/images/playme.png               | Bin 0 -> 1731 bytes
 8 files changed, 39 insertions(+), 5 deletions(-)
 create mode 100644 TUIKit/static/images/play.gif
 create mode 100644 TUIKit/static/images/play.png
 create mode 100644 TUIKit/static/images/playme.gif
 create mode 100644 TUIKit/static/images/playme.png

diff --git a/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.wxml b/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.wxml
index 797419b..2a82ce7 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.wxml
@@ -2,11 +2,11 @@
     <view class="audio-message {{isMine?'my-audio':'your-audio'}}">
     <!-- 默认状态 未播放 -->
     <view class='audio' wx:if="{{!isPlay}}" bindtap='audioPlay' data-id="{{message.ID}}"  >
-    <image class="image {{isMine?'my-image':''}}" src="../../../../../static/images/sendingaudio.png"/> {{renderDom[0].second}}s
+    <image class="image {{isMine?'my-image':''}}" src="{{isMine?'../../../../../static/images/play.png':'../../../../../static/images/playme.png'}}" /> {{renderDom[0].second}}s
     </view>
     <!-- 当前正在播放状态 -->
     <view class='audio' wx:else data-value="{{message}}" bindtap='audioStop'   data-id="{{message.ID}}" >
-         <image class="image {{isMine?'my-image':''}}" src="../../../../../static/images/sendingaudio.png"/> {{renderDom[0].second}}s
+         <image class="image {{isMine?'my-image':''}}" src="{{isMine?'../../../../../static/images/play.gif':'../../../../../static/images/playme.gif'}}" /> {{renderDom[0].second}}s
     </view>
     </view>
 </block>
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js
index 282e635..0893ade 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.js
@@ -111,6 +111,8 @@ Component({
     ChangYongYu: [],
     dialog_visible: false,
     sub_visible: false,
+    timer:null,
+    recordtime:0,
     dialog_message: "在线开处方需先进行多点执业认证",
     message_rounds: 0,
     networkstatus: "wifi",
@@ -131,6 +133,13 @@ Component({
               icon: 'none',
             });
           } else {
+            if(resData.duration >= 59000){
+              wx.showToast({
+                title: '录音时间不能超过60s',
+                duration:2000,
+                icon: 'none',
+              });
+            }
             let {from}=this.data;
             // res.tempFilePath 存储录音文件的临时路径
             if(from){
@@ -306,6 +315,16 @@ Component({
         encodeBitRate: 192000, // 编码码率
         format: 'aac', // 音频格式，选择此格式创建的音频消息，可以在即时通信 IM 全平台（Android、iOS、微信小程序和Web）互通
       });
+
+      this.timer=setInterval(()=>{
+        if(this.data.recordtime>59){
+         clearInterval(this.timer)
+        };
+       this.setData({
+         recordtime:this.data.recordtime+1
+       });
+       
+      },1000)
       this.setData({
         startPoint: e.touches[0],
         title: '正在录音',
@@ -352,6 +371,10 @@ Component({
       });
       wx.hideLoading();
       this.recorderManager.stop();
+      clearInterval(this.timer);
+      this.setData({
+        recordtime:0
+      })
     },
     // 选中表情消息
     handleEmoji() {
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxml b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
index 5b931b6..b3d7311 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
@@ -54,7 +54,7 @@
             <image mode="widthFix" class="TUI-Extension-icon MY-TUI-Extension-icon" src="{{static_host}}/applet/doctor/static/images/chat/wenzi.png" />
             <view class="TUI-Extension-slot-name MY-TUI-Extension-slot-name">常用语</view>
         </view>
-        <view class="TUI-Extension-slot MY-TUI-Extension-slot" bindtap="showWenZhenBiao">
+        <view class="TUI-Extension-slot MY-TUI-Extension-slot" bindtap="showWenZhenBiao" wx:if="{{baseInfo.inquiry_status==4}}">
             <image mode="widthFix" class="TUI-Extension-icon MY-TUI-Extension-icon" src="../../../../../static/images/yishi/tabbar_icon/wenzhenicon.png" />
             <view class="TUI-Extension-slot-name MY-TUI-Extension-slot-name">问诊表</view>
         </view>
@@ -106,9 +106,13 @@
         <view class="modal-loading">
         </view>
     </view>
+    <view class="recordtime">
+      00:{{recordtime<10?'0'+recordtime:recordtime}}
+    </view>
     <view class="modal-title">
     {{title}}
     </view>
+   
 </view>
 <t-dialog
     visible="{{ dialog_visible }}"
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxss b/TUIKit/components/TUIChat/components/MessageInput/index.wxss
index 91973af..cd6fefa 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxss
@@ -146,9 +146,16 @@
 }
 .record-modal .wrapper {
     display: flex;
-    height: 200rpx;
+    height: 140rpx;
     box-sizing: border-box;
-    padding: 10vw;
+    padding: 8vw;
+}
+.recordtime{
+  display: flex;
+  font-size: 32rpx;
+  margin-bottom: 10rpx;
+  justify-content: center;
+  color:#fff;
 }
  .record-modal .wrapper .modal-loading {
     opacity: 1;
diff --git a/TUIKit/static/images/play.gif b/TUIKit/static/images/play.gif
new file mode 100644
index 0000000000000000000000000000000000000000..39212e3049aee0b2a35a41600e42d400484532fc
GIT binary patch
literal 1577
zcmah}3s@9Y7#&bdp(4_X9@sEoVX`}~eawukJZ5)=Vv&H<${w>bcVU9v*=A<l1+BCP
zreO9Udx@nMYNeT|WmskpEk(^r4Ju1AD@#dxnwi~MSfnqqJM(>W=iYPf`R{+v{l^!%
z8CDpHWFa%+ke-%)DyhU(QO@U=x+pU-$QXu0lRc%VQ_uzY&B=`f1+g0Fs25bq0SDII
zwh=>R$$?F>dI(RD2UT)moeIk9N-D&<YLS(&+;M15gp2rtexM6z#9tH8xQGK2B*hCj
z*f)l842?qcY6q5YOrVA)uc!dEn<<k>5Cm#x&7{|673{3nl8sUXMd5@ECutK!aRdop
zw6|eUP?daKnbX}X2mc&cm97Ul91n-X<}htm)JmLWSr#WKoT5w+VbW>?x)3o1w2asa
zPN0dZ9MokcfEp_bUL~YEFc@slF8o1{r*GkaW{&R3EGm9HA_Q^LOyGXMv9%~#)62l=
zFa|_x6}3TtmjO))sUm>zj2IcF@619mpd|L;f+4jgx=%^OK@ISOfUd!y$Y?|`a&Ceu
z!!s0WoQfDSW{aE-3<{YgS>i-5OVfmnG7-Q>n|zXmHL)U~On@N;iL}}nAhCv~vCcqz
ztBcBK2;Rn$q?;sNF4jgc1w3P+7`L^+X(wacqJX9g0TINsWvJcDwVsj7@hT8>MXgYj
znwV)ys}x<)s+1tg^Uxur9nG2~2P7q|jgIQ|Z~*i&aA43uw27olBwaz097S_9J%(U7
zg6M&I6iN2g{tHT2IQUxFe?XywC3rvn7c7aKPf`5>^pNZqDgj<8`wXx3rV*&}R3N!k
z#g9hK!pQ?9hoET}&(l_laq%#*49i<xjN4`7Z5Er$#lXb&aHRnbwU=xAPc9CF!40SP
zbAD_HUMHj5ca`B!UoijySOHXc)#Fb6b@I;>e;oh)w_ktx`KMz?f9yVT_=oQgefRA*
z2fse>RoDJ6zu5QrXP<U<e6n}X?vFqEaMuSrcWiIpw)Oq@wrqa)owwiG^ybDlUf<C6
z+WJ>tS+{mg>*|+Ry|i-0i!VICeA&{L=bl}%c+oRYFKk}$)RRv<{@DCSn;v=ip$F$Z
zFt@Q`&g}bV)!%pTJ$KKXao3%9OrKU)8wpPh>6&_bPzm^Js&A94Dt$l_y~3@x+<eoN
z8*jLN@}!B^Rg{-qTRNe{Q+&<UMTO(tE+=1*pO-t%ku#QK8N1DDp(&EU&8F-zSB=iP
z@`_QJ8CW`c`N*`(F1_U9)Qc{>V8rnAQ_f31_nfnn5{C^vYe>T2LGiF)rXL@iFan7~
zvW<#r6xY1?^u~G1w;fJivS3YTL+ic`Cz9*C3g;i3-EwH_x+6(jjumSOr&;kx3Ni#f
zdGW)Fk@{&3C#OjLW)qP_WGFHM&ZZS3EpsBxsZ&;QoqO7LOVewIrxxv>xY*YbYMR(D
ziWDRsNkTFq!`>(?A2#=BQ$u_6`jy+)ZfXoIw5f~M&s@5!<-qC!(6BjkR9ARK_bSJ(
U4ykqTPSBoKnZILJIf9J+8xJ5F-2eap

literal 0
HcmV?d00001

diff --git a/TUIKit/static/images/play.png b/TUIKit/static/images/play.png
new file mode 100644
index 0000000000000000000000000000000000000000..2656566af0ed38f97902aec90b08fde26e685d95
GIT binary patch
literal 1724
zcmah~4NMbf7(RXk1sMbbB15?yEMla+pZ?xSv863qv5b_WotwzD_m!Tsy?Q;QxIc?C
z5uLIbW*jbyIOjAv9R}TuiC_le;sj?{79H%TxJ6yIiD8>D%eJrlZOfRu+}-zc&-1?T
z_kPd&U2{eGij<`6Bm_ZHEGtbm*e-%k!R!S1zB6xCI&2n5W`|TMxTOYG1c-qXoB*}>
z*jiu%EZ4Z{V^D-3@oL`gkQ~<4j7#vz*(gRH@&zCpL5h}#0<5bJNT?Ik@_rrm)A=q8
z<vAU;R%Iou0VDA6E4PTCa!a}0wWZEQbJ+4?v?#<t13n<JXvpXF2bqu#8@J2Aesmhg
z&~b=Vr^6<Ka#$-+qaXrQBd268f*?>0Ehn976|140%0iSPC<-UkIH{0P6hn~kMkg-}
zIutoKV>6Xbx`QJf=8>cTgX0Yi4e|zsTo7w<lBQ{#pm2(kL4+*W=$F`#%pc5~vS0#1
zm&gYsUhtz)i>y<qmvk5mc48I2fYmx}*dLtC70enQVgooSCvcxHy0me0P_lu)!k7^q
zv^NF-ZUaG~UUb1Napz5uVfr5JXbQ-=rg4FK(L26Q&V>Un@BzORgh7$x5y8lrr$ip^
zA?q~>uKMU#i%Ew;M{<tm7?+b)C<rwrBY;~Wb8|{sM!Ntd16q>hNR?U(I6CSxYG)?C
z%1jxwgwa5gWGP9S&9s`(mKe24N?WQbF=@ytuEigeSicKQ`R1YTNiO|JE@Kn{D+!`q
z5WG{OsqhGr5cCKE)M$hXAvI{hTHenI4Z$Vj{w6rU#7aPiK?NyfBqbvic9LW$1*1?b
zCA17dOhByy$GaQ<1tpXWp<)R7A5f@Zj+NN|1#>ROEr>oAYKV^(9Uk!4MzuDXMj-N=
z0aq#tK6G3x3_nA12!+CIG%8e-)@+1{)zU_lSzBsW8`Vm+*{p?$o#1jaZ0aOe{hwSM
z27^bH{x{`MO~G=CcBe}j4yF$S;D;xG2uuB)0WyLhu{jo#!5+HltjU_y8k2z*r}nHG
zJ3BTf?T^IBGJT;TwG6ygxc!@L`cF#gcG2NbZd)%pWJ%o+G>pu@5$V!<SEpXd2tQcZ
z_HAu=fAgY!ea<=e(>7)mCiO((2M_jX3X-yxbhPH~7(hnXqied~?vLGd>W6}kvHZOT
zP1u37JY4U|9LW1Ta?bI5M{LW(H07Dxt^41|*>!Hyt*Y9byEnoQ^4iuVi!WSF?D?Rh
zwc^9>QstSd)_h`q;e|DQ?Pt@h!?ykL^n&M7J1g`FUup-d4I_1t(^<C;@cN;Ip8KJ~
z4ZAOCdfR`@%--<WfkVp9n#OI5PaR79bx9E)`}A<CcW1S;`FwRwLiWL9=bINx*RJ-=
z-bm*BTzK+C)7%Rq6@B3=s>_+Vy;#fA;|Jf3%-0T%9vWTltUMg!JKf#H(Qjq;I6J@o
z{$hLoZ0qpCXP@YvTXkZ`;(pWC2gz;WYVF{q_G4cdEHTvMWp``)+BaiuH;YBt?!LXN
z4%|E1wdaWXO?$H8^^m+XWxMxUrKh?#!T#ys?{QAnCfnQ>seCoB=-%x+C6zBV4b}9o
zP#leKS+~eDly`jKa6Vgwj0&FjN8(hTeJ_4A?@3eKtl0b49ofh{&u}Mr`MWBvtV{pQ
z5#_85M>?DFo-C!wy<qGYrFEG<M*my#)$6D9C(7!+D!-WCb8+l89!~!Z%P+ffo5s55
j`pj!y*>kxj4v9%X#=;|sD|Qx3(f^6XTy8p9Qq%M&`iNPv

literal 0
HcmV?d00001

diff --git a/TUIKit/static/images/playme.gif b/TUIKit/static/images/playme.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6595ed149f500e37f6448233ea49743d7120a0f9
GIT binary patch
literal 1610
zcmah}3s@9Y7#&b7q%z9hX~T$y>F&JP-I<Y9VRjcN774b{(rR|*E=;gH+sv%HV3}5;
z24)Yl7m`MyP#B3?q-FNdQt_2$npqiXSxVZ&)XeTIELoAw%=gXAz32SrzyCe=&(3u*
ztS}f!L#D+cb#-+Jf~1^D%6EE-_{;()WhVN>bq$So7oZM77vMW%Oe83XWk5&0phOPX
zvCdU%FjSW8Sh2-TxPv?>m2)apP*j=k5i83?R>H=NMl&K@#2@qnT|guL@_@!g?3f@a
zUckX`V;INKC`2!_W0}STYH0F`3Q(JwGKmC1pf=V_daV}0#(L97q7*?<IAO&}+C)(t
zLBa>^zAz}LN<Oa8;p&!ye|D@?*Ml66hr?lWm^LeF2~M&sixU)1Q6`8mX%zuoh?oM}
zkXQr<&_q=Z>ar3*jfjF*3F&qWCfl_Nf6(pj2^`SO(KVSx#g9jXAWoVI-0wG*7Da1%
zA^0neUeTJTA_(w8peZ3$1Q0$XMuz1(w@?fyi9NVrNG*@9Qxb7d4*VdXYcMG?ni0&L
z8>h-}4~24vB8H6FT!$TlLS{*pIMK_}G-0Jo1n|)&pOns;SP@Vrz>tDOTC5C^SVPl@
z(;MGKW%3q>gJlUmlO&x^)=Ds0Jd;i_E=!ifM#i|g0ZkVIB8X|rP`jJUoRiD(DiCx<
z^(abt%rph1imqs-N)Y9F=n&F|rWMNpNeOGiqk3H&0KE+C7<3SAA}JF|dq|R_XpW{w
z5DZ5UT~N0o$-atzL5XyZpg9ZsHz;(l1kcC+f+dmjDXL$99+Le+3BXHapW(IcG6Gee
z3?!GT_|d3YIJuYN5H#)NdD=oTP97GPVR?&_aXGELHQnlTGO(~+T&b5$?dDqllZ(S-
zaKq_mIX^Z8kCXA)bClsvPcr}k*a1{{)Z@<lar*aDCr|u#{MTQ8{^{7!A3Kj6{^9#W
z-+g=Vz&9OV@Biw{FZO-D_p?2_Ki&1o&K)0b-?nwj=Jrh+H+=Nr`gI??|K7W6-&yna
zTdP;S+4jckD_1OUUG`ebt4o_-dAX@^$>N5WUaWs%(Zc8J7SulX>@!b4HUG(ZPdxtE
zqjMjbQ&au$>{&CbW<2!Z1JkG7KlQ$Qr&Lx%!jnU~rrr}&0{-%{yXDdnACN?^aMzu8
zOqzK6Z4<^9-+GIusPN{3ary4Nn{Ld_$#yv%d{*YzF{AAnqd1naSuN=_MH0B#G;+iZ
z!_%%GHZ*kzmV#b4c+j=iTz%D*S6qJCz)LSlzIebz7haImKk@wY`X%)36Av3^%89-S
z1CcmnB<!7t(Ok#Ir_{`C+<16EeeLo+)vfzhpBhlLKWF}d*$sy_tUQvm{#c%tV6YOS
ztav0D=?Cwz@rijz)s*Vf6Q$_vKVy!L##}S4Z%h7!)_t{;_F9T(<#o(%Xv%J0cd%c5
z|N2nP!IPVhPi5*8W-Q#f)kh60%HH0-J7dMv9ZeR`S!pIC@kkPq3I%O7LSy2bqw}ga
zEofWXzG7`nsLrY`YMZ`zNkhl7EKt2Jb?E+Zb7zZv+it0K*A}p8P)X+InMDXP>Q6X%
BF@yjB

literal 0
HcmV?d00001

diff --git a/TUIKit/static/images/playme.png b/TUIKit/static/images/playme.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9a636984c298f65c11e9f5d4fadd1983ebd44d7
GIT binary patch
literal 1731
zcmbVNX;2eq7>;-VN-VS<V1-#14^WfMCgj)*5orzy8l?~wJb+}gfe6Wl&0-QP0@|^t
zSS?6pJPIW(idCxBf*q6&iXbB`hgJ}kLn?;{77L}|K{p7tKOBE_XLi5u+kKzseco$!
zcgX4$^r>^E(r7fgJV+8stzOja<1~eO_IwchKDBs|(r_{i*OF!xfzbjrxEcfGdQ}V-
zim5c#glf#6Mw_@*rwk{<6|00Ou4k(3HcX4&NTF#o{{V|og~nkdpvGc!1`+tQ^k)#z
zX++?9u7ag7im_N-P!fTKC9PJXNpUEm0Rxr+{uUucpvOoRVA01LOhStY9OV^Kd;4n$
z1V&BBI1%_-RJbAp5aR>}aG5*?3UdSiA7R2=M8Ni23b0u)4`Lw@?8jiiLKY%q!NAxB
zQr-xSRv0RgjrpQZA~2RDjY0@Ao6Sr!hlvw05R4!Q#9~8iHiNQYn5+g;Wnmah-s21s
z%!Cp;BdNm;fSpmL#uG^qNGW|Cg5Ic5ydgH2#u7!P46>+<5X@vjdc8faQEL+!iv26&
zt=1-`)rdi%m<dlLP^unU?{P4dyLUUX8&Yb7YX}`x6ji(gM-%m!fs{)`AoYc*(P@OJ
z8sTtQJT`-cX*mq7#t&g2D8^=B0$8PixjX@;LB@IBhG%g&Qn8rBV+*8W7?uhUF;^;(
zNqJ(PA5SV3z~flC!9=PIC^qg}NBJJZa^Hy+iU~|b;)D{%<Hx%oBo-%eQ!H)-#A18Z
z`GC)Qok4?}O}_Rry^dOf5xT9IMn>RzU^LG{-CH#9IRX{OkBu=fwE$)C5GsBFqUJHQ
zJXnip`CNppW`SdP&Hv3GM2Ujz&GMh-8Gl7}q<#Bl6sW_SVZsd51QFDzY|ko*qtP5X
z<dQ(8rTO<9d8{(fbyt^e{(UCXX<nxL`WZ8>Si+0}mfd}A3QxZ4rp{UYZPE-dFvIa<
zXy=~1No&0PV3|mw4EZ!Yz2XVD$C;T2R%Ap4(*3d<p<l22o6fW!FL=0iaO7lEqIqD_
z&?n2dbM=xfIU6E;9j`wi&bcw7!xm;)U#<byHIzm>$BJ{m5Ww@ZgExF#FvmD^TSSA~
zVCtdDVu!f{iB7@Uze)I0>I=g*$G(jAXnmfbt_Y6Y=bBml`H*vvxFxrVQ2)VCpICWu
z#?AK-b^hUnkV|!yQ||PN;HrLQWa_e^a5qkyq=IhDZC&eD^jQY8HQ9Qqa9sm0WSTZ@
zU3`{**ehDX^_-HcFDn-<5PK#w1s}Gjv~&+#?7k+bcwX*_-l>WHPV}m=oWJ6b$I97?
zn*QV!H`5G%cAu#lIn=8)Y@E5|C-+rg6KeL!|EjA;y?b_LWYvL^M+@7F>0W~|vMAT2
zrO!I!$g?REx&UjJ#~JCl(z*t(fYOxOxvuaxrHRhhlwJo<fVWQWyHMFNc)Ppfa=~zV
z!eNKMq(^1GS!c_R8aG<q`}z-*WqaKxY$N^gLfc5Ef3J&md+m){ZJ*=*R*Nl#?%m=X
zi44z_vuac09IGQ+GX`9)Z7Hjowt4^F1-||1(~guCrthn~+deN+)8AY7VA5?|bivjP
zvu@RIE7$MGPuJ&GiDs2NT$FIf<DS=*W}z)$>B*v9tmTg<AFr_u=2hQ_nXWEFGr_z|
zO*<l6UYtKGr~l}!IX$bHX$!bqQgWiOK)eKutD!gHN%`5HTT0=m^tDdQ8%}N1<sSW|
zTjAClac}4@z4KYf-b;&vT4ny<*F8SgmUE;hOYuX|^z-hUp5}a;dSch#VVR9Lr-&Dy
zuFw2(xY(!5VuM$TlELab>SMi6($H5Eie2?lnI+P~O)`%o2evLqR%GvJ&y473%oiSf
tc6jmCVQJmup1$%IJ4bq>aswP(Xicjg3Fe>~z4qUVT)J9P^ilMVe*h5eruzT@

literal 0
HcmV?d00001


From d6421a78a15d1caf32157e268b09ae2eb0ad988d Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Thu, 14 Dec 2023 13:03:47 +0800
Subject: [PATCH 77/83] =?UTF-8?q?=E5=8C=BB=E7=94=9F=E8=B4=A6=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/myaccount/index.js                |  2 +-
 .../TUIChat/components/MessageInput/index.js  | 50 ++++++++++++++++---
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/Pages/yishi/myaccount/index.js b/Pages/yishi/myaccount/index.js
index 48465c5..96c3dd4 100644
--- a/Pages/yishi/myaccount/index.js
+++ b/Pages/yishi/myaccount/index.js
@@ -119,7 +119,7 @@ Page({
         balance_account: response.data.balance_account,
         amount_total_month: response.data.amount_total_month,
         doctor_today_inquiry_total:response.data.doctor_today_inquiry_total,
-        doctor_day_completed_amount_total:response.data.doctor_today_inquiry_total,
+        doctor_day_completed_amount_total:response.data.doctor_day_completed_amount_total,
         withdrawal_amount_month: response.data.withdrawal_amount_month,
         bill: response.data.bill,
       })
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js
index 0893ade..ba53d86 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.js
@@ -299,16 +299,52 @@ Component({
         displayFlag: '',
       });
     },
+    openRecord(e,callback){
+      let THIS=this;
+      return new Promise((resolve, reject) => {
+          wx.getSetting({
+              success(res) {
+                  if(!(res.authSetting['scope.record'])) { // 关闭订阅消息主按钮
+                      return wx.showModal({
+                          title: '提示',
+                          content: '您已关闭麦克风权限，请点击“确认”按钮在设置中打开麦克风权限。',
+                          success: function (res) {
+                              if (res.confirm) {
+                                  wx.openSetting({
+                                      success(res) {
+  
+                                      }
+                                  });
+                              }
+                          },
+                          complete(){
+                           
+                          }
+                      });
+                  } else { // 开放订阅消息主按钮
+                    callback(e,THIS);
+                    resolve()
+                  }
+              },
+              complete(){
+                wx.hideLoading();
 
+              }
+          })
+      })
+   },
     // 长按录音
     handleLongPress(e) {
+      this.openRecord(e,this.recording)
+    },
+    recording(e,THIS){
       wx.aegis.reportEvent({
         name: 'messageType',
         ext1: 'messageType-audio',
         ext2: wx.$chat_reportType,
         ext3: wx.$chat_SDKAppID,
       });
-      this.recorderManager.start({
+      THIS.recorderManager.start({
         duration: 60000, // 录音的时长，单位 ms，最大值 600000（10 分钟）
         sampleRate: 44100, // 采样率
         numberOfChannels: 1, // 录音通道数
@@ -316,16 +352,16 @@ Component({
         format: 'aac', // 音频格式，选择此格式创建的音频消息，可以在即时通信 IM 全平台（Android、iOS、微信小程序和Web）互通
       });
 
-      this.timer=setInterval(()=>{
-        if(this.data.recordtime>59){
-         clearInterval(this.timer)
+      THIS.timer=setInterval(()=>{
+        if(THIS.data.recordtime>59){
+         clearInterval(THIS.timer)
         };
-       this.setData({
-         recordtime:this.data.recordtime+1
+        THIS.setData({
+         recordtime:THIS.data.recordtime+1
        });
        
       },1000)
-      this.setData({
+      THIS.setData({
         startPoint: e.touches[0],
         title: '正在录音',
         // isRecording : true,

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 78/83] =?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{

From ea448bec367fe5ce8090837038e2eee8896178c4 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 15 Dec 2023 09:19:45 +0800
Subject: [PATCH 79/83] =?UTF-8?q?=E5=8C=BB=E7=94=9F12.15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/sickform/index.wxss                            | 1 +
 Pages/yishi/write_sickform/index.json                      | 3 ++-
 Pages/yishi/write_sickform/index.wxss                      | 3 ++-
 TUIKit/components/TUIChat/components/MessageInput/index.js | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Pages/yishi/sickform/index.wxss b/Pages/yishi/sickform/index.wxss
index 5d0aa61..58c2520 100644
--- a/Pages/yishi/sickform/index.wxss
+++ b/Pages/yishi/sickform/index.wxss
@@ -6,6 +6,7 @@ page{
 
  flex:1;
  overflow-y: scroll;
+ -webkit-overflow-scrolling: touch;
  background-color: #F6F6F6;
 }
 .cellbox{
diff --git a/Pages/yishi/write_sickform/index.json b/Pages/yishi/write_sickform/index.json
index 14785a0..3c0475a 100644
--- a/Pages/yishi/write_sickform/index.json
+++ b/Pages/yishi/write_sickform/index.json
@@ -5,5 +5,6 @@
     "van-cell": "@vant/weapp/cell/index",
     "van-cell-group": "@vant/weapp/cell-group/index",
     "van-checkbox-group": "@vant/weapp/checkbox-group/index"
-  }
+  },
+  "disableScroll": true
 }
\ No newline at end of file
diff --git a/Pages/yishi/write_sickform/index.wxss b/Pages/yishi/write_sickform/index.wxss
index de55aa1..bf2dd8d 100644
--- a/Pages/yishi/write_sickform/index.wxss
+++ b/Pages/yishi/write_sickform/index.wxss
@@ -11,6 +11,7 @@ page{
 }
 .listbox{
   flex:1;
+  -webkit-overflow-scrolling: touch;
   overflow-y: scroll;
 }
 .container{
@@ -36,7 +37,7 @@ background:#fff;
 }
 .bottom{
   background-color: #FFFFFF;
- height:274rpx;
+  height:300rpx;
   width:100%;
 }
 .bottom .btn{
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js
index 1aa8e6d..4029771 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.js
@@ -289,6 +289,7 @@ Component({
 
     // 打开录音开关
     switchAudio() {
+      wx.hideKeyboard();
       this.setData({
         isAudio: !this.data.isAudio,
         isEmoji: false,

From 93965b3ba4119460583845bbd9c7da13e0144950 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 15 Dec 2023 09:22:53 +0800
Subject: [PATCH 80/83] =?UTF-8?q?=E5=B0=8F=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/wenzhen_v2/wenzhen.wxml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml
index 5f130d3..e4fe8fa 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxml
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml
@@ -201,7 +201,7 @@
           </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>
+            <text wx:elif="{{item.inquiry_type ==3 || item.inquiry_type ==1}}">不接诊24小时后自动取消</text>
           </view>
         </view>         
          <!-- aa -->
@@ -249,7 +249,7 @@
           </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>
+            <text wx:elif="{{item.inquiry_type ==3 || item.inquiry_type ==1}}">不接诊24小时后自动取消</text>
           </view>
         </view>  
       </van-tab>
@@ -296,7 +296,7 @@
           </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>
+            <text wx:elif="{{item.inquiry_type ==3 || item.inquiry_type ==1}}">不接诊24小时后自动取消</text>
           </view>
         </view>  
       </van-tab>
@@ -343,7 +343,7 @@
           </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>
+            <text wx:elif="{{item.inquiry_type ==3 || item.inquiry_type ==1}}">不接诊24小时后自动取消</text>
           </view>
         </view>  
       </van-tab>

From d3137d149ef8b3309c01e88e322c7161b7f13b8d Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Tue, 19 Dec 2023 09:35:04 +0800
Subject: [PATCH 81/83] 12.19 bug

---
 Pages/yishi/myaccount/index.wxss              |  3 +-
 Pages/yishi/onlinechufang/index.js            |  2 +-
 Pages/yishi/sickform/index.js                 |  8 +--
 Pages/yishi/sickform/index.wxss               | 16 ++++--
 Pages/yishi/write_sickform/index.js           | 18 ++++---
 Pages/yishi/write_sickform/index.wxss         | 16 +++---
 .../MessageElements/AudioMessage/index.js     |  4 +-
 .../MessageElements/AudioMessage/index.wxml   |  8 +--
 .../MessageElements/AudioMessage/index.wxss   | 16 +++++-
 .../TUIChat/components/MessageInput/index.js  | 52 +++++++++++++++++--
 .../components/MessageInput/index.wxml        |  8 +--
 .../TUIChat/components/MessageList/index.js   | 13 +++++
 .../TUIChat/components/MessageList/index.wxml |  2 +-
 TUIKit/components/TUIChat/index.wxss          |  2 +-
 14 files changed, 132 insertions(+), 36 deletions(-)

diff --git a/Pages/yishi/myaccount/index.wxss b/Pages/yishi/myaccount/index.wxss
index ea4072c..b48ebee 100644
--- a/Pages/yishi/myaccount/index.wxss
+++ b/Pages/yishi/myaccount/index.wxss
@@ -112,6 +112,7 @@ color: #333333;
 .cashbox{
   margin:20rpx 30rpx 0;
   display: flex;
+  justify-content: space-between;
 }
 .accountNum{
   font-size: 64rpx;
@@ -124,7 +125,7 @@ font-weight: 400;
 color: #999999;
 }
 .today,.finish{
-  flex:1;
+  /* flex:1; */
 }
 .money{
   margin-top: 16rpx;
diff --git a/Pages/yishi/onlinechufang/index.js b/Pages/yishi/onlinechufang/index.js
index eccbe47..ee84032 100644
--- a/Pages/yishi/onlinechufang/index.js
+++ b/Pages/yishi/onlinechufang/index.js
@@ -460,7 +460,7 @@ Page({
    let prescription_num=this.data.prescription_num?this.data.prescription_num:5
     if(save_durg_prescription_product_num > prescription_num){
       Dialog.alert({
-        message: '每个药品数量不允许添加超过'+prescription_num+'个',
+        message: '药品数量不允许添加超过'+prescription_num+'个',
       }).then(() => {
         this.setData({
           save_durg_prescription_product_num:''
diff --git a/Pages/yishi/sickform/index.js b/Pages/yishi/sickform/index.js
index bb308d2..58fb5c6 100644
--- a/Pages/yishi/sickform/index.js
+++ b/Pages/yishi/sickform/index.js
@@ -17,9 +17,9 @@ Page({
     obj:{
       height:'身高',
       weight:'体重',
+      marital_status:'婚姻状态',
       nation_id:'民族',
       job_id:'职业',
-      marital_status:'婚姻状态',
       allergy_history:'是否有过敏史？',
       family_history:'是否有家族病史？',
       is_pregnant:'是否处于备孕、妊娠、哺乳期？',
@@ -106,7 +106,7 @@ Page({
       return false
    }
    if (list1[i]=='height' && personInfo.height) {
-    if (!/^3[5-9](\.\d+)?$|^[4-9][0-9](\.\d+)?$|^1[0-9][0-9](\.\d+)?$|^2[1-4][0-9](\.\d+)?$|250/.test(personInfo.height)) {
+    if (!/^3[5-9](\.\d+)?$|^[4-9][0-9](\.\d+)?$|^1[0-9][0-9](\.\d+)?$|^2[0-4][0-9](\.\d+)?$|250/.test(personInfo.height)) {
       wx.showToast({
         title: `请输入范围内身高！`,
         icon: 'none',
@@ -496,7 +496,8 @@ for (let i = 0; i < list2.length; i++) {
         let data=JSON.parse(options.case_filled_fields);
         let arr1=[];
         let arr2=[];
-      
+        console.log('----------加载');
+        console.log(data);
         this.setData({
           personInfo:data,
           showBtn:false
@@ -560,6 +561,7 @@ for (let i = 0; i < list2.length; i++) {
       }
      if(options.params){
        let data=JSON.parse(options.params);
+      
        let {obj}=this.data;
        let arr1=[];
        let arr2=[];
diff --git a/Pages/yishi/sickform/index.wxss b/Pages/yishi/sickform/index.wxss
index 58c2520..6095399 100644
--- a/Pages/yishi/sickform/index.wxss
+++ b/Pages/yishi/sickform/index.wxss
@@ -36,7 +36,7 @@ page{
  .iptbox{
    display: flex;
    flex:1;
-  
+   margin-top:4rpx;
    justify-content: flex-end;
  }
  .righticon{
@@ -55,13 +55,17 @@ page{
    text-align: right;
    font-size: 28rpx;
  font-weight: 400;
+
  color: #C5C8CB;
  }
  .ipt{
    width:100%;
    text-align: right;
    color: #666666;
+   line-height: 48rpx;
    font-size: 28rpx;
+ 
+   margin-left: 160rpx;
  }
  .basictitle{
    margin-top: 30rpx;
@@ -145,8 +149,14 @@ margin-bottom: 20rpx;
 .van-radio{
   margin-bottom: 10rpx!important;
 }
+.van-radio__icon--disabled{
+  background-color: #fff!important;
+}
 .van-radio__icon--disabled.van-radio__icon--checked{
-  color:#3cc7c0!important;
-  background-color: #fff;
+  color:#fff!important;
+  background-color: #3cc7c0!important;
   border-color:#3cc7c0 ;
+}
+.van-radio__label--disabled{
+  color:#000!important;
 }
\ No newline at end of file
diff --git a/Pages/yishi/write_sickform/index.js b/Pages/yishi/write_sickform/index.js
index 7d1c6a6..3793e2d 100644
--- a/Pages/yishi/write_sickform/index.js
+++ b/Pages/yishi/write_sickform/index.js
@@ -14,11 +14,11 @@ Page({
       title: '问诊表', //导航栏 中间的标题
     },
     obj:{
-      height:'身高',
-      weight:'体重',
+      height:'身高（CM）',
+      weight:'体重（KG）',
+      marital_status:'婚姻状态',
       nation_id:'民族',
       job_id:'职业',
-      marital_status:'婚姻状态',
       allergy_history:'是否有过敏史？',
       family_history:'是否有家族病史？',
       is_pregnant:'是否处于备孕、妊娠、哺乳期？',
@@ -39,6 +39,7 @@ Page({
     this.setData({
       result: event.detail,
     });
+    console.log(event.detail);
   },
 
   toggle(event) {
@@ -74,7 +75,7 @@ Page({
   })
  },
  handleSend(){
-   let {order_inquiry_id,result}=this.data;
+   let {order_inquiry_id,result,obj}=this.data;
      if(result.length==0){
        wx.showToast({
          title: '请至少选择一项',
@@ -82,10 +83,15 @@ Page({
        })
        return false;
      }
-     console.log(this.data.result);
+     let fields=[];
+     for (const key in obj) {
+         if(result.indexOf(key)!=-1){
+           fields.push(key)
+         }
+     }
   api.doctorSendUnfilled({
     order_inquiry_id,
-    fields:this.data.result
+    fields:fields
   }).then(data=>{
     if(data.code==200){
       wx.navigateBack();
diff --git a/Pages/yishi/write_sickform/index.wxss b/Pages/yishi/write_sickform/index.wxss
index bf2dd8d..1586434 100644
--- a/Pages/yishi/write_sickform/index.wxss
+++ b/Pages/yishi/write_sickform/index.wxss
@@ -16,7 +16,8 @@ page{
 }
 .container{
   width: 100vw;
-  height:100vh;
+
+  height:calc(100vh - 136rpx);
   display:flex;
   flex-direction: column;
 }
@@ -37,14 +38,13 @@ background:#fff;
 }
 .bottom{
   background-color: #FFFFFF;
-  height:300rpx;
+  height:160rpx;
   width:100%;
 }
 .bottom .btn{
-
-  margin:40rpx 30rpx;
-  height: 80rpx;
-  font-size: 30rpx;
+margin:20rpx 30rpx 0rpx;
+height: 80rpx;
+font-size: 30rpx;
 color: #FFFFFF;
 display: flex;
 align-items: center;
@@ -69,4 +69,8 @@ border-radius: 8rpx;
 }
 .van-cell{
   align-items: center;
+}
+.van-cell__title{
+  font-size: 34rpx!important;
+  color:#000;
 }
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.js b/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.js
index 30ae25a..f783cbd 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.js
+++ b/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.js
@@ -77,9 +77,10 @@ Component({
 
     // 音频播放
     audioPlay(e) {
+    
       const  { id } = e.currentTarget.dataset;
       const { audioSave } = this.data;
-
+       this.triggerEvent("closeAudio",false)
       // 设置状态
       audioSave.forEach((message, index) => {
         message.isPlaying = false;
@@ -132,6 +133,7 @@ Component({
     audioStop(e) {
       const { key } = e.currentTarget.dataset;
       const { audioSave } = this.data;
+      console.log(audioSave);
       // 设置状态
       audioSave.forEach((message, index) => {
         message.isPlaying = false;
diff --git a/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.wxml b/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.wxml
index 2a82ce7..e93714a 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.wxml
@@ -1,12 +1,12 @@
 <block>
     <view class="audio-message {{isMine?'my-audio':'your-audio'}}">
     <!-- 默认状态 未播放 -->
-    <view class='audio' wx:if="{{!isPlay}}" bindtap='audioPlay' data-id="{{message.ID}}"  >
-    <image class="image {{isMine?'my-image':''}}" src="{{isMine?'../../../../../static/images/play.png':'../../../../../static/images/playme.png'}}" /> {{renderDom[0].second}}s
+    <view class='audio'  wx:if="{{!isPlay}}" bindtap='audioPlay' data-id="{{message.ID}}"  >
+    <image class="image {{isMine?'my-image':''}}" src="../../../../../static/images/play.png" /> {{renderDom[0].second}}"
     </view>
     <!-- 当前正在播放状态 -->
-    <view class='audio' wx:else data-value="{{message}}" bindtap='audioStop'   data-id="{{message.ID}}" >
-         <image class="image {{isMine?'my-image':''}}" src="{{isMine?'../../../../../static/images/play.gif':'../../../../../static/images/playme.gif'}}" /> {{renderDom[0].second}}s
+    <view class='audio' wx:else data-value="{{message}}" bindtap='audioStop'  id="audio{{message.ID}}" data-id="{{message.ID}}" >
+         <image class="image {{isMine?'my-image':''}}" src="../../../../../static/images/play.gif" /> {{renderDom[0].second}}"
     </view>
     </view>
 </block>
diff --git a/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.wxss b/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.wxss
index 5528738..3c2ecba 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.wxss
@@ -2,6 +2,7 @@
   padding: 10rpx 18rpx;
   border-radius: 2px 10px 10px 10px;
   border: 1px solid #D9D9D9;
+  position: relative;
 }
 
 .my-audio {
@@ -10,6 +11,7 @@
   background: rgb(212, 239, 241);
   border: 1rpx solid #1ACAD3;
 }
+
 .my-audio::after{
   content:'';
   position: absolute;
@@ -41,6 +43,7 @@
   border-style: none none solid solid
 }
 .audio {
+  width:200rpx;
   /*border-radius: 2px 10px 10px 10px;*/
   height: 60rpx;
   font-family: PingFangSC-Medium;
@@ -49,7 +52,10 @@
   line-height: 28rpx;
   display: flex;
   align-items: center;
-  justify-content: flex-end;
+  justify-content: flex-start;
+}
+.my-audio .audio{
+  flex-direction: row-reverse;
 }
 .image{
   width: 16px;
@@ -61,4 +67,12 @@
     width: 16px;
     height: 16px;
     transform:rotate(180deg)
+}
+.dot{
+  top:10rpx;
+  position: absolute;
+  width:15rpx;
+  height:15rpx;
+  background-color: red;
+  border-radius: 50%;
 }
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js
index 4029771..2e1a81d 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.js
@@ -133,7 +133,7 @@ Component({
               icon: 'none',
             });
           } else {
-            if(resData.duration >= 59000){
+            if(resData.duration >= 60000){
               wx.showToast({
                 title: '录音时间不能超过60s',
                 duration:2000,
@@ -266,7 +266,13 @@ Component({
         }
       })
 
-    }
+    },
+    hide: function () {
+      let THIS=this;
+      if(THIS.data.isRecording){
+        THIS.handleTouchEnd()
+      }
+     },
   },
 
   /**
@@ -290,6 +296,20 @@ Component({
     // 打开录音开关
     switchAudio() {
       wx.hideKeyboard();
+      if(!this.data.isAudio){
+        wx.getSetting({
+          success(res) {
+            if (!res.authSetting['scope.record']) {
+              wx.authorize({
+                scope: 'scope.record',
+                success () {
+           
+                }
+              })
+            }
+          }
+        })
+      }
       this.setData({
         isAudio: !this.data.isAudio,
         isEmoji: false,
@@ -348,7 +368,7 @@ Component({
         ext3: wx.$chat_SDKAppID,
       });
       THIS.recorderManager.start({
-        duration: 60000, // 录音的时长，单位 ms，最大值 600000（10 分钟）
+        duration: 61000, // 录音的时长，单位 ms，最大值 600000（10 分钟）
         sampleRate: 44100, // 采样率
         numberOfChannels: 1, // 录音通道数
         encodeBitRate: 192000, // 编码码率
@@ -356,14 +376,17 @@ Component({
       });
 
       THIS.timer=setInterval(()=>{
-        if(THIS.data.recordtime>59){
-         clearInterval(THIS.timer)
+        if(THIS.data.recordtime>=60){
+          THIS.handleTouchEnd();
+         clearInterval(THIS.timer);
+       
         };
         THIS.setData({
          recordtime:THIS.data.recordtime+1
        });
        
       },1000)
+      console.log("handleLongPress")
       THIS.setData({
         startPoint: e.touches[0],
         title: '正在录音',
@@ -378,6 +401,7 @@ Component({
 
     // 录音时的手势上划移动距离对应文案变化
     handleTouchMove(e) {
+      console.log("handleTouchMove")
       if (this.data.isRecording) {
         if (this.data.startPoint.clientY - e.touches[e.touches.length - 1].clientY > 100) {
           this.setData({
@@ -403,11 +427,29 @@ Component({
 
     // 手指离开页面滑动
     handleTouchEnd() {
+      wx.nextTick(() => {
+        this.setData({
+          isRecording: false,
+          popupToggle: false,
+  
+        });
+        console.log("handleTouchEnd")
+        wx.hideLoading();
+        this.recorderManager.stop();
+        clearInterval(this.timer);
+        this.setData({
+          recordtime:0
+        })
+      })
+    
+    },
+    handleTouchCancel(){
       this.setData({
         isRecording: false,
         popupToggle: false,
 
       });
+      console.log("handleTouchCancel")
       wx.hideLoading();
       this.recorderManager.stop();
       clearInterval(this.timer);
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxml b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
index 3f290dc..1b9ac44 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
@@ -17,9 +17,11 @@
                 />
         </view>
         <view wx:if="{{isAudio}}" class="TUI-message-input-main"
-            bind:longpress="handleLongPress"
-            bind:touchmove="handleTouchMove"
-            bind:touchend="handleTouchEnd"
+        catchlongpress="handleLongPress"
+        catchtouchmove="handleTouchMove"
+        catchtouchend="handleTouchEnd"
+        catchtap="handleTouchCancel"
+        catchtouchcancel="handleTouchCancel"
             style="display: flex; justify-content: center; font-size: 32rpx; font-family: PingFangSC-Regular; height: 30px">
             <text >{{text}}</text>
         </view>
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index 2c15bd3..a926ead 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -293,6 +293,19 @@ Component({
         url: url,
       })
     },
+    closeAudio(data){
+      //关闭其他语音
+      this.data.messageList.forEach((item)=>{
+        if(item.type=="TIMSoundElem"){
+          let ele=this.selectComponent('#audio'+item.ID);
+          ele.setData({
+            isPlay:false
+          })
+         
+        }
+        
+      })
+    },
     refreshMessageRounds(message){
       try {
         // console.log("messageList refreshMessageRounds message: ", message);
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxml b/TUIKit/components/TUIChat/components/MessageList/index.wxml
index ece4633..17ce31f 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageList/index.wxml
@@ -54,7 +54,7 @@
                     <TextMessage wx:if="{{item.type === 'TIMTextElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}" />
                     <ImageMessage wx:if="{{item.type === 'TIMImageElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}" />
                     <VideoMessage wx:if="{{item.type === 'TIMVideoFileElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}"/>
-                    <AudioMessage wx:if="{{item.type === 'TIMSoundElem'}}"  message="{{item}}" data-index ='{{index}}' messageList="{{messageList}}" isMine="{{item.flow === 'out'}}"/>
+                    <AudioMessage wx:if="{{item.type === 'TIMSoundElem'}}"  message="{{item}}" data-index ='{{index}}' messageList="{{messageList}}"  bind:closeAudio="closeAudio"  id="audio{{item.ID}}" isMine="{{item.flow === 'out'}}"/>
                     <CustomMessage wx:if="{{item.type === 'TIMCustomElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}" bindtap="handleJumpLink" data-value = "{{item}}" patient_family_data="{{concat.formateText(item.cloudCustomData).patient_family_data}}"/>
                     <FaceMessage wx:if="{{item.type === 'TIMFaceElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}"/>
                     <FileMessage wx:if="{{item.type === 'TIMFileElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}"/>
diff --git a/TUIKit/components/TUIChat/index.wxss b/TUIKit/components/TUIChat/index.wxss
index a06e00c..ac0f562 100644
--- a/TUIKit/components/TUIChat/index.wxss
+++ b/TUIKit/components/TUIChat/index.wxss
@@ -163,7 +163,7 @@
 }
 .time_desc .item{
   color:#E34D59;
-
+  margin-top:3rpx;
   display:inline-flex;
   white-space: nowrap;
   align-items: center;

From 49af4f25059c1d1c48ef1a1e292419b9cff76ecf Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Tue, 19 Dec 2023 10:20:29 +0800
Subject: [PATCH 82/83] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=97=AE=E8=AF=8A?=
 =?UTF-8?q?=E8=A1=A8=E9=87=8D=E5=A4=8D=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/yishi/write_sickform/index.js | 4 ++--
 utils/debounce.js                   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Pages/yishi/write_sickform/index.js b/Pages/yishi/write_sickform/index.js
index 3793e2d..6263f9e 100644
--- a/Pages/yishi/write_sickform/index.js
+++ b/Pages/yishi/write_sickform/index.js
@@ -74,7 +74,7 @@ Page({
     })
   })
  },
- handleSend(){
+ handleSend:debounce(function(){
    let {order_inquiry_id,result,obj}=this.data;
      if(result.length==0){
        wx.showToast({
@@ -97,7 +97,7 @@ Page({
       wx.navigateBack();
     }
   })
- },
+ }),
   noop() {},
   /**
    * 生命周期函数--监听页面加载
diff --git a/utils/debounce.js b/utils/debounce.js
index 3306bdf..7feffaa 100644
--- a/utils/debounce.js
+++ b/utils/debounce.js
@@ -1,4 +1,4 @@
-function debounce(fn, delay){
+function debounce(fn, delay=800){
 	let timer = null;
 	return function(){
 		clearTimeout(timer);

From a36ff7e890b0c548d072911bead05ddc52e3b744 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Tue, 19 Dec 2023 13:53:50 +0800
Subject: [PATCH 83/83] js debounce

---
 utils/debounce.js | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/utils/debounce.js b/utils/debounce.js
index 7feffaa..baf1c57 100644
--- a/utils/debounce.js
+++ b/utils/debounce.js
@@ -1,10 +1,15 @@
-function debounce(fn, delay=800){
-	let timer = null;
-	return function(){
-		clearTimeout(timer);
-		timer = setTimeout(()=> {
-			fn.apply(this, arguments);
-		}, delay)
-	}
+function debounce(fn,wait=1500){
+  var flag = true;
+  var timer = null;
+  return function(){
+    if(flag) {
+      fn.apply(this,arguments);
+      flag = false;
+      timer = setTimeout(() => {
+        flag = true
+      },wait)
+    }
+  }
 }
+
 export default debounce
\ No newline at end of file