Authored by 张丽霞

5.9.0谭梦琪需求

... ... @@ -118,10 +118,11 @@ export default class MineListHeader extends React.Component {
_renderBannerResource(){
return(
<MineResourceList
style={{width: width,height: bannerResourceHeight}}
<MineResourceList
style={{width:width,height:500}}
mineResource={this.props.mineResource}
onPressFloorItem={this.props.onPressFloorItem} />
onPressFloorItem={this.props.onPressFloorItem}>
</MineResourceList>
);
}
... ... @@ -205,12 +206,9 @@ export default class MineListHeader extends React.Component {
//资源位高度
if (this.props.mineResource) {
bannerResourceHeight = this._calculateBannerResourceHeight();
oHigh = oHigh + bannerResourceHeight;
if (Platform.OS === 'ios') {
oHigh += 120;
}
}
let floorHeight = this._calculateBannerResourceHeight();
oHigh = oHigh + floorHeight;
}
oHigh = topHeight + oHigh;
let bgImage = Platform.OS === 'ios' ? require('../../image/mine_top_boy.png') : require('../../image/mine_banner_boy.jpg');
... ... @@ -218,12 +216,11 @@ export default class MineListHeader extends React.Component {
let bgMarginTop = Platform.OS === 'ios' ? -95 : 0;
let bgPaddingTop = Platform.OS === 'ios' ? 160: 45;
let paddingContainer =(width - 36*5)/16;
let containerBottomMargin = Platform.OS === 'ios' ? -105 : 0;
let favStringFontSize = profile.uid != '0' ? 11 : 15;
return (
<View style={[styles.container,{height:oHigh, marginBottom:containerBottomMargin}]}>
<View style={[styles.container,{height:oHigh, marginBottom: -105}]}>
<Image source={bgImage}
style={{width: width, height: bgHeight, paddingTop: bgPaddingTop, marginTop: bgMarginTop}}
resizeMode={'cover'}>
... ... @@ -677,13 +674,13 @@ export default class MineListHeader extends React.Component {
{
activityListInfo.list.map((item, i) => {
return (
item.get('state') === 1?
// item.get('state') === 1?
<TouchableOpacity key={i} activeOpacity={1} onPress={() => this.props.onPressItem('mineActivity',item)}>
<View style={styles.row}>
<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')}/>
}
<Text style={styles.icon_text} numberOfLines={1}>
<Text style={i == 0 ? styles.icon_text_white : styles.icon_text} numberOfLines={1}>
{item.get('act_name')}
</Text>
{
... ... @@ -730,19 +727,9 @@ export default class MineListHeader extends React.Component {
height: 10,
backgroundColor: '#f0f0f0',
}}/>
{
Platform.OS === 'ios' ?
<Text style={[styles.icon_text, {fontSize: 16, height: 120, marginTop:15,}]} numberOfLines={1}>
为您优选
</Text>
:
<View style={styles.row}>
<Text style={[styles.icon_text, {textAlign: 'center',}]} numberOfLines={1}>
为您优选
</Text>
</View>
}
<Text style={[styles.icon_text, {fontSize: 16, height: 120, marginTop:15,}]} numberOfLines={1}>
为您优选
</Text>
</View>
);
}
... ... @@ -755,7 +742,6 @@ let subRowHeight = Math.ceil(35 * DEVICE_WIDTH_RATIO);//账号安全 通知层
let rowheight = 45;//wo的订单类似的高度,我的逛也用这个高度
let orderContainerHeight = 55;
let topHeight = 175 + rowheight + orderContainerHeight + 10 + rowheight + orderContainerHeight + 1 + 10 + rowheight * 3 + 91;
let bannerResourceHeight = 0;
let orderContentWidth = (width - 10) / 5;
let assetContentWidth = (width - 10) / 4;
... ... @@ -841,6 +827,14 @@ let styles = StyleSheet.create({
fontSize: 17,
color: '#444444',
},
icon_text_white: {
flex: 1,
alignItems: 'center',
justifyContent: 'center',
marginLeft: 4,
fontSize: 17,
color: 'white',
},
order_text: {
flex: 1,
alignItems: 'center',
... ... @@ -915,6 +909,14 @@ let styles = StyleSheet.create({
paddingLeft: 15,
backgroundColor: 'white',
},
red_row: {
flexDirection: 'row',
alignItems: 'center',
height: rowheight,
width: width,
paddingLeft: 15,
backgroundColor: '#ce0b23',
},
sub_row: {
flexDirection: 'row',
alignItems: 'center',
... ...