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

@@ -146,9 +146,9 @@
           </el-input>
         </el-form-item>
 
-        <el-form-item v-if="(!editShortLink) && shortLink" label="任务面板链接" props="shortLink">
+        <el-form-item v-if="shortLink && !editShortLink" label="任务面板链接" props="shortLink">
           {{shortLink}}
-          <i class="el-icon-edit" @click="editShortLink = !editShortLink"/>
+          <i class="el-icon-edit" @click="editShortLink = true"/>
         </el-form-item>
 
         <el-form-item v-if="!isModifyMode">
@@ -399,7 +399,7 @@
         },
         acceptedUserList: [],
         shortLink:'',
-        editShortLink:true,
+        editShortLink:false,
       }
     },
     watch: {
@@ -587,7 +587,10 @@
         this.serviceName = this.getServiceByCode(res.crowdTaskVO.serviceType);
         if(res.crowdTaskVO.endPointVO){
           if(res.crowdTaskVO.endPointVO.token){
-            this.shortLink = res.crowdTaskVO.endPointVO.token
+            this.shortLink = res.crowdTaskVO.endPointVO.token;
+            this.editShortLink = false
+          }else{
+            this.editShortLink = true
           }
         }
         // console.log(res.crowdTaskVO.endPointVO.token)

src/pages/Homepage/Homepage.vue

@@ -127,7 +127,7 @@
             "value": "1"
           },
           {
-            "name": "工具",
+            "name": "资源",
             "value": "2"
           },
           {

src/pages/Homepage/ResourceAndTool.vue

@@ -1,7 +1,7 @@
 <template>
   <el-card class="test-card">
     <div slot="header" class="clearfix test-card-header">
-      <span>众测资源和工具</span>
+      <span>众测资源</span>
       <el-button style="float: right; padding: 3px 0;line-height: 25px" type="text"  @click="getMore()">more>></el-button>
     </div>
     <div>

src/pages/HomepageSearch/AgencyList.vue

@@ -122,7 +122,7 @@
             "value": "1"
           },
           {
-            "name": "工具",
+            "name": "资源",
             "value": "2"
           },
           {

src/pages/HomepageSearch/ExpertList.vue

@@ -89,7 +89,7 @@
             "value": "1"
           },
           {
-            "name": "工具",
+            "name": "资源",
             "value": "2"
           },
           {

src/pages/HomepageSearch/ResourceList.vue

@@ -125,7 +125,7 @@
             "value": "1"
           },
           {
-            "name": "工具",
+            "name": "资源",
             "value": "2"
           },
           {