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

@@ -148,7 +148,7 @@
 
         <el-form-item v-if="shortLink && !editShortLink" label="任务面板链接" props="shortLink">
           {{shortLink}}
-          <i class="el-icon-edit" @click="editShortLink = true"/>
+          <i class="el-icon-edit" @click="editShortLink = true" v-if="taskOperationControl.confirmFinish"/>
         </el-form-item>
 
         <el-form-item v-if="!isModifyMode">

src/pages/Technology/CrowdTool.vue

@@ -3,15 +3,16 @@
     <div class="card-wrapper" v-if="toolList&&toolList.length">
       <el-card v-for="item in toolList" :key="item.id" style="margin-bottom: 15px">
         <el-row>
-          <el-col :span="6">
+          <el-col :span="4">
             <img :src="item.photoUrl" alt="tool-img" class="pull-left technology-img">
           </el-col>
-          <el-col :span="15" class="technology-detail">
+          <el-col :span="17" class="technology-detail">
             <div class="technology-title">
               {{item.name}}
             </div>
+            <div>简介：{{item.description}}</div>
+
             <div class="technology-info">
-              <div>简介：{{item.description}}</div>
               <div>开发：{{item.owner}}</div>
             </div>
           </el-col>