From 4135d8062c13e36f536fde110187d57e1d252296 Mon Sep 17 00:00:00 2001
From: clay <209192278@qq.com>
Date: Wed, 5 Oct 2022 17:58:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=93=E6=B4=81=20commit=20:=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=9C=AC=E7=A7=91=E6=95=99=E8=82=B2=E5=92=8C=E7=A0=94?=
 =?UTF-8?q?=E7=A9=B6=E7=94=9F=E6=95=99=E8=82=B2=E7=9A=84=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/header/index.vue                     |  9 +++++++++
 .../index/components/academy_and_sciences.vue  | 12 +++++++++++-
 src/views/index/components/announcements.vue   |  2 +-
 .../components/party_building_activities.vue   |  5 +++--
 src/views/index/components/slideshow_card.vue  |  2 +-
 .../components/undergraduate_and_graduate.vue  | 18 ++++++++++++++++++
 6 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/src/views/header/index.vue b/src/views/header/index.vue
index cac970e..b530efd 100644
--- a/src/views/header/index.vue
+++ b/src/views/header/index.vue
@@ -378,5 +378,14 @@ export default {
   }
 }
 
+@media screen and (max-width: 1200px) {
+  .banner {
+    margin: 0 !important;
+  }
+  .header{
+    width: 90rem;
+  }
+}
+
 
 </style>
diff --git a/src/views/index/components/academy_and_sciences.vue b/src/views/index/components/academy_and_sciences.vue
index e52ab22..ae99b51 100644
--- a/src/views/index/components/academy_and_sciences.vue
+++ b/src/views/index/components/academy_and_sciences.vue
@@ -90,7 +90,7 @@
             </div>
             <el-row>
               <el-col :span="11">
-                <div class="academy_content" @mouseleave="mouseLeave(1)">
+                <div class="academy_content" >
                   <div class="academy_content_icontime">
                     <div class="img"></div>
                     <span>2022-10-08</span>
@@ -175,6 +175,16 @@ export default {
 </script>
 
 <style scoped lang="scss">
+@media screen and (max-width: 960px) {
+  .more {
+    justify-content: center!important;
+  }
+}
+@media screen and (max-width: 768px) {
+  .more {
+    justify-content: center!important;
+  }
+}
 /deep/ .el-col-2 {
   width: 8%;
 }
diff --git a/src/views/index/components/announcements.vue b/src/views/index/components/announcements.vue
index 4cf5b9b..bcfccc7 100644
--- a/src/views/index/components/announcements.vue
+++ b/src/views/index/components/announcements.vue
@@ -81,7 +81,6 @@ export default {
   background-size: cover;
   background-repeat: no-repeat;
   width: 100%;
-  height: 54.2rem;
 
   .headline {
     width: 100%;
@@ -190,6 +189,7 @@ export default {
     justify-content: center;
     height: 2.3rem;
     margin-top: 2.6rem;
+    padding-bottom: 2.6rem;
     cursor: pointer;
 
     .more_text {
diff --git a/src/views/index/components/party_building_activities.vue b/src/views/index/components/party_building_activities.vue
index b4d2b1e..7b726cf 100644
--- a/src/views/index/components/party_building_activities.vue
+++ b/src/views/index/components/party_building_activities.vue
@@ -86,7 +86,7 @@ export default {
   background-size: cover;
   background-repeat: no-repeat;
   width: 100%;
-  height: 55.6rem;
+  //height: 55.6rem;
 
   .headline {
     width: 100%;
@@ -120,7 +120,8 @@ export default {
     display: flex;
     justify-content: center;
     height: 2.3rem;
-    margin-top: 5.1rem;
+    margin-top: 2rem;
+    padding-bottom: 2rem;
     cursor: pointer;
 
     .more_text {
diff --git a/src/views/index/components/slideshow_card.vue b/src/views/index/components/slideshow_card.vue
index eb63434..ee2264e 100644
--- a/src/views/index/components/slideshow_card.vue
+++ b/src/views/index/components/slideshow_card.vue
@@ -257,7 +257,7 @@ export default {
 
 @media screen and (min-width: 1100px) and (max-width: 1400px) {
   .banner-card {
-    height: 34rem;
+    height: 32rem;
 
     li {
       width: 28rem !important;
diff --git a/src/views/index/components/undergraduate_and_graduate.vue b/src/views/index/components/undergraduate_and_graduate.vue
index 5c6d5ce..329b8ae 100644
--- a/src/views/index/components/undergraduate_and_graduate.vue
+++ b/src/views/index/components/undergraduate_and_graduate.vue
@@ -119,6 +119,20 @@ export default {
 </script>
 
 <style scoped lang="scss">
+@media screen and (max-width: 960px) {
+  .undergraduate {
+    border-radius: 36px 36px 0 0 !important;
+  }
+  .graduate {
+    border-radius: 36px 36px 0 0 !important;
+  }
+  .more {
+    justify-content: center!important;
+  }
+  .vline {
+    border-right: none!important;
+  }
+}
 @media screen and (max-width: 768px) {
   .undergraduate {
     border-radius: 36px 36px 0 0 !important;
@@ -129,6 +143,10 @@ export default {
   .more {
     justify-content: center!important;
   }
+
+  .vline {
+    border-right: none!important;
+  }
 }
 
 .undergraduate_and_graduate {