Authored by 郭成尧

global-cart-handle

@@ -31,9 +31,18 @@ const _relatedBrand = (getBrand, isApp) => { @@ -31,9 +31,18 @@ const _relatedBrand = (getBrand, isApp) => {
31 31
32 relatedBrand.forEach(brand => { 32 relatedBrand.forEach(brand => {
33 brand.thumb = brand.thumb.replace('http://', '//'); 33 brand.thumb = brand.thumb.replace('http://', '//');
  34 + if (brand.isGlobal === 'Y') {
  35 + brand.url = helpers.urlFormat('/product/global/list', {brand: brand.tbl_id});
  36 + }
34 37
35 if (isApp) { 38 if (isApp) {
36 - brand.url = brand.url + '?openby:yohobuy={"action":"go.brand","params":{"brand_id":"' + brand.id + '"}}'; 39 + if (brand.isGlobal === 'Y') {
  40 + brand.url = brand.url +
  41 + '?openby:yohobuy={"action":"go.globalpurchase","params":{"brand":"' + brand.id + '"}}';
  42 + } else {
  43 + brand.url = brand.url +
  44 + '?openby:yohobuy={"action":"go.brand","params":{"brand_id":"' + brand.id + '"}}';
  45 + }
37 } 46 }
38 }); 47 });
39 48
@@ -5,10 +5,12 @@ @@ -5,10 +5,12 @@
5 <div class="focus-small"></div> 5 <div class="focus-small"></div>
6 </div> 6 </div>
7 </div> 7 </div>
8 - <div class="lable-info-box{{#if isApp}} lable-infobox-borderadius{{/if}}"><a href="{{href}}">{{tagName}}</a></div> 8 + <div class="lable-info-box{{#if noCart}} lable-infobox-borderadius{{/if}}"><a href="{{href}}">{{tagName}}</a></div>
  9 + {{#unless noCart}}
9 <div class="lable-btn add-to-cart" data-skn="{{product_skn}}"> 10 <div class="lable-btn add-to-cart" data-skn="{{product_skn}}">
10 <span class="iconfont">&#xe62c;</span> 11 <span class="iconfont">&#xe62c;</span>
11 <span class="iconfont plus">&#xe624;</span> 12 <span class="iconfont plus">&#xe624;</span>
12 </div> 13 </div>
  14 + {{/unless}}
13 </div> 15 </div>
14 {{/unless}} 16 {{/unless}}
@@ -161,6 +161,7 @@ $focus-size: 42px; @@ -161,6 +161,7 @@ $focus-size: 42px;
161 } 161 }
162 162
163 .lable-infobox-borderadius { 163 .lable-infobox-borderadius {
  164 + width: 336px;
164 border-top-right-radius: 40px; 165 border-top-right-radius: 40px;
165 border-bottom-right-radius: 40px; 166 border-bottom-right-radius: 40px;
166 } 167 }
@@ -257,7 +257,8 @@ const processArticleDetail = (articleContent, isApp, gender, isWeixin, isqq, isW @@ -257,7 +257,8 @@ const processArticleDetail = (articleContent, isApp, gender, isWeixin, isqq, isW
257 _.forEach(tagListGlobal, tagGlobal => { 257 _.forEach(tagListGlobal, tagGlobal => {
258 tagList.push(Object.assign(tagGlobal, { 258 tagList.push(Object.assign(tagGlobal, {
259 href: '//m.yohobuy.com/product/global/' + tagGlobal.product_skn + '.html', 259 href: '//m.yohobuy.com/product/global/' + tagGlobal.product_skn + '.html',
260 - isApp: isApp 260 + isApp: isApp,
  261 + noCart: true
261 })); 262 }));
262 }); 263 });
263 } 264 }
@@ -267,7 +268,8 @@ const processArticleDetail = (articleContent, isApp, gender, isWeixin, isqq, isW @@ -267,7 +268,8 @@ const processArticleDetail = (articleContent, isApp, gender, isWeixin, isqq, isW
267 _.forEach(tagListLimit, tagLimit => { 268 _.forEach(tagListLimit, tagLimit => {
268 tagList.push(Object.assign(tagLimit, { 269 tagList.push(Object.assign(tagLimit, {
269 href: '//m.yohobuy.com/product/' + tagLimit.product_skn + '.html', 270 href: '//m.yohobuy.com/product/' + tagLimit.product_skn + '.html',
270 - isApp: isApp 271 + isApp: isApp,
  272 + noCart: true
271 })); 273 }));
272 }); 274 });
273 } 275 }