Merge branch '0605' into feature/20200514_version

src/pages/activity/ActivityCode.vue

@@ -1,5 +1,16 @@
 <template>
   <div class="activity_code">
+    <Row class="search-row">
+      <i-col span="24"
+             class="search-col">
+        <Button type="primary"
+                @click="downloadCode(2)"
+                style="margin-left: 20px;">批量下载门店码</Button>
+        <Button type="primary"
+                @click="downloadCode(1)"
+                style="margin-left: 20px;">批量下载导购码</Button>
+      </i-col>
+    </Row>
     <Table :loading="loading"
            border
            :columns="columns"
@@ -50,6 +61,7 @@
 <script>
 import { activityCodeList } from "../../services/ActivityManager/ActivityManager";
 import http from '../../services/store/IncreaseStoreManager';
+import doHttp from '../../services/CommonHttp'
 export default {
   name: "ActivityCode",
   data () {
@@ -206,6 +218,15 @@ export default {
         _this.loading = false;
       });
     },
+    downloadCode (type) {
+      this.loading = true;
+      let that = this;
+      doHttp
+        .downloadZip("/activity/instance/download", type == 2 ? '门店码' : "门店导购码", { type: type, instanceId: this.instanceId })
+        .then(res => {
+          console.log("下载", res)
+        })
+    }
   },
 };
 </script>

src/pages/shop/IncreaseWelcomeEdit.vue

@@ -256,6 +256,7 @@ export default {
         params: [],
         company: [],
         stores: [],
+        scheduleId: null,
         categoryCode: "welcome",
         id: null
       },
@@ -304,6 +305,10 @@ export default {
     console.log(this.$route);
     if (this.id) {
       this.getDetail(this.id);
+    } else {
+      store.commit("SET_useData", {
+        ...this.welcome
+      });
     }
   },
   components: {