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

@@ -145,19 +145,19 @@ export default class MineListHeader extends React.Component {
         } = this.props;
         } = this.props;
 
 
         let oHigh = 0;
         let oHigh = 0;
-        if (this.props.certificationInfo && this.props.certificationInfo.isBindedOrRelated === 'N') {
+        if (profile.uid != '0' && this.props.certificationInfo && this.props.certificationInfo.isBindedOrRelated === 'N') {
             oHigh = oHigh + subRowHeight;
             oHigh = oHigh + subRowHeight;
         }
         }
         if (this.props.announcement && this.props.announcement.open === 'Y') {
         if (this.props.announcement && this.props.announcement.open === 'Y') {
             oHigh = oHigh + subRowHeight;
             oHigh = oHigh + subRowHeight;
         }
         }
-        if ((this.props.certificationInfo.isBindedOrRelated === 'N') || (this.props.announcement && this.props.announcement.open === 'Y')) {
+        if ((profile.uid != '0' && this.props.certificationInfo.isBindedOrRelated === 'N') || (this.props.announcement && this.props.announcement.open === 'Y')) {
             oHigh = oHigh + 10;
             oHigh = oHigh + 10;
         }
         }
-        if (this.props.globalOrderData && this.props.globalOrderData.hasOrder === 'Y') {
-            oHigh = oHigh + rowheight;
+        if (profile.uid != '0' && this.props.globalOrderData && this.props.globalOrderData.hasOrder === 'Y') {
+            oHigh = oHigh + rowheight + 11;
         }
         }
-        if (this.props.memberBill && this.props.memberBill.bill.open === 'Y') {
+        if (profile.uid != '0' && this.props.memberBill && this.props.memberBill.bill.open === 'Y') {
             oHigh = oHigh + rowheight;
             oHigh = oHigh + rowheight;
         }
         }
 
 
@@ -371,7 +371,7 @@ export default class MineListHeader extends React.Component {
                         duration={announcement.time}
                         duration={announcement.time}
                         onPressAnnounceItem={(url, i) => this.props.onPressItem('mineAnnounce',url)}/> : null
                         onPressAnnounceItem={(url, i) => this.props.onPressItem('mineAnnounce',url)}/> : null
                 }
                 }
-                {((certificationInfo.isBindedOrRelated === 'N') || (announcement && announcement.open === 'Y')) ?
+                {(profile.uid != '0' && (certificationInfo.isBindedOrRelated === 'N') || (announcement && announcement.open === 'Y')) ?
                     <View style={{
                     <View style={{
                     width: width,
                     width: width,
                     height: 10,
                     height: 10,
@@ -460,7 +460,7 @@ export default class MineListHeader extends React.Component {
                     height: 10,
                     height: 10,
                     backgroundColor: '#f0f0f0',
                     backgroundColor: '#f0f0f0',
                 }}/>
                 }}/>
-                {(globalOrderData && globalOrderData.hasOrder === 'Y') ?
+                {(profile.uid != '0' && globalOrderData && globalOrderData.hasOrder === 'Y') ?
                     <TouchableOpacity onPress={() => this.props.onPressItem('mineGlobalOrder','')}>
                     <TouchableOpacity onPress={() => this.props.onPressItem('mineGlobalOrder','')}>
                         <View style={styles.row}>
                         <View style={styles.row}>
                             <Image style={styles.row_icon} source={require('../../image/mine_globalpurchase_icon.png')}/>
                             <Image style={styles.row_icon} source={require('../../image/mine_globalpurchase_icon.png')}/>
@@ -597,7 +597,7 @@ export default class MineListHeader extends React.Component {
                     </View>
                     </View>
                 </TouchableOpacity>
                 </TouchableOpacity>
 
 
-                {(memberBill && memberBill.bill && memberBill.bill.open === 'Y') ?
+                {(profile.uid != '0' && memberBill && memberBill.bill && memberBill.bill.open === 'Y') ?
                     <TouchableOpacity onPress={() => this.props.onPressItem('mineMemberInfo',memberBill.bill.userinfo)}>
                     <TouchableOpacity onPress={() => this.props.onPressItem('mineMemberInfo',memberBill.bill.userinfo)}>
                         <View style={{
                         <View style={{
                         width: width-50,
                         width: width-50,
@@ -694,7 +694,7 @@ let subRowHeight = Math.ceil(35 * DEVICE_WIDTH_RATIO);//雍ｦ蜿ｷ螳牙 騾夂衍螻ら
 
 
 let rowheight = 45;//wo的订单类似的高度,我的逛也用这个高度
 let rowheight = 45;//wo的订单类似的高度,我的逛也用这个高度
 let orderContainerHeight = 55;
 let orderContainerHeight = 55;
-let topHeight = 175 + rowheight + orderContainerHeight + 10 + rowheight + orderContainerHeight + 1 + 10 + rowheight * 3 + 100;
+let topHeight = 175 + rowheight + orderContainerHeight + 10 + rowheight + orderContainerHeight + 1 + 10 + rowheight * 3 + 91;
 
 
 let styles = StyleSheet.create({
 let styles = StyleSheet.create({
     container: {
     container: {