Authored by 孙凯

update UI review by daiqiang

... ... @@ -116,7 +116,7 @@ export default class GroupDetailHeader extends React.Component {
let buttonText = '';
let tipTitle = '';
let tipDetail = '';
let tipTitlecolor = '#D0021B';
if(diffTime == 0 ){
diffTime = parseInt(leftTime);
}
... ... @@ -137,22 +137,27 @@ export default class GroupDetailHeader extends React.Component {
tipTitle = '拼团成功';
tipDetail = '我们会尽快安排发货';
buttonText = '查看更多拼团活动';
tipTitlecolor = '#000000';
}else if (pageGo == 5) {
tipTitle = '你来晚了';
tipDetail = '你的好友已经拼团成功';
buttonText = '查看更多拼团活动';
tipTitlecolor = '#000000';
}else if (pageGo == 6) {
tipTitle = '拼团失败';
tipDetail = '购买人数不足,我们会尽快安排退款';
buttonText = '查看更多拼团活动';
tipTitlecolor = '#000000';
}else if (pageGo == 7) {
tipTitle = '拼团失败';
tipDetail = '购买人数不足,我们会尽快安排退款';
buttonText = '查看更多拼团活动';
tipTitlecolor = '#000000'
}else {
tipTitle = '拼团失败';
tipDetail = '购买人数不足,我们会尽快安排退款';
buttonText = '查看更多拼团活动';
tipTitlecolor = '#000000';
}
return (
... ... @@ -168,7 +173,7 @@ export default class GroupDetailHeader extends React.Component {
:
this._renderTip(tipTitle,tipDetail)
}
<TouchableOpacity activeOpacity={0.5} style={styles.button} onPress={() => {
<TouchableOpacity activeOpacity={0.5} style={[styles.button,{backgroundColor: tipTitlecolor}]} onPress={() => {
this.props.didTouchButton && this.props.didTouchButton(resource);
}}>
<Text style={styles.buttonText}>{buttonText}</Text>
... ... @@ -261,19 +266,18 @@ let styles = StyleSheet.create({
backgroundColor: 'white',
},
headerList: {
marginTop: 107*DEVICE_WIDTH_RATIO,
marginTop: 97*DEVICE_WIDTH_RATIO,
width: width - 30*DEVICE_WIDTH_RATIO,
height: 40*DEVICE_WIDTH_RATIO,
},
button: {
height: 40*DEVICE_WIDTH_RATIO,
borderRadius: 20*DEVICE_WIDTH_RATIO,
backgroundColor: '#D0021B',
flex: 1,
justifyContent: 'center',
paddingLeft: 30*DEVICE_WIDTH_RATIO,
paddingRight: 30*DEVICE_WIDTH_RATIO,
marginTop: 30*DEVICE_WIDTH_RATIO,
marginTop: 20*DEVICE_WIDTH_RATIO,
},
buttonText: {
fontSize: 16,
... ...
... ... @@ -32,15 +32,6 @@ export default class GroupDetailProduct extends React.Component {
let productName = resource.productName;
let productSalePrice = resource.productSalePrice;
let productSkn = resource.productSkn;
let tipIcon = '';
let needShowTioIcon = false;
if (pageGo == 4) {
needShowTioIcon = true;
tipIcon = require('../images/success_tab.png');
}else if (pageGo == 6 || pageGo == 7) {
needShowTioIcon = true;
tipIcon = require('../images/lost_tab.png');
}
return (
<View style={styles.container}>
... ... @@ -54,9 +45,11 @@ export default class GroupDetailProduct extends React.Component {
<Text style={styles.title} numberOfLines={2}>{productName}</Text>
</View>
<View style={styles.priceView}>
{1 ? null :
<View style={styles.iconTextView}>
<Text style={styles.iconText}>{perpleNum}人团</Text>
</View>
}//暂时注释
<Text style={styles.price1}>{productGroupPrice}</Text>
</View>
<View style={styles.subPriceView}>
... ... @@ -69,13 +62,6 @@ export default class GroupDetailProduct extends React.Component {
/>
</View>
</View>
{needShowTioIcon ?
<View style={styles.styleBtn}>
<Image source={tipIcon} style={styles.styleBtnicon} resizeMode={'contain'}/>
</View>
: null
}
</View>
</View>
... ... @@ -160,8 +146,7 @@ let styles = StyleSheet.create({
price1: {
fontSize: 18*DEVICE_WIDTH_RATIO,
marginLeft: 10*DEVICE_WIDTH_RATIO,
color: '#444444',
color: '#D0021B',
lineHeight: 18*DEVICE_WIDTH_RATIO,
fontWeight: 'bold',
},
... ...
... ... @@ -48,9 +48,11 @@ export default class GroupProductCell extends React.Component {
<Text style={styles.title} numberOfLines={2}>{resource.get('productName')}</Text>
</View>
<View style={styles.priceView}>
<View style={styles.iconTextView}>
<Text style={styles.iconText}>{resource.get('peopleNum')}人团</Text>
</View>
{1 ? null :
<View style={styles.iconTextView} >
<Text style={styles.iconText}>{resource.get('peopleNum')}人团</Text>
</View>
}//暂时注释
<Text style={styles.price1}>¥{resource.get('collagePrice')}</Text>
<DeleteLineText
style={styles.oldPriceContainer}
... ... @@ -65,7 +67,7 @@ export default class GroupProductCell extends React.Component {
source={require('../images/PT_bt.png')}
>
<View style={styles.buttonS}>
<Text style={styles.button1}>{resource.get('peopleNum')}直降</Text>
<Text style={styles.button1}>{resource.get('peopleNum')}成团</Text>
</View>
<View style={styles.buttonS}>
<Text style={styles.button2}>立即购买</Text>
... ... @@ -147,16 +149,15 @@ let styles = StyleSheet.create({
price1: {
fontSize: 18*DEVICE_WIDTH_RATIO,
marginLeft: 10*DEVICE_WIDTH_RATIO,
color: '#444444',
lineHeight: 18*DEVICE_WIDTH_RATIO,
fontWeight: 'bold',
color: '#D0021B',
},
oldPriceContainer: {
flexDirection: 'row',
height: 12,
height: 12*DEVICE_WIDTH_RATIO,
marginLeft: 10*DEVICE_WIDTH_RATIO,
marginTop: 5,
marginTop : 1,
},
price2: {
... ... @@ -178,8 +179,8 @@ let styles = StyleSheet.create({
},
buttonBackImage: {
width: 120*DEVICE_WIDTH_RATIO + 2,
height: 30*DEVICE_WIDTH_RATIO,
width: Math.floor(120*DEVICE_WIDTH_RATIO),
height: Math.floor(30*DEVICE_WIDTH_RATIO),
flexDirection: 'row',
alignItems: 'center',
},
... ...

3.38 KB | W: 0px | H: 0px

2.48 KB | W: 0px | H: 0px

  • 2-up
  • Swipe
  • Onion skin

5.71 KB | W: 0px | H: 0px

3.85 KB | W: 0px | H: 0px

  • 2-up
  • Swipe
  • Onion skin