Merge branch 'feature/recommendShop' into 'release/5.8'

Feature/recommend shop



See merge request !655

@@ -257,6 +257,8 @@ const getSearchData = (params) => {
                 for (let i = 0; i < result.data.rec_shop_list.length; i++) {
                     if (parseInt(result.data.rec_shop_list[i].show_type, 10) === 1) {
                         result.data.rec_shop_list[i].is_shop = true;
+                        result.data.rec_shop_list[i].shopUrl = '//m.yohobuy.com/product/index/brand?domain=' +
+                            result.data.rec_shop_list[i].shop_domain;
                         newList.list.splice(parseInt(result.data.rec_shop_list[i].insert_index, 10) - 1, 0,
                             result.data.rec_shop_list[i]);
                     }

 {{#if this}} {{!-- 剔除值为false的项 --}}
     {{#if is_shop}}
-        <a class="good-info brand-info" data-type="hot-shop" data-brand="" data-shop="" href="//m.yohobuy.com/product/index/brand?domain={{shop_domain}}">
+        <a class="good-info brand-info" data-type="hot-shop" data-brand="" data-shop="" href="{{shopUrl}}">
             <div class="brand-info-box">
                 <img src="{{image shop_logo 240 85}}" alt="{{shop_name}}">
                 {{!-- <h5 class="bname">{{shop_name}}</h5> --}}

 {{!-- 商品列表中的 品牌上新--}}
-<a class="good-info brand-info" data-type="hot-shop" data-brand="{{brand_id}}" href="//m.yohobuy.com/product/index/brand?domain={{shop_domain}}" data-shop="{{shop_id}}">
+<a class="good-info brand-info" data-type="hot-shop" data-brand="{{brand_id}}" href="{{shopUrl}}" data-shop="{{shop_id}}">
     <div class="brand-info-box">
         <img src="{{image shop_logo 240 100}}" alt="{{shop_name}}">
         {{!-- <h5 class="bname">{{shop_name}}</h5> --}}

@@ -32,22 +32,21 @@
     }
 
     .entry {
-        display: flex;
-        align-items: center;
-        justify-content: center;
         height: 45px;
+        width: 170px;
         font-size: 24px;
-        line-height: 60px;
+        line-height: 45px;
         color: #fff;
         background-color: #d0021b;
-        width: 170px;
         margin: 35px 53px;
+        display: inline-block;
 
         span {
             background-image: resolve("product/shop-entry.png");
+            background-repeat: no-repeat;
             display: inline-block;
             width: 14px;
-            height: 20px;
+            height: 18px;
             background-size: 100%;
             margin-left: 10px;
         }

@@ -431,22 +431,21 @@
             }
 
             .entry {
-                display: flex;
-                align-items: center;
-                justify-content: center;
                 height: 45px;
+                width: 170px;
                 font-size: 24px;
-                line-height: 60px;
+                line-height: 45px;
                 color: #fff;
                 background-color: #d0021b;
-                width: 170px;
                 margin: 35px 53px;
+                display: inline-block;
 
                 span {
                     background-image: resolve("product/shop-entry.png");
+                    background-repeat: no-repeat;
                     display: inline-block;
                     width: 14px;
-                    height: 20px;
+                    height: 18px;
                     background-size: 100%;
                     margin-left: 10px;
                 }

@@ -130,6 +130,7 @@ exports.processProductList = (list, options) => {
 
                 if (extraAttr === '_isHotShop' && parseInt(product.data.show_type, 10) === 1) {
                     product.reShop = true;
+                    product.data.shopUrl = '//m.yohobuy.com/product/index/brand?domain=' + product.data.shop_domain;
                 }
 
                 pruductList.push(product);