From d5448f4877b0eb1a5586d366ead25af79e64b64e Mon Sep 17 00:00:00 2001 From: liaoxinyu Date: Tue, 4 Nov 2025 18:27:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/chart_main/sevencoin.js | 5 ++--- utils/class/date.js | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/static/chart_main/sevencoin.js b/static/chart_main/sevencoin.js index 791c6bc..4657935 100644 --- a/static/chart_main/sevencoin.js +++ b/static/chart_main/sevencoin.js @@ -296,9 +296,8 @@ $(function () { 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 - console.log(start); - 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; } diff --git a/utils/class/date.js b/utils/class/date.js index c09eafe..745faf6 100644 --- a/utils/class/date.js +++ b/utils/class/date.js @@ -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; }