diff --git a/app/Tasks/WebSocketDialogMsgTask.php b/app/Tasks/WebSocketDialogMsgTask.php index 622734932..d4d5b81f6 100644 --- a/app/Tasks/WebSocketDialogMsgTask.php +++ b/app/Tasks/WebSocketDialogMsgTask.php @@ -86,8 +86,12 @@ class WebSocketDialogMsgTask extends AbstractTask if (empty($dialog)) { return; } - $updateds = $dialog->dialogUser->pluck('updated_at', 'userid')->toArray(); - $silences = $dialog->dialogUser->pluck('silence', 'userid')->toArray(); + $updateds = []; + $silences = []; + foreach ($dialog->dialogUser as $dialogUser) { + $updateds[$dialogUser->userid] = $dialogUser->updated_at; + $silences[$dialogUser->userid] = $dialogUser->silence; + } $userids = array_keys($silences); // 提及会员 diff --git a/resources/assets/js/pages/manage/components/CheckinCalendar.vue b/resources/assets/js/pages/manage/components/CheckinCalendar.vue index 0bda4d887..1736b4351 100644 --- a/resources/assets/js/pages/manage/components/CheckinCalendar.vue +++ b/resources/assets/js/pages/manage/components/CheckinCalendar.vue @@ -31,7 +31,7 @@
{{data.day}}
{{$L('已签到')}}
- {{$L('尚未签到')}} +
{{$L('尚未签到')}}
@@ -250,6 +250,13 @@ export default { justify-content: center; flex-direction: column; line-height: 20px; + > div { + max-width: 100%; + padding: 0 4px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } } &:last-child { border-right: 0; @@ -278,9 +285,6 @@ export default { .ui-state-down, .ui-state-default { font-size: 12px; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; } }