From 6f7d07bad2b1af2664f3190bb3e92b0819c46864 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 18 十二月 2024 09:49:06 +0800
Subject: [PATCH] 1.只有待付款的订单启用倒计时,避免频繁请求接口

---
 pages/order/order-detail.vue |   97 ++++++++++++++++++++----------------------------
 1 files changed, 40 insertions(+), 57 deletions(-)

diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 3b6c0b3..4acc628 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -18,19 +18,6 @@
 				salesTypeList: [],
 			};
 		},
-		
-		async onShow() {
-			// 支付回调
-			// #ifdef PUB_CUSTOMER_DEV
-			let options = wx.getEnterOptionsSync();
-			if (options.scene == '1038' && options.referrerInfo.appId == 'wxef277996acc166c3') {
-				// 代表从收银台小程序返回
-				let extraData = options.referrerInfo.extraData;
-				this.getDetail()
-				return
-			}
-			// #endif
-		},
 		onUnload() {
 			this.timer && clearTimeout(this.timer)
 		},
@@ -58,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
 
 						//计算倒计时
@@ -87,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
 
 						}
@@ -123,6 +120,7 @@
 			})
 
 		},
+		
 		methods: {
 			// 商品评论
 			commentButtonClick(){
@@ -131,7 +129,6 @@
 					url: '/pages/order/comment/order-comment?orderId='+this.id
 				})
 			},
-
 			openbrand(item) {
 				//也要判断一下是否重复进入
 				//判断堆栈,如果是店铺,就直接返回
@@ -201,8 +198,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) {
@@ -221,9 +223,23 @@
 			async callTel() {
 				await this.$message.confirm('是否拨打客服电话')
 				uni.makePhoneCall({
-					phoneNumber: '15974805814'
+					phoneNumber: '19288780072'
 				});
 			},
+
+			async getTelNum(){
+				this.$http.request('get', '/api/code/value', {
+					params: {
+						type: 'customer_service_hotline'
+					}
+				}).then(res => {
+					var data = res.data;
+
+					console.log(data)
+					
+				})
+			},
+
 			async getItemList() {
 				this.$message.showLoading()
 				const {
@@ -332,6 +348,8 @@
 							this.$message.hideLoading()
 							if (code === 0) {
 								this.getDetail()
+								this.$store.dispatch('getCurrentInfo')
+								this.$message.showToast('收货成功')
 							}
 						}
 
@@ -366,41 +384,6 @@
 									that.$message.showToast('支付失败')
 								}
 							})
-							// #ifdef PUB_CUSTOMER_DEV
-							var param = {
-								cusid: "平台分配的商户号",
-								appid: "平台分配的appid",
-								orgid: "平台分配的机构号",
-								version: "12",
-								trxamt: "1",
-								reqsn: "商户唯一订单号",
-								notify_url: "服务器异步通知页面路径",
-								body: "标题",
-								remark: "备注",
-								validtime: "订单有效时间",
-								limit_pay: "no_credit",
-								randomstr: "随机字符串",
-								paytype: "W06",
-								signtype: "签名方式",
-								sign: "签名,参考2.1",
-								...data
-							}
-							if (compareVersion(version, '2.26.2') >= 0) {
-							
-								wx.openEmbeddedMiniProgram({
-									appId: 'wxef277996acc166c3',
-									extraData: param
-								})
-							
-							} else {
-								wx.navigateToMiniProgram({
-									appId: 'wxef277996acc166c3',
-									extraData: param
-								})
-							
-							}
-							// #endif
-							
 
 						}
 
@@ -817,7 +800,7 @@
 			<view class="flex m-t-12">
 				<view class="flex1 w-fit m-auto icon-view" @click.stop="callTel">
 					<image src="/static/common/icon-call.png" class="icon icon-call m-r-10  img100"></image>
-					拨打15974805814
+					拨打19288780072
 				</view>
 				<view class="flex1 w-fit m-auto icon-view flex flex-wrap-normal" open-type="contact">
 					<image src="/static/common/icon-wx.png" class="icon icon-call m-t-2  m-r-10 img100"></image>
@@ -905,8 +888,8 @@
 			<view class="button button-1" @click="buttonClick('payAgain')" v-if=" dto.status === 'PENDING'"> 重新支付<span
 					v-if="dto.bctime">({{dto.bctime}})</span>
 			</view>
-			<!-- <view class="button button-1" @click="commentButtonClick('evaluate')" v-if=" dto.status === 'EVALUATE'"> 评价 </view> -->
-			<!-- <view class="button button-1" @click="buttonClick('evaluate')" v-if=" dto.status === 'EVALUATE'"> 评价 </view> -->
+			<view class="button button-1" @click="buttonClick('evaluate')" v-if=" dto.status === 'EVALUATE'"> 评价
+			</view>
 			<!-- ||dto.status=='COMPLETED' -->
 			<!-- 在外面申请了,里面不允许了 -->
 			<!-- 	<view class="button button-1" @click="buttonClick('sales')" v-if=" dto.status === 'RECEIVE'"> 申请售后

--
Gitblit v1.9.3