diff --git a/src/layout/components/FixedHeader/index.vue b/src/layout/components/FixedHeader/index.vue
index 70e79d5..a64a225 100644
--- a/src/layout/components/FixedHeader/index.vue
+++ b/src/layout/components/FixedHeader/index.vue
@@ -129,6 +129,7 @@ export default {
.crumbs-box {
padding: 0 15px;
height: 55px;
+ border-bottom: 2px solid #d1d9e6;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
}
}
diff --git a/src/permission.js b/src/permission.js
index c568979..33d66ec 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -1,58 +1,62 @@
-import router from './router'
-import store from './store'
-import { Message } from 'element-ui'
-import NProgress from 'nprogress'
-import 'nprogress/nprogress.css'
-import { getToken } from '@/utils/auth'
-import { isRelogin } from '@/utils/request'
+import router from "./router";
+import store from "./store";
+import { Message } from "element-ui";
+import NProgress from "nprogress";
+import "nprogress/nprogress.css";
+import { getToken } from "@/utils/auth";
+import { isRelogin } from "@/utils/request";
-NProgress.configure({ showSpinner: false })
+NProgress.configure({ showSpinner: false });
-const whiteList = ['/login', '/register']
+const whiteList = ["/login", "/register"];
router.beforeEach((to, from, next) => {
- NProgress.start()
+ NProgress.start();
if (getToken()) {
- to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
+ to.meta.title && store.dispatch("settings/setTitle", to.meta.title);
/* has token*/
- if (to.path === '/login') {
- next({ path: '/' })
- NProgress.done()
+ if (to.path === "/login") {
+ next({ path: "/" });
+ NProgress.done();
} else if (whiteList.indexOf(to.path) !== -1) {
- next()
+ next();
} else {
if (store.getters.roles.length === 0) {
- isRelogin.show = true
+ isRelogin.show = true;
// 判断当前用户是否已拉取完user_info信息
- store.dispatch('GetInfo').then(() => {
- isRelogin.show = false
- store.dispatch('GenerateRoutes').then(accessRoutes => {
- // 根据roles权限生成可访问的路由表
- router.addRoutes(accessRoutes) // 动态添加可访问路由表
- next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
- })
- }).catch(err => {
- store.dispatch('LogOut').then(() => {
- Message.error(err)
- next({ path: '/' })
- })
+ store
+ .dispatch("GetInfo")
+ .then(() => {
+ isRelogin.show = false;
+ store.dispatch("GenerateRoutes").then((accessRoutes) => {
+ // 根据roles权限生成可访问的路由表
+ console.log(accessRoutes, "路由");
+ router.addRoutes(accessRoutes); // 动态添加可访问路由表
+ next({ ...to, replace: true }); // hack方法 确保addRoutes已完成
+ });
})
+ .catch((err) => {
+ store.dispatch("LogOut").then(() => {
+ Message.error(err);
+ next({ path: "/" });
+ });
+ });
} else {
- next()
+ next();
}
}
} else {
// 没有token
if (whiteList.indexOf(to.path) !== -1) {
// 在免登录白名单,直接进入
- next()
+ next();
} else {
- next(`/login?redirect=${encodeURIComponent(to.fullPath)}`) // 否则全部重定向到登录页
- NProgress.done()
+ next(`/login?redirect=${encodeURIComponent(to.fullPath)}`); // 否则全部重定向到登录页
+ NProgress.done();
}
}
-})
+});
router.afterEach(() => {
- NProgress.done()
-})
+ NProgress.done();
+});
diff --git a/src/views/project/projectInfo/index.vue b/src/views/project/projectInfo/index.vue
new file mode 100644
index 0000000..ce15fe1
--- /dev/null
+++ b/src/views/project/projectInfo/index.vue
@@ -0,0 +1,9 @@
+
+ 项目详情
+
+
+
+
+