Merge branch 'feature/activity' into release/6.2

@@ -45,6 +45,9 @@ const _getShopGroup = (shopRawData) => {
         let renderData = _.get(result, 'data', []);
 
         _.forEach(renderData, shop => {
+            let displayStyle = _.get(shopRawData, 'displayStyle', '0');
+
+            shop.picture = displayStyle === '0' ? shop.pic_popular : shop.shop_logo;
             shop.href = `//m.yohobuy.com/product/shop?domain=${shop.shop_domain}&openby:yohobuy={"action":"go.shop","params":{"shop_id":${shop.shops_id},"shop_template_type":${shop.shop_template_type || "1"},"is_red_shop":${shop.is_red_shop || 1}}}`; // eslint-disable-line
         });
 

@@ -4,7 +4,7 @@
         <div class="pull-left shop-box">
             <div class="shop-img">
                 <img class="left-icon" src="{{image2 ../lefTopImg q=95}}" alt="">
-                <img src="{{image2 pic_popular w=187 h=275 q=95}}" alt="">
+                <img src="{{image2 picture w=187 h=275 q=95}}" alt="">
             </div>
             <a{{#isEqualOr ../jump2Shop '1'}} href="{{href}}"{{/isEqualOr}} class="shop-bottom-bar" style="background-image: url({{image2 ../brandImg w=290 h=60 q=95}})">
                 <span class="shop-name">{{shop_name}}</span>
@@ -14,7 +14,7 @@
         <div class="pull-left shop-box">
             <div class="shop-img">
                 <img class="left-icon" src="{{image2 ../lefTopImg q=95}}" alt="">
-                <img src="{{image2 pic_popular w=187 h=275 q=95}}" alt="">
+                <img src="{{image2 picture w=187 h=275 q=95}}" alt="">
             </div>
             <a{{#isEqualOr ../jump2Shop '1'}} href="{{href}}"{{/isEqualOr}} class="shop-bottom-bar" style="background-image: url({{image2 ../brandImg w=290 h=60 q=95}});">
                 <span class="shop-name">{{shop_name}}</span>