diff --git a/src/api/admin/user.js b/src/api/admin/user.js index ccc935c..62fcb46 100644 --- a/src/api/admin/user.js +++ b/src/api/admin/user.js @@ -34,8 +34,8 @@ export const getUserInfo = (data) => { } /**获取用户列表 */ -export const getUserList = (data) => { - return http2.get('/api/v1/admin/user/user/list?page=' + data.page + '&count=' + data.count + '&key=' + data.key) +export const getUserList = (params) => { + return http2.get('/api/v1/admin/user/user/list', { params }) } /**更新用户信息 */ diff --git a/src/components/UserSelector/index.vue b/src/components/UserSelector/index.vue index 0c24b2b..10c099a 100644 --- a/src/components/UserSelector/index.vue +++ b/src/components/UserSelector/index.vue @@ -26,6 +26,10 @@ + + + + 重置 @@ -118,6 +122,7 @@ const selectedUser = ref(null) const searchParams = reactive({ key: '', + is_admin: undefined, page: 1, count: 10 }) @@ -161,6 +166,7 @@ const handleSearch = () => { const handleReset = () => { searchParams.key = '' + searchParams.is_admin = undefined searchParams.page = 1 fetchUserList() } @@ -191,22 +197,25 @@ const confirmSelection = () => { diff --git a/src/components/admin/UserListSelector.vue b/src/components/admin/UserListSelector.vue index a0f565c..481196e 100644 --- a/src/components/admin/UserListSelector.vue +++ b/src/components/admin/UserListSelector.vue @@ -1,166 +1,111 @@