bingyi/vue-next-admin
1
0
Fork 0
mirror of https://gitee.com/lyt-top/vue-next-admin synced 2026-07-04 13:02:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

'admin-21.04.18:更新最新依赖、优化进度条问题'

Browse Source
This commit is contained in:
lyt-Top
2021-04-18 20:05:58 +08:00
parent ea6b527cfb
commit 779ea5cbc6
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
package.json
View File

@ -12,7 +12,7 @@
"clipboard": "^2.0.8",
"core-js": "^3.10.1",
"countup.js": "^2.0.7",
"echarts": "^5.0.2",
"echarts": "^5.1.0",
"element-ui": "^2.15.1",
"html2canvas": "^1.0.0-rc.7",
"json2csv": "^5.0.6",
@ -36,10 +36,10 @@
"@vue/cli-plugin-vuex": "~4.5.12",
"@vue/cli-service": "~4.5.12",
"babel-eslint": "^10.1.0",
"eslint": "^7.23.0",
"eslint-plugin-vue": "^7.8.0",
"sass": "^1.32.8",
"sass-loader": "^8.0.2",
"eslint": "^7.24.0",
"eslint-plugin-vue": "^7.9.0",
"sass": "^1.32.10",
"sass-loader": "^10.1.1",
"vue-template-compiler": "^2.6.12"
}
}

6
src/router/index.js
View File

@ -191,10 +191,10 @@ export function resetRouter() {
// 路由加载前
router.beforeEach((to, from, next) => {
NProgress.configure({ showSpinner: false });
NProgress.start();
if (to.meta.title) NProgress.start();
keepAliveSplice(to);
let token = getSession('token');
if (to.fullPath === '/login' && !token) {
if (to.path === '/login' && !token) {
next();
NProgress.done();
} else {
@ -202,7 +202,7 @@ router.beforeEach((to, from, next) => {
next('/login');
clearSession();
NProgress.done();
} else if (token && to.fullPath === '/login') {
} else if (token && to.path === '/login') {
next('/home');
NProgress.done();
} else {