From 821df75d4b89d991195478e1f967d9632781e8d9 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Thu, 13 Feb 2025 21:18:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=92=A4=E5=9B=9E=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=98=AF=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8=E4=B8=8D=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/js/store/actions.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js index 2cae109a6..69ec72ff9 100644 --- a/resources/assets/js/store/actions.js +++ b/resources/assets/js/store/actions.js @@ -2631,6 +2631,11 @@ export default { } else if ($A.isJson(data)) { data.id = parseInt(data.id) const index = state.cacheDialogs.findIndex(({id}) => id == data.id); + let lastForce = false + if (typeof data.last_force !== "undefined") { + lastForce = true + delete data.last_force + } if (index > -1) { const original = state.cacheDialogs[index] const nowTime = data.user_ms @@ -2651,7 +2656,8 @@ export default { return !state.dialogMsgs.find(m => m.id == id)?.read_at }) } - if (data.last_at + if (!lastForce + && data.last_at && original.last_at && $A.dayjs(data.last_at) < $A.dayjs(original.last_at)) { delete data.last_at @@ -3898,6 +3904,7 @@ export default { id: dialog_id, last_msg: data.last_msg, last_at: data.last_msg ? data.last_msg.created_at : $A.daytz().format("YYYY-MM-DD HH:mm:ss"), + last_force: true, } if (data.update_read) { // 更新未读数量