diff --git a/src/api/sylive/groups-order/index.js b/src/api/sylive/groups-order/index.js new file mode 100644 index 0000000..2feac7a --- /dev/null +++ b/src/api/sylive/groups-order/index.js @@ -0,0 +1,29 @@ +import request from '@/utils/request'; + +/** + * 查询订单列表 + * @param params 查询条件 + */ +export async function listGroupsOrder(params) { + const res = await request.get('/sylive/groupsOrder/', { + params + }); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 导出订单 + * @param params 查询条件 + */ +export async function exportGroupsOrder(params) { + const res = await request.get('/sylive/groupsOrder/export', { + params + }); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/sylive/order/index.js b/src/api/sylive/order/index.js index 1a9bb37..e92bd8e 100644 --- a/src/api/sylive/order/index.js +++ b/src/api/sylive/order/index.js @@ -1,19 +1,5 @@ import request from '@/utils/request'; -/** - * 分页查询订单 - * @param params 查询条件 - */ -export async function pageOrder(params) { - const res = await request.get('/sylive/order/page', { - params - }); - if (res.data.code === 0) { - return res.data.data; - } - return Promise.reject(new Error(res.data.message)); -} - /** * 查询订单列表 * @param params 查询条件 @@ -28,18 +14,6 @@ export async function listOrder(params) { return Promise.reject(new Error(res.data.message)); } -/** - * 根据id查询订单 - * @param id 订单id - */ -export async function getOrder(id) { - const res = await request.get('/sylive/order/' + id); - if (res.data.code === 0) { - return res.data.data; - } - return Promise.reject(new Error(res.data.message)); -} - /** * 导出订单 * @param params 查询条件 diff --git a/src/api/sylive/user/index.js b/src/api/sylive/user/index.js index 597ff4f..911d310 100644 --- a/src/api/sylive/user/index.js +++ b/src/api/sylive/user/index.js @@ -139,11 +139,11 @@ export async function importUsers(file) { * 检查用户是否存在 * @param field 检查的字段 * @param value 字段的值 - * @param id 修改时的id + * @param organizationId 机构id */ -export async function checkExistence(field, value, id) { +export async function checkExistence(field, value, organizationId) { const res = await request.get('/sylive/user/existence', { - params: { field, value, id } + params: { field, value, organizationId } }); if (res.data.code === 0) { return res.data.message; diff --git a/src/views/sylive/activity/index.vue b/src/views/sylive/activity/index.vue index 03c844f..174b3b2 100644 --- a/src/views/sylive/activity/index.vue +++ b/src/views/sylive/activity/index.vue @@ -43,7 +43,19 @@