fe / yohobuy-node · Commits

Go to a project

Authored by htoooth
Commit 223df73ea873f6dcb921ede8d3471212f210f34d 2 parents 20fea8ee e910fcf5

Merge branch 'feature/promotion-list' into gray

Inline Side-by-side
Showing 2 changed files with 12 additions and 9 deletions
@@ -217,7 +217,7 @@ const _getActivityDataByProductBaseInfo = (data) => { @@ -217,7 +217,7 @@ const _getActivityDataByProductBaseInfo = (data) => {
217 return _.get(data, 'data', []).map(value => ({ 217 return _.get(data, 'data', []).map(value => ({
218 type: value.promotionType.replace(/￥/g, '¥'), 218 type: value.promotionType.replace(/￥/g, '¥'),
219 des: value.promotionTitle.replace(/￥/g, '¥'), 219 des: value.promotionTitle.replace(/￥/g, '¥'),
220 - url: helpers.urlFormat('', {psp_id: value.id}, 'list') 220 + url: value.id && helpers.urlFormat('', {psp_id: value.id}, 'list')
221 })); 221 }));
222 }; 222 };
223 223
@@ -17,20 +17,23 @@ module.exports = { @@ -17,20 +17,23 @@ module.exports = {
17 cookieDomain: '.yohobuy.com', 17 cookieDomain: '.yohobuy.com',
18 domains: { 18 domains: {
19 // test3 19 // test3
20 - singleApi: 'http://api-test3.yohops.com:9999/',  
21 - api: 'http://api-test3.yohops.com:9999/',  
22 - service: 'http://service-test3.yohops.com:9999/', 20 + // singleApi: 'http://api-test3.yohops.com:9999/',
  21 + // api: 'http://api-test3.yohops.com:9999/',
  22 + // service: 'http://service-test3.yohops.com:9999/',
23 23
24 - // singleApi: 'http://single.gray.yohops.com/', 24 + // prod
  25 + // singleApi: 'http://single.yoho.cn/',
25 // api: 'http://api.yoho.cn/', 26 // api: 'http://api.yoho.cn/',
26 // service: 'http://service.yoho.cn/', 27 // service: 'http://service.yoho.cn/',
27 28
28 - // api: 'http://dev-api.yohops.com:9999/',  
29 - // service: 'http://dev-service.yohops.com:9999/', 29 + // gray
  30 + singleApi: 'http://single.gray.yohops.com/',
  31 + api: 'http://api.gray.yohops.com/',
  32 + service: 'http://service.gray.yohops.com/',
30 33
31 - // api: 'http://192.168.102.205:8080/gateway/', 34 + // dev
  35 + // api: 'http://dev-api.yohops.com:9999/',
32 // service: 'http://dev-service.yohops.com:9999/', 36 // service: 'http://dev-service.yohops.com:9999/',
33 - // search: 'http://192.168.102.216:8080/yohosearch/',  
34 37
35 imSocket: 'ws://socket.yohobuy.com:10240', 38 imSocket: 'ws://socket.yohobuy.com:10240',
36 imCs: 'http://im.yohobuy.com/api', 39 imCs: 'http://im.yohobuy.com/api',