修改倒计时有问题、撤销提款按钮点不了、客服的英文不对

i18n/lang/en.json

@@ -125,7 +125,7 @@
 		"c17": "Transfer Address",
 		"c18": "Transfer Amount",
 		"c19": "Recharge/Transfer",
-		"c20": "Contact customer service",
+		"c20": "Contact Customer Service",
 		"c21": "Select Currency",
 		"c22": "Password and Email Verification Code",
 		"c23": "Estimated arrival time",

pages/assets/records.vue

@@ -31,7 +31,7 @@
 							</view>
 							<view v-if="type=='draw'" style="width: 20%;">
 							  <view :class="item.status==0?'status_text':item.status==2?'status_text1':''">{{ item.status_text }}</view>
-							  <view v-if="item.status==0">{{updateTimer(item.datetime)}}</view>
+							  <view v-if="item.status==0">{{updateTimer(item)}}</view>
 							</view>
 							<view v-if="type=='recharge'">
 							  <view v-if="item.status==0">{{$t('assets.d1')}}</view>
@@ -118,38 +118,30 @@ import formData from "@/utils/class/date";
 			  	this.depositHistory();
 			  }
 			},
-			// 根据日期判断是工作日还是周末
+			cancelWithdraw(item) {
-			isWeekend(date) {
+			    Wallet.cancelWithdraw({ withdraw_id: item.id }).then(res => {
-			  const day = date.getDay(); // 0（周日）到 6（周六）
+			        this.$toast(this.$t('otc.d4'));
-			  return day === 0 || day === 6;
+			        this.getWithdrawRecords()
-			},
+			    })
-			// 根据日期动态计算目标时间
-			getTargetTime(datetime) {
-			  const now = new Date();
-			  const target = new Date( Date.parseTime(datetime) );
-			  const isWeekend = this.isWeekend(target);
-				
-			  // 如果是周末，设置为 24 小时后
-			  if (isWeekend) {
-			    target.setHours(target.getHours() + 24);
-			  } else {
-			    // 如果是工作日，设置为 12 小时后
-			    target.setHours(target.getHours() + 12);
-			  }
-			const countdownMilliseconds = isWeekend ? 24 * 60 * 60 * 1000 : 12 * 60 * 60 * 1000;
-			  return target.getTime() + countdownMilliseconds;
 			},
 			updateTimer(val){
-				const now = Date.now();
+				const nowInMilliseconds = Date.now(); // 当前时间的毫秒级时间戳
-				const timer = this.getTargetTime(val)
+				const twelveHoursInSeconds = 43200; // 12小时的秒数
-				const diff = timer - now;
+				const nowInSeconds = Math.floor(nowInMilliseconds / 1000); // 当前时间的秒级时间戳
+				const adjustedNowInSeconds = nowInSeconds - twelveHoursInSeconds; // 调整后的当前时间的秒级时间戳
+				 
+				// 如果你需要一个毫秒级的时间戳，可以再将秒级时间戳转换回毫秒级
+				const adjustedNowInMilliseconds = adjustedNowInSeconds * 1000;
+				const timer = val.newdatetime * 1000
+				const diff = timer - adjustedNowInMilliseconds;
+				
 				if (diff <= 0) {
 				  return '00:00:00';
 				}
 						
-				const hours = Math.floor((diff % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
+				const hours = Math.floor(diff / 3600000)
-				const minutes = Math.floor((diff % (1000 * 60 * 60)) / (1000 * 60));
+				const minutes = Math.floor((diff % 3600000) / 60000)
-				const seconds = Math.floor((diff % (1000 * 60)) / 1000);
+				const seconds = Math.floor((diff % 60000) / 1000)
 						
 				return `${hours < 10 ? '0'+hours: hours}:${minutes < 10 ? '0'+minutes: minutes}:${seconds < 10 ? '0'+seconds: seconds}`;
 			},