Showing
1 changed file
with
8 additions
and
5 deletions
@@ -232,14 +232,14 @@ const _pageArticleContent = (articleContent, isApp, gender, isWeixin, isqq, isWe | @@ -232,14 +232,14 @@ const _pageArticleContent = (articleContent, isApp, gender, isWeixin, isqq, isWe | ||
232 | * [处理品牌数据] | 232 | * [处理品牌数据] |
233 | * @param {[array]} getBrand [品牌原数据] | 233 | * @param {[array]} getBrand [品牌原数据] |
234 | */ | 234 | */ |
235 | -const _relatedBrand = (getBrand, isApp, id) => { | 235 | +const _relatedBrand = (getBrand, isApp) => { |
236 | let relatedBrand = getBrand; | 236 | let relatedBrand = getBrand; |
237 | 237 | ||
238 | relatedBrand.forEach(brand => { | 238 | relatedBrand.forEach(brand => { |
239 | brand.thumb = brand.thumb.replace('http://', '//'); | 239 | brand.thumb = brand.thumb.replace('http://', '//'); |
240 | 240 | ||
241 | if (isApp) { | 241 | if (isApp) { |
242 | - brand.url = 'http://guang.m.yohobuy.com/guang/info/' + id + '.html?openby:yohobuy={"action":"go.brand","params":{"brand_id":"' + brand.id + '"}}'; | 242 | + brand.url = brand.url + '?openby:yohobuy={"action":"go.brand","params":{"brand_id":"' + brand.id + '"}}'; |
243 | } | 243 | } |
244 | }); | 244 | }); |
245 | 245 | ||
@@ -256,12 +256,13 @@ const _relatedTag = (tags, isApp) => { | @@ -256,12 +256,13 @@ const _relatedTag = (tags, isApp) => { | ||
256 | let tagUrl; | 256 | let tagUrl; |
257 | 257 | ||
258 | tags.forEach(value => { | 258 | tags.forEach(value => { |
259 | + | ||
259 | tagUrl = helpers.urlFormat('/tags/index', {query: value.name}, 'guang'); | 260 | tagUrl = helpers.urlFormat('/tags/index', {query: value.name}, 'guang'); |
260 | 261 | ||
261 | if (!isApp) { | 262 | if (!isApp) { |
262 | value.url = tagUrl; | 263 | value.url = tagUrl; |
263 | } else { | 264 | } else { |
264 | - if (value.url.indexOf('openby')) { | 265 | + if (value.url.indexOf('openby') >= 0) { |
265 | value.url = value.url; | 266 | value.url = value.url; |
266 | } else { | 267 | } else { |
267 | value.url = tagUrl + '&openby:yohobuy={"action":"go.h5","params":{"query":"' + value.name + '","type":0","title":"' + value.name + '","url":"http://guang.m.yohobuy.com/tags/index","islogin":"N"}}}'; | 268 | value.url = tagUrl + '&openby:yohobuy={"action":"go.h5","params":{"query":"' + value.name + '","type":0","title":"' + value.name + '","url":"http://guang.m.yohobuy.com/tags/index","islogin":"N"}}}'; |
@@ -270,6 +271,7 @@ const _relatedTag = (tags, isApp) => { | @@ -270,6 +271,7 @@ const _relatedTag = (tags, isApp) => { | ||
270 | 271 | ||
271 | relatedTag.push(value); | 272 | relatedTag.push(value); |
272 | }); | 273 | }); |
274 | + | ||
273 | return relatedTag; | 275 | return relatedTag; |
274 | }; | 276 | }; |
275 | 277 | ||
@@ -296,6 +298,7 @@ const _relatedInfo = (getOtherArticle, isApp) => { | @@ -296,6 +298,7 @@ const _relatedInfo = (getOtherArticle, isApp) => { | ||
296 | value.thumb = helpers.image(value.thumb, 279, 175); | 298 | value.thumb = helpers.image(value.thumb, 279, 175); |
297 | relatedInfo.push(value); | 299 | relatedInfo.push(value); |
298 | }); | 300 | }); |
301 | + | ||
299 | return relatedInfo; | 302 | return relatedInfo; |
300 | }; | 303 | }; |
301 | 304 | ||
@@ -432,7 +435,7 @@ const index = (req, res, next) => { | @@ -432,7 +435,7 @@ const index = (req, res, next) => { | ||
432 | 435 | ||
433 | // 相关品牌 | 436 | // 相关品牌 |
434 | if (detail.getBrand && detail.getBrand.length) { | 437 | if (detail.getBrand && detail.getBrand.length) { |
435 | - guang.relatedBrand = _relatedBrand(detail.getBrand, isApp, id); | 438 | + guang.relatedBrand = _relatedBrand(detail.getBrand, isApp); |
436 | } | 439 | } |
437 | 440 | ||
438 | // 相关标签 | 441 | // 相关标签 |
@@ -541,7 +544,7 @@ const mini = (req, res, next) => { | @@ -541,7 +544,7 @@ const mini = (req, res, next) => { | ||
541 | 544 | ||
542 | // 相关品牌 | 545 | // 相关品牌 |
543 | if (detail.getBrand && detail.getBrand.length) { | 546 | if (detail.getBrand && detail.getBrand.length) { |
544 | - guang.relatedBrand = _relatedBrand(detail.getBrand, isApp, id); | 547 | + guang.relatedBrand = _relatedBrand(detail.getBrand, isApp); |
545 | } | 548 | } |
546 | 549 | ||
547 | // 分享参数 | 550 | // 分享参数 |
-
Please register or login to post a comment