Merge branch 'gray' of http://git.yoho.cn/fe/yohoblk-wap into gray

@@ -7,13 +7,21 @@ const processProductList = require(`${global.utils}/beautify/product`);
 
 
 const search = {
 const search = {
     products(params) {
     products(params) {
+        let method = 'app.search.li';
+
         if (params.hasOwnProperty('priceRange')) {
         if (params.hasOwnProperty('priceRange')) {
             params.price = params.priceRange;
             params.price = params.priceRange;
             delete params.priceRange;
             delete params.priceRange;
         }
         }
 
 
+        if (params.filter_poolId) {
+            params.productPool = params.filter_poolId;
+            delete params.filter_poolId;
+            method = 'app.search.pool';
+        }
+
         const data = _.merge({
         const data = _.merge({
-            method: 'app.search.li'
+            method
         }, params);
         }, params);
 
 
         return api.get('', data, {
         return api.get('', data, {

@@ -38,22 +38,13 @@ import FilterSub from './filter-sub.vue';
 
 
 let locationQuery = qs(decodeURIComponent(location.search.replace(/^\?/, '')));
 let locationQuery = qs(decodeURIComponent(location.search.replace(/^\?/, '')));
 
 
-const keyMap = {
-    品牌: 'brand',
-    品类: 'sort',
-    颜色: 'color',
-    尺寸: 'size',
-    价格: 'price',
-    折扣: 'discount'
-};
-
 const convertMap = {
 const convertMap = {
     brand: 'brand',
     brand: 'brand',
     group_sort: 'sort',
     group_sort: 'sort',
     color: 'color',
     color: 'color',
     size: 'size',
     size: 'size',
     price: 'price',
     price: 'price',
-    discount: 'discount',
+    discount: 'p_d',
 };
 };
 
 
 export default {
 export default {