From 41426416bd250130129fb8a547bee874375768a8 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 14 十一月 2024 09:47:15 +0800
Subject: [PATCH] 1.付款：改成15分钟，并使用服务器时间进行倒计时 2.优惠券中心：已经领取（达到最大次数），显示已领取且置灰，未领取根据创建时间放前面，已领取根据首次时间正序排序 3.购物车-提交订单：自动根据订单金额选择合适优惠券
---
pages/order/order-detail.vue | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 465a721..cbc4434 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -45,9 +45,17 @@
if (this.dto.statusBackend === 'PENDING' || this.dto.status === 'PENDING') {
- this.timer = setInterval(() => {
+ this.timer = setInterval(async () => {
+ //倒计时,修改成
+ // var nowdate = new Date().getTime() - 1000 * 60 * 15
+ let res = await this.$http.request('get', `/api/order/time/now`, {
+ params: {}
+ })
+ let serverTime=res.data;
+
//倒计时
- var nowdate = new Date().getTime() - 1000 * 60 * 5
+ var nowdate = serverTime - 1000 * 60 * 15
+
var change = false
//计算倒计时
@@ -74,7 +82,9 @@
} else {
tt = alltime
}
- this.dto.bctime = `0${parseInt(alltime / 60)}:${tt<10?'0':''}${tt}`
+ // this.dto.bctime = `0${parseInt(alltime / 60)}:${tt<10?'0':''}${tt}`
+ this.dto.bctime = `${parseInt(alltime / 60) < 10 ? '0' : ''}${parseInt(alltime / 60)}:${tt < 10 ? '0' : ''}${tt}`
+
change = true
}
@@ -187,8 +197,13 @@
// }]
}
if (this.dto.statusBackend === 'PENDING') {
+ let res = await this.$http.request('get', `/api/order/time/now`, {
+ params: {}
+ })
+ let serverTime=res.data;
//先判断要不要字节变成已取消
- var nowdate = new Date().getTime() - 1000 * 60 * 5
+ var nowdate = serverTime - 1000 * 60 * 15
+ // var nowdate = new Date().getTime() - 1000 * 60 * 5
var diff = new Date(this.dto.createTime).getTime() - nowdate
if (diff <= 2000 && true) {
--
Gitblit v1.9.3