diff --git a/src/common/DateUtil.js b/src/common/DateUtil.js index 93e5dbd3..90cb1b77 100644 --- a/src/common/DateUtil.js +++ b/src/common/DateUtil.js @@ -68,30 +68,14 @@ export function formatSeconds(value) { } -export function formatDuring(mss) { - var days = parseInt(mss / (1000 * 60 * 60 * 24)); - var hours = parseInt((mss % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60)); - var minutes = parseInt((mss % (1000 * 60 * 60)) / (1000 * 60)); - var second = parseInt(mss / 1000 % 60); - - try { - days = Math.abs(days); - } catch (e) { - - } - try { - hours = Math.abs(hours); - } catch (e) { - - } - try { - minutes = Math.abs(minutes); - } catch (e) { - - } +export function formatDuring(s) { + let days =absFloor(s / (60 * 60 * 24)) ; + let hours = absFloor((s % (60 * 60 * 24)) / ( 60 * 60)); + let minutes =absFloor((s % (60 * 60)) / ( 60)); + let second = absFloor(s % 60); if (days) { - return days + "天" + hours + "小时" + minutes + "分"; + return days + "天" + hours + "小时" ; } if (hours) { return hours + "小时" + minutes + "分"; @@ -100,7 +84,10 @@ export function formatDuring(mss) { return minutes + "分"; } return second + "秒"; - // return days + "天" + hours + "小时" + minutes + "分"; +} + +export function absFloor(number){ + return Math.abs(Math.floor(number)); } /* diff --git a/src/military/task/components/itemListTask/index.jsx b/src/military/task/components/itemListTask/index.jsx index d2cd069e..cceb2083 100644 --- a/src/military/task/components/itemListTask/index.jsx +++ b/src/military/task/components/itemListTask/index.jsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from 'react'; import { Icon, Pagination } from 'antd'; -import { formatDuring, getImageUrl } from 'educoder'; +import { getImageUrl } from 'educoder'; import Nodata from 'forge/Nodata'; import { taskStatusAllArr } from '../../static'; import Loading from "src/Loading"; diff --git a/src/military/task/taskList/index.jsx b/src/military/task/taskList/index.jsx index 60beeb6f..eab6d676 100644 --- a/src/military/task/taskList/index.jsx +++ b/src/military/task/taskList/index.jsx @@ -89,17 +89,17 @@ export default ({ history, current_user, showLoginDialog }) => { function surplusTime(item) { let status = item.status; let surplus = item.collectingDays * 24 * 3600 - (new Date() - new Date(item.publishedAt || item.createdAt)) / 1000; - if (status >= 4) { - surplus += item.choosingDays * 24 * 3600; + if (status === 4) { + surplus = item.choosingDays * 24 * 3600 - (new Date() - new Date(item.collectingCompleteAt)) / 1000; } - if (status >= 5) { + if (status === 5) { surplus = item.makePublicDays * 24 * 3600 - (new Date() - new Date(item.makePublicAt)) / 1000; } - if (status >= 6) { - surplus += item.signingDays * 24 * 3600; + if (status === 6) { + surplus = item.signingDays * 24 * 3600 - (new Date() - new Date(item.publicityCompleteAt)) / 1000; } - if (status >= 7) { - surplus += item.payingDays * 24 * 3600; + if (status === 7) { + surplus = item.payingDays * 24 * 3600 - (new Date() - new Date(item.payingCompleteAt)) / 1000; } let surplusTimetext = formatDuring(surplus);