mobile / YH_RNComponent · Commits

Go to a project

Authored by 于良
Commit ba60b92b1365226d6214e8c23ff6709b1efc7036 2 parents b4c7dabd 4f732689

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

Inline Side-by-side
Showing 5 changed files with 44 additions and 13 deletions
@@ -677,20 +677,37 @@ export default class MineListHeader extends React.Component { @@ -677,20 +677,37 @@ export default class MineListHeader extends React.Component {
677 { 677 {
678 activityListInfo.list.map((item, i) => { 678 activityListInfo.list.map((item, i) => {
679 return ( 679 return (
680 - // item.get('state') === 1?  
681 <TouchableOpacity key={i} activeOpacity={1} onPress={() => this.props.onPressItem('mineActivity',item)}> 680 <TouchableOpacity key={i} activeOpacity={1} onPress={() => this.props.onPressItem('mineActivity',item)}>
682 - <View style={ i == 0 ? styles.red_row : styles.row}>  
683 - {  
684 - iconAll.invite.isExist ? <Image style={styles.row_icon} source={{uri:iconAll.invite.default_ico}}/> : <Image style={styles.row_icon} source={require('../../image/mine_activity_icon.png')}/>  
685 - }  
686 - <Text style={i == 0 ? styles.icon_text_white : styles.icon_text} numberOfLines={1}>  
687 - {item.get('act_name')}  
688 - </Text>  
689 - {  
690 - item.get('isHasClicked') ? null:<Image style={styles.dot} source={require('../../image/mine_message_new_icon.png')}/>  
691 - }  
692 - <Image style={styles.arrow} source={require('../../image/arrow_gray.png')}/>  
693 - </View> 681 + {
  682 + item.get('style') == 1 ?
  683 + <View style={styles.red_row}>
  684 + {
  685 + iconAll.inviteFriend.isExist ?
  686 + <Image style={styles.row_icon} source={{uri:iconAll.inviteFriend.default_ico}}/>
  687 + :
  688 + <Image style={styles.row_icon} source={require('../../image/mine_yqhy_icon.png')}/>
  689 + }
  690 + <Text style={styles.icon_text_white} numberOfLines={1}>{item.get('act_name')}</Text>
  691 + {
  692 + item.get('isHasClicked') ? null:<Image style={styles.dot} source={require('../../image/mine_message_new_icon.png')}/>
  693 + }
  694 + <Image style={styles.arrow} source={require('../../image/arrow_gray.png')}/>
  695 + </View>
  696 + :
  697 + <View style={styles.row}>
  698 + {
  699 + iconAll.invite.isExist ?
  700 + <Image style={styles.row_icon} source={{uri:iconAll.invite.default_ico}}/>
  701 + :
  702 + <Image style={styles.row_icon} source={require('../../image/mine_activity_icon.png')}/>
  703 + }
  704 + <Text style={styles.icon_text} numberOfLines={1}>{item.get('act_name')}</Text>
  705 + {
  706 + item.get('isHasClicked') ? null:<Image style={styles.dot} source={require('../../image/mine_message_new_icon.png')}/>
  707 + }
  708 + <Image style={styles.arrow} source={require('../../image/arrow_gray.png')}/>
  709 + </View>
  710 + }
694 <View style={{ 711 <View style={{
695 width: width-50, 712 width: width-50,
696 height: 0.5, 713 height: 0.5,
@@ -216,6 +216,12 @@ let InitialState = Record({ @@ -216,6 +216,12 @@ let InitialState = Record({
216 ico_name: '', 216 ico_name: '',
217 isExist: false, 217 isExist: false,
218 })), 218 })),
  219 + inviteFriend: new (Record({
  220 + default_ico: '',
  221 + ico: '',
  222 + ico_name: '',
  223 + isExist: false,
  224 + })),
219 vipBill: new (Record({ 225 vipBill: new (Record({
220 default_ico: '', 226 default_ico: '',
221 ico: '', 227 ico: '',
@@ -397,6 +397,7 @@ export default function appReducer(state = initialState, action) { @@ -397,6 +397,7 @@ export default function appReducer(state = initialState, action) {
397 myList, 397 myList,
398 suggestion, 398 suggestion,
399 invite, 399 invite,
  400 + inviteFriend,
400 vipBill, 401 vipBill,
401 } = action.payload; 402 } = action.payload;
402 403
@@ -484,6 +485,12 @@ export default function appReducer(state = initialState, action) { @@ -484,6 +485,12 @@ export default function appReducer(state = initialState, action) {
484 .set('ico_name', invite.ico_name) 485 .set('ico_name', invite.ico_name)
485 .set('isExist', invite.isExist); 486 .set('isExist', invite.isExist);
486 487
  488 + let newInviteFriend = state.iconAll.inviteFriend
  489 + .set('default_ico', inviteFriend.default_ico)
  490 + .set('ico', inviteFriend.ico)
  491 + .set('ico_name', inviteFriend.ico_name)
  492 + .set('isExist', inviteFriend.isExist);
  493 +
487 let newVipBill = state.iconAll.vipBill 494 let newVipBill = state.iconAll.vipBill
488 .set('default_ico', vipBill.default_ico) 495 .set('default_ico', vipBill.default_ico)
489 .set('ico', vipBill.ico) 496 .set('ico', vipBill.ico)
@@ -505,6 +512,7 @@ export default function appReducer(state = initialState, action) { @@ -505,6 +512,7 @@ export default function appReducer(state = initialState, action) {
505 .set('myList', newMyList) 512 .set('myList', newMyList)
506 .set('suggestion', newSuggestion) 513 .set('suggestion', newSuggestion)
507 .set('invite', newInvite) 514 .set('invite', newInvite)
  515 + .set('inviteFriend', newInviteFriend)
508 .set('vipBill', newVipBill); 516 .set('vipBill', newVipBill);
509 517
510 return state.set('iconAll', newIconAll); 518 return state.set('iconAll', newIconAll);