fe / yohobuywap-node · Commits

Go to a project

Authored by 郭成尧
Commit 462e8351b86dec0613b67df493e2c9462cb13494 2 parents c39f5e1f fefe8bba

Merge branch 'feature/activity' into release/6.2

Inline Side-by-side
Showing 2 changed files with 5 additions and 2 deletions
@@ -45,6 +45,9 @@ const _getShopGroup = (shopRawData) => { @@ -45,6 +45,9 @@ const _getShopGroup = (shopRawData) => {
45 let renderData = _.get(result, 'data', []); 45 let renderData = _.get(result, 'data', []);
46 46
47 _.forEach(renderData, shop => { 47 _.forEach(renderData, shop => {
  48 + let displayStyle = _.get(shopRawData, 'displayStyle', '0');
  49 +
  50 + shop.picture = displayStyle === '0' ? shop.pic_popular : shop.shop_logo;
48 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 51 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
49 }); 52 });
50 53
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <div class="pull-left shop-box"> 4 <div class="pull-left shop-box">
5 <div class="shop-img"> 5 <div class="shop-img">
6 <img class="left-icon" src="{{image2 ../lefTopImg q=95}}" alt=""> 6 <img class="left-icon" src="{{image2 ../lefTopImg q=95}}" alt="">
7 - <img src="{{image2 pic_popular w=187 h=275 q=95}}" alt=""> 7 + <img src="{{image2 picture w=187 h=275 q=95}}" alt="">
8 </div> 8 </div>
9 <a{{#isEqualOr ../jump2Shop '1'}} href="{{href}}"{{/isEqualOr}} class="shop-bottom-bar" style="background-image: url({{image2 ../brandImg w=290 h=60 q=95}})"> 9 <a{{#isEqualOr ../jump2Shop '1'}} href="{{href}}"{{/isEqualOr}} class="shop-bottom-bar" style="background-image: url({{image2 ../brandImg w=290 h=60 q=95}})">
10 <span class="shop-name">{{shop_name}}</span> 10 <span class="shop-name">{{shop_name}}</span>
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 <div class="pull-left shop-box"> 14 <div class="pull-left shop-box">
15 <div class="shop-img"> 15 <div class="shop-img">
16 <img class="left-icon" src="{{image2 ../lefTopImg q=95}}" alt=""> 16 <img class="left-icon" src="{{image2 ../lefTopImg q=95}}" alt="">
17 - <img src="{{image2 pic_popular w=187 h=275 q=95}}" alt=""> 17 + <img src="{{image2 picture w=187 h=275 q=95}}" alt="">
18 </div> 18 </div>
19 <a{{#isEqualOr ../jump2Shop '1'}} href="{{href}}"{{/isEqualOr}} class="shop-bottom-bar" style="background-image: url({{image2 ../brandImg w=290 h=60 q=95}});"> 19 <a{{#isEqualOr ../jump2Shop '1'}} href="{{href}}"{{/isEqualOr}} class="shop-bottom-bar" style="background-image: url({{image2 ../brandImg w=290 h=60 q=95}});">
20 <span class="shop-name">{{shop_name}}</span> 20 <span class="shop-name">{{shop_name}}</span>