Merge branch '5.4.1' of http://git.yoho.cn/mobile/YH_RNComponent into 5.4.1

@@ -38,7 +38,6 @@ let templet = new (Record({
 	list: List(),
 	shop: shop,
 	bottomBanner: bottomBanner,
-	endReached:false,
 	favorite: favorite,	//男， 女，潮童频道 猜你喜欢列表
 	content_code: '',
 	endReached: false,

@@ -156,10 +156,10 @@ export default function redBrandReducer(state=initialState, action) {
 		}
         case ADD_FAVORITE_SUCCESS: {
             if (action.payload) {
-                return state.setIn(['shopIntro', 'is_addFav'], action.payload)
+                return state.setIn(['shopIntro', 'is_addFav'], true)
                 .setIn(['shopIntro', 'favoriteCount'],parseInt(state.shopIntro.favoriteCount) +1);
             }else {
-                return state.setIn(['shopIntro', 'is_addFav'], action.payload);
+                return state.setIn(['shopIntro', 'is_addFav'], true);
             }
 		}
 		case ADD_FAVORITE_FAILURE: {