From 99ffb6ec053357054224d5029d2fe0e3772d6ed2 Mon Sep 17 00:00:00 2001
From: wangyifeng <812766448@qq.com>
Date: Fri, 28 Mar 2025 18:33:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=88=A0=E9=99=A4=E4=BC=9A?=
 =?UTF-8?q?=E8=AF=9D=E5=90=8E=E5=8F=91=E6=B6=88=E6=81=AF=EF=BC=8C=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E7=BB=9F=E8=AE=A1=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=9B=E8=A7=A3=E5=86=B3=E5=9B=BE=E7=89=87=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E6=AD=A3=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/event/talk.js                          | 42 +++++++++++++---------
 src/pages/dialog/index.vue                 |  9 +++--
 src/pages/search/components/searchList.vue |  3 +-
 3 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/src/event/talk.js b/src/event/talk.js
index f2435b0..256e4e7 100644
--- a/src/event/talk.js
+++ b/src/event/talk.js
@@ -143,27 +143,32 @@ class Talk extends Base {
         !useTalkStore().items[useTalkStore().findTalkIndex(this.getIndexName())]
           ?.is_disturb
       ) {
-        if (typeof plus !== 'undefined') {
-          let OAWebView = plus.webview.all()
-          OAWebView.forEach((webview) => {
-            if (webview.id === 'webviewId1') {
-              webview.evalJS(`updateUnreadMsgNumAdd()`)
-            }
-          })
-        } else {
-          document.addEventListener('plusready', () => {
-            let OAWebView = plus.webview.all()
-            OAWebView.forEach((webview) => {
-              if (webview.id === 'webviewId1') {
-                webview.evalJS(`updateUnreadMsgNumAdd()`)
-              }
-            })
-          })
-        }
+        this.updateUnreadMsgNumAdd()
       }
     }
   }
 
+  //更新未读数量+1
+  updateUnreadMsgNumAdd() {
+    if (typeof plus !== 'undefined') {
+      let OAWebView = plus.webview.all()
+      OAWebView.forEach((webview) => {
+        if (webview.id === 'webviewId1') {
+          webview.evalJS(`updateUnreadMsgNumAdd()`)
+        }
+      })
+    } else {
+      document.addEventListener('plusready', () => {
+        let OAWebView = plus.webview.all()
+        OAWebView.forEach((webview) => {
+          if (webview.id === 'webviewId1') {
+            webview.evalJS(`updateUnreadMsgNumAdd()`)
+          }
+        })
+      })
+    }
+  }
+
   /**
    * 显示消息提示
    * @returns
@@ -207,6 +212,9 @@ class Talk extends Base {
       if (code == 200) {
         let item = formatTalkItem(data)
         item.unread_num = 1
+        if (!item?.is_disturb) {
+          this.updateUnreadMsgNumAdd()
+        }
         useTalkStore().addItem(item)
         await useTalkStore().loadTalkList()
       }
diff --git a/src/pages/dialog/index.vue b/src/pages/dialog/index.vue
index c656d95..5a74812 100644
--- a/src/pages/dialog/index.vue
+++ b/src/pages/dialog/index.vue
@@ -226,11 +226,7 @@
                   id="editor"
                   :options="editorOption"
                   @editorChange="onEditorChange"
-                  style="
-                    width: 100%;
-                    flex: 1;
-                    height: 100%;
-                  "
+                  style="width: 100%; flex: 1; height: 100%;"
                   @click="onEditorClick"
                 />
                 <!-- <tm-input type=textarea autoHeight focusColor="#F9F9F9" color="#F9F9F9" :inputPadding="[12]"
@@ -1573,6 +1569,9 @@ const isLeader = computed(() => {
 //长按头像@用户
 const doMentionUser = (mentionSelect) => {
   console.log(mentionSelect)
+  if (talkParams.type === 1) {
+    return
+  }
   // 构造正确的 mention 对象
   const mentionObj = {
     id: mentionSelect.user_id, // 使用 user_id 而不是 erp_user_id
diff --git a/src/pages/search/components/searchList.vue b/src/pages/search/components/searchList.vue
index c4414de..3c19ecb 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="'@/static/image/search/search-no-data.png'"
+      :empty-view-img="searchNoData"
       :empty-view-text="$t('search.hint')"
       :empty-view-img-style="{ width: '476rpx', height: '261rpx' }"
       :empty-view-title-style="{
@@ -113,6 +113,7 @@
   </div>
 </template>
 <script setup>
+import searchNoData from '@/static/image/search/search-no-data.png'
 import customInput from '@/components/custom-input/custom-input.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'