From f738732de140953d003303cae574f02c2952e094 Mon Sep 17 00:00:00 2001
From: root <zxsoft>
Date: Fri, 22 May 2020 21:02:03 +0800
Subject: [PATCH] up

---
 src/pages/activity/ActivityManager.vue      |   4 +-
 src/pages/activity/ActivityPlan.vue         |   5 +
 src/pages/activity/useActivityStepOne.vue   | 127 ++++++++++----------
 src/pages/activity/useActivityStepThree.vue |   1 +
 src/pages/activity/useActivityStepTwo.vue   |   1 +
 src/pages/activity/useTable.vue             |  28 ++++-
 src/store/modules/activity.js               |   4 +-
 7 files changed, 104 insertions(+), 66 deletions(-)

diff --git a/src/pages/activity/ActivityManager.vue b/src/pages/activity/ActivityManager.vue
index 39e41a6..beec632 100644
--- a/src/pages/activity/ActivityManager.vue
+++ b/src/pages/activity/ActivityManager.vue
@@ -5,7 +5,7 @@
         <Card>
           <div class="operateAndThemeItem">
             <div class="ThemeItem">
-              <img class="img" :src="item.img">
+              <img class="img" :src="'/kiisoo-ic' + item.logo">
               <div class="tipItem">
                 <span>{{item.name}}</span>
                 <span>{{item.description}}</span>
@@ -33,7 +33,6 @@
 </template>
 
 <script>
-  import Img from '../../assets/logo.png'
   import useTable from './useTable'
   import addActivity from './addActivity'
   import ActivityManager from "../../services/ActivityManager/ActivityManager"
@@ -168,6 +167,7 @@
     border: 1px dashed;
     text-align: center;
     line-height: 300px;
+    cursor: pointer;
   }
 </style>
 
diff --git a/src/pages/activity/ActivityPlan.vue b/src/pages/activity/ActivityPlan.vue
index b73ff9a..28b00a7 100644
--- a/src/pages/activity/ActivityPlan.vue
+++ b/src/pages/activity/ActivityPlan.vue
@@ -44,16 +44,21 @@
                       placement="top" @on-change="handlePage" class-name="ks-page"></Page>
             </Row>
         </Form>
+<!--      <useTable @dispalyuseModal="dispalyuseModal" :useModal="useModal" :id="id"></useTable>-->
     </div>
 </template>
 
 <script>
     import ActivityManager from "../../services/ActivityManager/ActivityManager";
+    import useTable from './useTable'
     import http from '../../services/CommonHttp'
 
     export default {
         name: "ActivityPlan",
         inject: ['setMenuName'],
+        components: {
+            useTable,
+        },
         data() {
             return {
                 totalSize: 0,
diff --git a/src/pages/activity/useActivityStepOne.vue b/src/pages/activity/useActivityStepOne.vue
index 7d0bafc..d943f40 100644
--- a/src/pages/activity/useActivityStepOne.vue
+++ b/src/pages/activity/useActivityStepOne.vue
@@ -16,10 +16,10 @@
             </Form-item>
           </div>
           <FormItem label="活动类型" prop="activityStyle">
-              <div v-for="(item, index) in formValidate.activityStyle" :key="index">
-                <i-input class="inputClass" disabled type="text" v-model="item.name" placeholder=""></i-input>
-                <i-input class="inputClass" style="margin-left: 20px" disabled type="text" v-model="item.defaultVal" placeholder=""></i-input>
-              </div>
+            <div v-for="(item, index) in formValidate.activityStyle" :key="index">
+              <i-input class="inputClass" disabled type="text" v-model="item.name" placeholder=""></i-input>
+              <i-input class="inputClass" style="margin-left: 20px" disabled type="text" v-model="item.defaultVal" placeholder=""></i-input>
+            </div>
           </FormItem>
         </i-col>
       </Row>
@@ -27,67 +27,70 @@
   </div>
 </template>
 <script>
-import store from "../../store/index"
-export default {
-  name: "useActivityStepOne",
-  data() {
-		return {
-      formValidate: {
-        activityName: '',
-        activityStartDate: '',
-        activityEndDate: '',
-        activityStyle: [],
-      },
-      flag: store.getters.useModal,
-      ruleValidate: {
-        activityName: [
-          { required: true, message: '活动名称不能为空', trigger: 'blur' }
-        ],
-        activityStartDate: [
-          { required: true, type: 'date', message: '开始时间不能为空', trigger: 'change' }
-        ],
-        activityEndDate: [
-          { required: true, type: 'date', message: '结束时间不能为空', trigger: 'change' }
-        ],
-        activityStyle: [
-          { required: true, message: '', trigger: 'blur' }
-        ],
-      }
-		}
-  },
-  props: {
-    displayUseModal: Boolean
-  },
-  watch: {
-    displayUseModal() {
-      this.formValidate.activityName = store.getters.useData.name
-      this.formValidate.activityStyle = store.getters.useData.inputActivityList
-    },
-  },
-	mounted() {
-    this.formValidate.activityName = store.getters.useData.name
-    this.formValidate.activityStyle = store.getters.useData.inputActivityList
-  },
-  methods: {
-    storeStartDate(date) {
-      store.getters.useData.activityStartDate = date
-    },
-    storeEndDate(date) {
-      store.getters.useData.activityEndDate = date
+    import store from "../../store/index"
+
+    export default {
+        name: "useActivityStepOne",
+        data() {
+            return {
+                formValidate: {
+                    activityName: '',
+                    activityStartDate: '',
+                    activityEndDate: '',
+                    activityStyle: [],
+                },
+                flag: store.getters.useModal,
+                ruleValidate: {
+                    activityName: [
+                        {required: true, message: '活动名称不能为空', trigger: 'blur'}
+                    ],
+                    activityStartDate: [
+                        {required: true, type: 'date', message: '开始时间不能为空', trigger: 'change'}
+                    ],
+                    activityEndDate: [
+                        {required: true, type: 'date', message: '结束时间不能为空', trigger: 'change'}
+                    ],
+                    activityStyle: [
+                        {required: true, message: '', trigger: 'blur'}
+                    ],
+                }
+            }
+        },
+        props: {
+            displayUseModal: Boolean
+        },
+        watch: {
+            displayUseModal() {
+                this.formValidate.activityName = store.getters.useData.name
+                this.formValidate.activityStyle = store.getters.useData.inputActivityList
+            },
+        },
+        mounted() {
+            this.formValidate.activityName = store.getters.useData.name
+            this.formValidate.activityStyle = store.getters.useData.inputActivityList
+        },
+        methods: {
+            storeStartDate(date) {
+                store.getters.useData.activityStartDate = date
+            },
+            storeEndDate(date) {
+                store.getters.useData.activityEndDate = date
+            }
+        }
     }
-  }
-}
 </script>
 
-<style  scoped>
-.dateClass {
-  display: flex;
-}
-.text {
+<style scoped>
+  .dateClass {
+    display: flex;
+  }
+
+  .text {
     position: relative;
     left: 100px;
-}
-.inputClass{
-  width: 1000px;
-}
+  }
+
+  .inputClass {
+    width: 1000px;
+  }
 </style>
\ No newline at end of file
diff --git a/src/pages/activity/useActivityStepThree.vue b/src/pages/activity/useActivityStepThree.vue
index e29c3d7..fc15933 100644
--- a/src/pages/activity/useActivityStepThree.vue
+++ b/src/pages/activity/useActivityStepThree.vue
@@ -118,6 +118,7 @@ export default {
   color: #657180!important;
   background: #fff;
   padding: 0 12px;
+  cursor: pointer;
 }
 .tagColorClass {
   background: #6ac1d1;
diff --git a/src/pages/activity/useActivityStepTwo.vue b/src/pages/activity/useActivityStepTwo.vue
index 6c1488c..820132a 100644
--- a/src/pages/activity/useActivityStepTwo.vue
+++ b/src/pages/activity/useActivityStepTwo.vue
@@ -118,6 +118,7 @@ export default {
   color: #657180!important;
   background: #fff;
   padding: 0 12px;
+  cursor: pointer;
 }
 .tagColorClass {
   background: #6ac1d1;
diff --git a/src/pages/activity/useTable.vue b/src/pages/activity/useTable.vue
index 5026017..9e7ca0c 100644
--- a/src/pages/activity/useTable.vue
+++ b/src/pages/activity/useTable.vue
@@ -46,7 +46,6 @@ export default {
   watch: {
     useModal(val) {
       this.displayUseModal = val
-      this.id = this.id
     }
   },
 	mounted() {
@@ -58,6 +57,33 @@ export default {
       this.currentStep = 0
     },
     next() {
+        const data = store.getters.useData;
+        if (this.currentStep === 0) {
+            if (!data.activityStartDate) {
+                this.$Message.error('请填写活动开始时间');
+                return;
+            }
+            if (!data.activityEndDate) {
+                this.$Message.error('请填写活动结束时间');
+                return;
+            }
+            if (data.activityStartDate > data.activityEndDate) {
+                this.$Message.error('开始时间不能晚于结束时间');
+                return;
+            }
+        }
+        if (this.currentStep === 1) {
+            if (!data.selectCompanyValue || data.selectCompanyValue.length === 0) {
+                this.$Message.error('请至少选择1家公司');
+                return;
+            }
+        }
+        if (this.currentStep === 2) {
+            if (!data.selectShopValue || data.selectShopValue.length === 0) {
+                this.$Message.error('请至少选择1家店铺');
+                return;
+            }
+        }
       this.currentStep = this.currentStep + 1
     },
     back() {
diff --git a/src/store/modules/activity.js b/src/store/modules/activity.js
index a68db3a..a143180 100644
--- a/src/store/modules/activity.js
+++ b/src/store/modules/activity.js
@@ -3,7 +3,9 @@ const activity = {
   state: {
     useData: {},
     useModal: false,
-    id: ''
+    id: '',
+    store: [],
+    company: [],
   },
   mutations: {
     [types.SET_useData](state, useData) {