mobile / YH_RNComponent · Commits

Go to a project

Authored by Zhu-Arthur
Commit 08cdb67ad4634546ee6e8bcdfd093a50669014ab 1 parent 34f3a4c4

拼团文案 图标修改 拼团头像问题 review by 戴强

Inline Side-by-side
Showing 5 changed files with 22 additions and 11 deletions
... ... @@ -178,7 +178,7 @@ export default class GroupDetailHeader extends React.Component {
<TouchableOpacity activeOpacity={0.5} onPress={() => {
this.props.goComment && this.props.goComment();
}}>
<Text style={styles.tip}>支付邀请-支付加入-凑齐人数发货-凑不齐退款 玩法介绍》</Text>
<Text style={styles.tip}>支付开团-支付参团-凑齐人数发货-凑不齐退款 玩法介绍》</Text>
</TouchableOpacity>
</View>
</View>
... ...
... ... @@ -41,10 +41,12 @@ export default class GroupDetailProduct extends React.Component {
<YH_Image style={styles.image} url={productIcon}></YH_Image>
<View style={styles.right}>
<View style={styles.titleView}>
<Text style={styles.title} numberOfLines={2}>{productName}</Text>
<View style={styles.wrapRow}>
{joinLimit == 1 && <Image style={styles.priceImg} source={require('../images/ptj_tab.png')}/>}
<Text style={styles.title} numberOfLines={2}>{productName}</Text>
</View>
</View>
<View style={styles.priceView}>
{joinLimit == 1 && <Image style={styles.priceImg} source={require('../images/ptj_tab.png')}/>}
<Text style={styles.price1}>{productGroupPrice}</Text>
</View>
<View style={styles.subPriceView}>
... ... @@ -94,11 +96,13 @@ let styles = StyleSheet.create({
marginTop: 17*DEVICE_WIDTH_RATIO,
marginLeft: 10*DEVICE_WIDTH_RATIO,
},
wrapRow: {
flexDirection: 'row',
alignItems: 'center'
},
title: {
fontSize: 12,
color: '#444444',
lineHeight: 19,
},
subPriceView: {
width: 174*DEVICE_WIDTH_RATIO,
... ...
... ... @@ -46,10 +46,12 @@ export default class GroupProductCell extends React.Component {
</View>
<View style={styles.right}>
<View style={styles.titleView}>
<Text style={styles.title} numberOfLines={2}>{resource.get('productName')}</Text>
<View style={styles.wrapRow}>
{joinLimit == 1 && <Image style={styles.priceImg} source={require('../images/ptj_tab.png')} />}
<Text style={styles.title} numberOfLines={2}>{resource.get('productName')}</Text>
</View>
</View>
<View style={styles.priceView}>
{joinLimit == 1 && <Image style={styles.priceImg} source={require('../images/ptj_tab.png')} />}
<Text style={styles.price1}>¥{collagePrice}</Text>
<Text style={[styles.price2, {textDecorationLine: 'line-through'}]}>{deleteLineText}</Text>
</View>
... ... @@ -112,7 +114,10 @@ let styles = StyleSheet.create({
marginTop: 12*DEVICE_WIDTH_RATIO,
marginLeft: 10*DEVICE_WIDTH_RATIO,
},
wrapRow: {
flexDirection: 'row',
alignItems: 'center'
},
title: {
fontSize: 14,
color: '#444444',
... ...
... ... @@ -47,7 +47,7 @@ export default class GroupPurchaseDetail extends Component {
return(
<View style={styles.productListheader}>
<View style={styles.productListheaderSub}>
<Text style={styles.title}>查看其他拼团产品</Text>
<Text style={styles.title}>查看其他拼团商品</Text>
</View>
</View>
);
... ...
... ... @@ -3,6 +3,7 @@
import React from 'react';
import Immutable, {Map} from 'immutable';
import YH_Image from '../../common/components/YH_Image';
import {getSlicedUrl} from '../../classify/utils/Utils';
import ReactNative, {
View,
... ... @@ -34,10 +35,11 @@ export default class HeaderList extends React.Component {
return (
<View style={styles.container}>
{resource.map((item, i) => {
let headUrl = item.headUrl && getSlicedUrl(item.headUrl, 40*DEVICE_WIDTH_RATIO, 40*DEVICE_WIDTH_RATIO, 2);
if (i == 0) {
return (
<View key={i} style={styles.icon1}>
<YH_Image style={{width: 40*DEVICE_WIDTH_RATIO,height: 40*DEVICE_WIDTH_RATIO}} url={item.headUrl} circle={true}></YH_Image>
<YH_Image style={{width: 40*DEVICE_WIDTH_RATIO,height: 40*DEVICE_WIDTH_RATIO}} url={headUrl} circle={true}></YH_Image>
<Image source={require('../images/PT_tx_tz.png')} style={styles.ovewicon} />
</View>
);
... ... @@ -48,7 +50,7 @@ export default class HeaderList extends React.Component {
);
}else {
return (
<YH_Image key={i} style={styles.icon} url={item.headUrl} circle={true}></YH_Image>
<YH_Image key={i} style={styles.icon} url={headUrl} circle={true}></YH_Image>
);
}
}
... ...