修改 brandList bug review by qiangbing

@@ -84,7 +84,6 @@ export function getBrandBannerInfo() {
 		let {app, productForBrand} = getState();
 		let {productList, filterFactors} = productForBrand;
 		let {brand_id} = app;
-
 		let getInfo = (uid) => {
 			dispatch(getBrandBannerInfoRequest());
 			return new ProductListForBrandService(app.host).getBrandBannerInfo(brand_id,uid)
@@ -415,7 +414,8 @@ export function getProductList(reload=false) {
 	return (dispatch, getState) => {
 
 		let {app, productForBrand} = getState();
-		let {brand_id,shopId, productList, filterFactors} = productForBrand;
+		let {shopId, productList, filterFactors} = productForBrand;
+		let {brand_id} = app;
 
         if (reload) {
 
@@ -424,7 +424,7 @@ export function getProductList(reload=false) {
 				return;
 			}
 		}
- 		let brandId = brand_id;
+ 		let brand = brand_id;
 		let order = productList.order;
 		let page = productList.currentPage + 1;
 		let pageSize = productList.pageSize;
@@ -435,18 +435,17 @@ export function getProductList(reload=false) {
 
 		for (let prop in allFilterFactors) {
 			if (allFilterFactors.hasOwnProperty(prop)) {
-				if (allFilterFactors[prop] === '') {
+				if (allFilterFactors[prop] === '' || !allFilterFactors[prop]) {
 					delete allFilterFactors[prop];
 				}
-				if (prop == 'sizeKey') {
+				if (prop == 'sizeKey' && allFilterFactors[prop]) {
 					allFilterFactors['size'] = allFilterFactors[prop];
 					delete allFilterFactors[prop];
 				}
 			}
 		}
-
 		dispatch(productListRequest());
-        return new ProductListForBrandService(app.host).productList(channel, page, pageSize,brandId,order,allFilterFactors)
+        return new ProductListForBrandService(app.host).productList(brand,channel, page, pageSize,order,allFilterFactors)
         .then(json => {
 			let payload = Utils.parseProductList(json);
 			payload.endReached = payload.currentPage == payload.pageCount;

@@ -437,7 +437,21 @@ export function getProductList(reload=false) {
 		let pageSize = productList.pageSize;
 		let channel = app.channel;
 
-		let allFilterFactors = filterFactors.toJS();
+		let bSelectedFilterFactor,allFilterFactors;
+		allFilterFactors = filterFactors.toJS();
+
+		for (let prop in allFilterFactors) {
+			if (allFilterFactors.hasOwnProperty(prop)) {
+				if (allFilterFactors[prop] === '' || !allFilterFactors[prop]) {
+					delete allFilterFactors[prop];
+				}
+				if (prop == 'sizeKey' && allFilterFactors[prop]) {
+					allFilterFactors['size'] = allFilterFactors[prop];
+					delete allFilterFactors[prop];
+				}
+			}
+		}
+
 		dispatch(productListRequest());
         return new ProductListForShopService(app.host).productList(brandId,shop_id,channel, page, pageSize,order,allFilterFactors)
         .then(json => {

@@ -114,6 +114,18 @@ export function getProductList(reload=false) {
 		let bSelectedFilterFactor,allFilterFactors;
 		allFilterFactors = filterFactors.toJS();
 
+		for (let prop in allFilterFactors) {
+			if (allFilterFactors.hasOwnProperty(prop)) {
+				if (allFilterFactors[prop] === '' || !allFilterFactors[prop]) {
+					delete allFilterFactors[prop];
+				}
+				if (prop == 'sizeKey' && allFilterFactors[prop]) {
+					allFilterFactors['size'] = allFilterFactors[prop];
+					delete allFilterFactors[prop];
+				}
+			}
+		}
+
 		let getList = (uid) => {
 			dispatch(productListRequest());
 	        return new ProductListPoolService(app.host).productList(uid,order,page, pageSize,originParams,allFilterFactors,params)

 'use strict';
 
-import Request from '../../common/services/Request';
+import Request from '../../common/services/NativeRequest';
 
 export default class ProductForBrandService {
 
@@ -49,16 +49,17 @@ export default class ProductForBrandService {
 	}
 
 
-	async productList(yh_channel=1, page=1, limit=60, brand_id,order,filterFactors={}, v=7) {
+	async productList(brand=0,yh_channel=1, page=1, limit=60,order,filterFactors={}, v=7,fromPage='iFP_BrandProList') {
 		return await this.api.get({
 			url: '',
 			body: {
 				method: 'app.search.brand',
-				brand_id,
+				brand,
 				yh_channel,
 				page,
 				limit,
 				order,
+				fromPage,
 				...filterFactors,
 				v,
 			}

 'use strict';
 
-import Request from '../../common/services/Request';
+import Request from '../../common/services/NativeRequest';
 
 export default class ProductListForShopService {