From b03f2ac89c10d6896d078b28e6c5898966e2ea76 Mon Sep 17 00:00:00 2001 From: zuiidea Date: Thu, 13 Apr 2017 19:00:32 +0800 Subject: [PATCH] users --- src/mock/dashboard.js | 4 +++- src/mock/users.js | 8 ++++---- src/models/app.js | 25 +------------------------ src/models/users.js | 6 +----- src/router.js | 8 ++++---- src/routes/request/index.js | 10 ++++++++++ src/services/app.js | 2 +- src/services/dashboard.js | 6 ++++-- src/services/users.js | 12 +++++++----- src/utils/config.js | 2 ++ 10 files changed, 37 insertions(+), 46 deletions(-) diff --git a/src/mock/dashboard.js b/src/mock/dashboard.js index bab721a..350a267 100644 --- a/src/mock/dashboard.js +++ b/src/mock/dashboard.js @@ -1,5 +1,7 @@ import { color } from '../utils/theme' const Mock = require('mockjs') +const config = require('../utils/config') +const { apiPrefix } = config const Dashboard = Mock.mock({ 'sales|8': [ @@ -122,7 +124,7 @@ const Dashboard = Mock.mock({ }) module.exports = { - 'GET /api/dashboard' (req, res) { + [`GET ${apiPrefix}/dashboard`] (req, res) { res.json(Dashboard) }, } diff --git a/src/mock/users.js b/src/mock/users.js index e4d2c40..17c5c07 100644 --- a/src/mock/users.js +++ b/src/mock/users.js @@ -106,7 +106,7 @@ module.exports = { }, [`GET ${apiPrefix}/users`] (req, res) { - const page = qs.parse(req.query) + const page = req.query const pageSize = page.pageSize || 10 const currentPage = page.page || 1 @@ -142,7 +142,7 @@ module.exports = { }, [`POST ${apiPrefix}/users`] (req, res) { - const newData = JSON.parse(req.body) + 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)) @@ -158,7 +158,7 @@ module.exports = { }, [`DELETE ${apiPrefix}/users`] (req, res) { - const deleteItem = JSON.parse(req.body) + const deleteItem = req.body usersListData.data = usersListData.data.filter((item) => { if (item.id === deleteItem.id) { @@ -175,7 +175,7 @@ module.exports = { }, [`PUT ${apiPrefix}/users`] (req, res) { - const editItem = JSON.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/models/app.js b/src/models/app.js index 54732ad..86a4840 100644 --- a/src/models/app.js +++ b/src/models/app.js @@ -5,7 +5,6 @@ import { parse } from 'qs' export default { namespace: 'app', state: { - login: false, user: { name: '吴彦祖', userPermissions: [], @@ -60,9 +59,8 @@ export default { user: data.user, }, }) - yield put(routerRedux.push('/dashboard')) } else { - throw (data) + yield put(routerRedux.push('/login')) } }, *logout ({ @@ -116,27 +114,6 @@ export default { ...action.payload, } }, - loginSuccess (state, action) { - return { - ...state, - ...action.payload, - login: true, - loginButtonLoading: false, - } - }, - logoutSuccess (state) { - return { - ...state, - login: false, - } - }, - loginFail (state) { - return { - ...state, - login: false, - loginButtonLoading: false, - } - }, showLoginButtonLoading (state) { return { ...state, diff --git a/src/models/users.js b/src/models/users.js index 9bb5264..4d432c1 100644 --- a/src/models/users.js +++ b/src/models/users.js @@ -34,11 +34,7 @@ export default { }, effects: { - *query ({ payload }, { call, put, select }) { - const { app } = yield select(state => state) - if (!app.login) { - return - } + *query ({ payload }, { call, put }) { const data = yield call(query, parse(payload)) if (data) { yield put({ diff --git a/src/router.js b/src/router.js index ce33aba..334c5ee 100644 --- a/src/router.js +++ b/src/router.js @@ -12,10 +12,10 @@ const registerModel = (app, model) => { const Routers = function ({ history, app }) { const handleChildRoute = ({ location }) => { - const state = app._store.getState() - if (!state.app.login && location.pathname !== '/login') { - app._store.dispatch(routerRedux.push('/login')) - } + // const state = app._store.getState() + // if (!state.app.login && location.pathname !== '/login') { + // app._store.dispatch(routerRedux.push('/login')) + // } } const routes = [ diff --git a/src/routes/request/index.js b/src/routes/request/index.js index 26c8e5a..6d9c98b 100644 --- a/src/routes/request/index.js +++ b/src/routes/request/index.js @@ -10,8 +10,18 @@ import { Input, Button, } from 'antd' +const { api, baseURL } = config +const { userInfo, dashboard } = api const requestOptions = [ + { + url: baseURL + userInfo, + desc: 'intercept request by mock.js', + }, + { + url: baseURL + dashboard, + desc: 'intercept request by mock.js', + }, { url: `${location.origin}/api/users`, desc: 'intercept request by mock.js', diff --git a/src/services/app.js b/src/services/app.js index 2e4594d..c4a62d4 100644 --- a/src/services/app.js +++ b/src/services/app.js @@ -1,7 +1,7 @@ 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', diff --git a/src/services/dashboard.js b/src/services/dashboard.js index 2756027..7400977 100644 --- a/src/services/dashboard.js +++ b/src/services/dashboard.js @@ -1,4 +1,6 @@ -import { request } from '../utils' +import { request, config } from '../utils' +const { api } = config +const { dashboard } = api export async function myCity (params) { return request({ @@ -16,7 +18,7 @@ export async function queryWeather (params) { export async function query (params) { return request({ - url: '/api/dashboard', + url: dashboard, method: 'get', data: params, }) diff --git a/src/services/users.js b/src/services/users.js index 960e6b7..bb4645c 100644 --- a/src/services/users.js +++ b/src/services/users.js @@ -1,8 +1,10 @@ -import { request } from '../utils' +import { request, config } from '../utils' +const { api } = config +const { users } = api export async function query (params) { return request({ - url: '/api/users', + url: users, method: 'get', data: params, }) @@ -10,7 +12,7 @@ export async function query (params) { export async function create (params) { return request({ - url: '/api/users', + url: users, method: 'post', data: params, }) @@ -18,7 +20,7 @@ export async function create (params) { export async function remove (params) { return request({ - url: '/api/users', + url: users, method: 'delete', data: params, }) @@ -26,7 +28,7 @@ export async function remove (params) { export async function update (params) { return request({ - url: '/api/users', + url: users, method: 'put', data: params, }) diff --git a/src/utils/config.js b/src/utils/config.js index 5635f81..b628707 100644 --- a/src/utils/config.js +++ b/src/utils/config.js @@ -13,5 +13,7 @@ module.exports = { userLogin: '/user/login', userLogout: '/user/logout', userInfo: '/userInfo', + users: '/users', + dashboard: '/dashboard', }, }