From 4dd404167b4ad4d7b9c36e9e6c9504dc90cd7958 Mon Sep 17 00:00:00 2001 From: Lei OT Date: Thu, 12 Jun 2025 17:00:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=82=AE=E4=BB=B6=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/useEmail.js | 14 +++-------- .../Online/Components/EmailDetailInline.jsx | 24 +++++++++++++++---- src/views/orders/Follow.jsx | 2 +- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js index e7fc158..876d618 100644 --- a/src/hooks/useEmail.js +++ b/src/hooks/useEmail.js @@ -52,6 +52,7 @@ export const useEmailDetail = (mai_sn, data={}, oid=0) => { const refresh = useCallback(() => { setRefreshTrigger(prev => prev + 1); }, []); + console.log(maiSN, 'mailSN', mai_sn) // const [updateMessageItem] = useConversationStore(state => [state.updateMessageItem]); @@ -67,7 +68,7 @@ export const useEmailDetail = (mai_sn, data={}, oid=0) => { try { setLoading(true) - const data = await getEmailDetailAction({ mai_sn: maiSN || mai_sn }) + const data = await getEmailDetailAction({ mai_sn: Number(mai_sn) || maiSN }) // console.log(data) setMailData(data) setColiSN(oid === false ? 0 : data.info.MAI_COLI_SN) @@ -133,16 +134,7 @@ export const useEmailDetail = (mai_sn, data={}, oid=0) => { } }; - const updateEmailProcessed = async (params) => { - try { - const x = await updateEmailAction(params); - refresh() - } catch (error) { - console.error(error) - } - } - - return { loading, mailData, orderDetail, postEmailResend, postEmailSaveOrSend, updateEmailProcessed } + return { loading, mailData, orderDetail, postEmailResend, postEmailSaveOrSend } } export const EmailBuilder = ({subject, content}) => { diff --git a/src/views/Conversations/Online/Components/EmailDetailInline.jsx b/src/views/Conversations/Online/Components/EmailDetailInline.jsx index d16bdf4..a726b78 100644 --- a/src/views/Conversations/Online/Components/EmailDetailInline.jsx +++ b/src/views/Conversations/Online/Components/EmailDetailInline.jsx @@ -6,7 +6,7 @@ import { isEmpty, TagColorStyle } from '@/utils/commons' import EmailEditorPopup from '../Input/EmailEditorPopup' import DnDModal from '@/components/DnDModal' import useStyleStore from '@/stores/StyleStore' -import { openPopup, useEmailDetail } from '@/hooks/useEmail' +import { openPopup, useEmailDetail, useEmailList, } from '@/hooks/useEmail' import { EMAIL_ATTA_HOST, POPUP_FEATURES } from '@/config' import EmailBindFormModal from './EmailBind' import EmailContent from './EmailContent' @@ -103,6 +103,22 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s }) } } + + const handleDel = async () => { + if (isEmpty(mai_sn)) { + return false + } + try { + // + } catch (err) { + notification.error({ + message: '请求失败', + description: err.message, + placement: 'top', + duration: 3, + }) + } + } const FileTypeIcon = ({fileName}) => { const ext = fileName.split('.').pop() || 'default'; const Com = extTypeMapped[ext]?.icon || FileOutlined; @@ -124,7 +140,7 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s const showDoneBtn = mailData.info?.MAI_Direction !== 1 ? true : false if (showDoneBtn) { - btns.push() + // btns.push() } // 没有关联订单的邮件`绑定订单` if (showBindBtn) { @@ -156,8 +172,8 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s break case 'failed': btns.push( - - , + // + // , , diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx index 8dfe200..6747652 100644 --- a/src/views/orders/Follow.jsx +++ b/src/views/orders/Follow.jsx @@ -158,7 +158,7 @@ function Follow() { onClickEmailItem(item)} currentActiveMailItem={activeEmailId} /> - + {}} />