From 6ef2a253ef2c71f0fffac23b78dd44b943170501 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:35:52 +0800
Subject: [PATCH] 1

---
 src/pages/activity/selectStoreStep.vue    | 100 +++++++++++-----------
 src/pages/activity/useActivityStepTwo.vue |   6 +-
 src/pages/shop/IncreaseWelcomeEdit.vue    |  17 +++-
 src/pages/shop/IncreaseWelcomeList.vue    |  14 ++-
 4 files changed, 80 insertions(+), 57 deletions(-)

diff --git a/src/pages/activity/selectStoreStep.vue b/src/pages/activity/selectStoreStep.vue
index 7aec19e..c66472d 100644
--- a/src/pages/activity/selectStoreStep.vue
+++ b/src/pages/activity/selectStoreStep.vue
@@ -1,40 +1,41 @@
 <template>
   <div class="use_box">
-    <Modal :scrollable="false"
-           v-model="showUse"
-           title="使用活动"
-           @on-cancel="cancel"
-           :loading="true"
-           width="70%">
-      <Steps style="padding: 40px;"
-             :current="currentStep">
-        <Step :title="isModify ? '修改零售公司' : '选择零售公司'"
-              content></Step>
-        <Step :title="isModify ? '修改店铺' : '选择店铺'"
-              content></Step>
+    <Modal
+      :scrollable="false"
+      v-model="showUse"
+      title="使用活动"
+      @on-cancel="cancel"
+      :loading="true"
+      width="70%"
+    >
+      <Steps style="padding: 40px;" :current="currentStep">
+        <Step :title="isModify ? '修改零售公司' : '选择零售公司'" content></Step>
+        <Step :title="isModify ? '修改店铺' : '选择店铺'" content></Step>
       </Steps>
-      <useActivityStepTwo :schedule="schedule"
-                          :isModify="isModify"
-                          v-if="currentStep == 0"></useActivityStepTwo>
-      <useActivityStepThree :schedule="schedule"
-                            :isModify="isModify"
-                            v-if="currentStep == 1"></useActivityStepThree>
+      <useActivityStepTwo :schedule="schedule" :isModify="isModify" v-if="currentStep == 0"></useActivityStepTwo>
+      <useActivityStepThree :schedule="schedule" :isModify="isModify" v-if="currentStep == 1"></useActivityStepThree>
       <div slot="footer">
-        <Button v-if="currentStep !== 0"
-                type="primary"
-                shape="circle"
-                :loading="modal_loading"
-                @click="back">上一步</Button>
-        <Button v-if="currentStep !== 1"
-                type="primary"
-                shape="circle"
-                :loading="modal_loading"
-                @click="next">下一步</Button>
-        <Button v-if="currentStep == 1"
-                type="primary"
-                shape="circle"
-                :loading="modal_loading"
-                @click="finish">完成</Button>
+        <Button
+          v-if="currentStep !== 0"
+          type="primary"
+          shape="circle"
+          :loading="modal_loading"
+          @click="back"
+        >上一步</Button>
+        <Button
+          v-if="currentStep !== 1"
+          type="primary"
+          shape="circle"
+          :loading="modal_loading"
+          @click="next"
+        >下一步</Button>
+        <Button
+          v-if="currentStep == 1"
+          type="primary"
+          shape="circle"
+          :loading="modal_loading"
+          @click="finish"
+        >完成</Button>
       </div>
     </Modal>
   </div>
@@ -46,20 +47,20 @@ import useActivityStepThree from "./useActivityStepThree";
 import useActivityStepFoure from "./useActivityStepFoure";
 import ActivityManager from "../../services/ActivityManager/ActivityManager";
 import store from "../../store/index";
-import { formatDate } from '../../utils/Common';
+import { formatDate } from "../../utils/Common";
 export default {
   name: "useTable",
   components: {
     useActivityStepOne,
     useActivityStepTwo,
     useActivityStepThree,
-    useActivityStepFoure,
+    useActivityStepFoure
   },
-  data () {
+  data() {
     return {
       currentStep: 0,
       modal_loading: false,
-      showUse: false,
+      showUse: false
     };
   },
   props: {
@@ -72,27 +73,26 @@ export default {
     }
   },
   watch: {
-    show () {
+    show() {
       this.showUse = this.show;
     },
-    schedule () {
+    schedule() {
       store.getters.useData.scheduleId = this.schedule.id;
-    },
+    }
   },
-  mounted () { },
+  mounted() {},
   methods: {
-    cancel () {
+    cancel() {
       this.currentStep = 0;
-    },
-    cancel () {
       store.commit("RSET_useData");
       this.$emit("doShow", false);
       this.modal_loading = false;
       this.showUse = false;
       this.currentStep = 0;
     },
-    next () {
+    next() {
       let data = store.getters.useData;
+      console.log("data1", data);
       if (this.currentStep === 0) {
         if (!data.company || data.company.length === 0) {
           this.$Message.error("请至少选择1家公司");
@@ -111,19 +111,19 @@ export default {
       if (typeof data.endTime == "object") {
         data.endTime = formatDate(data.endTime);
       }
-      console.log("data", data)
+      console.log("data", data);
       store.commit("SET_useData", data);
       this.currentStep = this.currentStep + 1;
     },
-    back () {
+    back() {
       this.currentStep = this.currentStep - 1;
     },
-    finish () {
+    finish() {
       let that = this;
       this.modal_loading = true;
       that.$emit("doShow", false);
-    },
-  },
+    }
+  }
 };
 </script>
 
diff --git a/src/pages/activity/useActivityStepTwo.vue b/src/pages/activity/useActivityStepTwo.vue
index 4079f4e..e136b39 100644
--- a/src/pages/activity/useActivityStepTwo.vue
+++ b/src/pages/activity/useActivityStepTwo.vue
@@ -45,7 +45,7 @@ export default {
   },
   mounted() {
     let _this = this;
-    console.log(111, store.getters.useData);
+    console.log(1, store.getters.useData);
     if (
       store.getters.useData.company &&
       store.getters.useData.company.length > 0
@@ -57,7 +57,6 @@ export default {
       });
     } else if (store.getters.useData.stores) {
       store.getters.useData.stores.forEach(item => {
-        console.log(112221, item.parentId);
         if (item.parentId && _this.checkCompanys.indexOf(item.parentId) == -1) {
           _this.checkCompanys.push(item.parentId);
         }
@@ -67,6 +66,7 @@ export default {
   },
   methods: {
     onChange(data) {
+      console.log(2, store.getters.useData);
       let _this = this;
       if (data.length === this.companyList.length) {
         this.indeterminate = false;
@@ -85,6 +85,7 @@ export default {
           store.getters.useData.company.push(c);
         }
       });
+      console.log(3, store.getters.useData);
     },
     doSearch(e) {
       const keyword = e.target.value;
@@ -126,7 +127,6 @@ export default {
           that.orginCompanyList = that.companyList;
         });
         store.getters.useData.company = [];
-        console.log(123, that.checkCompanys, that.companyListdata);
         that.checkCompanys.forEach(item => {
           const c = that._.find(
             that.companyListdata,
diff --git a/src/pages/shop/IncreaseWelcomeEdit.vue b/src/pages/shop/IncreaseWelcomeEdit.vue
index db8d3b4..a9aa73b 100644
--- a/src/pages/shop/IncreaseWelcomeEdit.vue
+++ b/src/pages/shop/IncreaseWelcomeEdit.vue
@@ -137,7 +137,9 @@ export default {
         content: "",
         params: [],
         company: [],
-        stores: []
+        stores: [],
+        categoryCode: "welcome",
+        id: null
       },
       welcomeRules: {
         content: [
@@ -164,6 +166,18 @@ export default {
       miniForm: { appid: "", uri: "" }
     };
   },
+  watch: {
+    welcome: {
+      handler() {
+        store.commit("SET_useData", {
+          ...store.getters.useData,
+          ...this.welcome
+        });
+      },
+      immediate: true,
+      deep: true
+    }
+  },
   created() {
     this.id = this.$route.query.id;
     // store.commit("SET_useData", { ...store.getters.useData, ...this.welcome });
@@ -179,7 +193,6 @@ export default {
     doShow() {
       this.showStoreCheck = false;
       this.welcome = store.getters.useData;
-      console.log(this.welcome);
     },
     getDetail(instanceId) {
       let _this = this;
diff --git a/src/pages/shop/IncreaseWelcomeList.vue b/src/pages/shop/IncreaseWelcomeList.vue
index 73f6d3f..526c06d 100644
--- a/src/pages/shop/IncreaseWelcomeList.vue
+++ b/src/pages/shop/IncreaseWelcomeList.vue
@@ -7,7 +7,13 @@
         </Row>
       </i-col>
     </Row>
-    <Table :columns="columns1" :data="data" style="margin-top: 20px;" size="small">
+    <Table
+      :columns="columns1"
+      :data="data"
+      :loading="loading"
+      style="margin-top: 20px;"
+      size="small"
+    >
       <template slot-scope="{ row, index }" slot="action">
         <Button type="primary" size="small" @click="handleEdit(row, index)">修改</Button>
         <Button type="error" size="small" @click="handleDelete(row, index)">删除</Button>
@@ -38,7 +44,7 @@ export default {
   data() {
     let _this = this;
     return {
-      loading: true,
+      loading: false,
       // 分页
       total: 0,
       pageSize: 10,
@@ -70,6 +76,9 @@ export default {
           title: "配置范围",
           key: "shop",
           render(h, params) {
+            if (params.row.storeName == null) {
+              return h("span", "店铺插入中...");
+            }
             return h(
               "span",
               params.row.storeName +
@@ -110,6 +119,7 @@ export default {
     //切页处理
     handlePage: function(value) {
       this.pageNum = value;
+      this.handlePaginate();
     },
     // 新增或修改
     handleEdit(row) {