Merge branch 'V9.30_Date' of git.yoho.cn:mobile/YH_RNComponent into V9.30_Date

@@ -135,7 +135,7 @@ export default class Alliance extends Component {
                 )
             }
             case 'orderList': {
-                let status = rowData.get('status') === '10' ? '待确认' : '';
+                let status = rowData.get('status') === '10' ? '待结算' : '';
                 return (
                     <View>
                         <TouchableOpacity activeOpacity={1} onPress={() => {

@@ -60,7 +60,13 @@ export default class BankCard extends Component {
 
         let bankBranch = this.state.bankBranch;
         if (!bankBranch || !bankBranch.trim()) {
-            this.setState({messageTips: '请输入分行/支行信息'});
+            this.setState({messageTips: '请输入正确的分行和支行信息'});
+            return
+        }
+
+        bankBranch = bankBranch.trim();
+        if (bankBranch.length < 4) {
+            this.setState({messageTips: '请输入正确的分行和支行信息'});
             return
         }
 
@@ -72,7 +78,7 @@ export default class BankCard extends Component {
         }
 
         this.setState({messageTips: '', isUpdate: true});
-        this.props.checkBankCard && this.props.checkBankCard(this.state.name, this.state.number, this.state.bankCode, this.state.cardNo,this.state.bankBranch);
+        this.props.checkBankCard && this.props.checkBankCard(this.state.name, this.state.number, this.state.bankCode, this.state.cardNo,bankBranch);
     }
 
     renderUnBind() {

@@ -186,6 +186,7 @@ export default class Home extends Component {
                     isShowGuide={this.props.isShowGuide}
                     hiddenGuideDialog={this.props.hiddenGuideDialog}/>
                 <SectionList
+                    stickySectionHeadersEnabled={true}
                     ref={(ref) => this.sectionList = ref}
                     sections={dataSource}
                     renderSectionHeader={this._renderSectionHeader}
@@ -236,8 +237,7 @@ let styles = StyleSheet.create({
             backgroundColor: '#e0e0e0'
         },
         contentContainer: {
-            flexDirection: 'row',
-            flexWrap: 'wrap',
+            flexDirection: 'column',
             backgroundColor: 'white'
         },
         listContainer: {

@@ -18,7 +18,7 @@ export default class OrderDetail extends Component {
     }
 
     _renderHeader() {
-        let status = this.props.orderDetail.status === '10' ? '（待确认）' : '';
+        let status = this.props.orderDetail.status === '10' ? '（待结算）' : '';
         return (
             <View>
                 <View style={styles.header}>

@@ -79,7 +79,7 @@ export default class OrderIncome extends Component {
                         }}>
                             <View style={styles.headerContainer}>
                               <View style={[styles.subHeaderContainer, this.state.orderStatus === 1 ? {backgroundColor: '#444444'} : null]}>
-                                <Text style={[styles.subHeaderText, this.state.orderStatus === 1 ? {color: 'white'} : null]}>待确认</Text>
+                                <Text style={[styles.subHeaderText, this.state.orderStatus === 1 ? {color: 'white'} : null]}>待结算</Text>
                               </View>
                             </View>
                         </TouchableOpacity>
@@ -121,7 +121,7 @@ export default class OrderIncome extends Component {
     }
 
     _renderRow(rowData, sectionID, rowID) {
-        let status = rowData.get('status') === '10' ? '待确认' : '';
+        let status = rowData.get('status') === '10' ? '待结算' : '';
         return (
             <View>
                 <TouchableOpacity activeOpacity={1} onPress={() => {

@@ -80,6 +80,7 @@ class HomeContainer extends Component {
                json && json.forEach(item => {
                     if (item.template_name === 'recommendGoodsGroup' && item.data) {
                         let productPool = item.data.recommendLogic;
+                        console.log('11111111111111111111111111 productPool: ', productPool);
                         let skns = item.data.skns;
                         self.props.actions.getProductList(productPool, skns);
                         let params = {
@@ -170,7 +171,8 @@ class HomeContainer extends Component {
             productPool,
             skns,
         } = this.props.app;
-        productPool !=0 && this.props.actions.getProductList(productPool,skns);
+        this.props.actions.getProductList(productPool, skns);
+        console.log('执行');
     }
 
     render() {

@@ -232,7 +232,7 @@ export default class NewArrival extends React.PureComponent {
             recommendForYou,
             cart_goods_count,
         } = this.props;
-
+        let cart_goods_countString = cart_goods_count > 99 ? '99+' : cart_goods_count;
         let latest = productList.get('list')&&productList.get('list').size?productList.get('list').toArray():[];
 
         let isLoadingMore = productList.isFetching && productList.currentPage > 0;
@@ -384,7 +384,7 @@ export default class NewArrival extends React.PureComponent {
 
                           {cart_goods_count > 0 ? <View style={styles.cart_goods_countView} >
                             <Text style={styles.cart_goods_count}>
-                                     {cart_goods_count}
+                                     {cart_goods_countString}
                             </Text>
                           </View> : null}
 
@@ -483,10 +483,12 @@ let styles = StyleSheet.create({
     cart_goods_countView: {
       backgroundColor: 'red',
       position: 'absolute',
-      right: 6.5,
+      right: 1.5,
       top: 2,
       borderRadius: 100,
       minWidth: 15,
+      paddingLeft: 3,
+      paddingRight: 3,
     },
 
     cart_goods_count: {