From 2454bafd78c80f01c73c9d5b1ce8655cb8e28c82 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Tue, 19 Mar 2024 13:12:10 +0800
Subject: [PATCH] 3.19

---
 Pages/yishi/index/index.wxss                     |  2 +-
 TUICallKit/TUICallService/serve/callManager.ts   |  2 ++
 .../TUIChat/components/MessageInput/index.js     |  5 +++--
 user/pages/yishi/appraise/index.wxml             | 16 ++++++++--------
 user/pages/yishi/onlinesetupprice/index.js       |  4 ++--
 user/pages/yishi/yizhensetup/index.wxml          |  2 +-
 utils/network/config.js                          |  4 ++--
 7 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/Pages/yishi/index/index.wxss b/Pages/yishi/index/index.wxss
index d32fccc..1590082 100644
--- a/Pages/yishi/index/index.wxss
+++ b/Pages/yishi/index/index.wxss
@@ -254,7 +254,7 @@ page{
   border-top-color: #E9E9E9 !important;
 }
 .introicon{
-    top:-7rpx;
+    top:2rpx;
     left:50rpx;
     width:32rpx;
     height:32rpx;
diff --git a/TUICallKit/TUICallService/serve/callManager.ts b/TUICallKit/TUICallService/serve/callManager.ts
index 3b1b361..56e525e 100644
--- a/TUICallKit/TUICallService/serve/callManager.ts
+++ b/TUICallKit/TUICallService/serve/callManager.ts
@@ -66,8 +66,10 @@ export class CallManager {
   };
 
   private _handleCallStatusToCalling() {
+    console.log('isPageRedirected:'+this._isPageRedirected);
     if (this._isPageRedirected) return;
     this._targetPagePath = this.getRoute().route;
+    console.log('videourl:'+`/${this._globalCallPagePath}`);
     // @ts-ignore
     wx.navigateTo({
       url: `/${this._globalCallPagePath}`,
diff --git a/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js
index a33cbb1..9f12489 100644
--- a/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js
@@ -1495,8 +1495,9 @@ Component({
     },
     showSendTalk(){
         let {baseInfo,message_rounds}=this.data;
-        console.log(message_rounds)
-        if(baseInfo.inquiry_status==4 || baseInfo.inquiry_status==5){
+        // console.log(message_rounds);
+        // console.log(baseInfo.inquiry_status);
+        if(baseInfo.inquiry_status==6 || baseInfo.inquiry_status==5){
             this.setData({
                 showTalk:true
             })
diff --git a/user/pages/yishi/appraise/index.wxml b/user/pages/yishi/appraise/index.wxml
index 783dc78..30cad1f 100644
--- a/user/pages/yishi/appraise/index.wxml
+++ b/user/pages/yishi/appraise/index.wxml
@@ -14,13 +14,13 @@
             <view class="top">
               <view class="namebox">
                 <view class="name">{{item.name_mask}}</view>
-              <view class="comemntType" wx:if="item.inquiry_mode==1">
+              <view class="comemntType" wx:if="{{item.inquiry_mode==1}}">
                  图文
                 </view>
-                <view class="comemntType video" wx:elif="item.inquiry_mode==2 && item.inquiry_type==1">
+                <view class="comemntType video" wx:elif="{{item.inquiry_mode==2 && item.inquiry_type==1}}">
                 视频
                 </view>
-                <view class="comemntType yinan" wx:elif="item.inquiry_mode==6 && item.inquiry_type==1">
+                <view class="comemntType yinan" wx:elif="{{item.inquiry_mode==6 && item.inquiry_type==1}}">
                 疑难会诊
                 </view>
               </view>
@@ -44,13 +44,13 @@
             <view class="top">
                 <view class="namebox">
                 <view class="name">{{item.name_mask}}</view>
-              <view class="comemntType" wx:if="item.inquiry_mode==1">
+              <view class="comemntType" wx:if="{{item.inquiry_mode==1}}">
                  图文
                 </view>
-                <view class="comemntType video" wx:elif="item.inquiry_mode==2 && item.inquiry_type==1">
+                <view class="comemntType video" wx:elif="{{item.inquiry_mode==2 && item.inquiry_type==1}}">
                 视频
                 </view>
-                <view class="comemntType yinan" wx:elif="item.inquiry_mode==6 && item.inquiry_type==1">
+                <view class="comemntType yinan" wx:elif="{{item.inquiry_mode==6 && item.inquiry_type==1}}">
                 疑难会诊
                 </view>
               </view>
@@ -77,10 +77,10 @@
               <view class="comemntType" wx:if="item.inquiry_mode==1">
                  图文
                 </view>
-                <view class="comemntType video" wx:elif="item.inquiry_mode==2 && item.inquiry_type==1">
+                <view class="comemntType video" wx:elif="{{item.inquiry_mode==2 && item.inquiry_type==1}}">
                 视频
                 </view>
-                <view class="comemntType yinan" wx:elif="item.inquiry_mode==6 && item.inquiry_type==1">
+                <view class="comemntType yinan" wx:elif="{{item.inquiry_mode==6 && item.inquiry_type==1}}">
                 疑难会诊
                 </view>
               </view>
diff --git a/user/pages/yishi/onlinesetupprice/index.js b/user/pages/yishi/onlinesetupprice/index.js
index 90ce07d..d6ae576 100644
--- a/user/pages/yishi/onlinesetupprice/index.js
+++ b/user/pages/yishi/onlinesetupprice/index.js
@@ -105,8 +105,8 @@ Page({
           return;
         }
     }
-    if(this.data.inquiry_mode==2){
-       console.log(parseFloat(this.data.info.inquiry_price))
+    if(this.data.inquiry_mode==2 || this.data.inquiry_mode==6){
+       //console.log(parseFloat(this.data.info.inquiry_price))
         if(!(parseFloat(this.data.info.inquiry_price)>=10 && parseFloat(this.data.info.inquiry_price)<=2999)){
             wx.showToast({
               title: '问诊单价为10~2999元',
diff --git a/user/pages/yishi/yizhensetup/index.wxml b/user/pages/yishi/yizhensetup/index.wxml
index f015995..78cb76f 100644
--- a/user/pages/yishi/yizhensetup/index.wxml
+++ b/user/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="/user/pages/yishi/manual_detail/index?manual_id=4" custom-style="font-size:32rpx;" title="图文问诊操作手册" is-link border="{{false}}" />
+      <van-cell size="large" url="/user/pages/yishi/manual_detail/index?manual_id=4" custom-style="font-size:32rpx;" title="公益问诊操作手册" is-link border="{{false}}" />
     </view>
   </view>
 
diff --git a/utils/network/config.js b/utils/network/config.js
index a7dd4b8..d42df9a 100644
--- a/utils/network/config.js
+++ b/utils/network/config.js
@@ -2,14 +2,14 @@
 export const dev = {
   baseUrl: "https://dev.hospital.applets.igandanyiyuan.com",
   staticHost: "https://img.applets.igandanyiyuan.com",//静态资源host
-  IMappId: '1600022752', //此处为IM appId
+  IMappId: '1600027911', //此处为IM appId
   IMsecretkey: 'fc45ab469ca632a700166973d87b3a6f56a855cb92d7cffb54e4d37135c097da' //此处为IM secretkey
 }
 // 测试环境url
 export const test = {
   baseUrl: "https://dev.hospital.applets.igandanyiyuan.com",
   staticHost: "https://img.applets.igandanyiyuan.com",//静态资源host
-  IMappId: '1600022752', //此处为此处为IM appId
+  IMappId: '1600027911', //此处为此处为IM appId
   IMsecretkey: 'fc45ab469ca632a700166973d87b3a6f56a855cb92d7cffb54e4d37135c097da' //此处为IM secretkey
 }