diff --git a/src/App.vue b/src/App.vue index 892235a..338b440 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,67 +1,9 @@ - - -const current = ref(['mail']) -const items = ref([ - { - key: 'home', - icon: () => h(MailOutlined), - label: h('a', { href: '/' }, '首页'), - title: '首页' - }, - { - key: 'about', - icon: () => h(AppstoreOutlined), - label: h('a', { href: '/about' }, '关于'), - title: '关于' - }, - { - key: 'tool', - icon: () => h(AppstoreOutlined), - label: h('a', { href: '/tool' }, '工具'), - title: '工具' - }, - { - key: 'login', - icon: () => h(AppstoreOutlined), - label: h('a', { href: '/login' }, '登录'), - title: '登录' - } -]) - \ No newline at end of file + diff --git a/src/assets/background.jpg b/src/assets/background.jpg new file mode 100644 index 0000000..2250d7a Binary files /dev/null and b/src/assets/background.jpg differ diff --git a/src/assets/main.css b/src/assets/main.css index bbf3199..c86d1bf 100644 --- a/src/assets/main.css +++ b/src/assets/main.css @@ -1,7 +1,6 @@ @import './base.css'; #app { - max-width: 1280px; margin: 0 auto; padding: 2rem; font-weight: normal; @@ -14,8 +13,8 @@ header { } main { - /*width: 80%;*/ - width: 1080px; + width: 100%; + /*width: 1080px;*/ display: flex; justify-content: center; flex: 2 800px; @@ -25,19 +24,19 @@ main { a, .green { text-decoration: none; - color: hsla(160, 100%, 37%, 1); + color: hsl(0, 0%, 0%); transition: 0.4s; padding: 3px; } @media (hover: hover) { a:hover { - background-color: hsla(160, 100%, 37%, 0.2); + background-color: hsla(150, 1%, 56%, 0.2); } } @media (min-width: 1024px) { #app { - padding: 0 2rem; + padding: 0; } } diff --git a/src/components/CustomLogin.vue b/src/components/CustomLogin.vue index 441db26..6c35da8 100644 --- a/src/components/CustomLogin.vue +++ b/src/components/CustomLogin.vue @@ -33,7 +33,7 @@ const disabled = computed(() => { diff --git a/src/layouts/LoginLayout.vue b/src/layouts/LoginLayout.vue new file mode 100644 index 0000000..c7a50c0 --- /dev/null +++ b/src/layouts/LoginLayout.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 1897c4f..6de34be 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,37 +1,51 @@ import { createRouter, createWebHistory } from 'vue-router' -import HomeView from '@/views/HomeView.vue' import AboutView from '@/views/AboutView.vue' import ToolView from '@/views/ToolView.vue' -import LoginView from '@/views/LoginView.vue' import NewsView from '@/views/NewsView.vue' +import DefaultLayout from '../layouts/DefaultLayout.vue' +import LoginLayout from '@/layouts/LoginLayout.vue' +import LoginView from '@/views/LoginView.vue' +import HomeView from '@/views/HomeView.vue' const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), routes: [ { path: '/', - name: 'home', - component: HomeView - }, - { - path: '/about', - name: 'about', - component: AboutView - }, - { - path: '/tool', - name: 'tool', - component: ToolView + component: DefaultLayout, + children: [ + { + path: '', + name: 'Home', + component: HomeView + }, + { + path: '/about', + name: 'about', + component: AboutView + }, + { + path: '/tool', + name: 'tool', + component: ToolView + }, + { + path: '/news', + name: 'news', + component: NewsView + } + ] }, { path: '/login', - name: 'login', - component: LoginView - }, - { - path: '/news', - name: 'news', - component: NewsView + component: LoginLayout, + children: [ + { + path: '', + name: 'Login', + component: LoginView + } + ] } ] })