update

src/components/EmailForm.js

@@ -13,7 +13,7 @@ const formItemLayout = {
 
 class EmailForm extends React.Component {
 
-  onUpdateEmail = (e) => {
+  onSubmit = (e) => {
     const { form, dispatch, data: {id} } = this.props
 
     e && e.preventDefault();
@@ -23,7 +23,7 @@ class EmailForm extends React.Component {
         
         const { email, password } = values
 
-        dispatch({type: "user/updateEmail", payload: { email, password, user_id: id }})
+        dispatch({type: "user/updateAccount", payload: { email, password, user_id: id }})
       }
     });
   }
@@ -68,7 +68,7 @@ class EmailForm extends React.Component {
     }
     
     return (
-      <Form onSubmit={this.onUpdateEmail}>
+      <Form onSubmit={this.onSubmit}>
         <FormItem {...emailProps.fromItem}>
           {getFieldDecorator(`email`, {...emailProps.decorator})(
             <Input 

src/components/PasswordForm.js

@@ -38,9 +38,9 @@ class EmailForm extends React.Component {
       if (!err) {
         console.log('Received values of form: ', values);
         
-        const { email, password } = values
+        const { new_password, password } = values
 
-        // dispatch({type: "user/updateEmail", payload: { email, password, user_id: id }})
+        dispatch({type: "user/updateAccount", payload: { new_password, password, user_id: id }})
       }
     });
   }
@@ -87,7 +87,7 @@ class EmailForm extends React.Component {
     return (
       <Form onSubmit={this.onSubmit}>          
         <FormItem {...passwordProps.fromItem} label="old password">
-          {getFieldDecorator(`old_password`, {...passwordProps.decorator})(
+          {getFieldDecorator(`password`, {...passwordProps.decorator})(
             <Input {...passwordProps.input} />
           )}
         </FormItem>

src/components/SendEmail.css

+
+.normal {
+}

src/components/SendEmail.js

+import React from 'react';
+import styles from './SendEmail.css';
+
+function SendEmail() {
+  return (
+    <div className={styles.normal}>
+      Component: SendEmail
+    </div>
+  );
+}
+
+export default SendEmail;

src/index.js

 import dva from 'dva';
 import ReactDOM from 'react-dom';
 import { browserHistory } from 'dva/router'
+import { message } from 'antd'
 import './index.css';
 
 import { IntlProvider, addLocaleData } from 'react-intl';
 
 // 1. Initialize
 const app = dva({
+    onError: (error, dispatch) => {
+      message.destroy();
+      message.error(error.message);
+    },
     history: browserHistory
 });
 

src/models/auth.js

@@ -5,15 +5,16 @@ import { message } from 'antd'
 export default {
   namespace: 'auth',
   state: {
-    activateState: false,
     checkEmail: '',
     checkUsername: '',
+    isSendEmailActive: false,
     isEmailExists: false,
     isUserNameExists: false,
     isRegisterSubmit: false,
     isLoginSubmit: false,
     isForgotSubmit: false,
     isSpinSubmit: false,
+    isActivateSubmit: false,
     register: {}
   },
   reducers: {
@@ -136,35 +137,43 @@ export default {
   effects: {
     *activate({ payload }, { call, put }) {
       const { data } = yield call(activate, payload)
+
+      
+
     },
     *checkEmail({ payload }, { call, put }) {
-      const { data } = yield call(checkUserExists, payload)
 
+      try {
+        const { data } = yield call(checkUserExists, payload)
         if(data) {
           yield put({ type: 'check', payload: { isEmailExists: true , checkEmail: 'warning'}})
-      } else {
+        }
+      } catch (error) {
         yield put({ type: 'check', payload: { isEmailExists: false , checkEmail: 'success'}}) 
       }
     },
     *checkUsername({ payload }, { call, put }) {
+      try {
         const { data } = yield call(checkUserExists, payload)    
-
         if(data) {
           yield put({ type: 'check', payload: { isUserNameExists: true , checkUsername: 'warning'}})
-      } else {
+        }    
+      } catch (error) {
         yield put({ type: 'check', payload: { isUserNameExists: false , checkUsername: 'success'}})
+        
       }
     },
     *login({ payload }, { call, put }) {
+      try {
         const {data} = yield call(login, payload)
-        
         if(data){
           yield put({ type: 'loginSuccess' })   
           yield put({ type: 'user/loginSuccess', payload: { data } })
           message.info("登录成功")
-        } else {
+        }
+      } catch (error) {
         yield put({ type: 'loginFail' })
-          message.error("登陆失败")
+        message.error(error.message)
       }
     },
     *forgot({ payload }, { call, put }) {

src/models/user.js

@@ -93,15 +93,17 @@ export default {
         }
     },
     *updateAccount({ payload }, { call, put }) {
+      try {
         
         let { data } = yield call(updateAccount, payload )   
 
         if(data){
           yield put({ type: 'updateAccountSuccess', payload: { data } })
           message.info("更新成功")
-        }else {
+        }     
+      } catch (error) {
           yield put({ type: 'updateAccountFail' })
-          message.error("更新失败")      
+          message.error(error.message)
       }
     },
   },

src/utils/request.js

@@ -5,12 +5,19 @@ function parseJSON(response) {
   return response.json();
 }
 
-function checkStatus(response) {
+async function checkStatus(response) {
   if (response.status >= 200 && response.status < 300) {
     return response;
   }
 
-  const error = new Error(response.statusText);
+  let message 
+  try {
+    message = (await response.json())["message"]
+  } catch (error) {
+    message = response.statusText
+  }
+
+  const error = new Error(message);
   error.response = response;
   throw error;
 }
@@ -34,5 +41,5 @@ export default function request(url, options) {
     .then(checkStatus)
     .then(parseJSON)
     .then(data => ({ data }))
-    .catch(err => ({ err }));
+    // .catch(err => ({ err }));
 }