From 9cdbc45a8cf9b34e9207f8a654875158a54d3c91 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 09:29:53 +0800
Subject: [PATCH] fix

---
 src/assets/css/style.css                 |  2 +-
 src/views/about/supervisoryauthority.vue |  2 +-
 src/views/aboutpage.vue                  | 61 ++++++++++++++++--------
 src/views/commonpage.vue                 | 54 +++++++++++++++++----
 src/views/staytuned.vue                  |  2 +-
 5 files changed, 89 insertions(+), 32 deletions(-)

diff --git a/src/assets/css/style.css b/src/assets/css/style.css
index cce2427..9d744f6 100644
--- a/src/assets/css/style.css
+++ b/src/assets/css/style.css
@@ -4,7 +4,7 @@
 
 .fl-page-width {
     max-width: 1200px;
-    margin: auto;
+    margin: 0 auto;
 }
 
 .flex {
diff --git a/src/views/about/supervisoryauthority.vue b/src/views/about/supervisoryauthority.vue
index 858ba8d..5810f49 100644
--- a/src/views/about/supervisoryauthority.vue
+++ b/src/views/about/supervisoryauthority.vue
@@ -7,7 +7,7 @@
            style="margin-top:55px">
 
         <img src="../../assets/images/about-supervisoryauthority.png"
-             style="width: calc(100% - 120px);">
+             style="width: 100%">
       </div>
     </div>
   </div>
diff --git a/src/views/aboutpage.vue b/src/views/aboutpage.vue
index 907a2f2..ba3bbe2 100644
--- a/src/views/aboutpage.vue
+++ b/src/views/aboutpage.vue
@@ -9,17 +9,25 @@
 
       <div class="col-6 row justify-around items-center">
 
-        <div class="cursor header-title">首页</div>
-        <div class="cursor header-title">导航</div>
-        <div class="cursor header-title">展览</div>
-        <div class="cursor header-title">典藏</div>
-        <div class="cursor header-title">资讯</div>
-        <div class="cursor header-title">文创</div>
-        <div class="cursor header-title">数字文脉</div>
-        <div class="cursor header-title">关于</div>
+        <div class="cursor header-title"
+             @click="handkeLink('/home/navigation')">首页</div>
+        <div class="cursor header-title"
+             @click="handkeLink('')">导航</div>
+        <div class="cursor header-title"
+             @click="handkeLink('')">展览</div>
+        <div class="cursor header-title"
+             @click="handkeLink('')">典藏</div>
+        <div class="cursor header-title"
+             @click="handkeLink('')">资讯</div>
+        <div class="cursor header-title"
+             @click="handkeLink('')">文创</div>
+        <div class="cursor header-title"
+             @click="handkeLink('')">数字文脉</div>
+        <div class="cursor header-title"
+             @click="handkeLink('/about/statutes')">关于</div>
       </div>
     </div>
-    <div class="row ">
+    <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">
         <div style="height:50px"
@@ -32,22 +40,31 @@
 
       <div style="width:calc(100% - 320px)">
         <router-view></router-view>
+
       </div>
     </div>
-
     <div style="height:187px;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="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"
+             @click="handkeLink('')">关于</div>
       </div>
     </div>
+
   </div>
 </template>
 <script setup>
@@ -114,8 +131,12 @@ onBeforeMount(() => {
 
 
 const handkeLink = (url) => {
-  router.push(url)
-  state.activePage = url;
+  if (url) {
+    router.push(url)
+    state.activePage = url;
+  } else {
+    router.push('/home/staytuned')
+  }
 }
 </script>
 
diff --git a/src/views/commonpage.vue b/src/views/commonpage.vue
index f500efa..c9d5a33 100644
--- a/src/views/commonpage.vue
+++ b/src/views/commonpage.vue
@@ -9,17 +9,25 @@
 
       <div class="col-6 row justify-around items-center">
 
-        <div class="cursor header-title">首页</div>
-        <div class="cursor header-title">导航</div>
-        <div class="cursor header-title">展览</div>
-        <div class="cursor header-title">典藏</div>
-        <div class="cursor header-title">资讯</div>
-        <div class="cursor header-title">文创</div>
-        <div class="cursor header-title">数字文脉</div>
-        <div class="cursor header-title">关于</div>
+        <div class="cursor header-title"
+             @click="handkeLink('/home/navigation')">首页</div>
+        <div class="cursor header-title"
+             @click="handkeLink('')">导航</div>
+        <div class="cursor header-title"
+             @click="handkeLink('')">展览</div>
+        <div class="cursor header-title"
+             @click="handkeLink('')">典藏</div>
+        <div class="cursor header-title"
+             @click="handkeLink('')">资讯</div>
+        <div class="cursor header-title"
+             @click="handkeLink('')">文创</div>
+        <div class="cursor header-title"
+             @click="handkeLink('')">数字文脉</div>
+        <div class="cursor header-title"
+             @click="handkeLink('/about/statutes')">关于</div>
       </div>
     </div>
-    <div>
+    <div class="fl-page-width">
       <router-view></router-view>
     </div>
 
@@ -40,6 +48,34 @@
 </template>
 <script setup>
 
+import {
+  ref,
+  reactive,
+  onBeforeMount,
+  getCurrentInstance,
+  watch,
+  nextTick,
+} from "vue";
+import { useRoute, useRouter } from 'vue-router';
+const route = useRoute();
+const router = useRouter();
+const state = reactive({
+  activePage: '',
+});
+onBeforeMount(() => {
+  const currentPath = route.path;
+  state.activePage = currentPath;
+})
+
+
+const handkeLink = (url) => {
+  if (url) {
+    router.push(url)
+    state.activePage = url;
+  } else {
+    router.push('/home/staytuned')
+  }
+}
 </script>
 
 <style scoped>
diff --git a/src/views/staytuned.vue b/src/views/staytuned.vue
index 60502cc..a262329 100644
--- a/src/views/staytuned.vue
+++ b/src/views/staytuned.vue
@@ -1,7 +1,7 @@
 <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:690px;width:1166px;font-weight:bold;font-size:20px"
+    <div style="background:rgb(84, 121, 111,0.1);color:#54796F;height:calc(100vh - 160px - 187px);width:1166px;font-weight:bold;font-size:20px"
          class="row items-center justify-center">敬请期待</div>
   </div>
 </template>