Merge branch 'PrivateReleaseOfXC' into 'dev-online'

# Conflicts:
#   src/pages/DetailPage/TestTypeDetail.vue

src/pages/Homepage/HotTask.vue

@@ -0,0 +1,53 @@
+<template>
+  <el-card class="popular-card">
+    <div slot="header" class="popular-header">
+      <img src="../../assets/img/HotCrowd.png" alt="hot-crowd" class="popular-header-img"/>
+      <span class="popular-header-title">热门任务</span>
+      <el-button style="float: right; padding: 3px 0;line-height: 25px" type="text"  @click="getMore()">more>></el-button>
+    </div>
+    <div class="popular-list">
+      <el-row class="popular-list-item" v-for="item in applicationTypeRank" :key="item.id" @click.native="goToDetail(item.code)">
+        <el-col :span="19">
+          <img :src="item.image" alt="logo-project" class="pull-left project-logo-img">
+          <div style="margin-left: 55px">
+            <div class="list-item-title single-line-title">
+              {{item.name}}
+            </div>
+            <div class="list-item-info">
+            </div>
+          </div>
+        </el-col>
+        <el-col :span="5">
+          <div class="project-people-number">
+            {{item.count}}次
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+  </el-card>
+</template>
+
+<script>
+  export default {
+    name: 'HotCrowd',
+    props:['applicationTypeRank'],
+    methods:{
+        getMore(){
+            this.$router.push({
+                name: 'CrowdList',
+            });
+        },
+      goToDetail(code) {
+        this.$router.push({
+          name: 'CrowdDetail',
+          path:'/crowd/detail',
+          query: {code: code}
+        })
+      },
+    }
+  }
+</script>
+
+<style lang="scss">
+
+</style>

src/pages/Square/Square2.0.vue

@@ -171,6 +171,14 @@
           this.getHotData();
       },
 
+      getTestTask(type) {
+        Http.get(`/api/square/task/${type}`).then((res)=>{
+          this.projectAndTaskArr = res.data.crowdTestTaskVOS;
+          this.hotCrowdTestProjectVOs = res.data.hotCrowdTestProjectVOs;
+          this.hotCrowdTaskVOs = res.data.hotCrowdTaskVOs;
+        })
+      },
+
       getHotData(){
           Http.get('/api/square/hotTaskAndProject').then((res)=>{
               this.hotCrowdTestProjectVOs = res.data.hotCrowdTestProjectVOs;