From 81801983a6dae474abcec7772fc0821d33337399 Mon Sep 17 00:00:00 2001
From: zuiidea <zuiiidea@gmail.com>
Date: Tue, 13 Jun 2017 20:26:38 +0800
Subject: [PATCH] fix request

---
 src/routes/request/index.js | 20 ++++++++++----------
 src/utils/config.js         |  2 +-
 src/utils/request.js        | 16 +++++++---------
 webpack.config.js           | 10 +++++-----
 4 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/src/routes/request/index.js b/src/routes/request/index.js
index b798452..5f2931c 100644
--- a/src/routes/request/index.js
+++ b/src/routes/request/index.js
@@ -10,20 +10,20 @@ import {
   Input,
   Button,
 } from 'antd'
-const { api, baseURL } = config
+const { api } = config
 const { dashboard, users, userLogin, user } = api
 
 const requestOptions = [
   {
-    url: baseURL + user.replace('/:id', ''),
+    url: user.replace('/:id', ''),
     desc: 'intercept request by mock.js',
   },
   {
-    url: baseURL + dashboard,
+    url: dashboard,
     desc: 'intercept request by mock.js',
   },
   {
-    url: baseURL + userLogin,
+    url: userLogin,
     method: 'post',
     data: {
       username: 'guest',
@@ -32,18 +32,18 @@ const requestOptions = [
     desc: 'intercept request by mock.js',
   },
   {
-    url: baseURL + users,
+    url: users,
     desc: 'intercept request by mock.js',
   },
   {
-    url: baseURL + user,
+    url: user,
     desc: 'intercept request by mock.js',
     data: Mock.mock({
       id: '@id',
     }),
   },
   {
-    url: baseURL + user.replace('/:id', ''),
+    url: user.replace('/:id', ''),
     desc: 'intercept request by mock.js',
     method: 'post',
     data: Mock.mock({
@@ -60,7 +60,7 @@ const requestOptions = [
     }),
   },
   {
-    url: baseURL + user,
+    url: user,
     desc: 'intercept request by mock.js',
     method: 'patch',
     data: Mock.mock({
@@ -69,7 +69,7 @@ const requestOptions = [
     }),
   },
   {
-    url: baseURL + user,
+    url: user,
     desc: 'intercept request by mock.js',
     method: 'delete',
     data: Mock.mock({
@@ -77,7 +77,7 @@ const requestOptions = [
     }),
   },
   {
-    url: `${baseURL}/test`,
+    url: '/test',
     desc: 'intercept request by mock.js',
     method: 'get',
   },
diff --git a/src/utils/config.js b/src/utils/config.js
index 1e80155..1c67043 100644
--- a/src/utils/config.js
+++ b/src/utils/config.js
@@ -5,7 +5,7 @@ module.exports = {
   logo: '/logo.png',
   iconFontCSS: '/iconfont.css',
   iconFontJS: '/iconfont.js',
-  baseURL: 'http://localhost:8000/api/v1',
+  baseURL: '/api/v1',
   YQL: ['http://www.zuimeitianqi.com'],
   CORS: ['http://localhost:7000'],
   openPages: ['/login'],
diff --git a/src/utils/request.js b/src/utils/request.js
index d1ad8c8..c0aeb72 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -94,23 +94,21 @@ export default function request (options) {
     return {
       success: true,
       message: statusText,
-      status,
+      statusCode: status,
       ...data,
     }
   }).catch((error) => {
     const { response } = error
     let msg
-    let status
-    let otherData = {}
-    if (response) {
+    let statusCode
+    if (response && response instanceof Object) {
       const { data, statusText } = response
-      otherData = data
-      status = response.status
+      statusCode = response.status
       msg = data.message || statusText
     } else {
-      status = 600
-      msg = 'Network Error'
+      statusCode = 600
+      msg = error.message || 'Network Error'
     }
-    return { success: false, status, message: msg, ...otherData }
+    return { success: false, statusCode, message: msg }
   })
 }
diff --git a/webpack.config.js b/webpack.config.js
index 9f71906..cf144a2 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -17,11 +17,11 @@ module.exports = (webpackConfig) => {
   }).join('!')
 
   // PreLoaders
-  webpackConfig.module.preLoaders = [{
-    test: /\.js$/,
-    enforce: 'pre',
-    loader: 'eslint',
-  }]
+  // webpackConfig.module.preLoaders = [{
+  //   test: /\.js$/,
+  //   enforce: 'pre',
+  //   loader: 'eslint',
+  // }]
 
   return webpackConfig
 }