From 391558c1e30ab213afd157e37e7e7174c5162148 Mon Sep 17 00:00:00 2001
From: zengBin <web260320689@163.com>
Date: Wed, 9 Oct 2024 17:24:18 +0800
Subject: [PATCH] update

---
 src/pages/home/information.wpy |  4 +---
 src/pages/news/chitchat.wpy    | 12 ++++++++----
 src/pages/news/visitor.wpy     |  7 +++++--
 src/pages/tabBar/news.wpy      |  9 +++------
 src/utils/im.js                |  5 ++++-
 5 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/pages/home/information.wpy b/src/pages/home/information.wpy
index 963d7fb..a5d3a68 100644
--- a/src/pages/home/information.wpy
+++ b/src/pages/home/information.wpy
@@ -1044,10 +1044,8 @@ wepy.page({
             }
           }
           vm.throttle = true
-          wx.hideLoading()
         }).catch(() => {
           vm.throttle = true
-          wx.hideLoading()
         })
       }
     },
@@ -1156,7 +1154,7 @@ wepy.page({
         vm.loginShow = true
         return
       }
-      if (!vm.userData.is_rank) {
+      if (!vm.userData.rank_id) {
         vm.modalName = 'purchase'
         return
       }
diff --git a/src/pages/news/chitchat.wpy b/src/pages/news/chitchat.wpy
index cdc88c0..6b295d5 100644
--- a/src/pages/news/chitchat.wpy
+++ b/src/pages/news/chitchat.wpy
@@ -559,7 +559,7 @@ page {
 </style>
 <template>
   <view class="ui-chitchat">
-    <image class="m_tips_icon" src="https://image.fulllinkai.com/202305/05/2172ea48286be34e3a4e80a8c2a4571a.png" mode="aspectFit" @tap="reportShow = true"></image>
+    <image v-show="!hiddenHtml" class="m_tips_icon" src="https://image.fulllinkai.com/202305/05/2172ea48286be34e3a4e80a8c2a4571a.png" mode="aspectFit" @tap="reportShow = true"></image>
     <scroll-view class="ui-scroll-view" style="height: {{windowHeight - bottomBoxH}}rpx;" :scroll-y="scrollY" upper-threshold="50" bindscrolltoupper="getHistoryMsg" scroll-into-view="{{toView}}" enable-flex="{{true}}">
       <view class="ui-top-placeholder"></view>
       <block v-show="loading">
@@ -615,7 +615,7 @@ page {
         </view>
       </view>
     </scroll-view>
-    <view class="ui-bottom-input-box">
+    <view class="ui-bottom-input-box" v-show="!hiddenHtml">
       <!--输入文本加表情预览信息-->
       <view class="replyView f-fcc animation-slide-bottom" v-if="msg.length > 17 && showReplyView" style="bottom: {{inputBoxH}}px;">
         <view class="replyContent main-content-box" bindlongpress="copy" data-text="{{msg}}">
@@ -742,6 +742,7 @@ wepy.page({
     videoIndex: -1,
     videoContext: null,
     videoState: null,
+    hiddenHtml: null,
 
     playAudioIndex: -1,
     audioTime: null,
@@ -774,10 +775,10 @@ wepy.page({
       }
       let msg = vm.msg
       if (/\[[^\]]+\]/.test(vm.msg)) {
-        vm.msg = vm.transitionMsg(vm.msg)
+        msg = vm.transitionMsg(vm.msg)
       }
       vm.msgList.push({
-        text: vm.msg,
+        text: msg,
         attach: '',
         id: `id_${timeData}`,
         isSelf: true,
@@ -1433,6 +1434,7 @@ wepy.page({
     playVideo(index) {
       let vm = this
       vm.videoState = true
+      vm.hiddenHtml = true
       vm.videoIndex = index
       vm.videoContext = wx.createVideoContext('chatVideo-' + index, vm)
       vm.videoContext.requestFullScreen({direction: 0})
@@ -1446,11 +1448,13 @@ wepy.page({
       let vm = this
       let fullScreen = e.$wx.detail.fullScreen
       vm.videoState = true
+      vm.hiddenHtml = true
       if (!fullScreen) {
         vm.toView = `${row}`
         vm.videoContext.stop()
         vm.videoContext = null
         vm.videoIndex = -1
+        vm.hiddenHtml = false
         setTimeout(() => {
           vm.videoState = false
         }, 500)
diff --git a/src/pages/news/visitor.wpy b/src/pages/news/visitor.wpy
index 198d280..02faecd 100644
--- a/src/pages/news/visitor.wpy
+++ b/src/pages/news/visitor.wpy
@@ -445,7 +445,7 @@ wepy.page({
           data.data.forEach((item) => {
             item.nickname = `${item.nickname.substring(0, 1)}***`
           })
-          if (vm.list.length === 0 || vm.page === 1) {
+          if (vm.fansList.length === 0 || vm.fans_page === 1) {
             vm.fansList = data.data
           } else {
             data.data.map(function (item) {
@@ -563,8 +563,11 @@ wepy.page({
   },
   onShow() {
   },
-  created() {
+  onLoad(e) {
     let vm = this
+    if (e && e.index) {
+      vm.tabBarIndex = e.index
+    }
     vm.getList()
     vm.getFansList()
     vm.userInfo = wx.getStorageSync('userInfo')
diff --git a/src/pages/tabBar/news.wpy b/src/pages/tabBar/news.wpy
index ed6cf8f..6b24661 100644
--- a/src/pages/tabBar/news.wpy
+++ b/src/pages/tabBar/news.wpy
@@ -240,7 +240,6 @@ wepy.page({
     index: null, // 滑动删除聊天消息下标
     groupSessionsCount: [], // 群聊消息未读数
     teamAtList: [], // 群聊@
-    cachePage: 0, // 记录跳转前的页数
     page: 1,
     no_more: false,
     list: [] // 消息列表数据
@@ -288,7 +287,6 @@ wepy.page({
             }
           }
         }
-        vm.cachePage = vm.page
         setTimeout(() => {
           vm.loading = true
         }, 500)
@@ -468,16 +466,15 @@ wepy.page({
   onPullDownRefresh() {
     let vm = this
     vm.page = 1
-    vm.cachePage = 0
     vm.no_more = false
     vm.getList()
   },
   onShow() {
     let vm = this
+    vm.page = 1
+    vm.no_more = false
     vm.getNewCount()
-    if (vm.cachePage != vm.page) {
-      vm.getList()
-    }
+    vm.getList()
   },
   onLoad() {}
 })
diff --git a/src/utils/im.js b/src/utils/im.js
index 5f9aa79..d4be187 100644
--- a/src/utils/im.js
+++ b/src/utils/im.js
@@ -145,7 +145,10 @@ const IM = (account, token) => {
       })
     }
     setTimeout(() => {
-      currentPage.onShow()
+      console.log(currentPage, '7777777')
+      if (currentPage.route == 'pages/tabBar/news') {
+        currentPage.onShow()
+      }
       wx.vibrateLong({
         success: () => {
           console.log('来消息了，震动~~')