diff --git a/pages/exchange/time-sharing.vue b/pages/exchange/time-sharing.vue index b5720a6..37ee3e4 100644 --- a/pages/exchange/time-sharing.vue +++ b/pages/exchange/time-sharing.vue @@ -110,12 +110,16 @@ export default { // 计算夏令时结束时间(11月第一个周日 2:00 AM EST) const dstEnd = this.getNthSunday(year, 10, 1, 2); // 月份从 0 开始(10=11月) - return now >= dstStart && now < dstEnd; }, // 辅助函数:获取某年第n个月的第m个周日(月份从0开始) getNthSunday(year, month, occurrence, hour) { + if (month === 10 && occurrence === 1) { + const date = new Date(year, 10, 3); // 11月3日 + date.setHours(hour, 0, 0, 0); + return date; + } let date = new Date(year, month, 1); let count = 0; @@ -134,7 +138,7 @@ export default { let timeData = this.isDSTByRules() highstock.setOptions({ global: { - timezoneOffset: timeData ? 16 * 60 : 17 * 60, + timezoneOffset: timeData ? 16 * 60 : 16 * 60, }, }); diff --git a/pages/financialManagement/index.vue b/pages/financialManagement/index.vue index 3bb8af5..6c1e775 100644 --- a/pages/financialManagement/index.vue +++ b/pages/financialManagement/index.vue @@ -39,14 +39,14 @@ - VIP {{financial.vip.level}} + VIP {{vip.level}} - {{financial.vip.level==5?$t('common.grade'):$t('common.distance')}} VIP{{financial.nextVip.level}} + {{vip.level==5?$t('common.grade'):$t('common.distance')}} VIP{{nextVip.level}} {{financial.performance}} - {{financial.nextVip.performance}} + {{nextVip.performance}} @@ -106,7 +106,9 @@ activeCoin:{}, userAdressList:[], coin_name1:"USDT", - financial:{} + financial:{}, + vip:{}, + nextVip:{} }; }, watch:{ @@ -139,8 +141,10 @@ // console.log(res); }); Wallet.financial_vip({}).then(res => { - console.log(res); + // console.log(res); this.financial = res.data + this.vip = res.data.vip + this.nextVip = res.data.nextVip }); }, init(){ diff --git a/static/chart_main/sevencoin.js b/static/chart_main/sevencoin.js index 2d13ce9..d2de453 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 - 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; } getResolutionTime() {