From 5fd9ab0d9b04fd7c29d2a147e3717ab7eff431be Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 13 Jul 2021 20:52:33 +0800
Subject: [PATCH] 整合冲突
---
src/api/desk/notice.js | 81 +++++++++++++++++++++++-----------------
1 files changed, 46 insertions(+), 35 deletions(-)
diff --git a/src/api/desk/notice.js b/src/api/desk/notice.js
index e1507d7..de94928 100644
--- a/src/api/desk/notice.js
+++ b/src/api/desk/notice.js
@@ -1,50 +1,61 @@
import request from '@/router/axios';
export const getList = (current, size, params) => {
- return request({
- url: '/api/blade-desk/notice/list',
- method: 'get',
- params: {
- ...params,
- current,
- size,
- }
- })
+ return request({
+ url: '/api/blade-desk/notice/list',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+
+export const getListPage = (current, size, params) => {
+ return request({
+ url: '/api/blade-desk/notice/page',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
}
export const remove = (ids) => {
- return request({
- url: '/api/blade-desk/notice/remove',
- method: 'post',
- params: {
- ids,
- }
- })
+ return request({
+ url: '/api/blade-desk/notice/remove',
+ method: 'post',
+ params: {
+ ids,
+ }
+ })
}
export const add = (row) => {
- return request({
- url: '/api/blade-desk/notice/submit',
- method: 'post',
- data: row
- })
+ return request({
+ url: '/api/blade-desk/notice/submit',
+ method: 'post',
+ data: row
+ })
}
export const update = (row) => {
- return request({
- url: '/api/blade-desk/notice/submit',
- method: 'post',
- data: row
- })
+ return request({
+ url: '/api/blade-desk/notice/submit',
+ method: 'post',
+ data: row
+ })
}
export const getNotice = (id) => {
- return request({
- url: '/api/blade-desk/notice/detail',
- method: 'get',
- params: {
- id
- }
- })
-}
-
+ return request({
+ url: '/api/blade-desk/notice/detail',
+ method: 'get',
+ params: {
+ id
+ }
+ })
+}
\ No newline at end of file
--
Gitblit v1.9.3