|
@@ -14,17 +14,18 @@ import { i18nRender } from '@/locales'
|
|
|
NProgress.configure({ showSpinner: false }) // NProgress Configuration
|
|
|
|
|
|
const allowList = ['login', 'register', 'registerResult', 'download', 'forget', 'oldRegister'] // no redirect allowList
|
|
|
-const loginRoutePath = '/user/login'
|
|
|
+const loginRoutePath = '/login'
|
|
|
const defaultRoutePath = '/'
|
|
|
|
|
|
router.beforeEach(async (to, from, next) => {
|
|
|
- console.log('to',to);
|
|
|
- console.log('from', from);
|
|
|
NProgress.start() // start progress bar
|
|
|
to.meta && typeof to.meta.title !== 'undefined' && setDocumentTitle(`${i18nRender(to.meta.title)} - ${domTitle}`)
|
|
|
/* has token */
|
|
|
const token = storage.get(ACCESS_TOKEN)
|
|
|
+ const tenant_id = storage.get(TENANT_ID)
|
|
|
if (token) {
|
|
|
+ store.commit('SET_TENANT_ID', tenant_id)
|
|
|
+ store.commit('SET_TOKEN', token)
|
|
|
if (to.path === loginRoutePath) {
|
|
|
next({ path: defaultRoutePath })
|
|
|
NProgress.done()
|