Merge branch 'feature/detailFooter' into 'release/5.6'

店铺入口埋点，三种情况（店铺id，品牌id，全球购id）



See merge request !475

@@ -35,7 +35,8 @@ const _processBrandShops = (list) => {
                     shop_id: item.shop_id
                     shop_id: item.shop_id
                 }),
                 }),
                 thumb: helpers.image(item.shop_logo, 75, 40),
                 thumb: helpers.image(item.shop_logo, 75, 40),
-                name: item.shop_name
+                name: item.shop_name,
+                shopId: item.shop_id
             });
             });
         } else if (item.shop_type === 'tbl_brand') {
         } else if (item.shop_type === 'tbl_brand') {
             formatDat.push({
             formatDat.push({
@@ -43,7 +44,8 @@ const _processBrandShops = (list) => {
                     brand: item.global_brand_id
                     brand: item.global_brand_id
                 }),
                 }),
                 thumb: helpers.image(item.brand_ico, 75, 40),
                 thumb: helpers.image(item.brand_ico, 75, 40),
-                name: item.brand_name
+                name: item.brand_name,
+                brandId: item.global_brand_id
             });
             });
         }
         }
     });
     });

@@ -13,10 +13,10 @@
         <ul class="search-associate"></ul>
         <ul class="search-associate"></ul>
     {{/ search}}
     {{/ search}}
     {{#if brandWay}}
     {{#if brandWay}}
-        <div class="brand-way" data-shopid="{{brandWay/shopId}}" data-brandid="{{brandWay/brandId}}">
+        <div class="brand-way">
             <div class="brand-enter">
             <div class="brand-enter">
                 {{# brandWay}}
                 {{# brandWay}}
-                <a  href={{url}}>
+                <a href={{url}} data-shopid="{{shopId}}" data-brandid="{{brandId}}">
                     <img class="brand-thumb" src={{image2 thumb q=60}}>
                     <img class="brand-thumb" src={{image2 thumb q=60}}>
                     <span class="brand-name">{{name}}</span>
                     <span class="brand-name">{{name}}</span>
                     <span class="entry">
                     <span class="entry">

@@ -839,8 +839,8 @@ $('.brand-way a').on('click', function() {
         window._yas.sendCustomInfo({
         window._yas.sendCustomInfo({
             op: 'YB_BRAND_SHOP_C',
             op: 'YB_BRAND_SHOP_C',
             param: JSON.stringify({
             param: JSON.stringify({
-                BRAND_ID: $('.brand-way').data('brandid'),
-                SHOP_ID: $('.brand-way').data('shopid'),
+                BRAND_ID: $('.brand-enter a').data('brandid'),
+                SHOP_ID: $('.brand-enter a').data('shopid'),
                 POS_ID: 101
                 POS_ID: 101
             })
             })
         }, true);
         }, true);