From e56f544b4a1a6fb2d545b57ebced5d2ddbc8737f Mon Sep 17 00:00:00 2001 From: "min.jiang" Date: Wed, 4 Sep 2024 02:26:16 +0800 Subject: [PATCH] update --- frontend/src/pages/user/messages/Home.vue | 14 ++++++++++++-- frontend/src/plugins/store/basic.js | 4 ++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/frontend/src/pages/user/messages/Home.vue b/frontend/src/pages/user/messages/Home.vue index d2f7a12..304ab37 100644 --- a/frontend/src/pages/user/messages/Home.vue +++ b/frontend/src/pages/user/messages/Home.vue @@ -91,11 +91,21 @@ export default { conversations(n_val) { console.log('nval', n_val, this.selConversation, n_val[0]?.messages) if (!this.selConversation && n_val[0]) { - this.selectConversation(n_val[0]) + const messages = n_val[0].messages || [] + if (messages.length == 0) { + this.selectConversation(n_val[0]) + } else { + this.messages = messages + } this.clearUnreadMessageBy(n_val[0]) } else { if (n_val?.[0] && this.selConversation?.id === n_val?.[0]?.id) { - // this.messages = n_val[0].messages || [] + const messages = n_val[0].messages || [] + if (messages.length == 0) { + this.selectConversation(n_val[0]) + } else { + this.messages = messages + } this.clearUnreadMessageBy(n_val[0]) } } diff --git a/frontend/src/plugins/store/basic.js b/frontend/src/plugins/store/basic.js index ba799c4..368bc21 100644 --- a/frontend/src/plugins/store/basic.js +++ b/frontend/src/plugins/store/basic.js @@ -50,9 +50,9 @@ const updateConversations = debounce((state, { token, cb }, data) => { ).then((response) => { conversations[0].messages = response?.data || [] conversations[0].message_update_time = new Date().toISOString() - // state.conversations = conversations + state.conversations = conversations state.unreadConversationCount = updateLength - // localStorage.setItem('conversations', JSON.stringify(conversations)) + localStorage.setItem('conversations', JSON.stringify(conversations)) localStorage.setItem('unreadConversationCount', updateLength) }) }