From 2f230d3b2c0738d0791b6aa70803bcf8501d7789 Mon Sep 17 00:00:00 2001 From: ZF sun <34314687@qq.com> Date: Wed, 7 Jan 2026 15:51:24 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BD=BF=E7=94=A8=E5=B8=B8=E9=87=8F?= =?UTF-8?q?=E6=9D=A5=E5=A4=84=E7=90=86=E7=99=BB=E5=BD=95=E7=9A=84=E8=B7=AF?= =?UTF-8?q?=E7=94=B1=E9=A1=B5=E9=9D=A2=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/js/util.js | 2 ++ components-diy/diy-fenxiao-goods-list.vue | 2 +- components/ns-login/ns-login.vue | 4 ++-- pages_order/detail.vue | 2 +- pages_order/detail_point.vue | 2 +- pages_promotion/fenxiao/apply.vue | 2 +- pages_promotion/fenxiao/level.vue | 2 +- pages_promotion/fenxiao/public/js/goods_list.js | 2 +- pages_promotion/fenxiao/withdraw_apply.vue | 2 +- pages_promotion/fenxiao/withdrawal_detail.vue | 2 +- pages_promotion/point/public/js/payment.js | 2 +- pages_tool/login/find.vue | 4 ++-- pages_tool/member/apply_withdrawal.vue | 2 +- pages_tool/member/assets.vue | 2 +- pages_tool/member/cancellation.vue | 2 +- pages_tool/member/cancelrefuse.vue | 2 +- pages_tool/member/cancelstatus.vue | 2 +- pages_tool/member/cancelsuccess.vue | 2 +- pages_tool/member/modify_face.vue | 2 +- pages_tool/member/pay_password.vue | 2 +- pages_tool/member/point_detail.vue | 2 +- pages_tool/member/withdrawal.vue | 2 +- pages_tool/member/withdrawal_detail.vue | 2 +- pages_tool/order/logistics.vue | 2 +- pages_tool/order/public/js/evaluate.js | 2 +- pages_tool/order/refund.vue | 2 +- pages_tool/order/refund_batch.vue | 2 +- pages_tool/order/refund_detail.vue | 2 +- pages_tool/order/refund_type_select.vue | 2 +- pages_tool/pay/index.vue | 2 +- 30 files changed, 33 insertions(+), 31 deletions(-) diff --git a/common/js/util.js b/common/js/util.js index 0542fe0..9829e01 100644 --- a/common/js/util.js +++ b/common/js/util.js @@ -12,6 +12,7 @@ export const INDEX_PAGE_URL = '/pages/index/index'; export const CATEGORY_PAGE_URL = '/pages_goods/category'; export const CONTACT_PAGE_URL = '/pages_tool/contact/contact'; export const MEMBER_PAGE_URL = '/pages_tool/member/index'; +export const LOGIN_PAGE_URL = '/pages_tool/login/login'; // 当前最新的tabBar.list (参见pages.json 中的tabBar.list 配置) export const systemTabBarList = [ @@ -117,6 +118,7 @@ export default { CATEGORY_PAGE_URL, CONTACT_PAGE_URL, INDEX_PAGE_URL, + LOGIN_PAGE_URL, /** * 页面跳转 diff --git a/components-diy/diy-fenxiao-goods-list.vue b/components-diy/diy-fenxiao-goods-list.vue index fbdd61f..4b0e073 100644 --- a/components-diy/diy-fenxiao-goods-list.vue +++ b/components-diy/diy-fenxiao-goods-list.vue @@ -75,7 +75,7 @@ export default { this.currentRoute = '/' + currentPage.route; if (!this.storeToken) { this.$util.redirectTo( - '/pages_tool/login/login', + this.$util.LOGIN_PAGE_URL, { back: this.currentRoute }, diff --git a/components/ns-login/ns-login.vue b/components/ns-login/ns-login.vue index 0716ab8..f14421e 100644 --- a/components/ns-login/ns-login.vue +++ b/components/ns-login/ns-login.vue @@ -286,10 +286,10 @@ export default { // 跳转去登录页 toLogin(mode = 'navigateTo') { - if (this.url) this.$util.redirectTo('/pages_tool/login/login', { + if (this.url) this.$util.redirectTo(this.$util.LOGIN_PAGE_URL, { back: encodeURIComponent(this.url) }, mode); - else this.$util.redirectTo('/pages_tool/login/login', {}, mode); + else this.$util.redirectTo(this.$util.LOGIN_PAGE_URL, {}, mode); }, // 取消完善信息 diff --git a/pages_order/detail.vue b/pages_order/detail.vue index 16202b9..43043f3 100644 --- a/pages_order/detail.vue +++ b/pages_order/detail.vue @@ -669,7 +669,7 @@ export default { this.getEvaluateConfig(); this.getOrderData(); } else { - this.$util.redirectTo('/pages_tool/login/login', { + this.$util.redirectTo(this.$util.LOGIN_PAGE_URL, { back: '/pages_order/detail?order_id=' + this.orderId + '&merchant_trade_no=' + this.merchantTradeNo }); } diff --git a/pages_order/detail_point.vue b/pages_order/detail_point.vue index 37ee721..de67e82 100644 --- a/pages_order/detail_point.vue +++ b/pages_order/detail_point.vue @@ -161,7 +161,7 @@ export default { if (this.storeToken) { this.getOrderData(); } else { - this.$util.redirectTo('/pages_tool/login/login', { + this.$util.redirectTo(this.$util.LOGIN_PAGE_URL, { back: '/pages_order/detail_point?order_id=' + this.orderId }); } diff --git a/pages_promotion/fenxiao/apply.vue b/pages_promotion/fenxiao/apply.vue index fc99c53..cf484cf 100644 --- a/pages_promotion/fenxiao/apply.vue +++ b/pages_promotion/fenxiao/apply.vue @@ -213,7 +213,7 @@ this.applyStatus(); this.getSourceMemberInfo(); } else { - this.$util.redirectTo('/pages_tool/login/login', { + this.$util.redirectTo(this.$util.LOGIN_PAGE_URL, { back: '/pages_promotion/fenxiao/apply' }, 'redirectTo'); } diff --git a/pages_promotion/fenxiao/level.vue b/pages_promotion/fenxiao/level.vue index bf34ca4..1aeafd0 100644 --- a/pages_promotion/fenxiao/level.vue +++ b/pages_promotion/fenxiao/level.vue @@ -224,7 +224,7 @@ this.getFenxiaoInfo(); this.getBasicsConfig(); } else { - this.$util.redirectTo('/pages_tool/login/login', { + this.$util.redirectTo(this.$util.LOGIN_PAGE_URL, { back: '/pages_promotion/fenxiao/level' }); } diff --git a/pages_promotion/fenxiao/public/js/goods_list.js b/pages_promotion/fenxiao/public/js/goods_list.js index 45d02cc..5d37f94 100644 --- a/pages_promotion/fenxiao/public/js/goods_list.js +++ b/pages_promotion/fenxiao/public/js/goods_list.js @@ -40,7 +40,7 @@ export default { if (!this.storeToken) { this.$util.redirectTo( - '/pages_tool/login/login', { + this.$util.LOGIN_PAGE_URL, { back: '/pages_promotion/fenxiao/goods_list' }, 'redirectTo' diff --git a/pages_promotion/fenxiao/withdraw_apply.vue b/pages_promotion/fenxiao/withdraw_apply.vue index e5dfb4e..febccdc 100644 --- a/pages_promotion/fenxiao/withdraw_apply.vue +++ b/pages_promotion/fenxiao/withdraw_apply.vue @@ -90,7 +90,7 @@ this.getBankAccountInfo(); this.getWithdrawInfo(); } else { - this.$util.redirectTo('/pages_tool/login/login', { + this.$util.redirectTo(this.$util.LOGIN_PAGE_URL, { back: '/pages_promotion/fenxiao/withdraw_apply' }); } diff --git a/pages_promotion/fenxiao/withdrawal_detail.vue b/pages_promotion/fenxiao/withdrawal_detail.vue index 51d563a..e581f9b 100644 --- a/pages_promotion/fenxiao/withdrawal_detail.vue +++ b/pages_promotion/fenxiao/withdrawal_detail.vue @@ -67,7 +67,7 @@ export default { if (this.storeToken) { this.getDetail(); } else { - this.$util.redirectTo('/pages_tool/login/login', { + this.$util.redirectTo(this.$util.LOGIN_PAGE_URL, { back: '/pages_promotion/fenxiao/withdraw_list' }, 'redirectTo'); } diff --git a/pages_promotion/point/public/js/payment.js b/pages_promotion/point/public/js/payment.js index c651b0f..c0d7cbd 100644 --- a/pages_promotion/point/public/js/payment.js +++ b/pages_promotion/point/public/js/payment.js @@ -547,7 +547,7 @@ export default { } // 判断登录 if (!this.storeToken) { - this.$util.redirectTo('/pages_tool/login/login'); + this.$util.redirectTo(this.$util.LOGIN_PAGE_URL); } else { this.getOrderPaymentData(); } diff --git a/pages_tool/login/find.vue b/pages_tool/login/find.vue index 07d65a9..ed89429 100644 --- a/pages_tool/login/find.vue +++ b/pages_tool/login/find.vue @@ -128,7 +128,7 @@ export default { if (this.stepShow > 0) { this.stepShow -= 1; } else { - this.$util.redirectTo('/pages_tool/login/login', '', 'redirectTo'); + this.$util.redirectTo(this.$util.LOGIN_PAGE_URL, '', 'redirectTo'); } }, // 下一步 @@ -318,7 +318,7 @@ export default { uni.removeStorage({ key: 'forgot_password_token' }); - this.$util.redirectTo('/pages_tool/login/login', {}, 'redirectTo'); + this.$util.redirectTo(this.$util.LOGIN_PAGE_URL, {}, 'redirectTo'); }, 1000); } else { this.stepShow -= 1; diff --git a/pages_tool/member/apply_withdrawal.vue b/pages_tool/member/apply_withdrawal.vue index be31103..a6422f0 100644 --- a/pages_tool/member/apply_withdrawal.vue +++ b/pages_tool/member/apply_withdrawal.vue @@ -78,7 +78,7 @@ this.getWithdrawInfo(); this.getBankAccountInfo(); } else { - this.$util.redirectTo('/pages_tool/login/login', { + this.$util.redirectTo(this.$util.LOGIN_PAGE_URL, { back: '/pages_tool/member/apply_withdrawal' }); } diff --git a/pages_tool/member/assets.vue b/pages_tool/member/assets.vue index 000b039..dd74538 100644 --- a/pages_tool/member/assets.vue +++ b/pages_tool/member/assets.vue @@ -92,7 +92,7 @@ export default { // 判断登录 if (!this.storeToken) { - this.$util.redirectTo('/pages_tool/login/login'); + this.$util.redirectTo(this.$util.LOGIN_PAGE_URL); } else { this.getAccountInfo(); } diff --git a/pages_tool/member/cancellation.vue b/pages_tool/member/cancellation.vue index b1e05a8..ce6a8de 100644 --- a/pages_tool/member/cancellation.vue +++ b/pages_tool/member/cancellation.vue @@ -31,7 +31,7 @@ export default { if (option.back) this.back = option.back; // 判断登录 if (!this.storeToken) { - this.$util.redirectTo('/pages_tool/login/login'); + this.$util.redirectTo(this.$util.LOGIN_PAGE_URL); } else { this.getCancelAgreement(); } diff --git a/pages_tool/member/cancelrefuse.vue b/pages_tool/member/cancelrefuse.vue index 51cc945..d701ff3 100644 --- a/pages_tool/member/cancelrefuse.vue +++ b/pages_tool/member/cancelrefuse.vue @@ -26,7 +26,7 @@ export default { // 判断登录 if (!this.storeToken) { - this.$util.redirectTo('/pages_tool/login/login'); + this.$util.redirectTo(this.$util.LOGIN_PAGE_URL); } else { this.getStatus(); } diff --git a/pages_tool/member/cancelstatus.vue b/pages_tool/member/cancelstatus.vue index 062422c..c1887be 100644 --- a/pages_tool/member/cancelstatus.vue +++ b/pages_tool/member/cancelstatus.vue @@ -46,7 +46,7 @@ onLoad(option) { // 判断登录 if (!this.storeToken) { - this.$util.redirectTo('/pages_tool/login/login'); + this.$util.redirectTo(this.$util.LOGIN_PAGE_URL); } else { this.getStatus(); } diff --git a/pages_tool/member/cancelsuccess.vue b/pages_tool/member/cancelsuccess.vue index 91d03a5..8d48022 100644 --- a/pages_tool/member/cancelsuccess.vue +++ b/pages_tool/member/cancelsuccess.vue @@ -25,7 +25,7 @@ // 判断登录 if (!this.storeToken) { - this.$util.redirectTo('/pages_tool/login/login'); + this.$util.redirectTo(this.$util.LOGIN_PAGE_URL); } else { this.getStatus(); } diff --git a/pages_tool/member/modify_face.vue b/pages_tool/member/modify_face.vue index 7f70626..947ec12 100644 --- a/pages_tool/member/modify_face.vue +++ b/pages_tool/member/modify_face.vue @@ -40,7 +40,7 @@ onShow() { if (!this.storeToken) { this.$util.redirectTo( - '/pages_tool/login/login', { + this.$util.LOGIN_PAGE_URL, { back: '/pages_tool/member/modify_face' }, 'redirectTo' diff --git a/pages_tool/member/pay_password.vue b/pages_tool/member/pay_password.vue index 628f5e1..233fd4a 100644 --- a/pages_tool/member/pay_password.vue +++ b/pages_tool/member/pay_password.vue @@ -40,7 +40,7 @@ // 判断登录 if (!this.storeToken) { - this.$util.redirectTo('/pages_tool/login/login'); + this.$util.redirectTo(this.$util.LOGIN_PAGE_URL); } else { if (this.memberInfo.mobile == '') { uni.showModal({ diff --git a/pages_tool/member/point_detail.vue b/pages_tool/member/point_detail.vue index 2f0c9f0..4b1ca5c 100644 --- a/pages_tool/member/point_detail.vue +++ b/pages_tool/member/point_detail.vue @@ -74,7 +74,7 @@ export default { onShow() { if (!this.storeToken) { this.$util.redirectTo( - '/pages_tool/login/login', + this.$util.LOGIN_PAGE_URL, { back: '/pages_tool/member/point' }, diff --git a/pages_tool/member/withdrawal.vue b/pages_tool/member/withdrawal.vue index bddf231..380d22e 100644 --- a/pages_tool/member/withdrawal.vue +++ b/pages_tool/member/withdrawal.vue @@ -40,7 +40,7 @@ export default { onShow() { if (!this.storeToken) { this.$util.redirectTo( - '/pages_tool/login/login', + this.$util.LOGIN_PAGE_URL, { back: '/pages_tool/member/point' }, diff --git a/pages_tool/member/withdrawal_detail.vue b/pages_tool/member/withdrawal_detail.vue index 1f2285f..ab035de 100644 --- a/pages_tool/member/withdrawal_detail.vue +++ b/pages_tool/member/withdrawal_detail.vue @@ -69,7 +69,7 @@ export default { this.getDetail(); } else { this.$util.redirectTo( - '/pages_tool/login/login', + this.$util.LOGIN_PAGE_URL, { back: '/pages_tool/member/point' }, diff --git a/pages_tool/order/logistics.vue b/pages_tool/order/logistics.vue index 90f4522..8b8f49d 100644 --- a/pages_tool/order/logistics.vue +++ b/pages_tool/order/logistics.vue @@ -91,7 +91,7 @@ export default { onShow() { // 判断登录 if (!this.storeToken) { - this.$util.redirectTo('/pages_tool/login/login'); + this.$util.redirectTo(this.$util.LOGIN_PAGE_URL); } else { this.getPackageInfo(); } diff --git a/pages_tool/order/public/js/evaluate.js b/pages_tool/order/public/js/evaluate.js index 63ebd01..c15a1f8 100644 --- a/pages_tool/order/public/js/evaluate.js +++ b/pages_tool/order/public/js/evaluate.js @@ -27,7 +27,7 @@ export default { this.isIphoneX = this.$util.uniappIsIPhoneX(); if (!this.storeToken) { - this.$util.redirectTo('/pages_tool/login/login', { + this.$util.redirectTo(this.$util.LOGIN_PAGE_URL, { back: '/pages_tool/order/evaluate?order_id=' + this.orderId }, 'redirectTo'); } diff --git a/pages_tool/order/refund.vue b/pages_tool/order/refund.vue index 7f7e6cb..adc1899 100644 --- a/pages_tool/order/refund.vue +++ b/pages_tool/order/refund.vue @@ -130,7 +130,7 @@ export default { if (this.storeToken) { this.getRefundData(); } else { - this.$util.redirectTo('/pages_tool/login/login', { back: '/pages_tool/order/refund?order_goods_id=' + this.order_goods_id }); + this.$util.redirectTo(this.$util.LOGIN_PAGE_URL, { back: '/pages_tool/order/refund?order_goods_id=' + this.order_goods_id }); } }, methods: { diff --git a/pages_tool/order/refund_batch.vue b/pages_tool/order/refund_batch.vue index f5812a3..bff69c4 100644 --- a/pages_tool/order/refund_batch.vue +++ b/pages_tool/order/refund_batch.vue @@ -122,7 +122,7 @@ export default { if (this.storeToken) { this.getRefundData(); } else { - this.$util.redirectTo('/pages_tool/login/login', { back: '/pages_tool/order/refund?order_goods_id=' + this.order_goods_id }); + this.$util.redirectTo(this.$util.LOGIN_PAGE_URL, { back: '/pages_tool/order/refund?order_goods_id=' + this.order_goods_id }); } }, methods: { diff --git a/pages_tool/order/refund_detail.vue b/pages_tool/order/refund_detail.vue index b5793a5..e38fa49 100644 --- a/pages_tool/order/refund_detail.vue +++ b/pages_tool/order/refund_detail.vue @@ -175,7 +175,7 @@ export default { if (this.storeToken) { this.getRefundDetail(); } else { - this.$util.redirectTo('/pages_tool/login/login', { back: '/pages_tool/order/refund_detail?order_goods_id=' + this.order_goods_id }); + this.$util.redirectTo(this.$util.LOGIN_PAGE_URL, { back: '/pages_tool/order/refund_detail?order_goods_id=' + this.order_goods_id }); } }, methods: { diff --git a/pages_tool/order/refund_type_select.vue b/pages_tool/order/refund_type_select.vue index b4ae5d9..a29b056 100644 --- a/pages_tool/order/refund_type_select.vue +++ b/pages_tool/order/refund_type_select.vue @@ -41,7 +41,7 @@ if (this.storeToken) { this.getRefundData(); } else { - this.$util.redirectTo('/pages_tool/login/login', { + this.$util.redirectTo(this.$util.LOGIN_PAGE_URL, { back: '/pages_tool/order/refund?order_goods_id=' + this.order_goods_id }); } diff --git a/pages_tool/pay/index.vue b/pages_tool/pay/index.vue index 9b762dd..8e63c97 100644 --- a/pages_tool/pay/index.vue +++ b/pages_tool/pay/index.vue @@ -33,7 +33,7 @@ export default { onShow() { if (!this.storeToken) { - this.$util.redirectTo('/pages_tool/login/login'); + this.$util.redirectTo(this.$util.LOGIN_PAGE_URL); } else { this.getPayInfo(); }