From d1cf57717bb1402e4d28a345c66dc9a64192bce3 Mon Sep 17 00:00:00 2001 From: jinhhanhan <1683105490@qq.com> Date: Wed, 7 Jan 2026 16:12:55 +0800 Subject: [PATCH] =?UTF-8?q?chore=EF=BC=9A=E5=9C=A8=E7=BA=BF=E7=95=99?= =?UTF-8?q?=E8=A8=80=E6=8F=90=E4=BA=A4=E5=90=8E=EF=BC=8C=E5=86=8D=E6=AC=A1?= =?UTF-8?q?=E6=89=93=E5=BC=80=E5=9C=A8=E7=BA=BF=E7=95=99=E8=A8=80=EF=BC=8C?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E9=87=8C=E6=B2=A1=E6=9C=89=E4=B8=8A?= =?UTF-8?q?=E6=AC=A1=E7=95=99=E8=A8=80=E5=86=85=E5=AE=B9=EF=BC=8C=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E6=88=91=E7=9A=84=E5=85=B3=E6=B3=A8=EF=BC=8C=E6=9A=82?= =?UTF-8?q?=E6=97=A0=E5=85=B3=E6=B3=A8=E7=9A=84=E5=95=86=E5=93=81=EF=BC=8C?= =?UTF-8?q?=E5=BA=94=E5=B1=95=E7=A4=BA=E5=8E=BB=E9=80=9B=E9=80=9B=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E7=82=B9=E5=87=BB=E5=94=AE=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E7=9A=84=E7=95=8C=E9=9D=A2=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E5=BA=94=E5=B1=95=E7=A4=BA=E2=80=9C=E5=94=AE=E5=90=8E=E2=80=9D?= =?UTF-8?q?=EF=BC=8C=E6=97=A0=E6=95=B0=E6=8D=AE=E6=97=B6=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=BA=94=E5=B1=95=E7=A4=BA=E2=80=9C=E6=9A=82=E6=97=A0=E5=94=AE?= =?UTF-8?q?=E5=90=8E=E8=AE=B0=E5=BD=95=EF=BC=8C=E6=90=9C=E7=B4=A2=E9=A1=B5?= =?UTF-8?q?=E7=9A=84=E2=80=9C=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85=E2=80=9D?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=8A=A0=E4=BA=86=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/js/golbalConfig.js | 2 +- common/js/goods_detail_base.js | 2 +- common/js/lang.js | 14 +- common/js/util.js | 44 +- components-diy/diy-bottom-nav.vue | 2 +- components-diy/diy-coupon.vue | 2 +- components-diy/diy-digit.vue | 2 +- components-diy/diy-fenxiao-goods-list.vue | 2 +- components-diy/diy-graphic-nav.vue | 2 +- components-diy/diy-image-nav.vue | 2 +- components-diy/diy-listmenu.vue | 4 +- components-diy/diy-member-info.vue | 6 +- components-diy/diy-notes.vue | 2 +- components-diy/diy-picture.vue | 2 +- components-diy/diy-quick-nav.vue | 2 +- components-diy/diy-search.vue | 2 +- components/common-payment/payment.js | 2 +- components/ns-empty/ns-empty.vue | 2 +- .../ns-goods-sku/ns-goods-sku-index.vue | 2 +- components/ns-goods-sku/ns-goods-sku.vue | 18 +- components/ns-login/ns-login.vue | 65 +- components/ns-payment/ns-payment.vue | 2 +- .../register-reward/register-reward.vue | 2 +- lang/zh-cn/goods/list.js | 2 +- pages_goods/cart.vue | 2 +- pages_goods/list.vue | 3 +- pages_goods/public/css/list.scss | 2 +- pages_goods/public/js/common.js | 8 + pages_order/detail.vue | 2 +- pages_order/detail_point.vue | 2 +- pages_order/list.vue | 7 +- pages_promotion/fenxiao/apply.vue | 8 +- pages_promotion/fenxiao/bill.vue | 2 +- pages_promotion/fenxiao/child_fenxiao.vue | 2 +- pages_promotion/fenxiao/index.vue | 8 +- pages_promotion/fenxiao/level.vue | 4 +- pages_promotion/fenxiao/order.vue | 2 +- pages_promotion/fenxiao/order_detail.vue | 2 +- pages_promotion/fenxiao/promote.vue | 2 +- pages_promotion/fenxiao/promote_code.vue | 6 +- .../fenxiao/public/js/goods_list.js | 4 +- pages_promotion/fenxiao/team.vue | 2 +- pages_promotion/fenxiao/withdraw_apply.vue | 2 +- pages_promotion/fenxiao/withdraw_list.vue | 2 +- pages_promotion/fenxiao/withdrawal_detail.vue | 2 +- pages_promotion/point/list.vue | 4 +- pages_promotion/point/order_list.vue | 2 +- pages_promotion/point/public/js/payment.js | 6 +- pages_promotion/point/result.vue | 2 +- pages_tool/contact/contact.vue | 923 +++++++++--------- pages_tool/goods/coupon.vue | 2 +- pages_tool/goods/coupon_receive.vue | 2 +- pages_tool/login/find.vue | 4 +- pages_tool/login/login.vue | 8 +- pages_tool/member/apply_withdrawal.vue | 4 +- pages_tool/member/assets.vue | 2 +- pages_tool/member/balance.vue | 4 +- pages_tool/member/cancellation.vue | 2 +- pages_tool/member/cancelrefuse.vue | 4 +- pages_tool/member/cancelstatus.vue | 8 +- pages_tool/member/cancelsuccess.vue | 4 +- pages_tool/member/card.vue | 4 +- pages_tool/member/card_buy.vue | 2 +- pages_tool/member/collection.vue | 159 ++- pages_tool/member/coupon.vue | 4 +- pages_tool/member/footprint.vue | 2 +- pages_tool/member/index.vue | 4 +- pages_tool/member/level.vue | 2 +- pages_tool/member/modify_face.vue | 2 +- pages_tool/member/pay_password.vue | 6 +- pages_tool/member/point.vue | 4 +- pages_tool/member/point_detail.vue | 2 +- pages_tool/member/public/js/common.js | 9 + pages_tool/member/public/js/info.js | 4 +- pages_tool/member/public/js/invite_friends.js | 4 +- pages_tool/member/public/js/signin.js | 4 +- 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 | 4 +- pages_tool/pay/result.vue | 6 +- pages_tool/storeclose/storeclose.vue | 2 +- 87 files changed, 735 insertions(+), 747 deletions(-) create mode 100644 pages_goods/public/js/common.js create mode 100644 pages_tool/member/public/js/common.js 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/lang.js b/common/js/lang.js index 5fec1bf..c8ca741 100644 --- a/common/js/lang.js +++ b/common/js/lang.js @@ -66,15 +66,16 @@ export default { const locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言 - var value = ''; + let value = ''; // 存放解析后的语言值 + let langPath = ''; // 存放当前页面语言包路径 + try { //公共语言包（同步加载） var lang = loadLangPackSync(locale, 'common'); //当前页面语言包（同步加载） let route = _this.route; - let langPath = processRoutePath(route); - console.log(`当前语言: ${locale}, 当前页面语言包路径: ${langPath}`); + langPath = processRoutePath(route); // 加载当前页面语言包 let currentPageLang = loadLangPackSync(locale, langPath); @@ -102,7 +103,7 @@ export default { } } catch (e) { - console.error('解析语言包失败:', e); + console.error('解析语言包失败:', e, { langPath, field, locale }); value = field; } @@ -115,7 +116,10 @@ export default { if (value == undefined || (value == 'title' && field == 'title')) value = ''; // field // 多语言调试，注释后可以关闭控制台输出 - console.log(`字段: ${field}, 值: ${value}`) + if (field == value) { + console.warn(`警告: 字段 ${field} 在语言包 ${langPath} 中未找到对应值，使用默认值 ${field} 当前语言: ${locale}`); + } + return value; }, /** diff --git a/common/js/util.js b/common/js/util.js index d47f9e7..9829e01 100644 --- a/common/js/util.js +++ b/common/js/util.js @@ -7,15 +7,19 @@ import { -// 首页路径 +// 关于页面路径，使用常量导出 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 = [ INDEX_PAGE_URL, - '/pages_goods/category', - '/pages_tool/contact/contact', - '/pages_tool/member/index' + CATEGORY_PAGE_URL, + CONTACT_PAGE_URL, + MEMBER_PAGE_URL ]; /** @@ -89,7 +93,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 { // 二级页面 @@ -109,17 +113,24 @@ export const checkTabBarActive = (linkUrl, currentPageRoute) => { } export default { + /** 导出页面URL常量 */ + MEMBER_PAGE_URL, + CATEGORY_PAGE_URL, + CONTACT_PAGE_URL, + INDEX_PAGE_URL, + LOGIN_PAGE_URL, + /** * 页面跳转 * @param {string} to 跳转链接 /pages/idnex/index - * @param {Object} param 参数 {key : value, ...} - * @param {string} mode 模式 + * @param {Object} param 参数 {key : value, ...}, 默认{} + * @param {string} mode 模式 navigateTo、redirectTo、reLaunch、tabbar, 默认navigateTo */ - redirectTo(to, param, mode) { + redirectTo(to, param = {}, mode = 'navigateTo') { let url = to; // 替换url中的前缀 - console.log('redirectTo', to, param, mode); + console.log('页面跳转 redirectTo', to, param, mode); url = adaptSubpackageUrl(url); console.log('adaptSubpackageUrl', url); @@ -146,26 +157,26 @@ export default { // 如果url不包含tabBarList中的路径，根据mode判断跳转方式 switch (mode) { case 'tabbar': - // 跳转到 tabBar 页面，并关闭其他所有非 tabBar 页面。 + // 跳转到 tabBar 页面，并关闭其他所有非 tabBar 页面。重置页面栈，仅保留 tabBar 页面 uni.switchTab({ url }); break; case 'redirectTo': - // 关闭当前页面，跳转到应用内的某个页面。 + // 关闭当前页面，跳转到应用内的某个页面。替换栈顶页面，长度不变（上限10层） uni.redirectTo({ url }); break; case 'reLaunch': - // 关闭所有页面，打开到应用内的某个页面。 + // 关闭所有页面，打开到应用内的某个页面。清空栈后打开新页面，长度=1 uni.reLaunch({ url }); break; default: - // 保留当前页面，跳转到应用内的某个页面 - console.log('保留当前页面，跳转到应用内的某个页面', url); + // 保留当前页面，跳转到应用内的某个页面，新增页面到栈顶，长度+1（上限10层） + console.log('保留当前页面，navigateTo跳转到应用内的某个页面', url); uni.navigateTo({ url }); @@ -592,6 +603,9 @@ export default { } return cloneObj }, + + + /** * 自定义模板的跳转链接 * @param {Object} link @@ -792,7 +806,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-digit.vue b/components-diy/diy-digit.vue index 83cdf74..de1f43d 100644 --- a/components-diy/diy-digit.vue +++ b/components-diy/diy-digit.vue @@ -90,7 +90,7 @@ export default { // 页面跳转 redirectTo(item) { - if (!item.wap_url || this.$util.getCurrRoute() != 'pages/member/index' || this.storeToken) { + if (!item.wap_url || this.$util.getCurrRoute() != this.$util.MEMBER_PAGE_URL || this.storeToken) { console.log(item); this.$util.diyRedirectTo(item); } else { 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-diy/diy-graphic-nav.vue b/components-diy/diy-graphic-nav.vue index d645bb3..644b1d1 100644 --- a/components-diy/diy-graphic-nav.vue +++ b/components-diy/diy-graphic-nav.vue @@ -159,7 +159,7 @@ export default { redirectTo(link) { if (link.wap_url) { - if (this.$util.getCurrRoute() == 'pages/member/index' && !this.storeToken) { + if (this.$util.getCurrRoute() == this.$util.MEMBER_PAGE_URL && !this.storeToken) { this.$refs.login.open(link.wap_url); return; } diff --git a/components-diy/diy-image-nav.vue b/components-diy/diy-image-nav.vue index 8615a21..17b4fb9 100644 --- a/components-diy/diy-image-nav.vue +++ b/components-diy/diy-image-nav.vue @@ -116,7 +116,7 @@ export default { // 页面跳转 redirectTo(link) { - if (!link.wap_url || this.$util.getCurrRoute() != 'pages/member/index' || this.storeToken) { + if (!link.wap_url || this.$util.getCurrRoute() != this.$util.MEMBER_PAGE_URL || this.storeToken) { this.$util.diyRedirectTo(link); } else { this.$refs.login.open(link.wap_url); diff --git a/components-diy/diy-listmenu.vue b/components-diy/diy-listmenu.vue index f07440a..eb2d6a0 100644 --- a/components-diy/diy-listmenu.vue +++ b/components-diy/diy-listmenu.vue @@ -62,8 +62,8 @@ export default { methods: { redirectTo(link) { if (link.wap_url) { - if (this.$util.getCurrRoute() == 'pages/member/index' && !this.storeToken) { - this.$refs.login.open(link.wap_url); + if (this.$util.getCurrRoute() == this.$util.MEMBER_PAGE_URL && !this.storeToken) { + this.$refs?.login?.open(link.wap_url); return; } } diff --git a/components-diy/diy-member-info.vue b/components-diy/diy-member-info.vue index 37afec7..fea7e80 100644 --- a/components-diy/diy-member-info.vue +++ b/components-diy/diy-member-info.vue @@ -64,7 +64,7 @@ @click.stop="modifyInfo()">{{ langIndex == 0 ? 'CN' : 'EN' }} - + @@ -545,7 +545,7 @@ export default { */ redirectBeforeAuth(url) { if (!this.storeToken) { - this.$refs.login.open('/pages/member/index'); + this.$refs.login.open(this.$util.MEMBER_PAGE_URL); return; } @@ -583,7 +583,7 @@ export default { url: '/wechat/api/wechat/authcode', data: { scopes: 'snsapi_userinfo', - redirect_url: this.$config.h5Domain + '/pages/member/index' + redirect_url: this.$config.h5Domain + this.$util.MEMBER_PAGE_URL }, success: res => { if (res.code >= 0) { 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-diy/diy-picture.vue b/components-diy/diy-picture.vue index 1f86e63..c17b371 100644 --- a/components-diy/diy-picture.vue +++ b/components-diy/diy-picture.vue @@ -65,7 +65,7 @@ export default { }, redirectTo(link) { if (link.wap_url) { - if (this.$util.getCurrRoute() == 'pages/member/index' && !this.storeToken) { + if (this.$util.getCurrRoute() == this.$util.MEMBER_PAGE_URL && !this.storeToken) { this.$refs.login.open(link.wap_url); return; } diff --git a/components-diy/diy-quick-nav.vue b/components-diy/diy-quick-nav.vue index 401efb7..d32b698 100644 --- a/components-diy/diy-quick-nav.vue +++ b/components-diy/diy-quick-nav.vue @@ -61,7 +61,7 @@ export default { methods: { redirectTo(link) { if (link.wap_url) { - if (this.$util.getCurrRoute() == 'pages/member/index' && !this.storeToken) { + if (this.$util.getCurrRoute() == this.$util.MEMBER_PAGE_URL && !this.storeToken) { this.$refs.login.open(link.wap_url); return; } diff --git a/components-diy/diy-search.vue b/components-diy/diy-search.vue index a74830b..1505d85 100644 --- a/components-diy/diy-search.vue +++ b/components-diy/diy-search.vue @@ -198,7 +198,7 @@ export default { }, redirectTo(link) { if (link.wap_url) { - if (this.$util.getCurrRoute() == 'pages/member/index' && !this.storeToken) { + if (this.$util.getCurrRoute() == this.$util.MEMBER_PAGE_URL && !this.storeToken) { this.$refs.login.open(link.wap_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-login/ns-login.vue b/components/ns-login/ns-login.vue index 8172f78..f14421e 100644 --- a/components/ns-login/ns-login.vue +++ b/components/ns-login/ns-login.vue @@ -42,26 +42,22 @@ - + @click="isAgree = !isAgree"> 我同意 - 《隐私条款》 - 《用户服务协议》 + 《隐私条款》 + 《用户服务协议》 - @@ -71,7 +67,8 @@ - + 暂不登录 @@ -118,8 +115,8 @@ 获取手机号 - - + + @@ -226,7 +223,7 @@ export default { if (siteInfo) { this.site_name = siteInfo.site_name; } - }, + }, methods: { // 同意协议 authno() { @@ -254,7 +251,7 @@ export default { }, // 打开弹窗 - open(url) { + open(url = '', mode = 'navigateTo') { if (url) this.url = url; // #ifdef MP this.getCode(authData => { @@ -266,28 +263,33 @@ export default { if (this.$util.isWeChatMiniProgram()) { // 微信小程序环境，使用微信授权登录 let authData = uni.getStorageSync('authInfo'); - if (authData) this.authLogin(authData); - else this.getCode(); + if (authData) { + this.authLogin(authData); + } else { + this.getCode(authData => { + this.authLogin(authData, 'authOnlyLogin'); + }); + } } else if (this.$util.isWeiXin()) { // 微信浏览器环境，显示登录页面 - this.toLogin(); + this.toLogin(mode); } else { // 其他浏览器环境，显示登录页面 - this.toLogin(); + this.toLogin(mode); } // #endif // #ifndef MP || H5 - this.toLogin(); + this.toLogin(mode); // #endif }, // 跳转去登录页 - toLogin() { - if (this.url) this.$util.redirectTo('/pages_tool/login/login', { + toLogin(mode = 'navigateTo') { + if (this.url) this.$util.redirectTo(this.$util.LOGIN_PAGE_URL, { back: encodeURIComponent(this.url) - }); - else this.$util.redirectTo('/pages_tool/login/login'); + }, mode); + else this.$util.redirectTo(this.$util.LOGIN_PAGE_URL, {}, mode); }, // 取消完善信息 @@ -535,7 +537,8 @@ export default { getPhoneNumber(e) { if (e.detail.errMsg === 'getPhoneNumber:ok') { const authInfo = uni.getStorageSync('authInfo'); - if (authInfo) { Object.assign(this.authMobileData, authInfo, e.detail); + if (authInfo) { + Object.assign(this.authMobileData, authInfo, e.detail); } if (uni.getStorageSync('source_member')) { this.authMobileData.source_member = uni.getStorageSync('source_member'); @@ -596,7 +599,7 @@ export default { } }); }, - + // 授权登录 authLogin(data, type = 'authLogin') { uni.showLoading({ @@ -686,8 +689,8 @@ export default { if (this.forceBindingMobileControl) { this.bindMobile(); - } else { - this.authLogin(authInfo); + } else { + this.authLogin(authInfo); } }, @@ -749,7 +752,7 @@ export default { // 跳转页面 tourl(url) { this.$util.redirectTo(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/lang/zh-cn/goods/list.js b/lang/zh-cn/goods/list.js index fc8bec1..7806673 100644 --- a/lang/zh-cn/goods/list.js +++ b/lang/zh-cn/goods/list.js @@ -6,6 +6,6 @@ export const lang = { Price:'价格', Filter:'筛选', Search:'请输入您要搜索的商品', - Make:'立即询底价', + Make:'查看详情', } diff --git a/pages_goods/cart.vue b/pages_goods/cart.vue index 58ab7c3..7c1ded5 100644 --- a/pages_goods/cart.vue +++ b/pages_goods/cart.vue @@ -203,7 +203,7 @@ :emptyBtn="{ text: $lang('toGoodsCategoryPage'), url: '/pages_goods/category' }"> + }} diff --git a/pages_goods/list.vue b/pages_goods/list.vue index d7eef2a..1c19518 100644 --- a/pages_goods/list.vue +++ b/pages_goods/list.vue @@ -319,8 +319,9 @@ export default { @import './public/css/list.scss'; \ No newline at end of file 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/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/login/login.vue b/pages_tool/login/login.vue index 72e0bbe..a064dbe 100644 --- a/pages_tool/login/login.vue +++ b/pages_tool/login/login.vue @@ -234,13 +234,13 @@ export default { this.$util.showToast({ title: this.$lang('loginSuccessTip') }); - let back = this.back ? this.back : '/pages/member/index'; + let back = this.back ? this.back : this.$util.MEMBER_PAGE_URL; if (this.$refs.registerReward) this.$refs.registerReward.open(back); } else { if (this.back != '') { this.$util.redirectTo(decodeURIComponent(this.back), {}, 'reLaunch'); } else { - this.$util.redirectTo('/pages/member/index', {}, 'reLaunch'); + this.$util.redirectTo(this.$util.MEMBER_PAGE_URL, {}, 'reLaunch'); } } }); @@ -348,13 +348,13 @@ export default { this.$store.dispatch('getCartNumber'); this.getMemberInfo(() => { if (can_receive_registergift == 1) { - let back = this.back ? this.back : '/pages/member/index'; + let back = this.back ? this.back : this.$util.MEMBER_PAGE_URL; if (this.$refs.registerReward) this.$refs.registerReward.open(back); } else { if (this.back != '') { this.$util.redirectTo(decodeURIComponent(this.back), {}, this.redirect); } else { - this.$util.redirectTo('/pages/member/index', {}, this.redirect); + this.$util.redirectTo(this.$util.MEMBER_PAGE_URL, {}, this.redirect); } } }) diff --git a/pages_tool/member/apply_withdrawal.vue b/pages_tool/member/apply_withdrawal.vue index d258e4f..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' }); } @@ -109,7 +109,7 @@ title: '未开启提现' }); setTimeout(() => { - this.$util.redirectTo('/pages/member/index'); + this.$util.redirectTo(this.$util.MEMBER_PAGE_URL); }, 1500); } } 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/balance.vue b/pages_tool/member/balance.vue index 356e063..fa528b7 100644 --- a/pages_tool/member/balance.vue +++ b/pages_tool/member/balance.vue @@ -6,7 +6,7 @@ 'height': menuButtonBounding.height + 'px' }"> - + 账户余额 @@ -171,7 +171,7 @@ export default { if (options.from === 'navigateBack') { return false; } - this.$util.redirectTo('/pages/member/index', {}, 'reLaunch'); + this.$util.redirectTo(this.$util.MEMBER_PAGE_URL, {}, 'reLaunch'); return true; }, watch: { 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 eabb02a..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(); } @@ -43,7 +43,7 @@ export default { }); }, toIndex() { - this.$util.redirectTo('/pages/member/index'); + this.$util.redirectTo(this.$util.MEMBER_PAGE_URL); }, apply() { this.$util.redirectTo('/pages_tool/member/cancellation'); diff --git a/pages_tool/member/cancelstatus.vue b/pages_tool/member/cancelstatus.vue index a33ecf0..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(); } @@ -71,13 +71,13 @@ 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); } } }); }, back() { - this.$util.redirectTo('/pages/member/index'); + this.$util.redirectTo(this.$util.MEMBER_PAGE_URL); }, revoke() { uni.showModal({ @@ -90,7 +90,7 @@ url: '/membercancel/api/membercancel/cancelApply', success: res => { if (res.code >= 0) { - this.$util.redirectTo('/pages/member/index'); + this.$util.redirectTo(this.$util.MEMBER_PAGE_URL); } } }); diff --git a/pages_tool/member/cancelsuccess.vue b/pages_tool/member/cancelsuccess.vue index 4f975ab..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(); } @@ -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/card.vue b/pages_tool/member/card.vue index 0096af2..6f8a1de 100644 --- a/pages_tool/member/card.vue +++ b/pages_tool/member/card.vue @@ -183,7 +183,7 @@ export default { if (options.from === 'navigateBack') { return false; } - this.$util.redirectTo('/pages/member/index'); + this.$util.redirectTo(this.$util.MEMBER_PAGE_URL); return true; } }; @@ -220,7 +220,7 @@ export default { } - \ No newline at end of file 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/footprint.vue b/pages_tool/member/footprint.vue index e6ae305..27e7361 100644 --- a/pages_tool/member/footprint.vue +++ b/pages_tool/member/footprint.vue @@ -46,7 +46,7 @@ - + diff --git a/pages_tool/member/index.vue b/pages_tool/member/index.vue index 2d7d846..5024a06 100644 --- a/pages_tool/member/index.vue +++ b/pages_tool/member/index.vue @@ -96,7 +96,7 @@ export default { this.$store.commit('setMemberInfo', ''); this.$store.dispatch('emptyCart'); uni.removeStorageSync('authInfo'); - this.$util.redirectTo('/pages/member/index'); + this.$util.redirectTo(this.$util.MEMBER_PAGE_URL); } } }); @@ -118,7 +118,7 @@ export default { this.$store.commit('setMemberInfo', ''); this.$store.dispatch('emptyCart'); uni.removeStorageSync('authInfo'); - this.$util.redirectTo('/pages/member/index'); + this.$util.redirectTo(this.$util.MEMBER_PAGE_URL); } else { this.$util.showToast({ title: rres.message diff --git a/pages_tool/member/level.vue b/pages_tool/member/level.vue index e4b7504..1af035a 100644 --- a/pages_tool/member/level.vue +++ b/pages_tool/member/level.vue @@ -354,7 +354,7 @@ if (options.from === 'navigateBack') { return false; } - this.$util.redirectTo('/pages/member/index'); + this.$util.redirectTo(this.$util.MEMBER_PAGE_URL); return true; }, watch: { 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 e3117ad..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({ @@ -54,7 +54,7 @@ }, 'redirectTo'); } else { if (this.back) this.$util.redirectTo(this.back); - else this.$util.redirectTo('/pages/member/index'); + else this.$util.redirectTo(this.$util.MEMBER_PAGE_URL); } } }); @@ -133,7 +133,7 @@ setTimeout(() => { if (this.back) this.$util.redirectTo(this.back, {}, 'redirectTo'); - else this.$util.redirectTo('/pages/member/index'); + else this.$util.redirectTo(this.$util.MEMBER_PAGE_URL); }, 2000); } else { this.initInfo(); diff --git a/pages_tool/member/point.vue b/pages_tool/member/point.vue index b8f8d38..067e3ed 100644 --- a/pages_tool/member/point.vue +++ b/pages_tool/member/point.vue @@ -7,7 +7,7 @@ }" > - + 我的积分 @@ -143,7 +143,7 @@ export default { if (options.from === 'navigateBack') { return false; } - this.$util.redirectTo('/pages/member/index', {}, 'reLaunch'); + this.$util.redirectTo(this.$util.MEMBER_PAGE_URL, {}, 'reLaunch'); return true; }, watch: { 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/public/js/common.js b/pages_tool/member/public/js/common.js new file mode 100644 index 0000000..9f11e9e --- /dev/null +++ b/pages_tool/member/public/js/common.js @@ -0,0 +1,9 @@ +export default { + methods: { + // 跳转至登录页 + 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/info.js b/pages_tool/member/public/js/info.js index 94d7fbc..4afb595 100644 --- a/pages_tool/member/public/js/info.js +++ b/pages_tool/member/public/js/info.js @@ -256,7 +256,7 @@ export default { this.$store.dispatch('emptyCart'); this.$store.dispatch('emptyCart'); uni.removeStorageSync('authInfo'); - this.$util.redirectTo('/pages/member/index'); + this.$util.redirectTo(this.$util.MEMBER_PAGE_URL); } else { this.$util.showToast({ title: rres.message @@ -329,7 +329,7 @@ export default { this.$store.dispatch('emptyCart'); this.$store.dispatch('emptyCart'); uni.removeStorageSync('authInfo'); - this.$util.redirectTo('/pages/member/index'); + this.$util.redirectTo(this.$util.MEMBER_PAGE_URL); } } }); 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 c22ca2e..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); @@ -106,7 +106,7 @@ export default { if (this.back != '') { this.$util.redirectTo(this.back, {}, this.redirect); } else { - this.$util.redirectTo('/pages/member/index'); + this.$util.redirectTo(this.$util.MEMBER_PAGE_URL); } }, //获取rule 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 19f857c..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(); } @@ -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 ffd3554..d55a788 100644 --- a/pages_tool/pay/result.vue +++ b/pages_tool/pay/result.vue @@ -91,7 +91,7 @@ this.$util.redirectTo('/pages_tool/member/coupon', {}); break; default: - this.$util.redirectTo('/pages/member/index', {}, 'reLaunch'); + this.$util.redirectTo(this.$util.MEMBER_PAGE_URL, {}, 'reLaunch'); break; } }, @@ -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); } } });