From 64b432916af9c9218ab3f3eca614e26c542142ae Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 07 十一月 2023 15:47:13 +0800 Subject: [PATCH] bug --- minipro_standard/uni_modules/uview-ui/components/u-count-down/utils.js | 124 ++++++++++++++++++++-------------------- 1 files changed, 62 insertions(+), 62 deletions(-) diff --git a/minipro_standard/uni_modules/uview-ui/components/u-count-down/utils.js b/minipro_standard/uni_modules/uview-ui/components/u-count-down/utils.js index 4cde64d..8c75005 100644 --- a/minipro_standard/uni_modules/uview-ui/components/u-count-down/utils.js +++ b/minipro_standard/uni_modules/uview-ui/components/u-count-down/utils.js @@ -1,62 +1,62 @@ -// 琛�0锛屽1 -> 01 -function padZero(num, targetLength = 2) { - let str = `${num}` - while (str.length < targetLength) { - str = `0${str}` - } - return str -} -const SECOND = 1000 -const MINUTE = 60 * SECOND -const HOUR = 60 * MINUTE -const DAY = 24 * HOUR -export function parseTimeData(time) { - const days = Math.floor(time / DAY) - const hours = Math.floor((time % DAY) / HOUR) - const minutes = Math.floor((time % HOUR) / MINUTE) - const seconds = Math.floor((time % MINUTE) / SECOND) - const milliseconds = Math.floor(time % SECOND) - return { - days, - hours, - minutes, - seconds, - milliseconds - } -} -export function parseFormat(format, timeData) { - let { - days, - hours, - minutes, - seconds, - milliseconds - } = timeData - // 濡傛灉鏍煎紡鍖栧瓧绗︿覆涓笉瀛樺湪DD(澶�)锛屽垯灏嗗ぉ鐨勬椂闂磋浆涓哄皬鏃朵腑鍘� - if (format.indexOf('DD') === -1) { - hours += days * 24 - } else { - // 瀵瑰ぉ琛�0 - format = format.replace('DD', padZero(days)) - } - // 鍏朵粬鍚岀悊浜嶥D鐨勬牸寮忓寲澶勭悊鏂瑰紡 - if (format.indexOf('HH') === -1) { - minutes += hours * 60 - } else { - format = format.replace('HH', padZero(hours)) - } - if (format.indexOf('mm') === -1) { - seconds += minutes * 60 - } else { - format = format.replace('mm', padZero(minutes)) - } - if (format.indexOf('ss') === -1) { - milliseconds += seconds * 1000 - } else { - format = format.replace('ss', padZero(seconds)) - } - return format.replace('SSS', padZero(milliseconds, 3)) -} -export function isSameSecond(time1, time2) { - return Math.floor(time1 / 1000) === Math.floor(time2 / 1000) -} +// 琛�0锛屽1 -> 01 +function padZero(num, targetLength = 2) { + let str = `${num}` + while (str.length < targetLength) { + str = `0${str}` + } + return str +} +const SECOND = 1000 +const MINUTE = 60 * SECOND +const HOUR = 60 * MINUTE +const DAY = 24 * HOUR +export function parseTimeData(time) { + const days = Math.floor(time / DAY) + const hours = Math.floor((time % DAY) / HOUR) + const minutes = Math.floor((time % HOUR) / MINUTE) + const seconds = Math.floor((time % MINUTE) / SECOND) + const milliseconds = Math.floor(time % SECOND) + return { + days, + hours, + minutes, + seconds, + milliseconds + } +} +export function parseFormat(format, timeData) { + let { + days, + hours, + minutes, + seconds, + milliseconds + } = timeData + // 濡傛灉鏍煎紡鍖栧瓧绗︿覆涓笉瀛樺湪DD(澶�)锛屽垯灏嗗ぉ鐨勬椂闂磋浆涓哄皬鏃朵腑鍘� + if (format.indexOf('DD') === -1) { + hours += days * 24 + } else { + // 瀵瑰ぉ琛�0 + format = format.replace('DD', padZero(days)) + } + // 鍏朵粬鍚岀悊浜嶥D鐨勬牸寮忓寲澶勭悊鏂瑰紡 + if (format.indexOf('HH') === -1) { + minutes += hours * 60 + } else { + format = format.replace('HH', padZero(hours)) + } + if (format.indexOf('mm') === -1) { + seconds += minutes * 60 + } else { + format = format.replace('mm', padZero(minutes)) + } + if (format.indexOf('ss') === -1) { + milliseconds += seconds * 1000 + } else { + format = format.replace('ss', padZero(seconds)) + } + return format.replace('SSS', padZero(milliseconds, 3)) +} +export function isSameSecond(time1, time2) { + return Math.floor(time1 / 1000) === Math.floor(time2 / 1000) +} -- Gitblit v1.9.3