diff --git a/common/js/golbalConfig.js b/common/js/golbalConfig.js index 27a27d4..f00e78a 100644 --- a/common/js/golbalConfig.js +++ b/common/js/golbalConfig.js @@ -145,7 +145,7 @@ export default { if (isJump && route != 'pages/index/index') { uni.setStorageSync('manual_change_store', true); // 手动切换门店 this.$store.dispatch('getCartNumber'); //重新获取购物车数据 - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); } } }, diff --git a/common/js/goods_detail_base.js b/common/js/goods_detail_base.js index 2fe192a..f61ebe5 100644 --- a/common/js/goods_detail_base.js +++ b/common/js/goods_detail_base.js @@ -240,7 +240,7 @@ export default { }, goHome() { if (this.preview) return; // 开启预览,禁止任何操作和跳转 - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); }, goCart() { if (this.preview) return; // 开启预览,禁止任何操作和跳转 diff --git a/common/js/util.js b/common/js/util.js index 7b21f81..0542fe0 100644 --- a/common/js/util.js +++ b/common/js/util.js @@ -92,7 +92,7 @@ export const checkTabBarActive = (linkUrl, currentPageRoute) => { const linkUrlParts = adaptSubpackageUrl(linkUrl).split('/'); const currentPageRouteParts = currentPageRoute.split('/'); - console.log('diy-bottom-nav verify:', { linkUrlParts, currentPageRouteParts}); + // console.log('diy-bottom-nav verify:', { linkUrlParts, currentPageRouteParts}); try { // 二级页面 @@ -804,7 +804,7 @@ export default { let routes = getCurrentPages(); // 获取当前打开过的页面路由数组 return routes.length ? routes[routes.length - 1].route : ''; }, - goBack(backUrl = '/pages/index/index') { + goBack(backUrl = INDEX_PAGE_URL) { if (getCurrentPages().length == 1) { this.redirectTo(backUrl); } else { diff --git a/components-diy/diy-bottom-nav.vue b/components-diy/diy-bottom-nav.vue index 71441c9..efe030b 100644 --- a/components-diy/diy-bottom-nav.vue +++ b/components-diy/diy-bottom-nav.vue @@ -145,7 +145,7 @@ export default { let linkUrl = link.wap_url; // 首页特殊处理 - if (linkUrl === '/pages/index/index' && this.name === 'DIY_VIEW_INDEX') { + if (linkUrl === this.$util.INDEX_PAGE_URL && this.name === 'DIY_VIEW_INDEX') { return true; } diff --git a/components-diy/diy-coupon.vue b/components-diy/diy-coupon.vue index 52d0b86..a1eaf02 100644 --- a/components-diy/diy-coupon.vue +++ b/components-diy/diy-coupon.vue @@ -454,7 +454,7 @@ export default { } }); } else { - this.$refs.login.open('/pages/index/index'); + this.$refs.login.open(this.$util.INDEX_PAGE_URL); this.couponBtnSwitch = false; } }, diff --git a/components-diy/diy-notes.vue b/components-diy/diy-notes.vue index 317f05e..2475557 100644 --- a/components-diy/diy-notes.vue +++ b/components-diy/diy-notes.vue @@ -157,7 +157,7 @@ export default { /* 点赞 */ giveLike(noteId, index) { if (!this.storeToken) { - this.$refs.login.open('/pages/index/index'); + this.$refs.login.open(this.$util.INDEX_PAGE_URL); return; } diff --git a/components/common-payment/payment.js b/components/common-payment/payment.js index 03b039d..8e26c06 100644 --- a/components/common-payment/payment.js +++ b/components/common-payment/payment.js @@ -270,7 +270,7 @@ export default { }); setTimeout(() => { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); }, 1000) } } diff --git a/components/ns-empty/ns-empty.vue b/components/ns-empty/ns-empty.vue index 3d46f4a..a11fe1e 100644 --- a/components/ns-empty/ns-empty.vue +++ b/components/ns-empty/ns-empty.vue @@ -45,7 +45,7 @@ export default { if (this.emptyBtn.url) { this.$util.redirectTo(this.emptyBtn.url, {}, 'redirectTo'); } else { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); } }, re(text) { diff --git a/components/ns-goods-sku/ns-goods-sku-index.vue b/components/ns-goods-sku/ns-goods-sku-index.vue index 345b7a1..f57f889 100644 --- a/components/ns-goods-sku/ns-goods-sku-index.vue +++ b/components/ns-goods-sku/ns-goods-sku-index.vue @@ -28,7 +28,7 @@ export default { */ addCart(config, data, event) { if (!this.storeToken) { - this.$refs.login.open('/pages/index/index') + this.$refs.login.open(this.$util.INDEX_PAGE_URL); return; } if (config == "detail" || data.is_virtual) { diff --git a/components/ns-goods-sku/ns-goods-sku.vue b/components/ns-goods-sku/ns-goods-sku.vue index 2275870..33851d4 100644 --- a/components/ns-goods-sku/ns-goods-sku.vue +++ b/components/ns-goods-sku/ns-goods-sku.vue @@ -413,7 +413,7 @@ this.isLoad = false; if (callback) callback(); } else { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); } } }); @@ -441,7 +441,7 @@ this.skuId = res.data[0].sku_id; this.goodsSkuInfo = obj; } else { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); } } }); @@ -467,7 +467,7 @@ this.skuId = res.data[0].sku_id; this.goodsSkuInfo = obj; } else { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); } } }); @@ -500,7 +500,7 @@ this.skuId = res.data[0].sku_id; this.goodsSkuInfo = obj; } else { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); } } }); @@ -527,7 +527,7 @@ this.skuId = res.data[0].sku_id; this.goodsSkuInfo = obj; } else { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); } } }); @@ -553,7 +553,7 @@ this.skuId = res.data[0].sku_id; this.goodsSkuInfo = obj; } else { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); } } }); @@ -579,7 +579,7 @@ this.skuId = res.data[0].sku_id; this.goodsSkuInfo = obj; } else { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); } } }); @@ -606,7 +606,7 @@ this.skuId = res.data[0].sku_id; this.goodsSkuInfo = obj; } else { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); } } }); @@ -630,7 +630,7 @@ this.skuId = res.data[0].sku_id; this.goodsSkuInfo = obj; } else { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); } } }); diff --git a/components/ns-payment/ns-payment.vue b/components/ns-payment/ns-payment.vue index 7bb750f..6550598 100644 --- a/components/ns-payment/ns-payment.vue +++ b/components/ns-payment/ns-payment.vue @@ -185,7 +185,7 @@ export default { title: '未获取到支付信息!' }); setTimeout(() => { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); }, 1500); } } diff --git a/components/register-reward/register-reward.vue b/components/register-reward/register-reward.vue index 4146909..7b42111 100644 --- a/components/register-reward/register-reward.vue +++ b/components/register-reward/register-reward.vue @@ -138,7 +138,7 @@ break; default: if (this.back) this.$util.redirectTo(decodeURIComponent(this.back), {}, 'redirectTo'); - else this.$util.redirectTo('/pages/index/index'); + else this.$util.redirectTo(this.$util.INDEX_PAGE_URL); break; } } diff --git a/pages_promotion/fenxiao/apply.vue b/pages_promotion/fenxiao/apply.vue index 33b8ebd..fc99c53 100644 --- a/pages_promotion/fenxiao/apply.vue +++ b/pages_promotion/fenxiao/apply.vue @@ -196,7 +196,7 @@ duration: 2000 }); setTimeout(() => { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); }, 2000); } },1000); diff --git a/pages_promotion/fenxiao/bill.vue b/pages_promotion/fenxiao/bill.vue index 724601d..039f51c 100644 --- a/pages_promotion/fenxiao/bill.vue +++ b/pages_promotion/fenxiao/bill.vue @@ -40,7 +40,7 @@ export default { duration: 2000 }); setTimeout(() => { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); }, 2000); } }, 1000); diff --git a/pages_promotion/fenxiao/child_fenxiao.vue b/pages_promotion/fenxiao/child_fenxiao.vue index b138908..5263f1f 100644 --- a/pages_promotion/fenxiao/child_fenxiao.vue +++ b/pages_promotion/fenxiao/child_fenxiao.vue @@ -59,7 +59,7 @@ export default { duration: 2000 }); setTimeout(() => { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); }, 2000); } }, 1000); diff --git a/pages_promotion/fenxiao/index.vue b/pages_promotion/fenxiao/index.vue index 628158e..4b4cfb4 100644 --- a/pages_promotion/fenxiao/index.vue +++ b/pages_promotion/fenxiao/index.vue @@ -307,7 +307,7 @@ export default { duration: 2000 }); setTimeout(() => { - this.$util.redirectTo('/pages/index/index', {}, 'redirectTo'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL, {}, 'redirectTo'); }, 2000); } }, 1000); diff --git a/pages_promotion/fenxiao/level.vue b/pages_promotion/fenxiao/level.vue index a673cb0..bf34ca4 100644 --- a/pages_promotion/fenxiao/level.vue +++ b/pages_promotion/fenxiao/level.vue @@ -213,7 +213,7 @@ duration: 2000 }); setTimeout(() => { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); }, 2000); } },1000); diff --git a/pages_promotion/fenxiao/order.vue b/pages_promotion/fenxiao/order.vue index df7c28f..6981267 100644 --- a/pages_promotion/fenxiao/order.vue +++ b/pages_promotion/fenxiao/order.vue @@ -142,7 +142,7 @@ export default { duration: 2000 }); setTimeout(() => { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); }, 2000); } }, 1000); diff --git a/pages_promotion/fenxiao/order_detail.vue b/pages_promotion/fenxiao/order_detail.vue index 4158687..5ff1ead 100644 --- a/pages_promotion/fenxiao/order_detail.vue +++ b/pages_promotion/fenxiao/order_detail.vue @@ -105,7 +105,7 @@ export default { duration: 2000 }); setTimeout(() => { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); }, 2000); } },1000); diff --git a/pages_promotion/fenxiao/promote.vue b/pages_promotion/fenxiao/promote.vue index e634a8d..5b9988b 100644 --- a/pages_promotion/fenxiao/promote.vue +++ b/pages_promotion/fenxiao/promote.vue @@ -84,7 +84,7 @@ export default { duration: 2000 }); setTimeout(() => { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); }, 2000); } }, 1000); diff --git a/pages_promotion/fenxiao/promote_code.vue b/pages_promotion/fenxiao/promote_code.vue index 7646fce..8b169ad 100644 --- a/pages_promotion/fenxiao/promote_code.vue +++ b/pages_promotion/fenxiao/promote_code.vue @@ -35,7 +35,7 @@ - + @@ -65,7 +65,7 @@ export default { this.$api.sendRequest({ url: '/fenxiao/api/fenxiao/poster', data: { - page: '/pages/index/index', + page: this.$util.INDEX_PAGE_URL, qrcode_param: JSON.stringify({}), template_id: id }, @@ -154,7 +154,7 @@ export default { duration: 2000 }); setTimeout(() => { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); }, 2000); } }, 1000); diff --git a/pages_promotion/fenxiao/public/js/goods_list.js b/pages_promotion/fenxiao/public/js/goods_list.js index 67b8f53..45d02cc 100644 --- a/pages_promotion/fenxiao/public/js/goods_list.js +++ b/pages_promotion/fenxiao/public/js/goods_list.js @@ -27,7 +27,7 @@ export default { duration: 2000 }); setTimeout(() => { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); }, 2000); } }, 1000); diff --git a/pages_promotion/fenxiao/team.vue b/pages_promotion/fenxiao/team.vue index 0662ff6..3b40974 100644 --- a/pages_promotion/fenxiao/team.vue +++ b/pages_promotion/fenxiao/team.vue @@ -113,7 +113,7 @@ export default { duration: 2000 }); setTimeout(() => { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); }, 2000); } }, 1000); diff --git a/pages_promotion/fenxiao/withdraw_list.vue b/pages_promotion/fenxiao/withdraw_list.vue index b60b536..0e37783 100644 --- a/pages_promotion/fenxiao/withdraw_list.vue +++ b/pages_promotion/fenxiao/withdraw_list.vue @@ -70,7 +70,7 @@ export default { duration: 2000 }); setTimeout(() => { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); }, 2000); } }, 1000); diff --git a/pages_promotion/point/list.vue b/pages_promotion/point/list.vue index db7101a..cea5470 100644 --- a/pages_promotion/point/list.vue +++ b/pages_promotion/point/list.vue @@ -302,7 +302,7 @@ export default { duration: 2000 }); setTimeout(() => { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); }, 2000); } }, 1000); @@ -544,7 +544,7 @@ export default { if (getCurrentPages().length > 1) uni.navigateBack({ delta: 1 }); - else this.$util.redirectTo('/pages/index/index'); + else this.$util.redirectTo(this.$util.INDEX_PAGE_URL); }, getNewestGame() { this.$api.sendRequest({ diff --git a/pages_promotion/point/order_list.vue b/pages_promotion/point/order_list.vue index 1f87102..3260d45 100644 --- a/pages_promotion/point/order_list.vue +++ b/pages_promotion/point/order_list.vue @@ -120,7 +120,7 @@ export default { duration: 2000 }); setTimeout(() => { - this.$util.redirectTo('/pages/index/index', {}, 'redirectTo'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL, {}, 'redirectTo'); }, 2000); } }, 1000); diff --git a/pages_promotion/point/public/js/payment.js b/pages_promotion/point/public/js/payment.js index c06528b..c651b0f 100644 --- a/pages_promotion/point/public/js/payment.js +++ b/pages_promotion/point/public/js/payment.js @@ -95,7 +95,7 @@ export default { title: '未获取到创建订单所需数据!' }); setTimeout(() => { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); }, 1500); } return; @@ -122,7 +122,7 @@ export default { title: '未获取到创建订单所需数据!' }); setTimeout(() => { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); }, 1500); } }, diff --git a/pages_promotion/point/result.vue b/pages_promotion/point/result.vue index ce14ea8..ebe3e74 100644 --- a/pages_promotion/point/result.vue +++ b/pages_promotion/point/result.vue @@ -23,7 +23,7 @@ this.$util.redirectTo('/pages_promotion/point/order_list', {}, 'redirectTo'); }, toIndex() { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); } } }; diff --git a/pages_tool/goods/coupon.vue b/pages_tool/goods/coupon.vue index a95e53c..51cd200 100644 --- a/pages_tool/goods/coupon.vue +++ b/pages_tool/goods/coupon.vue @@ -99,7 +99,7 @@ export default { duration: 2000 }); setTimeout(() => { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); }, 2000); } }, 1000); diff --git a/pages_tool/goods/coupon_receive.vue b/pages_tool/goods/coupon_receive.vue index ff2eb34..c7e9944 100644 --- a/pages_tool/goods/coupon_receive.vue +++ b/pages_tool/goods/coupon_receive.vue @@ -58,7 +58,7 @@ duration: 2000 }); setTimeout(() => { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); }, 2000); } },1000); diff --git a/pages_tool/member/cancelstatus.vue b/pages_tool/member/cancelstatus.vue index c0675b8..062422c 100644 --- a/pages_tool/member/cancelstatus.vue +++ b/pages_tool/member/cancelstatus.vue @@ -71,7 +71,7 @@ this.$store.commit('setMemberInfo', ''); this.$store.commit('setMemberInfo', ''); this.$store.dispatch('emptyCart'); - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); } } }); diff --git a/pages_tool/member/cancelsuccess.vue b/pages_tool/member/cancelsuccess.vue index 4f975ab..91d03a5 100644 --- a/pages_tool/member/cancelsuccess.vue +++ b/pages_tool/member/cancelsuccess.vue @@ -40,7 +40,7 @@ this.$store.commit('setToken', ''); this.$store.commit('setMemberInfo', ''); this.$store.dispatch('emptyCart'); - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); } } } diff --git a/pages_tool/member/coupon.vue b/pages_tool/member/coupon.vue index 96aa047..5539916 100644 --- a/pages_tool/member/coupon.vue +++ b/pages_tool/member/coupon.vue @@ -60,7 +60,7 @@ - + @@ -93,7 +93,7 @@ export default { duration: 2000 }); setTimeout(() => { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); }, 2000); } },1000); diff --git a/pages_tool/member/public/js/common.js b/pages_tool/member/public/js/common.js index 09714f6..9f11e9e 100644 --- a/pages_tool/member/public/js/common.js +++ b/pages_tool/member/public/js/common.js @@ -1,8 +1,9 @@ export default { methods: { // 跳转至登录页 - toLogin() { - this.$refs.login.open(); + toLogin(url) { + console.log('跳转至登录页', {url, currentRoute: this.$util.getCurrentRoute()}); + this.$refs.login.open(url ?? this.$util.getCurrentRoute()); } } } \ No newline at end of file diff --git a/pages_tool/member/public/js/invite_friends.js b/pages_tool/member/public/js/invite_friends.js index 884833b..12e5a86 100644 --- a/pages_tool/member/public/js/invite_friends.js +++ b/pages_tool/member/public/js/invite_friends.js @@ -51,7 +51,7 @@ export default { this.$refs.rulePopup.close(); }, copyUrl() { - let text = this.$config.h5Domain + '/pages/index/index'; + let text = this.$config.h5Domain + this.$util.INDEX_PAGE_URL; if (this.memberInf && this.memberInfo.member_id) text += '?source_member=' + this.memberInfo.member_id; this.$util.copy(text, () => { this.closeSharePopup(); @@ -76,7 +76,7 @@ export default { this.$api.sendRequest({ url: "/memberrecommend/api/memberrecommend/poster", data: { - page: '/pages/index/index', + page: this.$util.INDEX_PAGE_URL, qrcode_param: JSON.stringify(qrcode_param) }, success: res => { diff --git a/pages_tool/member/public/js/signin.js b/pages_tool/member/public/js/signin.js index 1367659..94d2f11 100644 --- a/pages_tool/member/public/js/signin.js +++ b/pages_tool/member/public/js/signin.js @@ -33,7 +33,7 @@ export default { duration: 2000 }); setTimeout(() => { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); }, 2000); } },1000); diff --git a/pages_tool/pay/index.vue b/pages_tool/pay/index.vue index 19f857c..9b762dd 100644 --- a/pages_tool/pay/index.vue +++ b/pages_tool/pay/index.vue @@ -54,7 +54,7 @@ export default { title: '未获取到支付信息!' }); setTimeout(() => { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); }, 1500); } }, diff --git a/pages_tool/pay/result.vue b/pages_tool/pay/result.vue index 0ca0a22..d55a788 100644 --- a/pages_tool/pay/result.vue +++ b/pages_tool/pay/result.vue @@ -133,7 +133,7 @@ title: '未获取到支付信息!' }); setTimeout(() => { - this.$util.redirectTo('/pages/index/index', {}, 'reLaunch'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL, {}, 'reLaunch'); }, 1500); } }, @@ -143,7 +143,7 @@ }); }, goHome() { - this.$util.redirectTo('/pages/index/index', {}, 'reLaunch'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL, {}, 'reLaunch'); }, toOrderDetail(id) { if (this.payInfo.order_type == 2) { diff --git a/pages_tool/storeclose/storeclose.vue b/pages_tool/storeclose/storeclose.vue index c710e27..55a7062 100644 --- a/pages_tool/storeclose/storeclose.vue +++ b/pages_tool/storeclose/storeclose.vue @@ -30,7 +30,7 @@ export default { data: {}, success: res => { if (res.code == 0) { - this.$util.redirectTo('/pages/index/index'); + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); } } });