From 4b14dad2989d04bdeb25c4597fcea79feb2ed036 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Tue, 23 Jul 2024 21:19:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2=E8=B0=83?=
=?UTF-8?q?=E6=95=B4=EF=BC=8C=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE=E6=98=AF?=
=?UTF-8?q?=E5=90=A6=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
my/order/pay.vue | 49 ++++++++++++++++++++++++-----
my/order/payModifyTcMyDaiB.vue | 24 ++++++++++++--
my/order/payding.vue | 31 ++++++++++++++----
my/order/paydingTCX.vue | 31 ++++++++++++++----
pages/order/index.vue | 57 ++++++++++++++++++++++++++--------
5 files changed, 157 insertions(+), 35 deletions(-)
diff --git a/my/order/pay.vue b/my/order/pay.vue
index 9980694..faa84f2 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -372,7 +372,9 @@
class="btns">联系客服
-
+
取消订单
-
取消订单
@@ -462,7 +466,9 @@
-
+
取消订单
联系客服
-
+
取消订单
联系客服
-
+
取消订单
联系客服
-
+
取消订单
{
uni.hideLoading();
+ console.log(resa);
if (resa.code == 0) {
that.page = 1;
uni.showModal({
@@ -2297,7 +2330,7 @@ export default {
}
});
} else {
- that.$queue.showToast(res.msg);
+ that.$queue.showToast(resa.msg);
}
})
},
diff --git a/my/order/payModifyTcMyDaiB.vue b/my/order/payModifyTcMyDaiB.vue
index 25cb9b7..c906500 100644
--- a/my/order/payModifyTcMyDaiB.vue
+++ b/my/order/payModifyTcMyDaiB.vue
@@ -290,7 +290,8 @@
取消订单
+ v-if="(order.status != 3 && order.status != 4 && order.status != 5) && yhqxSel != '否' && order.cancelBtnShow == 'true'"
+ >取消订单
立即支付
@@ -539,7 +540,8 @@
this.order["technicianTypeName"] = "资深"
}
var date = new Date(); // 当前日期和时间
- var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
+ // var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
+ var timestamp = parseInt(date.getTime());
const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; // 两个小时的毫秒数
var twoTime = parseInt(new Date(twoHoursInMilliseconds).getTime())
var time = parseInt(new Date(this.order.serveTime).getTime())
@@ -548,6 +550,24 @@
} else {
this.$set(this.order, 'btnShow', 'false')
}
+ const fifteenMinutesInMilliseconds = 15 * 60 * 1000; // 15分钟的毫秒数
+ var fifteenTime=parseInt(new Date(fifteenMinutesInMilliseconds).getTime())
+ if(timestamp-time
取消订单
+ v-if="(order.status != 3 && order.status != 4 && order.status != 5) && yhqxSel != '否' && order.cancelBtnShow == 'true'">取消订单
twoTime){
- this.$set(this.order, 'btnShow', 'true')
+ if(time-timestamp>twoTime){
+ this.$set(this.order, 'btnShow', 'true')
+ }else{
+ this.$set(this.order, 'btnShow', 'false')
+ }
+ console.log("sadasdsa0",this.order)
+ const fifteenMinutesInMilliseconds = 15 * 60 * 1000; // 15分钟的毫秒数
+ var fifteenTime=parseInt(new Date(fifteenMinutesInMilliseconds).getTime())
+ if(timestamp-time取消订单
@@ -579,16 +579,35 @@
this.order["technicianTypeName"] = "资深"
}
var date = new Date(); // 当前日期和时间
- var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
+ // var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
+ var timestamp = parseInt(date.getTime());
const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; // 两个小时的毫秒数
var twoTime=parseInt(new Date(twoHoursInMilliseconds).getTime())
var time=parseInt(new Date(this.order.serveTime).getTime())
- if(time-timestamp>twoTime){
- this.$set(this.order, 'btnShow', 'true')
+ if(time-timestamp>twoTime){
+ this.$set(this.order, 'btnShow', 'true')
+ }else{
+ this.$set(this.order, 'btnShow', 'false')
+ }
+ const fifteenMinutesInMilliseconds = 15 * 60 * 1000; // 15分钟的毫秒数
+ var fifteenTime=parseInt(new Date(fifteenMinutesInMilliseconds).getTime())
+ if(timestamp-time
-
@@ -129,15 +129,21 @@
更多
-
+
+ 服务升级
+
+
服务升级
-
充值
@@ -147,11 +153,17 @@
加钟
+
+
+ 充值
+
+
联系客服
-
取消订单
@@ -179,7 +191,7 @@
-
@@ -196,7 +208,7 @@
-
@@ -213,7 +225,7 @@
-
@@ -229,7 +241,7 @@
-
@@ -516,24 +528,43 @@
page: this.page,
limit: this.limit
}
+
// selectOrdersList
this.$Request.get('/app/artificer/selectAppOrdersList', data).then(res => {
+
if (res.code == 0) {
uni.hideLoading();
if (this.page == 1) this.goods = []; //如果是第一页需手动制空列表
this.goods = [...this.goods, ...res.data.list]; //追加新数据
- var timestamp = this.timeToMilliseconds(this.getCurrentTime);
+ // var timestamp = this.timeToMilliseconds(this.getCurrentTime);
+ var timestamp = (new Date()).getTime();
var twoTime=2* 60 * 60 * 1000;
+ var fifteenTime = 15 * 60 * 1000; // 15分钟的毫秒数
var time='';
-
for(var i=0;itwoTime){
this.$set(this.goods[i], 'btnShow', 'true')
}else{
this.$set(this.goods[i], 'btnShow', 'false')
}
-
+ if(timestamp-time