From d9b1333d9c1749d9d81e7b6f8506abc14b6f164c Mon Sep 17 00:00:00 2001 From: YANGDL <114714267@qq.com> Date: 星期二, 02 三月 2021 18:17:12 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/router/index.js | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 7477bf9..32dae04 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -6,10 +6,27 @@ const { routeMode } = appConfig Vue.use(Router) +const baseName = process.env.NODE_ENV === 'production' ? `/${appConfig.projectName}/` : '/' const router = new Router({ - base: appConfig.projectName, + base: baseName, mode: routeMode || 'hash', routes: routes }) - +router.beforeEach((to, from, next) => { + Vue.prototype.$cancels.forEach((cancel) => { + cancel() + }) + Vue.prototype.$cancels = [] + // 涓嶉渶瑕佺櫥褰曡璇佺殑璺敱 + if (Object.hasOwnProperty.call(to.meta, 'noLoginIdentify') && to.meta.noLoginIdentify) { + next() + return + } + next() +}) +router.beforeResolve((to, from, next) => { + next() +}) +router.afterEach((to, from) => { +}) export default router -- Gitblit v1.8.0