Remove dislike from home. reviewed by redding.
Showing
6 changed files
with
28 additions
and
7 deletions
@@ -143,7 +143,6 @@ export default class Home extends Component { | @@ -143,7 +143,6 @@ export default class Home extends Component { | ||
143 | onPressProduct={this.props.onPressProductListProduct} | 143 | onPressProduct={this.props.onPressProductListProduct} |
144 | onLongPressProduct={this.props.onLongPressProduct} | 144 | onLongPressProduct={this.props.onLongPressProduct} |
145 | onPressFindSimilar={this.props.onPressFindSimilar} | 145 | onPressFindSimilar={this.props.onPressFindSimilar} |
146 | - onPressDislike={this.props.onPressDislike} | ||
147 | /> | 146 | /> |
148 | </View> | 147 | </View> |
149 | ); | 148 | ); |
@@ -88,6 +88,9 @@ export default class MineList extends React.Component { | @@ -88,6 +88,9 @@ export default class MineList extends React.Component { | ||
88 | renderHeader={this._renderHeader} | 88 | renderHeader={this._renderHeader} |
89 | onScroll={(event) => { | 89 | onScroll={(event) => { |
90 | ReactNative.NativeModules.YH_MineHelper.updateNavBarState(event.nativeEvent.contentOffset.y); | 90 | ReactNative.NativeModules.YH_MineHelper.updateNavBarState(event.nativeEvent.contentOffset.y); |
91 | + if (Platform.OS === 'ios' && event.nativeEvent.contentOffset.y < -60) { | ||
92 | + this.props.onRefresh && this.props.onRefresh(); | ||
93 | + } | ||
91 | }} | 94 | }} |
92 | /> | 95 | /> |
93 | </View> | 96 | </View> |
@@ -192,10 +192,14 @@ export default class MineListHeader extends React.Component { | @@ -192,10 +192,14 @@ export default class MineListHeader extends React.Component { | ||
192 | oHigh = oHigh + rowheight * this.props.activityListInfo.list.size; | 192 | oHigh = oHigh + rowheight * this.props.activityListInfo.list.size; |
193 | } | 193 | } |
194 | oHigh = topHeight + oHigh; | 194 | oHigh = topHeight + oHigh; |
195 | + let bgImage = Platform.OS === 'ios' ? require('../../image/mine_top_boy.png') : require('../../image/mine_banner_boy.jpg'); | ||
196 | + let bgHeight = Platform.OS === 'ios' ? 245 : 175; | ||
197 | + let bgMarginTop = Platform.OS === 'ios' ? -60 : 0; | ||
198 | + let bgPaddingTop = Platform.OS === 'ios' ? 115: 45; | ||
195 | return ( | 199 | return ( |
196 | <View style={[styles.container,{height:oHigh}]}> | 200 | <View style={[styles.container,{height:oHigh}]}> |
197 | - <Image source={require('../../image/mine_banner_boy.jpg')} | ||
198 | - style={{width: width, height: 175,paddingTop:45, }} | 201 | + <Image source={bgImage} |
202 | + style={{width: width, height: bgHeight,paddingTop:bgPaddingTop, marginTop: bgMarginTop}} | ||
199 | resizeMode={'stretch'}> | 203 | resizeMode={'stretch'}> |
200 | 204 | ||
201 | { | 205 | { |
@@ -732,6 +736,7 @@ let styles = StyleSheet.create({ | @@ -732,6 +736,7 @@ let styles = StyleSheet.create({ | ||
732 | height: 50, | 736 | height: 50, |
733 | paddingTop: 3, | 737 | paddingTop: 3, |
734 | backgroundColor: 'black', | 738 | backgroundColor: 'black', |
739 | + opacity: Platform.OS === 'ios' ? 0.7 : 1.0, | ||
735 | }, | 740 | }, |
736 | mine_row_container: { | 741 | mine_row_container: { |
737 | flexDirection: 'row', | 742 | flexDirection: 'row', |
@@ -899,7 +904,7 @@ let styles = StyleSheet.create({ | @@ -899,7 +904,7 @@ let styles = StyleSheet.create({ | ||
899 | textAlignVertical: 'center', | 904 | textAlignVertical: 'center', |
900 | color: 'white', | 905 | color: 'white', |
901 | fontSize: 15, | 906 | fontSize: 15, |
902 | - borderRadius: 3, | 907 | + borderRadius: Platform.OS === 'ios' ? 0 : 3, |
903 | borderWidth: (Platform.OS === 'ios' ? 3 : 5) / PixelRatio.get(), | 908 | borderWidth: (Platform.OS === 'ios' ? 3 : 5) / PixelRatio.get(), |
904 | borderColor: 'white', | 909 | borderColor: 'white', |
905 | backgroundColor: 'transparent', | 910 | backgroundColor: 'transparent', |
@@ -41,7 +41,7 @@ class MineContainer extends Component { | @@ -41,7 +41,7 @@ class MineContainer extends Component { | ||
41 | super(props); | 41 | super(props); |
42 | this._onPressItem = this._onPressItem.bind(this); | 42 | this._onPressItem = this._onPressItem.bind(this); |
43 | this._onPressProductListProduct = this._onPressProductListProduct.bind(this); | 43 | this._onPressProductListProduct = this._onPressProductListProduct.bind(this); |
44 | - | 44 | + this.onRefresh = this.onRefresh.bind(this); |
45 | this.subscription1 = NativeAppEventEmitter.addListener( | 45 | this.subscription1 = NativeAppEventEmitter.addListener( |
46 | 'UserDidLoginEvent', | 46 | 'UserDidLoginEvent', |
47 | (reminder) => { | 47 | (reminder) => { |
@@ -103,7 +103,21 @@ class MineContainer extends Component { | @@ -103,7 +103,21 @@ class MineContainer extends Component { | ||
103 | ); | 103 | ); |
104 | } | 104 | } |
105 | 105 | ||
106 | - | 106 | + onRefresh() { |
107 | + InteractionManager.runAfterInteractions(() => { | ||
108 | + this.props.actions.getMineUserInfo(); | ||
109 | + this.props.actions.getMineUserInfoNum(); | ||
110 | + this.props.actions.getMineFavProNum(); | ||
111 | + this.props.actions.getMineRedPackageNum(); | ||
112 | + this.props.actions.getMineInstalemtInfo(); | ||
113 | + this.props.actions.getMineActivity(); | ||
114 | + this.props.actions.getMemberBillTask(); | ||
115 | + this.props.actions.getEnvelopesItem(); | ||
116 | + this.props.actions.getCertificationData(); | ||
117 | + this.props.actions.getAnnouncement(); | ||
118 | + this.props.actions.getGlobalOrderState(); | ||
119 | + }); | ||
120 | + } | ||
107 | 121 | ||
108 | componentDidMount() { | 122 | componentDidMount() { |
109 | this.props.actions.productListForInstallment(); | 123 | this.props.actions.productListForInstallment(); |
@@ -325,7 +339,7 @@ class MineContainer extends Component { | @@ -325,7 +339,7 @@ class MineContainer extends Component { | ||
325 | announcement={announcement} | 339 | announcement={announcement} |
326 | globalOrderData={globalOrderData} | 340 | globalOrderData={globalOrderData} |
327 | iconAll={iconAll} | 341 | iconAll={iconAll} |
328 | - | 342 | + onRefresh={this.onRefresh} |
329 | onPressItem={this._onPressItem} | 343 | onPressItem={this._onPressItem} |
330 | onPressProductListProduct={this._onPressProductListProduct} | 344 | onPressProductListProduct={this._onPressProductListProduct} |
331 | /> | 345 | /> |
js/mine/image/mine_top_boy@2x.png
0 → 100755
221 KB
js/mine/image/mine_top_boy@3x.png
0 → 100755
435 KB
-
Please register or login to post a comment