Authored by 于良

Merge branch '5.8.0-0.44.0' of http://git.yoho.cn/mobile/YH_RNComponent into 5.8.0-0.44.0

@@ -130,7 +130,7 @@ export default class ProductListCell extends Component { @@ -130,7 +130,7 @@ export default class ProductListCell extends Component {
130 } 130 }
131 131
132 //新品到着升级为sectionList后价格会被遮挡 132 //新品到着升级为sectionList后价格会被遮挡
133 - let priceMarginTop = (Platform.OS === 'android' && fromPage === 'newArrival') ? Math.ceil(-18 * DEVICE_WIDTH_RATIO) : Math.ceil(-4 * DEVICE_WIDTH_RATIO); 133 + let priceMarginTop = Math.ceil(-4 * DEVICE_WIDTH_RATIO);
134 134
135 return ( 135 return (
136 <View style={[styles.priceContainer, {marginTop: priceMarginTop,} ]}> 136 <View style={[styles.priceContainer, {marginTop: priceMarginTop,} ]}>
@@ -93,7 +93,6 @@ export default class NewArrivalCell extends Component { @@ -93,7 +93,6 @@ export default class NewArrivalCell extends Component {
93 rowID={index} 93 rowID={index}
94 data={rowData} 94 data={rowData}
95 similarIndex={similarIndex} 95 similarIndex={similarIndex}
96 - fromPage={'newArrival'}  
97 onPressProduct={this.props.onPressProductListProduct} 96 onPressProduct={this.props.onPressProductListProduct}
98 onLongPressProduct={this.props.onLongPressProduct} 97 onLongPressProduct={this.props.onLongPressProduct}
99 onPressFindSimilar={this.props.onPressFindSimilar} 98 onPressFindSimilar={this.props.onPressFindSimilar}
@@ -83,6 +83,6 @@ let styles = StyleSheet.create({ @@ -83,6 +83,6 @@ let styles = StyleSheet.create({
83 subContainer: { 83 subContainer: {
84 flexDirection: 'row', 84 flexDirection: 'row',
85 width: width, 85 width: width,
86 - height: rowHeight, 86 + height: Platform.OS === 'ios'? rowHeight : rowHeight + 15 * DEVICE_WIDTH_RATIO,
87 } 87 }
88 }); 88 });
@@ -254,7 +254,7 @@ let styles = StyleSheet.create({ @@ -254,7 +254,7 @@ let styles = StyleSheet.create({
254 fontSize: 12, 254 fontSize: 12,
255 color: 'white', 255 color: 'white',
256 textAlign: 'center', 256 textAlign: 'center',
257 - width: 63, 257 + width: 70,
258 fontWeight: 'bold', 258 fontWeight: 'bold',
259 }, 259 },
260 line: { 260 line: {