|
|
|
@ -27,13 +27,24 @@ function time2Date(time, isOffset = false) { |
|
|
|
if (time.toString().length <= 10) { |
|
|
|
time = Number(time) * 1000; |
|
|
|
} |
|
|
|
let timeN; |
|
|
|
// 是否对时差进行转化
|
|
|
|
if (isOffset) { |
|
|
|
time = getTimeZoneOffset(time); |
|
|
|
timeN = getTimeZoneOffset(time); |
|
|
|
/** |
|
|
|
* time + new Date(time).getTimezoneOffset() * 60 * 1000 |
|
|
|
*/ |
|
|
|
}else{ |
|
|
|
// 这也是对时差进行转换,但是不想在每个处理时间格式的组件中修改isOffset为true
|
|
|
|
timeN = time-(-28800000)+(new Date(new Date().getTime()).getTimezoneOffset()* 60 * 1000); |
|
|
|
/** |
|
|
|
* 北京时间时间戳和同一时间时间戳相差“-28800000”ms,本地时间和同一时间相差 |
|
|
|
* time-28800000+(new Date(new Date().getTime()).getTimezoneOffset()* 60 * 1000) |
|
|
|
*/ |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 转化成日期时间对象
|
|
|
|
date = new Date(time); |
|
|
|
date = new Date(timeN); |
|
|
|
} |
|
|
|
return date; |
|
|
|
} |
|
|
|
@ -48,7 +59,8 @@ function time2Date(time, isOffset = false) { |
|
|
|
function parseTime(time, isOffset = false, cformat = null) { |
|
|
|
|
|
|
|
// 设置默认格式
|
|
|
|
let format = cformat || '{y}-{m}-{d} {h}:{i}:{s}'; |
|
|
|
// let format = cformat || '{y}-{m}-{d} {h}:{i}:{s}';
|
|
|
|
let format = cformat || '{m}/{d}/{y} {h}:{i}:{s}'; |
|
|
|
|
|
|
|
const date = time2Date(time, isOffset); |
|
|
|
|
|
|
|
|