diff --git a/src/api/sylive/activity/index.js b/src/api/sylive/activity/index.js index 0c28f25..891d255 100644 --- a/src/api/sylive/activity/index.js +++ b/src/api/sylive/activity/index.js @@ -14,6 +14,32 @@ export async function pageActivity(params) { return Promise.reject(new Error(res.data.message)); } +/** + * 分页查询活动订单 + * @param params 查询条件 + */ +export async function pageOrder(params) { + const res = await request.get('/sylive/activity/order', { + params + }); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询活动 + * @param id 活动id + */ +export async function getActivity(id) { + const res = await request.get('/sylive/activity/' + id); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + /** * 查询活动列表 * @param params 查询条件 diff --git a/src/layout/components/header-tools.vue b/src/layout/components/header-tools.vue index 0cef07e..e4ea044 100644 --- a/src/layout/components/header-tools.vue +++ b/src/layout/components/header-tools.vue @@ -13,10 +13,6 @@
- -
- -
@@ -56,14 +52,13 @@ diff --git a/src/views/sylive/activity/order/index.vue b/src/views/sylive/activity/order/index.vue new file mode 100644 index 0000000..a4f0be1 --- /dev/null +++ b/src/views/sylive/activity/order/index.vue @@ -0,0 +1,148 @@ + + + diff --git a/src/views/sylive/activity/statistics/index.vue b/src/views/sylive/activity/statistics/index.vue index d032b22..263b143 100644 --- a/src/views/sylive/activity/statistics/index.vue +++ b/src/views/sylive/activity/statistics/index.vue @@ -201,56 +201,6 @@ name: 'SyliveActivityStatistics', data() { return { - projectList: [ - { - id: 1, - projectName: '项目0000001', - status: 0, - startDate: '2020-03-01', - endDate: '2020-06-01', - progress: 30 - }, - { - id: 2, - projectName: '项目0000002', - status: 0, - startDate: '2020-03-01', - endDate: '2020-08-01', - progress: 10 - }, - { - id: 3, - projectName: '项目0000003', - status: 1, - startDate: '2020-01-01', - endDate: '2020-05-01', - progress: 60 - }, - { - id: 4, - projectName: '项目0000004', - status: 1, - startDate: '2020-06-01', - endDate: '2020-10-01', - progress: 0 - }, - { - id: 5, - projectName: '项目0000005', - status: 2, - startDate: '2020-01-01', - endDate: '2020-03-01', - progress: 100 - }, - { - id: 6, - projectName: '项目0000006', - status: 3, - startDate: '2020-01-01', - endDate: '2020-03-01', - progress: 100 - } - ], statistics: { activityId: null, activityData: [], diff --git a/src/views/sylive/order/components/order-search.vue b/src/views/sylive/order/components/order-search.vue index 2f46cfa..e436fb9 100644 --- a/src/views/sylive/order/components/order-search.vue +++ b/src/views/sylive/order/components/order-search.vue @@ -7,6 +7,11 @@ @submit.native.prevent > + + + + + @@ -22,6 +27,19 @@ + + + + + + + +
- -
- -
-
标签
-
@@ -115,66 +85,6 @@ - - -