From 08dfd799f60088096542d1d7cf230b84d538209c Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Wed, 5 Oct 2022 16:11:46 +0800
Subject: [PATCH] =?UTF-8?q?clay=20commit=20:=20=E9=80=9A=E7=9F=A5=E5=85=AC?=
 =?UTF-8?q?=E5=91=8A=E5=93=8D=E5=BA=94=E5=BC=8F=E5=9F=BA=E6=9C=AC=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index/components/academy_and_sciences.vue     | 14 ++++++--------
 .../components/undergraduate_and_graduate.vue     | 15 ++++++---------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/views/index/components/academy_and_sciences.vue b/src/views/index/components/academy_and_sciences.vue
index 5b8c066..511b34b 100644
--- a/src/views/index/components/academy_and_sciences.vue
+++ b/src/views/index/components/academy_and_sciences.vue
@@ -1,12 +1,9 @@
 <template>
   <div class="academy_and_sciences">
-    <el-row>
-      <el-col :xs="1" :sm="1" :md="2" :lg="2" :xl="2" >
-        <div class="grid-content"></div>
-      </el-col>
-      <el-col :xs="23" :sm="22" :md="20" :lg="20" :xl="20" >
+    <el-row type="flex" justify="center">
+      <el-col :xs="22" :sm="22" :md="20" :lg="16" :xl="14" >
         <el-row>
-          <el-col :span="12">
+          <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
             <div class="sciences_title">
               科学研究
             </div>
@@ -87,7 +84,7 @@
               <img src="../../../assets/index/academy_and_sciences/gangduobai1.png" alt="">
             </div>
           </el-col>
-          <el-col :span="12">
+          <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
             <div class="academy_title">
               学术交流
             </div>
@@ -181,7 +178,7 @@ export default {
   background-size: cover;
   background-repeat: no-repeat;
   width: 100%;
-  height: 68.3rem;
+  //height: 68.3rem;
 
   .sciences_title, .academy_title {
     display: flex;
@@ -234,6 +231,7 @@ export default {
     display: flex;
     height: 2.3rem;
     margin-top: 3.4rem;
+    margin-bottom: 2rem;
     cursor: pointer;
     .more_text {
       font-size: 1.6rem;
diff --git a/src/views/index/components/undergraduate_and_graduate.vue b/src/views/index/components/undergraduate_and_graduate.vue
index ba91da7..4b97cef 100644
--- a/src/views/index/components/undergraduate_and_graduate.vue
+++ b/src/views/index/components/undergraduate_and_graduate.vue
@@ -1,12 +1,9 @@
 <template>
   <div class="undergraduate_and_graduate">
-    <el-row>
-      <el-col :xs="1" :sm="1" :md="2" :lg="2" :xl="2">
-        <div class="grid-content"></div>
-      </el-col>
-      <el-col :xs="23" :sm="22" :md="20" :lg="20" :xl="20" >
+    <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 :span="12">
+          <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
             <div class="undergraduate headline">
               <img src="../../../assets/index/undergraduate_and_graduate/benka.png" alt=""/>
               <span>本科教育</span>
@@ -58,7 +55,7 @@
               </div>
             </div>
           </el-col>
-          <el-col :span="12">
+          <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
             <div class="graduate headline">
               <img src="../../../assets/index/undergraduate_and_graduate/boshimaobeifen.png" alt=""/>
               <span>研究生教育</span>
@@ -127,11 +124,11 @@ export default {
   background-size: cover;
   background-repeat: no-repeat;
   width: 100%;
-  height: 54.2rem;
+  //height: 54.2rem;
 
   &_bgc {
     background-color: #fff;
-    height: 33.8rem;
+    //height: 33.8rem;
     margin-top: 8.1rem;
   }