Merge branch '710_0.49' into '718_0.49'

710 0.49



See merge request !9

@@ -404,11 +404,11 @@ let styles = StyleSheet.create({
         height: 15,
         height: 15,
     },
     },
     thumbsUpNumView: {
     thumbsUpNumView: {
-        backgroundColor: 'red',
+        backgroundColor: '#D0021B',
         borderRadius: 5,
         borderRadius: 5,
         position: 'absolute',
         position: 'absolute',
-        left: 12,
-        top: 10,
+        left: 16,
+        top: 8,
     },
     },
     thumbsUpNumText: {
     thumbsUpNumText: {
         backgroundColor: 'transparent',
         backgroundColor: 'transparent',

@@ -198,7 +198,7 @@ let styles = StyleSheet.create({
         width: 16,
         width: 16,
         height: 16,
         height: 16,
         left: width - 84,
         left: width - 84,
-        top:14,
+        top:13,
     },
     },
 
 
     shareButton: {
     shareButton: {

@@ -175,7 +175,12 @@ export default class Product extends Component {
         if (productList.size == 0) {
         if (productList.size == 0) {
             return null;
             return null;
         }
         }
-        return (<TabHeader
+        let {selectedProductList, categoryList, selectedCategoryIndex} = commonProduct;
+        let isShow = currentTab === 'common' && selectedProductList.size > 0;
+
+        return (
+            <View>
+                <TabHeader
                     currentTab={currentTab}
                     currentTab={currentTab}
                     onPressTab={(tab)=>{
                     onPressTab={(tab)=>{
                         if (tab == currentTab) {
                         if (tab == currentTab) {
@@ -185,7 +190,17 @@ export default class Product extends Component {
                         this.setState({currentlyOpenSwipeable: null});
                         this.setState({currentlyOpenSwipeable: null});
                         this.props.onPressTab && this.props.onPressTab(tab);
                         this.props.onPressTab && this.props.onPressTab(tab);
                     }}
                     }}
-            />)
+                />
+                {isShow ? <CategorySelector
+                    data={categoryList}
+                    selectedCategoryIndex={selectedCategoryIndex}
+                    onPressCategory={(rowData, rowID) => {
+                        this.listView && this.listView.scrollTo({x: 0, y: 0, animated: false});
+                        this.props.onPressCategory && this.props.onPressCategory(rowData, rowID);
+                    }}
+                /> : null}
+            </View>
+        )
     }
     }
 
 
     renderSectionHeader(sectionData, sectionID) {
     renderSectionHeader(sectionData, sectionID) {
@@ -255,7 +270,7 @@ export default class Product extends Component {
                     dataSource={this.dataSource.cloneWithRows(dataArray)}
                     dataSource={this.dataSource.cloneWithRows(dataArray)}
                     renderRow={this.renderRow}
                     renderRow={this.renderRow}
                     renderHeader={this.renderHeader}
                     renderHeader={this.renderHeader}
-                    renderSectionHeader={this.renderSectionHeader}
+                    // renderSectionHeader={this.renderSectionHeader}
                     onScroll={this.handleScroll}
                     onScroll={this.handleScroll}
                     renderFooter={this.renderFooter}
                     renderFooter={this.renderFooter}
                     bounces={dataArray.length > 0}
                     bounces={dataArray.length > 0}