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

@@ -677,20 +677,37 @@ export default class MineListHeader extends React.Component {
                 {
                     activityListInfo.list.map((item, i) => {
                         return (
-                            // item.get('state') === 1?
                                <TouchableOpacity key={i} activeOpacity={1} onPress={() => this.props.onPressItem('mineActivity',item)}>
-                                   <View style={ i == 0 ? styles.red_row : styles.row}>
                                {
-                                           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')}/>
+                                    item.get('style') == 1 ?
+                                        <View style={styles.red_row}>
+                                            {
+                                               iconAll.inviteFriend.isExist ? 
+                                                 <Image style={styles.row_icon} source={{uri:iconAll.inviteFriend.default_ico}}/> 
+                                               : 
+                                                 <Image style={styles.row_icon} source={require('../../image/mine_yqhy_icon.png')}/>
                                             }
-                                       <Text style={i == 0 ? styles.icon_text_white : styles.icon_text} numberOfLines={1}>
-                                           {item.get('act_name')}
-                                       </Text>
+                                           <Text style={styles.icon_text_white} numberOfLines={1}>{item.get('act_name')}</Text>
+                                           {
+                                               item.get('isHasClicked') ? null:<Image style={styles.dot} source={require('../../image/mine_message_new_icon.png')}/>
+                                           }
+                                           <Image style={styles.arrow} source={require('../../image/arrow_gray.png')}/>
+                                        </View>
+                                    :
+                                        <View style={styles.row}>
+                                            {
+                                               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')}/>
+                                            }
+                                           <Text style={styles.icon_text} numberOfLines={1}>{item.get('act_name')}</Text>
                                            {
                                                item.get('isHasClicked') ? null:<Image style={styles.dot} source={require('../../image/mine_message_new_icon.png')}/>
                                            }
                                            <Image style={styles.arrow} source={require('../../image/arrow_gray.png')}/>
                                         </View>
+                                }
                                    <View style={{
                                        width: width-50,
                                        height: 0.5,

@@ -216,6 +216,12 @@ let InitialState = Record({
             ico_name: '',
             isExist: false,
         })),
+        inviteFriend: new (Record({
+            default_ico: '',
+            ico: '',
+            ico_name: '',
+            isExist: false,
+        })),
         vipBill: new (Record({
             default_ico: '',
             ico: '',

@@ -397,6 +397,7 @@ export default function appReducer(state = initialState, action) {
                 myList,
                 suggestion,
                 invite,
+                inviteFriend,
                 vipBill,
             } = action.payload;
 
@@ -484,6 +485,12 @@ export default function appReducer(state = initialState, action) {
                 .set('ico_name', invite.ico_name)
                 .set('isExist', invite.isExist);
 
+            let newInviteFriend = state.iconAll.inviteFriend
+                .set('default_ico', inviteFriend.default_ico)
+                .set('ico', inviteFriend.ico)
+                .set('ico_name', inviteFriend.ico_name)
+                .set('isExist', inviteFriend.isExist);
+
             let newVipBill = state.iconAll.vipBill
                 .set('default_ico', vipBill.default_ico)
                 .set('ico', vipBill.ico)
@@ -505,6 +512,7 @@ export default function appReducer(state = initialState, action) {
                 .set('myList', newMyList)
                 .set('suggestion', newSuggestion)
                 .set('invite', newInvite)
+                .set('inviteFriend', newInviteFriend)
                 .set('vipBill', newVipBill);
 
             return state.set('iconAll', newIconAll);