|
|
|
@ -8,7 +8,17 @@ import { isRelogin } from "@/utils/request";
|
|
|
|
|
|
|
|
|
|
|
|
NProgress.configure({ showSpinner: false });
|
|
|
|
NProgress.configure({ showSpinner: false });
|
|
|
|
|
|
|
|
|
|
|
|
const whiteList = ["/login", "/register", "/3dmodel"];
|
|
|
|
const whiteList = [
|
|
|
|
|
|
|
|
"/login",
|
|
|
|
|
|
|
|
"/register",
|
|
|
|
|
|
|
|
"/3dmodel",
|
|
|
|
|
|
|
|
"/volunteer/userbq/bqhsj",
|
|
|
|
|
|
|
|
"/volunteer/userbq/dictGl",
|
|
|
|
|
|
|
|
"/volunteer/hdtj/hdGl",
|
|
|
|
|
|
|
|
"/volunteer/yzczs/ycxzsff",
|
|
|
|
|
|
|
|
"/volunteer/gxhzs/gxhzsgl",
|
|
|
|
|
|
|
|
"/volunteer/gxhzs/gxhzsff",
|
|
|
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
|
|
router.beforeEach((to, from, next) => {
|
|
|
|
router.beforeEach((to, from, next) => {
|
|
|
|
NProgress.start();
|
|
|
|
NProgress.start();
|
|
|
|
@ -19,6 +29,8 @@ router.beforeEach((to, from, next) => {
|
|
|
|
next({ path: "/" });
|
|
|
|
next({ path: "/" });
|
|
|
|
NProgress.done();
|
|
|
|
NProgress.done();
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
|
|
|
|
let isTrue = whiteList.some((item) => item == to.path);
|
|
|
|
|
|
|
|
store.commit("SET_IS_MENU_HEADER", !isTrue);
|
|
|
|
if (store.getters.roles.length === 0) {
|
|
|
|
if (store.getters.roles.length === 0) {
|
|
|
|
isRelogin.show = true;
|
|
|
|
isRelogin.show = true;
|
|
|
|
// 判断当前用户是否已拉取完user_info信息
|
|
|
|
// 判断当前用户是否已拉取完user_info信息
|
|
|
|
@ -43,13 +55,26 @@ router.beforeEach((to, from, next) => {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
// 没有token
|
|
|
|
let { isFromVolunteer, tel } = to.query;
|
|
|
|
if (whiteList.indexOf(to.path) !== -1) {
|
|
|
|
if (tel) {
|
|
|
|
// 在免登录白名单，直接进入
|
|
|
|
// store
|
|
|
|
next();
|
|
|
|
// .dispatch("Login", {
|
|
|
|
|
|
|
|
// username: "15937192537",
|
|
|
|
|
|
|
|
// password: "123456",
|
|
|
|
|
|
|
|
// })
|
|
|
|
|
|
|
|
// .then(() => {
|
|
|
|
|
|
|
|
// store.commit("SET_IS_MENU_HEADER", false);
|
|
|
|
|
|
|
|
// });
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
next(`/login?redirect=${encodeURIComponent(to.fullPath)}`); // 否则全部重定向到登录页
|
|
|
|
if (whiteList.indexOf(to.path) !== -1) {
|
|
|
|
NProgress.done();
|
|
|
|
store.commit("SET_IS_MENU_HEADER", false); //不显示左侧菜单，头部标题
|
|
|
|
|
|
|
|
// 没有token
|
|
|
|
|
|
|
|
// 在免登录白名单，直接进入
|
|
|
|
|
|
|
|
next();
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
next(`/login?redirect=${encodeURIComponent(to.fullPath)}`); // 否则全部重定向到登录页
|
|
|
|
|
|
|
|
NProgress.done();
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
