mobile / YH_RNComponent · Commits

Go to a project

Authored by aozhe.zhu
Commit 41ffff56506ed7fe63846bfe9424f7bcd083261f 1 parent fa2c9759

拼图UI修改 review by 戴强

Inline Side-by-side
Showing 5 changed files with 17 additions and 13 deletions
@@ -149,9 +149,8 @@ export default class GroupDetailHeader extends React.Component { @@ -149,9 +149,8 @@ export default class GroupDetailHeader extends React.Component {
149 buttonText = '查看更多拼团活动'; 149 buttonText = '查看更多拼团活动';
150 tipTitlecolor = '#000000'; 150 tipTitlecolor = '#000000';
151 }else { 151 }else {
152 - tipTitle = '拼团失败';  
153 - buttonText = '查看更多拼团活动';  
154 - tipTitlecolor = '#000000'; 152 + tipTitle = '';
  153 + buttonText = '去参团';
155 } 154 }
156 155
157 return ( 156 return (
@@ -107,7 +107,7 @@ export default class SnapshootShare extends React.Component { @@ -107,7 +107,7 @@ export default class SnapshootShare extends React.Component {
107 <Image source={{uri: qrCode}} resizeMode={'contain'} style={styles.qr} /> 107 <Image source={{uri: qrCode}} resizeMode={'contain'} style={styles.qr} />
108 <View style={styles.bottomDetail}> 108 <View style={styles.bottomDetail}>
109 <View style={styles.titleV}> 109 <View style={styles.titleV}>
110 - <Text style={styles.titleText}>{shareCodeInfo.title}</Text> 110 + <Text style={styles.titleText} numberOfLines={1}>有货友拼团，潮人专属福利团</Text>
111 </View> 111 </View>
112 <Text style={styles.tipDetailText}>长按图片识别小程序参团</Text> 112 <Text style={styles.tipDetailText}>长按图片识别小程序参团</Text>
113 </View> 113 </View>
@@ -277,11 +277,11 @@ let styles = StyleSheet.create({ @@ -277,11 +277,11 @@ let styles = StyleSheet.create({
277 marginLeft: 27*DEVICE_WIDTH_RATIO, 277 marginLeft: 27*DEVICE_WIDTH_RATIO,
278 }, 278 },
279 titleText: { 279 titleText: {
280 - fontSize: 16, 280 + fontSize: 13,
281 color: '#444444', 281 color: '#444444',
282 }, 282 },
283 tipDetailText: { 283 tipDetailText: {
284 - fontSize: 12, 284 + fontSize: 11,
285 color: '#B0B0B0', 285 color: '#B0B0B0',
286 marginTop: 12*DEVICE_WIDTH_RATIO, 286 marginTop: 12*DEVICE_WIDTH_RATIO,
287 marginLeft: 27*DEVICE_WIDTH_RATIO, 287 marginLeft: 27*DEVICE_WIDTH_RATIO,
@@ -107,7 +107,7 @@ export default class SnapshootShare extends React.Component { @@ -107,7 +107,7 @@ export default class SnapshootShare extends React.Component {
107 <Image source={{uri: qrCode}} resizeMode={'contain'} style={styles.qr} /> 107 <Image source={{uri: qrCode}} resizeMode={'contain'} style={styles.qr} />
108 <View style={styles.bottomDetail}> 108 <View style={styles.bottomDetail}>
109 <View style={styles.titleV}> 109 <View style={styles.titleV}>
110 - <Text style={styles.titleText}>{shareCodeInfo.title}</Text> 110 + <Text style={styles.titleText}>有货友拼团，潮人专属福利团</Text>
111 </View> 111 </View>
112 <Text style={styles.tipDetailText}>长按图片识别小程序参团</Text> 112 <Text style={styles.tipDetailText}>长按图片识别小程序参团</Text>
113 </View> 113 </View>
@@ -277,11 +277,11 @@ let styles = StyleSheet.create({ @@ -277,11 +277,11 @@ let styles = StyleSheet.create({
277 marginLeft: 27*DEVICE_WIDTH_RATIO, 277 marginLeft: 27*DEVICE_WIDTH_RATIO,
278 }, 278 },
279 titleText: { 279 titleText: {
280 - fontSize: 16, 280 + fontSize: 13,
281 color: '#444444', 281 color: '#444444',
282 }, 282 },
283 tipDetailText: { 283 tipDetailText: {
284 - fontSize: 12, 284 + fontSize: 11,
285 color: '#B0B0B0', 285 color: '#B0B0B0',
286 marginTop: 12*DEVICE_WIDTH_RATIO, 286 marginTop: 12*DEVICE_WIDTH_RATIO,
287 marginLeft: 27*DEVICE_WIDTH_RATIO, 287 marginLeft: 27*DEVICE_WIDTH_RATIO,
@@ -135,8 +135,8 @@ export default class SnapshootShare extends React.Component { @@ -135,8 +135,8 @@ export default class SnapshootShare extends React.Component {
135 <Image source={{uri: qrCode}} resizeMode={'contain'} style={styles.qr} /> 135 <Image source={{uri: qrCode}} resizeMode={'contain'} style={styles.qr} />
136 <View style={styles.bottomDetail}> 136 <View style={styles.bottomDetail}>
137 <View style={styles.titleV}> 137 <View style={styles.titleV}>
138 - <Text style={styles.titleText}>{nickName}</Text>  
139 - <Text style={styles.titleText}>邀请你参团</Text> 138 + <Text style={[styles.titleText, styles.titleWidth]} numberOfLines={1}>{nickName}</Text>
  139 + <Text style={styles.titleText}>邀请你拼潮货</Text>
140 </View> 140 </View>
141 <Text style={styles.tipDetailText}>长按图片识别小程序参团</Text> 141 <Text style={styles.tipDetailText}>长按图片识别小程序参团</Text>
142 </View> 142 </View>
@@ -309,6 +309,9 @@ let styles = StyleSheet.create({ @@ -309,6 +309,9 @@ let styles = StyleSheet.create({
309 fontSize: 16, 309 fontSize: 16,
310 color: '#444444', 310 color: '#444444',
311 }, 311 },
  312 + titleWidth: {
  313 + maxWidth: 80,
  314 + },
312 tipDetailText: { 315 tipDetailText: {
313 fontSize: 12, 316 fontSize: 12,
314 color: '#B0B0B0', 317 color: '#B0B0B0',
@@ -148,7 +148,8 @@ class GroupPurchaseContainer extends Component { @@ -148,7 +148,8 @@ class GroupPurchaseContainer extends Component {
148 } = this.props.groupPurchase; 148 } = this.props.groupPurchase;
149 149
150 let { 150 let {
151 - host 151 + host,
  152 + unionType,
152 } = this.props.app; 153 } = this.props.app;
153 154
154 let param = { 155 let param = {
@@ -159,9 +160,10 @@ class GroupPurchaseContainer extends Component { @@ -159,9 +160,10 @@ class GroupPurchaseContainer extends Component {
159 160
160 return ( 161 return (
161 <View style={styles.container}> 162 <View style={styles.container}>
162 - <ShareViewModal show={showShareView} showShareView={this.showShareView} shareMiniApp={this.shareMiniApp} showSnapshootShare={this.showSnapshootShare}/> 163 + <ShareViewModal show={showShareView} unionType={unionType} showShareView={this.showShareView} shareMiniApp={this.shareMiniApp} showSnapshootShare={this.showSnapshootShare}/>
163 <ListSnapshootShare 164 <ListSnapshootShare
164 show={showSnapshootShare} 165 show={showSnapshootShare}
  166 + unionType={unionType}
165 shareCodeInfo={shareCodeInfo} 167 shareCodeInfo={shareCodeInfo}
166 showSnapshootShare={this.showSnapshootShare} 168 showSnapshootShare={this.showSnapshootShare}
167 shareSnapshootAction={this.shareSnapshootAction} 169 shareSnapshootAction={this.shareSnapshootAction}