diff --git a/app/Http/Controllers/Api/DialogController.php b/app/Http/Controllers/Api/DialogController.php index 9b572c9a2..4182303d1 100755 --- a/app/Http/Controllers/Api/DialogController.php +++ b/app/Http/Controllers/Api/DialogController.php @@ -616,13 +616,14 @@ class DialogController extends AbstractController $dialogUser->updated_at = Carbon::now(); $dialogUser->save(); // - $dialogUser->webSocketDialog->generateUnread($user->userid); + $dialogUser->webSocketDialog->generateUnread($user->userid, true); $data[] = [ 'id' => $dialogUser->webSocketDialog->id, 'unread' => $dialogUser->webSocketDialog->unread, 'mention' => $dialogUser->webSocketDialog->mention, + 'position_msgs' => $dialogUser->webSocketDialog->position_msgs, 'user_at' => Carbon::parse($dialogUser->updated_at)->toDateTimeString('millisecond'), - 'user_ms' => Carbon::parse($dialogUser->updated_at)->valueOf() + 'user_ms' => Carbon::parse($dialogUser->updated_at)->valueOf(), ]; } return Base::retSuccess('success', $data); diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index fad5403dc..fb0927a3e 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -136,10 +136,10 @@ -
+
- + {{positionMsg.label}}
@@ -694,6 +694,7 @@ export default { scrollTmp: 0, positionLoad: 0, + positionLoadMark: false, approveDetails:{id: 0}, approveDetailsShow: false, @@ -1036,6 +1037,7 @@ export default { watch: { dialogId: { handler(dialog_id, old_id) { + this.positionLoadMark = false; this.mountedNow = Date.now(); if (dialog_id) { this.msgNew = 0 @@ -2996,6 +2998,7 @@ export default { return; } // + this.positionLoadMark = true; this.positionLoad++ const {msg_id} = this.positionMsg; this.onPositionId(msg_id).finally(_ => { diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss index 41f7aa8ea..3a619de3e 100644 --- a/resources/assets/sass/pages/components/dialog-wrapper.scss +++ b/resources/assets/sass/pages/components/dialog-wrapper.scss @@ -1392,6 +1392,9 @@ height: 14px; font-size: 14px; line-height: 14px; + &.below{ + transform: rotate(-180deg); + } } } }