diff --git a/vue/src/api/account/index.js b/vue/src/api/account/index.js index a66287b..28aaaa8 100644 --- a/vue/src/api/account/index.js +++ b/vue/src/api/account/index.js @@ -1,34 +1,23 @@ -import request from "@/api/request" -import {isEmpty} from "@/util" +import {GetApi, PostApi} from "@/api/request" -export const baseUrl = '/account' +export const login = new PostApi(`/account/login`) -export function login(data) { - return request.post(`${baseUrl}/login`, data).then(({data}) => data.data) -} +export const logout = new GetApi(`/account/logout`) -export function logout() { - return request.get(`${baseUrl}/logout`) -} +export const register = new PostApi(`/account/register`) -export function register(data) { - return request.post(`${baseUrl}/register`, data) -} +export const updateUserPwd = new PostApi(`/account/updatePwd`) -export function updateUserPwd(data) { - return request.post(`${baseUrl}/updatePwd`, data).then(({data}) => data) -} +export const updateAvatar = new GetApi( + `/account/updateAvatar`, + key => ({params: {key: encodeURIComponent(key)}}), + p => p.then(({data}) => data) +) -export function updateAvatar(key) { - return request.get(`${baseUrl}/updateAvatar?key=${encodeURIComponent(key)}`).then(({data}) => ({...data, key})) -} +export const validate = new GetApi(`/account/validate`, pwd => ({params: {pwd}})) -export function validate(pwd) { - return request.get(`${baseUrl}/validate?pwd=${pwd}`).then(({data}) => data) -} - -export function checkName(name, id) { - let param = `?name=${name}` - if (!isEmpty(id)) param += `&id=${id}` - return request.get(`${baseUrl}/checkName${param}`).then(({data}) => data) -} +export const checkName = new GetApi( + `/account/checkName`, + (name, id) => ({params: {name, id}}), + p => p.then(({data}) => data) +) diff --git a/vue/src/api/doc/baseUrl.js b/vue/src/api/doc/baseUrl.js deleted file mode 100644 index 9a642f1..0000000 --- a/vue/src/api/doc/baseUrl.js +++ /dev/null @@ -1 +0,0 @@ -export default '/doc' diff --git a/vue/src/api/doc/history.js b/vue/src/api/doc/history.js index eeda8c4..b1ef483 100644 --- a/vue/src/api/doc/history.js +++ b/vue/src/api/doc/history.js @@ -1,8 +1,3 @@ -import request from "@/api/request" -import BASE from './baseUrl' +import {PostApi} from "@/api/request" -export const baseUrl = `${BASE}/history` - -export function searchHistory(data) { - return request.post(`${baseUrl}/search`, data).then(({data}) => data.data) -} +export const search = new PostApi(`/doc/history/search`) diff --git a/vue/src/api/doc/purchase/inbound.js b/vue/src/api/doc/purchase/inbound.js index e17ab93..7682188 100644 --- a/vue/src/api/doc/purchase/inbound.js +++ b/vue/src/api/doc/purchase/inbound.js @@ -1,44 +1,23 @@ -import request from "@/api/request" -import BASE from '../baseUrl' +import {GetApi, PostApi} from "@/api/request" -export const baseUrl = `${BASE}/purchase/inbound` +export const baseUrl = `/doc/purchase/inbound` -export function getById(id) { - return request.get(`${baseUrl}/getById?id=${id}`).then(({data}) => data.data) -} +export const getById = new GetApi(`${baseUrl}/getById`, id => ({params: {id}})) -export function getSubById(id) { - return request.get(`${baseUrl}/getSubById?id=${id}`).then(({data}) => data.data) -} +export const getSubById = new GetApi(`${baseUrl}/getSubById`, id => ({params: {id}})) -export function search(data) { - return request.post(`${baseUrl}/search`, data).then(({data}) => data.data) -} +export const search = new PostApi(`${baseUrl}/search`) -export function add(data) { - return request.post(`${baseUrl}/add`, data).then(({data}) => data) -} +export const add = new PostApi(`${baseUrl}/add`, null, p => p.then(({data}) => data)) -export function update(data) { - return request.post(`${baseUrl}/update`, data).then(({data}) => data) -} +export const update = new PostApi(`${baseUrl}/update`, null, p => p.then(({data}) => data)) -export function commit(data) { - return request.post(`${baseUrl}/commit`, data).then(({data}) => data) -} +export const commit = new PostApi(`${baseUrl}/commit`, null, p => p.then(({data}) => data)) -export function withdraw(data) { - return request.post(`${baseUrl}/withdraw`, data).then(({data}) => data) -} +export const withdraw = new PostApi(`${baseUrl}/withdraw`, null, p => p.then(({data}) => data)) -export function pass(data) { - return request.post(`${baseUrl}/pass`, data).then(({data}) => data) -} +export const pass = new PostApi(`${baseUrl}/pass`, null, p => p.then(({data}) => data)) -export function reject(data) { - return request.post(`${baseUrl}/reject`, data).then(({data}) => data) -} +export const reject = new PostApi(`${baseUrl}/reject`, null, p => p.then(({data}) => data)) -export function del(id) { - return request.get(`${baseUrl}/del?id=${id}`).then(({data}) => data) -} +export const del = new GetApi(`${baseUrl}/del`, id => ({params: {id}}), p => p.then(({data}) => data)) diff --git a/vue/src/api/doc/purchase/order.js b/vue/src/api/doc/purchase/order.js index 4f7d21e..8a90263 100644 --- a/vue/src/api/doc/purchase/order.js +++ b/vue/src/api/doc/purchase/order.js @@ -1,44 +1,23 @@ -import request from "@/api/request" -import BASE from '../baseUrl' +import {GetApi, PostApi} from "@/api/request" -export const baseUrl = `${BASE}/purchase/order` +export const baseUrl = `/doc/purchase/order` -export function getById(id) { - return request.get(`${baseUrl}/getById?id=${id}`).then(({data}) => data.data) -} +export const getById = new GetApi(`${baseUrl}/getById`, id => ({params: {id}})) -export function getSubById(id) { - return request.get(`${baseUrl}/getSubById?id=${id}`).then(({data}) => data.data) -} +export const getSubById = new GetApi(`${baseUrl}/getSubById`, id => ({params: {id}})) -export function search(data) { - return request.post(`${baseUrl}/search`, data).then(({data}) => data.data) -} +export const search = new PostApi(`${baseUrl}/search`) -export function add(data) { - return request.post(`${baseUrl}/add`, data).then(({data}) => data) -} +export const add = new PostApi(`${baseUrl}/add`, null, p => p.then(({data}) => data)) -export function update(data) { - return request.post(`${baseUrl}/update`, data).then(({data}) => data) -} +export const update = new PostApi(`${baseUrl}/update`, null, p => p.then(({data}) => data)) -export function commit(data) { - return request.post(`${baseUrl}/commit`, data).then(({data}) => data) -} +export const commit = new PostApi(`${baseUrl}/commit`, null, p => p.then(({data}) => data)) -export function withdraw(data) { - return request.post(`${baseUrl}/withdraw`, data).then(({data}) => data) -} +export const withdraw = new PostApi(`${baseUrl}/withdraw`, null, p => p.then(({data}) => data)) -export function pass(data) { - return request.post(`${baseUrl}/pass?`, data).then(({data}) => data) -} +export const pass = new PostApi(`${baseUrl}/pass`, null, p => p.then(({data}) => data)) -export function reject(data) { - return request.post(`${baseUrl}/reject`, data).then(({data}) => data) -} +export const reject = new PostApi(`${baseUrl}/reject`, null, p => p.then(({data}) => data)) -export function del(id) { - return request.get(`${baseUrl}/del?id=${id}`).then(({data}) => data) -} +export const del = new GetApi(`${baseUrl}/del`, id => ({params: {id}}), p => p.then(({data}) => data)) diff --git a/vue/src/api/doc/sell/order.js b/vue/src/api/doc/sell/order.js index 976bdb3..c49112d 100644 --- a/vue/src/api/doc/sell/order.js +++ b/vue/src/api/doc/sell/order.js @@ -1,44 +1,23 @@ -import request from "@/api/request" -import BASE from '../baseUrl' +import {GetApi, PostApi} from "@/api/request" -export const baseUrl = `${BASE}/sell/order` +export const baseUrl = `/doc/sell/order` -export function getById(id) { - return request.get(`${baseUrl}/getById?id=${id}`).then(({data}) => data.data) -} +export const getById = new GetApi(`${baseUrl}/getById`, id => ({params: {id}})) -export function getSubById(id) { - return request.get(`${baseUrl}/getSubById?id=${id}`).then(({data}) => data.data) -} +export const getSubById = new GetApi(`${baseUrl}/getSubById`, id => ({params: {id}})) -export function search(data) { - return request.post(`${baseUrl}/search`, data).then(({data}) => data.data) -} +export const search = new PostApi(`${baseUrl}/search`) -export function add(data) { - return request.post(`${baseUrl}/add`, data).then(({data}) => data) -} +export const add = new PostApi(`${baseUrl}/add`, null, p => p.then(({data}) => data)) -export function update(data) { - return request.post(`${baseUrl}/update`, data).then(({data}) => data) -} +export const update = new PostApi(`${baseUrl}/update`, null, p => p.then(({data}) => data)) -export function commit(data) { - return request.post(`${baseUrl}/commit`, data).then(({data}) => data) -} +export const commit = new PostApi(`${baseUrl}/commit`, null, p => p.then(({data}) => data)) -export function withdraw(data) { - return request.post(`${baseUrl}/withdraw`, data).then(({data}) => data) -} +export const withdraw = new PostApi(`${baseUrl}/withdraw`, null, p => p.then(({data}) => data)) -export function pass(data) { - return request.post(`${baseUrl}/pass?`, data).then(({data}) => data) -} +export const pass = new PostApi(`${baseUrl}/pass`, null, p => p.then(({data}) => data)) -export function reject(data) { - return request.post(`${baseUrl}/reject`, data).then(({data}) => data) -} +export const reject = new PostApi(`${baseUrl}/reject`, null, p => p.then(({data}) => data)) -export function del(id) { - return request.get(`${baseUrl}/del?id=${id}`).then(({data}) => data) -} +export const del = new GetApi(`${baseUrl}/del`, id => ({params: {id}}), p => p.then(({data}) => data)) diff --git a/vue/src/api/doc/sell/outbound.js b/vue/src/api/doc/sell/outbound.js index bc37116..1073739 100644 --- a/vue/src/api/doc/sell/outbound.js +++ b/vue/src/api/doc/sell/outbound.js @@ -1,44 +1,23 @@ -import request from "@/api/request" -import BASE from '../baseUrl' +import request, {GetApi, PostApi} from "@/api/request" -export const baseUrl = `${BASE}/sell/outbound` +export const baseUrl = `/doc/sell/outbound` -export function getById(id) { - return request.get(`${baseUrl}/getById?id=${id}`).then(({data}) => data.data) -} +export const getById = new GetApi(`${baseUrl}/getById`, id => ({params: {id}})) -export function getSubById(id) { - return request.get(`${baseUrl}/getSubById?id=${id}`).then(({data}) => data.data) -} +export const getSubById = new GetApi(`${baseUrl}/getSubById`, id => ({params: {id}})) -export function search(data) { - return request.post(`${baseUrl}/search`, data).then(({data}) => data.data) -} +export const search = new PostApi(`${baseUrl}/search`) -export function add(data) { - return request.post(`${baseUrl}/add`, data).then(({data}) => data) -} +export const add = new PostApi(`${baseUrl}/add`, null, p => p.then(({data}) => data)) -export function update(data) { - return request.post(`${baseUrl}/update`, data).then(({data}) => data) -} +export const update = new PostApi(`${baseUrl}/update`, null, p => p.then(({data}) => data)) -export function commit(data) { - return request.post(`${baseUrl}/commit`, data).then(({data}) => data) -} +export const commit = new PostApi(`${baseUrl}/commit`, null, p => p.then(({data}) => data)) -export function withdraw(data) { - return request.post(`${baseUrl}/withdraw`, data).then(({data}) => data) -} +export const withdraw = new PostApi(`${baseUrl}/withdraw`, null, p => p.then(({data}) => data)) -export function pass(data) { - return request.post(`${baseUrl}/pass?`, data).then(({data}) => data) -} +export const pass = new PostApi(`${baseUrl}/pass`, null, p => p.then(({data}) => data)) -export function reject(data) { - return request.post(`${baseUrl}/reject`, data).then(({data}) => data) -} +export const reject = new PostApi(`${baseUrl}/reject`, null, p => p.then(({data}) => data)) -export function del(id) { - return request.get(`${baseUrl}/del?id=${id}`).then(({data}) => data) -} +export const del = new GetApi(`${baseUrl}/del`, id => ({params: {id}}), p => p.then(({data}) => data)) diff --git a/vue/src/api/message/baseUrl.js b/vue/src/api/message/baseUrl.js deleted file mode 100644 index e6bab2f..0000000 --- a/vue/src/api/message/baseUrl.js +++ /dev/null @@ -1 +0,0 @@ -export default '/message' diff --git a/vue/src/api/message/manage.js b/vue/src/api/message/manage.js index 83da414..1279b8c 100644 --- a/vue/src/api/message/manage.js +++ b/vue/src/api/message/manage.js @@ -1,28 +1,13 @@ -import request from "@/api/request" -import BASE from './baseUrl' +import {GetApi, PostApi} from "@/api/request" -export const baseUrl = `${BASE}/manage` +export const search = new PostApi(`/message/manage/search`) -export function search(data) { - return request.post(`${baseUrl}/search`, data).then(({data}) => data.data) -} +export const add = new PostApi(`/message/manage/add`, null, p => p.then(({data}) => data)) -export function add(data) { - return request.post(`${baseUrl}/add`, data).then(({data}) => data) -} +export const update = new PostApi(`/message/manage/update`, null, p => p.then(({data}) => data)) -export function update(data) { - return request.post(`${baseUrl}/update`, data).then(({data}) => data) -} +export const publish = new PostApi(`/message/manage/publish`, null, p => p.then(({data}) => data)) -export function publish(data) { - return request.post(`${baseUrl}/publish`, data).then(({data}) => data) -} +export const withdraw = new PostApi(`/message/manage/withdraw`, null, p => p.then(({data}) => data)) -export function withdraw(data) { - return request.post(`${baseUrl}/withdraw`, data).then(({data}) => data) -} - -export function del(id, title) { - return request.get(`${baseUrl}/del?id=${id}&title=${title}`).then(({data}) => data) -} +export const del = new GetApi(`/message/manage/del`, (id, title) => ({params: {id, title}})) diff --git a/vue/src/api/message/user.js b/vue/src/api/message/user.js index 3747da3..0088d5f 100644 --- a/vue/src/api/message/user.js +++ b/vue/src/api/message/user.js @@ -1,16 +1,9 @@ -import request from "@/api/request" -import BASE from './baseUrl' +import {GetApi, PostApi} from "@/api/request" -export const baseUrl = `${BASE}/user` +export const baseUrl = `/message/user` -export function search(data) { - return request.post(`${baseUrl}/search`, data).then(({data}) => data.data) -} +export const search = new PostApi(`/message/user/search`) -export function read(id) { - return request.get(`${baseUrl}/read?id=${id}`).then(({data}) => data) -} +export const read = new GetApi(`/message/user/read`, id => ({params: {id}})) -export function readAll() { - return request.get(`${baseUrl}/readAll`).then(({data}) => data) -} +export const readAll = new GetApi(`/message/user/readAll`) diff --git a/vue/src/api/record/index.js b/vue/src/api/record/index.js index 6b2c03b..f9effaf 100644 --- a/vue/src/api/record/index.js +++ b/vue/src/api/record/index.js @@ -1,11 +1,5 @@ -import request from "@/api/request" +import {PostApi} from "@/api/request" -export const baseUrl = '/record' +export const searchLoginHistory = new PostApi(`/record/searchLoginHistory`) -export function searchLoginHistory(data) { - return request.post(`${baseUrl}/searchLoginHistory`, data).then(({data}) => data.data) -} - -export function searchUserAction(data) { - return request.post(`${baseUrl}/searchUserAction`, data).then(({data}) => data.data) -} +export const searchUserAction = new PostApi(`/record/searchUserAction`) diff --git a/vue/src/api/request.js b/vue/src/api/request.js index 1c6266b..b574540 100644 --- a/vue/src/api/request.js +++ b/vue/src/api/request.js @@ -4,13 +4,13 @@ import {MessageBox, Notification} from 'element-ui' import Message from '@ele/component/Message' import store from '@/store' -const service = axios.create({ +const instance = axios.create({ baseURL: apiPrefix, // withCredentials: true, // send cookies when cross-domain requests timeout: 60000 // request timeout }) -service.interceptors.request.use( +instance.interceptors.request.use( config => { //登录状态下socket断连时,除登出外中断一切请求 if (store.state.user.id && !store.state.socket.online && config.url !== '/account/logout') { @@ -27,7 +27,7 @@ service.interceptors.request.use( error => Promise.reject(error) ) -service.interceptors.response.use( +instance.interceptors.response.use( response => { const res = response.data @@ -73,4 +73,45 @@ service.interceptors.response.use( } ) -export default service +class Api { + /** + * 数据接口定义 + * @param url 请求url,不带参数 + * @param arg 对传入参数的处理方法,返回值将作为axios[get,post]的第二个参数 + * @param chain 形参为请求返回的promise + * @param isGet 是否为get请求 + */ + constructor(url, arg, chain, isGet) { + this.url = url + this.arg = arg + this.chain = chain + this.isGet = isGet + if (this.chain === undefined) { + this.chain = p => p.then(({data}) => data.data) + } + } + + request(...args) { + const params = this.arg ? this.arg(...args) : undefined + const method = this.isGet ? 'get' : 'post' + const promise = instance[method](this.url, params) + return this.chain ? this.chain(promise) : promise + } +} + +export class PostApi extends Api { + constructor(url, arg, chain) { + if (!arg) { + arg = data => data + } + super(url, arg, chain, false) + } +} + +export class GetApi extends Api { + constructor(url, arg, chain) { + super(url, arg, chain, true) + } +} + +export default instance diff --git a/vue/src/api/statistic/index.js b/vue/src/api/statistic/index.js index 1eee5cd..2d1eb74 100644 --- a/vue/src/api/statistic/index.js +++ b/vue/src/api/statistic/index.js @@ -1,19 +1,9 @@ -import request from "@/api/request" +import {GetApi} from "@/api/request" -export const baseUrl = `/statistic` +export const getFourBlock = new GetApi(`/statistic/getFourBlock`) -export function getFourBlock() { - return request.get(`${baseUrl}/getFourBlock`).then(({data}) => data.data) -} +export const getDailyProfitStat = new GetApi(`/statistic/getDailyProfitStat`) -export function getDailyProfitStat() { - return request.get(`${baseUrl}/getDailyProfitStat`).then(({data}) => data.data) -} +export const getDailyFinishOrder = new GetApi(`/statistic/getDailyFinishOrder`) -export function getDailyFinishOrder() { - return request.get(`${baseUrl}/getDailyFinishOrder`).then(({data}) => data.data) -} - -export function getTotalProfitGoods() { - return request.get(`${baseUrl}/getTotalProfitGoods`).then(({data}) => data.data) -} +export const getTotalProfitGoods = new GetApi(`/statistic/getTotalProfitGoods`) diff --git a/vue/src/api/stock/current.js b/vue/src/api/stock/current.js index 944edba..d2a37aa 100644 --- a/vue/src/api/stock/current.js +++ b/vue/src/api/stock/current.js @@ -1,15 +1,7 @@ -import request from "@/api/request" +import {GetApi, PostApi} from "@/api/request" -export const baseUrl = '/stock/current' +export const search = new PostApi(`/stock/current/search`) -export function search(data) { - return request.post(`${baseUrl}/search`, data).then(({data}) => data.data) -} +export const getDetail = new GetApi(`/stock/current/getDetail`, cids => ({params: {cids}})) -export function getDetail(cids) { - return request.get(`${baseUrl}/getDetail?cids=${cids}`).then(({data}) => data.data) -} - -export function getDetailById(ids) { - return request.get(`${baseUrl}/getDetailById?ids=${ids}`).then(({data}) => data.data) -} +export const getDetailById = new GetApi(`/stock/current/getDetailById`, ids => ({params: {ids}})) diff --git a/vue/src/api/system/baseUrl.js b/vue/src/api/system/baseUrl.js deleted file mode 100644 index f932e9a..0000000 --- a/vue/src/api/system/baseUrl.js +++ /dev/null @@ -1 +0,0 @@ -export default '/system' diff --git a/vue/src/api/system/category.js b/vue/src/api/system/category.js index 0fceed3..e5144c9 100644 --- a/vue/src/api/system/category.js +++ b/vue/src/api/system/category.js @@ -1,24 +1,11 @@ -import request from "@/api/request" -import BASE from './baseUrl' +import {GetApi, PostApi} from "@/api/request" -export const baseUrl = `${BASE}/category` +export const search = new PostApi(`/system/category/search`) -export function search(data) { - return request.post(`${baseUrl}/search`, data).then(({data}) => data.data) -} +export const getAll = new GetApi(`/system/category/getAll`) -export function getAll() { - return request.get(`${baseUrl}/getAll`).then(({data}) => data.data) -} +export const add = new PostApi(`/system/category/add`) -export function add(data) { - return request.post(`${baseUrl}/add`, data).then(({data}) => data) -} +export const update = new PostApi(`/system/category/update`) -export function update(data) { - return request.post(`${baseUrl}/update`, data).then(({data}) => data) -} - -export function del(data) { - return request.post(`${baseUrl}/del`, data).then(({data}) => data) -} +export const del = new PostApi(`/system/category/del`) diff --git a/vue/src/api/system/customer.js b/vue/src/api/system/customer.js index 9ccd8f1..3307fed 100644 --- a/vue/src/api/system/customer.js +++ b/vue/src/api/system/customer.js @@ -1,24 +1,11 @@ -import request from "@/api/request" -import BASE from './baseUrl' +import {GetApi, PostApi} from "@/api/request" -export const baseUrl = `${BASE}/customer` +export const getLimitRegion = new GetApi(`/system/customer/getLimitRegion`) -export function getLimitRegion() { - return request.get(`${baseUrl}/getLimitRegion`).then(({data}) => data.data) -} +export const search = new PostApi(`/system/customer/search`) -export function getCustomers(data) { - return request.post(`${baseUrl}/search`, data).then(({data}) => data.data) -} +export const add = new PostApi(`/system/customer/add`, null, p => p.then(({data}) => data)) -export function addCustomer(data) { - return request.post(`${baseUrl}/add`, data).then(({data}) => data) -} +export const update = new PostApi(`/system/customer/update`, null, p => p.then(({data}) => data)) -export function updateCustomer(data) { - return request.post(`${baseUrl}/update`, data).then(({data}) => data) -} - -export function delCustomer(data) { - return request.post(`${baseUrl}/del`, data).then(({data}) => data) -} +export const del = new PostApi(`/system/customer/del`, null, p => p.then(({data}) => data)) diff --git a/vue/src/api/system/department.js b/vue/src/api/system/department.js index 699d039..7438ab8 100644 --- a/vue/src/api/system/department.js +++ b/vue/src/api/system/department.js @@ -1,20 +1,9 @@ -import request from "@/api/request" -import BASE from './baseUrl' +import {GetApi, PostApi} from "@/api/request" -export const baseUrl = `${BASE}/department` +export const get = new GetApi(`/system/department/get`, (all = true) => ({params: {all}})) -export function getDepartments(all = true) { - return request.get(`${baseUrl}/get?all=${all}`).then(({data}) => data.data) -} +export const add = new PostApi(`/system/department/add`, null, p => p.then(({data}) => data)) -export function addDepartment(data) { - return request.post(`${baseUrl}/add`, data).then(({data}) => data) -} +export const update = new PostApi(`/system/department/update`, null, p => p.then(({data}) => data)) -export function updateDepartment(data) { - return request.post(`${baseUrl}/update`, data).then(({data}) => data) -} - -export function delDepartment(data) { - return request.post(`${baseUrl}/del`, data).then(({data}) => data) -} +export const del = new PostApi(`/system/department/del`, null, p => p.then(({data}) => data)) diff --git a/vue/src/api/system/resource.js b/vue/src/api/system/resource.js index d62631d..41525fd 100644 --- a/vue/src/api/system/resource.js +++ b/vue/src/api/system/resource.js @@ -1,20 +1,9 @@ -import request from "@/api/request" -import BASE from './baseUrl' +import {GetApi, PostApi} from "@/api/request" -export const baseUrl = `${BASE}/resource` +export const getAll = new GetApi(`/system/resource/getAll`) -export function getAll() { - return request.get(`${baseUrl}/getAll`).then(({data}) => data.data) -} +export const add = new PostApi(`/system/resource/add`, null, p => p.then(({data}) => data)) -export function add(data) { - return request.post(`${baseUrl}/add`, data).then(({data}) => data) -} +export const update = new PostApi(`/system/resource/update`, null, p => p.then(({data}) => data)) -export function update(data) { - return request.post(`${baseUrl}/update`, data).then(({data}) => data) -} - -export function del(id) { - return request.get(`${baseUrl}/del?id=${id}`).then(({data}) => data) -} +export const del = new GetApi(`/system/resource/del`, id => ({params: {id}}), p => p.then(({data}) => data)) diff --git a/vue/src/api/system/role.js b/vue/src/api/system/role.js index ab18781..8caa49d 100644 --- a/vue/src/api/system/role.js +++ b/vue/src/api/system/role.js @@ -1,24 +1,13 @@ -import request from "@/api/request" -import BASE from './baseUrl' +import {GetApi, PostApi} from "@/api/request" -export const baseUrl = `${BASE}/role` +export const baseUrl = `/system/role` -export function search(data) { - return request.post(`${baseUrl}/search`, data).then(({data}) => data.data) -} +export const search = new PostApi(`/system/role/search`) -export function get() { - return request.get(`${baseUrl}/get`).then(({data}) => data.data) -} +export const get = new GetApi(`/system/role/get`) -export function add(data) { - return request.post(`${baseUrl}/add`, data).then(({data}) => data) -} +export const add = new PostApi(`/system/role/add`, null, p => p.then(({data}) => data)) -export function update(data) { - return request.post(`${baseUrl}/update`, data).then(({data}) => data) -} +export const update = new PostApi(`/system/role/update`, null, p => p.then(({data}) => data)) -export function del(data) { - return request.post(`${baseUrl}/del`, data).then(({data}) => data) -} +export const del = new PostApi(`/system/role/del`, null, p => p.then(({data}) => data)) diff --git a/vue/src/api/system/supplier.js b/vue/src/api/system/supplier.js index 396147a..5e63cfa 100644 --- a/vue/src/api/system/supplier.js +++ b/vue/src/api/system/supplier.js @@ -1,24 +1,11 @@ -import request from "@/api/request" -import BASE from './baseUrl' +import {GetApi, PostApi} from "@/api/request" -export const baseUrl = `${BASE}/supplier` +export const getLimitRegion = new GetApi(`/system/supplier/getLimitRegion`) -export function getLimitRegion() { - return request.get(`${baseUrl}/getLimitRegion`).then(({data}) => data.data) -} +export const search = new PostApi(`/system/supplier/search`) -export function getSuppliers(data) { - return request.post(`${baseUrl}/search`, data).then(({data}) => data.data) -} +export const add = new PostApi(`/system/supplier/add`, null, p => p.then(({data}) => data)) -export function addSupplier(data) { - return request.post(`${baseUrl}/add`, data).then(({data}) => data) -} +export const update = new PostApi(`/system/supplier/update`, null, p => p.then(({data}) => data)) -export function updateSupplier(data) { - return request.post(`${baseUrl}/update`, data).then(({data}) => data) -} - -export function delSupplier(data) { - return request.post(`${baseUrl}/del`, data).then(({data}) => data) -} +export const del = new PostApi(`/system/supplier/del`, null, p => p.then(({data}) => data)) diff --git a/vue/src/api/system/user.js b/vue/src/api/system/user.js index 8c6fc10..7f767ec 100644 --- a/vue/src/api/system/user.js +++ b/vue/src/api/system/user.js @@ -1,28 +1,13 @@ -import request from "@/api/request" -import BASE from './baseUrl' +import {PostApi} from "@/api/request" -export const baseUrl = `${BASE}/user` +export const search = new PostApi(`/system/user/search`) -export function getUsers(data) { - return request.post(`${baseUrl}/search`, data).then(({data}) => data.data) -} +export const kick = new PostApi(`/system/user/kick`, null, p => p.then(({data}) => data)) -export function kick(data) { - return request.post(`${baseUrl}/kick`, data).then(({data}) => data) -} +export const add = new PostApi(`/system/user/add`, null, p => p.then(({data}) => data)) -export function addUser(data) { - return request.post(`${baseUrl}/add`, data).then(({data}) => data) -} +export const update = new PostApi(`/system/user/update`, null, p => p.then(({data}) => data)) -export function updateUser(data) { - return request.post(`${baseUrl}/update`, data).then(({data}) => data) -} +export const del = new PostApi(`/system/user/del`, null, p => p.then(({data}) => data)) -export function delUser(data) { - return request.post(`${baseUrl}/del`, data).then(({data}) => data) -} - -export function resetUserPwd(data) { - return request.post(`${baseUrl}/resetPwd`, data).then(({data}) => data) -} +export const resetPwd = new PostApi(`/system/user/resetPwd`, null, p => p.then(({data}) => data)) diff --git a/vue/src/component/biz/CategoryTree/index.vue b/vue/src/component/biz/CategoryTree/index.vue index 3474668..1da0233 100644 --- a/vue/src/component/biz/CategoryTree/index.vue +++ b/vue/src/component/biz/CategoryTree/index.vue @@ -33,7 +33,8 @@ export default { mounted() { if (this.data.length > 0) return - getAll() + getAll + .request() .then(data => this.$store.commit('dataCache/categories', data)) .finally(() => this.loading = false) } diff --git a/vue/src/component/biz/UserSelector/SimpleMultipleUserSelector.vue b/vue/src/component/biz/UserSelector/SimpleMultipleUserSelector.vue index 59437b3..76a1274 100644 --- a/vue/src/component/biz/UserSelector/SimpleMultipleUserSelector.vue +++ b/vue/src/component/biz/UserSelector/SimpleMultipleUserSelector.vue @@ -10,21 +10,14 @@