From da97a9791b2eeecd1152f832a483673f83f8b545 Mon Sep 17 00:00:00 2001 From: Lei OT Date: Fri, 17 May 2024 09:17:33 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E6=B6=88=E6=81=AF=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/stores/ConversationStore.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/stores/ConversationStore.js b/src/stores/ConversationStore.js index 3911a4d..ebab3e6 100644 --- a/src/stores/ConversationStore.js +++ b/src/stores/ConversationStore.js @@ -4,7 +4,8 @@ import { olog, isEmpty } from '@/utils/commons'; import { receivedMsgTypeMapped, handleNotification } from '@/channel/whatsappUtils'; import { fetchConversationsList, fetchTemplates, fetchConversationsSearch, UNREAD_MARK } from '@/actions/ConversationActions'; import { devtools } from 'zustand/middleware'; -import { WS_URL } from '@/config'; +import { WS_URL, DATETIME_FORMAT } from '@/config'; +import dayjs from 'dayjs'; // const WS_URL = 'ws://202.103.68.144:8888/whatever/'; // const WS_URL = 'ws://120.79.9.217:10022/whatever/'; @@ -277,7 +278,7 @@ const messageSlice = (set, get) => ({ // 更新列表的时间 conversationsList.splice(targetIndex, 1, { ...conversationsList[targetIndex], - last_received_time: message.status === 'received' ? message.deliverTime : conversationsList[targetIndex].last_received_time, // todo: 需要+8 hours + last_received_time: message.status === 'received' ? dayjs(message.deliverTime).add(8, 'hours').format(DATETIME_FORMAT) : conversationsList[targetIndex].last_received_time, conversation_expiretime: message?.conversation?.expireTime || conversationsList[targetIndex].conversation_expiretime || '', // 保留使用UTC时间 }); } else if (targetIndex === -1) { @@ -307,7 +308,7 @@ const messageSlice = (set, get) => ({ const { activeConversations, conversationsList, currentConversation, totalNotify } = get(); const targetMsgs = activeConversations[String(targetId)] || []; const targetIndex = conversationsList.findIndex((ele) => String(ele.sn) === String(targetId)); - const lastReceivedTime = message.type !== 'system' && message.sender !== 'me' ? message.date : null; + const lastReceivedTime = (message.type !== 'system' && message.sender !== 'me') ? dayjs(message.date).add(8, 'hours').format(DATETIME_FORMAT) : null; const newConversation = targetIndex !== -1 ? { @@ -323,7 +324,7 @@ const messageSlice = (set, get) => ({ ...message, sn: targetId, opi_sn: currentConversation.opi_sn, // todo: coli sn - last_received_time: message.date, + last_received_time: dayjs(message.date).add(8, 'hours').format(DATETIME_FORMAT), unread_msg_count: message.sender === 'me' ? 0 : 1, whatsapp_name: message?.senderName || message?.sender || '', customer_name: message?.senderName || message?.sender || '',