From 4be87f00d0f690d65f6e04e0f5785c74f9b94d44 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Wed, 4 Jan 2023 15:34:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=B2=A1=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/main-shuju.scss | 36 + src/router/index.js | 36 - src/views/main-shuju/main-navbar.vue | 151 ++-- src/views/modules/HomeWork.vue | 14 - src/views/modules/home.vue | 36 - src/views/pages/caiji.vue | 947 ----------------------- src/views/pages/caijisuccess.vue | 125 --- src/views/pages/staffRegister.vue | 509 ------------ src/views/pages/staffRegisterSuccess.vue | 147 ---- 9 files changed, 118 insertions(+), 1883 deletions(-) delete mode 100644 src/views/modules/HomeWork.vue delete mode 100644 src/views/modules/home.vue delete mode 100644 src/views/pages/caiji.vue delete mode 100644 src/views/pages/caijisuccess.vue delete mode 100644 src/views/pages/staffRegister.vue delete mode 100644 src/views/pages/staffRegisterSuccess.vue diff --git a/src/assets/scss/main-shuju.scss b/src/assets/scss/main-shuju.scss index e728b228e..5c97ebc8f 100644 --- a/src/assets/scss/main-shuju.scss +++ b/src/assets/scss/main-shuju.scss @@ -110,4 +110,40 @@ } } } + + .msg { + position: absolute; + display: flex; + align-items: center; + top: 40px; + right: 40px; + font-size: 16px; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #ffffff; + line-height: 22px; + .weather { + display: flex; + align-items: center; + img { + position: relative; + width: 16px; + } + div { + margin-left: 3px; + } + } + .date { + margin-left: 24px; + display: flex; + align-items: center; + .date-div { + margin: 0 10px; + height: 22px; + width: 1px; + background-color: #fff; + opacity: 0.8; + } + } + } } diff --git a/src/router/index.js b/src/router/index.js index 76ad282f6..49c748be6 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -25,42 +25,6 @@ export const pageRoutes = [ path: "/main/home", }, }, - { - path: "/caiji/:id", - props: true, - name: "caiji", - component: () => import("@/views/pages/caiji"), - meta: { - title: "居民信息填报", - }, - }, - { - path: "/caijisuccess", - props: true, - name: "caijisuccess", - component: () => import("@/views/pages/caijisuccess"), - meta: { - title: "居民信息填报", - }, - }, - { - path: "/staffRegister", - props: true, - name: "staffRegister", - component: () => import("@/views/pages/staffRegister"), - meta: { - title: "员工登记", - }, - }, - { - path: "/staffRegisterSuccess", - props: true, - name: "staffRegisterSuccess", - component: () => import("@/views/pages/staffRegisterSuccess"), - meta: { - title: "员工登记", - }, - }, { path: "/404", component: () => import("@/views/pages/404"), diff --git a/src/views/main-shuju/main-navbar.vue b/src/views/main-shuju/main-navbar.vue index 1e6248014..2a6eed342 100644 --- a/src/views/main-shuju/main-navbar.vue +++ b/src/views/main-shuju/main-navbar.vue @@ -3,22 +3,49 @@