From fea7504a918f37e9044d451d8918cdcc2b545d94 Mon Sep 17 00:00:00 2001
From: wangyifeng <812766448@qq.com>
Date: Thu, 27 Mar 2025 17:25:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E7=BA=BF=E5=89=8D?=
 =?UTF-8?q?=E9=81=87=E5=88=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/chat/index.js                           |  2 +-
 src/components/custom-navbar/index.vue          |  1 -
 src/event/talk.js                               | 14 +++++++++-----
 .../components/groupMembersList.vue             |  4 ++--
 .../components/select-member-item.vue           |  2 +-
 .../components/selectMemberByAlphabet.vue       |  5 +++--
 .../chatSettings/components/settingFormItem.vue |  2 +-
 .../chatSettings/groupManage/editGroupName.vue  |  2 +-
 .../groupManage/manageGroupAdmin.vue            |  4 ++--
 .../groupManage/manageGroupSilence.vue          |  2 +-
 src/pages/chatSettings/index.vue                |  2 +-
 src/pages/dialog/dialogDetail/userDetail.vue    |  4 ++--
 src/pages/dialog/index.vue                      | 17 +++++++++--------
 src/pages/search/components/searchList.vue      | 15 +++++++++++----
 src/pages/search/searchByCondition/index.vue    | 17 ++++++++++++-----
 src/store/modules/dialogue.js                   |  4 ++++
 16 files changed, 60 insertions(+), 37 deletions(-)

diff --git a/src/api/chat/index.js b/src/api/chat/index.js
index 791858f..e75c9b4 100644
--- a/src/api/chat/index.js
+++ b/src/api/chat/index.js
@@ -44,7 +44,7 @@ export const ServeTopTalkList = (data) => {
 // 清除聊天消息未读数服务接口
 export const ServeClearTalkUnreadNum = (data, unReadNum) => {
   console.log('=======chatApp==UnreadNum', unReadNum)
-  if(!useTalkStore().items[useTalkStore().findTalkIndex(useDialogueStore().index_name)].is_disturb){
+  if(!useTalkStore().items[useTalkStore().findTalkIndex(useDialogueStore().index_name)]?.is_disturb){
     if (typeof plus !== 'undefined') {
       let OAWebView = plus.webview.all()
       OAWebView.forEach((webview) => {
diff --git a/src/components/custom-navbar/index.vue b/src/components/custom-navbar/index.vue
index 3b0f168..1baae82 100644
--- a/src/components/custom-navbar/index.vue
+++ b/src/components/custom-navbar/index.vue
@@ -1,7 +1,6 @@
 <template>
   <tm-navbar
     :hideBack="props.hideBack"
-    hideHome
     :title="props.title"
     :shadow="props.shadowNum"
     :fontSize="34"
diff --git a/src/event/talk.js b/src/event/talk.js
index bc43672..f2435b0 100644
--- a/src/event/talk.js
+++ b/src/event/talk.js
@@ -117,7 +117,10 @@ class Talk extends Base {
 
     // 判断会话列表是否存在，不存在则创建
     if (useTalkStore().findTalkIndex(this.getIndexName()) == -1) {
-      if (this.resource.msg_type == 1106) {
+      if (this.resource.msg_type == 1102) {
+        //被邀请进入群聊时，需要热更新会话列表
+        await useTalkStore().loadTalkList()
+      } else if (this.resource.msg_type == 1106) {
         //群解散时，需要热更新会话列表
         await useTalkStore().loadTalkList()
       } else if (
@@ -138,7 +141,7 @@ class Talk extends Base {
       this.updateTalkItem()
       if (
         !useTalkStore().items[useTalkStore().findTalkIndex(this.getIndexName())]
-          .is_disturb
+          ?.is_disturb
       ) {
         if (typeof plus !== 'undefined') {
           let OAWebView = plus.webview.all()
@@ -200,11 +203,12 @@ class Talk extends Base {
     ServeCreateTalkList({
       talk_type,
       receiver_id,
-    }).then(({ code, data }) => {
+    }).then(async ({ code, data }) => {
       if (code == 200) {
         let item = formatTalkItem(data)
         item.unread_num = 1
         useTalkStore().addItem(item)
+        await useTalkStore().loadTalkList()
       }
     })
   }
@@ -326,8 +330,8 @@ class Talk extends Base {
       const findMention = this.resource?.extra?.mentions?.find(
         (mention) => mention === this.getAccountId(),
       )
-      //有人@我，则更新会话列表
-      if (findMention) {
+      //有人@我或者@所有人，则更新会话列表
+      if (findMention || this.resource?.extra?.mentions?.includes(0)) {
         useTalkStore().loadTalkList()
       }
     }
diff --git a/src/pages/chatSettings/components/groupMembersList.vue b/src/pages/chatSettings/components/groupMembersList.vue
index 3aee643..7c21c66 100644
--- a/src/pages/chatSettings/components/groupMembersList.vue
+++ b/src/pages/chatSettings/components/groupMembersList.vue
@@ -53,7 +53,7 @@
     >
       <div class="group-member-each">
         <div class="group-member-avatar" :style="{ background: 'unset' }">
-          <img src="/src/static/image/chatSettings/add-member.png" />
+          <img src="@/static/image/chatSettings/add-member.png" />
         </div>
         <div class="group-member-name">
           <span class="text-[24rpx] font-regular">添加</span>
@@ -71,7 +71,7 @@
     >
       <div class="group-member-each">
         <div class="group-member-avatar" :style="{ background: 'unset' }">
-          <img src="/src/static/image/chatSettings/remove-member.png" />
+          <img src="@/static/image/chatSettings/remove-member.png" />
         </div>
         <div class="group-member-name">
           <span class="text-[24rpx] font-regular">移除</span>
diff --git a/src/pages/chatSettings/components/select-member-item.vue b/src/pages/chatSettings/components/select-member-item.vue
index d0e99e4..d686259 100644
--- a/src/pages/chatSettings/components/select-member-item.vue
+++ b/src/pages/chatSettings/components/select-member-item.vue
@@ -49,7 +49,7 @@
           props?.memberItem?.is_mine && props?.manageType === 'removeMembers'
         "
       >
-        <img src="/src/static/image/chatSettings/is-mine.png" />
+        <img src="@/static/image/chatSettings/is-mine.png" />
       </div>
       <div
         class="is-admin-tag"
diff --git a/src/pages/chatSettings/components/selectMemberByAlphabet.vue b/src/pages/chatSettings/components/selectMemberByAlphabet.vue
index b266373..16cc0a8 100644
--- a/src/pages/chatSettings/components/selectMemberByAlphabet.vue
+++ b/src/pages/chatSettings/components/selectMemberByAlphabet.vue
@@ -158,6 +158,7 @@ import customInput from '@/components/custom-input/custom-input.vue'
 import selectMemberItem from '../components/select-member-item.vue'
 import ZPaging from '@/uni_modules/z-paging/components/z-paging/z-paging.vue'
 import useZPaging from '@/uni_modules/z-paging/components/z-paging/js/hooks/useZPaging.js'
+import groupAllMember from '@/static/image/chatList/groupAllMember.png'
 import {
   computed,
   onMounted,
@@ -265,7 +266,7 @@ watch(
           key: '0',
           memberList: [
             {
-              avatar: '/src/static/image/chatList/groupAllMember.png',
+              avatar: groupAllMember,
               erp_user_id: 0,
               gender: 0,
               is_mute: 0,
@@ -465,7 +466,7 @@ const assembleAlphabetMemberList = async (newMemberList) => {
         key: '0',
         memberList: [
           {
-            avatar: '/src/static/image/chatList/groupAllMember.png',
+            avatar: groupAllMember,
             erp_user_id: 0,
             gender: 0,
             is_mute: 0,
diff --git a/src/pages/chatSettings/components/settingFormItem.vue b/src/pages/chatSettings/components/settingFormItem.vue
index 2742782..e75f1d9 100644
--- a/src/pages/chatSettings/components/settingFormItem.vue
+++ b/src/pages/chatSettings/components/settingFormItem.vue
@@ -19,7 +19,7 @@
                 (props?.item?.label !== $t('chat.settings.groupName') ||
                   props?.item?.label !== $t('chat.settings.groupType'))))
           "
-          src="/src/static/image/chatSettings/pointer.png"
+          src="@/static/image/chatSettings/pointer.png"
         />
         <tm-switch
           :width="88"
diff --git a/src/pages/chatSettings/groupManage/editGroupName.vue b/src/pages/chatSettings/groupManage/editGroupName.vue
index d69549d..55e1009 100644
--- a/src/pages/chatSettings/groupManage/editGroupName.vue
+++ b/src/pages/chatSettings/groupManage/editGroupName.vue
@@ -35,7 +35,7 @@
               <img
                 v-if="state.groupName"
                 class="groupName-input-clearBtn"
-                src="/src/static/image/chatSettings/clear-btn.png"
+                src="@/static/image/chatSettings/clear-btn.png"
                 @click="clearGroupNameInput"
               />
             </div>
diff --git a/src/pages/chatSettings/groupManage/manageGroupAdmin.vue b/src/pages/chatSettings/groupManage/manageGroupAdmin.vue
index 7044bfb..232ce49 100644
--- a/src/pages/chatSettings/groupManage/manageGroupAdmin.vue
+++ b/src/pages/chatSettings/groupManage/manageGroupAdmin.vue
@@ -46,7 +46,7 @@
               <div class="group-admin-list-each-btns">
                 <img
                   v-if="item.is_mine"
-                  src="/src/static/image/chatSettings/is-mine.png"
+                  src="@/static/image/chatSettings/is-mine.png"
                 />
                 <div
                   class="group-admin-list-each-btns-each"
@@ -67,7 +67,7 @@
               margin: state?.groupAdminList.length == 0 ? '20rpx 0 0' : '',
             }"
           >
-            <img src="/src/static/image/chatSettings/add-btn.png" />
+            <img src="@/static/image/chatSettings/add-btn.png" />
             <span class="text-[28rpx] font-medium">
               {{ $t('chat.manage.addAdmin') }}
             </span>
diff --git a/src/pages/chatSettings/groupManage/manageGroupSilence.vue b/src/pages/chatSettings/groupManage/manageGroupSilence.vue
index 5a22501..22d6628 100644
--- a/src/pages/chatSettings/groupManage/manageGroupSilence.vue
+++ b/src/pages/chatSettings/groupManage/manageGroupSilence.vue
@@ -42,7 +42,7 @@
             class="add-silence-member-btn chat-settings-card"
             @click="toSelectMembersPage"
           >
-            <img src="/src/static/image/chatSettings/add-btn.png" />
+            <img src="@/static/image/chatSettings/add-btn.png" />
             <span class="text-[28rpx] font-medium">
               {{ $t('chat.manage.addSilenceMember') }}
             </span>
diff --git a/src/pages/chatSettings/index.vue b/src/pages/chatSettings/index.vue
index c0dca72..ebecaf1 100644
--- a/src/pages/chatSettings/index.vue
+++ b/src/pages/chatSettings/index.vue
@@ -54,7 +54,7 @@
               @click="toEditGroupInfoPage"
               v-if="groupParams?.groupInfo?.is_manager"
             >
-              <img src="/src/static/image/chatSettings/edit-btn.png" />
+              <img src="@/static/image/chatSettings/edit-btn.png" />
             </div>
           </div>
           <div class="chat-group-members chat-group-infos chat-settings-card">
diff --git a/src/pages/dialog/dialogDetail/userDetail.vue b/src/pages/dialog/dialogDetail/userDetail.vue
index 4f110b5..943dc20 100644
--- a/src/pages/dialog/dialogDetail/userDetail.vue
+++ b/src/pages/dialog/dialogDetail/userDetail.vue
@@ -37,7 +37,7 @@
           </div>
           <div class="user-info-main user-info-card">
             <div class="user-info-main-title">
-              <img src="/src/static/image/mine/ming001@3x.png" />
+              <img src="@/static/image/mine/ming001@3x.png" />
               <span class="text-[28rpx] font-medium">
                 {{ $t('index.mine.basic') }}
               </span>
@@ -84,7 +84,7 @@
         <div class="do-phone-call-header">
           <span>{{ $t('popup.title.phone') }}</span>
           <img
-            src="/src/static/image/login/check-circle-filled@3x.png"
+            src="@/static/image/login/check-circle-filled@3x.png"
             @click="hidePhoneCallPopup"
           />
         </div>
diff --git a/src/pages/dialog/index.vue b/src/pages/dialog/index.vue
index 831a4c2..f26604a 100644
--- a/src/pages/dialog/index.vue
+++ b/src/pages/dialog/index.vue
@@ -250,7 +250,7 @@
                   <img
                     @click="clearQuoteInfo"
                     style="width: 30rpx; height: 30rpx;"
-                    src="/src/static/image/login/check-circle-filled@3x.png"
+                    src="@/static/image/login/check-circle-filled@3x.png"
                   />
                 </div>
               </div>
@@ -389,7 +389,7 @@
           >
             <img
               style="width: 40rpx; height: 40rpx;"
-              src="/src/static/image/chatList/mention_select_hide_bg.png"
+              src="@/static/image/chatList/mention_select_hide_bg.png"
             />
             <img
               style="
@@ -399,7 +399,7 @@
                 margin-left: -9rpx;
                 margin-top: -5rpx;
               "
-              src="/src/static/image/chatList/mention_select_hide_icon.png"
+              src="@/static/image/chatList/mention_select_hide_icon.png"
             />
           </div>
           <span
@@ -1400,12 +1400,13 @@ const updateMentionUserIds = () => {
     }
   })
 
-  // 直接使用当前编辑器中的mentions作为mentionUserIds
-  // 如果当前有@所有人，或者没有任何@，则添加0
-  if (currentMentions.has(0) || currentMentions.size === 0) {
-    currentMentions.add(0)
+  // 如果当前有@所有人，则添加0
+  if (currentMentions.has(0)) {
+    state.value.mentionUserIds = [0]
+  } else {
+    // 如果没有@任何人，保持空数组
+    state.value.mentionUserIds = Array.from(currentMentions)
   }
-  state.value.mentionUserIds = Array.from(currentMentions)
 }
 
 //根据msg信息找到对应的聊天记录，并根据sequence等查看上下文
diff --git a/src/pages/search/components/searchList.vue b/src/pages/search/components/searchList.vue
index 27f391c..c4414de 100644
--- a/src/pages/search/components/searchList.vue
+++ b/src/pages/search/components/searchList.vue
@@ -9,7 +9,7 @@
       :default-page-size="props.searchResultPageSize"
       :loading-more-default-as-loading="true"
       :inside-more="true"
-      :empty-view-img="'/src/static//image/search/search-no-data.png'"
+      :empty-view-img="'@/static/image/search/search-no-data.png'"
       :empty-view-text="$t('search.hint')"
       :empty-view-img-style="{ width: '476rpx', height: '261rpx' }"
       :empty-view-title-style="{
@@ -360,9 +360,16 @@ const queryAllSearch = (pageNum, searchResultPageSize) => {
 
 //点击取消搜索
 const cancelSearch = () => {
-  uni.navigateBack({
-    delta: 1,
-  })
+  const pages = getCurrentPages()
+  if (pages.length > 1) {
+    uni.navigateBack({
+      delta: 1,
+    })
+  } else {
+    uni.reLaunch({
+      url: '/pages/index/index'
+    })
+  }
 }
 
 //获取key对应值
diff --git a/src/pages/search/searchByCondition/index.vue b/src/pages/search/searchByCondition/index.vue
index a7a286f..0d52421 100644
--- a/src/pages/search/searchByCondition/index.vue
+++ b/src/pages/search/searchByCondition/index.vue
@@ -42,7 +42,7 @@
               <span class="text-[28rpx] font-regular">
                 {{ state.selectedMonth }}
               </span>
-              <img src="/src/static/image/search/down-pointer.png" />
+              <img src="@/static/image/search/down-pointer.png" />
             </div>
           </tm-time-picker>
           <tm-calendar-view
@@ -209,7 +209,7 @@
                           v-if="state.condition === 'file'"
                         />
                         <img
-                          src="/src/static/image/search/result-link-icon.png"
+                          src="@/static/image/search/result-link-icon.png"
                           v-if="state.condition === 'link'"
                         />
                       </div>
@@ -554,9 +554,16 @@ const inputSearchText = (e) => {
 
 //点击取消搜索
 const cancelSearch = () => {
-  uni.navigateBack({
-    delta: 1,
-  })
+  const pages = getCurrentPages()
+  if (pages.length > 1) {
+    uni.navigateBack({
+      delta: 1,
+    })
+  } else {
+    uni.reLaunch({
+      url: '/pages/index/index'
+    })
+  }
 }
 
 //查询数据
diff --git a/src/store/modules/dialogue.js b/src/store/modules/dialogue.js
index 0d76c50..5ca6a2a 100644
--- a/src/store/modules/dialogue.js
+++ b/src/store/modules/dialogue.js
@@ -15,6 +15,10 @@ import { useAuth } from '../auth/index'
 // let keyboardTimeout = null
 
 export const useDialogueStore = defineStore('dialogue', {
+  // 添加持久化配置
+  persist: {
+    paths: ['talk.talk_type', 'talk.receiver_id']
+  },
   state: () => {
     return {
       // 对话索引（聊天对话的唯一索引）