From 6be3d9c05eaf77d4df18ba2d8186807229fc8a4d Mon Sep 17 00:00:00 2001 From: Lei OT Date: Fri, 24 May 2024 17:07:56 +0800 Subject: [PATCH] =?UTF-8?q?test:=20=E9=A1=B5=E9=9D=A2=E4=B8=8D=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=BC=9A=E8=AF=9D=E8=BF=87=E6=9C=9F=E6=97=B6=E9=97=B4?= =?UTF-8?q?,=20=E6=97=A5=E5=BF=97=E6=9F=A5=E7=9C=8B=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/channel/whatsappUtils.js | 2 +- src/views/Conversations/Online/InputComposer.jsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/channel/whatsappUtils.js b/src/channel/whatsappUtils.js index 68a6480..ce594ed 100644 --- a/src/channel/whatsappUtils.js +++ b/src/channel/whatsappUtils.js @@ -609,7 +609,7 @@ export const whatsappError = { 'INVALID_PHONE_NUMBER': '无效号码, 请修正号码后尝试发送', '100': '参数错误, 请联系技术组', '131026': '[131026] 消息无法投递(未同意WhatsApp 的隐私政策).\n请使用邮件联系', - '131047': '[131047] 会话未激活. \n请使用模板消息发送', + '131047': '[131047] 会话未激活. \n请使用模板消息💬发送', '131053': '[131053] 文件上传失败.', '131048': '[131048] 账户被风控.', // 消息发送太多, 达到垃圾数量限制 '131031': '[131031] 账户已锁定.', diff --git a/src/views/Conversations/Online/InputComposer.jsx b/src/views/Conversations/Online/InputComposer.jsx index fb03e53..c17332d 100644 --- a/src/views/Conversations/Online/InputComposer.jsx +++ b/src/views/Conversations/Online/InputComposer.jsx @@ -42,7 +42,7 @@ const InputComposer = ({ mobile }) => { const gt24h = !isEmpty(currentConversation.last_received_time) ? dayjs().diff(dayjs(currentConversation.last_received_time), 'hour') > 24 : true; const lt24h = !isEmpty(currentConversation.last_received_time) ? dayjs().diff(dayjs(currentConversation.last_received_time), 'hour') <= 24 : false; // lt24h || !isExpired - const textabled = talkabled && (lt24h || !isExpired); // 只要有一个时间没过期, 目前未知明确规则 + const textabled = talkabled; // && (lt24h || !isExpired); // 只要有一个时间没过期, 目前未知明确规则 // debug: 日志 console.group('InputComposer textabled'); console.log('c_sn, websocketOpened, lt24h, isExpired, textabled', currentConversation.sn, websocketOpened, lt24h, isExpired, textabled); @@ -269,7 +269,7 @@ const InputComposer = ({ mobile }) => { showCount={textabled} placeholder={ !textabled - ? '会话已过期. 请发送打招呼消息激活对话💬.' + ? '请先选择会话' : mobile === undefined ? 'Enter 发送, Shift+Enter 换行\n支持复制粘贴 [截图/文件] 以备发送' : 'Enter 换行, 点击 Send 发送'