github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-02-23 09:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
Pang 2024-03-10 22:13:21 +08:00
parent 28717fd0c7
commit 5f0a0e0371
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/WebSocketDialog.php
View File

@ -155,7 +155,7 @@ class WebSocketDialog extends AbstractModel
if (isset($this->search_msg_id)) { if (isset($this->search_msg_id)) {
// 最后消息 (搜索预览消息) // 最后消息 (搜索预览消息)
$this->last_msg = WebSocketDialogMsg::whereDialogId($this->id)->find($this->search_msg_id); $this->last_msg = WebSocketDialogMsg::whereDialogId($this->id)->find($this->search_msg_id);
$this->last_at = $this->last_msg?->created_at; $this->last_at = $this->last_msg ? Carbon::parse($this->last_msg->created_at)->format('Y-m-d H:i:s') : null;
} else { } else {
// 未读信息 // 未读信息
if (Base::judgeClientVersion("0.34.0")) { if (Base::judgeClientVersion("0.34.0")) {

5
resources/assets/js/functions/web.js vendored
View File

@ -102,8 +102,7 @@ import {MarkdownPreview} from "../store/markdown";
*/ */
formatTime(date) { formatTime(date) {
let now = $A.Time(), let now = $A.Time(),
time = $A.Date(date, true), time = $A.Date(date, true);
string = '';
if ($A.formatDate('Ymd', now) === $A.formatDate('Ymd', time)) { if ($A.formatDate('Ymd', now) === $A.formatDate('Ymd', time)) {
return $A.formatDate('H:i', time) return $A.formatDate('H:i', time)
} }
@ -113,7 +112,7 @@ import {MarkdownPreview} from "../store/markdown";
if ($A.formatDate('Y', now) === $A.formatDate('Y', time)) { if ($A.formatDate('Y', now) === $A.formatDate('Y', time)) {
return $A.formatDate('m-d', time) return $A.formatDate('m-d', time)
} }
return $A.formatDate('Y-m-d', time); return $A.formatDate('Y-m-d', time) || '';
}, },
/** /**