From 08e77df1a543598d354f0c0d4ccc603238fb68ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com>
Date: Thu, 4 Sep 2025 09:43:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=96=E6=B6=88=E6=94=AF?=
=?UTF-8?q?=E4=BB=98=E7=9A=84=E4=BF=A1=E6=81=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
packages/park/parkOrderDetail/index.vue | 3 +--
packages/park/temporaryOrder/index.vue | 7 ++----
packages/shop/groupPurchaseSubmit/index.vue | 26 ++++++++++-----------
3 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/packages/park/parkOrderDetail/index.vue b/packages/park/parkOrderDetail/index.vue
index 2994a786..bf24c915 100644
--- a/packages/park/parkOrderDetail/index.vue
+++ b/packages/park/parkOrderDetail/index.vue
@@ -146,9 +146,8 @@ export default {
},
fail: (payErr) => {
- console.log("支付失败", payErr)
uni.showToast({
- title: payErr.errMsg || '支付失败',
+ title: payErr.errMsg == 'requestPayment:fail cancel' ? '用户取消支付' : '支付失败',
icon: 'none'
})
},
diff --git a/packages/park/temporaryOrder/index.vue b/packages/park/temporaryOrder/index.vue
index ba81c95f..7be3d0dd 100644
--- a/packages/park/temporaryOrder/index.vue
+++ b/packages/park/temporaryOrder/index.vue
@@ -401,14 +401,11 @@ export default {
},
fail: (payErr) => {
- console.log("支付失败", payErr)
uni.showToast({
- title: payErr.errMsg || '支付失败',
+ title: payErr.errMsg == 'requestPayment:fail cancel' ? '用户取消支付' : '支付失败',
icon: 'none'
})
- },
- complete: () => {
- // 支付完成后的回调，无论成功失败都会执行
+ // 支付完成后的回调，无论成功失败都会执行
}
})
} else {
diff --git a/packages/shop/groupPurchaseSubmit/index.vue b/packages/shop/groupPurchaseSubmit/index.vue
index 04d2e96d..5cd7b5a2 100644
--- a/packages/shop/groupPurchaseSubmit/index.vue
+++ b/packages/shop/groupPurchaseSubmit/index.vue
@@ -43,7 +43,7 @@
￥{{ item.commodity_goods_info.sales_price }}/{{
item.commodity_goods_info.goods_unit
- }}
+ }}
运费 ￥{{
item.commodity_goods_info.freight }}
@@ -128,7 +128,8 @@
请选择自提点
-
+
+
@@ -501,14 +502,14 @@ export default {
},
submitPayment() {
// 检查所有供应商是否都选择了自提点
- const supplierIds = [...new Set(this.orderList2.map(item =>
+ const supplierIds = [...new Set(this.orderList2.map(item =>
item.commodity_goods_info.group_buy_activity_info?.supplier_id || 'default'
))];
-
+
const allHaveZTAddress = supplierIds.every(supplierId => {
- const ztAddress = this.defZTAddress.find(adItem => adItem.id == supplierId);
- return !!ztAddress;
- });
+ const ztAddress = this.defZTAddress.find(adItem => adItem.id == supplierId);
+ return !!ztAddress;
+ });
if (!allHaveZTAddress) {
uni.showToast({
@@ -524,16 +525,16 @@ export default {
goods_list: Object.keys(this.supplierGroups).map(supplierId => {
const group = this.supplierGroups[supplierId];
const firstItem = group[0];
-
+
// 团购活动id
this.group_buy_activity_id = firstItem.commodity_goods_info.group_buy_activity_id;
-
+
// 根据供应商id获取自提点信息
const ztAddress = this.defZTAddress.find(adItem => adItem.id == supplierId) || {};
-
+
// 团购活动时间判断
const currentTime = new Date().getTime();
-
+
return {
supplier_id: firstItem.commodity_goods_info.group_buy_activity_info.supplier_id,
supplier_name: firstItem.supplier_name || '',
@@ -605,9 +606,8 @@ export default {
},
fail: (payErr) => {
- console.log("支付失败", payErr)
uni.showToast({
- title: payErr.errMsg || '支付失败',
+ title: payErr.errMsg == 'requestPayment:fail cancel' ? '用户取消支付' : '支付失败',
icon: 'none'
})
},