users

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)
   },
 }

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))

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,

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({

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 = [

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',

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',

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,
   })

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,
   })

src/utils/config.js

@@ -13,5 +13,7 @@ module.exports = {
     userLogin: '/user/login',
     userLogout: '/user/logout',
     userInfo: '/userInfo',
+    users: '/users',
+    dashboard: '/dashboard',
   },
 }