From 00ec56ab755eab9e4890df16b1b7b2fdff442529 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E7=9A=87?= <236220500@qq.com>
Date: Sun, 31 May 2020 11:52:48 +0800
Subject: [PATCH] 1

---
 src/pages/activity/selectStoreStep.vue    | 8 ++++++--
 src/pages/activity/useActivityStepTwo.vue | 5 ++++-
 src/pages/shop/IncreaseWelcomeEdit.vue    | 1 -
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/pages/activity/selectStoreStep.vue b/src/pages/activity/selectStoreStep.vue
index c66472d..8172709 100644
--- a/src/pages/activity/selectStoreStep.vue
+++ b/src/pages/activity/selectStoreStep.vue
@@ -58,7 +58,7 @@ export default {
   },
   data() {
     return {
-      currentStep: 0,
+      currentStep: -1,
       modal_loading: false,
       showUse: false
     };
@@ -75,6 +75,8 @@ export default {
   watch: {
     show() {
       this.showUse = this.show;
+      this.currentStep = 0;
+      console.log(344, store.getters.useData);
     },
     schedule() {
       store.getters.useData.scheduleId = this.schedule.id;
@@ -84,7 +86,9 @@ export default {
   methods: {
     cancel() {
       this.currentStep = 0;
-      store.commit("RSET_useData");
+      if (!this.isModify) {
+        store.commit("RSET_useData");
+      }
       this.$emit("doShow", false);
       this.modal_loading = false;
       this.showUse = false;
diff --git a/src/pages/activity/useActivityStepTwo.vue b/src/pages/activity/useActivityStepTwo.vue
index e136b39..4cb8721 100644
--- a/src/pages/activity/useActivityStepTwo.vue
+++ b/src/pages/activity/useActivityStepTwo.vue
@@ -55,7 +55,10 @@ export default {
           _this.checkCompanys.push(item.id);
         }
       });
-    } else if (store.getters.useData.stores) {
+    } else if (
+      store.getters.useData.stores &&
+      store.getters.useData.stores.length > 0
+    ) {
       store.getters.useData.stores.forEach(item => {
         if (item.parentId && _this.checkCompanys.indexOf(item.parentId) == -1) {
           _this.checkCompanys.push(item.parentId);
diff --git a/src/pages/shop/IncreaseWelcomeEdit.vue b/src/pages/shop/IncreaseWelcomeEdit.vue
index a9aa73b..0527a13 100644
--- a/src/pages/shop/IncreaseWelcomeEdit.vue
+++ b/src/pages/shop/IncreaseWelcomeEdit.vue
@@ -202,7 +202,6 @@ export default {
         },
         res => {
           _this.welcome = res.data.results;
-
           store.commit("SET_useData", {
             ...store.getters.useData,
             ...this.welcome