diff --git a/src/assets/js/utils/permission.js b/src/assets/js/utils/permission.js index f6ea244..208ae10 100644 --- a/src/assets/js/utils/permission.js +++ b/src/assets/js/utils/permission.js @@ -3,13 +3,10 @@ import store from '@/store' import NProgress from 'nprogress' // progress bar import 'nprogress/nprogress.css' // progress bar style import { getToken, removeToken } from '@/assets/js/utils/auth' // get token from cookie -import getPageTitle from '@/assets/js/utils/get-page-title' import { Message } from 'element-ui' NProgress.configure({ showSpinner: false }) // NProgress Configuration const whiteList = ['/login', '/authentication', '/404'] // no redirect whitelist -console.log('token:' + getToken()) - router.beforeEach((to, from, next) => { NProgress.start() if (getToken()) { @@ -23,7 +20,7 @@ router.beforeEach((to, from, next) => { store .dispatch('user/getInfo') .then(() => { - store.dispatch('app/GenerateRoutes').then(accessRoutes => { + store.dispatch('app/GenerateRoutes').then(() => { next() }) }) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 2b815fe..6f46619 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -1,6 +1,5 @@ -import { login, logout, getInfo, getRouters } from '@/api/app/user' +import { login, logout, getInfo } from '@/api/app/user' import { getToken, setToken, removeToken } from '@/assets/js/utils/auth' -import router from '@/router' const state = { token: getToken(), @@ -55,7 +54,6 @@ const actions = { if (!res) { reject('Verification failed, please Login again.') } - console.log(res) commit('SET_NAME', res.content.content.userName) // commit('SET_AVATAR', res.avatar) diff --git a/src/views/track/Index.vue b/src/views/track/Index.vue index 1963ff7..03f4a79 100644 --- a/src/views/track/Index.vue +++ b/src/views/track/Index.vue @@ -246,16 +246,15 @@ export default { - 全部上传用户 + @@ -341,7 +340,6 @@ export default {