diff --git a/app/Models/WebSocketDialog.php b/app/Models/WebSocketDialog.php index 164d9cfdb..6d87ea97f 100644 --- a/app/Models/WebSocketDialog.php +++ b/app/Models/WebSocketDialog.php @@ -79,12 +79,14 @@ class WebSocketDialog extends AbstractModel $unreadBuilder = WebSocketDialogMsgRead::whereDialogId($this->id)->whereUserid($userid)->whereReadAt(null); $this->unread = $unreadBuilder->count(); $this->mention = 0; - $this->first_umid = 0; // 第一条未读消息 $this->last_umid = 0; + $this->first_umid = 0; // 第一条未读消息 if ($this->unread > 0) { $this->mention = $unreadBuilder->clone()->whereMention(1)->count(); - $this->first_umid = intval($unreadBuilder->clone()->orderBy('msg_id')->value('msg_id')); $this->last_umid = intval($unreadBuilder->clone()->orderByDesc('msg_id')->value('msg_id')); + if ($hasData === true) { + $this->first_umid = intval($unreadBuilder->clone()->orderBy('msg_id')->value('msg_id')); + } } $this->mark_unread = $this->mark_unread ?? $dialogUserFun('mark_unread'); // 是否免打扰 diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index 09945f778..5a7b80fbd 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -1064,7 +1064,7 @@ export default { getMsgs(data) { return new Promise((resolve, reject) => { - setTimeout(_ => this.msgLoadIng++, 600) + setTimeout(_ => this.msgLoadIng++, 2000) this.$store.dispatch("getDialogMsgs", data) .then(resolve) .catch(reject)