From 8fd09daba5c89106b4a9aacd8d5ef9354afc93be Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期六, 28 二月 2026 14:22:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mini-program/pages/confirm-order/confirm-order.vue | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/mini-program/pages/confirm-order/confirm-order.vue b/mini-program/pages/confirm-order/confirm-order.vue
index 0b07b24..9116c02 100644
--- a/mini-program/pages/confirm-order/confirm-order.vue
+++ b/mini-program/pages/confirm-order/confirm-order.vue
@@ -398,6 +398,14 @@
// 鏀粯
payment() {
var that = this;
+ if (that.receiveType === 0 && !that.addr) return uni.showToast({
+ title: '璇烽�夋嫨鏀惰揣鍦板潃',
+ icon: 'none'
+ })
+ if (that.receiveType === 1 && !that.shopId) return uni.showToast({
+ title: '璇烽�夋嫨闂ㄥ簵',
+ icon: 'none'
+ })
this.$u.api.orderPay({
addressId: this.addr ? this.addr.id : null,
couponId: this.couponId,
@@ -411,15 +419,9 @@
if (res.code === 200) {
// 绉垎鎶垫墸
if (res.data.payType === 1) {
- // if (this.receiveType === 0) {
- uni.redirectTo({
- url: `/pagesA/pages/order-details/order-details?id=${res.data.orderId}&userType=0`
- })
- // } else {
- // uni.reLaunch({
- // url: `/pages/payment-successful/payment-successful?id=${res.data.orderId}&userType=0`
- // })
- // }
+ uni.redirectTo({
+ url: `/pagesA/pages/order-details/order-details?id=${res.data.orderId}&userType=0`
+ })
} else {
wx.requestPayment({
timeStamp: res.data.response.timeStamp,
@@ -429,15 +431,9 @@
paySign: res.data.response.paySign,
success (pay) {
if (pay.errMsg === "requestPayment:ok") {
- // if (that.receiveType === 0) {
- uni.redirectTo({
- url: `/pagesA/pages/order-details/order-details?id=${res.data.orderId}&userType=0`
- })
- // } else {
- // uni.reLaunch({
- // url: `/pages/payment-successful/payment-successful?id=${res.data.orderId}&userType=0`
- // })
- // }
+ uni.redirectTo({
+ url: `/pagesA/pages/order-details/order-details?id=${res.data.orderId}&userType=0`
+ })
} else {
uni.showToast({ title: '璁㈠崟鍙栨秷鏀粯', icon: 'none' })
}
@@ -1041,6 +1037,10 @@
height: 144rpx;
display: flex;
align-items: center;
+ margin-bottom: 20rpx;
+ &:last-child {
+ margin: 0 !important;
+ }
.item-image {
flex-shrink: 0;
width: 144rpx;
--
Gitblit v1.9.3