Merge branch 'master' of git://192.168.1.116/bolan-root/frontend/manager-app-sz into wq

src/services/navigator.js

@@ -8,12 +8,15 @@ function setContainer(container: Object) {
   _container = container;
 }
 
+function back() {
+  _container.props.navigation.dispatch(NavigationActions.back());
+}
+
 function reset(routeName: string, params?: NavigationParams) {
-  _container.dispatch(NavigationActions.reset({
+  _container.props.navigation.dispatch(NavigationActions.reset({
     index: 0,
     actions: [
       NavigationActions.navigate({
-        type: 'Navigation/NAVIGATE',
         routeName,
         params,
       }),
@@ -22,18 +25,16 @@ function reset(routeName: string, params?: NavigationParams) {
 }
 
 function navigate(routeName: string, params?: NavigationParams) {
-  _container.dispatch(NavigationActions.navigate({
-    type: 'Navigation/NAVIGATE',
+  _container.props.navigation.dispatch(NavigationActions.navigate({
     routeName,
     params,
   }));
 }
 
 function navigateDeep(actions: { routeName: string, params?: NavigationParams }[]) {
-  _container.dispatch(actions.reduceRight(
+  _container.props.navigation.dispatch(actions.reduceRight(
     (prevAction, action): any =>
       NavigationActions.navigate({
-        type: 'Navigation/NAVIGATE',
         routeName: action.routeName,
         params: action.params,
         action: prevAction,
@@ -54,6 +55,7 @@ export default {
   setContainer,
   navigateDeep,
   navigate,
+  back,
   reset,
   getCurrentRoute,
 };

src/utils/error.js

@@ -15,17 +15,22 @@ const errStyle = {
 };
 
 export function processError(err) {
-  if (err && err.data) {
-    const { data } = err;
-    switch (data.errorCode) {
-      case errorCodes.no_such_user:
-        Toast.fail('用户不存在！');
-        break;
-      case errorCodes.invalid_token:
-        navigate('Login');
-        break;
-      default:
-        showError(err);
+  if (err) {
+    if (err.preventDefault) {
+      err.preventDefault();
+    }
+    if (err.data) {
+      const { data } = err;
+      switch (data.errorCode) {
+        case errorCodes.no_such_user:
+          Toast.fail('用户不存在！');
+          break;
+        case errorCodes.invalid_token:
+          navigate('Login');
+          break;
+        default:
+          showError(err);
+      }
     }
   }
 }