Merge branch 'dev-XC' into 'PrivateReleaseOfXC'

Dev xc

See merge request crowd-2019/crowd-test-service-front!217

src/pages/Homepage/HomepagePrivate.vue

@@ -7,19 +7,19 @@
           <div class="pull-left to-mooctest-ranking" :style="{backgroundImage: 'url(' + mooctest_rank_logo_url + ')'}"  @click="handleLogoClick"></div>
         </el-col>
         <el-col :span="15">
-<!--          <div class="search-nav-input">-->
-<!--            <div id="search-block ">-->
-<!--              <el-tabs v-model="searchType" type="card" @tab-click="handleTypeClick">-->
-<!--                <el-tab-pane v-for="item in searchTypeArr" v-if="item.value!=='all'" :label="item.name"-->
-<!--                             :name="item.value" :key="item.value"></el-tab-pane>-->
-<!--              </el-tabs>-->
-<!--              <div class="search-input">-->
-<!--                <el-input ref="searchInput" placeholder="请输入内容" v-model="searchVal" class="input-with-select">-->
-<!--                  <el-button class="search-button" slot="append" type="primary" @click="handleSearchData">搜索</el-button>-->
-<!--                </el-input>-->
-<!--              </div>-->
-<!--            </div>-->
-<!--          </div>-->
+          <div class="search-nav-input">
+            <div id="search-block ">
+              <el-tabs v-model="searchType" type="card" @tab-click="handleTypeClick">
+                <el-tab-pane v-for="item in searchTypeArr" v-if="item.value!=='all'" :label="item.name"
+                             :name="item.value" :key="item.value"></el-tab-pane>
+              </el-tabs>
+              <div class="search-input">
+                <el-input ref="searchInput" placeholder="请输入内容" v-model="searchVal" class="input-with-select">
+                  <el-button class="search-button" slot="append" type="primary" @click="handleSearchData">搜索</el-button>
+                </el-input>
+              </div>
+            </div>
+          </div>
 
         </el-col>
         <el-col :span="19">