diff --git a/utils/index.js b/utils/index.js index b6fa932..4f56034 100644 --- a/utils/index.js +++ b/utils/index.js @@ -1,12 +1,15 @@ import env from '@/env/index.js' import store from '@/store/index.js' -import { isDate } from './is.js' +import { isDate, isString } from './is.js' /** * 日期格式化,样例 yyyy-mm-dd hh:MM:ss * @param date Date 需要转换的日期 * @param fmt string 转化的格式 yyyy-mm-dd hh:MM:ss */ export const dateTimeFormat = (date, fmt) => { + if (isString(date)) { + date = date.replace(/-/g, '/') + } if (!isDate(date)) { date = new Date(date) } @@ -127,9 +130,15 @@ export function round(number, precision) { * @returns 时间差对象 */ export const difTime = (time, target) => { + if (isString(time)) { + time = time.replace(/-/g, '/') + } + if (isString(target)) { + target = target.replace(/-/g, '/') + } let begin = new Date(time).getTime() // 兼容ios时间 - let end = new Date(target.replace(/-/g, '/')).getTime() + let end = new Date(target).getTime() let beyond = begin < end ? false : true let diff = Math.abs(begin - end) // 计算天数 diff --git a/utils/is.js b/utils/is.js index ac04e98..9ff756c 100644 --- a/utils/is.js +++ b/utils/is.js @@ -19,3 +19,7 @@ export function isArray(val) { export function isDate(val) { return is(val, 'Date') } + +export function isString(val) { + return is(val, 'String') +}