diff --git a/mock/users.js b/mock/users.js index 7e748b5..ce3ffc8 100644 --- a/mock/users.js +++ b/mock/users.js @@ -53,12 +53,9 @@ module.exports = { } else { data = usersListData.data.slice((currentPage - 1) * pageSize, currentPage * pageSize) usersListData.page.current = currentPage * 1 - newPage = { - current: usersListData.page.current, - total: usersListData.page.total - } + newPage = usersListData.page } - res.json({success: true, data, page: newPage}) + res.json({success: true, data, page: {...newPage, pageSize: Number(pageSize)}}) }, 'POST /api/users' (req, res) { @@ -72,7 +69,6 @@ module.exports = { usersListData.page.total = usersListData.data.length usersListData.page.current = 1 - // global.usersListData = usersListData global[dataKey] = usersListData res.json({success: true, data: usersListData.data, page: usersListData.page}) @@ -90,7 +86,6 @@ module.exports = { usersListData.page.total = usersListData.data.length - // global.usersListData = usersListData global[dataKey] = usersListData res.json({success: true, data: usersListData.data, page: usersListData.page}) @@ -109,7 +104,6 @@ module.exports = { return item }) - // global.usersListData = usersListData global[dataKey] = usersListData res.json({success: true, data: usersListData.data, page: usersListData.page}) } diff --git a/src/models/users.js b/src/models/users.js index ba7215a..afdda6e 100644 --- a/src/models/users.js +++ b/src/models/users.js @@ -42,10 +42,7 @@ export default { type: 'querySuccess', payload: { list: data.data, - pagination: { - total: data.page.total, - current: data.page.current - } + pagination: data.page } }) } diff --git a/src/routes/login.js b/src/routes/login.js index 79bda0d..85e6a82 100644 --- a/src/routes/login.js +++ b/src/routes/login.js @@ -22,8 +22,6 @@ const login = ({ }) } - // document.onkeyup = e => e.keyCode === 13 && handleOk() - return (