Merge remote-tracking branch 'origin/develop' into develop

src/views/task/edit/index.vue

@@ -4,6 +4,10 @@
       <div class="tip-navigation">
         <div class="tip"></div>
         <div class="tip-title">任务信息</div>
+        <div class="left-back" @click="backPage">
+          <icon-park type="left" size="14" fill="#1a6fd7" />
+          <span class="return-button">取消</span>
+        </div>
       </div>
       <div class="global-left-margin">
         <el-row :gutter="20">
@@ -998,6 +1002,9 @@ export default {
       // 去掉一个数组最后一个对象
       this.tableData.pop()
     },
+    backPage() {
+      this.$router.go(-1)
+    },
     /**
      * 添加小组成员点击按钮
      */
@@ -1232,6 +1239,17 @@ export default {
     font-weight: 700;
     color: #1a6fd7;
   }
+
+  .left-back {
+    position: absolute;
+    right: 2%;
+    display: flex;
+    color: #1a6fd7;
+    cursor: pointer;
+    .return-button {
+      padding-left: 7px;
+    }
+  }
 }
 
 .sortable-handle {