From 18a18687efb4b8e5682fdcff85fbe29d5e2f27e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E7=9A=87?= <236220500@qq.com>
Date: Thu, 4 Jun 2020 22:50:03 +0800
Subject: [PATCH] 1

---
 src/pages/activity/ActivityManager.vue |  92 ++++----
 src/pages/activity/ActivityPlan.vue    | 299 +++++++++++++------------
 src/pages/activity/addActivity.vue     |  14 +-
 src/pages/activity/useTable.vue        | 119 +++++-----
 src/pages/shop/IncreaseWelcomeEdit.vue |  54 ++++-
 5 files changed, 325 insertions(+), 253 deletions(-)

diff --git a/src/pages/activity/ActivityManager.vue b/src/pages/activity/ActivityManager.vue
index 9eb70d0..8f255bf 100644
--- a/src/pages/activity/ActivityManager.vue
+++ b/src/pages/activity/ActivityManager.vue
@@ -1,19 +1,20 @@
 <template>
   <div class="activityManager">
-    <Spin v-show="loading"
-          fix>加载中...</Spin>
+    <Spin v-show="loading" fix>加载中...</Spin>
     <Row>
-      <i-col class="activityListClass"
-             v-for="(item, index) in activityList"
-             :key="index"
-             span="7"
-             offset="1">
+      <i-col
+        class="activityListClass"
+        v-for="(item, index) in activityList"
+        :key="index"
+        span="7"
+        offset="1"
+      >
         <Card>
           <div class="operateAndThemeItem">
             <div class="ThemeItem">
-              <div class="schedule-image"><img class="img"
-                     :src="'/kiisoo-ic' + item.logo"
-                     alt /></div>
+              <div class="schedule-image">
+                <img class="img" :src="'/kiisoo-ic' + item.logo" alt />
+              </div>
               <div class="tipItem">
                 <span>{{ item.name }}</span>
                 <span>{{ item.description }}</span>
@@ -21,30 +22,26 @@
             </div>
             <div class="operateItem">
               <div @click="disPlayUseTable(item)">使用</div>
-              <div v-show="roleCode === 'GLY-ADMIN'"
-                   @click="dispalyAddActivity(item.id)">配置</div>
+              <div v-show="roleCode === 'GLY-ADMIN'" @click="dispalyAddActivity(item.id)">配置</div>
             </div>
           </div>
         </Card>
       </i-col>
     </Row>
     <Row v-show="roleCode === 'GLY-ADMIN'">
-      <i-col span="7"
-             offset="1">
-        <div @click="dispalyAddActivity('')"
-             class="addactivity">
+      <i-col span="7" offset="1">
+        <div @click="dispalyAddActivity('')" class="addactivity">
           <span>+</span>
           <span>添加活动</span>
         </div>
       </i-col>
     </Row>
-    <useTable ref="useTable"
-              @doShow="doShow"
-              :show="showUse"
-              :schedule="useSchedule"></useTable>
-    <addActivity @dispalyAddActivityModal="dispalyAddActivityModal"
-                 :addActivityModal="addActivityModal"
-                 :id="id"></addActivity>
+    <useTable ref="useTable" @doShow="doShow" :show="showUse" :schedule="useSchedule"></useTable>
+    <addActivity
+      @dispalyAddActivityModal="dispalyAddActivityModal"
+      :addActivityModal="addActivityModal"
+      :id="id"
+    ></addActivity>
   </div>
 </template>
 
@@ -52,16 +49,16 @@
 import useTable from "./useTable";
 import addActivity from "./addActivity";
 import ActivityManager from "../../services/ActivityManager/ActivityManager";
-import store from '../../store';
+import store from "../../store";
 
 export default {
   name: "ActivityManager",
   components: {
     useTable,
-    addActivity,
+    addActivity
   },
   inject: ["setMenuName"],
-  data () {
+  data() {
     return {
       showUse: false,
       addActivityModal: false,
@@ -73,72 +70,75 @@ export default {
       roleCode: ""
     };
   },
-  created () {
-    store.commit("RSET_useData")
+  created() {
+    store.commit("RSET_useData");
   },
-  mounted () {
+  mounted() {
     this.setMenuName("活动管理", "活动池");
     this.getActivityTable();
     this.roleCode = sessionStorage.getItem("roleCode");
   },
   methods: {
-    doShow (show) {
+    doShow(show) {
       this.showUse = show;
     },
-    getActivityData (id) {
+    getActivityData(id) {
       let that = this;
       let data = {
-        instanceId: id,
+        instanceId: id
       };
       that.loading = true;
-      ActivityManager.getActivityInfo(data, function (data) {
+      ActivityManager.getActivityInfo(data, function(data) {
         that.inputActivityList = [];
-        data.data.results.params.forEach((item) => {
+        data.data.results.params.forEach(item => {
           that.inputActivityList.push({
             value1: item.name,
-            value2: item.description,
+            value2: item.description
           });
         });
         this.useModal = true;
         that.loading = false;
       });
     },
-    getActivityTable () {
+    getActivityTable() {
       let that = this;
-      ActivityManager.getActivityList({ categoryCode: "promotion" }, function (data) {
+      ActivityManager.getActivityList({ categoryCode: "promotion" }, function(
+        data
+      ) {
         that.activityList = data.data.results;
       });
     },
-    disPlayUseTable (item) {
+    disPlayUseTable(item) {
+      console.log("disPlayUseTable");
       let that = this;
       let data = {
-        id: item.id,
+        id: item.id
       };
       // let data = new FormData()
       // data.append('instanceId', item.id)
-      ActivityManager.getActivityInfo(data, function (data) {
+      ActivityManager.getActivityInfo(data, function(data) {
         that.useSchedule = data.data.results;
         that.showUse = true;
-        that.$forceUpdate()
+        that.$forceUpdate();
       });
     },
-    dispalyAddActivity (id) {
+    dispalyAddActivity(id) {
       this.addActivityModal = true;
       this.id = id.toString();
     },
-    dispalyuseModal (displayModalFlag, isCancle) {
+    dispalyuseModal(displayModalFlag, isCancle) {
       this.useModal = displayModalFlag;
       if (isCancle === true) {
         this.getActivityTable();
       }
     },
-    dispalyAddActivityModal (displayModalFlag, isCancle) {
+    dispalyAddActivityModal(displayModalFlag, isCancle) {
       this.addActivityModal = displayModalFlag;
       if (isCancle === true) {
         this.getActivityTable();
       }
-    },
-  },
+    }
+  }
 };
 </script>
 
diff --git a/src/pages/activity/ActivityPlan.vue b/src/pages/activity/ActivityPlan.vue
index cc36071..f6d4ebb 100644
--- a/src/pages/activity/ActivityPlan.vue
+++ b/src/pages/activity/ActivityPlan.vue
@@ -1,129 +1,128 @@
 <template>
   <div>
-    <Spin v-if="saving"
-          fix>加载中...</Spin>
-    <Form ref="formValidate"
-          :model="formValidate"
-          :label-width="80">
+    <Spin v-if="saving" fix>加载中...</Spin>
+    <Form ref="formValidate" :model="formValidate" :label-width="80">
       <Row :gutter="10">
         <i-col span="6">
-          <FormItem label="选择日期"
-                    prop="">
-            <Date-picker style="width: 100%"
-                         v-model="formValidate.date"
-                         type="daterange"
-                         placement="bottom-end"
-                         placeholder="选择日期区间"></Date-picker>
+          <FormItem label="选择日期" prop>
+            <Date-picker
+              style="width: 100%"
+              v-model="formValidate.date"
+              type="daterange"
+              placement="bottom-end"
+              placeholder="选择日期区间"
+            ></Date-picker>
           </FormItem>
         </i-col>
         <i-col span="6">
-          <FormItem label="零售公司"
-                    prop>
-            <Select v-model="formValidate.organizationId"
-                    filterable
-                    @on-change="selectCompany"
-                    placeholder="全部"
-                    clearable>
-              <Option v-for="(item, index) in companyList"
-                      :key="index"
-                      :value="item.value">{{ item.label }}</Option>
+          <FormItem label="零售公司" prop>
+            <Select
+              v-model="formValidate.organizationId"
+              filterable
+              @on-change="selectCompany"
+              placeholder="全部"
+              clearable
+            >
+              <Option
+                v-for="(item, index) in companyList"
+                :key="index"
+                :value="item.value"
+              >{{ item.label }}</Option>
             </Select>
           </FormItem>
         </i-col>
         <i-col span="6">
-          <FormItem label="店铺"
-                    prop>
-            <Select v-model="formValidate.storeId"
-                    filterable
-                    placeholder="全部"
-                    clearable>
-              <Option v-for="(item, index) in shopList"
-                      :key="index"
-                      :value="item.value">{{ item.label }}</Option>
+          <FormItem label="店铺" prop>
+            <Select v-model="formValidate.storeId" filterable placeholder="全部" clearable>
+              <Option
+                v-for="(item, index) in shopList"
+                :key="index"
+                :value="item.value"
+              >{{ item.label }}</Option>
             </Select>
           </FormItem>
         </i-col>
         <i-col span="3">
-          <FormItem label="活动状态"
-                    prop>
+          <FormItem label="活动状态" prop>
             <Select v-model="formValidate.status">
-              <Option v-for="(item, index) in activityStatusList"
-                      :key="index"
-                      :value="item.value">{{ item.label }}</Option>
+              <Option
+                v-for="(item, index) in activityStatusList"
+                :key="index"
+                :value="item.value"
+              >{{ item.label }}</Option>
             </Select>
           </FormItem>
         </i-col>
         <i-col span="3">
-          <Button type="primary"
-                  @click="() => {pageNum = 1;searchTable()}">查询</Button>
+          <Button type="primary" @click="() => {pageNum = 1;searchTable()}">查询</Button>
         </i-col>
       </Row>
       <Row style="margin-top:50px">
-        <Table :loading="loading"
-               border
-               @on-row-dblclick="showDetail"
-               :columns="columns1"
-               :data="data">
-          <template slot-scope="{row}"
-                    slot="qrCodeAction">
-            <img :src="require('../../../static/img/qrCode-init.png')"
-                 @click="navigateCode(row)"
-                 class="table-img-qr-code" />
+        <Table
+          :loading="loading"
+          border
+          @on-row-dblclick="showDetail"
+          :columns="columns1"
+          :data="data"
+        >
+          <template slot-scope="{row}" slot="qrCodeAction">
+            <img
+              :src="require('../../../static/img/qrCode-init.png')"
+              @click="navigateCode(row)"
+              class="table-img-qr-code"
+            />
           </template>
-          <template slot="action"
-                    slot-scope="{row}">
+          <template slot="action" slot-scope="{row}">
             <i-col span="12">
-              <Button ghost
-                      class="router-btn"
-                      @click="() => {stop(row)}">终止</Button>
+              <Button
+                ghost
+                :class="row.status > 2 ? 'router-btn disable' : 'router-btn'"
+                @click="() => {stop(row)}"
+              >终止</Button>
             </i-col>
             <i-col span="12">
-              <Button ghost
-                      class="router-btn"
-                      @click="() => {modify(row)}">修改</Button>
+              <Button ghost class="router-btn" @click="() => {modify(row)}">修改</Button>
             </i-col>
           </template>
-
         </Table>
-        <Page :total="totalSize"
-              :current="pageNum"
-              :page-size="pageSize"
-              show-elevator
-              show-total
-              placement="top"
-              @on-change="handlePage"
-              class-name="ks-page"></Page>
+        <Page
+          :total="totalSize"
+          :current="pageNum"
+          :page-size="pageSize"
+          show-elevator
+          show-total
+          placement="top"
+          @on-change="handlePage"
+          class-name="ks-page"
+        ></Page>
       </Row>
     </Form>
-    <useTable ref="useTable"
-              @doShow="doShow"
-              :show="showUse"
-              :isModify="true"
-              :schedule="activityInstance.scheduleVO"></useTable>
-    <Modal v-model="isShowDetail"
-           title="活动计划详情"
-           width="70%"
-           :footer-hide="true">
-      <planDetail v-if="isShowDetail"
-                  :detail="detail"></planDetail>
+    <useTable
+      ref="useTable"
+      @doShow="doShow"
+      :show="showUse"
+      :isModify="true"
+      :schedule="activityInstance.scheduleVO"
+    ></useTable>
+    <Modal v-model="isShowDetail" title="活动计划详情" width="70%" :footer-hide="true">
+      <planDetail v-if="isShowDetail" :detail="detail"></planDetail>
     </Modal>
     <!-- 预览二维码 -->
-    <Modal v-model="isShow"
-           :title="showStoreName"
-           :footer-hide="true"
-           width="230"
-           class-name="vertical-center-modal"
-           @on-ok="ok">
+    <Modal
+      v-model="isShow"
+      :title="showStoreName"
+      :footer-hide="true"
+      width="230"
+      class-name="vertical-center-modal"
+      @on-ok="ok"
+    >
       <div slot="header">
         <p></p>
       </div>
       <p>{{this.showStoreName}}</p>
-      <img :src="qrCodeImage"
-           style="width:200px;height:200px;" />
+      <img :src="qrCodeImage" style="width:200px;height:200px;" />
       <div style="text-align: center;">
-        <Button ghost
-                type="primary"
-                @click="download(rowData)">下载</Button>
+        <Button ghost type="primary" @click="download(rowData)">下载</Button>
       </div>
     </Modal>
   </div>
@@ -143,7 +142,7 @@ export default {
     useTable,
     planDetail
   },
-  data () {
+  data() {
     const _this = this;
     return {
       showStoreName: "",
@@ -162,14 +161,14 @@ export default {
       shopList: [],
       showUse: false,
       activityInstance: {},
-      qrCodeImage: '',
+      qrCodeImage: "",
       formValidate: {
         date: null,
         organizationId: null,
         storeId: null,
         status: 2,
         startDate: null,
-        endDate: null,
+        endDate: null
       },
       startDateOptions: {},
       endDateOptions: {},
@@ -204,7 +203,7 @@ export default {
           width: 60,
           align: "center",
           title: "序号",
-          render (h, params) {
+          render(h, params) {
             let num = parseInt(params.index) + 1;
             console.log(_this.pageSize);
             if (_this.pageSize > 1) {
@@ -220,7 +219,7 @@ export default {
         {
           title: "活动类型",
           key: "scheduleVO.name",
-          render (h, params) {
+          render(h, params) {
             return h("span", params.row["params"][0]["name"]);
           }
         },
@@ -228,54 +227,54 @@ export default {
           title: "活动时间",
           key: "beginTime",
           width: 230,
-          render (h, params) {
+          render(h, params) {
             return h("span", params.row.beginTime + " - " + params.row.endTime);
           }
         },
         {
           title: "零售公司",
           key: "shop",
-          render (h, params) {
+          render(h, params) {
             return h(
               "span",
               params.row.companyName +
-              "等" +
-              (params.row.companyCount || 0) +
-              "家公司"
+                "等" +
+                (params.row.companyCount || 0) +
+                "家公司"
             );
           }
         },
         {
           title: "店铺",
           key: "shop",
-          render (h, params) {
+          render(h, params) {
             return h(
               "span",
               params.row.storeName +
-              "等" +
-              (params.row.storeCount || 0) +
-              "家店铺"
+                "等" +
+                (params.row.storeCount || 0) +
+                "家店铺"
             );
           }
         },
         {
           title: "添加好友数",
           key: "addFriendNum",
-          render (h, params) {
+          render(h, params) {
             return h("span", (params.row.friends || 0) + "人");
           }
         },
         {
           title: "参与活动客户数",
           key: "joinActivityClientNum",
-          render (h, params) {
+          render(h, params) {
             return h("span", (params.row.friends || 0) + "人");
           }
         },
         {
           title: "活动码",
-          slot: 'qrCodeAction',
-          className: 'table-width-80',
+          slot: "qrCodeAction",
+          className: "table-width-80"
           // render (h, p) {
           //   return h(
           //     "Button",
@@ -290,7 +289,7 @@ export default {
         {
           title: "活动状态",
           key: "status",
-          render (h, p) {
+          render(h, p) {
             const status = p.row.status;
             if (status === 1) return h("span", "未开始");
             if (status === 2) return h("span", "进行中");
@@ -300,8 +299,8 @@ export default {
         },
         {
           title: "操作",
-          slot: 'action',
-          width: 200,
+          slot: "action",
+          width: 200
           // render (h, p) {
           //   let r = [
           //     h(
@@ -333,30 +332,30 @@ export default {
       ]
     };
   },
-  mounted () {
+  mounted() {
     this.setMenuName("活动管理", "活动计划");
     this.getCompanyInfo();
     this.getShopInfo();
     this.searchTable();
   },
   methods: {
-    doShow (show) {
+    doShow(show) {
       this.showUse = show;
       this.searchTable();
     },
-    showDetail (detail) {
+    showDetail(detail) {
       let _this = this;
       this.getDetail(detail.id).then(res => {
         _this.detail = res;
         _this.isShowDetail = true;
       });
     },
-    getCompanyInfo () {
+    getCompanyInfo() {
       let that = this;
       let data = {
         userId: JSON.parse(sessionStorage.getItem("loginInfo")).userId
       };
-      ActivityManager.getCompany(data, function (data) {
+      ActivityManager.getCompany(data, function(data) {
         that.companyList = [];
         data.data.results.forEach(element => {
           that.companyList.push({
@@ -366,18 +365,18 @@ export default {
         });
       });
     },
-    selectCompany (value) {
+    selectCompany(value) {
       this.customerId = value;
       this.getShopInfo();
     },
-    getShopInfo () {
+    getShopInfo() {
       let that = this;
       let data = {
         userId: JSON.parse(sessionStorage.getItem("loginInfo")).userId,
         customerIds: this.customerId,
         scheduleId: null
       };
-      ActivityManager.getShop(data, function (data) {
+      ActivityManager.getShop(data, function(data) {
         that.shopList = [];
         data.data.results.forEach(element => {
           that.shopList.push({
@@ -387,11 +386,14 @@ export default {
         });
       });
     },
-    handlePage: function (value) {
+    handlePage: function(value) {
       this.pageNum = value;
       this.searchTable();
     },
-    stop (instance) {
+    stop(instance) {
+      if (instance.status > 2) {
+        return;
+      }
       let _this = this;
       this.$Modal.confirm({
         title: "您确认要终止?",
@@ -410,10 +412,10 @@ export default {
             }
           );
         },
-        onCancel: () => { }
+        onCancel: () => {}
       });
     },
-    getDetail (instanceId) {
+    getDetail(instanceId) {
       return new Promise((resolve, reject) => {
         ActivityManager.instanceDetail(
           {
@@ -425,7 +427,7 @@ export default {
         );
       });
     },
-    modify (instance) {
+    modify(instance) {
       let _this = this;
       this.getDetail(instance.id).then(res => {
         store.commit("SET_useData", res);
@@ -433,13 +435,14 @@ export default {
         _this.showUse = true;
       });
     },
-    navigateCode (instance) {
+    navigateCode(instance) {
+      return;
       this.$router.push({
         path: "/activity/plan/code",
         query: { instanceId: instance.id }
       });
     },
-    searchTable (params = {}) {
+    searchTable(params = {}) {
       this.loading = true;
       if (
         this.formValidate.date !== null &&
@@ -463,7 +466,7 @@ export default {
       if (params.status == 0) {
         params.status = undefined;
       }
-      params.categoryCode = "promotion"
+      params.categoryCode = "promotion";
       params.date = undefined;
       http.get("/activity/instance/list", params).then(res => {
         const data = res.data.results.this || {};
@@ -472,46 +475,53 @@ export default {
         this.loading = false;
       });
     },
-    startDateChange: function (e) {
+    startDateChange: function(e) {
       //设置开始时间
       this.endDateOptions = {
         disabledDate: date => {
-          let startTime = this.formValidate.startDate ? new Date(this.formValidate.startDate).valueOf() : '';
-          return date && (date.valueOf() < startTime)
+          let startTime = this.formValidate.startDate
+            ? new Date(this.formValidate.startDate).valueOf()
+            : "";
+          return date && date.valueOf() < startTime;
         }
-      }
+      };
     },
-    endDateChange: function (e) {
+    endDateChange: function(e) {
       //设置结束时间
-      let endTime = this.formValidate.endDate ? new Date(this.formValidate.endDate).valueOf() - 1 * 24 * 60 * 60 * 1000 : '';
+      let endTime = this.formValidate.endDate
+        ? new Date(this.formValidate.endDate).valueOf() -
+          1 * 24 * 60 * 60 * 1000
+        : "";
       this.startDateOptions = {
         disabledDate: date => {
-          return date && (date.valueOf() > endTime);
+          return date && date.valueOf() > endTime;
         }
-      }
+      };
     },
-    show: function (index) {
+    show: function(index) {
       this.isShow = true;
       this.showStoreName = index.name;
       this.qrCodeImage = index.qrCodeAction;
       this.rowData = index;
     },
-    hide: function () {
+    hide: function() {
       this.isShow = false;
     },
     // 下载二维码
-    download: function (index) {
-      debugger
+    download: function(index) {
+      debugger;
       let fileName = index.name + "-门店码";
-      http.downloadImg({
-        url: index.qrCodeAction
-      }, fileName, function (/*data*/) {
-
-      })
+      http.downloadImg(
+        {
+          url: index.qrCodeAction
+        },
+        fileName,
+        function(/*data*/) {}
+      );
     },
-    ok: function () {
+    ok: function() {
       this.isShow = false;
-    },
+    }
   }
 };
 </script>
@@ -528,6 +538,9 @@ export default {
   color: #3496eb !important;
   margin-left: -15px;
 }
+.router-btn.disable {
+  color: #999 !important;
+}
 .table-img-qr-code {
   margin-left: 5px;
   margin-top: 5px;
diff --git a/src/pages/activity/addActivity.vue b/src/pages/activity/addActivity.vue
index c99ad5e..6487540 100644
--- a/src/pages/activity/addActivity.vue
+++ b/src/pages/activity/addActivity.vue
@@ -1,5 +1,12 @@
 <template>
-  <Modal v-model="dispalyModal" width="1000" :loading="true" :mask-closable="false">
+  <Modal
+    v-model="dispalyModal"
+    width="1000"
+    :loading="true"
+    :mask-closable="false"
+    @on-visible-change="visibleChange"
+    @on-cancel="cancel"
+  >
     <p slot="header" style="color:#f60;text-align:left">
       <span>配置活动</span>
     </p>
@@ -176,6 +183,11 @@ export default {
       this.formValidate.params.splice(index, 1);
       this.$forceUpdate();
     },
+    visibleChange(show) {
+      if (!show) {
+        this.$emit("dispalyAddActivityModal", false, false);
+      }
+    },
     cancel() {
       this.$emit("dispalyAddActivityModal", false, false);
     },
diff --git a/src/pages/activity/useTable.vue b/src/pages/activity/useTable.vue
index 96eb9f7..ea43047 100644
--- a/src/pages/activity/useTable.vue
+++ b/src/pages/activity/useTable.vue
@@ -1,49 +1,46 @@
 <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">
+    <Modal
+      :scrollable="false"
+      v-model="showUse"
+      title="使用活动"
+      @on-cancel="cancel"
+      :loading="true"
+      width="70%"
+      @on-visible-change="visibleChange"
+    >
+      <Steps style="padding: 40px;" :current="currentStep">
         <Step title="基本信息"></Step>
-        <Step :title="isModify ? '修改零售公司' : '选择零售公司'"
-              content></Step>
-        <Step :title="isModify ? '修改店铺' : '选择店铺'"
-              content></Step>
-        <Step title="确认信息"
-              content></Step>
+        <Step :title="isModify ? '修改零售公司' : '选择零售公司'" content></Step>
+        <Step :title="isModify ? '修改店铺' : '选择店铺'" content></Step>
+        <Step title="确认信息" content></Step>
       </Steps>
-      <useActivityStepOne :schedule="schedule"
-                          :isModify="isModify"
-                          v-if="currentStep == 0 && show"></useActivityStepOne>
-      <useActivityStepTwo :schedule="schedule"
-                          :isModify="isModify"
-                          v-if="currentStep == 1"></useActivityStepTwo>
-      <useActivityStepThree :schedule="schedule"
-                            :isModify="isModify"
-                            v-if="currentStep == 2"></useActivityStepThree>
-      <useActivityStepFoure :schedule="schedule"
-                            :isModify="isModify"
-                            v-if="currentStep == 3"></useActivityStepFoure>
+      <useActivityStepOne :schedule="schedule" :isModify="isModify" v-if="currentStep == 0 && show"></useActivityStepOne>
+      <useActivityStepTwo :schedule="schedule" :isModify="isModify" v-if="currentStep == 1"></useActivityStepTwo>
+      <useActivityStepThree :schedule="schedule" :isModify="isModify" v-if="currentStep == 2"></useActivityStepThree>
+      <useActivityStepFoure :schedule="schedule" :isModify="isModify" v-if="currentStep == 3"></useActivityStepFoure>
       <div slot="footer">
-        <Button v-if="currentStep !== 0"
-                type="primary"
-                shape="circle"
-                :loading="modal_loading"
-                @click="back">上一步</Button>
-        <Button v-if="currentStep !== 3"
-                type="primary"
-                shape="circle"
-                :loading="modal_loading"
-                @click="next">下一步</Button>
-        <Button v-if="currentStep == 3"
-                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 !== 3"
+          type="primary"
+          shape="circle"
+          :loading="modal_loading"
+          @click="next"
+        >下一步</Button>
+        <Button
+          v-if="currentStep == 3"
+          type="primary"
+          shape="circle"
+          :loading="modal_loading"
+          @click="finish"
+        >完成</Button>
       </div>
     </Modal>
   </div>
@@ -55,20 +52,21 @@ 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 () {
+  inject: ["setMenuName"],
+  data() {
     return {
       currentStep: 0,
       modal_loading: false,
-      showUse: false,
+      showUse: false
     };
   },
   props: {
@@ -85,26 +83,27 @@ export default {
     }
   },
   watch: {
-    show () {
+    show() {
       this.showUse = this.show;
     },
-    schedule () {
+    schedule() {
       store.getters.useData.scheduleId = this.schedule.id;
-    },
+    }
   },
-  mounted () { },
+  created() {
+    this.setMenuName("活动管理", "活动计划");
+  },
+  mounted() {},
   methods: {
-    cancel () {
-      this.currentStep = 0;
-    },
-    cancel () {
+    visibleChange(show) {},
+    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;
       data.name = this.schedule.name;
       if (this.currentStep === 0) {
@@ -143,19 +142,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;
       let data = store.getters.useData;
       data.isGetActivityInfo = true;
       this.modal_loading = true;
-      ActivityManager.saveActivityData(store.getters.useData, function (data) {
+      ActivityManager.saveActivityData(store.getters.useData, function(data) {
         store.commit("RSET_useData");
         that.$emit("doShow", false);
         that.$router.push("/activity/plan");
@@ -163,8 +162,8 @@ export default {
         that.modal_loading = false;
         that.showUse = false;
       });
-    },
-  },
+    }
+  }
 };
 </script>
 
diff --git a/src/pages/shop/IncreaseWelcomeEdit.vue b/src/pages/shop/IncreaseWelcomeEdit.vue
index b1e80e6..9fde391 100644
--- a/src/pages/shop/IncreaseWelcomeEdit.vue
+++ b/src/pages/shop/IncreaseWelcomeEdit.vue
@@ -85,7 +85,7 @@
     </Row>
     <Modal v-model="showMessageTypes" title="添加图片/网页/小程序消息" :footer-hide="true">
       <Row :gutter="24">
-        <i-col :span="8">
+        <i-col :span="8" v-if="imageFilter()">
           <Upload
             ref="upload"
             :show-upload-list="false"
@@ -105,10 +105,10 @@
           </Upload>
         </i-col>
         <i-col :span="8">
-          <Button long @click="doShowWeb" type="primary">网页</Button>
+          <Button long @click="doShowWeb" v-if="webFilter()" type="primary">网页</Button>
         </i-col>
         <i-col :span="8">
-          <Button long @click="doShowMini" type="primary">小程序</Button>
+          <Button long @click="doShowMini" v-if="miniFilter()" type="primary">小程序</Button>
         </i-col>
       </Row>
     </Modal>
@@ -260,6 +260,21 @@ export default {
     selectStoreStep
   },
   methods: {
+    webFilter() {
+      return (
+        this._.filter(this.welcome.params, item => item.type == 2).length < 1
+      );
+    },
+    imageFilter() {
+      return (
+        this._.filter(this.welcome.params, item => item.type == 1).length < 1
+      );
+    },
+    miniFilter() {
+      return (
+        this._.filter(this.welcome.params, item => item.type == 3).length < 1
+      );
+    },
     doShow() {
       this.showStoreCheck = false;
       this.welcome = store.getters.useData;
@@ -423,6 +438,39 @@ export default {
         _this.loading = false;
         return false;
       }
+      // let params = this.welcome.params;
+      // let imageCount = 0;
+      // let webCount = 0;
+      // let miniCount = 0;
+      // for (const key in params) {
+      //   if (params.hasOwnProperty(key)) {
+      //     const element = params[key];
+      //     if (element.type == 1) {
+      //       imageCount++;
+      //     }
+      //     if (element.type == 2) {
+      //       webCount++;
+      //     }
+      //     if (element.type == 3) {
+      //       miniCount++;
+      //     }
+      //   }
+      // }
+      // if (imageCount > 1) {
+      //   _this.loading = false;
+      //   _this.$Message.error("图片消息只能一个");
+      //   return false;
+      // }
+      // if (webCount > 1) {
+      //   _this.loading = false;
+      //   _this.$Message.error("网页消息只能一个");
+      //   return false;
+      // }
+      // if (miniCount > 1) {
+      //   _this.loading = false;
+      //   _this.$Message.error("小程序消息只能一个");
+      //   return false;
+      // }
       this.$refs["welcomeForm"].validate(valid => {
         if (valid) {
           let data = _this.welcome;