Merge branch 'dev-online' into PrivateReleaseOfXC

src/pages/Homepage/Homepage.vue

@@ -2,7 +2,7 @@
   <div class="home-wrapper">
     <div class="nav" stype="height:500px">
       <!--搜索框-->
-      <el-row class="container search-nav" style="padding: 30px 0 20px 0" :gutter="40">
+      <el-row class="container search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="5">
           <div class="pull-left">
             <img class="logo-img" :src="logo_background" :to="'/home'"/>
@@ -32,12 +32,18 @@
       </el-row>
       <!--TabNav-->
       <el-tabs v-model="currTab" @tab-click="handleTabClick" class="container square-tab">
-        <el-tab-pane v-for="item in homeTabArr.menuArr1" :label="item.label" :name="item.name"
-                     :key="item.name"></el-tab-pane>
-        <el-tab-pane v-for="item in homeTabArr.menuArr2" :label="item.name" :name="item.code"
-                     :key="item.code"></el-tab-pane>
-        <el-tab-pane v-for="item in homeTabArr.menuArr3" :label="item.label" :name="item.name"
-                     :key="item.name"></el-tab-pane>
+        <el-tab-pane v-for="item in homeTabArr.menuArr1" :name="item.name"
+                     :key="item.name">
+          <span slot="label" style="font-size: 18px">{{item.label}}</span>
+        </el-tab-pane>
+        <el-tab-pane v-for="item in homeTabArr.menuArr2"  :name="item.code"
+                     :key="item.code">
+          <span slot="label" style="font-size: 18px">{{item.label}}</span>
+        </el-tab-pane>
+        <el-tab-pane v-for="item in homeTabArr.menuArr3" :name="item.name"
+                     :key="item.name">
+          <span slot="label" style="font-size: 18px">{{item.label}}</span>
+        </el-tab-pane>
       </el-tabs>
       <div>
       </div>

src/pages/Homepage/HomepagePrivate.vue

@@ -2,7 +2,7 @@
   <div class="home-wrapper">
     <div class="nav" stype="height:500px">
       <!--搜索框-->
-      <el-row class="container search-nav" style="padding: 30px 0 20px 0" :gutter="40">
+      <el-row class="container search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="5">
           <div class="pull-left to-mooctest-ranking" :style="{backgroundImage: 'url(' + mooctest_rank_logo_url + ')'}"  @click="handleLogoClick"></div>
         </el-col>
@@ -28,12 +28,18 @@
       </el-row>
       <!--TabNav-->
       <el-tabs v-model="currTab" @tab-click="handleTabClick" class="container square-tab">
-        <el-tab-pane v-for="item in homeTabArr.menuArr1" :label="item.label" :name="item.name"
-                     :key="item.name" style="font-size: 18px"></el-tab-pane>
-        <el-tab-pane v-for="item in homeTabArr.menuArr2" :label="item.name" :name="item.code"
-                     :key="item.code" style="font-size: 18px"></el-tab-pane>
-        <el-tab-pane v-for="item in homeTabArr.menuArr3" :label="item.label" :name="item.name"
-                     :key="item.name" style="font-size: 18px"></el-tab-pane>
+        <el-tab-pane v-for="item in homeTabArr.menuArr1" :name="item.name"
+                     :key="item.name">
+          <span slot="label" style="font-size: 18px">{{item.label}}</span>
+        </el-tab-pane>
+        <el-tab-pane v-for="item in homeTabArr.menuArr2"  :name="item.code"
+                     :key="item.code">
+          <span slot="label" style="font-size: 18px">{{item.label}}</span>
+        </el-tab-pane>
+        <el-tab-pane v-for="item in homeTabArr.menuArr3" :name="item.name"
+                     :key="item.name">
+          <span slot="label" style="font-size: 18px">{{item.label}}</span>
+        </el-tab-pane>
       </el-tabs>
       <div>
       </div>

src/style/search-nav.scss

@@ -75,6 +75,7 @@
   box-sizing: border-box;
   margin-top: 20px;
   cursor: pointer;
+  padding-left: 0 !important;
 }
 .search-nav-input {
   width: 600px;