From f4a108cfc1cc0d3261f035e999ed529ea148eee7 Mon Sep 17 00:00:00 2001
From: zuiidea <zuiiidea@gmail.com>
Date: Wed, 2 Nov 2016 22:35:07 +0800
Subject: [PATCH] logout

---
 mock/app.js         |  5 ++++-
 src/routes/login.js |  3 +--
 src/routes/users.js |  1 -
 src/utils/mock.js   | 14 +++++++++-----
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/mock/app.js b/mock/app.js
index e50aaf2..236890e 100644
--- a/mock/app.js
+++ b/mock/app.js
@@ -11,6 +11,10 @@ if (!global.adminUsersData) {
       {
         username: 'guest',
         password: 'guest'
+      },
+      {
+        username: '吴彦祖',
+        password: '123456'
       }
     ]
   adminUsersData = data
@@ -28,7 +32,6 @@ Watch.watch(adminUsersData, function () {
 
 module.exports = {
   'POST /api/login' (req, res) {
-    console.log(req);
     const userItem = req.body
     const response = {
       success: false,
diff --git a/src/routes/login.js b/src/routes/login.js
index abebdce..6193550 100644
--- a/src/routes/login.js
+++ b/src/routes/login.js
@@ -22,7 +22,6 @@ const login = ({
     validateFieldsAndScroll
   }
 }) => {
-  console.log(loginButtonLoading);
 
   function handleOk() {
     validateFieldsAndScroll((errors, values) => {
@@ -58,7 +57,7 @@ const login = ({
                 message: '请填写密码'
               }
             ]
-          })(<Input size="large" placeholder="密码"/>)}
+          })(<Input size="large" type="password" placeholder="密码"/>)}
         </FormItem>
         <Row>
           <Button type="primary" size="large" onClick={handleOk} loading={loginButtonLoading}>
diff --git a/src/routes/users.js b/src/routes/users.js
index 15612d4..3b4f244 100644
--- a/src/routes/users.js
+++ b/src/routes/users.js
@@ -65,7 +65,6 @@ function Users({ location, dispatch, users }) {
     field,
     keyword,
     onSearch(fieldsValue) {
-      console.log(fieldsValue);
       dispatch({
         type: 'users/query',
         payload: fieldsValue,
diff --git a/src/utils/mock.js b/src/utils/mock.js
index 8d91fc7..f4469bf 100644
--- a/src/utils/mock.js
+++ b/src/utils/mock.js
@@ -1,5 +1,5 @@
 const Mock = require('mockjs')
-const mockData = [require("../../mock/users"),require("../../mock/app")]
+const mockData = [require("../../mock/users"), require("../../mock/app")]
 
 function serialize(str) {
   let paramArray = str.split("&")
@@ -12,9 +12,13 @@ function serialize(str) {
 
 for (let i in mockData) {
   for (let key in mockData[i]) {
-    Mock.mock(eval("/"+key.split(" ")[1].replace(/\//g,"\\\/")+"/"), key.split(" ")[0].toLowerCase(), function (options) {
-      if(key.split(" ")[0].toLowerCase()=='get'){
-        options.query = !!options.url.split("?")[1] ? serialize(options.url.split("?")[1]) : (!!options.body ? serialize(options.body) : {})
+    Mock.mock(eval("/" + key.split(" ")[1].replace(/\//g, "\\\/") + "/"), key.split(" ")[0].toLowerCase(), function (options) {
+      if (key.split(" ")[0].toLowerCase() == 'get') {
+        options.query = !!options.url.split("?")[1]
+          ? serialize(options.url.split("?")[1])
+          : (!!options.body
+            ? serialize(options.body)
+            : {})
       }
       let res = {}
       let result = {}
@@ -27,4 +31,4 @@ for (let i in mockData) {
   }
 }
 
-Mock.setup({timeout: 400})
+Mock.setup({timeout: '200-600'})