1

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;

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);

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