From 7ec67acdedce5bdeee7649c2db8f49b819345655 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Sat, 14 Mar 2026 14:57:51 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E9=80=82=E9=85=8D=E6=94=AF=E4=BB=98?= =?UTF-8?q?=EF=BC=8C=E7=AC=AC=E4=B8=89=E6=96=B9app?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 4 +- src/pages.json | 18 +++++ src/pages/pay/payComplete.vue | 4 +- src/pages/pay/scanPay.vue | 14 ++-- src/pages/prosperity-shop/goods-detail.vue | 7 +- src/pages/prosperity-shop/goods-search.vue | 32 +++++---- src/pages/prosperity-shop/shop-detail.vue | 8 +-- .../prosperity-shop/use-shop-detail-scroll.ts | 8 ++- src/pages/root/dashboard.vue | 5 +- src/pages/root/web-view.vue | 24 +++++++ src/pages/tabbar/coopMerchant.vue | 7 +- src/pages/tabbar/my.vue | 38 ++++++++--- src/pages/tabbar/prosperityShop.vue | 23 ++++--- src/pages/tabbar/prosperityShopMchList.vue | 15 +++-- src/pages/tabbar/selfMerchant.vue | 2 +- src/sheep/components/number-keyboard.vue | 8 +-- src/sheep/hooks/use-scan-code.ts | 63 +++++------------- src/sheep/stores/tabbar.ts | 2 +- src/sheep/utils/app.ts | 10 +++ src/static/icon/birthday.png | Bin 0 -> 7448 bytes src/static/icon/birthday_coupon.jpg | Bin 0 -> 91457 bytes src/static/page/happy-mall.png | Bin 0 -> 111827 bytes 22 files changed, 173 insertions(+), 119 deletions(-) create mode 100644 src/pages/root/web-view.vue create mode 100644 src/static/icon/birthday.png create mode 100644 src/static/icon/birthday_coupon.jpg create mode 100644 src/static/page/happy-mall.png diff --git a/src/App.vue b/src/App.vue index ab297ac..dcc7a76 100644 --- a/src/App.vue +++ b/src/App.vue @@ -21,8 +21,8 @@ export default { }, onHide() { console.log("App Hide"); - const _this = this; - wx.offAppRoute(_this.watchRouter) + // const _this = this; + // wx.offAppRoute(_this.watchRouter) }, methods: { async watchRouter(route) { diff --git a/src/pages.json b/src/pages.json index 39cbc7e..5a69bb8 100644 --- a/src/pages.json +++ b/src/pages.json @@ -92,6 +92,13 @@ "navigationBarTitleText": "账号密码登录", "disableScroll": true } + }, + { + "path": "pages/root/web-view", + "style": { + "navigationBarTitleText": "webview页面", + "disableScroll": true + } } ], "subPackages": [ @@ -440,6 +447,17 @@ } } ] + }, + { + "root": "pages/third-app", + "pages": [ + { + "path": "happyMall", + "style": { + "navigationBarTitleText": "美好商城" + } + } + ] } ], "globalStyle": { diff --git a/src/pages/pay/payComplete.vue b/src/pages/pay/payComplete.vue index 8ada9c2..06a7d6c 100644 --- a/src/pages/pay/payComplete.vue +++ b/src/pages/pay/payComplete.vue @@ -9,11 +9,11 @@ fill="#2BCDA3" p-id="1709" data-spm-anchor-id="a313x.search_index.0.i2.beb13a81SVstw0" class="selected"> - 支付成功 + 支付成功 - ¥{{ scanPayData.payPrice }} + ¥{{ scanPayData.payPrice }} diff --git a/src/pages/pay/scanPay.vue b/src/pages/pay/scanPay.vue index 05bd5b7..f2edf39 100644 --- a/src/pages/pay/scanPay.vue +++ b/src/pages/pay/scanPay.vue @@ -1,31 +1,29 @@