修改时间问题

1 month ago · e43216b7e4
7 changed files with 20 additions and 8 deletions
--- a/pages/exchange/time-sharing.vue
+++ b/pages/exchange/time-sharing.vue
@ -118,6 +118,11 @@ export default {
 	
 	// 辅助函数：获取某年第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;
 	
@ -136,7 +141,7 @@ export default {
 	  let timeData = this.isDSTByRules()
      highstock.setOptions({
        global: {
-          timezoneOffset: timeData ? 4 * 60 : 5 * 60,
+          timezoneOffset: timeData ? 16 * 60 : 16 * 60,
        },
      });

--- a/static/chart_main/sevencoin.js
+++ b/static/chart_main/sevencoin.js
@ -298,8 +298,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;
 		}
--- a/static/js/jquery3_5_1.min.js
+++ b/static/js/jquery3_5_1.min.js
--- a/static/js/pako1_0_9.min.js
+++ b/static/js/pako1_0_9.min.js
--- a/static/js/qs6_9_4.min.js
+++ b/static/js/qs6_9_4.min.js
--- a/static/tradingview.html
+++ b/static/tradingview.html
@ -22,9 +22,12 @@
 <body>
    <div class="tradingview" id="tradingview_10798345"></div>
 </body>
-<script src="https://www.coinprx.com/newlink/jquery3_5_1.min.js"></script>
+<!-- <script src="https://www.coinprx.com/newlink/jquery3_5_1.min.js"></script>
 <script src="https://www.coinprx.com/newlink/mobile/pako1_0_9.min.js"></script>
-<script src="https://www.coinprx.com/newlink/mobile/qs6_9_4.min.js"></script>
+<script src="https://www.coinprx.com/newlink/mobile/qs6_9_4.min.js"></script> -->
+<script src="./js/jquery3_5_1.min.js"></script>
+<script src="./js/pako1_0_9.min.js"></script>
+<script src="./js/qs6_9_4.min.js"></script>
 <script src="./chart_main/charting_library.min.js"></script>
 <script src="./chart_main/ws.js"></script>
 <script src="./chart_main/sevencoin.js?v=2"></script>
--- a/utils/class/date.js
+++ b/utils/class/date.js
@ -35,7 +35,7 @@ function time2Date(time, isOffset = false) {
 						timeN = getTimeZoneOffset(time);
 				}else{
 					// 这也是对时差进行转换，不需要在每个处理时间格式的组件中修改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);
 				}

        // 转化成日期时间对象
@ -49,8 +49,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;
 }