From eb68274d450f2634d3a58f452f1e8122c6a50100 Mon Sep 17 00:00:00 2001 From: dengbw Date: Mon, 15 May 2023 17:44:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/institution/organization/index.js | 8 +++++--- src/api/sylive/goods/index.js | 12 ++++-------- src/api/sylive/groups-statistics/index.js | 4 +++- src/api/sylive/groups-user/index.js | 16 +++++++--------- src/api/sylive/groups/index.js | 4 +++- src/config/setting.js | 1 + src/views/sylive/goods/components/goods-edit.vue | 4 ++-- src/views/sylive/goods/index.vue | 4 ++-- 8 files changed, 27 insertions(+), 26 deletions(-) diff --git a/src/api/institution/organization/index.js b/src/api/institution/organization/index.js index 33a124f..1ad2a28 100644 --- a/src/api/institution/organization/index.js +++ b/src/api/institution/organization/index.js @@ -90,10 +90,12 @@ export async function removeOrganizations(ids) { /** * 机构详情 - * @param id 机构id + * @param organizationId 机构id */ -export async function infoOrganization(id) { - const res = await request.get('/institution/organization/info/' + id); +export async function infoOrganization(organizationId) { + const res = await request.get('/institution/organization/info', { + params: { organizationId } + }); if (res.data.code === 0) { return res.data.data; } diff --git a/src/api/sylive/goods/index.js b/src/api/sylive/goods/index.js index b1da670..9f01f5a 100644 --- a/src/api/sylive/goods/index.js +++ b/src/api/sylive/goods/index.js @@ -85,20 +85,16 @@ export async function updateGoodsStatus(itemId, status) { * @param id 商品id */ export async function removeGoods(id) { - const res = await request.delete('/sylive/goods/' + id); - if (res.data.code === 0) { - return res.data.message; - } - return Promise.reject(new Error(res.data.message)); + return removeGoodss([id]); } /** * 批量删除活动 - * @param data 商品id集合 + * @param ids 商品id集合 */ -export async function removeGoodss(data) { +export async function removeGoodss(ids) { const res = await request.delete('/sylive/goods/batch', { - data + data: { ids } }); if (res.data.code === 0) { return res.data.message; diff --git a/src/api/sylive/groups-statistics/index.js b/src/api/sylive/groups-statistics/index.js index 0493853..7db42de 100644 --- a/src/api/sylive/groups-statistics/index.js +++ b/src/api/sylive/groups-statistics/index.js @@ -5,7 +5,9 @@ import request from '@/utils/request'; * @param id 活动id */ export async function getGroupsStatistics(activityId) { - const res = await request.get('/sylive/groupsStatistics/' + activityId); + const res = await request.get('/sylive/groupsStatistics', { + params: { activityId } + }); if (res.data.code === 0) { return res.data.data; } diff --git a/src/api/sylive/groups-user/index.js b/src/api/sylive/groups-user/index.js index 6643193..712d5e4 100644 --- a/src/api/sylive/groups-user/index.js +++ b/src/api/sylive/groups-user/index.js @@ -69,20 +69,16 @@ export async function updateGroupsUser(data) { * @param id 用户id */ export async function removeGroupsUser(id) { - const res = await request.delete('/sylive/groupsUser/' + id); - if (res.data.code === 0) { - return res.data.message; - } - return Promise.reject(new Error(res.data.message)); + return removeGroupsUsers([id]); } /** * 批量删除用户 - * @param data 用户id集合 + * @param ids 用户id集合 */ -export async function removeGroupsUsers(data) { +export async function removeGroupsUsers(ids) { const res = await request.delete('/sylive/groupsUser/batch', { - data + data: { ids } }); if (res.data.code === 0) { return res.data.message; @@ -158,7 +154,9 @@ export async function checkExistence(field, value, id) { * @param groupsId 分组id */ export async function synchronousGroupsUser(groupsId) { - const res = await request.get('/sylive/groupsUser/synchronous/' + groupsId); + const res = await request.get('/sylive/groupsUser/synchronous', { + params: { groupsId } + }); if (res.data.code === 0) { return res.data.message; } diff --git a/src/api/sylive/groups/index.js b/src/api/sylive/groups/index.js index b141895..2eb21e8 100644 --- a/src/api/sylive/groups/index.js +++ b/src/api/sylive/groups/index.js @@ -71,7 +71,9 @@ export async function updateGroups(data) { * @param id 分组id */ export async function removeGroups(id) { - const res = await request.delete('/sylive/groups/' + id); + const res = await request.delete('/sylive/groups', { + data: { id } + }); if (res.data.code === 0) { return res.data.message; } diff --git a/src/config/setting.js b/src/config/setting.js index 64a5588..78a3372 100644 --- a/src/config/setting.js +++ b/src/config/setting.js @@ -1,5 +1,6 @@ // 接口地址 export const API_BASE_URL = process.env.VUE_APP_API_BASE_URL; +//export const API_BASE_URL = 'http://localhost:8088/system'; // 项目名称 export const PROJECT_NAME = process.env.VUE_APP_NAME; diff --git a/src/views/sylive/goods/components/goods-edit.vue b/src/views/sylive/goods/components/goods-edit.vue index b589e49..63142d8 100644 --- a/src/views/sylive/goods/components/goods-edit.vue +++ b/src/views/sylive/goods/components/goods-edit.vue @@ -142,8 +142,8 @@ price: 0, stock: 0, banner: [], - dateRange: '', - useRange: '', + dateRange: [], + useRange: [], sort: 0, ifAddress: 0, ifCode: 0, diff --git a/src/views/sylive/goods/index.vue b/src/views/sylive/goods/index.vue index 4ad4f97..c59c9fd 100644 --- a/src/views/sylive/goods/index.vue +++ b/src/views/sylive/goods/index.vue @@ -248,7 +248,7 @@ /* 删除 */ remove(row) { const loading = this.$loading({ lock: true }); - removeGoods(row.activityId) + removeGoods(row.itemId) .then((msg) => { loading.close(); this.$message.success(msg); @@ -270,7 +270,7 @@ }) .then(() => { const loading = this.$loading({ lock: true }); - removeGoodss(this.selection.map((d) => d.activityId)) + removeGoodss(this.selection.map((d) => d.itemId)) .then((msg) => { loading.close(); this.$message.success(msg);