diff --git a/src/assets/main.css b/src/assets/main.css index 25ab25e..75f567b 100644 --- a/src/assets/main.css +++ b/src/assets/main.css @@ -4,4 +4,8 @@ body{ padding: 0; width: 100%; height: 100%; -} \ No newline at end of file +} +.container { + width: 90%; + margin: 0 auto; +} diff --git a/src/assets/ordinary/Home.css b/src/assets/ordinary/Home.css index f26a363..4d1bd74 100644 --- a/src/assets/ordinary/Home.css +++ b/src/assets/ordinary/Home.css @@ -8,12 +8,12 @@ body { .container { width: 90%; - height: 10vh; margin: 0 auto; } .logo { background-color: #4081bf; + height: 10vh; } diff --git a/src/assets/ordinary/account.css b/src/assets/ordinary/account.css new file mode 100644 index 0000000..8b7bad9 --- /dev/null +++ b/src/assets/ordinary/account.css @@ -0,0 +1,8 @@ +.center-container { + display: flex; + justify-content: center; + align-items: center; + /*background-color: red;*/ + width: 100%; + height: 100vh; +} diff --git a/src/components/account/sign-in.css b/src/components/account/sign-in.css new file mode 100644 index 0000000..e69de29 diff --git a/src/components/account/sign-in.vue b/src/components/account/sign-in.vue new file mode 100644 index 0000000..e300aef --- /dev/null +++ b/src/components/account/sign-in.vue @@ -0,0 +1,11 @@ + + + + + diff --git a/src/components/account/sign-option.css b/src/components/account/sign-option.css new file mode 100644 index 0000000..0e0b9c2 --- /dev/null +++ b/src/components/account/sign-option.css @@ -0,0 +1,5 @@ +.el-button { + margin-bottom: 25px; + height: 10vh; + width: 50vw; +} \ No newline at end of file diff --git a/src/components/account/sign-option.vue b/src/components/account/sign-option.vue new file mode 100644 index 0000000..07a83d9 --- /dev/null +++ b/src/components/account/sign-option.vue @@ -0,0 +1,31 @@ + + + + + \ No newline at end of file diff --git a/src/components/account/sign-up.css b/src/components/account/sign-up.css new file mode 100644 index 0000000..0ffa5ea --- /dev/null +++ b/src/components/account/sign-up.css @@ -0,0 +1,15 @@ +.el-text { + text-align: center; + width: 60%; + margin: 0; + padding:0; +} + +.ButtonState { + width: 30%; + max-width: 120px; + min-width: 50px; + height: 30px; + margin: 0; + padding: 0; +} \ No newline at end of file diff --git a/src/components/account/sign-up.vue b/src/components/account/sign-up.vue new file mode 100644 index 0000000..51b7191 --- /dev/null +++ b/src/components/account/sign-up.vue @@ -0,0 +1,114 @@ + + + + + diff --git a/src/components/NotFound.vue b/src/error/NotFound.vue similarity index 100% rename from src/components/NotFound.vue rename to src/error/NotFound.vue diff --git a/src/router/router.ts b/src/router/router.ts index 74db990..e1677d2 100644 --- a/src/router/router.ts +++ b/src/router/router.ts @@ -1,17 +1,54 @@ import {createRouter, createWebHashHistory, RouteRecordRaw} from "vue-router"; -import Home from "@/views/ordinary/Home.vue"; -import NotFound from "@/components/NotFound.vue"; +import Home from "@/views/Home.vue"; +import NotFound from "@/error/NotFound.vue"; import Admin from "@/views/managerial/admin.vue" +import Account from "@/views/ordinary/account.vue" +import Books from "@/views/ordinary/books.vue" +import Journals from "@/views/ordinary/journals.vue" +import Newspapers from "@/views/ordinary/newspapers.vue"; +import Main from "@/views/ordinary/main.vue"; const routes: Array = [ { path: "/", - name:"home", + name: "home", component: Home, + children: [ + { + path: "account", + name: "account", + component: Account, + }, + { + path: "books", + name: "books", + component: Books, + }, + { + path: "journals", + name: "journals", + component: Journals, + }, + { + path: "newspapers", + name: "newspapers", + component: Newspapers, + }, + { + path: "main", + name: "main", + component: Main, + }, + ] }, { - path:"/5Usw4tshU6SRG2HxSxeG2UKfZZ7HKvSjEZjvBV7WExUFYwUKTX", - name:"admin", + path: "/account", + name: "account", + component: Account, + }, + { + path: "/5Usw4tshU6SRG2HxSxeG2UKfZZ7HKvSjEZjvBV7WExUFYwUKTX", + name: "admin", component: Admin, }, { diff --git a/src/views/ordinary/Home.vue b/src/views/Home.vue similarity index 74% rename from src/views/ordinary/Home.vue rename to src/views/Home.vue index b8d4e64..02cd6c8 100644 --- a/src/views/ordinary/Home.vue +++ b/src/views/Home.vue @@ -3,6 +3,7 @@ import "@/assets/ordinary/Home.css" import {ref} from 'vue' import { UserFilled } from '@element-plus/icons-vue' import {useRouter} from "vue-router"; +const imgsrc = ref('https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png') //头像 const router = useRouter() const activeIndex = ref(router.currentRoute.value.path) // 根据当前路由设置激活状态 const handleSelect = (path: string) => { @@ -23,7 +24,7 @@ const handleSelect = (path: string) => { router > - 首页 + 首页 图书 期刊 报纸 @@ -31,15 +32,15 @@ const handleSelect = (path: string) => {
- +
- 读者登录 + 读者登录 -
+
-
- +
+
diff --git a/src/views/ordinary/PersonalCenter.vue b/src/views/PersonalCenter.vue similarity index 100% rename from src/views/ordinary/PersonalCenter.vue rename to src/views/PersonalCenter.vue diff --git a/src/views/ordinary/account.vue b/src/views/ordinary/account.vue new file mode 100644 index 0000000..5af725f --- /dev/null +++ b/src/views/ordinary/account.vue @@ -0,0 +1,32 @@ + + + + + \ No newline at end of file diff --git a/src/views/ordinary/books.vue b/src/views/ordinary/books.vue new file mode 100644 index 0000000..b0a4cd6 --- /dev/null +++ b/src/views/ordinary/books.vue @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/src/views/ordinary/journals.vue b/src/views/ordinary/journals.vue new file mode 100644 index 0000000..82a596e --- /dev/null +++ b/src/views/ordinary/journals.vue @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/src/views/ordinary/main.vue b/src/views/ordinary/main.vue new file mode 100644 index 0000000..6c87902 --- /dev/null +++ b/src/views/ordinary/main.vue @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/src/views/ordinary/newspapers.vue b/src/views/ordinary/newspapers.vue new file mode 100644 index 0000000..601f8c9 --- /dev/null +++ b/src/views/ordinary/newspapers.vue @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file