Merge branch 'release/6.3' of git.yoho.cn:fe/yohobuywap-node into release/6.3

@@ -43,7 +43,6 @@
             text-align: center;
             text-align: center;
             color: #444;
             color: #444;
             height: 60px;
             height: 60px;
-            line-height: 60px;
         }
         }
 
 
         .type {
         .type {
@@ -467,11 +466,11 @@
                 margin: 0 auto;
                 margin: 0 auto;
 
 
                 .name {
                 .name {
-                    height: 120px;
+                    height: auto;
                 }
                 }
 
 
                 .info {
                 .info {
-                    height: 210px;
+                    height: auto;
                 }
                 }
             }
             }
 
 

@@ -6,36 +6,37 @@ const config = global.yoho.config;
  */
  */
 const PARAMMAP = {
 const PARAMMAP = {
     ag: 'age_level',
     ag: 'age_level',
-    cn: 'channel',
-    gd: 'gender',
-    sn: 'sort_name',
+    bd: 'brand',
+    cc: 'coupon_code',
+    cd: 'coupon_id',
     ci: 'category_id',
     ci: 'category_id',
-    so: 'sort',
-    ms: 'msort',
-    mi: 'misort',
-    tp: 'type',
-    sz: 'size',
     cl: 'color',
     cl: 'color',
-    pc: 'price',
-    bd: 'brand',
-    qr: 'query',
-    lt: 'limit',
+    cn: 'channel',
+    fp: 'filter_poolId',
+    gd: 'gender',
     ld: 'limited',
     ld: 'limited',
-    od: 'order',
+    lt: 'limit',
+    mi: 'misort',
+    ms: 'msort',
     nw: 'new',
     nw: 'new',
+    od: 'order',
+    ol: 'outlets',
+    pc: 'price',
+    pd: 'p_d',
     pg: 'page',
     pg: 'page',
-    st: 'style',
+    pm: 'promotion',
+    pp: 'productPool',
+    qr: 'query',
     sd: 'standard',
     sd: 'standard',
-    si: 'specialsale_id',
+    se: 'shelveTime',
     sf: 'specialoffer',
     sf: 'specialoffer',
-    fp: 'filter_poolId',
-    pp: 'productPool',
-    pm: 'promotion',
     sh: 'shop_id',
     sh: 'shop_id',
-    cc: 'coupon_code',
-    cd: 'coupon_id',
-    pd: 'p_d',
-    ol: 'outlets'
+    si: 'specialsale_id',
+    sn: 'sort_name',
+    so: 'sort',
+    st: 'style',
+    sz: 'size',
+    tp: 'type'
 };
 };
 
 
 /**
 /**

@@ -209,6 +209,9 @@ const getSearchParamsWithoutMethod = (params) => {
             finalParams.order = 's_t_asc';
             finalParams.order = 's_t_asc';
         }
         }
     }
     }
+    if (params.shelveTime) {
+        finalParams.shelveTime = params.shelveTime;
+    }
 
 
     return finalParams;
     return finalParams;
 };
 };