|
@@ -119,10 +119,9 @@ export default class MineListHeader extends React.Component { |
|
@@ -119,10 +119,9 @@ export default class MineListHeader extends React.Component { |
119
|
|
119
|
|
120
|
return(
|
120
|
return(
|
121
|
<MineResourceList
|
121
|
<MineResourceList
|
122
|
- style={{width:width,height:500}}
|
122
|
+ style={{width: width,height: bannerResourceHeight}}
|
123
|
mineResource={this.props.mineResource}
|
123
|
mineResource={this.props.mineResource}
|
124
|
- onPressFloorItem={this.props.onPressFloorItem}>
|
|
|
125
|
- </MineResourceList>
|
124
|
+ onPressFloorItem={this.props.onPressFloorItem} />
|
126
|
);
|
125
|
);
|
127
|
}
|
126
|
}
|
128
|
|
127
|
|
|
@@ -206,8 +205,8 @@ export default class MineListHeader extends React.Component { |
|
@@ -206,8 +205,8 @@ export default class MineListHeader extends React.Component { |
206
|
|
205
|
|
207
|
//资源位高度
|
206
|
//资源位高度
|
208
|
if (this.props.mineResource) {
|
207
|
if (this.props.mineResource) {
|
209
|
- let floorHeight = this._calculateBannerResourceHeight();
|
|
|
210
|
- oHigh = oHigh + floorHeight;
|
208
|
+ bannerResourceHeight = this._calculateBannerResourceHeight();
|
|
|
209
|
+ oHigh = oHigh + bannerResourceHeight;
|
211
|
}
|
210
|
}
|
212
|
|
211
|
|
213
|
oHigh = topHeight + oHigh;
|
212
|
oHigh = topHeight + oHigh;
|
|
@@ -742,6 +741,7 @@ let subRowHeight = Math.ceil(35 * DEVICE_WIDTH_RATIO);//账号安全 通知层 |
|
@@ -742,6 +741,7 @@ let subRowHeight = Math.ceil(35 * DEVICE_WIDTH_RATIO);//账号安全 通知层 |
742
|
let rowheight = 45;//wo的订单类似的高度,我的逛也用这个高度
|
741
|
let rowheight = 45;//wo的订单类似的高度,我的逛也用这个高度
|
743
|
let orderContainerHeight = 55;
|
742
|
let orderContainerHeight = 55;
|
744
|
let topHeight = 175 + rowheight + orderContainerHeight + 10 + rowheight + orderContainerHeight + 1 + 10 + rowheight * 3 + 91;
|
743
|
let topHeight = 175 + rowheight + orderContainerHeight + 10 + rowheight + orderContainerHeight + 1 + 10 + rowheight * 3 + 91;
|
|
|
744
|
+let bannerResourceHeight = 0;
|
745
|
let orderContentWidth = (width - 10) / 5;
|
745
|
let orderContentWidth = (width - 10) / 5;
|
746
|
let assetContentWidth = (width - 10) / 4;
|
746
|
let assetContentWidth = (width - 10) / 4;
|
747
|
|
747
|
|