Merge branch 'PrivateRelease' of http://git.mooctest.com/crowd-2019/crowd-test-service-front into PrivateRelease

src/pages/DetailPage/TestTypeDetail.vue

@@ -2,8 +2,9 @@
   <div class="home-wrapper">
     <div class="container" style="margin: 20px auto;">
       <div class="create-body" v-for="item in fields">
-        <div class="title h2">{{item.name}}</div>
+        <div class="title h2">{{item.name}}<button onclick="goToTask(item.type)">相关任务</button></div>
         <div class="h3">{{item.introduction}}</div>
+
       </div>
     </div>
   </div>
@@ -27,6 +28,9 @@
                     console.log(res);
                 })
             },
+            goToTask(){
+
+            }
         },
         mounted() {
             this.setFields();

src/pages/Homepage/Homepage.vue

@@ -46,6 +46,7 @@
       <el-row :gutter="15">
         <el-col :span="5" class="homepage-right-modules">
           <LoginCard v-if="HOME_DISPLAY.login_card"/>
+          <PopularTask :hotCrowdTaskVOs="homeData.taskList" v-if="HOME_DISPLAY.hot_task"/>
           <HotCrowd :applicationTypeRank="homeDataNoCache.applicationTypeRank" v-if="HOME_DISPLAY.hot_crowd"/>
           <PopularTask></PopularTask>
           <HotAgency :agencyRank="homeDataNoCache.agencyRank" v-if="HOME_DISPLAY.hot_agency"/>
@@ -81,6 +82,7 @@ import HotAgency from './HotAgency'
 import HotUser from './HotUser'
 import RankingCard from './RankingCard'
 import HotContest from './HotContest'
+import PopularTask from '../Square/PopularTask'
 import PopularProject from '../Square/PopularProject'
 import PopularTask from '../Square/PopularTask'
 import Http from '@/js/http.js'
@@ -100,6 +102,7 @@ export default {
     HotContest,
     HotUser,
     HotAgency,
+    PopularTask,
     InstitutionCard,
     SearchBar,
     TestMenu,