ANTD ADMIN
+
{config.iconFontUrl ? : ''}
- {login
- ?
- {!isNavbar ?
: ''}
-
-
-
-
-
- {children}
-
+
+ {!isNavbar ?
: ''}
+
:
-
-
-
-
-
}
+
+
+
)
}
@@ -91,7 +81,6 @@ App.propTypes = {
location: PropTypes.object,
dispatch: PropTypes.func,
app: PropTypes.object,
- loading: PropTypes.bool,
}
-export default connect(({ app, loading }) => ({ app, loading: loading.models.app }))(App)
+export default connect(({ app }) => ({ app }))(App)
diff --git a/src/routes/login/index.js b/src/routes/login/index.js
index 0cdf353..8ed54b8 100644
--- a/src/routes/login/index.js
+++ b/src/routes/login/index.js
@@ -1,24 +1,27 @@
import React, { PropTypes } from 'react'
+import { connect } from 'dva'
import { Button, Row, Form, Input } from 'antd'
import { config } from '../../utils'
import styles from './index.less'
const FormItem = Form.Item
-const login = ({
- loginButtonLoading,
- onOk,
+const Login = ({
+ login,
+ dispatch,
form: {
getFieldDecorator,
validateFieldsAndScroll,
},
}) => {
+ const { loginLoading } = login
+
function handleOk () {
validateFieldsAndScroll((errors, values) => {
if (errors) {
return
}
- onOk(values)
+ dispatch({ type: 'login/login', payload: values })
})
}
@@ -50,23 +53,24 @@ const login = ({
})(
)}
-
-
- 账号：guest
- 密码：guest
-
+
)
}
-login.propTypes = {
+Login.propTypes = {
form: PropTypes.object,
- loginButtonLoading: PropTypes.bool,
- onOk: PropTypes.func,
+ login: PropTypes.object,
+ dispatch: PropTypes.func,
}
-export default Form.create()(login)
+export default connect(({ login }) => ({ login }))(Form.create()(Login))
diff --git a/src/services/app.js b/src/services/app.js
index 20f0eeb..2e4594d 100644
--- a/src/services/app.js
+++ b/src/services/app.js
@@ -1,5 +1,7 @@
-import { request } from '../utils'
-
+import { request, config } from '../utils'
+const { api } = config
+const { userInfo, userLogout } = api
+console.log(userLogout)
export async function login (params) {
return request({
url: '/api/login',
@@ -10,15 +12,15 @@ export async function login (params) {
export async function logout (params) {
return request({
- url: '/api/logout',
- method: 'post',
+ url: userLogout,
+ method: 'get',
data: params,
})
}
-export async function userInfo (params) {
+export async function getUserInfo (params) {
return request({
- url: '/api/userInfo',
+ url: userInfo,
method: 'get',
data: params,
})
diff --git a/src/services/login.js b/src/services/login.js
new file mode 100644
index 0000000..540da24
--- /dev/null
+++ b/src/services/login.js
@@ -0,0 +1,11 @@
+import { request, config } from '../utils'
+const { api } = config
+const { userLogin } = api
+
+export async function login (data) {
+ return request({
+ url: userLogin,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/utils/config.js b/src/utils/config.js
index 49cbf49..5635f81 100644
--- a/src/utils/config.js
+++ b/src/utils/config.js
@@ -4,7 +4,14 @@ module.exports = {
footerText: 'Ant Design Admin 版权所有 © 2016 由 zuiidea 支持',
logo: 'https://t.alipayobjects.com/images/T1QUBfXo4fXXXXXXXX.png',
iconFontUrl: '//at.alicdn.com/t/font_c4y7asse3q1cq5mi.js',
- baseURL: 'http://47.92.30.98:7001/api',
+ baseURL: 'http://localhost:8000/api/v1',
YQL: ['http://www.zuimeitianqi.com'],
CORS: ['http://localhost:7001'],
+ openPages: ['/login'],
+ apiPrefix: '/api/v1',
+ api: {
+ userLogin: '/user/login',
+ userLogout: '/user/logout',
+ userInfo: '/userInfo',
+ },
}
diff --git a/src/utils/request.js b/src/utils/request.js
index 01a824d..8e77cc9 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,9 +1,11 @@
import axios from 'axios'
import qs from 'qs'
-import { YQL, CORS } from './config'
+import { YQL, CORS, baseURL } from './config'
import jsonp from 'jsonp'
import lodash from 'lodash'
+axios.defaults.baseURL = baseURL
+
const fetch = (options) => {
let {
method = 'get',
@@ -66,17 +68,23 @@ export default function request (options) {
const { statusText, status } = response
let data = options.fetchType === 'YQL' ? response.data.query.results.json : response.data
return {
- code: 0,
- status,
+ success: true,
message: statusText,
+ status,
...data,
}
}).catch((error) => {
- const {
- response = {
- statusText: error.message || 'Network Error',
- },
- } = error
- return { code: 1, message: response.statusText }
+ const { response } = error
+ let message
+ let status
+ if (response) {
+ status = response.status
+ const { data, statusText } = response
+ message = data.message || statusText
+ } else {
+ status = 600
+ message = 'Network Error'
+ }
+ return { success: false, status, message }
})
}