mobile / YH_RNComponent · Commits

Go to a project

Authored by aozhe.zhu
Commit fa2c97599ffee859454e515d788792a1660e6fa9 1 parent 5a5a8e93

拼团UI修改 review by 戴强

Inline Side-by-side
Showing 7 changed files with 44 additions and 29 deletions
... ... @@ -181,7 +181,7 @@ export default class GroupDetailHeader extends React.Component {
</TouchableOpacity>
</View>
</View>
<TouchableOpacity activeOpacity={0.5} style={styles.product} onPress={() => {
<TouchableOpacity activeOpacity={0.8} style={styles.product} onPress={() => {
this.props.didTouchProduct && this.props.didTouchProduct(productSkn,activityId);
}}>
<GroupDetailProduct joinLimit={joinLimit} resource={productDetail} pageGo={pageGo} perpleNum={perpleNum}/>
... ...
... ... @@ -15,7 +15,12 @@ import ReactNative, {
Platform,
} from 'react-native';
let nameIndent;
if (Platform.OS === 'ios') {
nameIndent = ' ';
} else {
nameIndent = ' ';
}
export default class GroupDetailProduct extends React.Component {
... ... @@ -31,7 +36,7 @@ export default class GroupDetailProduct extends React.Component {
let productName = resource.productName;
let productSalePrice = resource.productSalePrice;
let productSkn = resource.productSkn;
return (
<View style={styles.container}>
... ... @@ -41,10 +46,8 @@ export default class GroupDetailProduct extends React.Component {
<YH_Image style={styles.image} url={productIcon}></YH_Image>
<View style={styles.right}>
<View style={styles.titleView}>
<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>
{joinLimit == 1 && <Image style={styles.priceImg} source={require('../images/ptj_tab.png')}/>}
<Text style={styles.title} numberOfLines={2}>{(joinLimit == 1 ? nameIndent : '') + productName}</Text>
</View>
<View style={styles.priceView}>
<Text style={styles.price1}>{productGroupPrice}</Text>
... ... @@ -94,17 +97,16 @@ let styles = StyleSheet.create({
},
titleView: {
width: 174*DEVICE_WIDTH_RATIO,
height: 32*DEVICE_WIDTH_RATIO,
height: 40*DEVICE_WIDTH_RATIO,
marginTop: 17*DEVICE_WIDTH_RATIO,
marginLeft: 10*DEVICE_WIDTH_RATIO,
},
wrapRow: {
flexDirection: 'row',
alignItems: 'center'
},
title: {
fontSize: 12,
color: '#444444',
includeFontPadding: false,
textAlignVertical: 'top',
lineHeight: 20,
},
subPriceView: {
width: 174*DEVICE_WIDTH_RATIO,
... ... @@ -123,7 +125,7 @@ let styles = StyleSheet.create({
width: 174*DEVICE_WIDTH_RATIO,
height: 21*DEVICE_WIDTH_RATIO,
marginLeft: 10*DEVICE_WIDTH_RATIO,
marginTop: 33*DEVICE_WIDTH_RATIO,
marginTop: 25*DEVICE_WIDTH_RATIO,
flexDirection: 'row',
alignItems: 'center',
},
... ... @@ -140,6 +142,8 @@ let styles = StyleSheet.create({
textAlign: 'center',
},
priceImg: {
top: 3*DEVICE_WIDTH_RATIO,
position: 'absolute',
marginRight: 5,
},
price1: {
... ...
... ... @@ -16,7 +16,12 @@ import ReactNative, {
ImageBackground,
} from 'react-native';
let nameIndent;
if (Platform.OS === 'ios') {
nameIndent = ' ';
} else {
nameIndent = ' ';
}
export default class GroupProductCell extends React.Component {
... ... @@ -46,10 +51,8 @@ export default class GroupProductCell extends React.Component {
</View>
<View style={styles.right}>
<View style={styles.titleView}>
<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>
<Text style={styles.title} numberOfLines={2}>{(joinLimit == 1 ? nameIndent : '') + resource.get('productName')}</Text>
</View>
<View style={styles.priceView}>
<Text style={styles.price1}>¥{collagePrice}</Text>
... ... @@ -114,14 +117,12 @@ let styles = StyleSheet.create({
marginTop: 12*DEVICE_WIDTH_RATIO,
marginLeft: 10*DEVICE_WIDTH_RATIO,
},
wrapRow: {
flexDirection: 'row',
alignItems: 'center'
},
title: {
fontSize: 14,
color: '#444444',
lineHeight: 19,
includeFontPadding: false,
textAlignVertical: 'top',
lineHeight: 20,
},
priceView: {
... ... @@ -133,6 +134,8 @@ let styles = StyleSheet.create({
alignItems: 'center',
},
priceImg: {
top: 2*DEVICE_WIDTH_RATIO,
position: 'absolute',
marginRight: 5,
},
iconTextView: {
... ...
... ... @@ -190,12 +190,12 @@ let styles = StyleSheet.create({
},
productimage: {
height: 443*DEVICE_WIDTH_RATIO,
height: 433*DEVICE_WIDTH_RATIO,
width: 325*DEVICE_WIDTH_RATIO,
},
product: {
height: 443*DEVICE_WIDTH_RATIO,
height: 433*DEVICE_WIDTH_RATIO,
width: 325*DEVICE_WIDTH_RATIO,
marginTop: 24*DEVICE_WIDTH_RATIO,
},
... ...
... ... @@ -190,12 +190,12 @@ let styles = StyleSheet.create({
},
productimage: {
height: 443*DEVICE_WIDTH_RATIO,
height: 433*DEVICE_WIDTH_RATIO,
width: 325*DEVICE_WIDTH_RATIO,
},
product: {
height: 443*DEVICE_WIDTH_RATIO,
height: 433*DEVICE_WIDTH_RATIO,
width: 325*DEVICE_WIDTH_RATIO,
marginTop: 24*DEVICE_WIDTH_RATIO,
},
... ...
... ... @@ -12,6 +12,7 @@ const {
TouchableOpacity,
Modal,
Text,
TouchableWithoutFeedback,
} = ReactNative;
... ... @@ -30,6 +31,11 @@ export default class ShareViewModal extends React.Component {
onRequestClose={() => {
}}>
<View style={styles.modalContainer}>
<TouchableWithoutFeedback onPress={() => {
this.props.showShareView && this.props.showShareView(false);
}}>
<View style={styles.topView}/>
</TouchableWithoutFeedback>
<View style={styles.shareView}>
<View style={styles.buttons}>
<TouchableOpacity activeOpacity={0.5} style={styles.button1} onPress={() => {
... ... @@ -67,9 +73,11 @@ let styles = StyleSheet.create({
flex: 1,
width: width,
height: height,
justifyContent: 'flex-end',
backgroundColor: 'rgba(0, 0, 0, 0.6)',
},
topView: {
flex: 1,
},
shareView: {
width,
height: 171*DEVICE_WIDTH_RATIO,
... ...
... ... @@ -219,12 +219,12 @@ let styles = StyleSheet.create({
},
productimage: {
height: 443*DEVICE_WIDTH_RATIO,
height: 433*DEVICE_WIDTH_RATIO,
width: 325*DEVICE_WIDTH_RATIO,
},
product: {
height: 443*DEVICE_WIDTH_RATIO,
height: 433*DEVICE_WIDTH_RATIO,
width: 325*DEVICE_WIDTH_RATIO,
marginTop: 24*DEVICE_WIDTH_RATIO,
},
... ...