diff --git a/common/js/golbalConfig.js b/common/js/golbalConfig.js index 98fb276..7fb19c9 100644 --- a/common/js/golbalConfig.js +++ b/common/js/golbalConfig.js @@ -245,6 +245,19 @@ export default { this.$store.dispatch('getCartNumber'); //重新获取购物车数据 this.$util.redirectTo(this.$util.INDEX_PAGE_URL); } + }, + + /** + * 重新定向到登录授权 + * @param {String} backUrl + * @param {Object} params + */ + redirectTologin(backUrl = '', params = {}) { + setTimeout(() => { + this.$nextTick(() => { + this.$refs?.login?.open(backUrl, 'redirectTo'); + }); + }, 0); } }, filters: { diff --git a/pages.json b/pages.json index a2ea398..2a81a55 100644 --- a/pages.json +++ b/pages.json @@ -983,4 +983,4 @@ ] } } -} \ No newline at end of file +} diff --git a/pages_goods/_components/goods-detail-view/detail.js b/pages_goods/_components/goods-detail-view/detail.js index b9fe092..bf79fe1 100644 --- a/pages_goods/_components/goods-detail-view/detail.js +++ b/pages_goods/_components/goods-detail-view/detail.js @@ -262,9 +262,9 @@ export default { return this.whetherCollection; } else { if (this.source_member) { - this.$refs.login.open(this.shareUrl + '&source_member=' + this.source_member, 'redirectTo'); + this.redirectTologin(this.shareUrl + '&source_member=' + this.source_member); } else { - this.$refs.login.open(this.shareUrl, 'redirectTo'); + this.redirectTologin(this.shareUrl); } } }, diff --git a/pages_goods/category.vue b/pages_goods/category.vue index 93209f8..e62d58d 100644 --- a/pages_goods/category.vue +++ b/pages_goods/category.vue @@ -83,7 +83,7 @@ export default { }); }, toLogin() { - this.$refs.login.open('/pages_goods/category', 'redirectTo'); + this.redirectTologin('/pages_goods/category'); } }, onPullDownRefresh() { diff --git a/pages_goods/public/js/detail.js b/pages_goods/public/js/detail.js index dadf601..155ac69 100644 --- a/pages_goods/public/js/detail.js +++ b/pages_goods/public/js/detail.js @@ -260,7 +260,7 @@ export default { // 加入购物车 joinCart() { if (!this.storeToken && this.preview == 0) { - this.$refs.login.open(this.shareUrl, 'redirectTo'); + this.redirectTologin(this.shareUrl); return; } if (this.goodsSkuDetail.is_virtual == 1) { @@ -276,7 +276,7 @@ export default { // 立即购买 buyNow() { if (!this.storeToken && this.preview == 0) { - this.$refs.login.open(this.shareUrl, 'redirectTo'); + this.redirectTologin(this.shareUrl); return; } this.$refs.goodsSku.show("buy_now", () => { @@ -352,7 +352,7 @@ export default { }, }); } else { - this.$refs.login.open(this.shareUrl, 'redirectTo'); + this.redirectTologin(this.shareUrl); this.couponBtnSwitch = false; } }, diff --git a/pages_order/_components/common-payment/payment.js b/pages_order/_components/common-payment/payment.js index c3de193..2db5377 100644 --- a/pages_order/_components/common-payment/payment.js +++ b/pages_order/_components/common-payment/payment.js @@ -76,7 +76,7 @@ export default { } else { this.$nextTick(() => { this.$refs.loadingCover.hide(); - this.$refs.login.open(this.$util.getCurrentRoute().path, 'redirectTo'); + this.redirectTologin(this.$util.getCurrentRoute().path); }) } this.getTransactionAgreement(); diff --git a/pages_promotion/fenxiao/child_fenxiao.vue b/pages_promotion/fenxiao/child_fenxiao.vue index b076378..a331ded 100644 --- a/pages_promotion/fenxiao/child_fenxiao.vue +++ b/pages_promotion/fenxiao/child_fenxiao.vue @@ -65,9 +65,8 @@ export default { }, 1000); if (!this.storeToken) { - this.$nextTick(() => { - this.$refs.login.open('/pages_promotion/fenxiao/childfenxiao', 'redirectTo'); - }); + this.redirectTologin('/pages_promotion/fenxiao/childfenxiao'); + return; } }, methods: { diff --git a/pages_promotion/fenxiao/index.vue b/pages_promotion/fenxiao/index.vue index 07df0ac..b147a68 100644 --- a/pages_promotion/fenxiao/index.vue +++ b/pages_promotion/fenxiao/index.vue @@ -290,16 +290,14 @@ export default { }, mixins: [fenxiaoWords], onShow() { - if (this.fenxiaoWords && this.fenxiaoWords.concept) this.$langConfig.title(this.fenxiaoWords.concept + this.$lang('center')); - - if (this.storeToken) { - this.checkFenxiaoIsStart(); - } else { - this.$nextTick(() => { - this.$refs.login.open('/pages_promotion/fenxiao/index', 'redirectTo'); - }); + if (!this.storeToken) { + this.redirectTologin('/pages_promotion/fenxiao/index'); + return; } + if (this.fenxiaoWords && this.fenxiaoWords.concept) this.$langConfig.title(this.fenxiaoWords.concept + this.$lang('center')); + + this.checkFenxiaoIsStart(); this.getTemplateId(); this.getPoster(); }, diff --git a/pages_promotion/fenxiao/order.vue b/pages_promotion/fenxiao/order.vue index 5273750..8636550 100644 --- a/pages_promotion/fenxiao/order.vue +++ b/pages_promotion/fenxiao/order.vue @@ -155,9 +155,7 @@ export default { if (this.fenxiaoWords && this.fenxiaoWords.concept) this.$langConfig.title(this.fenxiaoWords.concept + this.$lang('orderSuffix')); if (!this.storeToken) { - this.$nextTick(() => { - this.$refs.login.open('/pages_promotion/fenxiao/order', 'redirectTo'); - }); + this.redirectTologin('/pages_promotion/fenxiao/order'); } }, methods: { diff --git a/pages_promotion/fenxiao/order_detail.vue b/pages_promotion/fenxiao/order_detail.vue index cd66d2d..e7a2391 100644 --- a/pages_promotion/fenxiao/order_detail.vue +++ b/pages_promotion/fenxiao/order_detail.vue @@ -115,9 +115,7 @@ export default { if (this.storeToken) { this.getOrderData(); } else { - this.$nextTick(() => { - this.$refs.login.open('/pages_promotion/fenxiao/order_detail?id=' + this.orderId, 'redirectTo'); - }); + this.redirectTologin('/pages_promotion/fenxiao/order_detail?id=' + this.orderId); } }, methods: { diff --git a/pages_promotion/fenxiao/promote.vue b/pages_promotion/fenxiao/promote.vue index 9e0879a..9b99545 100644 --- a/pages_promotion/fenxiao/promote.vue +++ b/pages_promotion/fenxiao/promote.vue @@ -94,9 +94,7 @@ export default { this.getPromoteRule(); this.getFenxiaoDetail(); } else { - this.$nextTick(() => { - this.$refs.login.open('/pages_promotion/fenxiao/promote_code', 'redirectTo'); - }); + this.redirectTologin('/pages_promotion/fenxiao/promote_code'); } }, onLoad() { diff --git a/pages_promotion/fenxiao/promote_code.vue b/pages_promotion/fenxiao/promote_code.vue index 2c18ee8..ecde92d 100644 --- a/pages_promotion/fenxiao/promote_code.vue +++ b/pages_promotion/fenxiao/promote_code.vue @@ -174,9 +174,7 @@ export default { } } else { - this.$nextTick(() => { - this.$refs.login.open('/pages_promotion/fenxiao/promote_code', 'redirectTo'); - }); + this.redirectTologin('/pages_promotion/fenxiao/promote_code'); } }, onShow() { diff --git a/pages_promotion/fenxiao/team.vue b/pages_promotion/fenxiao/team.vue index 8975560..328cd15 100644 --- a/pages_promotion/fenxiao/team.vue +++ b/pages_promotion/fenxiao/team.vue @@ -122,9 +122,7 @@ export default { this.getFenXiaoLevel(); if (!this.storeToken) { - this.$nextTick(() => { - this.$refs.login.open('/pages_promotion/fenxiao/team', 'redirectTo'); - }); + this.redirectTologin('/pages_promotion/fenxiao/team'); } }, methods: { diff --git a/pages_promotion/fenxiao/withdraw_list.vue b/pages_promotion/fenxiao/withdraw_list.vue index c3410af..074d4f1 100644 --- a/pages_promotion/fenxiao/withdraw_list.vue +++ b/pages_promotion/fenxiao/withdraw_list.vue @@ -78,9 +78,7 @@ export default { if (this.fenxiaoWords && this.fenxiaoWords.withdraw) this.$langConfig.title(this.fenxiaoWords.withdraw + this.$lang('detailSuffix')); if (!this.storeToken) { - this.$nextTick(() => { - this.$refs.login.open('/pages_promotion/fenxiao/withdraw_list', 'redirectTo'); - }); + this.redirectTologin('/pages_promotion/fenxiao/withdraw_list'); } }, mixins: [fenxiaoWords], diff --git a/pages_promotion/merch/merchcategory.vue b/pages_promotion/merch/merchcategory.vue index 8822610..2a3cc9e 100644 --- a/pages_promotion/merch/merchcategory.vue +++ b/pages_promotion/merch/merchcategory.vue @@ -218,7 +218,7 @@ }, toLogin() { - this.$refs.login.open('/pages_goods/category', 'redirectTo'); + this.redirectTologin('/pages_goods/category'); } }, // onPullDownRefresh() { diff --git a/pages_promotion/point/detail.vue b/pages_promotion/point/detail.vue index d1e7954..4e79ea7 100644 --- a/pages_promotion/point/detail.vue +++ b/pages_promotion/point/detail.vue @@ -442,7 +442,7 @@ export default { // 立即购买 exchange() { if (!this.storeToken) { - this.$refs.login.open('/pages_promotion/point/detail?id=' + this.id, 'redirectTo'); + this.redirectTologin('/pages_promotion/point/detail?id=' + this.id); return; } this.$refs.goodsSku.show('point'); diff --git a/pages_promotion/point/list.vue b/pages_promotion/point/list.vue index b38b143..43ddb46 100644 --- a/pages_promotion/point/list.vue +++ b/pages_promotion/point/list.vue @@ -490,7 +490,7 @@ export default { }, //跳转至登录页面 login() { - this.$refs.login.open('/pages_promotion/point/list', 'redirectTo'); + this.redirectTologin('/pages_promotion/point/list'); }, imgError(index) { this.goodsList[index].image = this.$util.getDefaultImage().goods; @@ -521,7 +521,8 @@ export default { */ redirect(url) { if (!this.storeToken) { - this.$refs.login.open(url, 'redirectTo'); + this.redirectTologin(url); + return; } else { this.$util.redirectTo(url); } diff --git a/pages_promotion/point/order_list.vue b/pages_promotion/point/order_list.vue index 4a4a40e..1163642 100644 --- a/pages_promotion/point/order_list.vue +++ b/pages_promotion/point/order_list.vue @@ -124,14 +124,13 @@ export default { }, 2000); } }, 1000); - - if (!this.storeToken) { - this.$nextTick(() => { - this.$refs.login.open('/pages_promotion/point/order_list', 'redirectTo'); - }); - } }, onShow() { + if (!this.storeToken) { + this.redirectTologin('/pages_promotion/point/order_list'); + return; + } + if (this.$refs.mescroll) this.$refs.mescroll.refresh(); }, watch: { diff --git a/pages_tool/form/form.vue b/pages_tool/form/form.vue index 210c77a..eadac21 100644 --- a/pages_tool/form/form.vue +++ b/pages_tool/form/form.vue @@ -44,13 +44,14 @@ }); } } - if (this.storeToken) { - this.getData(); - } else { - this.$nextTick(() => { - this.$refs.login.open('/pages_tool/form/form?id=' + this.id, 'redirectTo'); - }) - } + }, + onShow() { + if (!this.storeToken) { + this.redirectTologin('/pages_tool/form/form?id=' + this.id); + return; + } + + this.getData(); }, watch: { storeToken: function(nVal, oVal) { diff --git a/pages_tool/goods/coupon.vue b/pages_tool/goods/coupon.vue index 978387c..e7644bd 100644 --- a/pages_tool/goods/coupon.vue +++ b/pages_tool/goods/coupon.vue @@ -200,7 +200,8 @@ export default { }); } else { this.couponBtnSwitch = false; - this.$refs.login.open('/pages_tool/goods/coupon', 'redirectTo'); + this.redirectTologin('/pages_tool/goods/coupon'); + return; } }, //获取优惠券列表 diff --git a/pages_tool/goods/coupon_receive.vue b/pages_tool/goods/coupon_receive.vue index a91f7a5..be7f137 100644 --- a/pages_tool/goods/coupon_receive.vue +++ b/pages_tool/goods/coupon_receive.vue @@ -133,7 +133,7 @@ }, receiveGoodsCoupon(couponTypeId) { if (!this.storeToken) { - this.$refs.login.open('/pages_tool/goods/coupon_receive?coupon_type_id=' + this.couponTypeId); + this.redirectTologin('/pages_tool/goods/coupon_receive?coupon_type_id=' + this.couponTypeId); return; } diff --git a/pages_tool/member/account.vue b/pages_tool/member/account.vue index 4557b36..a2edd12 100644 --- a/pages_tool/member/account.vue +++ b/pages_tool/member/account.vue @@ -84,9 +84,7 @@ export default { }, onShow() { if (!this.storeToken) { - setTimeout(() => { - this.$refs.login.open('/pages_tool/member/account', 'redirectTo'); - }, 100); + this.redirectTologin('/pages_tool/member/account'); return; } this.getTransferType(); diff --git a/pages_tool/member/address.vue b/pages_tool/member/address.vue index d296790..408e3dd 100644 --- a/pages_tool/member/address.vue +++ b/pages_tool/member/address.vue @@ -128,16 +128,13 @@ export default { if (option.type) this.localType = option.type; }, onShow() { + if (!this.storeToken) { + this.redirectTologin('/pages_tool/member/address'); + return; + } + uni.removeStorageSync('addressInfo'); - - if (this.storeToken) { - if (this.$refs.mescroll) this.$refs.mescroll.refresh(); - } else { - // 使用redirectTo模式:当前页被登录页替换,返回时直接回到上一页,不会产生循环 - setTimeout(() => { - this.$refs.login.open('/pages_tool/member/address', 'redirectTo'); - }, 100); - } + if (this.$refs.mescroll) this.$refs.mescroll.refresh(); }, methods: { getListData(mescroll) { diff --git a/pages_tool/member/balance.vue b/pages_tool/member/balance.vue index 8697196..9fc4c1d 100644 --- a/pages_tool/member/balance.vue +++ b/pages_tool/member/balance.vue @@ -85,11 +85,9 @@ export default { menuButtonBounding: {} // 小程序胶囊属性 }; }, - async onShow() { + onShow() { if (!this.storeToken) { - setTimeout(() => { - this.$refs.login.open('/pages_tool/member/balance', 'redirectTo'); - }, 100); + this.redirectTologin('/pages_tool/member/balance'); return; } this.getWithdrawConfig(); diff --git a/pages_tool/member/balance_detail.vue b/pages_tool/member/balance_detail.vue index dbd1207..1904d79 100644 --- a/pages_tool/member/balance_detail.vue +++ b/pages_tool/member/balance_detail.vue @@ -95,9 +95,7 @@ export default { }, onShow() { if (!this.storeToken) { - setTimeout(() => { - this.$refs.login.open('/pages_tool/member/balance_detail', 'redirectTo'); - }, 100); + this.redirectTologin('/pages_tool/member/balance_detail'); return; } }, diff --git a/pages_tool/member/bind_mobile.vue b/pages_tool/member/bind_mobile.vue index fd22e30..3d07aab 100644 --- a/pages_tool/member/bind_mobile.vue +++ b/pages_tool/member/bind_mobile.vue @@ -80,9 +80,7 @@ }, onShow() { if (!this.storeToken) { - setTimeout(() => { - this.$refs.login.open('/pages_tool/member/bind_mobile', 'redirectTo'); - }, 100); + this.redirectTologin('/pages_tool/member/bind_mobile'); return; } }, diff --git a/pages_tool/member/card.vue b/pages_tool/member/card.vue index eeb4682..84b3be4 100644 --- a/pages_tool/member/card.vue +++ b/pages_tool/member/card.vue @@ -138,17 +138,13 @@ export default { mpShareData: null //小程序分享数据 }; }, - onLoad() { - //会员卡 + onShow() { if (!this.storeToken) { - this.$nextTick(() => { - this.$refs.login.open('/pages_tool/member/card', 'redirectTo'); - }); + this.redirectTologin('/pages_tool/member/card'); return; } this.isIphoneX = this.$util.uniappIsIPhoneX(); - this.levelId = this.memberInfo.member_level; let levelInfo = this.memberInfo.member_level_info; @@ -160,9 +156,9 @@ export default { value: charge_rule[key] }); }); - this.levelInfo = levelInfo; - }, - onShow() { + this.levelInfo = levelInfo; + + //小程序分享 // #ifdef MP-WEIXIN this.$util.getMpShare('/pages_tool/member/card').then(res => { diff --git a/pages_tool/member/card_buy.vue b/pages_tool/member/card_buy.vue index 74e348e..914bbef 100644 --- a/pages_tool/member/card_buy.vue +++ b/pages_tool/member/card_buy.vue @@ -293,17 +293,16 @@ export default { onLoad() { //会员卡 this.isIphoneX = this.$util.uniappIsIPhoneX(); - - if (this.storeToken) { - this.getCardList(); - } else { - this.$nextTick(() => { - this.$refs.login.open('/pages_tool/member/card_buy', 'redirectTo'); - }); + }, + onShow() { + if (!this.storeToken) { + this.redirectTologin('/pages_tool/member/card_buy'); + return; } + + this.getCardList(); this.getAgreement(); }, - onShow() { }, watch: { storeToken: function (nVal, oVal) { if (nVal) { diff --git a/pages_tool/member/card_log.vue b/pages_tool/member/card_log.vue index b835a1b..ed16883 100644 --- a/pages_tool/member/card_log.vue +++ b/pages_tool/member/card_log.vue @@ -81,14 +81,13 @@ export default { currentFilter: 'all' }; }, - onLoad() { + onLoad() {}, + onShow() { if (!this.storeToken) { - this.$nextTick(() => { - this.$refs.login.open('/pages_tool/member/card_log', 'redirectTo'); - }); + this.redirectTologin('/pages_tool/member/card_log'); return; } - this.loadStat(); + this.loadStat(); }, methods: { // 加载统计数据 diff --git a/pages_tool/member/coupon.vue b/pages_tool/member/coupon.vue index 229d675..71b967f 100644 --- a/pages_tool/member/coupon.vue +++ b/pages_tool/member/coupon.vue @@ -84,29 +84,30 @@ export default { }; }, onLoad(data) { - setTimeout( () => { - if (!this.addonIsExist.coupon) { - this.$util.showToast({ - title: this.$lang('merchantNotEnabled'), - mask: true, - duration: 2000 - }); - setTimeout(() => { - this.$util.redirectTo(this.$util.INDEX_PAGE_URL); - }, 2000); - } - },1000); + setTimeout(() => { + this.$nextTick(() => { + if (!this.addonIsExist.coupon) { + this.$util.showToast({ + title: this.$lang('merchantNotEnabled'), + mask: true, + duration: 2000 + }); + setTimeout(() => { + this.$util.redirectTo(this.$util.INDEX_PAGE_URL); + }, 2000); + } + }); + }, 0); if (data.related_id) this.related_id = data.related_id ? data.related_id : 0; this.isIphoneX = this.$util.uniappIsIPhoneX(); }, onShow() { if (!this.storeToken) { - setTimeout(() => { - this.$refs.login.open('/pages_tool/member/coupon', 'redirectTo'); - }, 100); + this.redirectTologin('/pages_tool/member/coupon'); return; } + if (this.$refs.mescroll) this.$refs.mescroll.refresh(); }, methods: { diff --git a/pages_tool/member/invite_friends.vue b/pages_tool/member/invite_friends.vue index 807368d..3d51fce 100644 --- a/pages_tool/member/invite_friends.vue +++ b/pages_tool/member/invite_friends.vue @@ -245,17 +245,16 @@ posterMsg: '' //海报错误信息 }; }, - onLoad(option) { - this.getBaseInfo(); - if (this.storeToken) { - this.getList(); - } else { - this.$nextTick(() => { - this.$refs.login.open('/pages_tool/member/invite_friends', 'redirectTo'); - }); + onLoad(option) {}, + onShow() { + if (!this.storeToken) { + this.redirectTologin('/pages_tool/member/invite_friends'); + return; } + + this.getBaseInfo(); + this.getList(); }, - onShow() {}, mixins: [inviteFriends], onReady() {} }; diff --git a/pages_tool/member/level.vue b/pages_tool/member/level.vue index 0516783..ad395ed 100644 --- a/pages_tool/member/level.vue +++ b/pages_tool/member/level.vue @@ -217,22 +217,20 @@ } } }, - onLoad() { - this.getLevelRule(); + onShow() { if (!this.storeToken) { - this.$nextTick(() => { - this.$refs.login.open('/pages_tool/member/level', 'redirectTo'); - }); - } else { - this.getLevelList(); - } + this.redirectTologin('/pages_tool/member/level'); + return; + } + + this.getLevelRule(); + this.getLevelList(); + // #ifdef MP-ALIPAY this.scaleX = 1 this.scaleY = 1 // #endif }, - onShow() { - }, filters: { rate(index, list, growth) { let nowGrowth = Number(growth); diff --git a/pages_tool/member/point.vue b/pages_tool/member/point.vue index a344175..d67b198 100644 --- a/pages_tool/member/point.vue +++ b/pages_tool/member/point.vue @@ -90,11 +90,10 @@ export default { }, onShow() { if (!this.storeToken) { - setTimeout(() => { - this.$refs.login.open('/pages_tool/member/point', 'redirectTo'); - }, 100); + this.redirectTologin('/pages_tool/member/point'); return; - } + } + this.getMemberPoint(); }, onLoad() { diff --git a/pages_tool/member/public/js/common.js b/pages_tool/member/public/js/common.js index 5430cca..ec885fe 100644 --- a/pages_tool/member/public/js/common.js +++ b/pages_tool/member/public/js/common.js @@ -1,10 +1,11 @@ export default { methods: { - // 跳转至登录页 + // 跳转至登录页(跨平台兼容) toLogin(url) { const currentRoute = this.$util.getCurrentRoute(); const backUrl = url ?? (currentRoute && currentRoute.path ? currentRoute.path : ''); - this.$refs.login.open(backUrl, 'redirectTo'); + + this.redirectTologin(backUrl); } } -} \ No newline at end of file +} diff --git a/pages_tool/member/public/js/info.js b/pages_tool/member/public/js/info.js index 53edbab..11e9819 100644 --- a/pages_tool/member/public/js/info.js +++ b/pages_tool/member/public/js/info.js @@ -88,12 +88,10 @@ export default { }, onShow() { if (!this.storeToken) { - // 使用redirectTo模式:当前页被登录页替换,返回时直接回到上一页,不会产生循环 - setTimeout(() => { - this.$refs.login.open('/pages_tool/member/info', 'redirectTo'); - }, 100); + this.redirectTologin('/pages_tool/member/info'); return; - } + } + this.getInfo(); }, onHide() { diff --git a/pages_tool/member/public/js/signin.js b/pages_tool/member/public/js/signin.js index a953612..802cfa9 100644 --- a/pages_tool/member/public/js/signin.js +++ b/pages_tool/member/public/js/signin.js @@ -45,9 +45,7 @@ export default { }, onShow() { if (!this.storeToken) { - this.$nextTick(() => { - this.$refs.login.open('/pages_tool/member/signin', 'redirectTo'); - }); + this.redirectTologin('/pages_tool/member/signin'); return; } diff --git a/pages_tool/pay/cashier.vue b/pages_tool/pay/cashier.vue index 7af86fa..df4cc78 100644 --- a/pages_tool/pay/cashier.vue +++ b/pages_tool/pay/cashier.vue @@ -124,11 +124,10 @@ export default { }, confirm() { if (!this.storeToken) { - this.$nextTick(() => { - this.$refs.login.open('/pages_tool/pay/cashier?out_trade_no=' + this.outTradeNo); - }); + this.redirectTologin('/pages_tool/pay/cashier?out_trade_no=' + this.outTradeNo); return; } + if (this.payTypeList.length == 0 && this.payInfo.pay_money > 0) { this.$util.showToast({ title: this.$lang('pay.cashier.pleaseSelectPayMethod') diff --git a/pages_tool/recharge/order_list.vue b/pages_tool/recharge/order_list.vue index 3edd307..50b4ed7 100644 --- a/pages_tool/recharge/order_list.vue +++ b/pages_tool/recharge/order_list.vue @@ -49,11 +49,10 @@ export default { }, onShow() { if (!this.storeToken) { - setTimeout(() => { - this.$refs.login.open('/pages_tool/recharge/order_list', 'redirectTo'); - }, 100); + this.redirectTologin('/pages_tool/recharge/order_list'); return; } + if (this.$refs.mescroll) this.$refs.mescroll.refresh(); }, methods: {