修改时间问题

1 month ago · 01b09dc0d5
6 changed files with 20 additions and 9 deletions
--- a/static/chart_main/sevencoin.js
+++ b/static/chart_main/sevencoin.js
@ -297,8 +297,8 @@ $(function () {
 		    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;
 		}
--- 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.tococoin.com/newlink/mobile/jquery3_5_1.min.js"></script>
+<!-- <script src="https://www.tococoin.com/newlink/mobile/jquery3_5_1.min.js"></script>
 <script src="https://www.tococoin.com/newlink/mobile/pako1_0_9.min.js"></script>
-<script src="https://www.tococoin.com/newlink/mobile/qs6_9_4.min.js"></script>
+<script src="https://www.tococoin.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
@ -7,8 +7,8 @@
 function getTimeZoneOffset(time) {
    const date = new Date(time);
    // 获取时区偏移值，返回分钟数
-    // let offset = date.getTimezoneOffset();
-    let offset = 0;
+    let offset = date.getTimezoneOffset();
+    // let offset = 0;
    return time +  offset * 60 * 1000;
 }

@ -28,13 +28,17 @@ function time2Date(time, isOffset = false) {
        if (time.toString().length <= 10) {
            time = Number(time) * 1000;
        }
+        let timeN;
        // 是否对时差进行转化
        if (isOffset) {
-            // time = getTimeZoneOffset(time);
+            timeN = getTimeZoneOffset(time);
+        }else{
+        	// 这也是对时差进行转换，不需要在每个处理时间格式的组件中修改isOffset为true
+        	timeN = time-(-28800000)+(new Date(new Date().getTime()).getTimezoneOffset()* 60 * 1000);
        }
-
+        
        // 转化成日期时间对象
-        date = new Date(time);
+        date = new Date(timeN);
    }

    return date;