From 1d5cf81d9e7d36ea8f413f7b6c9b7e053529dd53 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Tue, 7 Feb 2023 02:30:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=BB=E5=8A=A1=E9=A6=96=E6=AC=A1?= =?UTF-8?q?=E5=8F=91=E6=B6=88=E6=81=AF=E6=B6=88=E5=A4=B1=E7=9A=84=E6=83=85?= =?UTF-8?q?=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/DialogController.php | 1 + resources/assets/js/store/actions.js | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Api/DialogController.php b/app/Http/Controllers/Api/DialogController.php index 82d7ddfb4..57ca54dba 100755 --- a/app/Http/Controllers/Api/DialogController.php +++ b/app/Http/Controllers/Api/DialogController.php @@ -459,6 +459,7 @@ class DialogController extends AbstractController ->value('id')); } $data['list'] = $list; + $data['time'] = Base::time(); // 记录当前打开的任务对话 if ($dialog->type == 'group' && $dialog->group_type == 'task') { $user->task_dialog_id = $dialog->id; diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js index 2b48387d1..142cb761c 100644 --- a/resources/assets/js/store/actions.js +++ b/resources/assets/js/store/actions.js @@ -2483,7 +2483,6 @@ export default { $A.IDBSave("dialogMsgs", state.dialogMsgs, 600) } // - const callTime = $A.Time(); dispatch("call", { url: 'dialog/msg/list', data, @@ -2496,7 +2495,9 @@ export default { dispatch("saveDialog", resData.dialog); // const ids = resData.list.map(({id}) => id) - state.dialogMsgs = state.dialogMsgs.filter(item => item.dialog_id != data.dialog_id || ids.includes(item.id) || $A.Time(item.created_at) >= callTime); + state.dialogMsgs = state.dialogMsgs.filter(item => { + return item.dialog_id != data.dialog_id || ids.includes(item.id) || $A.Time(item.created_at) >= resData.time + }); $A.IDBSave("dialogMsgs", state.dialogMsgs, 600) } if ($A.isArray(resData.todo)) {