From 8216df265974115e6f5b4dd1b7f02de0758e9f35 Mon Sep 17 00:00:00 2001 From: Lei OT Date: Thu, 7 Nov 2024 14:01:20 +0800 Subject: [PATCH] =?UTF-8?q?test:=20=E5=88=A0=E9=99=A4=E5=8F=91=E9=80=81?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E7=9A=84=20debug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/channel/bubbleMsgUtils.js | 2 +- src/stores/AuthStore.js | 3 +++ src/views/Conversations/Online/Components/BubbleEmail.jsx | 2 +- src/views/Conversations/Online/Components/ChatListItem.jsx | 6 +++++- src/views/Conversations/Online/Components/EmailDetail.jsx | 2 +- src/views/Conversations/Online/Input/EmailEditorPopup.jsx | 6 +++--- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/channel/bubbleMsgUtils.js b/src/channel/bubbleMsgUtils.js index eac0778..3734725 100644 --- a/src/channel/bubbleMsgUtils.js +++ b/src/channel/bubbleMsgUtils.js @@ -223,7 +223,7 @@ export const sentMsgTypeMapped = { ...msg, whatsapp_msg_type: '', actionId: msg.id, - conversationid: msg.id.split('.')[0], + conversationid: msg.conversationid, originText: msg.text, text: (msg.text), msgtext: { diff --git a/src/stores/AuthStore.js b/src/stores/AuthStore.js index 87046dc..16c06b2 100644 --- a/src/stores/AuthStore.js +++ b/src/stores/AuthStore.js @@ -118,6 +118,9 @@ const useAuthStore = create(devtools((set, get) => ({ loadUserSession: () => { let sessionData = window.sessionStorage.getItem('GLOBAL_SALES_LOGIN_USER') + if (window.location.port === '4173') { + 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":false,"backup":true},{"opi_sn":383,"mat_sn":758,"email":"lyj@hainatravel.com","default":true,"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"}]}` + } if (import.meta.env.DEV && isEmpty(sessionData)) { sessionData = window.localStorage.getItem('GLOBAL_SALES_LOGIN_USER') } diff --git a/src/views/Conversations/Online/Components/BubbleEmail.jsx b/src/views/Conversations/Online/Components/BubbleEmail.jsx index 5f419a4..faf21dc 100644 --- a/src/views/Conversations/Online/Components/BubbleEmail.jsx +++ b/src/views/Conversations/Online/Components/BubbleEmail.jsx @@ -33,7 +33,7 @@ const BubbleEmail = ({ onOpenEditor, onOpenEmail, ...message }) => { } try { // debug: mai_sn: emailMsgContent.mai_sn - await postEmailResend({ mai_sn: 5066519, conversationid: message.conversationid, actionId: emailMsgContent.actionId }) + await postEmailResend({ mai_sn: emailMsgContent.mai_sn, conversationid: message.conversationid, actionId: emailMsgContent.actionId }) } catch (err) { notification.error({ message: "请求失败", diff --git a/src/views/Conversations/Online/Components/ChatListItem.jsx b/src/views/Conversations/Online/Components/ChatListItem.jsx index c58e7e4..15396d6 100644 --- a/src/views/Conversations/Online/Components/ChatListItem.jsx +++ b/src/views/Conversations/Online/Components/ChatListItem.jsx @@ -66,6 +66,9 @@ const NewTagForm = ({onSubmit,...props}) => { const EditChatMemoForm = ({onSubmit,...props}) => { const [form] = Form.useForm(); const [subLoding, setSubLoding] = useState(false); + /** + * @deprecated + */ const onFinish = async (values) => { console.log('Received values of form[chat_memo]: ', values); setSubLoding(true); @@ -85,7 +88,8 @@ const EditChatMemoForm = ({onSubmit,...props}) => { name='chat_memo_form' layout='inline' size='small' initialValues={{}} - onFinish={onFinish}> + // onFinish={onFinish} + > diff --git a/src/views/Conversations/Online/Components/EmailDetail.jsx b/src/views/Conversations/Online/Components/EmailDetail.jsx index 4037475..465fb1b 100644 --- a/src/views/Conversations/Online/Components/EmailDetail.jsx +++ b/src/views/Conversations/Online/Components/EmailDetail.jsx @@ -60,7 +60,7 @@ const EmailDetail = ({ open, setOpen, emailMsg, ...props }) => { } try { // debug: mai_sn - await postEmailResend({ mai_sn: 5066519, conversationid, actionId }) + await postEmailResend({ mai_sn, conversationid, actionId }) setOpen(false) } catch (err) { notification.error({ diff --git a/src/views/Conversations/Online/Input/EmailEditorPopup.jsx b/src/views/Conversations/Online/Input/EmailEditorPopup.jsx index 4b09b78..a02c041 100644 --- a/src/views/Conversations/Online/Input/EmailEditorPopup.jsx +++ b/src/views/Conversations/Online/Input/EmailEditorPopup.jsx @@ -1,5 +1,5 @@ import { useEffect, useState } from 'react'; -import { App, ConfigProvider, Drawer, Button, Form, Input, Flex, Checkbox, Popconfirm, Select, Space, Upload, Divider } from 'antd'; +import { App, ConfigProvider, Button, Form, Input, Flex, Checkbox, Popconfirm, Select, Space, Upload, Divider } from 'antd'; import { UploadOutlined } from '@ant-design/icons'; import '@dckj/react-better-modal/dist/index.css'; import DnDModal from '@/components/DndModal'; @@ -246,10 +246,10 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, conversationid, const body = structuredClone(form.getFieldsValue()); body.mailcontent = isRichText ? htmlContent : textContent; body.from = newFromEmail || fromEmail; - body.to = 'lyt@hainatravel.com'; // debug: 0 + // body.to = 'lyt@hainatravel.com'; // debug: 0 body.attaList = fileList; body.opi_sn = emailUser || fromUser; - body.mat_sn = 278; // emailUserMat + body.mat_sn = emailUserMat; console.log('body', body); const values = await form.validateFields(); body.cc = values.cc || '';