Merge branch 'local' into classify

@@ -321,11 +321,18 @@ export default class BrandStore extends Component {
 
                 {productList.isFilter ?
                     <ProductCategoryList
+                        productList={productList}
+                        onPressFilter={this._onPressProductFilter}
+                        lastSelected={this.props.productList.isFilter}
+                        moreFilter={this.props.productList.isMoreFilter}
+                        selectOrder={this.props.productList.order}
                         categoryFilterList={categoryFilterList}
                         filterCategoryDetailFilterList={filterCategoryDetailFilterList}
                         onPressProductFilterLeftItem={this.props.onPressProductFilterLeftItem}
                         filterNameFactors={filterNameFactors}
-                        onPressProductFilterRightItem={this.props.onPressProductFilterRightItem}/> : null}
+                        onPressProductFilterRightItem={this.props.onPressProductFilterRightItem}
+                        onPressCloseMoreFilter={this.props.onPressCloseMoreFilter}
+                        onPressMoreFilter={this.props.onPressMoreFilter}/> : null}
 
                 {productList.isMoreFilter ?
                     <BrandProductMoreFilter

@@ -95,21 +95,29 @@ export default class ProductCategoryList extends React.Component {
         }
 
         return (
-            <View style={styles.container}>
-                <ListView
-                    style={styles.leftContentContainer}
-                    dataSource={this.dataSourceL.cloneWithRows(categoryFilterList.toArray())}
-                    renderRow={this.leftRenderRow}
-                    scrollsToTop={false}
-                />
-                <ListView
-                    ref='subCategoryList'
-                    style={styles.rightContentContainer}
-                    dataSource={this.dataSourceR.cloneWithRows(subList.toArray())}
-                    renderRow={this.rightRenderRow}
-                    scrollsToTop={false}
-                />
-            </View>  
+            <View style={styles.allcontainer}>
+                <BrandProductFilter
+                    onPressFilter={this.props.onPressFilter}
+                    lastSelected={this.props.productList.isFilter}
+                    moreFilter={this.props.productList.isMoreFilter}
+                    selectOrder={this.props.productList.order}/>
+
+                <View style={styles.container}>
+                    <ListView
+                        style={styles.leftContentContainer}
+                        dataSource={this.dataSourceL.cloneWithRows(categoryFilterList.toArray())}
+                        renderRow={this.leftRenderRow}
+                        scrollsToTop={false}
+                    />
+                    <ListView
+                        ref='subCategoryList'
+                        style={styles.rightContentContainer}
+                        dataSource={this.dataSourceR.cloneWithRows(subList.toArray())}
+                        renderRow={this.rightRenderRow}
+                        scrollsToTop={false}
+                    />
+                </View>
+            </View>
         );
     }
 };
@@ -119,18 +127,30 @@ let rowHeight = Math.ceil(height - 37);
 let rowWidth = Math.ceil(width / 2);
 
 let styles = StyleSheet.create({
+    allcontainer:{
+        flex: 1,
+        flexDirection: 'column',
+        left: 0,
+        width: width,
+        height: height ,
+        backgroundColor: '#ffffff',
+        borderTopColor: '#e0e0e0',
+        borderTopWidth: 0.5,
+        borderLeftColor: '#ffffff',
+        borderLeftWidth: 0,
+        borderRightWidth: 0,
+        borderBottomWidth: 0,
+
+    },
     container:{
         flex: 1,
         flexDirection: 'row',
         position: 'absolute',
-        top: 40,
         left: 0,
         width: width,
         height: height - 40 - 44 - 64,
         backgroundColor: '#ffffff',
-        borderTopColor: '#e0e0e0',
-        borderTopWidth: 0.5,
-        borderLeftColor: '#ffffff',
+        borderTopWidth: 0,
         borderLeftWidth: 0,
         borderRightWidth: 0,
         borderBottomWidth: 0,