fix: 仅邮件渠道, 其他渠道没有值的显示问题

2.0/email-builder
Lei OT 10 months ago
parent 0dcae48a5c
commit 7d3cd1c085

@ -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;
};

@ -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 ||
}

@ -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';
/**
* []

@ -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号码

Loading…
Cancel
Save