diff --git a/admin/src/assets/scss/index.scss b/admin/src/assets/scss/index.scss index 68b5041..a0dcba1 100644 --- a/admin/src/assets/scss/index.scss +++ b/admin/src/assets/scss/index.scss @@ -1,4 +1,5 @@ @import './element.scss'; +@import './mine.scss'; * { margin: 0; diff --git a/admin/src/assets/scss/mine.scss b/admin/src/assets/scss/mine.scss new file mode 100644 index 0000000..88a7f94 --- /dev/null +++ b/admin/src/assets/scss/mine.scss @@ -0,0 +1,3 @@ +.m-content { + padding: 10px; +} \ No newline at end of file diff --git a/admin/src/layout/header/components/Avatar.vue b/admin/src/layout/header/components/Avatar.vue index dcd02bf..a2ca988 100644 --- a/admin/src/layout/header/components/Avatar.vue +++ b/admin/src/layout/header/components/Avatar.vue @@ -13,10 +13,14 @@ diff --git a/admin/src/layout/header/components/Hamburger.vue b/admin/src/layout/header/components/Hamburger.vue index e8236a9..8997b1e 100644 --- a/admin/src/layout/header/components/Hamburger.vue +++ b/admin/src/layout/header/components/Hamburger.vue @@ -24,6 +24,5 @@ const toggleCollapse = () => { diff --git a/admin/src/layout/header/index.vue b/admin/src/layout/header/index.vue index 9a52cd5..d1b9792 100644 --- a/admin/src/layout/header/index.vue +++ b/admin/src/layout/header/index.vue @@ -19,7 +19,7 @@ import Screenfull from './components/Screenfull.vue' diff --git a/admin/src/router/index.js b/admin/src/router/index.js index a2a52f7..80a816b 100644 --- a/admin/src/router/index.js +++ b/admin/src/router/index.js @@ -52,4 +52,14 @@ const router = createRouter({ routes }) +// 未登录时跳转至登录界面 +router.beforeEach((to, from, next) => { + const token = localStorage.getItem('token') + if (token || to.path === '/login') { + next() + } else { + next('/login') + } +}) + export default router diff --git a/admin/src/store/index.js b/admin/src/store/index.js index 8f6e16f..2579337 100644 --- a/admin/src/store/index.js +++ b/admin/src/store/index.js @@ -2,7 +2,8 @@ import { defineStore } from 'pinia' export const useStore = defineStore('store', { state: () => ({ - collapse: false + collapse: false, + token: localStorage.getItem('token') || '' }), actions: { changeCollapse() { diff --git a/admin/src/views/login/Login.vue b/admin/src/views/login/Login.vue index 090c6e2..48952c0 100644 --- a/admin/src/views/login/Login.vue +++ b/admin/src/views/login/Login.vue @@ -36,12 +36,44 @@