From 11584d3ee2616ad30084bab6ef1789623414650b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com> Date: Wed, 21 Aug 2024 22:20:10 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8Ddayjs=E6=97=B6=E9=97=B4=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/formatTime.ts | 4 ++-- .../mall/promotion/kefu/components/KeFuConversationList.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/utils/formatTime.ts b/src/utils/formatTime.ts index a13cfd6b0..ded65fe6d 100644 --- a/src/utils/formatTime.ts +++ b/src/utils/formatTime.ts @@ -66,10 +66,10 @@ export const defaultShortcuts = [ export function formatDate(date: Date, format?: string): string { // 日期不存在,则返回空 if (!date) { - return '' + return ''; } // 日期存在,则进行格式化 - return date ? dayjs(date).format((format?.includes("YYYY-mm-dd") ? format.replace("YYYY-mm-dd", "YYYY-MM-DD") : format) ?? 'YYYY-MM-DD HH:mm:ss') : '' + return date ? dayjs(date).format(format ?? 'YYYY-MM-DD HH:mm:ss') : ''; } /** diff --git a/src/views/mall/promotion/kefu/components/KeFuConversationList.vue b/src/views/mall/promotion/kefu/components/KeFuConversationList.vue index 0a8ba1eab..0ff3d422a 100644 --- a/src/views/mall/promotion/kefu/components/KeFuConversationList.vue +++ b/src/views/mall/promotion/kefu/components/KeFuConversationList.vue @@ -23,7 +23,7 @@