Merge branch '5.6.0' of http://git.yoho.cn/mobile/YH_RNComponent into 5.6.0
Showing
2 changed files
with
3 additions
and
1 deletions
@@ -62,7 +62,7 @@ export default class OrderInfoCell extends Component { | @@ -62,7 +62,7 @@ export default class OrderInfoCell extends Component { | ||
62 | </View> | 62 | </View> |
63 | <Text style={styles.otherText}>订单状态:{orderStatus}</Text> | 63 | <Text style={styles.otherText}>订单状态:{orderStatus}</Text> |
64 | <Text style={styles.otherText}>下单时间:{timeStr}</Text> | 64 | <Text style={styles.otherText}>下单时间:{timeStr}</Text> |
65 | - <Text style={styles.otherText}>支付方式:{payWay}</Text> | 65 | + {payWay&&payWay.leng?<Text style={styles.otherText}>支付方式:{payWay}</Text>:null} |
66 | </View> | 66 | </View> |
67 | </View> | 67 | </View> |
68 | ); | 68 | ); |
@@ -143,6 +143,8 @@ let styles = StyleSheet.create({ | @@ -143,6 +143,8 @@ let styles = StyleSheet.create({ | ||
143 | height: 82, | 143 | height: 82, |
144 | width:width, | 144 | width:width, |
145 | backgroundColor: 'white', | 145 | backgroundColor: 'white', |
146 | + borderColor: '#f0f0f0', | ||
147 | + borderBottomWidth: 0.5, | ||
146 | }, | 148 | }, |
147 | leftMiddleContainer:{ | 149 | leftMiddleContainer:{ |
148 | flexDirection:'row', | 150 | flexDirection:'row', |
-
Please register or login to post a comment