Authored by 王海元

UI 适配 --review by 孙凯

... ... @@ -158,7 +158,7 @@ export default class GroupDetailHeader extends React.Component {
return (
<View style={styles.container}>
<View style={styles.detail}>
<View style={styles.subdetail}>
<View style={Platform.OS === 'ios' ? styles.subdetail : styles.subDetailA}>
<View style={styles.headerList}>
<HeaderList resource={membershipItems} lackNum={lackNum}/>
</View>
... ... @@ -260,6 +260,16 @@ let styles = StyleSheet.create({
alignItems: 'center',
backgroundColor: 'white',
},
subDetailA: {
flex: 1,
width: width - 30*DEVICE_WIDTH_RATIO,
borderLeftWidth: 1,
borderRightWidth: 1,
borderBottomWidth: 1,
borderColor: 'rgba(0,0,0,0.1)',
alignItems: 'center',
backgroundColor: 'white',
},
headerList: {
marginTop: 107*DEVICE_WIDTH_RATIO,
width: width - 30*DEVICE_WIDTH_RATIO,
... ...
... ... @@ -100,6 +100,7 @@ let styles = StyleSheet.create({
shadowOffset: {width: 0, height: 5},
shadowOpacity: 0.5,
shadowRadius: 5,
elevation: 1,
flexDirection: 'row',
backgroundColor: 'white',
},
... ... @@ -133,7 +134,7 @@ let styles = StyleSheet.create({
alignItems: 'center',
},
subPrice1: {
fontSize: 10,
fontSize: 10*DEVICE_WIDTH_RATIO,
color: '#B0B0B0',
lineHeight: 10*DEVICE_WIDTH_RATIO,
},
... ... @@ -154,12 +155,12 @@ let styles = StyleSheet.create({
},
iconText: {
color: 'white',
fontSize: 9,
fontSize: 9*DEVICE_WIDTH_RATIO,
textAlign: 'center',
},
price1: {
fontSize: 18,
fontSize: 18*DEVICE_WIDTH_RATIO,
marginLeft: 10*DEVICE_WIDTH_RATIO,
color: '#444444',
lineHeight: 18*DEVICE_WIDTH_RATIO,
... ... @@ -168,19 +169,19 @@ let styles = StyleSheet.create({
oldPriceContainer: {
flexDirection: 'row',
height: 12,
marginTop: 2,
height: 12*DEVICE_WIDTH_RATIO,
marginTop: 2*DEVICE_WIDTH_RATIO,
},
price2: {
fontSize: 12,
lineHeight: 12,
fontSize: 12*DEVICE_WIDTH_RATIO,
lineHeight: 12*DEVICE_WIDTH_RATIO,
color: '#B0B0B0',
alignItems: 'center',
},
deleteLine: {
position: 'absolute',
top: (16 / 2) - 3,
top: (16*DEVICE_WIDTH_RATIO / 2) - 3,
left: 0,
right: 0,
height: 1,
... ...
... ... @@ -74,6 +74,8 @@ export default class GroupProductCell extends React.Component {
</View>
</View>
</View>
<View style={styles.line}/>
</TouchableOpacity>
</View>
);
... ... @@ -139,12 +141,12 @@ let styles = StyleSheet.create({
},
iconText: {
color: 'white',
fontSize: 8,
fontSize: 8*DEVICE_WIDTH_RATIO,
textAlign: 'center',
},
price1: {
fontSize: 18,
fontSize: 18*DEVICE_WIDTH_RATIO,
marginLeft: 10*DEVICE_WIDTH_RATIO,
color: '#444444',
lineHeight: 18*DEVICE_WIDTH_RATIO,
... ... @@ -158,8 +160,8 @@ let styles = StyleSheet.create({
},
price2: {
fontSize: 12,
lineHeight: 12,
fontSize: 12*DEVICE_WIDTH_RATIO,
lineHeight: 12*DEVICE_WIDTH_RATIO,
color: '#B0B0B0',
alignItems: 'center',
},
... ... @@ -176,7 +178,7 @@ let styles = StyleSheet.create({
},
buttonBackImage: {
width: 120*DEVICE_WIDTH_RATIO,
width: 120*DEVICE_WIDTH_RATIO + 2,
height: 30*DEVICE_WIDTH_RATIO,
flexDirection: 'row',
alignItems: 'center',
... ... @@ -188,20 +190,26 @@ let styles = StyleSheet.create({
justifyContent: 'center',
},
button1: {
fontSize: 12,
fontSize: 12*DEVICE_WIDTH_RATIO,
color: '#D0021B',
},
button2: {
fontSize: 12,
fontSize: 12*DEVICE_WIDTH_RATIO,
color: 'white',
},
deleteLine: {
position: 'absolute',
top: (12 / 2) - 0.8,
top: (12*DEVICE_WIDTH_RATIO / 2) - 0.8,
left: 0,
right: 0,
height: 1,
backgroundColor: '#b0b0b0',
},
line: {
width,
height: 1,
marginLeft: 15*DEVICE_WIDTH_RATIO,
backgroundColor: '#E0E0E0',
},
});
... ...
... ... @@ -79,21 +79,21 @@ let styles = StyleSheet.create({
width: 305*DEVICE_WIDTH_RATIO,
height: 88*DEVICE_WIDTH_RATIO,
marginTop: 25*DEVICE_WIDTH_RATIO,
backgroundColor: 'red',
},
buttons: {
width,
height: 115*DEVICE_WIDTH_RATIO,
alignItems: 'center',
flexDirection: 'row',
justifyContent: 'space-around',
},
button1: {
marginLeft: 90*DEVICE_WIDTH_RATIO,
// marginLeft: 90*DEVICE_WIDTH_RATIO,
alignItems: 'center',
},
button2: {
marginLeft: 105*DEVICE_WIDTH_RATIO,
marginLeft: -10*DEVICE_WIDTH_RATIO,
alignItems: 'center',
},
icon: {
... ...
... ... @@ -389,15 +389,16 @@ let styles = StyleSheet.create({
width,
height: 115*DEVICE_WIDTH_RATIO,
alignItems: 'center',
justifyContent: 'space-around',
flexDirection: 'row',
},
button1: {
marginLeft: 90*DEVICE_WIDTH_RATIO,
// marginLeft: 90*DEVICE_WIDTH_RATIO,
alignItems: 'center',
},
button2: {
marginLeft: 105*DEVICE_WIDTH_RATIO,
marginLeft: -10*DEVICE_WIDTH_RATIO,
alignItems: 'center',
},
icon: {
... ...