Authored by biao

update for optimise code

@@ -12,7 +12,6 @@ const _ = require('lodash'); @@ -12,7 +12,6 @@ const _ = require('lodash');
12 const ServiceAPI = require(`${library}/api`).ServiceAPI; 12 const ServiceAPI = require(`${library}/api`).ServiceAPI;
13 const API = require(`${library}/api`).API; 13 const API = require(`${library}/api`).API;
14 const sign = require(`${library}/sign`); 14 const sign = require(`${library}/sign`);
15 -const productProcess = require(`${utils}/product-process`);  
16 15
17 const camelCase = require(`${library}/camel-case`); 16 const camelCase = require(`${library}/camel-case`);
18 const resourcesProcess = require(`${utils}/resources-process`); 17 const resourcesProcess = require(`${utils}/resources-process`);
@@ -23,12 +22,10 @@ const api = new API(); @@ -23,12 +22,10 @@ const api = new API();
23 22
24 23
25 const getOutletResource = (channel, contentcode) => { 24 const getOutletResource = (channel, contentcode) => {
26 - console.log(contentcode);  
27 const params = { 25 const params = {
28 content_code: contentcode || 'c19ffa03f053f4cac3690b22c8da26b7', 26 content_code: contentcode || 'c19ffa03f053f4cac3690b22c8da26b7',
29 limit: 25, 27 limit: 25,
30 - yh_channel: channel || '',  
31 - debug: 'XYZ' 28 + yh_channel: channel || ''
32 }; 29 };
33 30
34 return serviceApi.get('operations/api/v5/resource/home', sign.apiSign(params)).then(result => { 31 return serviceApi.get('operations/api/v5/resource/home', sign.apiSign(params)).then(result => {
@@ -53,6 +50,7 @@ const convertNavData = (list) => { @@ -53,6 +50,7 @@ const convertNavData = (list) => {
53 url: encodeURI(item.sortUrl) 50 url: encodeURI(item.sortUrl)
54 }); 51 });
55 }); 52 });
  53 +
56 return {data: formatData}; 54 return {data: formatData};
57 }; 55 };
58 56
@@ -75,25 +73,6 @@ const getNavData = (categoryId) => { @@ -75,25 +73,6 @@ const getNavData = (categoryId) => {
75 }); 73 });
76 }; 74 };
77 75
78 -const getGoodsList = () => {  
79 - var params = {  
80 - method: 'app.search.category',  
81 - limit: 50,  
82 - page: 1,  
83 - outlets: 1  
84 - };  
85 -  
86 - var data = {};  
87 -  
88 - return api.get('', sign.apiSign(params)).then(res => {  
89 - if (res && res.code === 200) {  
90 - data = productProcess.processProductList(res.data.product_list);  
91 - }  
92 -  
93 - return data;  
94 - });  
95 -};  
96 -  
97 const getActivityDetail = (id) => { 76 const getActivityDetail = (id) => {
98 var params = { 77 var params = {
99 method: 'app.outlets.activityGet', 78 method: 'app.outlets.activityGet',
@@ -153,13 +132,12 @@ exports.getContent = (categoryId, channel, code) => { @@ -153,13 +132,12 @@ exports.getContent = (categoryId, channel, code) => {
153 id: 0 132 id: 0
154 }; 133 };
155 134
156 - const p = [getNavData(categoryId), getOutletResource(channel, code), getHomeActivity(params), getGoodsList()]; 135 + const p = [getNavData(categoryId), getOutletResource(channel, code), getHomeActivity(params)];
157 136
158 return Promise.all(p).then(data => { 137 return Promise.all(p).then(data => {
159 floorsData.nav = data[0] || []; 138 floorsData.nav = data[0] || [];
160 floorsData.content = data[1] || []; 139 floorsData.content = data[1] || [];
161 floorsData.activity = {data: data[2]}; 140 floorsData.activity = {data: data[2]};
162 - floorsData.goods = data[3];  
163 141
164 return floorsData; 142 return floorsData;
165 }); 143 });