Authored by 王海元

UI 修改 — review by 孙凯

... ... @@ -98,7 +98,10 @@ export default class Alliance extends Component {
<Text style={styles.numberText}>订单金额:{rowData.get('lastOrderAmountStr')}</Text>
<View style={{flexDirection: 'row', marginTop: 6}}>
<Text style={styles.timeText}>{rowData.get('orderTimeStr')}</Text>
{rowData.get('isNew') === 1 ? <Text style={styles.statusText}>新客订单</Text> : null}
{rowData.get('isNew') === 1 ?
<View style={styles.statusTextContainer}>
<Text style={styles.statusText}>新客订单</Text>
</View>: null}
</View>
</View>
<View>
... ... @@ -346,19 +349,21 @@ let styles = StyleSheet.create({
color: '#B0B0B0',
letterSpacing: -0.19,
},
statusTextContainer: {
width: 48,
height: 18,
marginLeft: 10,
borderWidth: 1,
borderColor: '#D0021B',
borderRadius: 2,
alignItems: 'center',
justifyContent: 'center',
},
statusText: {
fontFamily: 'PingFang-SC-Regular',
fontSize: 10,
marginLeft: 10,
paddingTop: 2,
paddingLeft: 4,
paddingRight: 4,
paddingBottom: 2,
color: '#D0021B',
letterSpacing: -0.24,
borderWidth: 1,
borderColor: '#D0021B',
borderRadius: 2,
textAlign: 'center',
},
})
... ...
... ... @@ -107,7 +107,7 @@ export default class OrderIncome extends Component {
</TouchableOpacity>
</View>
}
<View style={styles.lineView}/>
{this.state.orderType === 3 ? null : <View style={styles.lineView}/>}
</View>
)
}
... ... @@ -124,7 +124,10 @@ export default class OrderIncome extends Component {
<Text style={styles.numberText}>订单金额:{rowData.get('lastOrderAmountStr')}</Text>
<View style={{flexDirection: 'row', marginTop: 6}}>
<Text style={styles.timeText}>{rowData.get('orderTimeStr')}</Text>
{rowData.get('isNew') === 1 ? <Text style={styles.statusText}>新客订单</Text> : null}
{rowData.get('isNew') === 1 ?
<View style={styles.statusTextContainer}>
<Text style={styles.statusText}>新客订单</Text>
</View>: null}
</View>
</View>
<View>
... ... @@ -255,19 +258,21 @@ let styles = StyleSheet.create({
color: '#B0B0B0',
letterSpacing: -0.19,
},
statusTextContainer: {
width: 48,
height: 18,
marginLeft: 10,
borderWidth: 1,
borderColor: '#D0021B',
borderRadius: 2,
alignItems: 'center',
justifyContent: 'center',
},
statusText: {
fontFamily: 'PingFang-SC-Regular',
fontSize: 10,
marginLeft: 10,
paddingTop: 2,
paddingLeft: 4,
paddingRight: 4,
paddingBottom: 2,
color: '#D0021B',
letterSpacing: -0.24,
borderWidth: 1,
borderColor: '#D0021B',
borderRadius: 2,
textAlign: 'center',
},
});
... ...