Merge branch 'release/5.4' into gray

@@ -215,7 +215,6 @@ const index = (req) => {
         // 新品牌入驻
         // 新品牌入驻
         if (result[2].code === 200 && result[2].data) {
         if (result[2].code === 200 && result[2].data) {
             let hotBrandsData = _.get(result, '[2].data.hot_brand_list', []),
             let hotBrandsData = _.get(result, '[2].data.hot_brand_list', []),
-                browseBrandsData = _.get(result, '[2].data.browse_brand_list', []),
                 recList = [];
                 recList = [];
 
 
             _.forEach(hotBrandsData, hotBrand => {
             _.forEach(hotBrandsData, hotBrand => {
@@ -228,17 +227,6 @@ const index = (req) => {
                 });
                 });
             });
             });
 
 
-            _.forEach(browseBrandsData, browseBrand => {
-                recList.push({
-                    url: helpers.urlFormat('', {shopId: browseBrand.shops_id}, browseBrand.shop_domain),
-                    src: browseBrand.shop_logo,
-                    num: browseBrand.new_product_num,
-                    shopId: browseBrand.shops_id,
-                    brandId: browseBrand.brand_id
-                });
-            });
-
-
             // 为您推荐
             // 为您推荐
             Object.assign(respData.recommond.dataList, recList);
             Object.assign(respData.recommond.dataList, recList);
 
 

@@ -29,7 +29,7 @@
     {{!店铺}}
     {{!店铺}}
     {{#if shopType}}
     {{#if shopType}}
         <div class="good-info imgopacity" recommend-type="{{recType}}" data-shopId="{{shopId}}">
         <div class="good-info imgopacity" recommend-type="{{recType}}" data-shopId="{{shopId}}">
-            <div class="brand-box">
+            <a class="brand-box" href="{{url}}" target="_blank">
                 <div class="logo-wrap">
                 <div class="logo-wrap">
                     <img class="lazy" data-original="{{image2 src w=185 h=86}}" style="display: block; opacity: 1;">
                     <img class="lazy" data-original="{{image2 src w=185 h=86}}" style="display: block; opacity: 1;">
                 </div>
                 </div>
@@ -37,10 +37,10 @@
                     <p class="shop-name">{{shopName}}</p>
                     <p class="shop-name">{{shopName}}</p>
                     <p class="num-info">上新<span>{{newNum}}</span>件&nbsp;&nbsp;<span>{{collNum}}</span>人收藏</p>
                     <p class="num-info">上新<span>{{newNum}}</span>件&nbsp;&nbsp;<span>{{collNum}}</span>人收藏</p>
                     <span class="btn-tag tag-home">
                     <span class="btn-tag tag-home">
-                         <a href="{{url}}" target="_blank"><i class="iconfont">&#xe61a;</i>  <em>进入店铺</em></a>
+                         <i class="iconfont">&#xe61a;</i>  <em>进入店铺</em>
                     </span>
                     </span>
                 </div>
                 </div>
-            </div>
+            </a>
         </div>
         </div>
     {{/if}}
     {{/if}}
     {{!SK商品}}
     {{!SK商品}}

@@ -55,6 +55,7 @@
 
 
         .new-num {
         .new-num {
             background: #027cf9;
             background: #027cf9;
+            opacity: .6;
             text-align: center;
             text-align: center;
             line-height: 30px;
             line-height: 30px;
             font-size: 14px;
             font-size: 14px;
@@ -199,7 +200,7 @@
     .list-box {
     .list-box {
         border: 1px solid #e0e0e0;
         border: 1px solid #e0e0e0;
         border-top: 0;
         border-top: 0;
-        height: 152px;
+        height: 151px;
         padding-top: 18px;
         padding-top: 18px;
         padding-bottom: 18px;
         padding-bottom: 18px;
         padding-left: 5px;
         padding-left: 5px;
@@ -236,6 +237,7 @@
         display: inline-block;
         display: inline-block;
         width: 100%;
         width: 100%;
         background: #f5f5f5;
         background: #f5f5f5;
+        cursor: pointer;
     }
     }
 
 
     .brand-info {
     .brand-info {
@@ -295,16 +297,11 @@
         height: 65px;
         height: 65px;
 
 
         > a {
         > a {
-            margin-top: 15px;
-            padding: 0 5px;
             text-align: center;
             text-align: center;
         }
         }
 
 
         .price {
         .price {
             text-align: center;
             text-align: center;
-            font-size: 14px;
-            font-weight: bold;
-            margin-top: 3px;
         }
         }
     }
     }