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

src/Form/marketing2/agent/add.vue

@@ -162,7 +162,7 @@
       </div>
       <div class="fixed__btn__panel">
         <el-button size="small" @click="dialogVisible = false" class="normal-btn-width">取 消</el-button>
-        <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
+        <el-button size="small" :loading="loading" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
       </div>
     </el-drawer>
   </div>
@@ -171,6 +171,8 @@
 <script>
 import enterprise from '@/template/enterprise/index.vue'
 import selectAgent from '@/components/selectAgent/index.vue'
+import {mapGetters} from 'vuex'
+
 export default {
   data () {
     return {
@@ -240,6 +242,11 @@ export default {
     enterprise,
     selectAgent
   },
+  computed:{
+    ...mapGetters({
+      loading:'loading'
+    })
+  },
   methods:{
     onShow () {
       this.dialogVisible = true

src/components/submitBtn/index.vue

@@ -0,0 +1,24 @@
+<template>
+  <el-button>{{ name }}</el-button>
+</template>
+
+<script>
+import {mapGetters} from 'vuex'
+export default {
+  props:{
+    name:String
+  },
+  data () {
+    return {
+    }
+  },
+  computed:{
+
+  },
+  methods:{
+  }
+}
+
+</script>
+<style>
+</style>