活动池

src/pages/activity/ActivityManager.vue

@@ -27,7 +27,7 @@
 			</div>
 		</i-col>
 		</Row>
-		<useTable @dispalyuseModal="dispalyuseModal" :useModal="useModal"></useTable>
+		<useTable @dispalyuseModal="dispalyuseModal" :useModal="useModal" :id="id"></useTable>
 		<addActivity @dispalyAddActivityModal="dispalyAddActivityModal" :addActivityModal="addActivityModal" :id="id"></addActivity>
 	</div>
 </template>
@@ -91,16 +91,14 @@ export default {
       ActivityManager.getActivityInfo(data, function (data) {
 				that.inputActivityList = []
         data.data.results.params.forEach(item => {
-          that.inputActivityList.push({
-            value1: item.name,
-            value2: item.description
-          })
+          that.inputActivityList.push(item)
 				})
 				let useData = {
-					name: item.name,
+					name: data.data.results.name,
 					inputActivityList: that.inputActivityList
 				}
 				store.commit('SET_useData', useData)
+				store.commit('SET_ID', item.id)
 				console.log(store.getters.useData)
 				that.useModal = true
       })

src/pages/activity/ActivityPlan.vue

@@ -134,7 +134,6 @@ export default {
     getActivityTable() {
       let that = this
       console.log(that.formValidate.date)
-      debugger
       let data = new FormData()
       data.append('endDate', that.formValidate.date)
       data.append('organizationId', that.formValidate.companyData)
@@ -143,7 +142,6 @@ export default {
       data.append('startDate', that.formValidate.date)
       data.append('startDate', that.formValidate.date)
 			ActivityManager.getActivityTableData(data, function (data) {
-          debugger
 			})
     },
     getCompanyInfo() {

src/pages/activity/addActivity.vue

@@ -158,7 +158,6 @@ export default {
       })
     },
     uploadImgSuccess(res, file) {
-      debugger
         this.imageName = file.name
     },
     handleBeforeUpload(res, file) {

src/pages/activity/useActivityStepFoure.vue

@@ -10,7 +10,10 @@
             <div>{{formValidate.activityDate}}</div>
           </Form-item>
           <FormItem label="活动类型" prop="activityStyle">
-            <div>{{formValidate.activityStyle}}</div>
+            <div style="display:flex" 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.description" placeholder=""></i-input>
+            </div>
           </FormItem>
           <FormItem label="活动范围" prop="activityRange">
             <div>
@@ -30,35 +33,18 @@
   </div>
 </template>
 <script>
+import store from "../../store/index"
 export default {
   name: "useActivityStepFoure",
   data() {
 		return {
       formValidate: {
-        activityName: '红包活动',
-        activityDate: "2020/05/20-2020/0522",
-        activityStyle: '5元红包',
+        activityName: '',
+        activityDate: "",
+        activityStyle: [],
         activityRange: '上海分公司',
         activityCompanyNum: '35',
-        activityShop: [{
-          name: '店铺1'
-        },{
-          name: '店铺1'
-        },{
-          name: '店铺1'
-        },{
-          name: '店铺1'
-        },{
-          name: '店铺1'
-        },{
-          name: '店铺1'
-        },{
-          name: '店铺1'
-        },{
-          name: '店铺1'
-        },{
-          name: '店铺1'
-        }]
+        activityShop: []
       },
       operate: '收起',
       displayActivityShopFlag: false
@@ -66,6 +52,9 @@ export default {
 		}
   },
 	mounted() {
+    this.formValidate.activityName = store.getters.useData.name
+    this.formValidate.activityDate = store.getters.useData.activityStartDate + '-' + store.getters.useData.activityEndDate
+    this.formValidate.activityStyle = store.getters.useData.inputActivityList
   },
   methods: {
     isDisplay() {
@@ -95,4 +84,7 @@ export default {
   width: 360px;
   text-align: center;
 }
+.inputClass{
+  width: 1000px;
+}
 </style>

src/pages/activity/useActivityStepOne.vue

@@ -8,17 +8,17 @@
           </FormItem>
           <div class="dateClass">
             <Form-item label="活动时间" prop="activityStartDate">
-              <Date-picker @on-change="storeDate" type="date" :value="formValidate.activityStartDate" format="yyyy-MM-dd" placeholder="请选择开始日期" style="width: 200px"></Date-picker>
+              <Date-picker @on-change="storeStartDate" type="date" v-model="formValidate.activityStartDate" format="yyyy-MM-dd" placeholder="请选择开始日期" style="width: 200px"></Date-picker>
             </Form-item>
             <div class="text">至</div>
             <Form-item label="" prop="activityEndDate">
-              <Date-picker @on-change="storeDate" type="date" :value="formValidate.activityEndDate" format="yyyy-MM-dd" placeholder="请选择结束日期" style="width: 200px"></Date-picker>
+              <Date-picker @on-change="storeEndDate" type="date" v-model="formValidate.activityEndDate" format="yyyy-MM-dd" placeholder="请选择结束日期" style="width: 200px"></Date-picker>
             </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.value1" placeholder=""></i-input>
-                <i-input class="inputClass" style="margin-left: 20px" disabled type="text" v-model="item.value2" placeholder=""></i-input>
+                <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.description" placeholder=""></i-input>
               </div>
           </FormItem>
         </i-col>
@@ -69,9 +69,11 @@ export default {
     this.formValidate.activityStyle = store.getters.useData.inputActivityList
   },
   methods: {
-    storeDate() {
-      store.getters.useData.activityStartDate = this.formValidate.activityStartDate
-      store.getters.useData.activityEndDate = this.formValidate.activityEndDate
+    storeStartDate(date) {
+      store.getters.useData.activityStartDate = date
+    },
+    storeEndDate(date) {
+      store.getters.useData.activityEndDate = date
     }
   }
 }

src/pages/activity/useActivityStepThree.vue

@@ -13,6 +13,7 @@
 </template>
 <script>
 import ActivityManager from "../../services/ActivityManager/ActivityManager"
+import store from "../../store/index"
 export default {
   name: "useActivityStepThree",
   data() {
@@ -20,7 +21,8 @@ export default {
       allSelect: false,
       shopList: [],
       isSelect:[],
-      selectValue: []
+      selectValue: [],
+      shopListData: []
 		}
   },
 	mounted() {
@@ -34,6 +36,7 @@ export default {
       }
 			ActivityManager.getShop(data, function (data) {
           that.shopList = []
+          that.shopListData = data.data.results
           data.data.results.forEach(element => {
             that.isSelect.push('')
             that.selectValue.push('')
@@ -64,10 +67,25 @@ export default {
     selectTag(value,index) {
       this.isSelect.splice(index,1,!this.isSelect[index])
       if(this.isSelect[index] === true) {
-        this.selectValue.splice(index, 1, value.id)
+        this.selectValue.splice(index, 1, value.value)
       } else if(this.isSelect[index] === false) {
         this.selectValue.splice(index, 1, '')
       }
+      let selectShopValue = []
+      this.isSelect.forEach((element,index) => {
+        if(element === true) {
+          selectShopValue.push(this.selectValue[index])
+        }
+      })
+      let selectShopValueObject = []
+      for(let j=0; j< selectShopValue.length; j++) {
+        for(let i = 0; i< this.shopList.length; i++){
+          if(this.shopList[i].value === selectShopValue[j]) {
+            selectShopValueObject.push(this.shopListData[i])
+          }
+        }
+      }
+      store.getters.useData.selectShopValue = selectShopValueObject
     }
   }
 }

src/pages/activity/useActivityStepTwo.vue

@@ -13,6 +13,7 @@
 </template>
 <script>
 import ActivityManager from "../../services/ActivityManager/ActivityManager"
+import store from "../../store/index"
 export default {
   name: "useActivityStepTwo",
   data() {
@@ -20,7 +21,8 @@ export default {
       allSelect: false,
       companyList: [],
       isSelect:[],
-      selectValue: []
+      selectValue: [],
+      companyListdata:[]
 		}
   },
 	mounted() {
@@ -34,6 +36,7 @@ export default {
       }
 			ActivityManager.getCompany(data, function (data) {
           that.companyList = []
+          that.companyListdata = data.data.results
           data.data.results.forEach(element => {
             that.isSelect.push('')
             that.selectValue.push('')
@@ -64,10 +67,25 @@ export default {
     selectTag(value, index) {
       this.isSelect.splice(index,1,!this.isSelect[index])
       if(this.isSelect[index] === true) {
-        this.selectValue.splice(index, 1, value.id)
+        this.selectValue.splice(index, 1, value.value)
       } else if(this.isSelect[index] === false) {
         this.selectValue.splice(index, 1, '')
       }
+      let selectCompanyValue = []
+      this.isSelect.forEach((element,index) => {
+        if(element === true) {
+          selectCompanyValue.push(this.selectValue[index])
+        }
+      })
+      let selectCompanyValueObject = []
+      for(let j=0; j< selectCompanyValue.length; j++) {
+        for(let i = 0; i< this.companyList.length; i++){
+          if(this.companyList[i].value === selectCompanyValue[j]) {
+            selectCompanyValueObject.push(this.companyListdata[i])
+          }
+        }
+      }
+      store.getters.useData.selectCompanyValue = selectCompanyValueObject
     }
   }
 }

src/pages/activity/useTable.vue

@@ -22,6 +22,8 @@ import useActivityStepOne from './useActivityStepOne'
 import useActivityStepTwo from './useActivityStepTwo'
 import useActivityStepThree from './useActivityStepThree'
 import useActivityStepFoure from './useActivityStepFoure'
+import ActivityManager from "../../services/ActivityManager/ActivityManager"
+import store from "../../store/index"
 export default {
   name: "useTable",
   components: {
@@ -38,11 +40,13 @@ export default {
 		}
   },
   props: {
-    useModal: Boolean
+    useModal: Boolean,
+    id: String
   },
   watch: {
     useModal(val) {
       this.displayUseModal = val
+      this.id = this.id
     }
   },
 	mounted() {
@@ -60,7 +64,25 @@ export default {
       this.currentStep = this.currentStep - 1
     },
     finish() {
-      this.currentStep = 0
+      let that = this
+      console.log(store.getters.useData)
+
+      let data = {
+        beginTime: store.getters.useData.activityStartDate,
+        endTime: store.getters.useData.activityEndDate,
+        name: store.getters.useData.name,
+        organizations: store.getters.useData.selectCompanyValue,
+        params: store.getters.useData.inputActivityList,
+        stores: store.getters.useData.selectShopValue,
+        id: store.getters.id,
+        scheduleId: '123',
+        isGetActivityInfo: true
+      }
+      ActivityManager.saveActivityData(data, function (data) {
+        that.$emit("dispalyuseModal", false, false)
+        that.$router.push('/activity/plan');
+        that.currentStep = 0
+      })
     }
   }
 }

src/pages/shop/IncreaseStoreManager.vue

@@ -375,7 +375,6 @@
                         that.data1 = datas.list;
                     }
                 }, function (error) {
-                    debugger
                     that.loading = false;
                 });
             },

src/pages/user/AccountManager.vue

@@ -82,7 +82,6 @@
                         title: "序号",
                         align: 'center',
                         render: (h, params) => {
-                            debugger
                             return h('span', params.index + (this.pageNum- 1) * this.pageSize + 1);
                         }
                     },

src/services/ActivityManager/ActivityManager.js

@@ -51,6 +51,13 @@ export function getShop(params, call) {
   return http.post('poi/store/user/shop',params).then(call)
 }
 
+/**
+ * 根据活动池新建/编辑实例
+ */
+export function saveActivityData(params, call) {
+  return http.post('activity/instance/save',params).then(call)
+}
+
 /**
  * 活动实例分页列表
  */
@@ -65,5 +72,6 @@ export default {
   uploadImg,
   getCompany,
   getShop,
-  getActivityTableData
+  getActivityTableData,
+  saveActivityData
 }

src/store/modules/activity.js

@@ -2,7 +2,8 @@ import * as types from './mutation-type'
 const activity = {
   state: {
     useData: {},
-    useModal: false
+    useModal: false,
+    id: ''
   },
   mutations: {
     [types.SET_useData](state, useData) {
@@ -10,6 +11,9 @@ const activity = {
     },
     [types.SET_useModal](state, useModal) {
       state.useModal = useModal
+    },
+    [types.SET_ID](state, id) {
+      state.id = id
     }
   },
   actions: {},
@@ -19,6 +23,9 @@ const activity = {
     },
     useModal: state => {
       return state.useModal
+    },
+    id: state => {
+      return state.id
     }
   }
 

src/store/modules/mutation-type.js

@@ -1,3 +1,4 @@
 export const SET_NUM = 'SET_NUM'
+export const SET_ID = 'SET_ID'
 export const SET_useData = 'SET_useData'
 export const SET_useModal = 'SET_useModal'