From 22db64e6f71a98fa9c0c63bee8f51f4dcea7f286 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 21 Feb 2025 14:21:53 +0800
Subject: [PATCH] =?UTF-8?q?perf(=E5=89=8D=E7=AB=AF):=20=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=9C=80=E6=98=BE=E7=A4=BA=E6=8A=84=E9=80=81?=
 =?UTF-8?q?;=20=E5=9B=9E=E5=A4=8D=E6=8A=84=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Conversations/Online/Components/EmailDetail.jsx    | 10 +++++-----
 .../Conversations/Online/Input/EmailEditorPopup.jsx    |  6 +++---
 src/views/Conversations/Online/MessagesWrapper.jsx     |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/Conversations/Online/Components/EmailDetail.jsx b/src/views/Conversations/Online/Components/EmailDetail.jsx
index a40a5f1..830bb00 100644
--- a/src/views/Conversations/Online/Components/EmailDetail.jsx
+++ b/src/views/Conversations/Online/Components/EmailDetail.jsx
@@ -164,18 +164,18 @@ const EmailDetail = ({ open, setOpen, emailMsg={}, disabled=false, ...props }) =
               </div>
             </div>
             <div className='text-sm'>
-              <span className='text-neutral-500 pr-2'>收件人:</span>
+              <span className='text-neutral-500 pr-2 w-12 inline-block text-justify' style={{textAlignLast: 'justify'}}>收件人</span>
               {mailData.info?.MAI_To}
             </div>
-            {mailData.info?.cc && (
+            {mailData.info?.MAI_CS && (
               <div className='text-sm'>
-                <span className='text-neutral-500 pr-2'>抄送:</span>
-                {mailData.info.cc}
+                <span className='text-neutral-500 pr-2 w-12 inline-block text-justify' style={{textAlignLast: 'justify'}}>抄送</span>
+                {mailData.info.MAI_CS}
               </div>
             )}
             {mailData.info?.bcc && (
               <div className='text-sm'>
-                <span className='text-neutral-500 pr-2'>密送:</span>
+                <span className='text-neutral-500 pr-2 w-12 inline-block text-justify' style={{textAlignLast: 'justify'}}>密送</span>
                 {mailData.info.bcc}
               </div>
             )}
diff --git a/src/views/Conversations/Online/Input/EmailEditorPopup.jsx b/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
index 294d07f..40df542 100644
--- a/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
+++ b/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
@@ -532,13 +532,13 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, oid,
               }
             /> */}
             </Form.Item>
-            <Form.Item label='抄送' name={'cc'} hidden={!showCc} className='w-full pt-1'>
+            <Form.Item label='抄&nbsp;&nbsp;&nbsp;&nbsp;送' name={'cc'} hidden={!showCc} className='w-full pt-1' >
               <Input />
             </Form.Item>
-            <Form.Item label='密送' name={'bcc'} hidden={!showBcc} className='w-full pt-1'>
+            <Form.Item label='密&nbsp;&nbsp;&nbsp;&nbsp;送' name={'bcc'} hidden={!showBcc} className='w-full pt-1'>
               <Input />
             </Form.Item>
-            <Form.Item label='主题' name={'subject'} rules={[{ required: true }]} className='w-full pt-1'>
+            <Form.Item label='主&nbsp;&nbsp;&nbsp;&nbsp;题' name={'subject'} rules={[{ required: true }]} className='w-full pt-1'>
               <Input />
             </Form.Item>
             <Form.Item name='atta' label='' className='w-full py-1 border-b-0' valuePropName='fileList' getValueFromEvent={normFile}>
diff --git a/src/views/Conversations/Online/MessagesWrapper.jsx b/src/views/Conversations/Online/MessagesWrapper.jsx
index 8edd7da..12c0ea7 100644
--- a/src/views/Conversations/Online/MessagesWrapper.jsx
+++ b/src/views/Conversations/Online/MessagesWrapper.jsx
@@ -267,7 +267,7 @@ const MessagesWrapper = ({ updateRead = true, forceGetMessages }) => {
         fromEmail={fromEmail}
         fromUser={Number(orderDetail?.opi_sn || userId)}
         fromOrder={currentConversation.coli_sn}
-        oid={orderDetail?.order_no}
+        oid={orderDetail?.order_no || ReferEmailMsg?.coli_id}
         customerDetail={customerDetail}
         quoteid={ReferEmailMsg.mai_sn || ReferEmailMsg.id}
         conversationid={currentConversation.sn}