Authored by 李犇

收藏商品数量加上全球购的商品数;境外订单展示订单数量——review by 陈林

... ... @@ -301,9 +301,9 @@ export default class MineListHeader extends React.Component {
<TouchableOpacity onPress={() => this.props.onPressItem('mineFavProduct','')}>
<View style={styles.topnum_content}>
{
(profile.uid != '0' && mineInfoNum.product_favorite_total > 0) ?
(profile.uid != '0' && mineInfoNum.product_favorite_total + globalOrderData.collect_count >= 0) ?
<Text
style={styles.top_number_text}>{mineInfoNum.product_favorite_total < 100 ? mineInfoNum.product_favorite_total : '99+'}</Text> : null
style={styles.top_number_text}>{mineInfoNum.product_favorite_total + globalOrderData.collect_count < 100 ? mineInfoNum.product_favorite_total + globalOrderData.collect_count : '99+'}</Text> : null
}
<Text style={styles.top_text}>收藏的商品</Text>
</View>
... ... @@ -318,7 +318,7 @@ export default class MineListHeader extends React.Component {
<TouchableOpacity onPress={() => this.props.onPressItem('mineFavBrand','')}>
<View style={styles.topnum_content}>
{
(profile.uid != '0' && mineInfoNum.brand_favorite_total > 0) ?
(profile.uid != '0' && mineInfoNum.brand_favorite_total >= 0) ?
<Text
style={styles.top_number_text}>{mineInfoNum.brand_favorite_total < 100 ? mineInfoNum.brand_favorite_total : '99+'}</Text> : null
}
... ... @@ -335,7 +335,7 @@ export default class MineListHeader extends React.Component {
<TouchableOpacity onPress={() => this.props.onPressItem('mineBrowseHis','')}>
<View style={styles.topnum_content}>
{
(profile.uid != '0' && mineInfoNum.product_browse > 0) ?
(profile.uid != '0' && mineInfoNum.product_browse >= 0) ?
<Text
style={styles.top_number_text}>{mineInfoNum.product_browse < 100 ? mineInfoNum.product_browse : '99+'}</Text> : null
}
... ... @@ -473,11 +473,17 @@ export default class MineListHeader extends React.Component {
{(globalOrderData && globalOrderData.hasOrder === 'Y') ?
<TouchableOpacity onPress={() => this.props.onPressItem('mineGlobalOrder','')}>
<View style={styles.row}>
<Image style={styles.row_icon}
source={require('../../image/mine_globalpurchase_icon.png')}/>
<Image style={styles.row_icon} source={require('../../image/mine_globalpurchase_icon.png')}/>
<Text style={[styles.icon_text,{fontSize:17}]} numberOfLines={1}>
境外发货订单
</Text>
{
(profile.uid != '0' && globalOrderData.tradingOrder > 0) ?
<View style={styles.globalDot}>
<Text style={styles.globalDotText}>{globalOrderData.tradingOrder < 100 ? globalOrderData.tradingOrder : '99+'}</Text>
</View> : null
}
<Image style={styles.arrow} source={require('../../image/arrow_gray.png')}/>
</View>
<View style={{
... ... @@ -901,5 +907,24 @@ let styles = StyleSheet.create({
},
dot: {
marginRight: 10,
}
},
globalDot:{
backgroundColor:'red',
borderColor:'red',
marginRight:10,
borderRadius: 10,
paddingLeft:4,
paddingRight:4,
borderWidth: (Platform.OS==='ios' ? 3 : 5) / PixelRatio.get(),
},
globalDotText:{
color: 'white',
fontSize:10,
textAlign: 'center',
textAlignVertical: 'center',
backgroundColor: 'transparent'
},
});
... ...