diff --git a/mock/users.js b/mock/users.js index 18d83fb..80b1fd0 100644 --- a/mock/users.js +++ b/mock/users.js @@ -45,8 +45,6 @@ module.exports = { 'GET /api/users' (req, res) { const page = qs.parse(req.query) - - console.log(page,req); const pageSize = page.pageSize || 20 const currentPage = page.page || 1 @@ -78,11 +76,7 @@ module.exports = { }, 'POST /api/users' (req, res) { - const newData = qs.parse(req.body) - console.log(req,res); - - console.log(newData); - + const newData = req.body newData.createTime=Mock.mock('@now') newData.avatar=Mock.Random.image('100x100', Mock.Random.color(),"#757575",'png',newData.nickName.substr(0,1)) @@ -97,7 +91,7 @@ module.exports = { }, 'DELETE /api/users' (req, res) { - const deleteItem = qs.parse(req.body) + const deleteItem = req.body usersListData.data = usersListData.data.filter(function (item) { if (item.id == deleteItem.id) { @@ -113,7 +107,7 @@ module.exports = { }, 'PUT /api/users' (req, res) { - const editItem = qs.parse(req.body) + const editItem = req.body editItem.createTime=Mock.mock('@now') editItem.avatar=Mock.Random.image('100x100', Mock.Random.color(),"#757575",'png',editItem.nickName.substr(0,1)) diff --git a/src/routes/Users.jsx b/src/routes/Users.jsx index 309aabf..738cb2f 100644 --- a/src/routes/Users.jsx +++ b/src/routes/Users.jsx @@ -39,7 +39,7 @@ function Users({ location, dispatch, users }) { onPageChange(page) { dispatch(routerRedux.push({ pathname: '/users', - payload: { + query: { page:page.current, pageSize:page.pageSize }, diff --git a/src/services/users.js b/src/services/users.js index 641bcca..0710ed4 100644 --- a/src/services/users.js +++ b/src/services/users.js @@ -4,16 +4,13 @@ import qs from 'qs' export async function query(params) { return request('/api/users', { method: 'get', - body: qs.stringify(params), data:params, }) } export async function create(params) { - console.log(params); return request('/api/users', { method: 'post', - body: qs.stringify(params), data:params, }) } @@ -21,7 +18,6 @@ export async function create(params) { export async function remove(params) { return request('/api/users', { method: 'delete', - body: qs.stringify(params), data:params, }) } @@ -29,7 +25,6 @@ export async function remove(params) { export async function update(params) { return request('/api/users', { method: 'put', - body: qs.stringify(params), data: params, }) } diff --git a/src/utils/mock.js b/src/utils/mock.js index 8cf2239..7e16bcb 100644 --- a/src/utils/mock.js +++ b/src/utils/mock.js @@ -14,7 +14,9 @@ function serialize(str) { for (let i in mockData) { for (let key in mockData[i]) { Mock.mock(eval("/"+key.split(" ")[1].replace(/\//g,"\\\/")+"/"), key.split(" ")[0].toLowerCase(), function (options) { - options.query = !!options.url.split("?")[1] ? serialize(options.url.split("?")[1]) : (!!options.body ? serialize(options.body) : {}) + if(key.split(" ")[0].toLowerCase()=='get'){ + options.query = !!options.url.split("?")[1] ? serialize(options.url.split("?")[1]) : (!!options.body ? serialize(options.body) : {}) + } let res = {} let result = {} res.json = function (data) { diff --git a/src/utils/request.js b/src/utils/request.js index c29f6ae..e34ef5a 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -25,12 +25,12 @@ export default function request(url, options) { return Ajax.ajax({ url: url, - method:options.method||'GET', + method:options.method||'get', data:options.data||{}, - dataType:'json', + processData:options.method=='get'?true:false, + dataType:'JSON', }) .done((data) => { - console.log(data); return data })