Merge branch 'main' of https://gitea-inner.fontree.cn/scout666/fiee-official-website into LiWenHao

src/components/customDefaultPage/index.vue

@@ -3,6 +3,8 @@ import { computed } from 'vue'
 import { useWindowSize } from '@vueuse/core'
 
 import size375 from '@/components/customDefaultPage/size375/index.vue'
+import size768 from '@/components/customDefaultPage/size1920/index.vue'
+import size1440 from '@/components/customDefaultPage/size1920/index.vue'
 import size1920 from '@/components/customDefaultPage/size1920/index.vue'
 import { useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
@@ -15,13 +17,11 @@ const viewComponent = computed(() => {
   const viewWidth = width.value
   if (viewWidth <= 450) {
     return size375
-  }
+  } else if (viewWidth <= 1100) {
-  //    else if (viewWidth <= 1100) {
+    return size768
-  //     return size768;
+  } else if (viewWidth <= 1500) {
-  //   } else if (viewWidth <= 1500) {
+    return size1440
-  //     return size1440;
+  } else if (viewWidth <= 1920 || viewWidth > 1920) {
-  //   }
-  else if (viewWidth <= 1920 || viewWidth > 1920) {
     return size1920
   }
 })

src/components/customFooter/index.vue

@@ -3,6 +3,8 @@ import { computed } from 'vue'
 import { useWindowSize } from '@vueuse/core'
 
 import size375 from '@/components/customFooter/size375/index.vue'
+import size768 from '@/components/customFooter/size1920/index.vue'
+import size1440 from '@/components/customFooter/size1920/index.vue'
 import size1920 from '@/components/customFooter/size1920/index.vue'
 import { useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
@@ -15,13 +17,11 @@ const viewComponent = computed(() => {
   const viewWidth = width.value
   if (viewWidth <= 450) {
     return size375
-  }
+  } else if (viewWidth <= 1100) {
-  //    else if (viewWidth <= 1100) {
+    return size768
-  //     return size768;
+  } else if (viewWidth <= 1500) {
-  //   } else if (viewWidth <= 1500) {
+    return size1440
-  //     return size1440;
+  } else if (viewWidth <= 1920 || viewWidth > 1920) {
-  //   }
-  else if (viewWidth <= 1920 || viewWidth > 1920) {
     return size1920
   }
 })

src/components/customFooter/size1920/index.vue

@@ -13,11 +13,11 @@
   text-align: center;
   padding: 24px 0;
   color: #888;
-    font-size: 15px;
+  // font-size: 15px;
+  font-size: 1.05rem;
   background: #f7f8fa;
   letter-spacing: 1px;
   border-top: 1px solid #ececec;
   z-index: 100;
 }
 </style>
-  

src/components/customHeader/index.vue

@@ -3,6 +3,8 @@ import { computed } from 'vue'
 import { useWindowSize } from '@vueuse/core'
 
 import size375 from '@/components/customHeader/size375/index.vue'
+import size768 from '@/components/customHeader/size375/index.vue'
+import size1440 from '@/components/customHeader/size1920/index.vue'
 import size1920 from '@/components/customHeader/size1920/index.vue'
 import { useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
@@ -15,13 +17,11 @@ const viewComponent = computed(() => {
   const viewWidth = width.value
   if (viewWidth <= 450) {
     return size375
-  }
+  } else if (viewWidth <= 768) {
-  //    else if (viewWidth <= 1100) {
+    return size768
-  //     return size768;
+  } else if (viewWidth <= 1500) {
-  //   } else if (viewWidth <= 1500) {
+    return size1440
-  //     return size1440;
+  } else if (viewWidth <= 1920 || viewWidth > 1920) {
-  //   }
-  else if (viewWidth <= 1920 || viewWidth > 1920) {
     return size1920
   }
 })

src/components/customHeader/size1920/index.vue

@@ -81,7 +81,7 @@ const handleToHome = () => {
 
 <style scoped lang="scss">
 .custom-header {
-  --header-height: 80px;
+  --header-height: 5rem;
   --primary-color: #8b59f7;
   transition: all 0.3s ease;
   background: transparent;
@@ -133,7 +133,8 @@ const handleToHome = () => {
     margin: 0 20px;
     transition: all 0.3s ease;
     font-weight: 700;
-    font-size: 16px;
+    // font-size: 16px;
+    font-size: 1.05rem;
     min-width: 120px;
     text-align: center;
 

src/views/events-calendar/index.vue

@@ -4,8 +4,10 @@
   </div>
 </template>
 <script setup>
-import size1920 from '@/views/events-calendar/size1920/index.vue'
 import size375 from '@/views/events-calendar/size375/index.vue'
+import size768 from '@/views/events-calendar/size375/index.vue'
+import size1440 from '@/views/events-calendar/size1920/index.vue'
+import size1920 from '@/views/events-calendar/size1920/index.vue'
 import { computed } from 'vue'
 import { useWindowSize } from '@vueuse/core'
 
@@ -14,6 +16,10 @@ const viewComponent = computed(() => {
   const viewWidth = width.value
   if (viewWidth <= 450) {
     return size375
+  } else if (viewWidth <= 768) {
+    return size768
+  } else if (viewWidth <= 1500) {
+    return size1440
   } else if (viewWidth <= 1920 || viewWidth > 1920) {
     return size1920
   }

src/views/historic-stock/size1920/index.vue

@@ -237,12 +237,17 @@ const handlePageSizeChange = (size) => {
 
 // 回到顶部
 const scrollToTop = () => {
-  window.scrollTo({
+  // 尝试多种方法
-    top: 0,
+  // 1. 使用document.body
+  document.body.scrollTop = 0;
+  // 2. 使用document.documentElement (HTML元素)
+  document.documentElement.scrollTop = 0;
+  // 3. 使用scrollIntoView
+  document.querySelector(".historic-data-container").scrollIntoView({
     behavior: "smooth",
+    block: "start",
   });
 };
-
 onMounted(() => {
   getPageDefaultData();
 });

src/views/historic-stock/size375/index.vue

@@ -236,12 +236,17 @@ const handlePageSizeChange = (size) => {
 
 // 回到顶部
 const scrollToTop = () => {
-  window.scrollTo({
+  // 尝试多种方法
-    top: 0,
+  // 1. 使用document.body
+  document.body.scrollTop = 0;
+  // 2. 使用document.documentElement (HTML元素)
+  document.documentElement.scrollTop = 0;
+  // 3. 使用scrollIntoView
+  document.querySelector(".historic-data-container").scrollIntoView({
     behavior: "smooth",
+    block: "start",
   });
 };
-
 onMounted(() => {
   getPageDefaultData();
 });

src/views/index/index.vue

@@ -1,6 +1,8 @@
 <script setup>
-import size1920 from '@/views/index/size1920/index.vue'
 import size375 from '@/views/index/size375/index.vue'
+import size768 from '@/views/index/size1920/index.vue'
+import size1440 from '@/views/index/size1920/index.vue'
+import size1920 from '@/views/index/size1920/index.vue'
 import { computed } from 'vue'
 import { useWindowSize } from '@vueuse/core'
 
@@ -9,6 +11,10 @@ const viewComponent = computed(() => {
   const viewWidth = width.value
   if (viewWidth <= 450) {
     return size375
+  } else if (viewWidth <= 1100) {
+    return size768
+  } else if (viewWidth <= 1500) {
+    return size1440
   } else if (viewWidth <= 1920 || viewWidth > 1920) {
     return size1920
   }

src/views/press-releases/index.vue

@@ -4,8 +4,10 @@
   </div>
 </template>
 <script setup>
-import size1920 from '@/views/press-releases/size1920/index.vue'
 import size375 from '@/views/press-releases/size375/index.vue'
+import size768 from '@/views/press-releases/size375/index.vue'
+import size1440 from '@/views/press-releases/size1920/index.vue'
+import size1920 from '@/views/press-releases/size1920/index.vue'
 import { computed } from 'vue'
 import { useWindowSize } from '@vueuse/core'
 
@@ -14,6 +16,10 @@ const viewComponent = computed(() => {
   const viewWidth = width.value
   if (viewWidth <= 450) {
     return size375
+  } else if (viewWidth <= 768) {
+    return size768
+  } else if (viewWidth <= 1500) {
+    return size1440
   } else if (viewWidth <= 1920 || viewWidth > 1920) {
     return size1920
   }