From bc5d79cdd957fcee510d7a1cee07f6775af65596 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 03 三月 2026 10:04:46 +0800
Subject: [PATCH] 合并
---
mini-program/pagesA/pages/order/order.vue | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/mini-program/pagesA/pages/order/order.vue b/mini-program/pagesA/pages/order/order.vue
index 4c3c1b2..ceaea8b 100644
--- a/mini-program/pagesA/pages/order/order.vue
+++ b/mini-program/pagesA/pages/order/order.vue
@@ -178,7 +178,8 @@
{ name: '寰呮敮浠�', id: 0 ,index:1},
{ name: '寰呭彂璐�/鑷彁', id: 1,index:2 },
{ name: '寰呮敹璐�', id: 2 ,index:3},
- ]
+ ],
+ loading: false
};
},
onLoad(options) {
@@ -278,8 +279,31 @@
this.currentOrder = item
}
},
-
payOrder(item){
+ var that = this;
+ if (this.loading) return;
+ this.loading = true
+ this.$u.api.replayPay({
+ orderId: item.id
+ }).then(res => {
+ this.loading = false
+ if (res.code === 200) {
+ wx.requestPayment({
+ timeStamp: res.data.response.timeStamp,
+ nonceStr: res.data.response.nonceStr,
+ package: res.data.response.packageValue,
+ signType: res.data.response.signType,
+ paySign: res.data.response.paySign,
+ success (pay) {
+ if (pay.errMsg === "requestPayment:ok") {
+ that.getFirstPageData()
+ } else {
+ uni.showToast({ title: '璁㈠崟鍙栨秷鏀粯', icon: 'none' })
+ }
+ }
+ })
+ }
+ })
},
doneOrder(item){
this.currentOrder = null
@@ -295,13 +319,16 @@
var that =this
let res = await this.$u.api.affirmOrder({ orderId: this.currentOrder.id });
if (res.code === 200 ) {
+ that.showDone = false
+ that.getFirstPageData()
//淇敼璁㈠崟鐘舵��
- this.dataList.forEach(item=>{
- if(item.id==this.currentOrder.id){
- item.status =3
- }
- })
- this.doneOrder()
+ // this.dataList.forEach(item=>{
+ // if(item.id==this.currentOrder.id){
+ // item.status =3
+ // }
+ // })
+ // this.doneOrder()
+ this.showDone()
}else{
/* uni.showToast({
title:res.message||'纭畾鏀惰揣澶辫触锛�',
@@ -316,13 +343,15 @@
var that =this
let res = await that.$u.api.cancelOrder({ orderId: this.currentOrder.id });
if (res.code === 200 ) {
+ this.showCancel = false
//淇敼璁㈠崟鐘舵��
this.dataList.forEach(item=>{
if(item.id==this.currentOrder.id){
item.status = 4
}
})
- this.cancelOrder()
+ // this.cancelOrder()
+ that.getFirstPageData()
}else{
/* uni.showToast({
title:res.message||'鍙栨秷璁㈠崟澶辫触锛�',
@@ -337,6 +366,7 @@
var that =this
let res = await that.$u.api.delOrder({ orderId: this.currentOrder.id });
if (res.code === 200 ) {
+ this.showDelete = false
//淇敼璁㈠崟鐘舵��
/* var tindex = -1;
this.dataList.forEach((item,index)=>{
--
Gitblit v1.9.3