From bd7093d5a453f0020dfed4677bb9b4c1e84cb62a Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 18 九月 2024 15:42:00 +0800
Subject: [PATCH] update 订单刷新等

---
 pages/order/order-detail.vue |   87 +++++++++++++++++++++++++------------------
 1 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 5526c16..4340a8b 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -41,48 +41,45 @@
 					pictureList: []
 				}
 				this.showSales = options.showsales && true || false
+				this.timer = setInterval(() => {
+					//倒计时
+					var nowdate = new Date().getTime() - 1000 * 60 * 5
+					var change = false
 
+					//计算倒计时
+					var diff = new Date(this.dto.createTime).getTime() - nowdate
+					console.log('diff', diff)
+					if (diff <= 2000 && true) {
+						//超过了5分钟
+						this.dto.statusBackend = 'CANCEL'
+						this.dto.statusBackendStr = '已取消'
+						this.dto.status = 'CANCEL'
+						this.dto.statusStr = '已取消'
 
-				if (this.dto.statusBackend === 'PENDING') {
-					this.timer = setInterval(() => {
-						//倒计时
-						var nowdate = new Date().getTime() - 1000 * 60 * 5
-						var change = false
-
-						//计算倒计时
-						var diff = new Date(this.dto.createTime).getTime() - nowdate
-						console.log('diff', diff)
-						if (diff <= 2000 && true) {
-							//超过了5分钟
-							this.dto.statusBackend = 'CANCEL'
-							this.dto.statusBackendStr = '已取消'
-							this.dto.status = 'CANCEL'
-							this.dto.statusStr = '已取消'
-
-							this.dto.bctime = ''
-							// console.log('change cancel', this.dto)
-							change = true
-							clearInterval(this.timer)
-							this.timer = undefined
+						this.dto.bctime = ''
+						// console.log('change cancel', this.dto)
+						change = true
+						clearInterval(this.timer)
+						this.timer = undefined
+					} else {
+						//相差
+						var alltime = parseInt(diff / 1000)
+						var tt = 0
+						if (alltime > 60) {
+							tt = alltime - parseInt(alltime / 60) * 60
 						} else {
-							//相差
-							var alltime = parseInt(diff / 1000)
-							var tt = 0
-							if (alltime > 60) {
-								tt = alltime - parseInt(alltime / 60) * 60
-							} else {
-								tt = alltime
-							}
-							this.dto.bctime = `0${parseInt(alltime / 60)}:${tt<10?'0':''}${tt}`
-							change = true
-
+							tt = alltime
 						}
+						this.dto.bctime = `0${parseInt(alltime / 60)}:${tt<10?'0':''}${tt}`
+						change = true
+
+					}
 
 
-						if (change)
-							this.$forceUpdate()
-					}, 1000)
-				}
+					if (change)
+						this.$forceUpdate()
+				}, 1000)
+
 
 
 			}
@@ -93,7 +90,7 @@
 				}
 			}).then(res => {
 				var data = res.data;
-	
+
 				let tmpData = data.map(item => ({
 					value: item.value,
 					label: item.label
@@ -136,6 +133,22 @@
 						// 	description: 'descriptiondescriptiondescriptiondescriptiondescription'
 						// }]
 					}
+					if (this.dto.statusBackend === 'PENDING') {
+						//先判断要不要字节变成已取消
+						var nowdate = new Date().getTime() - 1000 * 60 * 5
+						var diff = new Date(this.dto.createTime).getTime() - nowdate
+
+						if (diff <= 2000 && true) {
+							//超过了5分钟
+							this.dto.statusBackend = 'CANCEL'
+							this.dto.statusBackendStr = '已取消'
+							this.dto.status = 'CANCEL'
+							this.dto.statusStr = '已取消'
+							this.dto.bctime = ''
+							this.$forceUpdate()
+						}
+					}
+
 				}
 			},
 			async callTel() {

--
Gitblit v1.9.3