From 70244c75aaec7017e308ed3b894815c52021c14d Mon Sep 17 00:00:00 2001 From: yuankai <1250898904@qq.com> Date: Fri, 22 May 2020 00:22:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=B1=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/activity/ActivityManager.vue | 49 ++++++++++++++++--- src/pages/activity/ActivityPlan.vue | 33 +++++++++---- src/pages/activity/useActivityStepOne.vue | 42 +++++++++++----- src/pages/activity/useTable.vue | 2 +- .../ActivityManager/ActivityManager.js | 10 +++- src/store/modules/activity.js | 17 +++++-- src/store/modules/mutation-type.js | 3 +- 7 files changed, 120 insertions(+), 36 deletions(-) diff --git a/src/pages/activity/ActivityManager.vue b/src/pages/activity/ActivityManager.vue index 0ae8a64..b8fdebd 100644 --- a/src/pages/activity/ActivityManager.vue +++ b/src/pages/activity/ActivityManager.vue @@ -12,7 +12,7 @@
-
使用
+
使用
配置
@@ -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 diff --git a/src/pages/activity/ActivityPlan.vue b/src/pages/activity/ActivityPlan.vue index 5c5c671..c9e61bd 100644 --- a/src/pages/activity/ActivityPlan.vue +++ b/src/pages/activity/ActivityPlan.vue @@ -25,11 +25,11 @@ - + - + @@ -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() { - } } } diff --git a/src/pages/activity/useActivityStepOne.vue b/src/pages/activity/useActivityStepOne.vue index 1d1ba53..8253f3a 100644 --- a/src/pages/activity/useActivityStepOne.vue +++ b/src/pages/activity/useActivityStepOne.vue @@ -2,22 +2,23 @@
- +
{{formValidate.activityName}}
- +
至
- +
- + +
@@ -26,39 +27,52 @@
@@ -66,10 +80,12 @@ export default { \ No newline at end of file diff --git a/src/pages/activity/useTable.vue b/src/pages/activity/useTable.vue index b92558a..e3f5631 100644 --- a/src/pages/activity/useTable.vue +++ b/src/pages/activity/useTable.vue @@ -6,7 +6,7 @@ - + diff --git a/src/services/ActivityManager/ActivityManager.js b/src/services/ActivityManager/ActivityManager.js index 5334133..276695f 100644 --- a/src/services/ActivityManager/ActivityManager.js +++ b/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 } diff --git a/src/store/modules/activity.js b/src/store/modules/activity.js index 5c445bc..61f6f30 100644 --- a/src/store/modules/activity.js +++ b/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 } } diff --git a/src/store/modules/mutation-type.js b/src/store/modules/mutation-type.js index edd921c..1db5eb5 100755 --- a/src/store/modules/mutation-type.js +++ b/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'