mobile / YH_RNComponent · Commits

Go to a project

Authored by 王海元
Commit 4cba3eb0179e5cf654e9c61602b9ce33069404b9 1 parent 8ee7adfd

update UI --review by 孙凯

Inline Side-by-side
Showing 3 changed files with 9 additions and 63 deletions
... ... @@ -4,7 +4,6 @@ import React from 'react';
import Immutable, {Map} from 'immutable';
import YH_Image from '../../common/components/YH_Image';
import {getSlicedUrl} from '../../classify/utils/Utils';
import DeleteLineText from '../../common/components/DeleteLineText';
import ReactNative, {
View,
... ... @@ -49,12 +48,7 @@ export default class GroupDetailProduct extends React.Component {
</View>
<View style={styles.subPriceView}>
<Text style={styles.subPrice1}>单人购买：</Text>
<DeleteLineText
style={styles.oldPriceContainer}
textStyle={styles.price2}
lineStyle={styles.deleteLine}
text={productSalePrice}
/>
<Text style={[styles.price2, {textDecorationLine: 'line-through'}]}>{productSalePrice}</Text>
</View>
</View>
... ... @@ -148,25 +142,12 @@ let styles = StyleSheet.create({
fontWeight: 'bold',
},
oldPriceContainer: {
flexDirection: 'row',
height: 12*DEVICE_WIDTH_RATIO,
marginTop: 2*DEVICE_WIDTH_RATIO,
},
price2: {
fontSize: 12*DEVICE_WIDTH_RATIO,
lineHeight: 12*DEVICE_WIDTH_RATIO,
color: '#B0B0B0',
alignItems: 'center',
},
deleteLine: {
position: 'absolute',
top: (16*DEVICE_WIDTH_RATIO / 2) - 3,
left: 0,
right: 0,
height: 1,
backgroundColor: '#b0b0b0',
marginTop: 2*DEVICE_WIDTH_RATIO,
},
styleBtn: {
position: 'absolute',
... ...
... ... @@ -4,7 +4,6 @@ import React from 'react';
import Immutable, {Map} from 'immutable';
import YH_Image from '../../common/components/YH_Image';
import {getSlicedUrl} from '../../classify/utils/Utils';
import DeleteLineText from '../../common/components/DeleteLineText';
import ReactNative, {
View,
... ... @@ -50,12 +49,7 @@ export default class GroupProductCell extends React.Component {
</View>
<View style={styles.priceView}>
<Text style={styles.price1}>¥{collagePrice}</Text>
<DeleteLineText
style={styles.oldPriceContainer}
textStyle={styles.price2}
lineStyle={styles.deleteLine}
text={deleteLineText}
/>
<Text style={[styles.price2, {textDecorationLine: 'line-through'}]}>{deleteLineText}</Text>
</View>
<View style={styles.buttonView}>
<ImageBackground
... ... @@ -150,16 +144,12 @@ let styles = StyleSheet.create({
color: '#D0021B',
},
oldPriceContainer: {
flexDirection: 'row',
height: 12*DEVICE_WIDTH_RATIO,
marginLeft: 10*DEVICE_WIDTH_RATIO,
marginTop: 1,
},
price2: {
fontSize: 12*DEVICE_WIDTH_RATIO,
lineHeight: 12*DEVICE_WIDTH_RATIO,
height: 12*DEVICE_WIDTH_RATIO,
marginLeft: 10*DEVICE_WIDTH_RATIO,
marginTop : 2,
color: '#B0B0B0',
alignItems: 'center',
},
... ... @@ -196,14 +186,6 @@ let styles = StyleSheet.create({
color: 'white',
},
deleteLine: {
position: 'absolute',
top: (12*DEVICE_WIDTH_RATIO / 2) - 0.8,
left: 0,
right: 0,
height: 1,
backgroundColor: '#b0b0b0',
},
line: {
width,
height: 1,
... ...
... ... @@ -4,7 +4,6 @@ import React from 'react';
import ReactNative , {Platform}from 'react-native';
import YH_Image from '../../common/components/YH_Image';
import {getSlicedUrl} from '../../classify/utils/Utils';
import DeleteLineText from '../../common/components/DeleteLineText';
import { captureRef } from "react-native-view-shot";
const {
... ... @@ -127,12 +126,7 @@ export default class SnapshootShare extends React.Component {
<View style={styles.productDetailBottom}>
<Image source={require('../images/Group5.png')} style={styles.priceIcon} />
<Text style={styles.price}>{productGroupPrice}</Text>
<DeleteLineText
style={styles.oldPriceContainer}
textStyle={styles.price2}
lineStyle={styles.deleteLine}
text={productSalePrice}
/>
<Text style={[styles.price2, {textDecorationLine: 'line-through'}]}>{productSalePrice}</Text>
</View>
</View>
<Image source={require('../images/Page.png')} resizeMode={'contain'} style={styles.mianyouIcon} />
... ... @@ -260,11 +254,6 @@ let styles = StyleSheet.create({
justifyContent: 'center',
alignItems: 'center',
},
oldPriceContainer: {
flexDirection: 'row',
height: 12,
marginTop: 2,
},
priceIcon: {
height: 17,
width: 50,
... ... @@ -281,14 +270,8 @@ let styles = StyleSheet.create({
color: '#B0B0B0',
alignItems: 'center',
marginLeft: 13*DEVICE_WIDTH_RATIO,
},
deleteLine: {
position: 'absolute',
top: (12 / 2),
left: 13,
right: 0,
height: 1,
backgroundColor: '#b0b0b0',
height: 12,
marginTop: 2,
},
mianyouIcon: {
... ...