From c7e3d1991fa50a374bc62f0c628f617a31037bc4 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Wed, 30 Apr 2025 15:49:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/message/index.vue | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/views/message/index.vue b/src/views/message/index.vue
index a7eefb8..4707246 100644
--- a/src/views/message/index.vue
+++ b/src/views/message/index.vue
@@ -135,10 +135,11 @@ const sendParams = ref<any>({
 
 // 消息列表
 const getMessageListData = async () => {
-    const { data: res }: any = await getMessageListApi()
-    // messageList.value = [...new Set([...messageListAll.value, ...res])]
+    const res: any = await getMessageListApi()
+    const data = res.data || []
+
     const uniqueMessages = [
-        ...new Map([...res, ...messageListAll.value].map((item) => [item.uuid, item])).values(),
+        ...new Map([...data, ...messageListAll.value].map((item) => [item.uuid, item])).values(),
     ]
 
     messageList.value = uniqueMessages
@@ -227,23 +228,27 @@ onMounted(() => {
         queryDetailsCompanyId.value = companyId
         getMessageInfoData(queryDetailsCompanyId.value)
 
-        setTimeout(() => {
-            messageInterval.value = setInterval(() => {
-                getMessageInfoData(queryDetailsCompanyId.value)
-            }, 5000)
-        }, 3000)
+        if (messageInterval.value) {
+            clearInterval(messageInterval.value)
+            messageInterval.value = null
+        }
+        messageInterval.value = setInterval(() => {
+            getMessageInfoData(queryDetailsCompanyId.value)
+        }, 5000)
     }
     myCompanyId.value = store.userInfo.companyId
 
-    setTimeout(() => {
-        messageListInterval.value = setInterval(() => {
-            getMessageListAllData()
-            getMessageListData()
-        }, 5000)
-    }, 3000)
+    if (messageListInterval.value) {
+        clearInterval(messageListInterval.value)
+        messageListInterval.value = null
+    }
+    messageListInterval.value = setInterval(() => {
+        getMessageListAllData()
+        getMessageListData()
+    }, 5000)
 })
 
-onBeforeMount(() => {
+onUnmounted(() => {
     if (messageInterval.value) {
         clearInterval(messageInterval.value)
         messageInterval.value = null