修改登录操作

Author: xujie3949

package.json

@@ -7,8 +7,6 @@
     "run-Android": "react-native run-android"
   },
   "dependencies": {
-    "babel-polyfill": "^6.9.1",
-    "isomorphic-fetch": "^2.2.1",
     "react": "15.2.1",
     "react-native": "0.30.0",
     "react-native-button": "^1.6.0",

src/actions/loginActions.js

@@ -3,32 +3,18 @@
  */
 import { createAction } from 'redux-actions';
 import loginActionEnum from '../constants/loginActionEnum'
-import {api} from '../apis/api'
+import {api, callApi} from '../apis/api'
 const loginActions = {
     login: createAction(loginActionEnum.LOGIN_REQUEST),
-    loginRequest: (data)=> {
+    loginRequest: (parameter)=> {
         return dispatch=> {
-            api.login(data)
-                .then(response=> {
-                    if (response.ok) {
-                        return response;
-                    } else {
-                        console.warn("出错了");
-                    }
-                })
-                .then(response=>response.json())
-                .then(jsonResult=> {
-                    if (jsonResult.errcode === 0) {
-                        console.warn(jsonResult.data);
-                    } else {
-                        console.warn(jsonResult.errmsg);
-                    }
-                })
-                .catch(error=> {
-                    console.warn(error);
-                });
+            callApi(
+                api.login(parameter),
+                (data)=>console.warn(data),
+                (err)=>console.warn(err)
+            );
         }
-    },
+    }
 };
 
 export default loginActions;

src/apis/api.js

@@ -2,42 +2,35 @@ import { fetchMethod, createFetch } from '../fetch/fetch'
 import appConfig from '../constants/appConfig'
 
 const api = {
-    test: (parameter)=> createFetch(
-        `${appConfig.serviceRoot}service/man/userInfo/login`,
-        fetchMethod.Get,
-        {parameter: parameter}
-    ),
     login: (parameter)=> createFetch(
         `${appConfig.serviceRoot}app/login`,
         fetchMethod.Get,
         {parameter: parameter}
     )
 };
 
-function callApi(api, success, fail){
-    api.then(response=> {
-            if (response.ok) {
-                return response;
-            } else {
-                throw new Error(`网络错误:${response.status}`);
-            }
-        })
-        .then(response=>response.json())
-        .then(jsonResult=> {
-            if (jsonResult.errcode === 0) {
-                if (success) {
-                    const data = jsonResult.data;
-                    success(data);
-                }
-            } else {
-                throw new Error(`服务器错误:${jsonResult.errmsg}`);
-            }
-        })
-        .catch(error=> {
-            if (fail) {
-                fail(error.message);
+async function callApi(api, success, fail) {
+    try {
+        const response = await api;
+        if (!response.ok) {
+            throw new Error(`网络错误:${response.status}`);
+        }
+
+        const jsonResult = await response.json();
+
+        if (jsonResult.errcode === 0) {
+            if (success) {
+                const data = jsonResult.data;
+                success(data);
             }
-        })
+        } else {
+            throw new Error(`服务器错误:${jsonResult.errmsg}`);
+        }
+    } catch (error) {
+        if (fail) {
+            fail(error.message);
+        }
+    }
 }
 
 export {

src/containers/android/Login.js

@@ -74,6 +74,7 @@ class Login extends Component {
         this.login = this.login.bind(this);
     }
     login() {
+        console.log("test");
         const username = this.refs.username._lastNativeText;
         const password = this.refs.password._lastNativeText;
         const data = {

src/fetch/fetch.js

@@ -30,6 +30,7 @@ function createFetch(url, method, jsonObj) {
                 const options = {
                     method: fetchMethod.Get
                 };
+                console.log(urlWithQueryStr);
                 return fetch(urlWithQueryStr, options);
             }
             break;
@@ -40,6 +41,7 @@ function createFetch(url, method, jsonObj) {
                     method: fetchMethod.Post,
                     body: queryStr
                 };
+                console.log(url);
                 return fetch(url, options);
             }
             break;