Merge branch 'dev-fix' into 'master'

1、修复项目任务图片固定问题

See merge request tuosi-crowd-test-service/cofotest-frontend!4

src/components/Mine.vue

@@ -31,8 +31,8 @@
           </span>
           <el-row v-if="unFinishedTaskList != null && unFinishedTaskList.length != 0" type="flex" align="middle"
                   justify="center" style="font-size: 14px;">
-            <el-col :span="5">任务封面</el-col>
-            <el-col :span="4">任务名称</el-col>
+            <el-col :span="5">任务名称</el-col>
+            <el-col :span="4">任务状态</el-col>
             <el-col :span="4">测试类型</el-col>
             <el-col :span="4">任务预算</el-col>
             <el-col :span="4">领取人数</el-col>
@@ -48,8 +48,8 @@
           </span>
           <el-row v-if="finishedTaskList != null && finishedTaskList.length != 0" type="flex" align="middle"
                   justify="center" style="font-size: 14px;">
-            <el-col :span="5">任务封面</el-col>
-            <el-col :span="4">任务名称</el-col>
+            <el-col :span="5">任务名称</el-col>
+            <el-col :span="4">任务状态</el-col>
             <el-col :span="4">测试类型</el-col>
             <el-col :span="4">任务预算</el-col>
             <el-col :span="4">领取人数</el-col>
@@ -72,8 +72,8 @@
           <span v-if="myProjects == null || myProjects.length == 0"> 暂无项目 </span>
           <el-row v-if="myProjects != null && myProjects.length != 0" type="flex" align="middle" justify="center"
                   style="font-size: 14px;">
-            <el-col :span="6" type="flex" align="middle" justify="center">项目图片</el-col>
             <el-col :span="6" type="flex" align="middle" justify="center">项目名称</el-col>
+            <el-col :span="6" type="flex" align="middle" justify="center">项目状态</el-col>
             <el-col :span="3" type="flex" align="middle" justify="center">应用类型</el-col>
             <el-col :span="3" type="flex" align="middle" justify="center">项目预算</el-col>
             <el-col :span="3" type="flex" align="middle" justify="center">参与人数</el-col>
@@ -91,8 +91,8 @@
           </span>
           <el-row v-if="handlingProjects != null && handlingProjects.length != 0" type="flex" align="middle"
                   justify="center" style="font-size: 14px;">
-            <el-col :span="6">项目图片</el-col>
             <el-col :span="6">项目名称</el-col>
+            <el-col :span="6">项目状态</el-col>
             <el-col :span="3">应用类型</el-col>
             <el-col :span="3">项目预算</el-col>
             <el-col :span="3">参与人数</el-col>
@@ -111,8 +111,8 @@
           </span>
           <el-row v-if="acceptableProjects != null && acceptableProjects.length != 0" type="flex" align="middle"
                   justify="center" style="font-size: 14px;">
-            <el-col :span="6">项目图片</el-col>
             <el-col :span="6">项目名称</el-col>
+            <el-col :span="6">项目状态</el-col>
             <el-col :span="3">应用类型</el-col>
             <el-col :span="3">项目预算</el-col>
             <el-col :span="3">参与人数</el-col>

src/components/Square.vue

@@ -4,8 +4,8 @@
 
     <div class="square-list-container" v-loading="loading" type="flex" align="middle">
       <el-row v-if="list != null && list.length != 0" type="flex" align="middle" justify="center"  style="font-size: 14px;">
-        <el-col :span="5">任务封面</el-col>
-        <el-col :span="4">任务名称</el-col>
+        <el-col :span="5">任务名称</el-col>
+        <el-col :span="4">任务状态</el-col>
         <el-col :span="4">测试类型</el-col>
         <el-col :span="4">任务预算</el-col>
         <el-col :span="4">领取次数</el-col>

src/components/commons/ProjectItem.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="project-item-container">
     <el-row type="flex" align="middle" justify="center" style="font-size: 14px;">
+      <el-col :span="6" type="flex" align="middle" justify="center">{{project.name}}</el-col>
       <el-col :span="6" type="flex" align="middle" justify="center">
         <el-badge :value="project.statusVO.text" class="item" :type="project.statusVO.style">
-          <img class="project-cover" src="@/assets/img/home_ban1.jpg">
+<!--          <img class="project-cover" src="@/assets/img/home_ban1.jpg">-->
         </el-badge>
       </el-col>
-      <el-col :span="6" type="flex" align="middle" justify="center">{{project.name}}</el-col>
       <!--<el-col :span="4">{{project.id}}</el-col>-->
       <el-col :span="3" type="flex" align="middle" justify="center">
         <span style="font-size: 10px;"

src/components/commons/TaskItem.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="task-item-container">
     <el-row type="flex" align="middle" justify="center" style="font-size: 14px;">
+      <el-col :span="4" type="flex" align="middle" justify="center">{{taskTable.title}}</el-col>
       <el-col :span="5" type="flex" align="middle" justify="center">
         <el-badge :value="taskTable.statusVO.text" class="item" :type="taskTable.statusVO.style">
-          <img class="task-cover" src="@/assets/img/home_ban1.jpg">
+<!--          <img class="task-cover" src="@/assets/img/home_ban1.jpg">-->
         </el-badge>
       </el-col>
-      <el-col :span="4" type="flex" align="middle" justify="center">{{taskTable.title}}</el-col>
       <!--<el-col :span="4">{{project.id}}</el-col>-->
       <el-col :span="4" type="flex" align="middle" justify="center">
         <div class="badge" type="flex" align="middle" justify="center">

src/js/index.js

@@ -235,7 +235,7 @@ export {
 
 export const defaultValue = {
   name: '普通用户',
-  image: 'http://www.mooctest.net/assets/img/mooctest.png',
+  image: 'http://mooctest-crowd-service.oss-cn-hangzhou.aliyuncs.com/Plantform/Image-online/logo-transparent.png',
 }
 //
 // //存session

src/pages/DetailPage/CrowdDetail.vue

@@ -37,8 +37,8 @@
           <span v-if="projectList == null || projectList.length == 0"> 暂无项目 </span>
           <el-row v-if="projectList != null && projectList.length != 0" type="flex" align="middle" justify="center"
                   style="font-size: 14px;">
-            <el-col :span="6" type="flex" align="middle" justify="center">项目图片</el-col>
             <el-col :span="6" type="flex" align="middle" justify="center">项目名称</el-col>
+            <el-col :span="6" type="flex" align="middle" justify="center">项目状态</el-col>
             <el-col :span="3" type="flex" align="middle" justify="center">应用类型</el-col>
             <el-col :span="3" type="flex" align="middle" justify="center">项目预算</el-col>
             <el-col :span="3" type="flex" align="middle" justify="center">参与人数</el-col>

src/pages/Square/PopularProjectAndTaskList.vue

@@ -44,8 +44,8 @@
           <el-row v-if="projectAndTaskArr != null && projectAndTaskArr.length != 0" type="flex" align="middle"
                   justify="center"
                   style="font-size: 14px;">
-            <el-col :span="6" type="flex" align="middle" justify="center">项目图片</el-col>
             <el-col :span="6" type="flex" align="middle" justify="center">项目名称</el-col>
+            <el-col :span="6" type="flex" align="middle" justify="center">项目状态</el-col>
             <el-col :span="3" type="flex" align="middle" justify="center">应用类型</el-col>
             <el-col :span="3" type="flex" align="middle" justify="center">项目预算</el-col>
             <el-col :span="3" type="flex" align="middle" justify="center">参与人数</el-col>
@@ -60,8 +60,8 @@
           <el-row v-if="projectAndTaskArr != null && projectAndTaskArr.length != 0" type="flex" align="middle"
                   justify="center"
                   style="font-size: 14px;">
-            <el-col :span="5">任务封面</el-col>
-            <el-col :span="4">任务名称</el-col>
+            <el-col :span="5">任务名称</el-col>
+            <el-col :span="4">任务状态</el-col>
             <el-col :span="4">测试类型</el-col>
             <el-col :span="4">任务预算</el-col>
             <el-col :span="4">领取人数</el-col>

src/pages/Technology/CrowdTool.vue

@@ -16,7 +16,7 @@
               <div>开发：{{item.owner}}</div>
             </div>
           </el-col>
-          <el-col :span="3">
+          <el-col :span="3" v-if="item.linkUrl">
             <div @click="gotoDetail(item)">
               <span style="font-size: 14px">查看详情</span>
               <i class="el-icon-arrow-right get-info-btn"></i>