fe / yohobuywap-node · Commits

Go to a project

Authored by lijing
Commit 73aba207d097603cffc2ecb86fa8c198dbadc430 1 parent 49d16a96

品牌页

Inline Side-by-side
Showing 2 changed files with 44 additions and 35 deletions
@@ -27,15 +27,13 @@ let CODE_TOPPOS_LIFESTYLE = 'f1aa914fd23cbcda71a87de6f5416c75'; @@ -27,15 +27,13 @@ let CODE_TOPPOS_LIFESTYLE = 'f1aa914fd23cbcda71a87de6f5416c75';
27 27
28 const _packageAd = (params) => { 28 const _packageAd = (params) => {
29 29
30 - return service.get('/operations/api/v5/resource/home', {  
31 - content_code: '5a9b5bcfd2e13d56c9ba6b867a325dc1', 30 + return service.get('/operations/api/v5/resource/get', {
  31 + content_code: params.contentCode,
32 gender: 1, 32 gender: 1,
33 limit: 1000, 33 limit: 1000,
34 page: 1 34 page: 1
35 }).then(result => { 35 }).then(result => {
36 36
37 - console.log(result);  
38 -  
39 return result; 37 return result;
40 38
41 }); 39 });
@@ -54,21 +52,6 @@ const _packageList = (params) => { @@ -54,21 +52,6 @@ const _packageList = (params) => {
54 }); 52 });
55 }; 53 };
56 54
57 -const _package = (params) => {  
58 - return api.all([  
59 -  
60 - _packageAd(params),  
61 - //_packageList(params)  
62 -  
63 - ]).then(result => {  
64 -  
65 - //console.log(result[0]);  
66 -  
67 - return result;  
68 -  
69 - });  
70 -};  
71 -  
72 const getBrandByChannel = (channel) => { 55 const getBrandByChannel = (channel) => {
73 56
74 let params = {}; 57 let params = {};
@@ -106,11 +89,16 @@ const getBrandByChannel = (channel) => { @@ -106,11 +89,16 @@ const getBrandByChannel = (channel) => {
106 89
107 return api.all([ 90 return api.all([
108 91
109 - _package(params) 92 + _packageAd(params),
  93 + //_packageList(params)
110 94
111 ]).then(result => { 95 ]).then(result => {
112 96
  97 + console.log(result);
  98 +
113 let resu = { 99 let resu = {
  100 + brandPage: true,
  101 + showDownloadApp: true,
114 channel: { 102 channel: {
115 channels: [{ 103 channels: [{
116 name: 'Boy' 104 name: 'Boy'
@@ -11,14 +11,17 @@ const isTest = process.env.NODE_ENV === 'test'; @@ -11,14 +11,17 @@ const isTest = process.env.NODE_ENV === 'test';
11 11
12 module.exports = { 12 module.exports = {
13 app: 'h5', 13 app: 'h5',
14 - appVersion: '4.9.2', // 调用api的版本  
15 port: 6001, 14 port: 6001,
16 siteUrl: '//m.yohobuy.com', 15 siteUrl: '//m.yohobuy.com',
17 assetUrl: '//localhost:5001', 16 assetUrl: '//localhost:5001',
18 domains: { 17 domains: {
19 - api: 'http://api.yoho.yohoops.org/',  
20 - service: 'http://service.yoho.yohoops.org/',  
21 - liveApi: 'http://api.live.yoho.cn/' 18 + // api: 'http://devapi.yoho.cn:58078/',
  19 + // service: 'http://devservice.yoho.cn:58077/'
  20 + api: 'http://api.yoho.cn/',
  21 +
  22 + // service: 'http://service.yoho.cn/',
  23 + service: 'http://service-test3.yohops.com:9999/',
  24 + liveApi: 'http://testapi.live.yohops.com:9999/'
22 }, 25 },
23 subDomains: { 26 subDomains: {
24 host: '.m.yohobuy.com', 27 host: '.m.yohobuy.com',
@@ -30,16 +33,25 @@ module.exports = { @@ -30,16 +33,25 @@ module.exports = {
30 activity: '//activity.yohobuy.com', 33 activity: '//activity.yohobuy.com',
31 index: '//m.yohobuy.com' 34 index: '//m.yohobuy.com'
32 }, 35 },
  36 + useOneapm: false,
33 useCache: false, 37 useCache: false,
34 memcache: { 38 memcache: {
35 - master: ['192.168.102.168:12111'],  
36 - slave: ['192.168.102.168:12111'],  
37 - session: ['192.168.102.168:12111'], 39 + master: ['192.168.102.205:12111'],
  40 + slave: ['192.168.102.205:12111'],
  41 + session: ['192.168.102.205:12111'],
38 timeout: 1000, 42 timeout: 1000,
39 retries: 0 43 retries: 0
40 }, 44 },
41 interfaceShunt: { 45 interfaceShunt: {
42 - open: false 46 + useInterfaceShunt: false,
  47 + tencentServers: {
  48 + api: ['123.206.1.98', '123.206.2.80'],
  49 + service: ['123.206.1.98', '123.206.2.80']
  50 + },
  51 + awsServers: {
  52 + api: 'app-java-168863769.cn-north-1.elb.amazonaws.com.cn',
  53 + service: 'service-yoho-579825100.cn-north-1.elb.amazonaws.com.cn'
  54 + }
43 }, 55 },
44 loggers: { 56 loggers: {
45 infoFile: { 57 infoFile: {
@@ -87,13 +99,21 @@ if (isProduction) { @@ -87,13 +99,21 @@ if (isProduction) {
87 master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'], 99 master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
88 slave: ['memcache1.yohoops.org:12112', 'memcache2.yohoops.org:12112', 'memcache3.yohoops.org:12112'], 100 slave: ['memcache1.yohoops.org:12112', 'memcache2.yohoops.org:12112', 'memcache3.yohoops.org:12112'],
89 session: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'], 101 session: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
90 - timeout: 100, 102 + timeout: 1000,
91 retries: 0 103 retries: 0
92 }, 104 },
  105 + useOneapm: true,
93 useCache: true, 106 useCache: true,
94 interfaceShunt: { 107 interfaceShunt: {
95 - open: false,  
96 - url: 'http://123.206.2.55/strategy' 108 + useInterfaceShunt: false,
  109 + tencentServers: {
  110 + api: ['123.206.1.98', '123.206.2.80'],
  111 + service: ['123.206.1.98', '123.206.2.80']
  112 + },
  113 + awsServers: {
  114 + api: 'app-java-168863769.cn-north-1.elb.amazonaws.com.cn',
  115 + service: 'service-yoho-579825100.cn-north-1.elb.amazonaws.com.cn'
  116 + }
97 } 117 }
98 }); 118 });
99 } else if (isTest) { 119 } else if (isTest) {
@@ -101,17 +121,18 @@ if (isProduction) { @@ -101,17 +121,18 @@ if (isProduction) {
101 appName: 'm.yohobuy.com for test', 121 appName: 'm.yohobuy.com for test',
102 assetUrl: '//cdn.yoho.cn/m-yohobuy-node/assets', 122 assetUrl: '//cdn.yoho.cn/m-yohobuy-node/assets',
103 domains: { 123 domains: {
104 - api: process.env.TEST_API || 'http://api-test1.yohops.com:9999/',  
105 - service: process.env.TEST_SERVICE || 'http://service-test1.yohops.com:9999/',  
106 - liveApi: process.env.TEST_LIVE || 'http://testapi.live.yohops.com:9999/' 124 + api: 'http://api-test3.yohops.com:9999/',
  125 + service: 'http://service-test3.yohops.com:9999/',
  126 + liveApi: 'http://testapi.live.yohops.com:9999/'
107 }, 127 },
108 memcache: { 128 memcache: {
109 master: ['127.0.0.1:12111'], 129 master: ['127.0.0.1:12111'],
110 slave: ['127.0.0.1:12112'], 130 slave: ['127.0.0.1:12112'],
111 session: ['127.0.0.1:12111'], 131 session: ['127.0.0.1:12111'],
112 - timeout: 100, 132 + timeout: 1000,
113 retries: 0 133 retries: 0
114 }, 134 },
  135 + useOneapm: true,
115 useCache: true 136 useCache: true
116 }); 137 });
117 } 138 }