Merge branch 'patch' into '6.5.5'

revert code



See merge request !2

@@ -12,7 +12,9 @@ export default keyMirror({
     SET_HOST: null,
     SET_SERVICE_HOST: null,
     UPDATE_LOGOUT_MODAL_STATE: null,
-    UPDATE_LOGOUT_STATUS: null,
+    FETCH_LOGOUT_STATUS_REQUEST: null,
+    FETCH_LOGOUT_STATUS_SUCCESS: null,
+    FETCH_LOGOUT_STATUS_FAILURE: null,
 
 
     //注销原因

@@ -9,7 +9,7 @@
 import React, {Component} from 'react';
 import {
     StyleSheet,
-    Dimensions
+    Dimensions,
 } from 'react-native'
 
 import {bindActionCreators} from 'redux';
@@ -19,6 +19,8 @@ import * as userLogoutActions from '../reducers/userLogout/userLogoutActions';
 import UserLogout from '../components/userLogout/UserLogout';
 import UserLogoutFaild from '../components/userLogout/UserLogoutFaild';
 import UserLogoutStatus from '../components/userLogout/UserLogoutStatus';
+import LoadingIndicator from '../../common/components/LoadingIndicator';
+
 
 const actions = [
     userLogoutActions,
@@ -82,29 +84,49 @@ class UserLogoutContainer extends Component {
     }
 
     render() {
-        let {showConfirmLogoutModal, logoutStatus} = this.props.userLogout;
+        let {showConfirmLogoutModal, logoutStatus, isFetching, tipMessage} = this.props.userLogout;
         if (logoutStatus == 0) {
-            return (
-                <UserLogout
-                    showConfirmLogoutModal = {showConfirmLogoutModal}
-                    onPressLogoutClause = {this._onPressLogoutClause}
-                    confirmLogoutAction = {this._confirmLogoutAction}
-                    updateLogoutModalState = {this._updateLogoutModalState}
-                />
-            );
+            if (isFetching) {
+                return (
+                    <LoadingIndicator isVisible={isFetching}/>
+                );
+            } else {
+                return(
+                    <UserLogout
+                        showConfirmLogoutModal = {showConfirmLogoutModal}
+                        onPressLogoutClause = {this._onPressLogoutClause}
+                        confirmLogoutAction = {this._confirmLogoutAction}
+                        updateLogoutModalState = {this._updateLogoutModalState}
+                    />
+                )
+            }
+
         } else if(logoutStatus == 1){
-            return (
-                <UserLogoutStatus
-                />
-            );
+            if (isFetching) {
+                return (
+                    <LoadingIndicator isVisible={isFetching}/>
+                );
+            } else {
+                return (
+                    <UserLogoutStatus
+                    />
+                )
+            }
+
         }else if(logoutStatus == 3){
-            return (
-                <UserLogoutFaild
-                    isFaildReasonPage={false}
-                    gotoLogoutFaildReason={this._gotoLogoutFaildReason}
-                    gotoLogoutReason={this._gotoLogoutReason}
-                />
-            );
+            if (isFetching) {
+                return (
+                    <LoadingIndicator isVisible={isFetching}/>
+                );
+            } else {
+                return (
+                    <UserLogoutFaild
+                        isFaildReasonPage={false}
+                        gotoLogoutFaildReason={this._gotoLogoutFaildReason}
+                        gotoLogoutReason={this._gotoLogoutReason}
+                    />
+                )
+            }
         }
     }
 }

@@ -15,7 +15,9 @@ import UserLogoutService from '../../services/UserLogoutService';
 
 const {
     UPDATE_LOGOUT_MODAL_STATE,
-    UPDATE_LOGOUT_STATUS,
+    FETCH_LOGOUT_STATUS_REQUEST,
+    FETCH_LOGOUT_STATUS_SUCCESS,
+    FETCH_LOGOUT_STATUS_FAILURE,
 } = require('../../constants/actionTypes').default;
 
 export function onPressLogoutClause() {
@@ -32,10 +34,23 @@ export function updateLogoutModalState(flag) {
     }
 }
 
-export function updateLogoutStatus(status) {
+export function fetchLogoutStatusRequest() {
     return{
-        type: UPDATE_LOGOUT_STATUS,
-        payload: status
+        type: FETCH_LOGOUT_STATUS_REQUEST
+    }
+}
+
+export function fetchLogoutStatusSuccess(obj) {
+    return{
+        type: FETCH_LOGOUT_STATUS_SUCCESS,
+        payload: obj
+    }
+}
+
+export function fetchLogoutStatusFailure(message) {
+    return{
+        type: FETCH_LOGOUT_STATUS_FAILURE,
+        payload: message
     }
 }
 
@@ -50,14 +65,14 @@ export function confirmLogoutAction() {
 export function checkUserLogedIn() {
     return (dispatch, getState) => {
         let {app} = getState();
-
+        dispatch(fetchLogoutStatusRequest());
         let fetchLogoutState = (uid) => {
             return new UserLogoutService(app.host).fetchLogoutState(uid)
                 .then(json => {
-                    dispatch(updateLogoutStatus(json.status));
+                    dispatch(fetchLogoutStatusSuccess({state:json.status, descList:json.desc}));
                 })
                 .catch(error => {
-                    console.log(error);
+                    dispatch(fetchLogoutStatusFailure(error.message?error.message:'网络错误'));
                 });
         }
 

@@ -9,9 +9,11 @@
 import {Record, List, Map} from 'immutable';
 
 let InitialState = Record({
-	isFetching: false,
+	isFetching: true,
     showConfirmLogoutModal: false,
     logoutStatus: 0,
+    tipMessage: '',
+    cancleFialdDesc: List(),
 });
 
 export default InitialState;

@@ -11,7 +11,9 @@ import Immutable, {Map} from 'immutable';
 
 const {
     UPDATE_LOGOUT_MODAL_STATE,
-    UPDATE_LOGOUT_STATUS
+    FETCH_LOGOUT_STATUS_REQUEST,
+    FETCH_LOGOUT_STATUS_SUCCESS,
+    FETCH_LOGOUT_STATUS_FAILURE,
 } = require('../../constants/actionTypes').default;
 
 const initialState = new InitialState;
@@ -21,8 +23,17 @@ export default function userLogoutReducer(state=initialState, action) {
         case UPDATE_LOGOUT_MODAL_STATE:{
             return state.set('showConfirmLogoutModal',action.payload);
         }
-        case UPDATE_LOGOUT_STATUS: {
-            return state.set('logoutStatus',action.payload);
+        case fetchLogoutStatusRequest:{
+            return state.set('isFetching', true);
+        }
+        case FETCH_LOGOUT_STATUS_SUCCESS:{
+            return state.set('logoutStatus',action.payload.state)
+                .set('cancleFialdDesc', Immutable.fromJS(action.payload.descList))
+                .set('isFetching', false);
+        }
+        case  fetchLogoutStatusFailure:{
+            return state.set('isFetching', false)
+                .set('tipMessage', action.payload);
         }
 
     }