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

src/stores/AuthStore.js

@@ -118,7 +118,7 @@ const useAuthStore = create(devtools((set, get) => ({
   loadUserSession: () => {
     let sessionData = window.sessionStorage.getItem('GLOBAL_SALES_LOGIN_USER')
 
-    if (window.location.port === '4173' && isEmpty(sessionData)) {
+    if (window.location.hostname === '202.103.68.93' && window.location.port === '4173' && isEmpty(sessionData)) {
       sessionData = `{"userId":"383","userIdStr":"383,609","emailList":[{"opi_sn":383,"mat_sn":760,"email":"lyj@asiahighlights.com","default":false,"backup":false},{"opi_sn":383,"mat_sn":759,"email":"lyj@chinahighlights.com","default":true,"backup":false},{"opi_sn":383,"mat_sn":758,"email":"lyj@hainatravel.com","default":false,"backup":false}],"username":"廖一军","avatarUrl":"https://static-legacy.dingtalk.com/media/lALPBDDrhXr716HNAoDNAoA_640_640.png","mobile":"+86-18777396951","email":"lyj@hainatravel.com","whatsAppBusiness":"8617458471254","openId":"iioljiPmZ4RPoOYpkFiSn7IKAiEiE","accountList":[{"OPI_SN":383,"OPI_Code":"LYJ","OPI_NameCN":"廖一军","OPI_DEI_SN":7,"OPI_NameEN":"Jimmy Liow"},{"OPI_SN":609,"OPI_Code":"LYJAH","OPI_NameCN":"廖一军（ah）","OPI_DEI_SN":28,"OPI_NameEN":"Jimmy Liow"}]}`
 
       window.sessionStorage.setItem('GLOBAL_SALES_LOGIN_USER', sessionData)

src/views/Conversations/Online/Components/EmailDetail.jsx

@@ -77,9 +77,9 @@ const EmailDetail = ({ open, setOpen, emailMsg, ...props }) => {
    * * 已发送: 回复, 转发
    * * 失败: 重发
    */
-  const ActionBtns = (props) => {
+  const ActionBtns = ({className, ...props}) => {
     // const { status } = mailData.info // todo: 1 需要后端返回`状态` [accepted, sent, failed]
-    const { status } = { status: 'failed' } // debug: 0
+    const { status } = { status: '' } // debug: 0
 
     let btns = []
     switch (status) {
@@ -114,7 +114,7 @@ const EmailDetail = ({ open, setOpen, emailMsg, ...props }) => {
     }
 
     return (
-      <div className={`flex items-center w-full ${props.className || ''}`}>
+      <div className={`flex items-center w-full ${className || ''}`}>
         {btns}
       </div>
     )
@@ -128,7 +128,7 @@ const EmailDetail = ({ open, setOpen, emailMsg, ...props }) => {
         title={
           <>
             {loading ? <LoadingOutlined className='mr-1' /> : null}
-            {mailData.info?.subject || emailMsg?.msgOrigin?.email?.subject}
+            {mailData.info?.MAI_Subject || emailMsg?.msgOrigin?.email?.subject}
           </>
         }
         initial={{ top: 74 }}
@@ -136,7 +136,7 @@ const EmailDetail = ({ open, setOpen, emailMsg, ...props }) => {
         onResize={onHandleResize}
         footer={mobile ? <ActionBtns className='w-full' /> : null}>
         <div className='email-container flex flex-col gap-2 *:p-2 *:rounded-sm *:border-b *:border-gray-200 *:shadow-1md'>
-          <div className=' font-bold'>{mailData.info?.subject || emailMsg?.msgOrigin?.subject}</div>
+          <div className=' font-bold'>{mailData.info?.MAI_Subject || emailMsg?.msgOrigin?.subject}</div>
 
           <div>
             <div className={['flex justify-between', window.innerWidth < 600 ? 'flex-row' : 'flex-row'].join(' ')}>