Merge branch 'master' of http://gitea.zianxin.com:8418/zianxin/biz-pc-cloud

src/api/admin/user.ts

@@ -3,7 +3,7 @@ import request from "/@/utils/request"
 export const list = () => {
 	return request({
 		url: "/admin/user/list",
-		method: "get",
+		method: "post",
 	})
 }
 

src/api/wallet/wallet-manage.ts

@@ -1,49 +1,52 @@
 import request from "/@/utils/request"
 
 export function fetchList(query?: Object) {
-  return request({
-    url: '/wallet/wallet-manage/page',
-    method: 'get',
-    params: query
-  })
+	return request({
+		url: "/wallet/wallet-manage/page",
+		method: "get",
+		params: query,
+	})
 }
 
-export function fetchListJoin(query?: Object) {
-  return request({
-    url: '/wallet/wallet-manage/page-join',
-    method: 'get',
-    params: query
-  })
+export function fetchListJoin(query: any) {
+	return request({
+		url: "/wallet/wallet-manage/page-join",
+		method: "post",
+		params: {
+			current: query.current,
+			size: query.size,
+		},
+		data: query,
+	})
 }
 
 export function addObj(obj?: Object) {
-  return request({
-    url: '/wallet/wallet-manage',
-    method: 'post',
-    data: obj
-  })
+	return request({
+		url: "/wallet/wallet-manage",
+		method: "post",
+		data: obj,
+	})
 }
 
 export function getObj(id?: string) {
-  return request({
-    url: '/wallet/wallet-manage/' + id,
-    method: 'get'
-  })
+	return request({
+		url: "/wallet/wallet-manage/" + id,
+		method: "get",
+	})
 }
 
 export function delObjs(ids?: Object) {
-  return request({
-    url: '/wallet/wallet-manage',
-    method: 'delete',
-    data: ids
-  })
+	return request({
+		url: "/wallet/wallet-manage",
+		method: "delete",
+		data: ids,
+	})
 }
 
 export function putObj(obj?: Object) {
-  return request({
-    url: '/wallet/wallet-manage',
-    method: 'put',
-    data: obj
-  })
+	return request({
+		url: "/wallet/wallet-manage",
+		method: "put",
+		data: obj,
+	})
 }
-