Merge branch 'feature-2.0' of ssh://git.mooctest.com:1022/crowd-2019/crowd-test-service-front into feature-2.0

src/components/task/Task.vue

@@ -20,7 +20,7 @@
           <el-input size="small" type="number" v-if="isModifyMode" v-model="task.quotePrice">
             <template slot="append">¥</template>
           </el-input>
-          <span v-if="!isModifyMode">{{task.quotePrice}}￥</span>
+          <span v-if="!isModifyMode">￥{{task.quotePrice}}</span>
         </el-form-item>
         <!--<el-form-item type="number" label="任务定价" prop="fixedPrice">-->
         <!--<el-input v-if="isModifyMode" v-model="task.fixedPrice">-->

src/pages/Square/PopularProjectAndTaskList.vue

@@ -102,7 +102,8 @@
   import {notify} from "../../constants"
   import TaskItem from '../../components/commons/TaskItem'
   import ProjectItem from '../../components/commons/ProjectItem'
-  import {storageGet} from '@/js/index'
+  import {defaultValue, getRolesPermissions, storageGet} from '@/js/index'
+  import {mapActions, mapGetters} from 'vuex';
 
   export default {
     name: 'PopularProjectAndTaskList',
@@ -224,12 +225,16 @@
         }
       },
       handleSearchData() {
-        console.log("this.searchVal  " + this.searchVal)
         this.activePage = 1;
-        if (this.currTab == 'project') {
+        console.log("this.searchType " + this.searchType);;
+        if (this.searchType === 'project') {
+          this.currTab =  'project';
           this.getHotProject();
+          console.log("currTab " + this.currTab)
         } else {
+          this.currTab =  'task';
           this.getHotTask();
+          console.log("currTab " + this.currTab)
         }
       },
       handlePageChange(index) {