Merge branch 'main' of github.com:hainatravel/global-sales

dev/supplier-email-drawer
LiaoYijun 1 year ago
commit 9547dab815

@ -41,7 +41,7 @@ const MessagesHeader = () => {
<Typography.Text strong>{currentConversation.show_default}</Typography.Text>
{currentConversation.sn ? (
<div className='flex flex-col'>
<Typography.Text>{currentConversation?.channels?.whatsapp_phone_number}</Typography.Text>
<Typography.Text>{currentConversation.session_type === 1 ? '' : currentConversation?.channels?.whatsapp_phone_number}</Typography.Text>
<Typography.Text>{currentConversation?.channels?.email}</Typography.Text>
</div>
) : (

@ -84,7 +84,7 @@ const ReplyWrapper = () => {
{
key: 'waba', disabled: sessionType === 1,
label: mobile ? '' : `商业号(${WABAccountsMapped[whatsAppBusiness]?.verifiedName || '-'})`,
icon: <WABIcon />,
icon: <WABIcon className={sessionType === 1 ? 'text-gray-500 [&_path]:fill-current' : ''} />,
children: <InputComposer currentActive={activeChannel === 'waba'} channel={'waba'} lastWABAMsg={lastWABAMsg} />,
},
{ key: 'email', label: mobile ? '' : '邮件', icon: <MailOutlined className='text-indigo-500' />, children: <EmailComposer currentActive={activeChannel === 'email'} /> },
@ -95,7 +95,7 @@ const ReplyWrapper = () => {
children: isPermitted(PERM_USE_WHATSAPP) ? (
<InputComposer channel={'wai'} />
) : (
<div className='p-2 py-4 text-center text-whatsapp bg-gray-200 rounded rounded-b-none border-gray-300 border-solid border border-b-0 border-x-0'>正在开发敬请期待</div>
<div className='p-2 py-4 text-center text-whatsapp bg-gray-200 rounded rounded-b-none border-gray-300 border-solid border border-b-0 border-x-0'>请联系你的主管申请开通</div>
),
},
// {

Loading…
Cancel
Save