From 393deffe46dc88100802eec547c569e9ef17e179 Mon Sep 17 00:00:00 2001 From: Lei OT Date: Mon, 25 Nov 2024 14:39:26 +0800 Subject: [PATCH] # --- src/actions/ConversationActions.js | 1 + src/channel/bubbleMsgUtils.js | 2 ++ src/stores/ConversationStore.js | 1 + 3 files changed, 4 insertions(+) diff --git a/src/actions/ConversationActions.js b/src/actions/ConversationActions.js index 8c4ec13..ffd7c78 100644 --- a/src/actions/ConversationActions.js +++ b/src/actions/ConversationActions.js @@ -37,6 +37,7 @@ export const fetchConversationsList = async (params) => { intour: '', session_enable: 1, lastactivetime: '', + top_state: '', } const combinedFilterStr = Object.values(pick(params, ['keyword', 'tags', 'olabel', 'intour', 'ostate'])).join('') if (isNotEmpty(combinedFilterStr) || params.session_enable === 0) { diff --git a/src/channel/bubbleMsgUtils.js b/src/channel/bubbleMsgUtils.js index 6733690..8f99233 100644 --- a/src/channel/bubbleMsgUtils.js +++ b/src/channel/bubbleMsgUtils.js @@ -599,6 +599,7 @@ export const parseRenderMessageItem = (msg) => { ...(typeof whatsappMsgTypeMapped[thisMsgType].type === 'function' ? whatsappMsgTypeMapped[thisMsgType].type(msg) : { type: whatsappMsgTypeMapped[thisMsgType].type || 'text' }), // type: whatsappMsgTypeMapped?.[thisMsgType]?.type || 'text', localDate: (msg?.sendTime || msg?.createTime || '').replace('T', ' '), + dateString: dayjs(msg?.sendTime || msg.createTime).format('MM-DD HH:mm'), from: msg.from, sender: msg.from, senderName: msg?.customerProfile?.name || msg?.fromName || msg?.from || 'me', // msg.from, @@ -670,6 +671,7 @@ export const parseRenderMessageList = (messages) => { ...(typeof whatsappMsgTypeMapped[msgType].type === 'function' ? whatsappMsgTypeMapped[msgType].type(msg) : { type: whatsappMsgTypeMapped[msgType].type || 'text' }), date: msgContent?.sendTime || msg.msgtime || '', dateText: dayjs(msgContent?.sendTime || msg.msgtime).format('MM-DD HH:mm'), + dateString: dayjs(msgContent?.sendTime || msg.msgtime).format('MM-DD HH:mm'), localDate: (msg.msgtime || '').replace('T', ' '), from: msgContent.from, sender: msgContent.from, diff --git a/src/stores/ConversationStore.js b/src/stores/ConversationStore.js index e479c71..229856b 100644 --- a/src/stores/ConversationStore.js +++ b/src/stores/ConversationStore.js @@ -74,6 +74,7 @@ const tagsSlice = (set) => ({ // 会话筛选 const filterObj = { + pagesize: '', search: '', otype: '', tags: [],