From 8e72794c076bcc643eb28ac55fce97632f677161 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 3 Mar 2022 14:35:12 +0800
Subject: [PATCH] =?UTF-8?q?pref:=20=E4=BB=BB=E5=8A=A1=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=BD=93=E4=BB=BB=E5=8A=A1=E5=80=92=E8=AE=A1=E6=97=B6=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E6=97=B6=E6=98=BE=E7=A4=BA"=E8=B6=85=E6=9C=9F?=
 =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90"=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/pages/manage/components/TaskDetail.vue | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue
index 50cc00ef..e18ba2e6 100644
--- a/resources/assets/js/pages/manage/components/TaskDetail.vue
+++ b/resources/assets/js/pages/manage/components/TaskDetail.vue
@@ -261,7 +261,7 @@
                                         <div @click="openTime" class="time">{{taskDetail.end_at ? cutTime : '--'}}</div>
                                         <template v-if="!taskDetail.complete_at && taskDetail.end_at">
                                             <Tag v-if="within24Hours(taskDetail.end_at)" color="blue"><i class="taskfont">&#xe71d;</i>{{expiresFormat(taskDetail.end_at)}}</Tag>
-                                            <Tag v-if="taskDetail.overdue" color="red">{{$L('超期未完成')}}</Tag>
+                                            <Tag v-if="isOverdue(taskDetail)" color="red">{{$L('超期未完成')}}</Tag>
                                         </template>
                                     </div>
                                 </DatePicker>
@@ -616,8 +616,8 @@ export default {
 
         cutTime() {
             const {taskDetail} = this;
-            let start_at = Math.round($A.Date(taskDetail.start_at).getTime() / 1000);
-            let end_at = Math.round($A.Date(taskDetail.end_at).getTime() / 1000);
+            let start_at = $A.Date(taskDetail.start_at, true);
+            let end_at = $A.Date(taskDetail.end_at, true);
             let string = "";
             if ($A.formatDate('Y/m/d', start_at) == $A.formatDate('Y/m/d', end_at)) {
                 string = $A.formatDate('Y/m/d H:i', start_at) + " ~ " + $A.formatDate('H:i', end_at)
@@ -725,22 +725,25 @@ export default {
     },
 
     methods: {
-        initLanguage() {
-
-        },
-
         innerHeightListener() {
             this.innerHeight = Math.min(1100, window.innerHeight);
         },
 
         within24Hours(date) {
-            return Math.round($A.Date(date).getTime() / 1000) - this.nowTime < 86400
+            return $A.Date(date, true) - this.nowTime < 86400
         },
 
         expiresFormat(date) {
             return $A.countDownFormat(date, this.nowTime)
         },
 
+        isOverdue(taskDetail) {
+            if (taskDetail.overdue) {
+                return true;
+            }
+            return $A.Date(taskDetail.end_at, true) < this.nowTime;
+        },
+
         onNameKeydown(e) {
             if (e.keyCode === 83) {
                 if (e.metaKey || e.ctrlKey) {