Merge branch 'local' into 5.4

@@ -166,7 +166,7 @@ let styles = StyleSheet.create({
         backgroundColor: 'white',
     },
     contentContainer: {
-        backgroundColor: 'white',
+        backgroundColor: '#f0f0f0',
         width: 100 * DEVICE_WIDTH_RATIO,
         height: height - 156,
     },

@@ -27,7 +27,7 @@ export default class HotBrandList extends Component{
 	}
 
 	shouldComponentUpdate(nextProps){
-		if (Immutable.is(nextProps.rowData, this.props.rowData)) {
+		if (Immutable.is(nextProps.data, this.props.data)) {
             return false;
         } else {
             return true;

@@ -27,10 +27,10 @@ export default class HotCategoryList extends Component{
 	}
 
 	shouldComponentUpdate(nextProps){
-		if (Immutable.is(nextProps.rowData, this.props.rowData)) {
-            return false;
+		if (Immutable.is(nextProps.data, this.props.data)) {
+        	return false;
         } else {
-            return true;
+       		return true;
         }
 	}
 

@@ -73,8 +73,11 @@ class BrandContainer extends Component {
     }
 
     componentDidMount() {
-        this.props.actions.getBrandList(1);
-        this.props.actions.getBrandResource(1);
+
+        let {selectedChannelId} = this.props.brand;
+
+        this.props.actions.getBrandList(selectedChannelId);
+        this.props.actions.getBrandResource(selectedChannelId);
         this.props.actions.searchHistory();
         this.props.actions.hotKeyword();
     }

@@ -49,8 +49,6 @@ export function selectCategoryB(category){
 		let categoryId = category.category_id;
         let categoryValue = category.category_name;
 
-        console.log("chenlin", "调用点击事件：_onSelectCategory，参数为：" + JSON.stringify(category));
-
         if(category.sub && category.sub.length > 0){
         	dispatch(getCategoryBSubCategoryDetail(categoryId, categoryValue));
         }
@@ -94,7 +92,7 @@ export function getCategoryBSubCategoryDetail(category_id, category_value){
         }
         //已命中，展示缓存数据
         else{
-            dispatch(getCategoryBSubDetailData(categoryData));
+            dispatch(getCategoryBSubDetailFromCache(categoryData));
         }
 
 	};
@@ -269,7 +267,7 @@ export function setCurrentChannelB(channelId, channelValue){
     }
 }
 
-export function getCategoryBSubDetailData(categoryData) {
+export function getCategoryBSubDetailFromCache(categoryData) {
 	return {
         type: SET_CURRENT_CATEGORY_B_SUBDETAIL_FROM_CACHE,
         payload: categoryData