From 129db4f0811e2b3abf28aeb848d30dd3db4aac3c Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Thu, 18 Apr 2024 13:56:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=B7=B3=E8=BD=AC=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E8=8D=AF=E5=93=81tip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TUIKit/components/TUIChat/index.wxml      |  2 +-
 user/pages/login/index.js                     | 22 ++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/TUIChatService/TUIKit/components/TUIChat/index.wxml b/TUIChatService/TUIKit/components/TUIChat/index.wxml
index e0d325e..fdfdd43 100644
--- a/TUIChatService/TUIKit/components/TUIChat/index.wxml
+++ b/TUIChatService/TUIKit/components/TUIChat/index.wxml
@@ -38,7 +38,7 @@
     <view >如需要修改视频时间，请点击这里</view>
     <van-icon name="arrow" size="14px" style="margin-top: 3rpx;" color="#FF9C00" />
   </view>
-  <view class="yaotip" hidden="{{showYaotip}}">
+  <view class="yaotip" hidden="{{showYaotip}}" wx:if="{{baseInfo.inquiry_status==4 && baseInfo.inquiry_mode==8}}">
    <view>温馨提示：还剩{{serviceInfo.remaining_quantity}}盒“肝爽颗粒(步长)”,记得开具处方</view>
    <van-icon name="cross" bind:tap="closeYaotip"/>
   </view>
diff --git a/user/pages/login/index.js b/user/pages/login/index.js
index 785a152..1aaa539 100644
--- a/user/pages/login/index.js
+++ b/user/pages/login/index.js
@@ -25,25 +25,27 @@ Page({
   },
   onShow(){
     let usertype =  wx.getStorageSync('usertype');
+    if(!usertype){
+        wx.redirectTo({
+          url: "/Pages/index/index"
+        })
+      };
     this.setData({
       beforeClose: this.data.beforeClose.bind(this),
   })
-    if(!usertype){
-      wx.navigateTo({
-        url: "/Pages/index/index"
-      })
-    };
+   
   },
   onLoad(){
     let usertype =  wx.getStorageSync('usertype');
+    if(!usertype){
+        wx.redirectTo({
+          url: "/Pages/index/index"
+        })
+      };
     this.setData({
       beforeClose: this.data.beforeClose.bind(this),
   })
-    if(!usertype){
-      wx.navigateTo({
-        url: "/Pages/index/index"
-      })
-    };
+    
     wx.getPrivacySetting({
       success: res => {
         console.log(res) // 返回结果为: res = { needAuthorization: true/false, privacyContractName: '《xxx隐私保护指引》' }