update UI review by daiqiang
Showing
5 changed files
with
36 additions
and
6 deletions
@@ -181,7 +181,7 @@ export default class GroupDetailHeader extends React.Component { | @@ -181,7 +181,7 @@ export default class GroupDetailHeader extends React.Component { | ||
181 | </TouchableOpacity> | 181 | </TouchableOpacity> |
182 | </View> | 182 | </View> |
183 | <View style={styles.product}> | 183 | <View style={styles.product}> |
184 | - <GroupDetailProduct resource={productDetail} perpleNum={perpleNum}/> | 184 | + <GroupDetailProduct resource={productDetail} pageGo={pageGo} perpleNum={perpleNum}/> |
185 | </View> | 185 | </View> |
186 | <View style={styles.bottomLine}/> | 186 | <View style={styles.bottomLine}/> |
187 | </View> | 187 | </View> |
@@ -25,13 +25,22 @@ export default class GroupDetailProduct extends React.Component { | @@ -25,13 +25,22 @@ export default class GroupDetailProduct extends React.Component { | ||
25 | } | 25 | } |
26 | 26 | ||
27 | render() { | 27 | render() { |
28 | - let { resource ,perpleNum} = this.props; | 28 | + let { resource ,perpleNum,pageGo} = this.props; |
29 | if(!resource) return null; | 29 | if(!resource) return null; |
30 | let productIcon = resource.productIcon ? getSlicedUrl(resource.productIcon,109*DEVICE_WIDTH_RATIO, 141*DEVICE_WIDTH_RATIO, 2) : ''; | 30 | let productIcon = resource.productIcon ? getSlicedUrl(resource.productIcon,109*DEVICE_WIDTH_RATIO, 141*DEVICE_WIDTH_RATIO, 2) : ''; |
31 | let productGroupPrice = resource.productGroupPrice; | 31 | let productGroupPrice = resource.productGroupPrice; |
32 | let productName = resource.productName; | 32 | let productName = resource.productName; |
33 | let productSalePrice = resource.productSalePrice; | 33 | let productSalePrice = resource.productSalePrice; |
34 | let productSkn = resource.productSkn; | 34 | let productSkn = resource.productSkn; |
35 | + let tipIcon = ''; | ||
36 | + let needShowTioIcon = false; | ||
37 | + if (pageGo == 4) { | ||
38 | + needShowTioIcon = true; | ||
39 | + tipIcon = require('../images/success_tab.png'); | ||
40 | + }else if (pageGo == 6 || pageGo == 7) { | ||
41 | + needShowTioIcon = true; | ||
42 | + tipIcon = require('../images/lost_tab.png'); | ||
43 | + } | ||
35 | 44 | ||
36 | return ( | 45 | return ( |
37 | <View style={styles.container}> | 46 | <View style={styles.container}> |
@@ -56,6 +65,14 @@ export default class GroupDetailProduct extends React.Component { | @@ -56,6 +65,14 @@ export default class GroupDetailProduct extends React.Component { | ||
56 | /> | 65 | /> |
57 | </View> | 66 | </View> |
58 | </View> | 67 | </View> |
68 | + {needShowTioIcon ? | ||
69 | + <View style={styles.styleBtn}> | ||
70 | + <Image source={tipIcon} style={styles.styleBtnicon} resizeMode={'contain'}/> | ||
71 | + </View> | ||
72 | + : null | ||
73 | + } | ||
74 | + | ||
75 | + | ||
59 | </View> | 76 | </View> |
60 | ); | 77 | ); |
61 | } | 78 | } |
@@ -159,4 +176,15 @@ let styles = StyleSheet.create({ | @@ -159,4 +176,15 @@ let styles = StyleSheet.create({ | ||
159 | height: 1, | 176 | height: 1, |
160 | backgroundColor: '#b0b0b0', | 177 | backgroundColor: '#b0b0b0', |
161 | }, | 178 | }, |
179 | + styleBtn: { | ||
180 | + position: 'absolute', | ||
181 | + width: 52*DEVICE_WIDTH_RATIO, | ||
182 | + height: 20*DEVICE_WIDTH_RATIO, | ||
183 | + top: 111*DEVICE_WIDTH_RATIO, | ||
184 | + right: -10*DEVICE_WIDTH_RATIO, | ||
185 | + }, | ||
186 | + styleBtnicon: { | ||
187 | + width: 52*DEVICE_WIDTH_RATIO, | ||
188 | + height: 20*DEVICE_WIDTH_RATIO, | ||
189 | + }, | ||
162 | }); | 190 | }); |
@@ -86,6 +86,7 @@ export default class SnapshootShare extends React.Component { | @@ -86,6 +86,7 @@ export default class SnapshootShare extends React.Component { | ||
86 | <ScrollView | 86 | <ScrollView |
87 | style={styles.scrollView} | 87 | style={styles.scrollView} |
88 | vertical={true} | 88 | vertical={true} |
89 | + showsVerticalScrollIndicator={false} | ||
89 | > | 90 | > |
90 | <View style={styles.container} ref='container'> | 91 | <View style={styles.container} ref='container'> |
91 | <View style={styles.titleV}> | 92 | <View style={styles.titleV}> |
@@ -230,7 +231,7 @@ let styles = StyleSheet.create({ | @@ -230,7 +231,7 @@ let styles = StyleSheet.create({ | ||
230 | }, | 231 | }, |
231 | spaceV: { | 232 | spaceV: { |
232 | backgroundColor: 'white', | 233 | backgroundColor: 'white', |
233 | - height: 171*DEVICE_WIDTH_RATIO, | 234 | + height: 150*DEVICE_WIDTH_RATIO, |
234 | width, | 235 | width, |
235 | }, | 236 | }, |
236 | 237 | ||
@@ -313,10 +314,11 @@ let styles = StyleSheet.create({ | @@ -313,10 +314,11 @@ let styles = StyleSheet.create({ | ||
313 | tip: { | 314 | tip: { |
314 | fontSize: 14, | 315 | fontSize: 14, |
315 | color:'#444444', | 316 | color:'#444444', |
316 | - marginTop: 16*DEVICE_WIDTH_RATIO, | 317 | + marginTop: 25*DEVICE_WIDTH_RATIO, |
317 | }, | 318 | }, |
318 | tipDetailView: { | 319 | tipDetailView: { |
319 | flexDirection: 'row', | 320 | flexDirection: 'row', |
321 | + alignItems: 'center', | ||
320 | }, | 322 | }, |
321 | tipicon: { | 323 | tipicon: { |
322 | marginTop: 10*DEVICE_WIDTH_RATIO, | 324 | marginTop: 10*DEVICE_WIDTH_RATIO, |
@@ -392,7 +394,7 @@ let styles = StyleSheet.create({ | @@ -392,7 +394,7 @@ let styles = StyleSheet.create({ | ||
392 | alignItems: 'flex-end', | 394 | alignItems: 'flex-end', |
393 | }, | 395 | }, |
394 | cancelBtnicon: { | 396 | cancelBtnicon: { |
395 | - width: 34*DEVICE_WIDTH_RATIO, | ||
396 | - height: 34*DEVICE_WIDTH_RATIO, | 397 | + width: 30*DEVICE_WIDTH_RATIO, |
398 | + height: 30*DEVICE_WIDTH_RATIO, | ||
397 | }, | 399 | }, |
398 | }); | 400 | }); |
js/groupPurchase/images/lost_tab@3x.png
0 → 100644
1.98 KB
js/groupPurchase/images/success_tab@3x.png
0 → 100644
3.01 KB
-
Please register or login to post a comment