收藏商品数量加上全球购的商品数;境外订单展示订单数量——review by 陈林
Showing
1 changed file
with
32 additions
and
7 deletions
@@ -301,9 +301,9 @@ export default class MineListHeader extends React.Component { | @@ -301,9 +301,9 @@ export default class MineListHeader extends React.Component { | ||
301 | <TouchableOpacity onPress={() => this.props.onPressItem('mineFavProduct','')}> | 301 | <TouchableOpacity onPress={() => this.props.onPressItem('mineFavProduct','')}> |
302 | <View style={styles.topnum_content}> | 302 | <View style={styles.topnum_content}> |
303 | { | 303 | { |
304 | - (profile.uid != '0' && mineInfoNum.product_favorite_total > 0) ? | 304 | + (profile.uid != '0' && mineInfoNum.product_favorite_total + globalOrderData.collect_count >= 0) ? |
305 | <Text | 305 | <Text |
306 | - style={styles.top_number_text}>{mineInfoNum.product_favorite_total < 100 ? mineInfoNum.product_favorite_total : '99+'}</Text> : null | 306 | + style={styles.top_number_text}>{mineInfoNum.product_favorite_total + globalOrderData.collect_count < 100 ? mineInfoNum.product_favorite_total + globalOrderData.collect_count : '99+'}</Text> : null |
307 | } | 307 | } |
308 | <Text style={styles.top_text}>收藏的商品</Text> | 308 | <Text style={styles.top_text}>收藏的商品</Text> |
309 | </View> | 309 | </View> |
@@ -318,7 +318,7 @@ export default class MineListHeader extends React.Component { | @@ -318,7 +318,7 @@ export default class MineListHeader extends React.Component { | ||
318 | <TouchableOpacity onPress={() => this.props.onPressItem('mineFavBrand','')}> | 318 | <TouchableOpacity onPress={() => this.props.onPressItem('mineFavBrand','')}> |
319 | <View style={styles.topnum_content}> | 319 | <View style={styles.topnum_content}> |
320 | { | 320 | { |
321 | - (profile.uid != '0' && mineInfoNum.brand_favorite_total > 0) ? | 321 | + (profile.uid != '0' && mineInfoNum.brand_favorite_total >= 0) ? |
322 | <Text | 322 | <Text |
323 | style={styles.top_number_text}>{mineInfoNum.brand_favorite_total < 100 ? mineInfoNum.brand_favorite_total : '99+'}</Text> : null | 323 | style={styles.top_number_text}>{mineInfoNum.brand_favorite_total < 100 ? mineInfoNum.brand_favorite_total : '99+'}</Text> : null |
324 | } | 324 | } |
@@ -335,7 +335,7 @@ export default class MineListHeader extends React.Component { | @@ -335,7 +335,7 @@ export default class MineListHeader extends React.Component { | ||
335 | <TouchableOpacity onPress={() => this.props.onPressItem('mineBrowseHis','')}> | 335 | <TouchableOpacity onPress={() => this.props.onPressItem('mineBrowseHis','')}> |
336 | <View style={styles.topnum_content}> | 336 | <View style={styles.topnum_content}> |
337 | { | 337 | { |
338 | - (profile.uid != '0' && mineInfoNum.product_browse > 0) ? | 338 | + (profile.uid != '0' && mineInfoNum.product_browse >= 0) ? |
339 | <Text | 339 | <Text |
340 | style={styles.top_number_text}>{mineInfoNum.product_browse < 100 ? mineInfoNum.product_browse : '99+'}</Text> : null | 340 | style={styles.top_number_text}>{mineInfoNum.product_browse < 100 ? mineInfoNum.product_browse : '99+'}</Text> : null |
341 | } | 341 | } |
@@ -473,11 +473,17 @@ export default class MineListHeader extends React.Component { | @@ -473,11 +473,17 @@ export default class MineListHeader extends React.Component { | ||
473 | {(globalOrderData && globalOrderData.hasOrder === 'Y') ? | 473 | {(globalOrderData && globalOrderData.hasOrder === 'Y') ? |
474 | <TouchableOpacity onPress={() => this.props.onPressItem('mineGlobalOrder','')}> | 474 | <TouchableOpacity onPress={() => this.props.onPressItem('mineGlobalOrder','')}> |
475 | <View style={styles.row}> | 475 | <View style={styles.row}> |
476 | - <Image style={styles.row_icon} | ||
477 | - source={require('../../image/mine_globalpurchase_icon.png')}/> | 476 | + <Image style={styles.row_icon} source={require('../../image/mine_globalpurchase_icon.png')}/> |
478 | <Text style={[styles.icon_text,{fontSize:17}]} numberOfLines={1}> | 477 | <Text style={[styles.icon_text,{fontSize:17}]} numberOfLines={1}> |
479 | 境外发货订单 | 478 | 境外发货订单 |
480 | </Text> | 479 | </Text> |
480 | + { | ||
481 | + (profile.uid != '0' && globalOrderData.tradingOrder > 0) ? | ||
482 | + <View style={styles.globalDot}> | ||
483 | + <Text style={styles.globalDotText}>{globalOrderData.tradingOrder < 100 ? globalOrderData.tradingOrder : '99+'}</Text> | ||
484 | + </View> : null | ||
485 | + } | ||
486 | + | ||
481 | <Image style={styles.arrow} source={require('../../image/arrow_gray.png')}/> | 487 | <Image style={styles.arrow} source={require('../../image/arrow_gray.png')}/> |
482 | </View> | 488 | </View> |
483 | <View style={{ | 489 | <View style={{ |
@@ -901,5 +907,24 @@ let styles = StyleSheet.create({ | @@ -901,5 +907,24 @@ let styles = StyleSheet.create({ | ||
901 | }, | 907 | }, |
902 | dot: { | 908 | dot: { |
903 | marginRight: 10, | 909 | marginRight: 10, |
904 | - } | 910 | + }, |
911 | + | ||
912 | + globalDot:{ | ||
913 | + backgroundColor:'red', | ||
914 | + borderColor:'red', | ||
915 | + marginRight:10, | ||
916 | + borderRadius: 10, | ||
917 | + paddingLeft:4, | ||
918 | + paddingRight:4, | ||
919 | + borderWidth: (Platform.OS==='ios' ? 3 : 5) / PixelRatio.get(), | ||
920 | + }, | ||
921 | + | ||
922 | + globalDotText:{ | ||
923 | + color: 'white', | ||
924 | + fontSize:10, | ||
925 | + textAlign: 'center', | ||
926 | + textAlignVertical: 'center', | ||
927 | + backgroundColor: 'transparent' | ||
928 | + }, | ||
929 | + | ||
905 | }); | 930 | }); |
-
Please register or login to post a comment