Commit 36172511 authored by chenqikuai's avatar chenqikuai

fix

parent 59b0df16
VUE_APP_MODE=normal
\ No newline at end of file
VUE_APP_MODE=platform
\ No newline at end of file
......@@ -4,7 +4,11 @@
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build --report",
"platform": "vue-cli-service serve --mode platform",
"normal": "vue-cli-service serve --mode normal",
"buildPlatform": "vue-cli-service build --mode platform",
"buildNormal": "vue-cli-service build --mode normal",
"build": "vue-cli-service build --mode report",
"bd": "npm run build & bash deploy.sh"
},
"dependencies": {
......@@ -52,4 +56,4 @@
"last 2 versions",
"not dead"
]
}
}
\ No newline at end of file
......@@ -3,7 +3,7 @@ import { getOldRoleFromUserMsg } from '@/utils/user'
import { getUserMsg } from '@/utils/userMsg/userMsg'
import { menuList } from '@/views/Root/getMenuList'
import Vue from 'vue'
import VueRouter, { RouteConfig } from 'vue-router'
import VueRouter, { RouteConfig, Route } from 'vue-router'
const Index = () => import('@/views/Root/index.vue')
......@@ -63,21 +63,46 @@ const router = new VueRouter({
routes,
})
const redirectConfig = {
platform: 'adminLogin',
normal: 'login',
}
function getRedirectRouteName() {
if (process.env.VUE_APP_MODE === 'platform') {
return redirectConfig.platform
} else if (process.env.VUE_APP_MODE) {
return redirectConfig.normal
}
}
router.beforeEach((to, from, next) => {
console.log({ from, to })
const redirectRouteName = getRedirectRouteName()
const usermsg = getUserMsg()
if (usermsg === undefined) {
/* 没有登录 */
if (to.name == 'adminLogin' || to.name == 'login') {
console.log(1)
next()
if (redirectRouteName === undefined) {
if (to.name == 'adminLogin' || to.name == 'login') {
console.log(1)
next()
} else {
console.log(2)
next({
name: 'login',
})
}
} else {
console.log(2)
next({
name: 'login',
})
if (to.name === redirectRouteName) {
next()
console.log(1)
} else {
next({
name: redirectRouteName,
})
}
}
} else {
console.log(3)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment