From 65c229c37b874f46f5df00388e6fec6542517cf7 Mon Sep 17 00:00:00 2001 From: 15233722133 <15233722133@163.com> Date: Mon, 8 Jun 2026 13:20:45 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=94=B6=E9=93=B6=E5=8F=B0?= =?UTF-8?q?=E5=8C=BA=E5=88=86=E6=A0=87=E8=AF=86=E8=BF=94=E5=9B=9E=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 ++- pages/AI/cashierDesk.vue | 12 +++++++++--- pages/AI/giftCashierDesk.vue | 7 +++++++ pages/AI/giftOrder.vue | 1 + pages/pay/result.vue | 15 +++++++++++++++ 5 files changed, 34 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b2661d..fc62acc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,4 +14,5 @@ - 选品广场结算返回到我的店铺页 - 点底部 tab 的`AI店铺`时没开通就不跳转并提示 - `会员优选`商品卡片点击不再跳转到商品详情页 -- 购物车为空时:底部不显示“去结算” \ No newline at end of file +- 购物车为空时:底部不显示“去结算” +- 会员专区→买商品→支付→支付结果→返回首页「选品广场」;选品广场→买商品→支付→支付结果→返回首页「我的店铺」 diff --git a/pages/AI/cashierDesk.vue b/pages/AI/cashierDesk.vue index 20d0c28..de1d802 100644 --- a/pages/AI/cashierDesk.vue +++ b/pages/AI/cashierDesk.vue @@ -74,6 +74,7 @@ let payOrderId = ref(''); let orderInfo = ref({}); const userWallet = ref(); + const returnTo = ref(''); let totalRecharge = ref(); // 检测支付环境 @@ -175,6 +176,7 @@ id.value = options.id || ''; payOrderId.value = options.payOrderId || ''; type.value = options.type || ''; + returnTo.value = options.returnTo || ''; if (type.value == 2) { state.orderType = 'aiRecharge'; @@ -206,9 +208,13 @@ sheep.$helper.toast('请选择余额支付'); return; } - if (state.orderType === 'aiGoods') { - uni.setStorageSync('pay_return_to', 'aiStore_myshop'); - } + if (returnTo.value) { + uni.setStorageSync('pay_return_to', returnTo.value); + } else if (String(type.value) === '2') { + uni.setStorageSync('pay_return_to', 'aiStore_plaza'); + } else if (state.orderType === 'aiGoods') { + uni.setStorageSync('pay_return_to', 'aiStore_myshop'); + } if (state.payment === 'wallet') { uni.showModal({ title: '提示', diff --git a/pages/AI/giftCashierDesk.vue b/pages/AI/giftCashierDesk.vue index f018307..acb4ab1 100644 --- a/pages/AI/giftCashierDesk.vue +++ b/pages/AI/giftCashierDesk.vue @@ -97,6 +97,7 @@ let payOrderId = ref(''); let orderInfo = ref({}); const userWallet = ref(); + const returnTo = ref(''); let totalRecharge = ref(); // 检测支付环境 @@ -197,6 +198,7 @@ id.value = options.id || ''; payOrderId.value = options.payOrderId || ''; type.value = options.type || ''; + returnTo.value = options.returnTo || ''; if (type.value == 2) { state.orderType = 'aiRecharge'; @@ -228,6 +230,11 @@ sheep.$helper.toast('请选择余额支付'); return; } + if (returnTo.value) { + uni.setStorageSync('pay_return_to', returnTo.value); + } else if (state.orderType === 'aiGoods') { + uni.setStorageSync('pay_return_to', 'aiStore_myshop'); + } if (state.payment === 'wallet') { uni.showModal({ title: '提示', diff --git a/pages/AI/giftOrder.vue b/pages/AI/giftOrder.vue index 5c3a578..f34950c 100644 --- a/pages/AI/giftOrder.vue +++ b/pages/AI/giftOrder.vue @@ -94,6 +94,7 @@ proxy.utils.go('/pages/AI/giftCashierDesk', { id: res.data.id, payOrderId: res.data.payOrderId, + returnTo: 'aiStore_plaza', }); }, 1000); } diff --git a/pages/pay/result.vue b/pages/pay/result.vue index a2641d0..df765ef 100644 --- a/pages/pay/result.vue +++ b/pages/pay/result.vue @@ -131,6 +131,16 @@ }); }; + const goAiStorePlazaTab = () => { + const url = '/pages/index/aiStore'; + uni.redirectTo({ + url, + fail: () => { + uni.reLaunch({ url }); + }, + }); + }; + const onBackHome = () => { const returnTo = uni.getStorageSync('pay_return_to'); if (returnTo === 'aiStore_myshop') { @@ -138,6 +148,11 @@ goAiStoreMyShopTab(); return; } + if (returnTo === 'aiStore_plaza') { + uni.removeStorageSync('pay_return_to'); + goAiStorePlazaTab(); + return; + } const orderType = String(state.orderType || '').trim(); if (orderType === 'aiGoods') { goAiStoreMyShopTab();