同步privateRelease的一个push

src/pages/DetailPage/TestTypeDetail.vue

@@ -2,9 +2,10 @@
   <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}}<button onclick="goToTask(item.type)">相关任务</button></div>
+        <div class="title h2">
+          <span style="display: inline-block;margin-right: 20px">{{item.name}}</span>
+          <el-button @click="goToTask(item.code)" type="primary" size="mini">相关任务</el-button></div>
         <div class="h3">{{item.introduction}}</div>
-
       </div>
     </div>
   </div>
@@ -14,28 +15,29 @@
   import {getAllServiceTypes} from '@/js/index.js'
 
   export default {
-        name: "TestTypeDetail",
-        data() {
-            return {
-                isLogin: false,
-                fields: [],
-            }
-        },
-        methods: {
-            setFields(){
-                getAllServiceTypes().then((res) => {
-                    this.fields = res
-                    console.log(res);
-                })
-            },
-            goToTask(){
-
-            }
-        },
-        mounted() {
-            this.setFields();
-        }
+    name: "TestTypeDetail",
+    data() {
+      return {
+        isLogin: false,
+        fields: [],
+      }
+    },
+    methods: {
+      setFields(){
+        getAllServiceTypes().then((res) => {
+          this.fields = res
+        })
+      },
+      goToTask(testType){
+        console.log(testType)
+        //type=1 表示是从测试类型跳转过去的
+        this.$router.push({path:'/square',query:{type:testType}})
+      }
+    },
+    mounted() {
+      this.setFields();
     }
+  }
 </script>
 
 <style scoped>

src/pages/Square/PopularTask.vue

@@ -5,7 +5,7 @@
       <span class="popular-header-title">热门任务</span>
       <el-button style="float: right; padding: 3px 0" type="text" class="pull-right"  @click="goToMore()">>></el-button>
     </div>
-    <div v-if="!hotCrowdTaskVOs.length" style="text-align: center;padding: 5px 0"><span>暂无任务</span></div>
+    <div v-if="!hotCrowdTaskVOs" style="text-align: center;padding: 5px 0"><span>暂无任务</span></div>
     <div class="popular-list" v-else>
       <el-row class="popular-list-item" v-for="item in hotCrowdTaskVOs" :key="item.id">
         <el-col :span="19">
@@ -42,7 +42,6 @@
     },
       methods:{
           goToMore(){
-              console.log("goToMoreTask");
               this.$router.push({
                   name: 'PopularProjectAndTaskList',
                   params: {type: "task"}

src/pages/Square/Square2.0.vue

@@ -78,7 +78,6 @@
     data(){
       return {
         logoTitle:CONFIG.logoTitle,
-        logo_transparent:CONFIG.logo_transparent,
         SQUARE_DISPLAY:CONFIG.SQUARE_DISPLAY,
         logo_transparent:CONFIG.logo_transparent,
         mooctest_rank_url: CONFIG.mooctest_rank_url,
@@ -178,6 +177,13 @@
               this.hotCrowdTaskVOs = res.data.hotCrowdTaskVOs;
           })
       },
+
+      getTestTask(type) {
+        Http.get(`/api/square/task/${type}`).then((res)=>{
+          this.projectAndTaskArr = res.data.crowdTestTaskVOS;
+        })
+      },
+
       checkLogin() {
         this.checkCreateProjectAuth();
       },
@@ -220,8 +226,14 @@
       }
     },
     mounted() {
+      const {type} = this.$route.query;
+      if(type){
+        this.$nextTick(()=>this.currTab = 'task')
+        this.getTestTask(type);
+      }else{
+        this.loadData();
+      }
       this.setUserInfo();
-      this.loadData();
     }
   }
 </script>