From c0849dfb6e8cb67e1d969fcbdd9b3322071b4257 Mon Sep 17 00:00:00 2001 From: Lee1203 <342694918@qq.com> Date: Tue, 2 Aug 2022 13:51:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=8D=E9=A6=88=E4=BF=AE=E6=94=B9-0802?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/shopping-carts/cart-slide.vue | 2 +- components/status-nav/status-nav.vue | 27 +++-- components/tabbar/tabbar.vue | 11 +-- pages/cart/finish.vue | 2 +- pages/cart/settlement.vue | 95 +++++++++++++++--- pagesA/order/detail.vue | 8 +- pagesA/order/order.vue | 12 +-- .../.sourcemap/mp-weixin/common/main.js.map | 2 +- .../components/nothing/nothing-page.js.map | 2 +- .../share-coupon/share-coupon.js.map | 2 +- .../shopping-carts/cart-slide.js.map | 2 +- .../components/status-nav/status-nav.js.map | 2 +- .../mp-weixin/components/tabbar/tabbar.js.map | 2 +- .../mp-weixin/pages/cart/finish.js.map | 2 +- .../mp-weixin/pages/cart/settlement.js.map | 2 +- .../mp-weixin/pagesA/integral/integral.js.map | 2 +- .../mp-weixin/pagesA/order/detail.js.map | 2 +- .../mp-weixin/pagesA/order/order.js.map | 2 +- .../components/shopping-carts/cart-slide.wxml | 2 +- .../components/status-nav/status-nav.js | 25 +++-- .../dev/mp-weixin/components/tabbar/tabbar.js | 27 +++-- .../mp-weixin/components/tabbar/tabbar.wxml | 2 +- .../mp-weixin/components/tabbar/tabbar.wxss | 2 +- .../dist/dev/mp-weixin/pages/cart/finish.js | 2 +- .../dev/mp-weixin/pages/cart/settlement.js | 99 +++++++++++++++---- .../dev/mp-weixin/pages/cart/settlement.wxml | 2 +- .../dist/dev/mp-weixin/pagesA/order/detail.js | 4 +- .../dev/mp-weixin/pagesA/order/detail.wxml | 2 +- .../dist/dev/mp-weixin/pagesA/order/order.js | 8 +- .../dev/mp-weixin/pagesA/order/order.wxml | 2 +- 30 files changed, 253 insertions(+), 103 deletions(-) diff --git a/components/shopping-carts/cart-slide.vue b/components/shopping-carts/cart-slide.vue index 0c8da30..ce968aa 100644 --- a/components/shopping-carts/cart-slide.vue +++ b/components/shopping-carts/cart-slide.vue @@ -38,7 +38,7 @@ - 合计:¥{{allPrice>0?allPrice:'0'}} + 合计:{{allPrice>0?'¥'+allPrice:'0'}} {{allPrice==0 ? '去购物' : '立即购买'}} diff --git a/components/status-nav/status-nav.vue b/components/status-nav/status-nav.vue index aad9e10..92b7815 100644 --- a/components/status-nav/status-nav.vue +++ b/components/status-nav/status-nav.vue @@ -81,6 +81,11 @@ type: String, default: '20rpx' }, + // 是否返回我的页面 + ifBackMy: { + type: Boolean, + default: false + } }, data() { return { @@ -120,14 +125,20 @@ }, //返回事件 backEv() { - uni.navigateBack({ - delta: 1, - fail: () => { - uni.reLaunch({ - url: '/pages/tabbar/index/index' - }) - } - }) + if(this.ifBackMy){ + uni.reLaunch({ + url:`/pages/my/my` + }) + }else{ + uni.navigateBack({ + delta: 1, + fail: () => { + uni.reLaunch({ + url: '/pages/tabbar/index/index' + }) + } + }) + } } } } diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue index 579895f..2c67a34 100644 --- a/components/tabbar/tabbar.vue +++ b/components/tabbar/tabbar.vue @@ -1,12 +1,12 @@