Merge branch 'master' into release/guang

@@ -46,9 +46,12 @@ const getAllChannels = (params) => {
  * @return {[array]}
  * @return {[array]}
  */
  */
 const getProductBatch = (productSkn, options) => {
 const getProductBatch = (productSkn, options) => {
-    productSkn = _.isArray(productSkn) ? productSkn : [productSkn];
+    productSkn = _.uniq(_.isArray(productSkn) ? productSkn : [productSkn]);
+
     return api.get('', {
     return api.get('', {
         method: 'h5.product.batch',
         method: 'h5.product.batch',
+        limit: productSkn.length,
+        page: 1,
         productSkn: productSkn.join(',')
         productSkn: productSkn.join(',')
     }).then(result => {
     }).then(result => {
         return result && result.data ? productProcess.processProductList(result.data.product_list, options) : [];
         return result && result.data ? productProcess.processProductList(result.data.product_list, options) : [];

@@ -70,6 +70,10 @@
     <input class="query-param" type="hidden" data-attr="productPool" value="{{productPool}}">
     <input class="query-param" type="hidden" data-attr="productPool" value="{{productPool}}">
 {{/if}}
 {{/if}}
 
 
+{{#if filter_poolId}}
+    <input class="query-param" type="hidden" data-attr="filter_poolId" value="{{filter_poolId}}">
+{{/if}}
+
 {{#if saleType}}
 {{#if saleType}}
     <input class="query-param" type="hidden" data-attr="saleType" value="{{saleType}}">
     <input class="query-param" type="hidden" data-attr="saleType" value="{{saleType}}">
 {{/if}}
 {{/if}}

@@ -7,7 +7,7 @@
             <li>
             <li>
                 <a href="{{url}}">
                 <a href="{{url}}">
                     <div class="img-box">
                     <div class="img-box">
-                        <img class="lazy" data-original="{{image src 180 320}}" alt="">
+                        <img class="lazy" data-original="{{image src 320 154}}" alt="">
                     </div>
                     </div>
                 </a>
                 </a>
             </li>
             </li>

@@ -198,7 +198,7 @@ function reMarginFooter(fixedElement) {
 }(window, document, 'script', (document.location.protocol === 'https:' ? 'https' : 'http') + '://cdn.yoho.cn/yas-jssdk/1.0.17/yas.js', '_yas'));
 }(window, document, 'script', (document.location.protocol === 'https:' ? 'https' : 'http') + '://cdn.yoho.cn/yas-jssdk/1.0.17/yas.js', '_yas'));
 
 
 (function() {
 (function() {
-    var uid = getUid();
+    var uid = getUid() || queryString().uid;
 
 
     uid = uid === 0 ? '' : uid;
     uid = uid === 0 ? '' : uid;
 
 

 .six-lines-floor li {
 .six-lines-floor li {
-    height: 180px;
+    height: 154px;
     width: 50%;
     width: 50%;
     float: left;
     float: left;
 
 
     img {
     img {
-        height: 180px;
+        height: 154px;
         width: 100%;
         width: 100%;
     }
     }
 }
 }