活动池

src/pages/activity/ActivityManager.vue

@@ -12,7 +12,7 @@
 							</div>
 						</div>
 						<div class="operateItem">
-							<div @click="disPlayUseTable(item.id)">使用</div>
+							<div @click="disPlayUseTable(item)">使用</div>
 							<div @click="dispalyAddActivity(item.id)">配置</div>
 						</div>
 					</div>
@@ -37,6 +37,7 @@ import Img from '../../assets/logo.png'
 import useTable from './useTable'
 import addActivity from './addActivity'
 import ActivityManager from "../../services/ActivityManager/ActivityManager"
+import store from "../../store/index"
 export default {
 	name: "ActivityManager",
 	components: {
@@ -49,7 +50,8 @@ export default {
 			useModal: false,
 			addActivityModal: false,
 			activityList: [],
-			id: ''
+			id: '',
+			inputActivityList: []
 		}
 	},
 	mounted() {
@@ -57,16 +59,51 @@ export default {
 		this.getActivityTable()
 	},
 	methods: {
+		getActivityData(id) {
+      let that = this
+      let data = {
+        instanceId: id
+      }
+      ActivityManager.getActivityInfo(data, function (data) {
+        that.inputActivityList = []
+        data.data.results.params.forEach(item => {
+          that.inputActivityList.push({
+            value1: item.name,
+            value2: item.description
+          })
+				})
+				this.useModal = true
+      })
+    },
 		getActivityTable() {
 			let that = this
 			ActivityManager.getActivityList({}, function (data) {
 					that.activityList = data.data.results
 			})
 		},
-		disPlayUseTable(id) {
-			// store.commit('SET_ID', id.toString())
-			// console.log(store.getters.id)
-			this.useModal = true
+		disPlayUseTable(item) {
+			let that = this
+			let data = {
+        id: item.id
+      }
+			// let data = new FormData()
+      // data.append('instanceId', item.id)
+      ActivityManager.getActivityInfo(data, function (data) {
+				that.inputActivityList = []
+        data.data.results.params.forEach(item => {
+          that.inputActivityList.push({
+            value1: item.name,
+            value2: item.description
+          })
+				})
+				let useData = {
+					name: item.name,
+					inputActivityList: that.inputActivityList
+				}
+				store.commit('SET_useData', useData)
+				console.log(store.getters.useData)
+				that.useModal = true
+      })
 		},
 		dispalyAddActivity(id) {
 			this.addActivityModal = true

src/pages/activity/ActivityPlan.vue

@@ -25,11 +25,11 @@
           </i-col>
           <i-col span="7">
             <FormItem label="选择日期" prop="">
-              <Date-picker :value="formValidate.date" type="daterange" placement="bottom-end" placeholder="选择日期区间"></Date-picker>
+              <Date-picker format="yyyy-MM-dd" :value="formValidate.date" type="daterange" placement="bottom-end" placeholder="选择日期区间"></Date-picker>
             </FormItem>
           </i-col>
           <i-col span="1">
-            <Button type="primary" @click="searchTable">查询</Button>
+            <Button type="primary" @click="getActivityTable">查询</Button>
           </i-col>
         </Row>
         <Row style="margin-top:50px">
@@ -48,9 +48,10 @@ export default {
     return {
       companyList: [],
       shopList: [],
-      activityStatus: '进行中',
+      pageNum: 1,
+      pageSize: 10,
       formValidate: {
-        date: '',
+        date: [],
         companyData: '',
         shopData: '',
         activityStatus: '进行中',
@@ -65,13 +66,13 @@ export default {
         value: '全部'
       },{
         label: '进行中',
-        value: '进行中'
+        value: '2'
       },{
         label: '未开始',
-        value: '未开始'
+        value: '1'
       },{
         label: '已结束',
-        value: '已结束'
+        value: '3'
       }],
       columns1: [{
                     type: 'index',
@@ -127,8 +128,24 @@ export default {
     this.setMenuName("活动管理", "活动计划")
     this.getCompanyInfo()
     this.getShopInfo()
+    // this.getActivityTable()
   },
   methods: {
+    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)
+      data.append('pageNum', that.pageNum)
+      data.append('pageSize', that.pageSize)
+      data.append('startDate', that.formValidate.date)
+      data.append('startDate', that.formValidate.date)
+			ActivityManager.getActivityTableData(data, function (data) {
+          debugger
+			})
+    },
     getCompanyInfo() {
       let that = this
       let data = {
@@ -159,8 +176,6 @@ export default {
           });
 			})
     },
-    searchTable() {
-    }
   }
 }
 </script>

src/pages/activity/useActivityStepOne.vue

@@ -2,22 +2,23 @@
   <div>
     <Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="80">
       <Row>
-        <i-col span="15" offset="2">
+        <i-col span="20" offset="2">
           <FormItem label="活动名称" prop="activityName">
             <div>{{formValidate.activityName}}</div>
           </FormItem>
           <div class="dateClass">
             <Form-item label="活动时间" prop="activityStartDate">
-              <Date-picker :value="formValidate.activityStartDate" format="yyyy-MM-dd" placeholder="请选择开始日期" style="width: 200px"></Date-picker>
+              <Date-picker @on-change="storeDate" type="date" :value="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 :value="formValidate.activityEndDate" format="yyyy-MM-dd" placeholder="请选择结束日期" style="width: 200px"></Date-picker>
+              <Date-picker @on-change="storeDate" type="date" :value="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 disabled type="text" v-model="item.tips" placeholder=""></i-input>
+                <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>
               </div>
           </FormItem>
         </i-col>
@@ -26,39 +27,52 @@
   </div>
 </template>
 <script>
+import store from "../../store/index"
 export default {
   name: "useActivityStepOne",
   data() {
 		return {
       formValidate: {
-        activityName: '红吧',
+        activityName: '',
         activityStartDate: '',
         activityEndDate: '',
-        activityStyle: [{
-          tips: '11',
-        },{
-          tips: '11',
-        }],
+        activityStyle: [],
       },
+      flag: store.getters.useModal,
       ruleValidate: {
         activityName: [
           { required: true, message: '活动名称不能为空', trigger: 'blur' }
         ],
         activityStartDate: [
-          { required: true, message: '开始时间不能为空', trigger: 'blur' }
+          { required: true, type: 'date', message: '开始时间不能为空', trigger: 'change' }
         ],
         activityEndDate: [
-          { required: true, message: '结束时间不能为空', trigger: 'blur' }
+          { 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: {
+    storeDate() {
+      store.getters.useData.activityStartDate = this.formValidate.activityStartDate
+      store.getters.useData.activityEndDate = this.formValidate.activityEndDate
+    }
   }
 }
 </script>
@@ -66,10 +80,12 @@ export default {
 <style  scoped>
 .dateClass {
   display: flex;
-  justify-content: space-around;
 }
 .text {
     position: relative;
     left: 100px;
 }
+.inputClass{
+  width: 1000px;
+}
 </style>

src/pages/activity/useTable.vue

@@ -6,7 +6,7 @@
       <Step title="选择店铺" content=""></Step>
       <Step title="确认信息" content=""></Step>
     </Steps>
-    <useActivityStepOne v-if="currentStep==0"></useActivityStepOne>
+    <useActivityStepOne :displayUseModal="displayUseModal" v-if="currentStep==0"></useActivityStepOne>
     <useActivityStepTwo v-if="currentStep==1"></useActivityStepTwo>
     <useActivityStepThree v-if="currentStep==2"></useActivityStepThree>
     <useActivityStepFoure v-if="currentStep==3"></useActivityStepFoure>

src/services/ActivityManager/ActivityManager.js

@@ -51,11 +51,19 @@ export function getShop(params, call) {
   return http.post('poi/store/user/shop',params).then(call)
 }
 
+/**
+ * 活动实例分页列表
+ */
+export function getActivityTableData(params, call) {
+  return http.get('activity/instance/list',params).then(call)
+}
+
 export default {
   getActivityList,
   addOreditActivity,
   getActivityInfo,
   uploadImg,
   getCompany,
-  getShop
+  getShop,
+  getActivityTableData
 }

src/store/modules/activity.js

@@ -1,17 +1,24 @@
 import * as types from './mutation-type'
 const activity = {
   state: {
-    id: ''
+    useData: {},
+    useModal: false
   },
   mutations: {
-    [types.SET_ID](state, id) {
-      state.id = id
+    [types.SET_useData](state, useData) {
+      state.useData = useData
+    },
+    [types.SET_useModal](state, useModal) {
+      state.useModal = useModal
     }
   },
   actions: {},
   getters: {
-    id: state => {
-      return state.id
+    useData: state => {
+      return state.useData
+    },
+    useModal: state => {
+      return state.useModal
     }
   }
 

src/store/modules/mutation-type.js

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