From 1317df72c7604f340985176b3bc2ef88bc1214a3 Mon Sep 17 00:00:00 2001 From: Lee1203 <342694918@qq.com> Date: Tue, 2 Aug 2022 20:01:54 +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/status-nav/status-nav.vue | 15 ++++--- pages/cart/settlement.vue | 44 ++++++++++++++----- pagesA/distribution/distribution.vue | 7 +-- pagesA/integral/integral.vue | 2 +- pagesA/order/detail.vue | 6 +-- pagesA/order/order.vue | 7 +-- pagesB/distributor/distributor.vue | 3 +- .../.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 +- .../pagesA/distribution/distribution.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 +- .../pagesB/distributor/distributor.js.map | 2 +- .../components/status-nav/status-nav.js | 15 ++++--- .../components/status-nav/status-nav.json | 4 +- .../dev/mp-weixin/pages/cart/settlement.js | 44 ++++++++++++++----- .../dev/mp-weixin/pages/cart/settlement.wxml | 2 +- .../pagesA/distribution/distribution.js | 3 +- .../pagesA/distribution/distribution.wxml | 2 +- .../dev/mp-weixin/pagesA/integral/integral.js | 19 ++++++++ .../mp-weixin/pagesA/integral/integral.wxml | 2 +- .../dist/dev/mp-weixin/pagesA/order/detail.js | 2 +- .../dev/mp-weixin/pagesA/order/detail.wxml | 2 +- .../dist/dev/mp-weixin/pagesA/order/order.js | 7 +-- .../dev/mp-weixin/pagesA/order/order.wxml | 2 +- .../pagesB/distributor/distributor.js | 5 ++- .../pagesB/distributor/distributor.wxml | 2 +- 34 files changed, 150 insertions(+), 71 deletions(-) diff --git a/components/status-nav/status-nav.vue b/components/status-nav/status-nav.vue index 92b7815..fca6b06 100644 --- a/components/status-nav/status-nav.vue +++ b/components/status-nav/status-nav.vue @@ -82,9 +82,9 @@ default: '20rpx' }, // 是否返回我的页面 - ifBackMy: { - type: Boolean, - default: false + backTag: { + type: String, + default: '' } }, data() { @@ -125,11 +125,16 @@ }, //返回事件 backEv() { - if(this.ifBackMy){ + if(this.backTag == 'backmy'){ uni.reLaunch({ url:`/pages/my/my` }) - }else{ + }else if(this.backTag == 'backindex'){ + uni.reLaunch({ + url:`/pages/index/index` + }) + } + else{ uni.navigateBack({ delta: 1, fail: () => { diff --git a/pages/cart/settlement.vue b/pages/cart/settlement.vue index 189b649..2112f10 100644 --- a/pages/cart/settlement.vue +++ b/pages/cart/settlement.vue @@ -69,8 +69,8 @@ 积分抵扣 - diff --git a/pagesA/order/detail.vue b/pagesA/order/detail.vue index 9dc0d51..64e833a 100644 --- a/pagesA/order/detail.vue +++ b/pagesA/order/detail.vue @@ -1,6 +1,6 @@