|
@@ -11,7 +11,12 @@ export function parseTime(time, cFormat) {
|
|
if (typeof time === 'object') {
|
|
if (typeof time === 'object') {
|
|
date = time
|
|
date = time
|
|
} else {
|
|
} else {
|
|
- if (('' + time).length === 10) time = parseInt(time) * 1000
|
|
|
|
|
|
+ if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
|
|
|
|
+ time = parseInt(time)
|
|
|
|
+ }
|
|
|
|
+ if ((typeof time === 'number') && (time.toString().length === 10)) {
|
|
|
|
+ time = time * 1000
|
|
|
|
+ }
|
|
date = new Date(time)
|
|
date = new Date(time)
|
|
}
|
|
}
|
|
const formatObj = {
|
|
const formatObj = {
|