|
@@ -127,6 +127,7 @@ import BaseBadge from '@/components/BaseBadge.vue'
|
|
|
import BaseEmpty from '@/components/BaseEmpty.vue'
|
|
import BaseEmpty from '@/components/BaseEmpty.vue'
|
|
|
import BaseLoading from '@/components/BaseLoading.vue'
|
|
import BaseLoading from '@/components/BaseLoading.vue'
|
|
|
import { getTodayTasks, completeTask as completeTaskApi, getChildren, switchBackToParent, verifyPassword } from '../../utils/api.js'
|
|
import { getTodayTasks, completeTask as completeTaskApi, getChildren, switchBackToParent, verifyPassword } from '../../utils/api.js'
|
|
|
|
|
+import { parseDate } from '../../utils/format.js'
|
|
|
|
|
|
|
|
export default {
|
|
export default {
|
|
|
components: { PlayfulButton, BaseBadge, BaseEmpty, BaseLoading },
|
|
components: { PlayfulButton, BaseBadge, BaseEmpty, BaseLoading },
|
|
@@ -292,7 +293,8 @@ export default {
|
|
|
getTimeLeft(task) {
|
|
getTimeLeft(task) {
|
|
|
var deadline, now, diff, hours, minutes, days
|
|
var deadline, now, diff, hours, minutes, days
|
|
|
if (!task.deadline) return '无截止时间'
|
|
if (!task.deadline) return '无截止时间'
|
|
|
- deadline = new Date(task.deadline)
|
|
|
|
|
|
|
+ deadline = parseDate(task.deadline)
|
|
|
|
|
+ if (!deadline) return ''
|
|
|
now = new Date()
|
|
now = new Date()
|
|
|
diff = deadline - now
|
|
diff = deadline - now
|
|
|
if (diff < 0) return ''
|
|
if (diff < 0) return ''
|
|
@@ -310,14 +312,16 @@ export default {
|
|
|
var deadline, now
|
|
var deadline, now
|
|
|
if (task.status === 'completed') return false
|
|
if (task.status === 'completed') return false
|
|
|
if (!task.deadline) return false
|
|
if (!task.deadline) return false
|
|
|
- deadline = new Date(task.deadline)
|
|
|
|
|
|
|
+ deadline = parseDate(task.deadline)
|
|
|
|
|
+ if (!deadline) return false
|
|
|
now = new Date()
|
|
now = new Date()
|
|
|
return deadline < now
|
|
return deadline < now
|
|
|
},
|
|
},
|
|
|
getOverdueDays(task) {
|
|
getOverdueDays(task) {
|
|
|
var deadline, now, diff, days, hours
|
|
var deadline, now, diff, days, hours
|
|
|
if (!task.deadline) return ''
|
|
if (!task.deadline) return ''
|
|
|
- deadline = new Date(task.deadline)
|
|
|
|
|
|
|
+ deadline = parseDate(task.deadline)
|
|
|
|
|
+ if (!deadline) return ''
|
|
|
now = new Date()
|
|
now = new Date()
|
|
|
diff = now - deadline
|
|
diff = now - deadline
|
|
|
days = Math.floor(diff / (1000 * 60 * 60 * 24))
|
|
days = Math.floor(diff / (1000 * 60 * 60 * 24))
|