From 7d3cd1c085ac4578f0e94e9289557ea328c7f521 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 19 Nov 2024 13:45:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=85=E9=82=AE=E4=BB=B6=E6=B8=A0?=
 =?UTF-8?q?=E9=81=93,=20=E5=85=B6=E4=BB=96=E6=B8=A0=E9=81=93=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=80=BC=E7=9A=84=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/ConversationActions.js                        | 8 +++++++-
 .../Conversations/Online/Components/ChatListItem.jsx      | 4 ++--
 src/views/Conversations/Online/ConversationsList.jsx      | 1 -
 src/views/Conversations/Online/MessagesHeader.jsx         | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

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={
               <span>
                 {/* 🔝 */}
                 {/* <RegionCodeEmoji regionCode={item?.last_message?.regionCode || ''} /> */}
-                {item.conversation_memo ?? (item.whatsapp_name ?? item.whatsapp_phone_number)}
+                {item.show_default}
               </span>
               // 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) ? (
               <>
                 <Typography.Text strong>{currentConversation.customer_name}</Typography.Text>
-                {currentConversation.whatsapp_phone_number ? (
-                  <Typography.Text>{currentConversation.whatsapp_phone_number}</Typography.Text>
+                {currentConversation.sn ? (
+                  <Typography.Text>{currentConversation.show_default}</Typography.Text>
                 ) : (
                   <Typography.Text strong type='danger'>
                     没有WhatsApp号码