From ebd85c9b4cb0a6bdd221995f4a76e82e7354122e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=20=E5=85=83=E5=B1=B1?= <piercezzs@outlook.com>
Date: Thu, 1 Feb 2024 10:40:05 +0800
Subject: [PATCH] f

---
 src/views/about/academiccommittee.vue    |  4 +-
 src/views/about/annualworkplan.vue       |  4 +-
 src/views/about/audiencesurveys.vue      | 15 +++--
 src/views/about/council.vue              |  4 +-
 src/views/about/developmentplanning.vue  |  4 +-
 src/views/about/friendsofthemuseum.vue   |  4 +-
 src/views/about/interpretive.vue         |  4 +-
 src/views/about/seniormanagement.vue     |  4 +-
 src/views/about/socialdonation.vue       |  4 +-
 src/views/about/statutes.vue             |  4 +-
 src/views/about/supervisoryauthority.vue |  4 +-
 src/views/about/threeyeannrep.vue        |  4 +-
 src/views/aboutpage.vue                  | 60 +++++++++----------
 src/views/commonpage.vue                 | 75 +++++++++++++++++-------
 src/views/homepage.vue                   | 75 +++++++++++++++++-------
 src/views/staytuned.vue                  |  6 +-
 16 files changed, 172 insertions(+), 103 deletions(-)

diff --git a/src/views/about/academiccommittee.vue b/src/views/about/academiccommittee.vue
index c1156cd..99cc47b 100644
--- a/src/views/about/academiccommittee.vue
+++ b/src/views/about/academiccommittee.vue
@@ -182,8 +182,8 @@
 </template>
 <style scoped>
 .about-page {
-  max-height: calc(100vh - 160px - 187px);
-  min-height: calc(100vh - 160px - 187px);
+  max-height: calc(100vh - 160px - 145px);
+  min-height: calc(100vh - 160px - 145px);
   overflow: auto;
   background: url("../../assets/images/about-bg.png");
 }
diff --git a/src/views/about/annualworkplan.vue b/src/views/about/annualworkplan.vue
index ec098e3..3b119e1 100644
--- a/src/views/about/annualworkplan.vue
+++ b/src/views/about/annualworkplan.vue
@@ -41,8 +41,8 @@
 </template>
 <style scoped>
 .about-page {
-  max-height: calc(100vh - 160px - 187px);
-  min-height: calc(100vh - 160px - 187px);
+  max-height: calc(100vh - 160px - 145px);
+  min-height: calc(100vh - 160px - 145px);
   overflow: auto;
   background: url("../../assets/images/about-bg.png");
 }
diff --git a/src/views/about/audiencesurveys.vue b/src/views/about/audiencesurveys.vue
index f0c13ec..a169fc8 100644
--- a/src/views/about/audiencesurveys.vue
+++ b/src/views/about/audiencesurveys.vue
@@ -26,8 +26,13 @@
       <div class="row items-center fl-mt-lg">
         <div class="col-2 font-blod font-16"
              style="color:#195D4A">验证码</div>
-        <div class="col-10"
-             style=""><input class="styled-input"></div>
+        <div class="col-10 row justify-between">
+
+          <div class="col-9"
+               style=""><input class="styled-input"></div>
+          <div class="col-2"
+               style=""><input class="styled-input"></div>
+        </div>
       </div>
     </div>
     <div class="col-12 row justify-center">
@@ -111,14 +116,14 @@ onBeforeMount(() => {
 })
 
 
-const handkeLink = (url) => {
+const handleLink = (url) => {
 }
 </script>
 
 <style scoped>
 .about-page {
-  max-height: calc(100vh - 160px - 187px);
-  min-height: calc(100vh - 160px - 187px);
+  max-height: calc(100vh - 160px - 145px);
+  min-height: calc(100vh - 160px - 145px);
   overflow: auto;
   background: url("../../assets/images/about-bg.png");
 }
diff --git a/src/views/about/council.vue b/src/views/about/council.vue
index f0331e0..79438d3 100644
--- a/src/views/about/council.vue
+++ b/src/views/about/council.vue
@@ -625,8 +625,8 @@
 </template>
 <style scoped>
 .about-page {
-  max-height: calc(100vh - 160px - 187px);
-  min-height: calc(100vh - 160px - 187px);
+  max-height: calc(100vh - 160px - 145px);
+  min-height: calc(100vh - 160px - 145px);
   overflow: auto;
   background: url("../../assets/images/about-bg.png");
 }
diff --git a/src/views/about/developmentplanning.vue b/src/views/about/developmentplanning.vue
index 2dcd5f1..8d144b8 100644
--- a/src/views/about/developmentplanning.vue
+++ b/src/views/about/developmentplanning.vue
@@ -303,8 +303,8 @@
 </template>
 <style scoped>
 .about-page {
-  max-height: calc(100vh - 160px - 187px);
-  min-height: calc(100vh - 160px - 187px);
+  max-height: calc(100vh - 160px - 145px);
+  min-height: calc(100vh - 160px - 145px);
   overflow: auto;
   background: url("../../assets/images/about-bg.png");
 }
diff --git a/src/views/about/friendsofthemuseum.vue b/src/views/about/friendsofthemuseum.vue
index 7ab6257..c791f3e 100644
--- a/src/views/about/friendsofthemuseum.vue
+++ b/src/views/about/friendsofthemuseum.vue
@@ -155,8 +155,8 @@
 </template>
 <style scoped>
 .about-page {
-  max-height: calc(100vh - 160px - 187px);
-  min-height: calc(100vh - 160px - 187px);
+  max-height: calc(100vh - 160px - 145px);
+  min-height: calc(100vh - 160px - 145px);
   overflow: auto;
   background: url("../../assets/images/about-bg.png");
 }
diff --git a/src/views/about/interpretive.vue b/src/views/about/interpretive.vue
index efb8507..c412fde 100644
--- a/src/views/about/interpretive.vue
+++ b/src/views/about/interpretive.vue
@@ -115,8 +115,8 @@
 </template>
 <style scoped>
 .about-page {
-  max-height: calc(100vh - 160px - 187px);
-  min-height: calc(100vh - 160px - 187px);
+  max-height: calc(100vh - 160px - 145px);
+  min-height: calc(100vh - 160px - 145px);
   overflow: auto;
   background: url("../../assets/images/about-bg.png");
 }
diff --git a/src/views/about/seniormanagement.vue b/src/views/about/seniormanagement.vue
index 5a16248..a8d6c25 100644
--- a/src/views/about/seniormanagement.vue
+++ b/src/views/about/seniormanagement.vue
@@ -25,8 +25,8 @@
 </template>
 <style scoped>
 .about-page {
-  max-height: calc(100vh - 160px - 187px);
-  min-height: calc(100vh - 160px - 187px);
+  max-height: calc(100vh - 160px - 145px);
+  min-height: calc(100vh - 160px - 145px);
   overflow: auto;
   background: url("../../assets/images/about-bg.png");
 }
diff --git a/src/views/about/socialdonation.vue b/src/views/about/socialdonation.vue
index c1881b8..ad843bf 100644
--- a/src/views/about/socialdonation.vue
+++ b/src/views/about/socialdonation.vue
@@ -111,8 +111,8 @@
 </template>
 <style scoped>
 .about-page {
-  max-height: calc(100vh - 160px - 187px);
-  min-height: calc(100vh - 160px - 187px);
+  max-height: calc(100vh - 160px - 145px);
+  min-height: calc(100vh - 160px - 145px);
   overflow: auto;
   background: url("../../assets/images/about-bg.png");
 }
diff --git a/src/views/about/statutes.vue b/src/views/about/statutes.vue
index 046e97e..59a0f42 100644
--- a/src/views/about/statutes.vue
+++ b/src/views/about/statutes.vue
@@ -628,8 +628,8 @@
 </template>
 <style scoped>
 .about-page {
-  max-height: calc(100vh - 160px - 187px);
-  min-height: calc(100vh - 160px - 187px);
+  max-height: calc(100vh - 160px - 145px);
+  min-height: calc(100vh - 160px - 145px);
   overflow: auto;
   background: url("../../assets/images/about-bg.png");
 }
diff --git a/src/views/about/supervisoryauthority.vue b/src/views/about/supervisoryauthority.vue
index 5810f49..c0566c8 100644
--- a/src/views/about/supervisoryauthority.vue
+++ b/src/views/about/supervisoryauthority.vue
@@ -14,8 +14,8 @@
 </template>
 <style scoped>
 .about-page {
-  max-height: calc(100vh - 160px - 187px);
-  min-height: calc(100vh - 160px - 187px);
+  max-height: calc(100vh - 160px - 145px);
+  min-height: calc(100vh - 160px - 145px);
   overflow: auto;
   background: url("../../assets/images/about-bg.png");
 }
diff --git a/src/views/about/threeyeannrep.vue b/src/views/about/threeyeannrep.vue
index 9166fea..2127683 100644
--- a/src/views/about/threeyeannrep.vue
+++ b/src/views/about/threeyeannrep.vue
@@ -41,8 +41,8 @@
 </template>
 <style scoped>
 .about-page {
-  max-height: calc(100vh - 160px - 187px);
-  min-height: calc(100vh - 160px - 187px);
+  max-height: calc(100vh - 160px - 145px);
+  min-height: calc(100vh - 160px - 145px);
   overflow: auto;
   background: url("../../assets/images/about-bg.png");
 }
diff --git a/src/views/aboutpage.vue b/src/views/aboutpage.vue
index 0e20367..3914e13 100644
--- a/src/views/aboutpage.vue
+++ b/src/views/aboutpage.vue
@@ -10,19 +10,19 @@
       <div class="col-6 row justify-around items-center">
 
         <div class="cursor header-title"
-             @click="handkeLink('/home/navigation')">首页</div>
+             @click="handleLink('/home/navigation')">首页</div>
         <div class="cursor header-title"
-             @click="handkeLink('')">导航</div>
+             @click="handleLink('')">导航</div>
         <div class="cursor header-title"
-             @click="handkeLink('')">展览</div>
+             @click="handleLink('')">展览</div>
         <div class="cursor header-title"
-             @click="handkeLink('')">典藏</div>
+             @click="handleLink('')">典藏</div>
         <div class="cursor header-title"
-             @click="handkeLink('')">资讯</div>
+             @click="handleLink('')">资讯</div>
         <div class="cursor header-title"
-             @click="handkeLink('')">文创</div>
+             @click="handleLink('')">文创</div>
         <div class="cursor header-title"
-             @click="handkeLink('')">数字文脉</div>
+             @click="handleLink('')">数字文脉</div>
         <div class="cursor header-title hover-dom relative">关于
           <div class="hidden-dom row justify-center"
                style="position:absolute;top:20px;left:-38px;z-index:9999">
@@ -30,14 +30,14 @@
                  style="padding: 4px 8px ">
               <div class="cursor"
                    style="padding: 8px;border-bottom:1px solid #fff "
-                   @click="handkeLink('/about/statutes')">制度公开</div>
+                   @click="handleLink('/about/statutes')">制度公开</div>
 
               <div class="cursor"
                    style="padding: 8px;border-bottom:1px solid #fff "
-                   @click="handkeLink('/common/interpretive')">讲解服务</div>
+                   @click="handleLink('/common/interpretive')">讲解服务</div>
               <div class="cursor"
                    style="padding: 8px  "
-                   @click="handkeLink('/common/audiencesurveys')">观众调查</div>
+                   @click="handleLink('/common/audiencesurveys')">观众调查</div>
 
             </div>
           </div>
@@ -47,12 +47,12 @@
     </div>
     <div class="row fl-page-width">
       <div class="color-white overflow-auto"
-           style="width:320px;background:rgba(0,0,0,0.8);font-size:20px">
+           style="width:320px;background:rgba(0,0,0,0.8);font-size:20px;padding-top:41px">
         <div style="height:50px"
              class="cursor row items-center justify-center"
              v-for="(item,index) in state.aboutPages"
              :key="index"
-             @click="handkeLink(item.url)"
+             @click="handleLink(item.url)"
              :class="state.activePage === item.url? 'active-about':''">{{item.title}}</div>
       </div>
 
@@ -61,28 +61,22 @@
 
       </div>
     </div>
-    <div style="height:187px;background:#000;"
+    <div style="height:145px;background:#000;"
          class="row justify-center color-white">
-      <div class="col-6 row justify-around fl-mt-lg">
+      <div class="col-4 row justify-around "
+           style="margin-top:32px;max-width:300px">
         <div class="cursor"
-             @click="handkeLink('')">首页</div>
-        <div class="cursor"
-             @click="handkeLink('')">导航</div>
-        <div class="cursor"
-             @click="handkeLink('')">展览</div>
-        <div class="cursor"
-             @click="handkeLink('')">典藏</div>
-        <div class="cursor"
-             @click="handkeLink('')">资讯</div>
-        <div class="cursor"
-             @click="handkeLink('')">文创</div>
-        <div class="cursor"
-             @click="handkeLink('')">数字文脉</div>
-        <div class="cursor hover-dom"
-             @click="handkeLink('')">关于
-          <div class="hidden-dom row justify-center"
-               style="">2333</div>
-        </div>
+             @click="handleLink('')">帮助</div>
+        <div class="
+             cursor"
+             @click="handleLink('')">隐私</div>
+        <div class="
+             cursor"
+             @click="handleLink('')">条款</div>
+        <div class="
+             col-12
+             cursor
+             text-center">copyright 2024 最终所有权归延庆博物馆</div>
       </div>
     </div>
 
@@ -151,7 +145,7 @@ onBeforeMount(() => {
 })
 
 
-const handkeLink = (url) => {
+const handleLink = (url) => {
   if (url) {
     router.push(url)
     state.activePage = url;
diff --git a/src/views/commonpage.vue b/src/views/commonpage.vue
index 4bc0528..1424795 100644
--- a/src/views/commonpage.vue
+++ b/src/views/commonpage.vue
@@ -10,38 +10,61 @@
       <div class="col-6 row justify-around items-center">
 
         <div class="cursor header-title"
-             @click="handkeLink('/home/navigation')">首页</div>
+             @click="handleLink('/home/navigation')">首页</div>
         <div class="cursor header-title"
-             @click="handkeLink('')">导航</div>
+             @click="handleLink('')">导航</div>
         <div class="cursor header-title"
-             @click="handkeLink('')">展览</div>
+             @click="handleLink('')">展览</div>
         <div class="cursor header-title"
-             @click="handkeLink('')">典藏</div>
+             @click="handleLink('')">典藏</div>
         <div class="cursor header-title"
-             @click="handkeLink('')">资讯</div>
+             @click="handleLink('')">资讯</div>
         <div class="cursor header-title"
-             @click="handkeLink('')">文创</div>
+             @click="handleLink('')">文创</div>
         <div class="cursor header-title"
-             @click="handkeLink('')">数字文脉</div>
-        <div class="cursor header-title"
-             @click="handkeLink('/about/statutes')">关于</div>
+             @click="handleLink('')">数字文脉</div>
+
+        <div class="cursor header-title hover-dom relative">关于
+          <div class="hidden-dom row justify-center"
+               style="position:absolute;top:20px;left:-38px;z-index:9999">
+            <div class="row justify-center secmenu fl-mt-lg"
+                 style="padding: 4px 8px ">
+              <div class="cursor"
+                   style="padding: 8px;border-bottom:1px solid #fff "
+                   @click="handleLink('/about/statutes')">制度公开</div>
+
+              <div class="cursor"
+                   style="padding: 8px;border-bottom:1px solid #fff "
+                   @click="handleLink('/common/interpretive')">讲解服务</div>
+              <div class="cursor"
+                   style="padding: 8px  "
+                   @click="handleLink('/common/audiencesurveys')">观众调查</div>
+
+            </div>
+          </div>
+        </div>
       </div>
     </div>
     <div class="fl-page-width">
       <router-view></router-view>
     </div>
 
-    <div style="height:187px;background:#000;"
+    <div style="height:145px;background:#000;"
          class="row justify-center color-white">
-      <div class="col-6 row justify-around fl-mt-lg">
-        <div class="cursor">首页</div>
-        <div class="cursor">导航</div>
-        <div class="cursor">展览</div>
-        <div class="cursor">典藏</div>
-        <div class="cursor">资讯</div>
-        <div class="cursor">文创</div>
-        <div class="cursor">数字文脉</div>
-        <div class="cursor">关于</div>
+      <div class="col-4 row justify-around "
+           style="margin-top:32px;max-width:300px">
+        <div class="cursor"
+             @click="handleLink('')">帮助</div>
+        <div class="
+             cursor"
+             @click="handleLink('')">隐私</div>
+        <div class="
+             cursor"
+             @click="handleLink('')">条款</div>
+        <div class="
+             col-12
+             cursor
+             text-center">copyright 2024 最终所有权归延庆博物馆</div>
       </div>
     </div>
   </div>
@@ -68,7 +91,7 @@ onBeforeMount(() => {
 })
 
 
-const handkeLink = (url) => {
+const handleLink = (url) => {
   if (url) {
     router.push(url)
     state.activePage = url;
@@ -86,4 +109,16 @@ const handkeLink = (url) => {
 .header-title:hover {
   background: #3d8873;
 }
+.hover-dom:hover .hidden-dom {
+  display: block;
+}
+
+.hidden-dom {
+  display: none;
+}
+.secmenu {
+  width: 120px;
+  background: #343434;
+  border-radius: 10px;
+}
 </style>
diff --git a/src/views/homepage.vue b/src/views/homepage.vue
index fbc16eb..95cf926 100644
--- a/src/views/homepage.vue
+++ b/src/views/homepage.vue
@@ -9,38 +9,61 @@
       <div class="col-6 row justify-around items-center">
 
         <div class="cursor header-title"
-             @click="handkeLink('/home/navigation')">首页</div>
+             @click="handleLink('/home/navigation')">首页</div>
         <div class="cursor header-title"
-             @click="handkeLink('')">导航</div>
+             @click="handleLink('')">导航</div>
         <div class="cursor header-title"
-             @click="handkeLink('')">展览</div>
+             @click="handleLink('')">展览</div>
         <div class="cursor header-title"
-             @click="handkeLink('')">典藏</div>
+             @click="handleLink('')">典藏</div>
         <div class="cursor header-title"
-             @click="handkeLink('')">资讯</div>
+             @click="handleLink('')">资讯</div>
         <div class="cursor header-title"
-             @click="handkeLink('')">文创</div>
+             @click="handleLink('')">文创</div>
         <div class="cursor header-title"
-             @click="handkeLink('')">数字文脉</div>
-        <div class="cursor header-title"
-             @click="handkeLink('/about/statutes')">关于</div>
+             @click="handleLink('')">数字文脉</div>
+
+        <div class="cursor header-title hover-dom relative">关于
+          <div class="hidden-dom row justify-center"
+               style="position:absolute;top:20px;left:-38px;z-index:9999">
+            <div class="row justify-center secmenu fl-mt-lg"
+                 style="padding: 4px 8px ">
+              <div class="cursor"
+                   style="padding: 8px;border-bottom:1px solid #fff "
+                   @click="handleLink('/about/statutes')">制度公开</div>
+
+              <div class="cursor"
+                   style="padding: 8px;border-bottom:1px solid #fff "
+                   @click="handleLink('/common/interpretive')">讲解服务</div>
+              <div class="cursor"
+                   style="padding: 8px  "
+                   @click="handleLink('/common/audiencesurveys')">观众调查</div>
+
+            </div>
+          </div>
+        </div>
       </div>
     </div>
     <div>
       <router-view></router-view>
     </div>
 
-    <div style="height:187px;background:#000;"
+    <div style="height:145px;background:#000;"
          class="row justify-center color-white">
-      <div class="col-6 row justify-around fl-mt-lg">
-        <div class="cursor">首页</div>
-        <div class="cursor">导航</div>
-        <div class="cursor">展览</div>
-        <div class="cursor">典藏</div>
-        <div class="cursor">资讯</div>
-        <div class="cursor">文创</div>
-        <div class="cursor">数字文脉</div>
-        <div class="cursor">关于</div>
+      <div class="col-4 row justify-around "
+           style="margin-top:32px;max-width:300px">
+        <div class="cursor"
+             @click="handleLink('')">帮助</div>
+        <div class="
+             cursor"
+             @click="handleLink('')">隐私</div>
+        <div class="
+             cursor"
+             @click="handleLink('')">条款</div>
+        <div class="
+             col-12
+             cursor
+             text-center">copyright 2024 最终所有权归延庆博物馆</div>
       </div>
     </div>
   </div>
@@ -67,7 +90,7 @@ onBeforeMount(() => {
 })
 
 
-const handkeLink = (url) => {
+const handleLink = (url) => {
   if (url) {
     router.push(url)
     state.activePage = url;
@@ -85,4 +108,16 @@ const handkeLink = (url) => {
 .header-title:hover {
   background: #3d8873;
 }
+.hover-dom:hover .hidden-dom {
+  display: block;
+}
+
+.hidden-dom {
+  display: none;
+}
+.secmenu {
+  width: 120px;
+  background: #343434;
+  border-radius: 10px;
+}
 </style>
diff --git a/src/views/staytuned.vue b/src/views/staytuned.vue
index a262329..bff16c0 100644
--- a/src/views/staytuned.vue
+++ b/src/views/staytuned.vue
@@ -1,14 +1,14 @@
 <template>
   <div class="about-page overflow-auto row justify-center"
        style="padding: 41px">
-    <div style="background:rgb(84, 121, 111,0.1);color:#54796F;height:calc(100vh - 160px - 187px);width:1166px;font-weight:bold;font-size:20px"
+    <div style="background:rgb(84, 121, 111,0.1);color:#54796F;height:calc(100vh - 160px - 145px);width:1166px;font-weight:bold;font-size:20px"
          class="row items-center justify-center">敬请期待</div>
   </div>
 </template>
 <style scoped>
 .about-page {
-  max-height: calc(100vh - 160px - 187px);
-  min-height: calc(100vh - 160px - 187px);
+  max-height: calc(100vh - 160px - 145px);
+  min-height: calc(100vh - 160px - 145px);
   overflow: auto;
   background: url("../../assets/images/about-bg.png");
 }