From a1e74c07fe4d4c677b405d5defd502eda243c1e6 Mon Sep 17 00:00:00 2001
From: liaoxinyu <liaoxinyu@xingtongworld.com>
Date: Tue, 11 Mar 2025 19:18:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E6=98=AF=E7=BE=8E=E5=9B=BD=E6=97=B6=E9=97=B4=E6=9D=A5?=
 =?UTF-8?q?=E5=80=92=E8=AE=A1=E6=97=B6=E3=80=81=E5=B9=B6=E6=8A=8A=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E6=97=B6=E9=97=B4=E6=94=B9=E6=88=90=E7=BE=8E=E5=9B=BD?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=BD=A2=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/class/date.js      | 27 +++++++++++++++++++++++-
 src/views/contract/index.vue |  2 +-
 src/views/purchase/index.vue | 40 ++++++++++++++++++++++++------------
 3 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/src/utils/class/date.js b/src/utils/class/date.js
index 529fb78..72b7ef7 100644
--- a/src/utils/class/date.js
+++ b/src/utils/class/date.js
@@ -215,6 +215,29 @@ function parseTime(time, isOffset = false, cformat = null) {
     return result;
 }
 
+/**
+ * 接口时间转换成12进制
+ * @param {string|number} dateTimeStr 接口返回的时间和日期
+ */
+function convertTo12HourFormat(dateTimeStr) {
+    // 解析输入的日期时间字符串
+    const date = new Date(dateTimeStr.replace(' ', 'T')); // 使用 T 将字符串转换为 ISO 格式
+
+    // 获取各个部分
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份要加1，并填充为2位
+    const day = String(date.getDate()).padStart(2, '0'); // 填充为2位
+    let hours = date.getHours();
+    const minutes = String(date.getMinutes()).padStart(2, '0'); // 填充为2位
+    const seconds = String(date.getSeconds()).padStart(2, '0'); // 填充为2位
+
+    // 计算12小时制的小时和 AM/PM
+    const ampm = hours >= 12 ? 'PM' : 'AM';//PM代表下午，AM代表上午。
+    // hours = String(hours % 12 || 12).padStart(2, '0'); // 0转换为12
+
+    // 格式化输出
+    return `${day}-${month}-${year} ${hours}:${minutes}:${seconds} ${ampm}`;
+}
 
 /**
  * 发布日期的特定显示方式，
@@ -254,10 +277,12 @@ Object.assign(Date, {
     time2Date,
     parseTime,
     pubTime,
+	convertTo12HourFormat
 });
 
 export default{
     time2Date,
     parseTime,
-    pubTime
+    pubTime,
+	convertTo12HourFormat
 }
\ No newline at end of file
diff --git a/src/views/contract/index.vue b/src/views/contract/index.vue
index b69064d..f76e68a 100644
--- a/src/views/contract/index.vue
+++ b/src/views/contract/index.vue
@@ -101,7 +101,7 @@
 							<div style="margin-left: 10px;">{{ item.symbol }}/{{ parent.coin_name }}</div>
 						</div>
 					</div>
-					<div class="text-right width-32">{{ item.close }}</div>
+					<div class="text-right width-32">{{ item.price }}</div>
 					<div class="text-right width-32" :class="item.increase < 0 ? 'decreace' : 'increase'">{{ item.increaseStr }}</div>
                   </td>
                   <!-- <td class="w-7/24 text-right" >{{ item.close }}</td>
diff --git a/src/views/purchase/index.vue b/src/views/purchase/index.vue
index ee90044..5158a55 100644
--- a/src/views/purchase/index.vue
+++ b/src/views/purchase/index.vue
@@ -26,7 +26,7 @@
               </div>
               <div class="txt">
                 <!-- {{ parseTime(detail.expected_time_online) }} -->
-                {{ detail.expected_time_online }}
+                {{ convertTo12HourFormat(detail.expected_time_online) }}
               </div>
             </li>
             <li class="mt-3">
@@ -35,7 +35,7 @@
               </div>
               <div class="txt">
                 <!-- {{ parseTime(detail.start_subscription_time) }} -->
-				{{ detail.start_subscription_time }}
+				{{ convertTo12HourFormat(detail.start_subscription_time) }}
               </div>
             </li>
             <li class="mt-3">
@@ -44,7 +44,7 @@
               </div>
               <div class="txt">
                 <!-- {{ parseTime(detail.end_subscription_time) }} -->
-				{{ detail.end_subscription_time }}
+				{{ convertTo12HourFormat(detail.end_subscription_time) }}
               </div>
             </li>
           </ul>
@@ -52,7 +52,7 @@
         <div
           class="col-6 d-flex flex-column justify-content-end align-items-start"
         >
-		  <div style="margin-bottom: 20px;">{{timerbool?$t("purchase.Countdown1"):$t("purchase.Countdown")}}: <span style="margin-right: 10px;">{{ days }}{{$t("purchase.day")}}</span><span>{{ hours }}:</span><span>{{ minutes }}:</span><span>{{ seconds }}</span></div>
+		  <div style="margin-bottom: 20px;">{{timerbool?$t("purchase.Countdown1"):$t("purchase.Countdown")}}: <span>{{ hours }}:</span><span>{{ minutes }}:</span><span>{{ seconds }}</span></div>
           <div class="input-group mb-3">
             <div class="input-group-prepend">
               <el-dropdown>
@@ -309,6 +309,7 @@
 </template>
 
 <script>
+import date from "@/utils/class/date.js";
 import Subscride from "@/api/subscride";
 import Wallet from "@/api/wallet";
 export default {
@@ -361,7 +362,8 @@ export default {
     },
   },
   methods: {
-    // 过滤查找当前币种的记录
+		convertTo12HourFormat: date.convertTo12HourFormat,
+		// 过滤查找当前币种的记录
         seek(item) {
             return !this.isCondition || item.coin_name === this.coinName;
         },
@@ -397,14 +399,26 @@ export default {
 		// 初始化固定时间差
 			const start = new Date(this.detail.start_subscription_time).getTime();
 			const end = new Date(this.detail.end_subscription_time).getTime();
-			const now = Date.now();
-			if(now < start && now < end){
+			const now = new Date();
+			const options = { 
+			  timeZone: 'America/New_York', // 指定时区为纽约
+			  year: 'numeric', 
+			  month: '2-digit', 
+			  day: '2-digit', 
+			  hour: '2-digit', 
+			  minute: '2-digit', 
+			  second: '2-digit', 
+			  hour12: false // 使用24小时制
+			};
+			
+			const newYorkTime = new Date(now.toLocaleString('en-US', options)).getTime();
+			if(newYorkTime < start && newYorkTime < end){
 				this.timerbool = false
-				this.remainingSeconds = Math.floor((start - now) / 1000);
+				this.remainingSeconds = Math.floor((start - newYorkTime) / 1000);
 				this.startTimer()
-			}else if (now > start && now < end) {
+			}else if (newYorkTime > start && newYorkTime < end) {
 				this.timerbool = true
-				this.remainingSeconds = Math.floor((end - now) / 1000);
+				this.remainingSeconds = Math.floor((end - newYorkTime) / 1000);
 		   		this.startTimer()
 			}
       });
@@ -506,10 +520,10 @@ export default {
 	updateDisplay() {
 	  const seconds = this.remainingSeconds % 60;
 	  const minutes = Math.floor(this.remainingSeconds / 60) % 60;
-	  const hours = Math.floor(this.remainingSeconds / 3600) % 24;
-	  const days = Math.floor(this.remainingSeconds / 86400);
+	  const hours = Math.floor(this.remainingSeconds / 3600);
+	  // const days = Math.floor(this.remainingSeconds / 86400);
 
-	  this.days = days;
+	  // this.days = days;
 	  this.hours = this.padZero(hours);
 	  this.minutes = this.padZero(minutes);
 	  this.seconds = this.padZero(seconds);