Authored by chenl

Merge branch '5.6.0' of http://git.yoho.cn/mobile/YH_RNComponent into 5.6.0

... ... @@ -67,7 +67,7 @@ export default class ActionView extends Component {
{this.showTimer && this.state.timeLeft
? <View style={styles.timerContainer}>
<Image style={styles.clockImage} source={require('../../image/countDown.png')}/>
<Text style={{width: 90,fontSize:14,color:'#b0b0b0',marginLeft: 4}}>{this.state.timerString}</Text>
<Text style={styles.time}>{this.state.timerString}</Text>
</View>
: null
}
... ... @@ -208,5 +208,11 @@ let styles = StyleSheet.create({
redText: {
fontSize: 14,
color: '#d0021b'
},
time:{
width: 90,
fontSize:14,
color:'#b0b0b0',
marginLeft: 4,
}
});
... ...
... ... @@ -68,7 +68,7 @@ export default class ListFooter extends Component {
{payInfoString}
</Text>
<Text style={styles.amount}>
{'¥'+(orderAmout)}
{' ¥'+(orderAmout)}
</Text>
<Text style={styles.shippingCost}>
{shipCostString}
... ... @@ -106,19 +106,23 @@ let styles = StyleSheet.create({
backgroundColor: 'transparent',
maxWidth: width-30,
color: '#444444',
fontSize: 16
fontSize: 16,
fontWeight: '100'
},
payInfo: {
fontSize: 16,
color:'#444444'
color:'#444444',
fontWeight: '100'
},
amount: {
fontSize: 16,
color:'#d0021b'
color:'#d0021b',
fontWeight:'normal'
},
shippingCost: {
fontSize: 12,
color: '#444444'
color: '#444444',
fontWeight: '100',
},
line: {
backgroundColor: '#e5e5e5',
... ...