From 2fb853551eb9c1cbe1a2257c197e564622856634 Mon Sep 17 00:00:00 2001
From: clay <209192278@qq.com>
Date: Wed, 5 Oct 2022 16:53:22 +0800
Subject: [PATCH] =?UTF-8?q?dengjie=20commit=20:=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=A7=91=E5=AD=A6=E7=A0=94=E7=A9=B6,=E5=AD=A6=E6=9C=AF?=
 =?UTF-8?q?=E4=BA=A4=E6=B5=81,=E6=9C=AC=E7=A7=91=E6=95=99=E8=82=B2?=
 =?UTF-8?q?=E5=92=8C=E7=A0=94=E7=A9=B6=E7=94=9F=E6=95=99=E8=82=B2=E7=9A=84?=
 =?UTF-8?q?=E5=93=8D=E5=BA=94=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index/components/academy_and_sciences.vue | 31 ++++++++++---------
 src/views/index/components/news_center.vue    | 24 +++++++++++---
 .../components/undergraduate_and_graduate.vue | 22 +++++++++++--
 3 files changed, 56 insertions(+), 21 deletions(-)

diff --git a/src/views/index/components/academy_and_sciences.vue b/src/views/index/components/academy_and_sciences.vue
index 511b34b..3f3ca5d 100644
--- a/src/views/index/components/academy_and_sciences.vue
+++ b/src/views/index/components/academy_and_sciences.vue
@@ -90,28 +90,28 @@
             </div>
             <el-row>
               <el-col :span="11">
-                <div class="academy_content">
+                <div class="academy_content" v-bind:style="{backgroundColor:bgColor}">
                   <div class="academy_content_icontime">
-                    <div class="img" v-bind:style="{backgroundImage:'url('+bgc+')'}"></div>
+                    <div class="img" v-bind:style="{backgroundImage:'url('+iconbgc+')'}"></div>
                     <span>2022-10-08</span>
                   </div>
                   <div class="academy_content_title">
                     信息科学与技术学院开展英
                   </div>
                   <div class="academy_content_text">
-                    为加强学院学风建设，提升学生英语能力，2021年10月25日晚，息科学与…
+                    为加强学院学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021年10月25日晚，息科学与…
                   </div>
                 </div>
-                <div class="academy_content">
+                <div class="academy_content" v-bind:style="{backgroundColor:bgColor}">
                   <div class="academy_content_icontime">
-                    <div class="img" v-bind:style="{backgroundImage:'url('+bgc+')'}"></div>
+                    <div class="img" v-bind:style="{backgroundImage:'url('+iconbgc+')'}"></div>
                     <span>2022-10-08</span>
                   </div>
                   <div class="academy_content_title">
                     信息科学与技术学院开展英
                   </div>
                   <div class="academy_content_text">
-                    为加强学院学风建设，提升学生英语能力，2021年10月25日晚，息科学与…
+                    为加强学院学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021年10月25日晚，息科学与…
                   </div>
                 </div>
               </el-col>
@@ -119,22 +119,22 @@
                 <div class="grid-content"></div>
               </el-col>
               <el-col :span="11">
-                <div class="academy_content">
+                <div class="academy_content" v-bind:style="{backgroundColor:bgColor}">
                   <div class="academy_content_icontime">
-                    <div class="img" v-bind:style="{backgroundImage:'url('+bgc+')'}"></div>
+                    <div class="img" v-bind:style="{backgroundImage:'url('+iconbgc+')'}"></div>
                     <span>2022-10-08</span>
                   </div>
                   <div class="academy_content_title">
                     信息科学与学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021
                   </div>
                   <div class="academy_content_text">
-                    为加强学院学风建设，提学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，20212021年10月25日晚，息科学与…
+                    为加强学院学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021年10月25日晚，息科学与…
                   </div>
                 </div>
-                <div class="academy_content">
+                <div class="academy_content" v-bind:style="{backgroundColor:bgColor}">
                   <div class="academy_content_icontime">
 <!--                    <img :src="src" alt="">-->
-                    <div class="img" v-bind:style="{backgroundImage:'url('+bgc+')'}"></div>
+                    <div class="img" v-bind:style="{backgroundImage:'url('+iconbgc+')'}"></div>
                     <span>2022-10-08</span>
                   </div>
                   <div class="academy_content_title">
@@ -162,7 +162,8 @@ export default {
   name: "academy_and_sciences",
   data(){
     return{
-      bgc:require('../../../assets/index/academy_and_sciences/shijian3.png')
+      bgColor:'rgba(10, 81, 174, 0.89)',
+      iconbgc:require('../../../assets/index/academy_and_sciences/shijian3.png')
     }
   }
 };
@@ -193,7 +194,7 @@ export default {
     text-align: left;
     background: linear-gradient(240deg, rgba(0, 75, 177, 0) 0%, rgba(6, 79, 175, 0.64) 44%, #0A51AE 100%);
     padding-left: 1.9rem;
-    margin-top: 8.1rem;
+    margin-top: 5rem;
     margin-bottom: 5rem;
   }
 
@@ -231,7 +232,7 @@ export default {
     display: flex;
     height: 2.3rem;
     margin-top: 3.4rem;
-    margin-bottom: 2rem;
+    margin-bottom: 3rem;
     cursor: pointer;
     .more_text {
       font-size: 1.6rem;
@@ -255,7 +256,7 @@ export default {
       color: #0049AF;
     }
     padding: 2.5rem 2.3rem;
-    background: rgba(10, 81, 174, 0.89);
+    //background: ;
     border-radius: 16px;
     margin-bottom: 1.9rem;
     color: #FFFFFF;
diff --git a/src/views/index/components/news_center.vue b/src/views/index/components/news_center.vue
index 8979eaf..0e61519 100644
--- a/src/views/index/components/news_center.vue
+++ b/src/views/index/components/news_center.vue
@@ -174,6 +174,22 @@ export default {
     width: 80rem!important;
   }
 }
+@media screen and (max-width: 960px) {
+  .news {
+    width: 80rem!important;
+  }
+  .headline{
+    width: 80rem!important;
+  }
+}
+@media screen and (max-width: 768px) {
+  .news {
+    width: 70rem!important;
+  }
+  .headline{
+    width: 70rem!important;
+  }
+}
 .news_center {
   background-image: url("../../../assets/index/news_center/sy_bj3.png");
   background-size: cover;
@@ -251,7 +267,7 @@ export default {
 .news {
   margin: 4rem  auto 0 auto;
   width: 115.4rem;
-  height: 60.4%;
+  //height: 60.4%;
   background-color: #fff;
   //margin-top: 4rem;
 
@@ -260,7 +276,7 @@ export default {
     cursor: pointer;
     //width: 28rem;
     width: 100%;
-    height: 36.9rem;
+    //height: 36.9rem;
 
     &:hover {
       box-shadow: 0 0 0.7rem 0 rgba(18, 69, 155, 0.59);
@@ -287,8 +303,8 @@ export default {
     //}
 
     .news_context_text {
-      margin: 4rem 0 4rem 2rem;
-      padding-right: 2rem;
+      padding: 2rem 2rem 2rem 2rem;
+      //padding-right: 2rem;
       //border-right: 1px solid #CCCCCC;
       .news_context_text-title {
         &:hover {
diff --git a/src/views/index/components/undergraduate_and_graduate.vue b/src/views/index/components/undergraduate_and_graduate.vue
index 4b97cef..9974bdf 100644
--- a/src/views/index/components/undergraduate_and_graduate.vue
+++ b/src/views/index/components/undergraduate_and_graduate.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="undergraduate_and_graduate">
-    <el-row  type="flex" justify="center">
-      <el-col :xs="22" :sm="22" :md="20" :lg="16" :xl="14" >
+    <el-row type="flex" justify="center">
+      <el-col :xs="22" :sm="22" :md="20" :lg="16" :xl="14">
         <el-row class="undergraduate_and_graduate_bgc">
           <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
             <div class="undergraduate headline">
@@ -119,6 +119,18 @@ export default {
 </script>
 
 <style scoped lang="scss">
+@media screen and (max-width: 768px) {
+  .undergraduate {
+    border-radius: 36px 36px 0 0 !important;
+  }
+  .graduate {
+    border-radius: 36px 36px 0 0 !important;
+  }
+  .more {
+    justify-content: center!important;
+  }
+}
+
 .undergraduate_and_graduate {
   background-image: url("../../../assets/index/announcements/sy_bj3.png");
   background-size: cover;
@@ -130,6 +142,7 @@ export default {
     background-color: #fff;
     //height: 33.8rem;
     margin-top: 8.1rem;
+    margin-bottom: 5rem;
   }
 
   .headline {
@@ -152,11 +165,14 @@ export default {
       letter-spacing: .1rem;
     }
   }
+
   .vline {
     border-right: 1px solid #CCCCCC;
   }
+
   .undergraduate {
     border-radius: 36px 0 0 0;
+
     &_content {
       display: flex;
       margin-bottom: 1.5rem;
@@ -200,6 +216,8 @@ export default {
     margin-top: 3.1rem;
     margin-left: 2.1rem;
     cursor: pointer;
+    margin-bottom: 3rem;
+
     .more_text {
       font-size: 1.6rem;
       font-weight: 500;