diff --git a/src/utils/index.js b/src/utils/index.js index 2684e3c2..eb760d5e 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -17,9 +17,17 @@ export function parseTime(time, cFormat) { if (typeof time === 'object') { date = time } else { - if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { - time = parseInt(time) + if ((typeof time === 'string')) { + if ((/^[0-9]+$/.test(time))) { + // support "1548221490638" + time = parseInt(time) + } else { + // support safari + // https://stackoverflow.com/questions/4310953/invalid-date-in-safari + time = time.replace(new RegExp(/-/gm), '/') + } } + if ((typeof time === 'number') && (time.toString().length === 10)) { time = time * 1000 } diff --git a/src/views/tab/index.vue b/src/views/tab/index.vue index 862a160f..2a35fa58 100644 --- a/src/views/tab/index.vue +++ b/src/views/tab/index.vue @@ -13,11 +13,11 @@