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

@@ -34,7 +34,7 @@ const _processBrandShops = (list) => {
                 url: helpers.urlFormat('/product/index/brand/', {
                     shop_id: item.shop_id
                 }),
-                thumb: helpers.image(item.shop_logo, 75, 40),
+                thumb: helpers.image(item.shop_logo, 126, 80),
                 name: item.shop_name,
                 shopId: item.shop_id
             });
@@ -43,7 +43,7 @@ const _processBrandShops = (list) => {
                 url: helpers.urlFormat('/product/global/list/', {
                     brand: item.global_brand_id
                 }),
-                thumb: helpers.image(item.brand_ico, 75, 40),
+                thumb: helpers.image(item.brand_ico, 126, 80),
                 name: item.brand_name,
                 brandId: item.global_brand_id
             });

@@ -201,7 +201,7 @@ const _processBrandShops = (list) => {
                 url: helpers.urlFormat('/product/index/brand/', {
                     shop_id: item.shop_id
                 }),
-                thumb: helpers.image(item.shop_logo, 75, 40),
+                thumb: helpers.image(item.shop_logo, 126, 80),
                 name: item.shop_name,
                 shopId: item.shop_id
             });
@@ -210,7 +210,7 @@ const _processBrandShops = (list) => {
                 url: helpers.urlFormat('/product/global/list/', {
                     brand: item.global_brand_id
                 }),
-                thumb: helpers.image(item.brand_ico, 75, 40),
+                thumb: helpers.image(item.brand_ico, 126, 80),
                 name: item.brand_name,
                 brandId: item.global_brand_id
             });

@@ -19,7 +19,7 @@
                 {{# brandWay}}
                 <a  href={{url}} data-shopid="{{shopId}}" data-brandid="{{brandId}}">
                     {{#if thumb}}
-                    <img class="brand-thumb" src={{image2 thumb q=60}}>
+                    <img class="brand-thumb" src={{image2 thumb q=90}}>
                     {{else}}
                     <span class="occupy"></span>
                     {{/if}}

@@ -8,11 +8,14 @@ let Tab = require('../plugin/tab');
 
 let $filterBox = $('.filter-box');
 let $shopCategory = $('#shop-category');
+let $listNav = $('#list-nav'); // 筛选项列表
 
 Tab.prototype.home = function() { // 隐藏筛选 TAB
     $filterBox.css('display', 'none');
 };
 Tab.prototype.getallgoods = function() { // 显示筛选 TAB
+    $listNav.find('li').removeClass('active');
+    $listNav.find('.default').addClass('active');
     $filterBox.css('display', 'block');
     allProduct.getGoodsList({type: 'default', page: 1});
 };

@@ -105,7 +105,8 @@
             float: left;
             margin: 0;
             display: inline-block;
-            margin-top: 5px;
+            height: 80px;
+            width: auto;
         }
 
         .occupy {

@@ -2,7 +2,7 @@
  * @Author: Targaryen
  * @Date: 2017-03-23 11:02:31
  * @Last Modified by: Targaryen
- * @Last Modified time: 2017-04-20 11:58:47
+ * @Last Modified time: 2017-04-20 15:41:44
  */
 /* 红人店铺数据处理 */
 
@@ -341,6 +341,8 @@ const pushGoodsInfo = (decorators, goodsList) => {
 
                 if (value.module_type === 'TripleImage' || value.module_type === 'DoubleImage') {
                     decorators[key].pics[subKey].src = imageSrc;
+                } else if (value.module_type === 'FourImage') {
+                    decorators[key].pics[subKey].isGood = false;
                 } else {
                     decorators[key].pics[subKey].src = imageSrc.split('?')[0];
                 }