From e1524c26cdbcc585430fa59b7dde55c0f98b9e60 Mon Sep 17 00:00:00 2001
From: Allen <hotlcc@qq.com>
Date: Wed, 24 Apr 2024 10:06:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=A4=84=E7=90=86=E4=BD=8E?=
 =?UTF-8?q?=E7=89=88=E6=9C=ACsafari=E6=B5=8F=E8=A7=88=E5=99=A8Date?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=80=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/@core/utils/formatters.ts             |  3 ++-
 src/@core/utils/index.ts                  | 10 +++++++---
 src/components/cards/MediaCard.vue        |  4 ++--
 src/components/cards/SubscribeCard.vue    | 10 ++++------
 src/views/setting/AccountSettingAbout.vue |  4 ++--
 src/views/system/MessageView.vue          |  2 +-
 6 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/@core/utils/formatters.ts b/src/@core/utils/formatters.ts
index f7848206..ae696ba6 100644
--- a/src/@core/utils/formatters.ts
+++ b/src/@core/utils/formatters.ts
@@ -171,6 +171,7 @@ export function formatDateDifference(dateString: string): string {
   //   return `${minutesDifference}分钟前`
   // else
   //   return '刚刚'
-
+  if (!dateString)
+    return ''
   return dayjs(dateString).fromNow()
 }
diff --git a/src/@core/utils/index.ts b/src/@core/utils/index.ts
index e74b1717..2c97f674 100644
--- a/src/@core/utils/index.ts
+++ b/src/@core/utils/index.ts
@@ -33,12 +33,16 @@ export function isToday(date: Date) {
   )
 }
 
-// 计算时间差，返回xx天/xx小时/xx分钟/xx秒
+/**
+ * 计算时间差，返回xx天/xx小时/xx分钟/xx秒
+ *
+ * @deprecated 建议使用：@core/utils/formatters.ts formatDateDifference
+ */
 export function calculateTimeDifference(inputTime: string): string {
   if (!inputTime)
     return ''
 
-  const inputDate = new Date(inputTime)
+  const inputDate = new Date(inputTime.replaceAll(/-/g, '/'))
   const currentDate = new Date()
 
   const timeDifference = currentDate.getTime() - inputDate.getTime()
@@ -70,7 +74,7 @@ export function calculateTimeDiff(inputTime: string): string {
     return ''
 
   // 使用当前时区
-  const inputDate = new Date(inputTime)
+  const inputDate = new Date(inputTime.replaceAll(/-/g, '/'))
   const currentDate = new Date()
 
   const timeDifference = currentDate.getTime() - inputDate.getTime()
diff --git a/src/components/cards/MediaCard.vue b/src/components/cards/MediaCard.vue
index 37e8f295..663eefdc 100644
--- a/src/components/cards/MediaCard.vue
+++ b/src/components/cards/MediaCard.vue
@@ -423,14 +423,14 @@ function getSeasonPoster(posterPath: string) {
 function formatAirDate(airDate: string) {
   if (!airDate)
     return ''
-  const date = new Date(airDate)
+  const date = new Date(airDate.replaceAll(/-/g, '/'))
   return `${date.getFullYear()}年${date.getMonth() + 1}月${date.getDate()}日`
 }
 // 从yyyy-mm-dd中提取年份
 function getYear(airDate: string) {
   if (!airDate)
     return ''
-  const date = new Date(airDate)
+  const date = new Date(airDate.replaceAll(/-/g, '/'))
   return date.getFullYear()
 }
 </script>
diff --git a/src/components/cards/SubscribeCard.vue b/src/components/cards/SubscribeCard.vue
index 9c6932a1..e37e345c 100644
--- a/src/components/cards/SubscribeCard.vue
+++ b/src/components/cards/SubscribeCard.vue
@@ -1,7 +1,7 @@
 <script lang='ts' setup>
 import { useToast } from 'vue-toast-notification'
 import SubscribeEditDialog from '../dialog/SubscribeEditDialog.vue'
-import { calculateTimeDifference } from '@/@core/utils'
+import { formatDateDifference } from '@/@core/utils/formatters'
 import { formatSeason } from '@/@core/utils/formatters'
 import api from '@/api'
 import type { Subscribe } from '@/api/types'
@@ -26,11 +26,9 @@ const subscribeEditDialog = ref(false)
 
 // 上一次更新时间
 const lastUpdateText = ref(
-  `${
-    props.media?.last_update
-      ? `${calculateTimeDifference(props.media?.last_update || '')}前`
-      : ''
-  }`,
+    props.media && props.media.last_update
+    ? formatDateDifference(props.media.last_update)
+    : '',
 )
 
 // 图片加载完成响应
diff --git a/src/views/setting/AccountSettingAbout.vue b/src/views/setting/AccountSettingAbout.vue
index 63c309de..79e161f3 100644
--- a/src/views/setting/AccountSettingAbout.vue
+++ b/src/views/setting/AccountSettingAbout.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { calculateTimeDifference } from '@/@core/utils'
+import { formatDateDifference } from '@/@core/utils/formatters'
 import api from '@/api'
 
 // 系统环境变量
@@ -62,7 +62,7 @@ async function queryAllRelease() {
 // 计算发布时间
 function releaseTime(releaseDate: string) {
   // 上一次更新时间
-  return `${calculateTimeDifference(releaseDate)}前`
+  return formatDateDifference(releaseDate)
 }
 
 onMounted(() => {
diff --git a/src/views/system/MessageView.vue b/src/views/system/MessageView.vue
index 79dacb6d..17827534 100644
--- a/src/views/system/MessageView.vue
+++ b/src/views/system/MessageView.vue
@@ -100,7 +100,7 @@ function compareTime(time1: string, time2: string) {
     return -1
   if (!time2)
     return 1
-  return new Date(time1).getTime() - new Date(time2).getTime()
+  return new Date(time1.replaceAll(/-/g, '/')).getTime() - new Date(time2.replaceAll(/-/g, '/')).getTime()
 }
 
 onBeforeUnmount(() => {