From 07834940c0cc4de43d26a7a5c428935f666cf205 Mon Sep 17 00:00:00 2001
From: liaoxinyu <liaoxinyu@xingtongworld.com>
Date: Sun, 9 Mar 2025 23:15:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9k=E7=BA=BF=E4=B8=BA=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=88=87=E6=8D=A2=E5=A4=8F=E4=BB=A4=E6=97=B6=E5=92=8C?=
 =?UTF-8?q?=E5=86=AC=E4=BB=A4=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/exchange/open-position.vue |   4 ++--
 static/chart_main/sevencoin.js   |  36 +++++++++++++++++++++++++++++--
 static/favicon.ico               | Bin 4286 -> 9662 bytes
 utils/class/date.js              |  36 ++++++++++++++++---------------
 4 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/pages/exchange/open-position.vue b/pages/exchange/open-position.vue
index 0a3f9e4..0227780 100644
--- a/pages/exchange/open-position.vue
+++ b/pages/exchange/open-position.vue
@@ -741,7 +741,7 @@
                             </view>
                         </view>
                         <view class="p-x-md p-t-0">
-                            <v-input class="p-sm rounded border m-t-sm" :placeholder="$t('contract.i3')" type="number"
+                            <v-input class="p-sm rounded border m-t-sm" :placeholder="$t('contract.i3')"
                                      v-model="strategyForm.tp_trigger_price">
                                 <template #left>
                                     <span class="color-default">{{ $t("contract.i4") }}：</span>
@@ -757,7 +757,7 @@
                     }}
                                 USDT
                             </view> -->
-                            <v-input class="p-sm rounded border m-t-sm" :placeholder="$t('contract.i3')" type="number"
+                            <v-input class="p-sm rounded border m-t-sm" :placeholder="$t('contract.i3')"
                                      v-model="strategyForm.sl_trigger_price">
                                 <template #left>
                                     <span class="color-default">{{ $t("contract.i7") }}：</span>
diff --git a/static/chart_main/sevencoin.js b/static/chart_main/sevencoin.js
index 7060bcf..cbade6b 100644
--- a/static/chart_main/sevencoin.js
+++ b/static/chart_main/sevencoin.js
@@ -253,12 +253,12 @@ $(function () {
             tvQuoter.find('[data-name="zhangdiee"]').css('color',zhangdiee>0?'#53b987':'#eb4d5c');
         }
         timestampToTime(timestamp) {
-            const date = new Date(timestamp);
+            const date = this.adjustToEasternTime(timestamp);
             const yyyy = `${date.getFullYear()}`;
             const yy = `${date.getFullYear()}`.substr(2);
             const MM = `0${date.getMonth() + 1}`.slice(-2);
             const dd = `0${date.getDate()}`.slice(-2);
-            const HH = `0${date.getHours()-13}`.slice(-2);
+            const HH = `0${date.getHours()}`.slice(-2);
             const mm = `0${date.getMinutes()}`.slice(-2);
 
 
@@ -271,6 +271,38 @@ $(function () {
             }
             return dateStr
         }
+		
+		adjustToEasternTime(date) {
+			let timestamp;
+					
+			// 判断日期是否在夏令时
+			const dates = new Date(date);
+			const isInEDT = this.dateIsInEDT(dates);
+			// 根据是否在夏令时来调整时间
+			if (isInEDT) {
+			    // 在夏令时期间
+			    timestamp = date - (-28800000)+(new Date(new Date().getTime()).getTimezoneOffset()* 60 * 1000) - 43200000; // 使用43200000毫秒 = 12小时
+			} else {
+			    // 在冬令时期间
+			    timestamp = date - (-28800000)+(new Date(new Date().getTime()).getTimezoneOffset()* 60 * 1000) - 46800000; // 使用46800000毫秒 = 13小时
+			}
+			// 创建新的日期对象，并使用调整后的时间戳
+			const adjustedDate = new Date(timestamp);
+					
+			// 返回调整后的日期对象
+			return adjustedDate;
+		}
+		// 判断日期是否在夏令时（简化的逻辑，实际应用中需要考虑更多的边界情况）
+		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());
+		
+		    return date >= start && date < end;
+		}
+		
         getResolutionTime() {
             const resolution = this.TView.chart().resolution();
             switch (resolution) {
diff --git a/static/favicon.ico b/static/favicon.ico
index c06d489634996bc27d94bfbf737d09988ad4807b..2a7951a7ae5d9187b4be2722df866c8a28f4c149 100644
GIT binary patch
literal 9662
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
Z@hKC`@rjZN=6FTP73TPd>_5xj{{t9fJoW$p

literal 4286
zcmeHKO-NKx6u$G*BxWT835n#;!a`d3M_H*OWEN3TZ^p@tL~s`*6(KH!aZ{~CT12!6
ziiix`h(*g3sgMY9Gc%b(ipWr+?@j4-bY|Y|yr*~OJncC@ws0{|zPX2Y-#Op+&O7(q
zD<KB>v)PF9OL}t&$s>du2EZ*+3sCN>7tF1{7-Pl^GC9~TH6VH_>O@a@;~HEG)9n_l
zjb6_!piYyEI?YaiKpV^#0q1GMj&p!|Kpk~iYG}*8JnWaO4g9sDrz8wut0?WpzM=aU
zEL0#v0G0qznD3`eyANXjWNgt>))wbibd<ZWA8oegL+qIZ{9NBGy_#K&{S(>I@Gm3q
zzd#!Ph~8sIupi{O3iy|k)bJ(psV}8I6ZAW?f&VMg@J$*&ldI9-Ft#Ph&lJ7bHyK;>
zowNb}EYi>)ntx;FzVh6RkqU;FNojBxZ*jj=#?|$psmD(2zjX6Z4)Bj9)Zj2`{BVp!
zHq_%Cl!GW}I*Wa1)2<@m7dO?g1^&p=xKfX=kcK(YcS5tS)IJ~(WzF%r*NzV34Xim;
zJ2-JU2lz*khS8wkk%Qw<hvA+Me<0a@6q@fdi@xfDf5KZ?EP9Vta7g2)t(br1*<CZ#
z<5SR}^d|)$K+_|7ZI2B<x0x-=E0F8b=jc7x`k>kmp)Xd{VSmW`CEyv30eUc=Psa{U
z2uiNUbTs@FeN_i|+?8H8yfb+R;NN>TmG|Xw){mn1coFaibu^6p{?U@feQ4``EAab~
zhLNR?%Gf-AF4YnGzM#Vo-=y?0jz_O#l>q-@T!Z0>EXyhNTpW+vz|*a-p{$udr;M;K
zH^=$mdpJ!kcs?C_VfwZO_=j{fEW*B2g5#?79<PN(B`<hB9b58M=L3I0N5gl#4nyu!
zS&)N|C=Y(xny*=>>1fz^F5%}BbsPxIy^ifm>KREO0i<Cd{PtmNJ{^9=2Wp{RCkIMB
zYW5fP3?`6pOv4uXKi9h~y*C4Yzm5iFU()m*3VUvhU)dY}LvNDC>#gW~%Fn55qqa9j
z0~1EIKRQi~uofDXvnhX<%$WI~Yn#*n$k=#=ItYt&5_hDA*yTcEXL|uXU3T_)(9VV@
t?Q9CbBzI_U4~y)4z+}@fV}>a}kg+a_vB3^Eo2;@ksRmG3xRGJ?&R<?(hL8XN

diff --git a/utils/class/date.js b/utils/class/date.js
index 7095eff..7ba71e8 100644
--- 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;
@@ -51,7 +55,8 @@ function parseTime(time, isOffset = false, cformat = null) {
 
     // 设置默认格式
     let format = cformat || '{y}-{m}-{d} {h}:{i}:{s}';
-    time = time + 8 * 3600;
+	// let format = cformat || '{m}/{d}/{y} {h}:{i}:{s}';
+
     const date = time2Date(time, isOffset);
 
     // 将日期时间值存入对象中
@@ -64,21 +69,18 @@ function parseTime(time, isOffset = false, cformat = null) {
         s: date.getSeconds(),
         a: date.getDay()
     };
-    console.log(date);
+
     // 星期值需要转化为中文
     dataObj.a = '星期' + ['日', '一', '二', '三', '四', '五', '六'][dataObj.a];
 
     // 匹配{}中的y|m|d...部分，分别替换不同的值
-    // const result = format.replace(/{(y|m|d|h|i|s|a)+}/g, (segment, key) => {
-    //     // 由索引提取值
-    //     let value = dataObj[key];
-    //     // 给值添加前导0
-    //     if (segment.length > 0 && value < 10) value = '0' + value;
-    //     return value || 0;
-    // });
-    // time = time + 8 * 3600 * 1000; // 增加8小时
-    const result = date.toJSON().substr(0, 19).replace('T', ' ');
-    // console.log(result);
+    const result = format.replace(/{(y|m|d|h|i|s|a)+}/g, (segment, key) => {
+        // 由索引提取值
+        let value = dataObj[key];
+        // 给值添加前导0
+        if (segment.length > 0 && value < 10) value = '0' + value;
+        return value || 0;
+    });
     return result;
 }