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/pages/confirm-order/confirm-order.vue | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/mini-program/pages/confirm-order/confirm-order.vue b/mini-program/pages/confirm-order/confirm-order.vue
index 5c5cfd8..a32915c 100644
--- a/mini-program/pages/confirm-order/confirm-order.vue
+++ b/mini-program/pages/confirm-order/confirm-order.vue
@@ -96,16 +96,16 @@
<view class="info-item-label">杩愯垂</view>
<view class="info-item-price1">楼{{orderInfo.mailAmount}}</view>
</view>
- <view class="info-item">
+ <view class="info-item" @click="show = true">
<view class="info-item-label">浼樻儬鍒�</view>
- <view class="info-item-price1" @click="show = true">
+ <view class="info-item-price1">
-楼{{orderInfo.couponAmount}}
<image src="/static/icon/ic_ar2@2x.png" mode="widthFix"></image>
</view>
</view>
- <view class="info-item">
+ <view class="info-item" @click="show1 = true">
<view class="info-item-label">绉垎鎶垫墸</view>
- <view class="info-item-price1" @click="show1 = true">
+ <view class="info-item-price1">
-楼{{orderInfo.integralAmount}}
<image src="/static/icon/ic_ar2@2x.png" mode="widthFix"></image>
</view>
@@ -160,6 +160,7 @@
</view>
</scroll-view>
<view class="coupon-btn" @click="confirmCoupon">纭畾</view>
+ <view style="width: 100%; height: 30rpx;"></view>
</view>
</u-popup>
<!-- 绉垎 -->
@@ -178,6 +179,7 @@
</view>
</view>
<view class="coupon-btn" @click="confirmJF">纭畾</view>
+ <view style="width: 100%; height: 30rpx;"></view>
</view>
</u-popup>
<!-- 闂ㄥ簵 -->
@@ -268,6 +270,7 @@
isPosition: true,
lat: '',
lgt: '',
+ loading: false,
};
},
onLoad(option) {
@@ -409,6 +412,8 @@
title: '璇烽�夋嫨闂ㄥ簵',
icon: 'none'
})
+ if (this.loading) return;
+ this.loading = true
this.$u.api.orderPay({
addressId: this.addr ? this.addr.id : null,
couponId: this.couponId,
@@ -419,9 +424,11 @@
titlePrice: this.orderInfo.payAmount,
shopId: this.shopId ? this.shopId.id : null
}).then(res => {
+ this.loading = false
if (res.code === 200) {
// 绉垎鎶垫墸
if (res.data.payType === 1) {
+ uni.$emit('shuaxin')
uni.redirectTo({
url: `/pagesA/pages/order-details/order-details?id=${res.data.orderId}&userType=0`
})
@@ -433,13 +440,18 @@
signType: res.data.response.signType,
paySign: res.data.response.paySign,
success (pay) {
+ uni.$emit('shuaxin')
if (pay.errMsg === "requestPayment:ok") {
uni.redirectTo({
url: `/pagesA/pages/order-details/order-details?id=${res.data.orderId}&userType=0`
})
- } else {
- uni.showToast({ title: '璁㈠崟鍙栨秷鏀粯', icon: 'none' })
}
+ },
+ fail (err) {
+ uni.$emit('shuaxin')
+ uni.navigateTo({
+ url: '/pagesA/pages/order/order?userType=0&status=1'
+ })
}
})
}
--
Gitblit v1.9.3