From b07889e22f823fac80a66b503671e170668f4ee6 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 10 十二月 2024 10:10:25 +0800
Subject: [PATCH] 1.供应商子账号
---
pages/order/order.vue | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/pages/order/order.vue b/pages/order/order.vue
index 2ad53ae..3a628f1 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -46,13 +46,22 @@
this.query.status = options.status || ''
this.listApi = `/api/customer/order/list`
await this.getList()
- this.timer = setInterval(() => {
+
+ this.timer = setInterval(async () => {
+
+ 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 change = false
for (var item of this.list) {
if (item.statusBackend === 'PENDING') {
//计算倒计时
+
var diff = new Date(item.createTime).getTime() - nowdate
// console.log('diff', diff, item)
if (diff <= 2000 && true) {
@@ -74,7 +83,8 @@
} else {
tt = alltime
}
- item.bctime = `0${parseInt(alltime / 60)}:${tt<10?'0':''}${tt}`
+ // item.bctime = `0${parseInt(alltime / 60)}:${tt<10?'0':''}${tt}`
+ item.bctime = `${parseInt(alltime / 60) < 10 ? '0' : ''}${parseInt(alltime / 60)}:${tt < 10 ? '0' : ''}${tt}`
change = true
}
@@ -136,8 +146,17 @@
url: `/sub_pages/customer/trade/detail?id=${item.flowerId}`
})
},
- getList_after() {
- var nowdate = new Date().getTime() - 1000 * 60 * 5
+ async getList_after() {
+
+ let res = await this.$http.request('get', `/api/order/time/now`, {
+ params: {}
+ })
+ let serverTime=res.data;
+
+ //倒计时
+ var nowdate = serverTime - 1000 * 60 * 15
+
+ // var nowdate = new Date().getTime() - 1000 * 60 * 15
var change = false
for (var item of this.list) {
if (item.statusBackend === 'PENDING') {
--
Gitblit v1.9.3