fix: some bug

This commit is contained in:
xiaoxian521
2021-08-27 00:45:40 +08:00
parent a4f126ae7f
commit a4d305868f
7 changed files with 69 additions and 20 deletions

View File

@@ -120,13 +120,12 @@ export function resetRouter() {
import NProgress from "../utils/progress";
// const whiteList = ["/login", "/register"];
const whiteList = ["/login", "/register"];
router.beforeEach((to, _from, next) => {
const name = storageSession.getItem("info");
NProgress.start();
const { t } = i18n.global;
// @ts-ignore
to.meta.title ? (document.title = t(to.meta.title)) : ""; // 动态title
if (name) {
if (_from?.name) {
@@ -140,7 +139,11 @@ router.beforeEach((to, _from, next) => {
}
} else {
if (to.path !== "/login") {
next({ path: "/login" });
if (whiteList.indexOf(to.path) !== -1) {
next();
} else {
next({ path: "/login" });
}
} else {
next();
}

View File

@@ -21,20 +21,6 @@ const remainingRouter = [
rank: 102
}
},
// {
// // 找不到路由重定向到404页面
// path: "/:pathMatch(.*)",
// name: "pathMatch",
// component: Layout,
// redirect: "/error/404",
// meta: {
// icon: "el-icon-s-home",
// title: "message.hshome",
// showLink: false,
// savedPosition: false,
// rank: 103,
// },
// },
{
path: "/redirect",
name: "redirect",