From f595f04a53a7e0432e93d6ac2ee8f116b214be34 Mon Sep 17 00:00:00 2001 From: zuiidea Date: Fri, 24 Mar 2017 20:32:27 +0800 Subject: [PATCH] modify request --- src/routes/request/index.js | 68 +++++++++++++++++++++++++++++++++---- src/utils/request.js | 15 ++++---- 2 files changed, 69 insertions(+), 14 deletions(-) diff --git a/src/routes/request/index.js b/src/routes/request/index.js index aa5aaad..f6bf040 100644 --- a/src/routes/request/index.js +++ b/src/routes/request/index.js @@ -1,5 +1,6 @@ import React from 'react' import styles from './index.less' +import Mock from 'mockjs' import { request, config } from '../../utils' import { Row, @@ -15,6 +16,52 @@ const requestOptions = [ url: `${location.origin}/api/users`, desc: 'intercept request by mock.js', }, + { + url: `${location.origin}/api/users`, + desc: 'intercept request by mock.js', + method: 'post', + data: Mock.mock({ + 'id|+1': 1000, + name: '@cname', + nickName: '@last', + phone: /^1[34578]\d{9}$/, + 'age|11-99': 1, + address: '@county(true)', + isMale: '@boolean', + email: '@email', + createTime: '@datetime', + avatar () { + return Mock.Random.image('100x100', Mock.Random.color(), '#757575', 'png', this.nickName.substr(0, 1)) + }, + }), + }, + { + url: `${location.origin}/api/users`, + desc: 'intercept request by mock.js', + method: 'put', + data: Mock.mock({ + id: 1, + name: '@cname', + nickName: '@last', + phone: /^1[34578]\d{9}$/, + 'age|11-99': 1, + address: '@county(true)', + isMale: '@boolean', + email: '@email', + createTime: '@datetime', + avatar () { + return Mock.Random.image('100x100', Mock.Random.color(), '#757575', 'png', this.nickName.substr(0, 1)) + }, + }), + }, + { + url: `${location.origin}/api/users`, + desc: 'intercept request by mock.js', + method: 'delete', + data: Mock.mock({ + id: 10, + }), + }, { url: `${config.baseURL}/admin/order`, desc: 'cross-domain request, but match config.baseURL(./src/utils/config.js)', @@ -61,7 +108,12 @@ export default class RequestPage extends React.Component { handeleURLChange = (value) => { const state = this.state - const currntItem = requestOptions.filter(item => value === item.url) + const curretUrl = value.split('?')[0] + const curretMethod = value.split('?')[1] + const currntItem = requestOptions.filter(item => { + const { method = 'get' } = item + return curretUrl === item.url && curretMethod === method + }) state.currntRequest = currntItem[0] this.setState(state) } @@ -72,7 +124,7 @@ export default class RequestPage extends React.Component { md: 24, } const { result, currntRequest } = this.state - const { methoad = 'get' } = currntRequest + const { method = 'get' } = currntRequest return (
@@ -82,17 +134,19 @@ export default class RequestPage extends React.Component { overflow: 'visible', }}>
-
diff --git a/src/utils/request.js b/src/utils/request.js index 026cd70..aa6a2e6 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -10,15 +10,15 @@ const fetch = (options) => { } = options switch (method.toLowerCase()) { case 'get': - return axios.get(url, { params: data }) + return axios.get(url, data) + case 'delete': + return axios.delete(url, { data }) + case 'head': + return axios.head(url, data) case 'post': return axios.post(url, data) case 'put': return axios.put(url, data) - case 'delete': - return axios.deleted(url, data) - case 'head': - return axios.head(url, data) case 'patch': return axios.patch(url, data) default: @@ -35,9 +35,10 @@ export default function request (options) { } } - return fetch(options).then((result) => { - return result.data + return fetch(options).then((response) => { + return response.data }).catch((error) => { console.log(error) + return Promise.reject(error) }) }