some litile refactor

soliury · soliury · commit 459b1a78fc14 · 2016-02-01T17:36:33.000+08:00
diff --git a/src/actions/user.js b/src/actions/user.js
@@ -58,6 +58,4 @@ export const getUserInfo = createAction(types.GET_USER_INFO, async (loginName)=>
 });
 
 
-export const logout = createAction(types.LOGOUT, async ()=> {
-	return userService.storage.clearUser();
-});
+export const logout = createAction(types.LOGOUT, userService.storage.clearUser);
diff --git a/src/layouts/Utils.js b/src/layouts/Utils.js
@@ -8,11 +8,6 @@ import Toast from '../components/base/Toast';
 
 
 class Utils extends Component {
-	constructor(props) {
-		super(props);
-	}
-
-
 	componentDidMount() {
 		const { actions } = this.props;
 		//actions.getUserFromStorage();
diff --git a/src/store/asyncActionCallbackMiddleware.js b/src/store/asyncActionCallbackMiddleware.js
@@ -1,12 +1,12 @@
 export default function asyncActionCallbackMiddleware() {
 	return next => action => {
-		const { meta = {}, error } = action;
+		const { meta = {}, error, payload } = action;
 		const { sequence = {}, resolved, rejected } = meta;
 		if (sequence.type !== 'next') return next(action);
 
 
 		// 执行回调
-		error ? (rejected && rejected()) : (resolved && resolved());
+		error ? (rejected && rejected(payload)) : (resolved && resolved(payload));
 
 		next(action);
 	}
diff --git a/src/store/utilsMiddleware.js b/src/store/utilsMiddleware.js
@@ -4,8 +4,8 @@ import * as utilsActions from '../actions/utils';
 
 export default function utilsMiddleware({ dispatch }) {
 	return next => action => {
-		const { meta = {}, payload, error, type } = action;
-		const { toast } = meta;
+		const { payload, error, type } = action;
+		const { toast } = action.meta || {};
 
 		const dispatchToast = (...args)=> {
 			dispatch(utilsActions.toast(...args));
