From 3caa2f1ed8657acb4d6180c36c9f023ed40ad93e Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Mon, 11 Nov 2024 10:36:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E9=82=AE=E7=AE=B1?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=9B=E7=BC=96=E8=BE=91=E4=BC=9A=E8=AF=9D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AE=A2=E4=BA=BA=E9=82=AE=E7=AE=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- src/views/Conversations/Online/ConversationsNewItem.jsx | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 19c1a0d..4f8c0e3 100644 --- a/README.md +++ b/README.md @@ -39,4 +39,4 @@ npm version patch --no-git-tag-version ## 本机测试账号 GLOBAL_SALES_LOGIN_USER -{"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"}]} +{"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":false},{"opi_sn":383,"mat_sn":758,"email":"lyj@hainatravel.com","default":false,"backup":false},{"opi_sn":383,"mat_sn":761,"email":"lyj@chinahighlights.net","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"}]} diff --git a/src/views/Conversations/Online/ConversationsNewItem.jsx b/src/views/Conversations/Online/ConversationsNewItem.jsx index b56a655..2b9acde 100644 --- a/src/views/Conversations/Online/ConversationsNewItem.jsx +++ b/src/views/Conversations/Online/ConversationsNewItem.jsx @@ -91,12 +91,15 @@ export const ConversationItemFormModal = ({ open, onCreate, onCancel, initialVal const [initialValues, setInitialValues] = useState({}); useEffect(() => { + console.info('_initialValues: %o', _initialValues) setInitialValues({ ..._initialValues, phone_number: _initialValues?.whatsapp_phone_number || _initialValues?.phone_number || '', wa_id: _initialValues?.whatsapp_phone_number || _initialValues?.wa_id || '', name: _initialValues?.whatsapp_name || _initialValues?.name || '', remark: _initialValues?.conversation_memo || '', + // TODO: 这里应该从哪里获取？ + email: _initialValues?.channels?.email || '', is_new: _initialValues?.is_new ?? true, });