|
|
|
@ -38,7 +38,7 @@ function time2Date(time, isOffset = false) { |
|
|
|
// 这也是对时差进行转换,不需要在每个处理时间格式的组件中修改isOffset为true
|
|
|
|
// timeN = time-(-28800000)+(new Date(new Date().getTime()).getTimezoneOffset()* 60 * 1000);
|
|
|
|
// 这也是对时差进行转换,不需要在每个处理时间格式的组件中修改isOffset为true
|
|
|
|
timeN = isInEDT ? time - (-28800000)+(new Date(new Date().getTime()).getTimezoneOffset()* 60 * 1000) - 43200000 : time - (-28800000)+(new Date(new Date().getTime()).getTimezoneOffset()* 60 * 1000) - 46800000; |
|
|
|
timeN = isInEDT ? time - (-28800000)+(new Date(new Date().getTime()).getTimezoneOffset()* 60 * 1000) - 43200000 : time - (-28800000)+(new Date(new Date().getTime()).getTimezoneOffset()* 60 * 1000); |
|
|
|
} |
|
|
|
|
|
|
|
// 转化成日期时间对象
|
|
|
|
@ -53,8 +53,8 @@ function dateIsInEDT(date) { |
|
|
|
const year = date.getUTCFullYear(); |
|
|
|
const start = new Date(Date.UTC(year, 2, 8, 18)); // March, 2nd Sunday
|
|
|
|
const end = new Date(Date.UTC(year, 10, 3, 18)); // November, 1st Sunday
|
|
|
|
start.setUTCDate(14 - start.getUTCDay()); |
|
|
|
end.setUTCDate(7 - end.getUTCDay()); |
|
|
|
start.setUTCDate(13 - start.getUTCDay()); |
|
|
|
end.setUTCDate(3 - end.getUTCDay()); |
|
|
|
|
|
|
|
return date >= start && date < end; |
|
|
|
} |
|
|
|
|