From 16af625aefdc9c45de99ab8bb9ff44c7a1956e52 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Thu, 3 Mar 2022 14:35:21 +0800 Subject: [PATCH] no msg --- resources/assets/js/functions/web.js | 4 ++-- resources/assets/js/pages/manage/components/TaskAdd.vue | 2 +- resources/assets/js/pages/manage/components/TaskRow.vue | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/assets/js/functions/web.js b/resources/assets/js/functions/web.js index ae01631c..a204f7b6 100755 --- a/resources/assets/js/functions/web.js +++ b/resources/assets/js/functions/web.js @@ -102,7 +102,7 @@ * @returns {*|string} */ formatTime(date) { - let time = Math.round($A.Date(date).getTime() / 1000), + let time = $A.Date(date, true), string = ''; if ($A.formatDate('Ymd') === $A.formatDate('Ymd', time)) { string = $A.formatDate('H:i', time) @@ -160,7 +160,7 @@ } else if (time < 0) { return '-' + this.formatSeconds(time * -1); } else if (time == 0) { - return 0; + return 0 + 's'; } return this.formatTime(date) }, diff --git a/resources/assets/js/pages/manage/components/TaskAdd.vue b/resources/assets/js/pages/manage/components/TaskAdd.vue index 4fbdca55..f2092fdb 100644 --- a/resources/assets/js/pages/manage/components/TaskAdd.vue +++ b/resources/assets/js/pages/manage/components/TaskAdd.vue @@ -238,7 +238,7 @@ export default { const {times} = this.addData; let temp = $A.date2string(times, "Y-m-d H:i"); if (temp[0] && temp[1]) { - let d = Math.ceil(($A.Date(temp[1]).getTime() - $A.Date(temp[0]).getTime()) / 86400000); + let d = Math.ceil(($A.Date(temp[1], true) - $A.Date(temp[0], true)) / 86400); if (d > 0) { return d; } diff --git a/resources/assets/js/pages/manage/components/TaskRow.vue b/resources/assets/js/pages/manage/components/TaskRow.vue index ad86843b..fe2b0a99 100644 --- a/resources/assets/js/pages/manage/components/TaskRow.vue +++ b/resources/assets/js/pages/manage/components/TaskRow.vue @@ -266,7 +266,7 @@ export default { }, completeAtFormat(date) { - let time = Math.round($A.Date(date).getTime() / 1000); + let time = $A.Date(date, true); if ($A.formatDate('Y') === $A.formatDate('Y', time)) { return $A.formatDate('m-d H:i', time) } else {