fe / yohobuywap-node · Commits

Go to a project

Authored by ccbikai(👎🏻🍜)
Commit 8a94d25f7aae4c81519a0f989f59fbc5f8242ecd 2 parents 82adc446 84284353

Merge branch 'master' into feature/11.11

Inline Side-by-side
Showing 2 changed files with 8 additions and 8 deletions
@@ -150,7 +150,7 @@ const index = (req, res, next) => { @@ -150,7 +150,7 @@ const index = (req, res, next) => {
150 }), 150 }),
151 pageFooter: true, 151 pageFooter: true,
152 search: { 152 search: {
153 - defaultTerms: (result.length && result.defaultTerms && result.defaultTerms.length !== 0) ? result.defaultTerms[0].content : '', 153 + defaultTerms: (result && result.defaultTerms && result.defaultTerms.length !== 0) ? result.defaultTerms[0].content : '',
154 url: helpers.urlFormat('', null, 'search'), 154 url: helpers.urlFormat('', null, 'search'),
155 hotTerms: result.hotTerms 155 hotTerms: result.hotTerms
156 } 156 }
@@ -16,15 +16,15 @@ module.exports = { @@ -16,15 +16,15 @@ module.exports = {
16 siteUrl: '//m.yohobuy.com', 16 siteUrl: '//m.yohobuy.com',
17 assetUrl: '//localhost:5001', 17 assetUrl: '//localhost:5001',
18 domains: { 18 domains: {
  19 + // api: 'http://api-test3.yohops.com:9999/',
  20 + // service: 'http://service-test3.yohops.com:9999/',
  21 + // liveApi: 'http://testapi.live.yohops.com:9999/',
  22 + // singleApi: 'http://api-test3.yohops.com:9999/'
  23 +
19 api: 'http://api.yoho.cn/', 24 api: 'http://api.yoho.cn/',
20 service: 'http://service.yoho.cn/', 25 service: 'http://service.yoho.cn/',
21 - liveApi: 'http://testapi.live.yohops.com:9999/',  
22 - singleApi: 'http://api-test3.yohops.com:9999/'  
23 -  
24 - // api: 'http://api.yoho.cn/',  
25 - // service: 'http://service.yoho.cn/',  
26 - // liveApi: 'http://api.live.yoho.cn/',  
27 - // singleApi: 'http://single.yoho.cn/' 26 + liveApi: 'http://api.live.yoho.cn/',
  27 + singleApi: 'http://single.yoho.cn/'
28 }, 28 },
29 subDomains: { 29 subDomains: {
30 host: '.m.yohobuy.com', 30 host: '.m.yohobuy.com',