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

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

@@ -84,7 +84,7 @@ const EmailDetail = ({ open, setOpen, emailMsg={}, ...props }) => {
           绑定订单
         </Button>
       );
-      btns.push(<Divider type='vertical' />);
+      btns.push(<Divider type='vertical' key={'divider'} />);
     }
 
     switch (status) {

src/views/Conversations/Online/Input/EmailComposer.jsx

@@ -184,10 +184,10 @@ const EmailComposer = ({ ...props }) => {
         onFinishFailed={console.log}
         className=''
       >
-        <Form.Item name='from' className='hidden'></Form.Item>
+        {/* <Form.Item name='from' className='hidden'></Form.Item>
         <Form.Item name='to' className='hidden'></Form.Item>
         <Form.Item name='cc' className='hidden'></Form.Item>
-        <Form.Item name='bcc' className='hidden'></Form.Item>
+        <Form.Item name='bcc' className='hidden'></Form.Item> */}
         <Form.Item name='subject' className='w-full' rules={[{ required: true, message: '' }]}>
           <Input tabIndex={1}
             className='rounded-b-none border-b-0 font-bold text-base text-indigo-600'
@@ -241,7 +241,7 @@ const EmailComposer = ({ ...props }) => {
             }}
             // variant={'borderless'}
           />
-          <Button icon={<SendOutlined />} type='primary' htmlType={'submit'} disabled={!talkabled} loading={sendLoading} _onClick={() => handleSendEmail()} tabIndex={3}>
+          <Button icon={<SendOutlined />} type='primary' htmlType={'submit'} disabled={!talkabled} loading={sendLoading} tabIndex={3}>
             发送
           </Button>
           {/* <Button icon={<EditIcon />} type='primary' onClick={() => openEditor(pickEmail.key)}>

src/views/Conversations/Online/MessagesWrapper.jsx

@@ -62,8 +62,8 @@ const MessagesWrapper = ({ updateRead = true, forceGetMessages }) => {
   useEffect(() => {
     if (updateRead === true && isVisible && currentConversation.opi_sn && activeMessages.length > 0) {
       fetchCleanUnreadMsgCount({ opisn: currentConversation.opi_sn, conversationid: currentConversation.sn });
-      refreshTotalNotify();
       updateCurrentConversation({ unread_msg_count: 0 });
+      refreshTotalNotify();
     }
     return () => {};
   }, [activeMessages.length, isVisible]);

vite.config.js

@@ -25,7 +25,7 @@ const manifestForPWAPlugIn = {
     navigateFallbackDenylist: [/^\/maintenance/],
     globPatterns: ['**/*.{json,css,js,html,ico,png,svg,woff2}'],
     globIgnores: ['**/maintenance.html', '**/maintenance/*'],
-    maximumFileSizeToCacheInBytes: 3000000,
+    maximumFileSizeToCacheInBytes: 30000000,
     clientsClaim: true,
     // skipWaiting: true,
     runtimeCaching: [