From 7b3c44e1f43e7a97fbbc3fae501b86131299b20d Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Fri, 7 Apr 2023 17:40:24 +0800
Subject: [PATCH] 123

---
 src/components/TopNav/index.vue                    |  6 +++-
 src/mock/case.js                                   |  9 ++++++
 src/mock/hardware.js                               |  9 ++++++
 src/style.scss                                     |  2 +-
 .../Index/components/CasePictureList/index.vue     | 26 ++++++----------
 .../Index/components/HardwareSummary/index.vue     | 35 ++++++----------------
 6 files changed, 42 insertions(+), 45 deletions(-)

diff --git a/src/components/TopNav/index.vue b/src/components/TopNav/index.vue
index b458dba..f6245d3 100644
--- a/src/components/TopNav/index.vue
+++ b/src/components/TopNav/index.vue
@@ -4,7 +4,7 @@
       activeIndex == 0 ? 'header_container' : 'header_container not_first'
     "
   >
-    <img :src="logo()" alt="logo" />
+    <img :src="logo()" alt="logo" class="logo" />
     <ul :class="fontColor()">
       <li :class="getActiveClass(0)" @click="scrollToPage(0)">首页</li>
       <li :class="getActiveClass(3)" @click="scrollToPage(3)">工业设计</li>
@@ -87,6 +87,10 @@ const fontColor = () => {
   li {
     margin: 0 30px;
   }
+  .logo {
+    height: 40px;
+    width: auto;
+  }
 }
 .flex_center {
   display: flex;
diff --git a/src/mock/case.js b/src/mock/case.js
index 3dbff41..43a7806 100644
--- a/src/mock/case.js
+++ b/src/mock/case.js
@@ -149,3 +149,12 @@ export const case_detail_list = {
     },
   },
 }
+
+export const allCaseList = [
+  {
+    id: '1',
+    picUrl: P1,
+    example_id: '1',
+    industry_id: '1',
+  },
+]
diff --git a/src/mock/hardware.js b/src/mock/hardware.js
index 3dbff41..45ce12d 100644
--- a/src/mock/hardware.js
+++ b/src/mock/hardware.js
@@ -149,3 +149,12 @@ export const case_detail_list = {
     },
   },
 }
+
+export const allHardCaseList = [
+  {
+    id: '1',
+    picUrl: P1,
+    hardwareExampleId: '1',
+    hardware_id: '1',
+  },
+]
diff --git a/src/style.scss b/src/style.scss
index 8ac595d..59ba76d 100644
--- a/src/style.scss
+++ b/src/style.scss
@@ -110,7 +110,7 @@ body {
     .swiper-pagination-bullet-active {
       background-color: $theme_color;
       transition-property: all;
-      transition-duration: 0.7s;
+      transition-duration: 1s;
       animation-fill-mode: forwards;
       width: 24px;
       height: 6px;
diff --git a/src/views/Index/components/CasePictureList/index.vue b/src/views/Index/components/CasePictureList/index.vue
index e2bb655..66f8548 100644
--- a/src/views/Index/components/CasePictureList/index.vue
+++ b/src/views/Index/components/CasePictureList/index.vue
@@ -93,21 +93,6 @@ import '@/assets/js/jquery.liMarquee.js'
 import CountTo from 'cpns/CountTo'
 import { ref, onMounted } from 'vue'
 import A1 from '@/assets/img/case/anli1.png'
-import A2 from '@/assets/img/case/anli2.png'
-import A3 from '@/assets/img/case/anli3.png'
-import A4 from '@/assets/img/case/anli4.png'
-import A5 from '@/assets/img/case/anli5.png'
-import A6 from '@/assets/img/case/anli6.png'
-import A7 from '@/assets/img/case/anli7.png'
-import A8 from '@/assets/img/case/anli8.png'
-import A9 from '@/assets/img/case/anli9.png'
-import A10 from '@/assets/img/case/anli10.png'
-import A11 from '@/assets/img/case/anli11.png'
-import A12 from '@/assets/img/case/anli12.png'
-import A13 from '@/assets/img/case/anli13.png'
-import A14 from '@/assets/img/case/anli14.png'
-import A15 from '@/assets/img/case/anli15.png'
-import A16 from '@/assets/img/case/anli16.png'
 // Import Swiper Vue.js components
 import { Swiper, SwiperSlide } from 'swiper/vue'
 import { Autoplay } from 'swiper'
@@ -123,11 +108,18 @@ const modules = ref([Autoplay])
 onMounted(() => {
   handleScreenAuto(showEmpty, '#case_picture')
   window.onresize = handleScreenAuto(showEmpty, '#case_picture')
-  $('#scroll_container_case_1').liMarquee()
+  $('#scroll_container_case_1').liMarquee({
+    direction: 'left',
+    scrollamount: 70,
+  })
   $('#scroll_container_case_2').liMarquee({
     direction: 'right',
+    scrollamount: 30,
+  })
+  $('#scroll_container_case_3').liMarquee({
+    direction: 'left',
+    scrollamount: 70,
   })
-  $('#scroll_container_case_3').liMarquee()
 })
 const showEmpty = ref(false)
 </script>
diff --git a/src/views/Index/components/HardwareSummary/index.vue b/src/views/Index/components/HardwareSummary/index.vue
index 0e8b17b..ee60c26 100644
--- a/src/views/Index/components/HardwareSummary/index.vue
+++ b/src/views/Index/components/HardwareSummary/index.vue
@@ -93,30 +93,6 @@ import '@/assets/js/jquery.liMarquee.js'
 import CountTo from 'cpns/CountTo'
 import { ref, onMounted } from 'vue'
 import A1 from '@/assets/img/harddetail/01.png'
-import A2 from '@/assets/img/harddetail/02.png'
-import A3 from '@/assets/img/harddetail/03.png'
-import A4 from '@/assets/img/harddetail/04.png'
-import A5 from '@/assets/img/harddetail/05.png'
-import A6 from '@/assets/img/harddetail/06.png'
-import A7 from '@/assets/img/harddetail/07.png'
-import A8 from '@/assets/img/harddetail/08.png'
-import A9 from '@/assets/img/harddetail/09.png'
-import A10 from '@/assets/img/harddetail/10.png'
-import A11 from '@/assets/img/harddetail/11.png'
-import A12 from '@/assets/img/harddetail/12.png'
-import A13 from '@/assets/img/harddetail/13.png'
-import A14 from '@/assets/img/harddetail/14.png'
-import A15 from '@/assets/img/harddetail/15.png'
-import A16 from '@/assets/img/harddetail/16.png'
-import A17 from '@/assets/img/harddetail/17.png'
-import A18 from '@/assets/img/harddetail/18.png'
-import A19 from '@/assets/img/harddetail/19.png'
-import A20 from '@/assets/img/harddetail/20.png'
-import A21 from '@/assets/img/harddetail/21.png'
-import A22 from '@/assets/img/harddetail/22.png'
-import A23 from '@/assets/img/harddetail/23.png'
-import A24 from '@/assets/img/harddetail/24.png'
-import A25 from '@/assets/img/harddetail/25.png'
 // Import Swiper Vue.js components
 import { Swiper, SwiperSlide } from 'swiper/vue'
 import { Autoplay } from 'swiper'
@@ -132,11 +108,18 @@ const modules = ref([Autoplay])
 onMounted(() => {
   handleScreenAuto(showEmpty, '#hardware_picture_list')
   window.onresize = handleScreenAuto(showEmpty, '#hardware_picture_list')
-  $('#scroll_container_case_4').liMarquee()
+  $('#scroll_container_case_4').liMarquee({
+    direction: 'left',
+    scrollamount: 70,
+  })
   $('#scroll_container_case_5').liMarquee({
     direction: 'right',
+    scrollamount: 30,
+  })
+  $('#scroll_container_case_6').liMarquee({
+    direction: 'left',
+    scrollamount: 70,
   })
-  $('#scroll_container_case_6').liMarquee()
 })
 const showEmpty = ref(false)
 </script>