Merge remote-tracking branch 'origin/5.4.1' into 5.4.1

@@ -43,7 +43,7 @@ export default class DivideImage extends Component{
 
 let {width} = Dimensions.get('window');
 const DEVICE_WIDTH_RATIO = width / 320;
-let height = 15 * DEVICE_WIDTH_RATIO;
+let height = Math.ceil(15 * DEVICE_WIDTH_RATIO);
 
 let styles = StyleSheet.create({
 

@@ -77,6 +77,7 @@ let styles = StyleSheet.create({
     container: {
         width,
         height: containerHeight,
+        backgroundColor: '#f0f0f0',
     },
 	store: {
         width: width,

@@ -83,6 +83,7 @@ let styles = StyleSheet.create({
         width: width,
         height: containerHeight,
         flexDirection: 'row',
+        backgroundColor: '#f0f0f0',
     },
     image: {
         width: imageWidth,

@@ -42,6 +42,7 @@ import VipUserFloor from '../floor/VipUserFloor';
 import ActivityProductFloor from '../floor/ActivityProductFloor';
 import HotCategoryIndividualization from '../floor/HotCategoryIndividualization';
 import ProductListCell from '../../../common/components/ListCell/ProductListCell';
+import channelTransfer from '../../../common/utils/channelTransfer';
 
 export default class Home extends Component {
 
@@ -81,17 +82,8 @@ export default class Home extends Component {
 
     _currentChannelData() {
         let channel = this.props.channel;
-        let data = {};
-        if (channel == 1) {
-            data = this.props.data.boy;
-        } else if (channel == 2) {
-            data = this.props.data.girl;
-        } else if (channel == 3) {
-            data = this.props.data.kid;
-        } else if (channel == 4) {
-            data = this.props.data.lifeStyle;
-        }
-        return data;
+        let channelStr = channelTransfer.number2String(channel);
+        return this.props.data[channelStr];
     }
 
     _renderRow(rowData, sectionID, rowID) {
@@ -301,7 +293,7 @@ export default class Home extends Component {
                 return (
                     <ShopRecommend
                         data={rowData.get('data')}
-                        favoriteState={data.shop}
+                        favoriteState={data.shop.get('list')}
                         onPressShopRecommendItem={this.props.onPressShopRecommendItem}
                         onPressShopFavorite={this.props.onPressShopFavorite}
                         onPressTitleMore={this.props.onPressTitleMore}