From a2d1b768a91c34b419997ff4c1d5f67d26526b8c Mon Sep 17 00:00:00 2001 From: liaoxinyu Date: Mon, 30 Dec 2024 10:52:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=81=E5=B8=81=E3=80=81?= =?UTF-8?q?=E5=90=88=E7=BA=A6=E3=80=81=E8=B5=84=E4=BA=A7=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=B6=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E7=9A=84=E6=8A=A5=E9=94=99=EF=BC=8C=E4=BF=AE=E6=94=B9k?= =?UTF-8?q?=E7=BA=BF=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/base/home.vue | 4 +-- pages/notice/index.vue | 10 ++++---- pages/safe/email.vue | 2 +- static/chart_main/sevencoin.js | 45 ++++++++++++++++++++++++++++------ 4 files changed, 46 insertions(+), 15 deletions(-) diff --git a/pages/base/home.vue b/pages/base/home.vue index 6f40bbb..fce45dc 100644 --- a/pages/base/home.vue +++ b/pages/base/home.vue @@ -851,14 +851,14 @@ - {{$t('first.a1')}} - + --> - {{item.created_ats| parseTime}} + {{item.created_at}} + @@ -39,8 +39,8 @@ {{item.data.title}} - - {{item.created_ats| parseTime}} + {{item.created_at}} + diff --git a/pages/safe/email.vue b/pages/safe/email.vue index 0aa43a7..53ae468 100644 --- a/pages/safe/email.vue +++ b/pages/safe/email.vue @@ -38,7 +38,7 @@ - {{user.email?$t('safe.a0'):$t('safe.a1')}} + diff --git a/static/chart_main/sevencoin.js b/static/chart_main/sevencoin.js index eeb04b0..097d835 100644 --- a/static/chart_main/sevencoin.js +++ b/static/chart_main/sevencoin.js @@ -233,9 +233,9 @@ $(function () { } let zhangdiefu=(bar.close-bar.open)/bar.open let zhangdiee=bar.close-bar.open - const times = new Date().toLocaleString("en-US", {timeZone: "America/New_York", hour: 'numeric', minute: 'numeric', hour12: false}); - // tvQuoter.find('[data-name="date"]').text(this.timestampToTime(bar.time)); - tvQuoter.find('[data-name="date"]').text(times); + // const times = new Date().toLocaleString("en-US", {timeZone: "America/New_York", hour: 'numeric', minute: 'numeric', hour12: false}); + // tvQuoter.find('[data-name="date"]').text(times); + tvQuoter.find('[data-name="date"]').text(this.timestampToTime(bar.time)); tvQuoter.find('[data-name="date_lang"]').text(this.lang=='zh-CN'?'时间':'Date'); tvQuoter.find('[data-name="open"]').text(bar.open); tvQuoter.find('[data-name="open_lang"]').text(this.lang=='zh-CN'?'开':'Open'); @@ -255,10 +255,10 @@ $(function () { tvQuoter.find('[data-name="zhangdiee"]').css('color',zhangdiee>0?'#53b987':'#eb4d5c'); } timestampToTime(timestamp) { - const thirteenHoursMs = 13 * 3600 * 1000;//修改时间只需要修改 那个13就行了 - const adjustedTimestamp = timestamp - thirteenHoursMs; - // const adjustedTimestamp = timestamp; - const date = new Date(adjustedTimestamp); + const dates = new Date(timestamp); + const resolutionTime = this.getResolutionTime() + const date = resolutionTime === 1 ? dates : this.adjustToEasternTime(dates); + const yyyy = `${date.getFullYear()}`; const yy = `${date.getFullYear()}`.substr(2); const MM = `0${date.getMonth() + 1}`.slice(-2); @@ -276,6 +276,37 @@ $(function () { } return dateStr } + + adjustToEasternTime(date) { + // 将给定日期转换为时间戳 + const timestamp = date.getTime(); + + // 获取美国东部时区偏移值（以分钟为单位） + // const easternOffset = -240; // 美国东部时区偏移值为 -240 分钟 + // 获取东部时间的偏移值（分钟） + let easternOffset = 1260; // 标准时间（EST） + if (this.dateIsInEDT(date)) { + easternOffset = 1200; // 夏令时（EDT） + } + // 调整时间为美国东部时间 + const adjustedTime = timestamp - (date.getTimezoneOffset() + easternOffset) * 60 * 1000; + // 创建新的日期对象，并使用调整后的时间戳 + const adjustedDate = new Date(adjustedTime); + + // 返回调整后的日期对象 + return adjustedDate; + } + // 判断日期是否在夏令时（简化的逻辑，实际应用中需要考虑更多的边界情况） + dateIsInEDT(date) { + const year = date.getUTCFullYear(); + const start = new Date(Date.UTC(year, 2, 13, 7)); // March, 2nd Sunday + const end = new Date(Date.UTC(year, 10, 6, 6)); // November, 1st Sunday + + start.setUTCDate(14 - start.getUTCDay()); + end.setUTCDate(7 - end.getUTCDay()); + + return date >= start && date < end; + } getResolutionTime() { const resolution = this.TView.chart().resolution(); switch (resolution) {