diff --git a/src/actions/ConversationActions.js b/src/actions/ConversationActions.js index cff470e..8c4ec13 100644 --- a/src/actions/ConversationActions.js +++ b/src/actions/ConversationActions.js @@ -48,6 +48,7 @@ export const fetchConversationsList = async (params) => { ...ele, customer_name: `${ele.whatsapp_name || ''}`.trim(), whatsapp_name: `${ele.whatsapp_name || ''}`.trim(), + show_default: ele.conversation_memo || ele.whatsapp_name || ele?.channels?.whatsapp_phone_number || ele?.channels?.phone_number || ele?.channels?.email || '', coli_id: ele.COLI_ID, })) return list; @@ -62,7 +63,12 @@ export const fetchConversationsList = async (params) => { export const fetchOrderConversationsList = async (params) => { const { errcode, result: data } = await fetchJSON(`${API_HOST}/getorderconversation`, params); if (errcode !== 0) return []; - const list = data.map((ele) => ({ ...ele, customer_name: `${ele.whatsapp_name || ''}`.trim(), whatsapp_name: `${ele.whatsapp_name || ''}`.trim() })); + const list = data.map((ele) => ({ + ...ele, + customer_name: `${ele.whatsapp_name || ''}`.trim(), + whatsapp_name: `${ele.whatsapp_name || ''}`.trim(), + show_default: ele.conversation_memo || ele.whatsapp_name || ele?.channels?.whatsapp_phone_number || ele?.channels?.phone_number || ele?.channels?.email || '', + })) return list; }; diff --git a/src/views/Conversations/Online/Components/ChatListItem.jsx b/src/views/Conversations/Online/Components/ChatListItem.jsx index f418c0c..d579b98 100644 --- a/src/views/Conversations/Online/Components/ChatListItem.jsx +++ b/src/views/Conversations/Online/Components/ChatListItem.jsx @@ -256,13 +256,13 @@ const ChatListItem = (({item, refreshConversationList,setListUpdateFlag,onSwitch {...item} key={item.sn} id={item.sn} - letterItem={{ id: item.whatsapp_name || item.whatsapp_phone_number, letter: (item.whatsapp_name || item.whatsapp_phone_number || '').slice(0, 5) }} + letterItem={{ id: item.show_default, letter: (item.show_default).slice(0, 5) }} alt={item.whatsapp_name} title={ {/* 🔝 */} {/* */} - {item.conversation_memo ?? (item.whatsapp_name ?? item.whatsapp_phone_number)} + {item.show_default} // item.conversation_memo || } diff --git a/src/views/Conversations/Online/ConversationsList.jsx b/src/views/Conversations/Online/ConversationsList.jsx index 204e06d..747b4f4 100644 --- a/src/views/Conversations/Online/ConversationsList.jsx +++ b/src/views/Conversations/Online/ConversationsList.jsx @@ -13,7 +13,6 @@ import ChatListFilter from './Components/ChatListFilter'; import useStyleStore from '@/stores/StyleStore'; import dayjs from 'dayjs'; import { DATETIME_FORMAT } from '@/config'; -import EmailFetch from './Components/EmailFetch'; /** * [] diff --git a/src/views/Conversations/Online/MessagesHeader.jsx b/src/views/Conversations/Online/MessagesHeader.jsx index 1baae2e..b405072 100644 --- a/src/views/Conversations/Online/MessagesHeader.jsx +++ b/src/views/Conversations/Online/MessagesHeader.jsx @@ -39,8 +39,8 @@ const MessagesHeader = () => { {(currentConversation.coli_sn || currentConversation.sn) ? ( <> {currentConversation.customer_name} - {currentConversation.whatsapp_phone_number ? ( - {currentConversation.whatsapp_phone_number} + {currentConversation.sn ? ( + {currentConversation.show_default} ) : ( 没有WhatsApp号码