Merge pull request 'dengjie commit : 学术交流固定高度' (#40) from deng into master

Reviewed-on: http://git.hchyun.com/feashow/sist_web/pulls/40

src/views/header/index.vue

@@ -150,7 +150,6 @@ export default {
       let lang = ''
       if (this.$i18n.locale === 'en') {
         lang = 'cn'
-
       } else {
         lang = 'en'
       }

src/views/index/components/academy_and_sciences.vue

@@ -15,7 +15,7 @@
                 {{item.title}}
               </div>
             </div>
-            <div class="more" @click="lookMore('b4Lm82Ct_eaF2u5XDABv0TM')">
+            <div class="sciences_more more" @click="lookMore('b4Lm82Ct_eaF2u5XDABv0TM')">
               <span class="more_text">更多</span>
               <img src="../../../assets/index/academy_and_sciences/gangduobai1.png" alt="">
             </div>
@@ -88,7 +88,7 @@
                 </div>
               </el-col>
             </el-row>
-            <div class="more" @click="lookMore('47sdOe8NQs0B4EHmM-wFWjQ')">
+            <div class="academy_more more" @click="lookMore('47sdOe8NQs0B4EHmM-wFWjQ')">
               <span class="more_text">更多</span>
               <img src="../../../assets/index/academy_and_sciences/gangduobai1.png" alt="">
             </div>
@@ -247,13 +247,20 @@ export default {
       -webkit-line-clamp: 1; //显示的行
     }
   }
-
+   .sciences_more{
+    margin-top: 3rem;
+    margin-bottom: 3rem;
+  }
+  .academy_more{
+    margin-top: 1.7rem;
+    margin-bottom: 3rem;
+  }
   .more {
     width: 100%;
     display: flex;
     height: 2.3rem;
-    margin-top: 3.4rem;
-    margin-bottom: 3rem;
+    //margin-top: 3rem;
+    //margin-bottom: 3rem;
     cursor: pointer;
     .more_text {
       font-size: 1.6rem;
@@ -286,22 +293,13 @@ export default {
 
   .academy_content {
     cursor: pointer;
-
-    //&:hover{
-    //  box-shadow: 0 8px 11px 0 rgba(0, 73, 174, 0.5);
-    //  background: #FFFFFF;
-    //  color: #0049AF;
-    //  .academy_content_text{
-    //    color: #575757;
-    //  }
-    //}
-
-
+    height: 10.5rem;
     background-color: rgba(10, 81, 174, 0.89);
     padding: 2.5rem 2.3rem;
     border-radius: 16px;
     margin-bottom: 1.9rem;
     color: #FFFFFF;
+
     &_icontime {
       display: flex;
       margin-bottom: 1.1rem;