mobile / YH_RNComponent · Commits

Go to a project

Authored by 李犇
Commit d8bbc0e32e8bbb73778fcc44dfa45c3e0b976612 1 parent db44eaf6

个人中心图标获取本地存储——review by 陈林

Inline Side-by-side
Showing 7 changed files with 312 additions and 33 deletions
@@ -54,6 +54,7 @@ export default class MineList extends React.Component { @@ -54,6 +54,7 @@ export default class MineList extends React.Component {
54 certificationInfo={this.props.certificationInfo} 54 certificationInfo={this.props.certificationInfo}
55 announcement={this.props.announcement} 55 announcement={this.props.announcement}
56 globalOrderData={this.props.globalOrderData} 56 globalOrderData={this.props.globalOrderData}
  57 + iconAll={this.props.iconAll}
57 /> 58 />
58 ); 59 );
59 } 60 }
@@ -167,7 +167,8 @@ export default class MineListHeader extends React.Component { @@ -167,7 +167,8 @@ export default class MineListHeader extends React.Component {
167 showRedPacket, 167 showRedPacket,
168 certificationInfo, 168 certificationInfo,
169 announcement, 169 announcement,
170 - globalOrderData 170 + globalOrderData,
  171 + iconAll,
171 } = this.props; 172 } = this.props;
172 173
173 let oHigh = 0; 174 let oHigh = 0;
@@ -208,7 +209,7 @@ export default class MineListHeader extends React.Component { @@ -208,7 +209,7 @@ export default class MineListHeader extends React.Component {
208 }}> 209 }}>
209 <Image style={styles.user_img} 210 <Image style={styles.user_img}
210 source={{uri: YH_Image.getSlicedUrl(profile.head_ico, 60, 60, 2)}} 211 source={{uri: YH_Image.getSlicedUrl(profile.head_ico, 60, 60, 2)}}
211 - resizeMode={'contain'}/> 212 + resizeMode={'cover'}/>
212 <View style={{ 213 <View style={{
213 flexDirection:'column', 214 flexDirection:'column',
214 flex:1, 215 flex:1,
@@ -289,7 +290,7 @@ export default class MineListHeader extends React.Component { @@ -289,7 +290,7 @@ export default class MineListHeader extends React.Component {
289 }}> 290 }}>
290 <TouchableOpacity onPress={() => this.props.onPressItem('mineLogin','')}> 291 <TouchableOpacity onPress={() => this.props.onPressItem('mineLogin','')}>
291 <Text style={styles.login_text} numberOfLines={1}> 292 <Text style={styles.login_text} numberOfLines={1}>
292 - 登陆/注册 293 + 登录/注册
293 </Text> 294 </Text>
294 </TouchableOpacity> 295 </TouchableOpacity>
295 </View> 296 </View>
@@ -410,7 +411,9 @@ export default class MineListHeader extends React.Component { @@ -410,7 +411,9 @@ export default class MineListHeader extends React.Component {
410 <View style={styles.order_container}> 411 <View style={styles.order_container}>
411 <TouchableOpacity onPress={() => this.props.onPressItem('dfkOrder','')}> 412 <TouchableOpacity onPress={() => this.props.onPressItem('dfkOrder','')}>
412 <View style={styles.order_content}> 413 <View style={styles.order_content}>
413 - <Image style={styles.icon_image} source={require('../../image/dd_icon_dfk.png')}/> 414 + {
  415 + iconAll.willPay.isExist ? <Image style={styles.icon_image} source={{uri:iconAll.willPay.default_ico}}/> : <Image style={styles.icon_image} source={require('../../image/dd_icon_dfk.png')}/>
  416 + }
414 <Text style={styles.order_text}>待付款</Text> 417 <Text style={styles.order_text}>待付款</Text>
415 { 418 {
416 (profile.uid != '0' && mineInfoNum) ? this._renderMineOrderNumberPoint(mineInfoNum.wait_pay_num) : null 419 (profile.uid != '0' && mineInfoNum) ? this._renderMineOrderNumberPoint(mineInfoNum.wait_pay_num) : null
@@ -419,7 +422,9 @@ export default class MineListHeader extends React.Component { @@ -419,7 +422,9 @@ export default class MineListHeader extends React.Component {
419 </TouchableOpacity> 422 </TouchableOpacity>
420 <TouchableOpacity onPress={() => this.props.onPressItem('dfhOrder','')}> 423 <TouchableOpacity onPress={() => this.props.onPressItem('dfhOrder','')}>
421 <View style={styles.order_content}> 424 <View style={styles.order_content}>
422 - <Image style={styles.icon_image} source={require('../../image/dd_icon_dfh.png')}/> 425 + {
  426 + iconAll.willDeliver.isExist ? <Image style={styles.icon_image} source={{uri:iconAll.willDeliver.default_ico}}/> : <Image style={styles.icon_image} source={require('../../image/dd_icon_dfh.png')}/>
  427 + }
423 <Text style={styles.order_text}>待发货</Text> 428 <Text style={styles.order_text}>待发货</Text>
424 { 429 {
425 (profile.uid != '0' && mineInfoNum) ? this._renderMineOrderNumberPoint(mineInfoNum.send_cargo_num) : null 430 (profile.uid != '0' && mineInfoNum) ? this._renderMineOrderNumberPoint(mineInfoNum.send_cargo_num) : null
@@ -428,7 +433,9 @@ export default class MineListHeader extends React.Component { @@ -428,7 +433,9 @@ export default class MineListHeader extends React.Component {
428 </TouchableOpacity> 433 </TouchableOpacity>
429 <TouchableOpacity onPress={() => this.props.onPressItem('dshOrder','')}> 434 <TouchableOpacity onPress={() => this.props.onPressItem('dshOrder','')}>
430 <View style={styles.order_content}> 435 <View style={styles.order_content}>
431 - <Image style={styles.icon_image} source={require('../../image/dd_icon_dsh.png')}/> 436 + {
  437 + iconAll.willReceived.isExist ? <Image style={styles.icon_image} source={{uri:iconAll.willReceived.default_ico}}/> : <Image style={styles.icon_image} source={require('../../image/dd_icon_dsh.png')}/>
  438 + }
432 <Text style={styles.order_text}>待收货</Text> 439 <Text style={styles.order_text}>待收货</Text>
433 { 440 {
434 (profile.uid != '0' && mineInfoNum) ? this._renderMineOrderNumberPoint(mineInfoNum.wait_cargo_num) : null 441 (profile.uid != '0' && mineInfoNum) ? this._renderMineOrderNumberPoint(mineInfoNum.wait_cargo_num) : null
@@ -437,7 +444,9 @@ export default class MineListHeader extends React.Component { @@ -437,7 +444,9 @@ export default class MineListHeader extends React.Component {
437 </TouchableOpacity> 444 </TouchableOpacity>
438 <TouchableOpacity onPress={() => this.props.onPressItem('dsdOrder','')}> 445 <TouchableOpacity onPress={() => this.props.onPressItem('dsdOrder','')}>
439 <View style={styles.order_content}> 446 <View style={styles.order_content}>
440 - <Image style={styles.icon_image} source={require('../../image/wddd_icon_dpj.png')}/> 447 + {
  448 + iconAll.willComment.isExist ? <Image style={styles.icon_image} source={{uri:iconAll.willComment.default_ico}}/> : <Image style={styles.icon_image} source={require('../../image/wddd_icon_dpj.png')}/>
  449 + }
441 <Text style={styles.order_text}>待晒单</Text> 450 <Text style={styles.order_text}>待晒单</Text>
442 { 451 {
443 (profile.uid != '0' && mineInfoNum) ? this._renderMineOrderNumberPoint(mineInfoNum.toShareOrderNum) : null 452 (profile.uid != '0' && mineInfoNum) ? this._renderMineOrderNumberPoint(mineInfoNum.toShareOrderNum) : null
@@ -446,7 +455,9 @@ export default class MineListHeader extends React.Component { @@ -446,7 +455,9 @@ export default class MineListHeader extends React.Component {
446 </TouchableOpacity> 455 </TouchableOpacity>
447 <TouchableOpacity onPress={() => this.props.onPressItem('thhOrder','')}> 456 <TouchableOpacity onPress={() => this.props.onPressItem('thhOrder','')}>
448 <View style={styles.order_content}> 457 <View style={styles.order_content}>
449 - <Image style={styles.icon_image} source={require('../../image/dd_icon_thh.png')}/> 458 + {
  459 + iconAll.reback.isExist ? <Image style={styles.icon_image} source={{uri:iconAll.reback.default_ico}}/> : <Image style={styles.icon_image} source={require('../../image/dd_icon_thh.png')}/>
  460 + }
450 <Text style={styles.order_text}>退/换货</Text> 461 <Text style={styles.order_text}>退/换货</Text>
451 { 462 {
452 (profile.uid != '0' && mineInfoNum) ? this._renderMineOrderNumberPoint(mineInfoNum.refund_exchange_num) : null 463 (profile.uid != '0' && mineInfoNum) ? this._renderMineOrderNumberPoint(mineInfoNum.refund_exchange_num) : null
@@ -498,7 +509,9 @@ export default class MineListHeader extends React.Component { @@ -498,7 +509,9 @@ export default class MineListHeader extends React.Component {
498 <View style={styles.order_container}> 509 <View style={styles.order_container}>
499 <TouchableOpacity onPress={() => this.props.onPressItem('mineCoupon','')}> 510 <TouchableOpacity onPress={() => this.props.onPressItem('mineCoupon','')}>
500 <View style={styles.asset_content}> 511 <View style={styles.asset_content}>
501 - <Image style={styles.icon_image} source={require('../../image/zc_icon_yhq_red.png')}/> 512 + {
  513 + iconAll.coupon.isExist ? <Image style={styles.icon_image} source={{uri:iconAll.coupon.default_ico}}/> : <Image style={styles.icon_image} source={require('../../image/zc_icon_yhq.png')}/>
  514 + }
502 <Text style={styles.order_text}>优惠券</Text> 515 <Text style={styles.order_text}>优惠券</Text>
503 { 516 {
504 (profile.uid != '0' && mineInfoNum) ? this._renderMinePropertyNumberPoint(mineInfoNum.coupon_num) : null 517 (profile.uid != '0' && mineInfoNum) ? this._renderMinePropertyNumberPoint(mineInfoNum.coupon_num) : null
@@ -507,7 +520,9 @@ export default class MineListHeader extends React.Component { @@ -507,7 +520,9 @@ export default class MineListHeader extends React.Component {
507 </TouchableOpacity> 520 </TouchableOpacity>
508 <TouchableOpacity onPress={() => this.props.onPressItem('mineYohoCoin','')}> 521 <TouchableOpacity onPress={() => this.props.onPressItem('mineYohoCoin','')}>
509 <View style={styles.asset_content}> 522 <View style={styles.asset_content}>
510 - <Image style={styles.icon_image} source={require('../../image/yh_mine_yoho_coin.png')}/> 523 + {
  524 + iconAll.yohoCoin.isExist ? <Image style={styles.icon_image} source={{uri:iconAll.yohoCoin.default_ico}}/> : <Image style={styles.icon_image} source={require('../../image/yh_mine_yoho_coin.png')}/>
  525 + }
511 <Text style={styles.order_text}>有货币</Text> 526 <Text style={styles.order_text}>有货币</Text>
512 527
513 { 528 {
@@ -518,8 +533,9 @@ export default class MineListHeader extends React.Component { @@ -518,8 +533,9 @@ export default class MineListHeader extends React.Component {
518 </TouchableOpacity> 533 </TouchableOpacity>
519 <TouchableOpacity onPress={() => this.props.onPressItem('mineLimitCode','')}> 534 <TouchableOpacity onPress={() => this.props.onPressItem('mineLimitCode','')}>
520 <View style={styles.asset_content}> 535 <View style={styles.asset_content}>
521 - <Image style={styles.icon_image}  
522 - source={require('../../image/yh_mine_limitcode_icon.png')}/> 536 + {
  537 + iconAll.myLimitCode.isExist ? <Image style={styles.icon_image} source={{uri:iconAll.myLimitCode.default_ico}}/> : <Image style={styles.icon_image} source={require('../../image/yh_mine_limitcode_icon.png')}/>
  538 + }
523 <Text style={styles.order_text}>限购码</Text> 539 <Text style={styles.order_text}>限购码</Text>
524 { 540 {
525 (profile.uid != '0' && mineInfoNum) ? this._renderMinePropertyNumberPoint(mineInfoNum.limitCodeNum) : null 541 (profile.uid != '0' && mineInfoNum) ? this._renderMinePropertyNumberPoint(mineInfoNum.limitCodeNum) : null
@@ -528,7 +544,9 @@ export default class MineListHeader extends React.Component { @@ -528,7 +544,9 @@ export default class MineListHeader extends React.Component {
528 </TouchableOpacity> 544 </TouchableOpacity>
529 <TouchableOpacity onPress={() => this.props.onPressItem('mineInstallment','')}> 545 <TouchableOpacity onPress={() => this.props.onPressItem('mineInstallment','')}>
530 <View style={styles.asset_content}> 546 <View style={styles.asset_content}>
531 - <Image style={styles.icon_image} source={require('../../image/yh_mine_fenqi_icon.png')}/> 547 + {
  548 + iconAll.instalment.isExist ? <Image style={styles.icon_image} source={{uri:iconAll.instalment.default_ico}}/> : <Image style={styles.icon_image} source={require('../../image/yh_mine_fenqi_icon.png')}/>
  549 + }
532 <Text style={styles.order_text}>有货分期</Text> 550 <Text style={styles.order_text}>有货分期</Text>
533 { 551 {
534 (profile.uid != '0') ? this._renderMinePropertyNumberPoint(0) : this._renderMinePropertyNumberPoint('去开通') 552 (profile.uid != '0') ? this._renderMinePropertyNumberPoint(0) : this._renderMinePropertyNumberPoint('去开通')
@@ -538,8 +556,9 @@ export default class MineListHeader extends React.Component { @@ -538,8 +556,9 @@ export default class MineListHeader extends React.Component {
538 {showRedPacket && showRedPacket.open === 'Y' ? 556 {showRedPacket && showRedPacket.open === 'Y' ?
539 <TouchableOpacity onPress={() => this.props.onPressItem('mineRedPackage','')}> 557 <TouchableOpacity onPress={() => this.props.onPressItem('mineRedPackage','')}>
540 <View style={styles.asset_content}> 558 <View style={styles.asset_content}>
541 - <Image style={styles.icon_image}  
542 - source={require('../../image/yh_mine_redbag_icon.png')}/> 559 + {
  560 + iconAll.redPackets.isExist ? <Image style={styles.icon_image} source={{uri:iconAll.redPackets.default_ico}}/> : <Image style={styles.icon_image} source={require('../../image/yh_mine_redbag_icon.png')}/>
  561 + }
543 <Text style={styles.order_text}>红包</Text> 562 <Text style={styles.order_text}>红包</Text>
544 { 563 {
545 (profile.uid != '0' && redPackageNum) ? this._renderMinePropertyNumberPoint(redPackageNum.redpacket_num) : null 564 (profile.uid != '0' && redPackageNum) ? this._renderMinePropertyNumberPoint(redPackageNum.redpacket_num) : null
@@ -555,7 +574,9 @@ export default class MineListHeader extends React.Component { @@ -555,7 +574,9 @@ export default class MineListHeader extends React.Component {
555 }}/> 574 }}/>
556 <TouchableOpacity onPress={() => this.props.onPressItem('mineGuang','')}> 575 <TouchableOpacity onPress={() => this.props.onPressItem('mineGuang','')}>
557 <View style={styles.row}> 576 <View style={styles.row}>
558 - <Image style={styles.row_icon} source={require('../../image/mine_collectionTiezi_icon.png')}/> 577 + {
  578 + iconAll.myguang.isExist ? <Image style={styles.row_icon} source={{uri:iconAll.myguang.default_ico}}/> : <Image style={styles.row_icon} source={require('../../image/mine_collectionTiezi_icon.png')}/>
  579 + }
559 <Text style={styles.icon_text} numberOfLines={1}> 580 <Text style={styles.icon_text} numberOfLines={1}>
560 我的逛 581 我的逛
561 </Text> 582 </Text>
@@ -570,7 +591,9 @@ export default class MineListHeader extends React.Component { @@ -570,7 +591,9 @@ export default class MineListHeader extends React.Component {
570 }}/> 591 }}/>
571 <TouchableOpacity onPress={() => this.props.onPressItem('mineShareOrder','')}> 592 <TouchableOpacity onPress={() => this.props.onPressItem('mineShareOrder','')}>
572 <View style={styles.row}> 593 <View style={styles.row}>
573 - <Image style={styles.row_icon} source={require('../../image/shaidan.png')}/> 594 + {
  595 + iconAll.myList.isExist ? <Image style={styles.row_icon} source={{uri:iconAll.myList.default_ico}}/> : <Image style={styles.row_icon} source={require('../../image/shaidan.png')}/>
  596 + }
574 <Text style={styles.icon_text} numberOfLines={1}> 597 <Text style={styles.icon_text} numberOfLines={1}>
575 我的晒单 598 我的晒单
576 </Text> 599 </Text>
@@ -587,8 +610,9 @@ export default class MineListHeader extends React.Component { @@ -587,8 +610,9 @@ export default class MineListHeader extends React.Component {
587 backgroundColor: '#e5e5e5', 610 backgroundColor: '#e5e5e5',
588 }}/> 611 }}/>
589 <View style={styles.row}> 612 <View style={styles.row}>
590 - <Image style={styles.row_icon} resizeMode={'contain'}  
591 - source={require('../../image/mine_bill_icon.png')}/> 613 + {
  614 + iconAll.vipBill.isExist ? <Image style={styles.row_icon} resizeMode={'contain'} source={{uri:iconAll.vipBill.default_ico}}/> : <Image style={styles.row_icon} resizeMode={'contain'} source={require('../../image/mine_bill_icon.png')}/>
  615 + }
592 <Text style={styles.icon_text} numberOfLines={1}> 616 <Text style={styles.icon_text} numberOfLines={1}>
593 会员账单信息 617 会员账单信息
594 </Text> 618 </Text>
@@ -613,7 +637,9 @@ export default class MineListHeader extends React.Component { @@ -613,7 +637,9 @@ export default class MineListHeader extends React.Component {
613 item.get('state') === 1? 637 item.get('state') === 1?
614 <TouchableOpacity key={i} onPress={() => this.props.onPressItem('mineActivity',item)}> 638 <TouchableOpacity key={i} onPress={() => this.props.onPressItem('mineActivity',item)}>
615 <View style={styles.row}> 639 <View style={styles.row}>
616 - <Image style={styles.row_icon} source={require('../../image/mine_activity_icon.png')}/> 640 + {
  641 + 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')}/>
  642 + }
617 <Text style={styles.icon_text} numberOfLines={1}> 643 <Text style={styles.icon_text} numberOfLines={1}>
618 {item.get('act_name')} 644 {item.get('act_name')}
619 </Text> 645 </Text>
@@ -644,8 +670,9 @@ export default class MineListHeader extends React.Component { @@ -644,8 +670,9 @@ export default class MineListHeader extends React.Component {
644 670
645 <TouchableOpacity onPress={() => this.props.onPressItem('mineFeedback','')}> 671 <TouchableOpacity onPress={() => this.props.onPressItem('mineFeedback','')}>
646 <View style={styles.row}> 672 <View style={styles.row}>
647 - <Image style={styles.row_icon} resizeMode={'contain'}  
648 - source={require('../../image/mine_servicefeedback_icon.png')}/> 673 + {
  674 + iconAll.suggestion.isExist ? <Image style={styles.row_icon} resizeMode={'contain'} source={{uri:iconAll.suggestion.default_ico}}/> : <Image style={styles.row_icon} resizeMode={'contain'} source={require('../../image/mine_servicefeedback_icon.png')}/>
  675 + }
649 <Text style={styles.icon_text} numberOfLines={1}> 676 <Text style={styles.icon_text} numberOfLines={1}>
650 服务与反馈 677 服务与反馈
651 </Text> 678 </Text>
@@ -837,7 +864,6 @@ let styles = StyleSheet.create({ @@ -837,7 +864,6 @@ let styles = StyleSheet.create({
837 borderRadius: 30, 864 borderRadius: 30,
838 borderColor: 'white', 865 borderColor: 'white',
839 borderWidth: (Platform.OS === 'ios' ? 1.0 : 1.5) / PixelRatio.get(), 866 borderWidth: (Platform.OS === 'ios' ? 1.0 : 1.5) / PixelRatio.get(),
840 - resizeMode: 'contain',  
841 }, 867 },
842 user_level: { 868 user_level: {
843 width: 45, 869 width: 45,
@@ -56,4 +56,6 @@ export default keyMirror({ @@ -56,4 +56,6 @@ export default keyMirror({
56 GET_GLOBALORDERSTATE_REQUEST:null, 56 GET_GLOBALORDERSTATE_REQUEST:null,
57 GET_GLOBALORDERSTATE_SUCCESS:null, 57 GET_GLOBALORDERSTATE_SUCCESS:null,
58 GET_GLOBALORDERSTATE_FAILURE:null, 58 GET_GLOBALORDERSTATE_FAILURE:null,
  59 +
  60 + GET_MINEALLICON_SUCCESS:null,
59 }); 61 });
@@ -119,6 +119,7 @@ class MineContainer extends Component { @@ -119,6 +119,7 @@ class MineContainer extends Component {
119 this.props.actions.getCertificationData(); 119 this.props.actions.getCertificationData();
120 this.props.actions.getAnnouncement(); 120 this.props.actions.getAnnouncement();
121 this.props.actions.getGlobalOrderState(); 121 this.props.actions.getGlobalOrderState();
  122 + this.props.actions.getMineAllIcon();
122 } 123 }
123 124
124 componentWillUnmount() { 125 componentWillUnmount() {
@@ -235,7 +236,7 @@ class MineContainer extends Component { @@ -235,7 +236,7 @@ class MineContainer extends Component {
235 NativeModules.YH_CommonHelper.logEvent('YB_MY_STROLL', {}); 236 NativeModules.YH_CommonHelper.logEvent('YB_MY_STROLL', {});
236 break; 237 break;
237 case 'mineShareOrder': 238 case 'mineShareOrder':
238 - url = `http://m.yohobuy.com?openby:yohobuy={"action":"go.shareorder","params":{}}`; 239 + url = `http://m.yohobuy.com?openby:yohobuy={"action":"go.shareOrder","params":{}}`;
239 NativeModules.YH_CommonHelper.logEvent('YB_MY_SHOW', {}); 240 NativeModules.YH_CommonHelper.logEvent('YB_MY_SHOW', {});
240 break; 241 break;
241 case 'mineMemberInfo': 242 case 'mineMemberInfo':
@@ -306,9 +307,8 @@ class MineContainer extends Component { @@ -306,9 +307,8 @@ class MineContainer extends Component {
306 certificationInfo, 307 certificationInfo,
307 announcement, 308 announcement,
308 globalOrderData, 309 globalOrderData,
  310 + iconAll,
309 } = this.props.mine; 311 } = this.props.mine;
310 - console.log("open");  
311 - console.log(activityListInfo);  
312 return ( 312 return (
313 <MineList 313 <MineList
314 isFetching={isFetching} 314 isFetching={isFetching}
@@ -324,6 +324,7 @@ class MineContainer extends Component { @@ -324,6 +324,7 @@ class MineContainer extends Component {
324 certificationInfo={certificationInfo} 324 certificationInfo={certificationInfo}
325 announcement={announcement} 325 announcement={announcement}
326 globalOrderData={globalOrderData} 326 globalOrderData={globalOrderData}
  327 + iconAll={iconAll}
327 328
328 onPressItem={this._onPressItem} 329 onPressItem={this._onPressItem}
329 onPressProductListProduct={this._onPressProductListProduct} 330 onPressProductListProduct={this._onPressProductListProduct}
@@ -62,6 +62,8 @@ const { @@ -62,6 +62,8 @@ const {
62 GET_GLOBALORDERSTATE_SUCCESS, 62 GET_GLOBALORDERSTATE_SUCCESS,
63 GET_GLOBALORDERSTATE_FAILURE, 63 GET_GLOBALORDERSTATE_FAILURE,
64 64
  65 + GET_MINEALLICON_SUCCESS,
  66 +
65 } = require('../../constants/actionTypes').default; 67 } = require('../../constants/actionTypes').default;
66 68
67 export function productListForInstallmentRequest() { 69 export function productListForInstallmentRequest() {
@@ -244,6 +246,13 @@ export function getGlobalOrderStateFailure() { @@ -244,6 +246,13 @@ export function getGlobalOrderStateFailure() {
244 } 246 }
245 } 247 }
246 248
  249 +export function getMineAllIconSuccess(json) {
  250 + return {
  251 + type: GET_MINEALLICON_SUCCESS,
  252 + payload: json,
  253 + }
  254 +}
  255 +
247 export function productListForInstallment() { 256 export function productListForInstallment() {
248 return (dispatch, getState) => { 257 return (dispatch, getState) => {
249 let {app, mine} = getState(); 258 let {app, mine} = getState();
@@ -427,8 +436,8 @@ export function getMineActivity() { @@ -427,8 +436,8 @@ export function getMineActivity() {
427 console.log('----getMineActivity-----'); 436 console.log('----getMineActivity-----');
428 return new MineService(app.host).getMineActivity() 437 return new MineService(app.host).getMineActivity()
429 .then(json => { 438 .then(json => {
430 - // 成功获取活动数据后，调用原生的getMineActivityNew方法获取是否点击过该活动，决定页面是否展示小红点  
431 - ReactNative.NativeModules.YH_MineHelper.getMineActivityNew(json) 439 + // 成功获取活动数据后，调用原生的getMineActivityWithClicked方法获取是否点击过该活动，决定页面是否展示小红点
  440 + ReactNative.NativeModules.YH_MineHelper.getMineActivityWithClicked(json)
432 .then(data => { 441 .then(data => {
433 // 如果成功获取到活动关联的小红点数据，那么就返回由原生方法返回的data数据 442 // 如果成功获取到活动关联的小红点数据，那么就返回由原生方法返回的data数据
434 let result = data; 443 let result = data;
@@ -528,11 +537,9 @@ export function getGlobalOrderState() { @@ -528,11 +537,9 @@ export function getGlobalOrderState() {
528 console.log('----getMineRedPackageNum-----'); 537 console.log('----getMineRedPackageNum-----');
529 return new MineService(app.globalApiHost).getGlobalOrderState() 538 return new MineService(app.globalApiHost).getGlobalOrderState()
530 .then(json => { 539 .then(json => {
531 - console.log(json);  
532 dispatch(getGlobalOrderStateSuccess(json)); 540 dispatch(getGlobalOrderStateSuccess(json));
533 }) 541 })
534 .catch(error => { 542 .catch(error => {
535 - console.log(error);  
536 }); 543 });
537 }; 544 };
538 545
@@ -544,4 +551,24 @@ export function getGlobalOrderState() { @@ -544,4 +551,24 @@ export function getGlobalOrderState() {
544 dispatch(getGlobalOrderStateFailure()); 551 dispatch(getGlobalOrderStateFailure());
545 }); 552 });
546 } 553 }
  554 +}
  555 +
  556 +export function getMineAllIcon() {
  557 + return (dispatch, getState) => {
  558 + let {app, mine} = getState();
  559 + let {isFetching, open} = mine;
  560 +
  561 + console.log('----getMineAllIcon-----');
  562 + ReactNative.NativeModules.YH_MineHelper.getMineAllIcon()
  563 + .then(data => {
  564 + let result = data;
  565 + //result = '[{"act_id":28,"act_name":"邀请好友赢福利","isHasClicked":false,"state":1,"url":"http://m.yohobuy.com/activity/invite/index?act_id=28"},{"act_id":29,"act_name":"邀请好友赢福利","isHasClicked":false,"state":1,"url":"http://m.yohobuy.com/activity/invite/index?act_id=29"},{"act_id":30,"act_name":"邀请好友赢福利","isHasClicked":true,"state":0,"url":"http://m.yohobuy.com/activity/invite/index?act_id=30"}]';
  566 + if (Platform.OS === 'android') {
  567 + result = JSON.parse(result);
  568 + }
  569 + dispatch(getMineAllIconSuccess(result));
  570 + })
  571 + .catch(error => {
  572 + });
  573 + }
547 } 574 }
@@ -119,6 +119,99 @@ let InitialState = Record({ @@ -119,6 +119,99 @@ let InitialState = Record({
119 cancelOrder: 0, 119 cancelOrder: 0,
120 tradingOrder: 0, 120 tradingOrder: 0,
121 })), 121 })),
  122 +
  123 + iconAll:new (Record({
  124 + willPay: new (Record({
  125 + default_ico: '',
  126 + ico: '',
  127 + ico_name: '',
  128 + isExist: false,
  129 + })),
  130 + willDeliver: new (Record({
  131 + default_ico: '',
  132 + ico: '',
  133 + ico_name: '',
  134 + isExist: false,
  135 + })),
  136 + willReceived: new (Record({
  137 + default_ico: '',
  138 + ico: '',
  139 + ico_name: '',
  140 + isExist: false,
  141 + })),
  142 + willComment: new (Record({
  143 + default_ico: '',
  144 + ico: '',
  145 + ico_name: '',
  146 + isExist: false,
  147 + })),
  148 + reback: new (Record({
  149 + default_ico: '',
  150 + ico: '',
  151 + ico_name: '',
  152 + isExist: false,
  153 + })),
  154 + coupon: new (Record({
  155 + default_ico: '',
  156 + ico: '',
  157 + ico_name: '',
  158 + isExist: false,
  159 + })),
  160 + yohoCoin: new (Record({
  161 + default_ico: '',
  162 + ico: '',
  163 + ico_name: '',
  164 + isExist: false,
  165 + })),
  166 + myLimitCode: new (Record({
  167 + default_ico: '',
  168 + ico: '',
  169 + ico_name: '',
  170 + isExist: false,
  171 + })),
  172 + instalment: new (Record({
  173 + default_ico: '',
  174 + ico: '',
  175 + ico_name: '',
  176 + isExist: false,
  177 + })),
  178 + redPackets: new (Record({
  179 + default_ico: '',
  180 + ico: '',
  181 + ico_name: '',
  182 + isExist: false,
  183 + })),
  184 + myguang: new (Record({
  185 + default_ico: '',
  186 + ico: '',
  187 + ico_name: '',
  188 + isExist: false,
  189 + })),
  190 + myList: new (Record({
  191 + default_ico: '',
  192 + ico: '',
  193 + ico_name: '',
  194 + isExist: false,
  195 + })),
  196 + suggestion: new (Record({
  197 + default_ico: '',
  198 + ico: '',
  199 + ico_name: '',
  200 + isExist: false,
  201 + })),
  202 + invite: new (Record({
  203 + default_ico: '',
  204 + ico: '',
  205 + ico_name: '',
  206 + isExist: false,
  207 + })),
  208 + vipBill: new (Record({
  209 + default_ico: '',
  210 + ico: '',
  211 + ico_name: '',
  212 + isExist: false,
  213 + })),
  214 + })),
122 }); 215 });
123 216
124 export default InitialState; 217 export default InitialState;
@@ -59,6 +59,8 @@ const { @@ -59,6 +59,8 @@ const {
59 GET_GLOBALORDERSTATE_SUCCESS, 59 GET_GLOBALORDERSTATE_SUCCESS,
60 GET_GLOBALORDERSTATE_FAILURE, 60 GET_GLOBALORDERSTATE_FAILURE,
61 61
  62 + GET_MINEALLICON_SUCCESS,
  63 +
62 } = require('../../constants/actionTypes').default; 64 } = require('../../constants/actionTypes').default;
63 65
64 const initialState = new InitialState; 66 const initialState = new InitialState;
@@ -81,8 +83,6 @@ export default function appReducer(state = initialState, action) { @@ -81,8 +83,6 @@ export default function appReducer(state = initialState, action) {
81 } 83 }
82 84
83 case GET_MINEUSERINFO_SUCCESS: { 85 case GET_MINEUSERINFO_SUCCESS: {
84 - console.log("----------GET_USERINFO_SUCCESS");  
85 - console.log(state);  
86 let { 86 let {
87 head_ico, 87 head_ico,
88 nickname, 88 nickname,
@@ -93,7 +93,6 @@ export default function appReducer(state = initialState, action) { @@ -93,7 +93,6 @@ export default function appReducer(state = initialState, action) {
93 } = action.payload; 93 } = action.payload;
94 let newVipInfo = state.profile.vip_info.set("cur_level", vip_info.cur_level) 94 let newVipInfo = state.profile.vip_info.set("cur_level", vip_info.cur_level)
95 .set("is_student", vip_info.is_student); 95 .set("is_student", vip_info.is_student);
96 - console.log(newVipInfo);  
97 let newProfile = state.profile.set("vip_info", newVipInfo) 96 let newProfile = state.profile.set("vip_info", newVipInfo)
98 .set("head_ico", head_ico) 97 .set("head_ico", head_ico)
99 .set("nickname", nickname) 98 .set("nickname", nickname)
@@ -326,6 +325,136 @@ export default function appReducer(state = initialState, action) { @@ -326,6 +325,136 @@ export default function appReducer(state = initialState, action) {
326 .set('hasOrder', "N"); 325 .set('hasOrder', "N");
327 return state.set("globalOrderData", newGlobalOrderData); 326 return state.set("globalOrderData", newGlobalOrderData);
328 } 327 }
  328 +
  329 + case GET_MINEALLICON_SUCCESS: {
  330 + console.log("liben6666");
  331 + let {
  332 + willPay,
  333 + willDeliver,
  334 + willReceived,
  335 + willComment,
  336 + reback,
  337 + coupon,
  338 + yohoCoin,
  339 + myLimitCode,
  340 + instalment,
  341 + redPackets,
  342 + myguang,
  343 + myList,
  344 + suggestion,
  345 + invite,
  346 + vipBill,
  347 + } = action.payload;
  348 +
  349 + let newWillPay = state.iconAll.willPay
  350 + .set('default_ico', willPay.default_ico)
  351 + .set('ico', willPay.ico)
  352 + .set('ico_name', willPay.ico_name)
  353 + .set('isExist', willPay.isExist);
  354 +
  355 + let newWillDeliver = state.iconAll.willDeliver
  356 + .set('default_ico', willDeliver.default_ico)
  357 + .set('ico', willDeliver.ico)
  358 + .set('ico_name', willDeliver.ico_name)
  359 + .set('isExist', willDeliver.isExist);
  360 +
  361 + let newWillReceived = state.iconAll.willReceived
  362 + .set('default_ico', willReceived.default_ico)
  363 + .set('ico', willReceived.ico)
  364 + .set('ico_name', willReceived.ico_name)
  365 + .set('isExist', willReceived.isExist);
  366 +
  367 + let newWillComment = state.iconAll.willComment
  368 + .set('default_ico', willComment.default_ico)
  369 + .set('ico', willComment.ico)
  370 + .set('ico_name', willComment.ico_name)
  371 + .set('isExist', willComment.isExist);
  372 +
  373 + let newReback = state.iconAll.reback
  374 + .set('default_ico', reback.default_ico)
  375 + .set('ico', reback.ico)
  376 + .set('ico_name', reback.ico_name)
  377 + .set('isExist', reback.isExist);
  378 +
  379 + let newCoupon = state.iconAll.coupon
  380 + .set('default_ico', coupon.default_ico)
  381 + .set('ico', coupon.ico)
  382 + .set('ico_name', coupon.ico_name)
  383 + .set('isExist', coupon.isExist);
  384 +
  385 + let newYohoCoin = state.iconAll.yohoCoin
  386 + .set('default_ico', yohoCoin.default_ico)
  387 + .set('ico', yohoCoin.ico)
  388 + .set('ico_name', yohoCoin.ico_name)
  389 + .set('isExist', yohoCoin.isExist);
  390 +
  391 + let newMyLimitCode = state.iconAll.myLimitCode
  392 + .set('default_ico', myLimitCode.default_ico)
  393 + .set('ico', myLimitCode.ico)
  394 + .set('ico_name', myLimitCode.ico_name)
  395 + .set('isExist', myLimitCode.isExist);
  396 +
  397 + let newInstalment = state.iconAll.instalment
  398 + .set('default_ico', instalment.default_ico)
  399 + .set('ico', instalment.ico)
  400 + .set('ico_name', instalment.ico_name)
  401 + .set('isExist', instalment.isExist);
  402 +
  403 + let newRedPackets = state.iconAll.redPackets
  404 + .set('default_ico', redPackets.default_ico)
  405 + .set('ico', redPackets.ico)
  406 + .set('ico_name', redPackets.ico_name)
  407 + .set('isExist', redPackets.isExist);
  408 +
  409 + let newMyguang = state.iconAll.myguang
  410 + .set('default_ico', myguang.default_ico)
  411 + .set('ico', myguang.ico)
  412 + .set('ico_name', myguang.ico_name)
  413 + .set('isExist', myguang.isExist);
  414 +
  415 + let newMyList = state.iconAll.myList
  416 + .set('default_ico', myList.default_ico)
  417 + .set('ico', myList.ico)
  418 + .set('ico_name', myList.ico_name)
  419 + .set('isExist', myList.isExist);
  420 +
  421 + let newSuggestion = state.iconAll.suggestion
  422 + .set('default_ico', suggestion.default_ico)
  423 + .set('ico', suggestion.ico)
  424 + .set('ico_name', suggestion.ico_name)
  425 + .set('isExist', suggestion.isExist);
  426 +
  427 + let newInvite = state.iconAll.invite
  428 + .set('default_ico', invite.default_ico)
  429 + .set('ico', invite.ico)
  430 + .set('ico_name', invite.ico_name)
  431 + .set('isExist', invite.isExist);
  432 +
  433 + let newVipBill = state.iconAll.vipBill
  434 + .set('default_ico', vipBill.default_ico)
  435 + .set('ico', vipBill.ico)
  436 + .set('ico_name', vipBill.ico_name)
  437 + .set('isExist', vipBill.isExist);
  438 +
  439 + let newIconAll = state.iconAll
  440 + .set('willPay', newWillPay)
  441 + .set('willDeliver', newWillDeliver)
  442 + .set('willReceived', newWillReceived)
  443 + .set('willComment', newWillComment)
  444 + .set('reback', newReback)
  445 + .set('coupon', newCoupon)
  446 + .set('yohoCoin', newYohoCoin)
  447 + .set('myLimitCode', newMyLimitCode)
  448 + .set('instalment', newInstalment)
  449 + .set('redPackets', newRedPackets)
  450 + .set('myguang', newMyguang)
  451 + .set('myList', newMyList)
  452 + .set('suggestion', newSuggestion)
  453 + .set('invite', newInvite)
  454 + .set('vipBill', newVipBill);
  455 +
  456 + return state.set('iconAll', newIconAll);
  457 + }
329 } 458 }
330 return state; 459 return state;
331 } 460 }