Merge remote-tracking branch 'origin/master'

src/views/club/form.vue

@@ -146,7 +146,7 @@ export default {
     },
     handleDoorwaySuccess(response, file) {
       setTimeout(() => {
-        this.form.businessLicenseImage = response.data
+        this.form.headpic = response.data
       }, 1000)
     },
     // 对上传图片的大小、格式进行限制

src/views/club/operateList.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="app-container">
-    <div class="app-title">当前机构：{{ clubTitle }} </div>
+    <div class="app-header-top" style="width: 100%;float: right;margin-bottom: 10px;">
+      <div class="app-title">当前机构：{{ clubTitle }} </div>
+      <el-button type="primary" icon="el-icon-back" style="float: right;" @click="backToList">返回</el-button>
+    </div>
     <div class="app-header-search">
       <el-form class="demo-form-inline">
         <el-form-item label="姓名:" style="width:210px;float: left;">
@@ -379,6 +382,15 @@ export default {
           break
       }
       return textColor
+    },
+    backToList() {
+      this.$store.dispatch('tagsView/delView', this.$route).then(() => {
+        this.$nextTick(() => {
+          this.$router.replace({
+            path: '/club/list'
+          })
+        })
+      })
     }
   }
 }
@@ -391,5 +403,6 @@ export default {
     color: #999999;
     margin-bottom:10px;
     color: #417DE6;
+    float: left;
   }
 </style>