修改我的众测：项目增加领域类型，任务增加领域、应用类型，增加未完成任务的冒泡提示，免费发布众测删除免费二字

src/components/Mine.vue

@@ -27,20 +27,25 @@
       <el-tabs value="myProject" @tab-click="handleTabClick" v-loading="loading" style="width: 90%;margin-left: 5%">
         <el-tab-pane name="unFinishedTask">
           <span slot="label">
-            <el-badge class="item" style="margin-top: 10px;margin-bottom: 25px; font-size: 16px;">未完成任务</el-badge>
+            <el-badge v-if="unfinishedTaskNoticeCount>0" :value="unfinishedTaskNoticeCount" class="item"
+                      style="height:auto; margin-top: 10px;margin-bottom: 25px; font-size: 16px;">未完成任务</el-badge>
+             <el-badge v-if="unfinishedTaskNoticeCount==null || unfinishedTaskNoticeCount == 0" class="item"
+                       style="margin-top: 10px;margin-bottom: 25px; font-size: 16px;">未完成任务</el-badge>
           </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="4">测试类型</el-col>
-            <el-col :span="4">任务预算</el-col>
-            <el-col :span="4">领取人数</el-col>
+            <el-col :span="3">领域类型</el-col>
+            <el-col :span="3">应用类型</el-col>
+            <el-col :span="3">测试类型</el-col>
+            <el-col :span="3">任务预算</el-col>
+            <el-col :span="3">领取人数</el-col>
             <el-col :span="3">操作</el-col>
           </el-row>
           <span v-if="unFinishedTaskList == null || unFinishedTaskList.length == 0"> 暂无任务 </span>
           <task-item v-if="unFinishedTaskList != null || unFinishedTaskList.length > 0"
-                     v-for="(item,index1) in unFinishedTaskList" :key="index1" :task="item"/>
+                     v-for="(item,index1) in unFinishedTaskList" :key="item.id" :task="item"/>
         </el-tab-pane>
         <el-tab-pane name="finishedTask">
           <span slot="label">
@@ -50,14 +55,16 @@
                   justify="center" style="font-size: 14px;">
             <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>
+            <el-col :span="3">领域类型</el-col>
+            <el-col :span="3">应用类型</el-col>
+            <el-col :span="3">测试类型</el-col>
+            <el-col :span="3">任务预算</el-col>
+            <el-col :span="3">领取人数</el-col>
             <el-col :span="3">操作</el-col>
           </el-row>
           <span v-if="finishedTaskList == null || finishedTaskList.length == 0"> 暂无任务 </span>
           <task-item v-if="finishedTaskList != null || finishedTaskList.length > 0"
-                     v-for="(item,index2) in finishedTaskList" :key="index2" :task="item"/>
+                     v-for="(item,index2) in finishedTaskList" :key="item.id" :task="item"/>
         </el-tab-pane>
         <el-tab-pane name="myProject">
 
@@ -70,15 +77,16 @@
           <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="4" 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>
             <el-col :span="3" type="flex" align="middle" justify="center">参与人数</el-col>
             <el-col :span="4" type="flex" align="middle" justify="center">操作</el-col>
           </el-row>
           <project-item v-if="myProjects != null || myProjects.length > 0"
-                        v-for="(item,index3) in myProjects" :key="index3" :projectItem="item"/>
+                        v-for="(item,index3) in myProjects" :key="item.id" :projectItem="item"/>
         </el-tab-pane>
         <el-tab-pane name="handlingProject">
           <span slot="label">
@@ -89,8 +97,9 @@
           </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="4">项目图片</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>
             <el-col :span="3">参与人数</el-col>
@@ -98,7 +107,7 @@
           </el-row>
           <span v-if="handlingProjects == null || handlingProjects.length == 0"> 暂无项目 </span>
           <project-item v-if="handlingProjects != null || handlingProjects.length > 0"
-                        v-for="(item,index4) in handlingProjects" :key="index4" :projectItem="item"/>
+                        v-for="(item,index4) in handlingProjects" :key="item.id" :projectItem="item"/>
         </el-tab-pane>
         <el-tab-pane name="acceptableProject">
           <span slot="label">
@@ -109,8 +118,9 @@
           </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="4">项目图片</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>
             <el-col :span="3">参与人数</el-col>
@@ -118,7 +128,7 @@
           </el-row>
           <span v-if="acceptableProjects == null || acceptableProjects.length == 0"> 暂无项目 </span>
           <project-item v-if="acceptableProjects != null || acceptableProjects.length > 0"
-                        v-for="(item,index) in acceptableProjects" :key="index" :projectItem="item"/>
+                        v-for="(item,index) in acceptableProjects" :key="item.id" :projectItem="item"/>
         </el-tab-pane>
       </el-tabs>
 
@@ -142,10 +152,10 @@
           <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
           <div class="el-upload__tip" slot="tip">只能上传Json文件，且不超过100MB</div>
         </el-upload>
-        <span slot="footer" class="dialog-footer">
-        <el-button @click="showImportTaskModal = false">取 消</el-button>
-        <el-button type="primary" @click="showImportTaskModal = false">确 定</el-button>
-        </span>
+<!--        <span slot="footer" class="dialog-footer">-->
+<!--        <el-button @click="showImportTaskModal = false">取 消</el-button>-->
+<!--        <el-button type="primary" @click="showImportTaskModal = false">确 定</el-button>-->
+<!--        </span>-->
       </el-dialog>
 
     </div>
@@ -186,6 +196,7 @@
         acceptableProjects: [],
         defaultValue: defaultValue,
         myProjectNoticeCount: 0,
+        unfinishedTaskNoticeCount: 0,
         processProjectNoticeCount: 0,
         acceptableProjectNoticeCount: 0,
         rolesPermissions: {
@@ -236,6 +247,7 @@
           this.statisticData = res;
           this.processProjectNoticeCount = res.processProjectNoticeCount == null ? 0 : res.processProjectNoticeCount
           this.myProjectNoticeCount = res.myProjectNoticeCount == null ? 0 : res.myProjectNoticeCount
+          this.unfinishedTaskNoticeCount = res.unfinishedTaskNoticeCount == null ? 0 : res.unfinishedTaskNoticeCount
           this.acceptableProjectNoticeCount = res.acceptableProjectNoticeCount == null ? 0 : res.acceptableProjectNoticeCount
           if (res.unfinishedTasks != null && res.unfinishedTasks.length > 0) {
             this.unFinishedTaskList = res.unfinishedTasks

src/components/commons/ProjectItem.vue

@@ -1,13 +1,17 @@
 <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">
+      <el-col :span="4" 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">
         </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;"
+              v-bind:class="['badge']"
+        >{{project.field}}</span>
+      </el-col>
       <el-col :span="3" type="flex" align="middle" justify="center">
         <span style="font-size: 10px;"
               v-bind:class="['badge']"

src/components/commons/SearchBar.vue

@@ -23,7 +23,7 @@
         </div>
       </el-col>
       <el-col :span="6">
-        <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">免费发布众测需求</el-button>
+        <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">发布众测需求</el-button>
       </el-col>
     </el-row>
     <!--TabNav-->

src/components/commons/TaskItem.vue

@@ -7,18 +7,27 @@
         </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">
+      <el-col :span="3" type="flex" align="middle" justify="center">
+        <div class="badge" type="flex" align="middle" justify="center">
+          {{taskTable.fieldType}}
+        </div>
+      </el-col>
+      <el-col :span="3" type="flex" align="middle" justify="center">
+        <div class="badge" type="flex" align="middle" justify="center">
+          {{taskTable.applicationType}}
+        </div>
+      </el-col>
+      <el-col :span="3" type="flex" align="middle" justify="center">
         <div class="badge" type="flex" align="middle" justify="center">
           {{taskTable.serviceType}}
         </div>
       </el-col>
-      <el-col :span="4" type="flex" align="middle" justify="center">¥{{taskTable.quotePrice==null?0:taskTable.quotePrice}}</el-col>
+      <el-col :span="3" type="flex" align="middle" justify="center">¥{{taskTable.quotePrice==null?0:taskTable.quotePrice}}</el-col>
 
-      <el-col :span="4" type="flex" align="middle" justify="center">
+      <el-col :span="3" type="flex" align="middle" justify="center">
         {{taskTable.acceptedCount}} / {{  taskTable.participantCount}}
       </el-col>
-      <el-col :span="3" type="flex" align="middle" justify="center"><span class="btn btn-medium btn-info"
+      <el-col :span="3" type="flex" align="middle" justify="center"><span class="btn btn-small btn-info"
                                                                           @click="goToTaskDetail(taskTable.projectId,taskTable.id)">查看详情</span>
       </el-col>
     </el-row>

src/components/commons/TopSearch.vue

@@ -24,7 +24,7 @@
         </div>
       </el-col>
       <el-col :span="6">
-        <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">免费发布众测需求</el-button>
+        <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">发布众测需求</el-button>
       </el-col>
     </el-row>
   </div>

src/pages/DetailPage/CrowdDetail.vue

@@ -22,7 +22,7 @@
           </div>
         </el-col>
         <el-col :span="4">
-          <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">免费发布众测需求</el-button>
+          <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">发布众测需求</el-button>
         </el-col>
       </el-row>
       <div>

src/pages/Homepage/Homepage.vue

@@ -27,7 +27,7 @@
 
         </el-col>
         <el-col :span="4">
-          <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">免费发布众测需求</el-button>
+          <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">发布众测需求</el-button>
         </el-col>
       </el-row>
       <!--TabNav-->

src/pages/Homepage/HomepagePrivate.vue

@@ -23,7 +23,7 @@
 
         </el-col>
         <el-col :span="4">
-          <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">免费发布众测需求</el-button>
+          <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">发布众测需求</el-button>
         </el-col>
       </el-row>
       <!--TabNav-->

src/pages/Homepage/HotTask.vue

@@ -1,53 +0,0 @@
-<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: 'HotTask',
-    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/HomepageSearch/AgencyList.vue

@@ -23,7 +23,7 @@
           </div>
         </el-col>
         <el-col :span="4">
-          <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">免费发布众测需求</el-button>
+          <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">发布众测需求</el-button>
         </el-col>
       </el-row>
     </div>

src/pages/HomepageSearch/AgencyResidentList.vue

@@ -24,7 +24,7 @@
           </div>
         </el-col>
         <el-col :span="4">
-          <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">免费发布众测需求</el-button>
+          <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">发布众测需求</el-button>
         </el-col>
       </el-row>
     </div>

src/pages/HomepageSearch/CompetitionList.vue

@@ -24,7 +24,7 @@
           </div>
         </el-col>
         <el-col :span="4">
-          <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">免费发布众测需求</el-button>
+          <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">发布众测需求</el-button>
         </el-col>
       </el-row>
     </div>

src/pages/HomepageSearch/CrowdList.vue

@@ -24,7 +24,7 @@
           </div>
         </el-col>
         <el-col :span="4">
-          <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">免费发布众测需求</el-button>
+          <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">发布众测需求</el-button>
         </el-col>
       </el-row>
     </div>

src/pages/HomepageSearch/ExpertList.vue

@@ -24,7 +24,7 @@
           </div>
         </el-col>
         <el-col :span="4">
-          <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">免费发布众测需求</el-button>
+          <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">发布众测需求</el-button>
         </el-col>
       </el-row>
     </div>

src/pages/HomepageSearch/ResourceList.vue

@@ -24,7 +24,7 @@
           </div>
         </el-col>
         <el-col :span="4">
-          <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">免费发布众测需求</el-button>
+          <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">发布众测需求</el-button>
         </el-col>
       </el-row>
     </div>

src/pages/HomepageSearch/UserList.vue

@@ -24,7 +24,7 @@
           </div>
         </el-col>
         <el-col :span="4">
-          <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">免费发布众测需求</el-button>
+          <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">发布众测需求</el-button>
         </el-col>
       </el-row>
     </div>

src/pages/Square/PopularProjectAndTaskList.vue

@@ -14,7 +14,7 @@
                              :key="item.label"></el-tab-pane>
               </el-tabs>
               <div class="search-input">
-                <el-input placeholder="请输入内容" v-model="searchVal" class="input-with-select">
+                <el-input placeholder="请输入内容" v-model="searchVal" class="input-with-select" ref="searchInput">
                   <el-button class="search-button" slot="append" type="primary" @click="handleSearchData">搜索</el-button>
                 </el-input>
               </div>
@@ -22,7 +22,7 @@
           </div>
         </el-col>
         <el-col :span="4">
-          <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">免费发布众测需求</el-button>
+          <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">发布众测需求</el-button>
         </el-col>
       </el-row>
       <el-tabs v-model="currTab" @tab-click="handleTabClick" class="container square-tab">
@@ -40,8 +40,9 @@
           <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="4" 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>
             <el-col :span="3" type="flex" align="middle" justify="center">参与人数</el-col>
@@ -58,13 +59,15 @@
                   style="font-size: 14px;">
             <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>
+            <el-col :span="3">领域类型</el-col>
+            <el-col :span="3">应用类型</el-col>
+            <el-col :span="3">测试类型</el-col>
+            <el-col :span="3">任务预算</el-col>
+            <el-col :span="3">领取人数</el-col>
             <el-col :span="3">操作</el-col>
           </el-row>
           <task-item v-if="(projectAndTaskArr != null || projectAndTaskArr.length > 0 )"
-                     v-for="(item,index2) in projectAndTaskArr" :key="index2" :task="item"/>
+                     v-for="(item,index2) in projectAndTaskArr" :key="item.id" :task="item"/>
         </el-tab-pane>
 
       </el-tabs>
@@ -148,9 +151,11 @@
         this.type = this.$route.params.type;
         if (this.type === "project") {
           this.currTab = 'project';
+          this.searchType = 'project';
           this.getHotProject();
         } else {
           this.currTab = 'task';
+          this.searchType = 'task';
           this.getHotTask();
         }
         this.hideLoading();
@@ -196,11 +201,12 @@
         this.searchVal = '';
         this.searchData()
       },
-      handleTabClickSearch() {
-        this.activePage = 1;
-        this.searchData()
-      },
+      // handleTabClickSearch() {
+      //   this.activePage = 1;
+      //   this.searchData()
+      // },
       searchData(index) {
+        console.log(this.currTab);
         if (this.currTab === 'project') {
           this.getHotProject();
         } else {
@@ -210,8 +216,10 @@
       },
       handleTypeClick(tab) {
         this.searchType = tab.name;
-        // this.currTab = this.searchType;
+        this.currTab = tab.name;
         this.activePage = 1;
+        this.$refs.searchInput.focus();
+        this.searchData();
       },
       checkLogin() {
         this.checkCreateProjectAuth();

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" style="text-align: center;padding: 5px 0"><span>暂无任务</span></div>
+    <div v-if="!hotCrowdTaskVOs.length" 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">

src/pages/Square/Square2.0.vue

@@ -21,7 +21,7 @@
           </div>
         </el-col>
         <el-col :span="4">
-          <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">免费发布众测需求</el-button>
+          <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">发布众测需求</el-button>
         </el-col>
       </el-row>
       <!--TabNav-->

src/pages/Square/SquareCard.vue

@@ -19,15 +19,22 @@
       </el-row>
     </div>
     <div class="card-footer">
-      <el-row class="card-footer-row">
+      <el-row class="card-footer-row" v-if="!card.serviceType">
         <el-col :span="12" class="pull-left">
-          {{card.applicationType || card.serviceType}}
+          {{card.applicationType}}
         </el-col>
         <el-col :span="12" class=" test-btn">
-          <el-button type="primary" round size="mini" class="pull-right" v-if="card.applicationType"
+          <el-button type="primary" round size="mini" class="pull-right"
                      @click="goToProjectDetail(card.code)">查看详情
           </el-button>
-          <el-button type="primary" round size="mini" class="pull-right" v-else
+        </el-col>
+      </el-row>
+      <el-row class="card-footer-row" v-else>
+        <el-col :span="12" class="pull-left">
+          {{card.serviceType}}
+        </el-col>
+        <el-col :span="12" class=" test-btn">
+          <el-button type="primary" round size="mini" class="pull-right"
                      @click="goToTaskDetail(card.projectId, card.code)">我要众测
           </el-button>
         </el-col>

src/pages/Technology/Technology2.0.vue

@@ -19,7 +19,7 @@
           </div>
         </el-col>
         <el-col :span="4">
-          <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">免费发布众测需求</el-button>
+          <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">发布众测需求</el-button>
         </el-col>
       </el-row>
       <!--TabNav-->

src/pages/Technology/TechnologyMore.vue

@@ -19,7 +19,7 @@
           </div>
         </el-col>
         <el-col :span="4">
-          <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">免费发布众测需求</el-button>
+          <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">发布众测需求</el-button>
         </el-col>
       </el-row>
       <!--TabNav-->