From a1c5dd551442aa5ef9cc1222e8616ddaf2ef2333 Mon Sep 17 00:00:00 2001 From: 15233722133 <15233722133@163.com> Date: Fri, 5 Jun 2026 16:16:13 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=80=E9=94=AE=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=B1=95=E7=A4=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/card_navbar/card_navbar.vue | 5 +++-- components/card_navbar/inner-navbar.vue | 5 +++-- components/card_navbar/transparent_navbar.vue | 5 +++-- pages/AI/cashierDesk.vue | 3 +++ pages/AI/placeOrder.vue | 7 ++++++- pages/index/listRecord.vue | 17 ++++++--------- pages/pay/result.vue | 21 +++++++++++++++++-- sheep/components/s-layout/s-layout.vue | 9 ++++++++ sheep/components/s-pages/s-pages.vue | 3 +++ 9 files changed, 55 insertions(+), 20 deletions(-) diff --git a/components/card_navbar/card_navbar.vue b/components/card_navbar/card_navbar.vue index 7855d59..d69cbaf 100644 --- a/components/card_navbar/card_navbar.vue +++ b/components/card_navbar/card_navbar.vue @@ -2,10 +2,11 @@ - - + + + {{ props.title diff --git a/components/card_navbar/inner-navbar.vue b/components/card_navbar/inner-navbar.vue index c1e301e..508b439 100644 --- a/components/card_navbar/inner-navbar.vue +++ b/components/card_navbar/inner-navbar.vue @@ -2,10 +2,11 @@ - - + + + {{ props.title }} diff --git a/components/card_navbar/transparent_navbar.vue b/components/card_navbar/transparent_navbar.vue index 66e5666..4d119c9 100644 --- a/components/card_navbar/transparent_navbar.vue +++ b/components/card_navbar/transparent_navbar.vue @@ -2,10 +2,11 @@ - - + + + {{ props.title }} diff --git a/pages/AI/cashierDesk.vue b/pages/AI/cashierDesk.vue index 5a4fd11..20d0c28 100644 --- a/pages/AI/cashierDesk.vue +++ b/pages/AI/cashierDesk.vue @@ -206,6 +206,9 @@ sheep.$helper.toast('请选择余额支付'); return; } + if (state.orderType === 'aiGoods') { + uni.setStorageSync('pay_return_to', 'aiStore_myshop'); + } if (state.payment === 'wallet') { uni.showModal({ title: '提示', diff --git a/pages/AI/placeOrder.vue b/pages/AI/placeOrder.vue index a137cce..e660dbf 100644 --- a/pages/AI/placeOrder.vue +++ b/pages/AI/placeOrder.vue @@ -102,7 +102,12 @@ // payOrderId: res.data.payOrderId, // }); uni.redirectTo({ - url: '/pages/AI/cashierDesk?id=' + res.data.id + '&payOrderId=' + res.data.payOrderId, + url: + '/pages/AI/cashierDesk?id=' + + res.data.id + + '&payOrderId=' + + res.data.payOrderId + + '&from=aiStore', }); }, 1000); } else { diff --git a/pages/index/listRecord.vue b/pages/index/listRecord.vue index fe0e15d..ad9c800 100644 --- a/pages/index/listRecord.vue +++ b/pages/index/listRecord.vue @@ -1,10 +1,9 @@