Showing
6 changed files
with
34 additions
and
42 deletions
1 | var API = require('../../../library/api').API; | 1 | var API = require('../../../library/api').API; |
2 | var api = new API(); | 2 | var api = new API(); |
3 | -const library = '../../../library'; | ||
4 | -const sign = require(`${library}/sign`); | ||
5 | 3 | ||
6 | /** | 4 | /** |
7 | * 分享页面基础参数 | 5 | * 分享页面基础参数 |
@@ -10,6 +8,7 @@ const sign = require(`${library}/sign`); | @@ -10,6 +8,7 @@ const sign = require(`${library}/sign`); | ||
10 | */ | 8 | */ |
11 | const getPageInfo = (pageInfo) => { | 9 | const getPageInfo = (pageInfo) => { |
12 | var dest = {}; | 10 | var dest = {}; |
11 | + | ||
13 | dest.shareTitle = pageInfo.data.shareTitle; | 12 | dest.shareTitle = pageInfo.data.shareTitle; |
14 | dest.shareDesc = pageInfo.data.shareContent; | 13 | dest.shareDesc = pageInfo.data.shareContent; |
15 | dest.shareImg = pageInfo.data.shareImgUrl; | 14 | dest.shareImg = pageInfo.data.shareImgUrl; |
@@ -73,13 +72,11 @@ const getUserStatus = (param) => { | @@ -73,13 +72,11 @@ const getUserStatus = (param) => { | ||
73 | */ | 72 | */ |
74 | exports.getPageInfo = (data) => { | 73 | exports.getPageInfo = (data) => { |
75 | var defaultParam = { | 74 | var defaultParam = { |
76 | - | ||
77 | method: 'app.activity.getInfoOfOrderShare' | 75 | method: 'app.activity.getInfoOfOrderShare' |
78 | }, | 76 | }, |
77 | + infoData = Object.assign(defaultParam, data); // 处理完成后,发给后端 | ||
79 | 78 | ||
80 | - // 处理完成后,发给后端 | ||
81 | - infoData = Object.assign(defaultParam, data); | ||
82 | - return api.get('', sign.apiSign(infoData)).then(result => { | 79 | + return api.get('', infoData).then(result => { |
83 | return getPageInfo(result); | 80 | return getPageInfo(result); |
84 | }); // 所有数据返回一个 Promise,方便 Promise.all 调用 | 81 | }); // 所有数据返回一个 Promise,方便 Promise.all 调用 |
85 | }; | 82 | }; |
@@ -95,7 +92,7 @@ exports.getCoupon = (data) => { | @@ -95,7 +92,7 @@ exports.getCoupon = (data) => { | ||
95 | // 处理完成后,发给后端 | 92 | // 处理完成后,发给后端 |
96 | phoneData = Object.assign(defaultParam, data); | 93 | phoneData = Object.assign(defaultParam, data); |
97 | 94 | ||
98 | - return api.get('', sign.apiSign(phoneData)).then(result => { | 95 | + return api.get('', phoneData).then(result => { |
99 | return getUserStatus(result); | 96 | return getUserStatus(result); |
100 | }); // 所有数据返回一个 Promise,方便 Promise.all 调用 | 97 | }); // 所有数据返回一个 Promise,方便 Promise.all 调用 |
101 | }; | 98 | }; |
@@ -112,7 +109,7 @@ exports.registerAndSendCoupon = (data) => { | @@ -112,7 +109,7 @@ exports.registerAndSendCoupon = (data) => { | ||
112 | // 处理完成后,发给后端 | 109 | // 处理完成后,发给后端 |
113 | verifyData = Object.assign(defaultParam, data); | 110 | verifyData = Object.assign(defaultParam, data); |
114 | 111 | ||
115 | - return api.get('', sign.apiSign(verifyData)).then(result => { | 112 | + return api.get('', verifyData).then(result => { |
116 | return getUserStatus(result); | 113 | return getUserStatus(result); |
117 | }); // 所有数据返回一个 Promise,方便 Promise.all 调用 | 114 | }); // 所有数据返回一个 Promise,方便 Promise.all 调用 |
118 | }; | 115 | }; |
@@ -10,7 +10,6 @@ const contentCodeConfig = require('../../../config/content-code'); | @@ -10,7 +10,6 @@ const contentCodeConfig = require('../../../config/content-code'); | ||
10 | const resourcesProcess = require(`${utils}/resources-process`); | 10 | const resourcesProcess = require(`${utils}/resources-process`); |
11 | const ServiceAPI = require(`${library}/api`).ServiceAPI; | 11 | const ServiceAPI = require(`${library}/api`).ServiceAPI; |
12 | const API = require(`${library}/api`).API; | 12 | const API = require(`${library}/api`).API; |
13 | -const sign = require(`${library}/sign`); | ||
14 | const logger = require(`${library}/logger`); | 13 | const logger = require(`${library}/logger`); |
15 | const camelCase = require(`${library}/camel-case`); | 14 | const camelCase = require(`${library}/camel-case`); |
16 | const helpers = require(`${library}/helpers`); | 15 | const helpers = require(`${library}/helpers`); |
@@ -26,10 +25,10 @@ const contentCode = contentCodeConfig.guang; | @@ -26,10 +25,10 @@ const contentCode = contentCodeConfig.guang; | ||
26 | * @return {[array]} | 25 | * @return {[array]} |
27 | */ | 26 | */ |
28 | const _getResources = (page) => { | 27 | const _getResources = (page) => { |
29 | - return serviceAPI.get('operations/api/v5/resource/get', sign.apiSign({ | 28 | + return serviceAPI.get('operations/api/v5/resource/get', { |
30 | content_code: contentCode[page], | 29 | content_code: contentCode[page], |
31 | client_type: 'iphone' | 30 | client_type: 'iphone' |
32 | - })).then((result) => { | 31 | + }).then((result) => { |
33 | if (result && result.code === 200) { | 32 | if (result && result.code === 200) { |
34 | return resourcesProcess(result.data); | 33 | return resourcesProcess(result.data); |
35 | } else { | 34 | } else { |
@@ -164,11 +163,11 @@ const _processCollocationData = (list) => { | @@ -164,11 +163,11 @@ const _processCollocationData = (list) => { | ||
164 | * 星潮首页 | 163 | * 星潮首页 |
165 | */ | 164 | */ |
166 | const getIndexData = (uid) => { | 165 | const getIndexData = (uid) => { |
167 | - return api.get('', sign.apiSign({ | 166 | + return api.get('', { |
168 | method: 'app.starClass.index', | 167 | method: 'app.starClass.index', |
169 | code: '8adc27fcf5676f356602889afcfd2a8e', | 168 | code: '8adc27fcf5676f356602889afcfd2a8e', |
170 | client_type: 'iphone' | 169 | client_type: 'iphone' |
171 | - })).then((result) => { | 170 | + }).then((result) => { |
172 | if (result && result.code === 200) { | 171 | if (result && result.code === 200) { |
173 | return _processIndexData(result.data, uid); | 172 | return _processIndexData(result.data, uid); |
174 | } else { | 173 | } else { |
@@ -182,13 +181,13 @@ const getIndexData = (uid) => { | @@ -182,13 +181,13 @@ const getIndexData = (uid) => { | ||
182 | * 明星专题 | 181 | * 明星专题 |
183 | */ | 182 | */ |
184 | const getDetailData = (params) => { | 183 | const getDetailData = (params) => { |
185 | - return api.get('', sign.apiSign({ | 184 | + return api.get('', { |
186 | method: 'app.starClass.lastTagArticle', | 185 | method: 'app.starClass.lastTagArticle', |
187 | tag: params.tag, | 186 | tag: params.tag, |
188 | page: params.page || 1, | 187 | page: params.page || 1, |
189 | size: 10, | 188 | size: 10, |
190 | client_type: 'iphone' | 189 | client_type: 'iphone' |
191 | - })).then((result) => { | 190 | + }).then((result) => { |
192 | if (result && result.code === 200) { | 191 | if (result && result.code === 200) { |
193 | if (params.page > result.data.totalPage) { | 192 | if (params.page > result.data.totalPage) { |
194 | return ''; | 193 | return ''; |
@@ -232,10 +231,10 @@ const getSpecialData = () => { | @@ -232,10 +231,10 @@ const getSpecialData = () => { | ||
232 | */ | 231 | */ |
233 | const getCollocationListData = (params, uid) => { | 232 | const getCollocationListData = (params, uid) => { |
234 | 233 | ||
235 | - return serviceAPI.get('guang/api/v5/article/getStarClassroomArticleList', sign.apiSign(Object.assign({ | 234 | + return serviceAPI.get('guang/api/v5/article/getStarClassroomArticleList', Object.assign({ |
236 | limit: '20', | 235 | limit: '20', |
237 | uid: uid | 236 | uid: uid |
238 | - }, params))).then((result) => { | 237 | + }, params)).then((result) => { |
239 | if (result && result.code === 200) { | 238 | if (result && result.code === 200) { |
240 | return _processCollocationData(result.data.list.artList); | 239 | return _processCollocationData(result.data.list.artList); |
241 | } else { | 240 | } else { |
@@ -253,12 +252,12 @@ const setFavorite = (params, uid) => { | @@ -253,12 +252,12 @@ const setFavorite = (params, uid) => { | ||
253 | }); | 252 | }); |
254 | } | 253 | } |
255 | 254 | ||
256 | - return api.get('', sign.apiSign({ | 255 | + return api.get('', { |
257 | method: params.type === 'del' ? 'app.sns.cancelFavorBackCount' : 'app.sns.setFavorBackCount', | 256 | method: params.type === 'del' ? 'app.sns.cancelFavorBackCount' : 'app.sns.setFavorBackCount', |
258 | client_type: 'h5', | 257 | client_type: 'h5', |
259 | article_id: params.articleId, | 258 | article_id: params.articleId, |
260 | uid: uid | 259 | uid: uid |
261 | - })); | 260 | + }); |
262 | }; | 261 | }; |
263 | 262 | ||
264 | module.exports = { | 263 | module.exports = { |
@@ -19,7 +19,7 @@ class Auth { | @@ -19,7 +19,7 @@ class Auth { | ||
19 | param.shopping_key = shoppingKey; | 19 | param.shopping_key = shoppingKey; |
20 | } | 20 | } |
21 | 21 | ||
22 | - return api.post('', sign.apiSign(param)); | 22 | + return api.post('', param); |
23 | } | 23 | } |
24 | 24 | ||
25 | static signinByOpenID(nickname, openId, sourceType, shoppingKey) { | 25 | static signinByOpenID(nickname, openId, sourceType, shoppingKey) { |
@@ -35,7 +35,7 @@ class Auth { | @@ -35,7 +35,7 @@ class Auth { | ||
35 | param.shopping_key = shoppingKey; | 35 | param.shopping_key = shoppingKey; |
36 | } | 36 | } |
37 | 37 | ||
38 | - return api.get('', sign.apiSign(param)); | 38 | + return api.get('', param); |
39 | } | 39 | } |
40 | 40 | ||
41 | static profile(uid) { | 41 | static profile(uid) { |
@@ -44,7 +44,7 @@ class Auth { | @@ -44,7 +44,7 @@ class Auth { | ||
44 | method: 'app.passport.profile' | 44 | method: 'app.passport.profile' |
45 | }; | 45 | }; |
46 | 46 | ||
47 | - return api.get('', sign.apiSign(param)); | 47 | + return api.get('', param); |
48 | } | 48 | } |
49 | 49 | ||
50 | static syncUserSession(uid, req, res) { | 50 | static syncUserSession(uid, req, res) { |
@@ -12,8 +12,6 @@ const contentCodeConfig = require('../../../config/content-code'); | @@ -12,8 +12,6 @@ const contentCodeConfig = require('../../../config/content-code'); | ||
12 | const _ = require('lodash'); | 12 | const _ = require('lodash'); |
13 | const ServiceAPI = require(`${library}/api`).ServiceAPI; | 13 | const ServiceAPI = require(`${library}/api`).ServiceAPI; |
14 | const API = require(`${library}/api`).API; | 14 | const API = require(`${library}/api`).API; |
15 | -const sign = require(`${library}/sign`); | ||
16 | - | ||
17 | const camelCase = require(`${library}/camel-case`); | 15 | const camelCase = require(`${library}/camel-case`); |
18 | const resourcesProcess = require(`${utils}/resources-process`); | 16 | const resourcesProcess = require(`${utils}/resources-process`); |
19 | const log = require(`${library}/logger`); | 17 | const log = require(`${library}/logger`); |
@@ -61,7 +59,7 @@ const _getOutletResource = (channel, contentcode) => { | @@ -61,7 +59,7 @@ const _getOutletResource = (channel, contentcode) => { | ||
61 | yh_channel: channel || '' | 59 | yh_channel: channel || '' |
62 | }; | 60 | }; |
63 | 61 | ||
64 | - return serviceApi.get('operations/api/v5/resource/home', sign.apiSign(params)).then(result => { | 62 | + return serviceApi.get('operations/api/v5/resource/home', params).then(result => { |
65 | if (result && result.code === 200) { | 63 | if (result && result.code === 200) { |
66 | return resourcesProcess(result.data.list); | 64 | return resourcesProcess(result.data.list); |
67 | } else { | 65 | } else { |
@@ -102,7 +100,7 @@ const _getNavData = (categoryId) => { | @@ -102,7 +100,7 @@ const _getNavData = (categoryId) => { | ||
102 | parent_id: categoryId | 100 | parent_id: categoryId |
103 | }; | 101 | }; |
104 | 102 | ||
105 | - return serviceApi.get('operations/api/v6/category/getCategory', sign.apiSign(params)).then(result => { | 103 | + return serviceApi.get('operations/api/v6/category/getCategory', params).then(result => { |
106 | if (result && result.code === 200) { | 104 | if (result && result.code === 200) { |
107 | let data = _convertNavData(result.data); | 105 | let data = _convertNavData(result.data); |
108 | 106 | ||
@@ -170,7 +168,7 @@ const _getActivityDetail = (id) => { | @@ -170,7 +168,7 @@ const _getActivityDetail = (id) => { | ||
170 | }; | 168 | }; |
171 | 169 | ||
172 | 170 | ||
173 | - return api.get('', sign.apiSign(params)).then(res => { | 171 | + return api.get('', params).then(res => { |
174 | if (res.code === 200) { | 172 | if (res.code === 200) { |
175 | return _convertActicityData(res.data); | 173 | return _convertActicityData(res.data); |
176 | } else { | 174 | } else { |
@@ -191,7 +189,7 @@ const _getHomeActivity = (data) => { | @@ -191,7 +189,7 @@ const _getHomeActivity = (data) => { | ||
191 | platform: 3 // h5平台代号 | 189 | platform: 3 // h5平台代号 |
192 | }; | 190 | }; |
193 | 191 | ||
194 | - return api.get('', sign.apiSign(_.assign(params, data))).then(res => { | 192 | + return api.get('', _.assign(params, data)).then(res => { |
195 | return _convertActicityData(res.data); | 193 | return _convertActicityData(res.data); |
196 | }); | 194 | }); |
197 | }; | 195 | }; |
@@ -10,7 +10,6 @@ | @@ -10,7 +10,6 @@ | ||
10 | const library = '../../../library'; | 10 | const library = '../../../library'; |
11 | const utils = '../../../utils'; | 11 | const utils = '../../../utils'; |
12 | const API = require(`${library}/api`).API; | 12 | const API = require(`${library}/api`).API; |
13 | -const sign = require(`${library}/sign`); | ||
14 | const _ = require('lodash'); | 13 | const _ = require('lodash'); |
15 | const productProcess = require(`${utils}/product-process`); | 14 | const productProcess = require(`${utils}/product-process`); |
16 | var api = new API(); | 15 | var api = new API(); |
@@ -18,12 +17,12 @@ var api = new API(); | @@ -18,12 +17,12 @@ var api = new API(); | ||
18 | module.exports = (data) => { | 17 | module.exports = (data) => { |
19 | var finalResult; | 18 | var finalResult; |
20 | 19 | ||
21 | - return api.get('', sign.apiSign({ | 20 | + return api.get('', { |
22 | method: 'h5.preference.Search', | 21 | method: 'h5.preference.Search', |
23 | productskn: data.productskn, | 22 | productskn: data.productskn, |
24 | yhchannel: data.yhchannel, | 23 | yhchannel: data.yhchannel, |
25 | brandId: data.brandId | 24 | brandId: data.brandId |
26 | - })).then(result => { | 25 | + }).then(result => { |
27 | if (!_.isEmpty(result) && result.code === 200) { | 26 | if (!_.isEmpty(result) && result.code === 200) { |
28 | // 为你优选数据处理,接口没有数据,待处理,待验证 | 27 | // 为你优选数据处理,接口没有数据,待处理,待验证 |
29 | finalResult = productProcess.processProductList(result.data); | 28 | finalResult = productProcess.processProductList(result.data); |
@@ -10,7 +10,6 @@ const contentCodeConfig = require('../../../config/content-code'); | @@ -10,7 +10,6 @@ const contentCodeConfig = require('../../../config/content-code'); | ||
10 | 10 | ||
11 | const API = require(`${library}/api`).API; | 11 | const API = require(`${library}/api`).API; |
12 | const ServiceAPI = require(`${library}/api`).ServiceAPI; | 12 | const ServiceAPI = require(`${library}/api`).ServiceAPI; |
13 | -const sign = require(`${library}/sign`); | ||
14 | const logger = require(`${library}/logger`); | 13 | const logger = require(`${library}/logger`); |
15 | const camelCase = require(`${library}/camel-case`); | 14 | const camelCase = require(`${library}/camel-case`); |
16 | const resourcesProcess = require(`${utils}/resources-process`); | 15 | const resourcesProcess = require(`${utils}/resources-process`); |
@@ -87,11 +86,11 @@ const _processDiscount = (list, channel) => { | @@ -87,11 +86,11 @@ const _processDiscount = (list, channel) => { | ||
87 | const _discount = (params) => { | 86 | const _discount = (params) => { |
88 | params = params || {}; | 87 | params = params || {}; |
89 | 88 | ||
90 | - return api.get('', sign.apiSign(Object.assign({ | 89 | + return api.get('', Object.assign({ |
91 | method: 'app.activity.get', | 90 | method: 'app.activity.get', |
92 | sort: 2, | 91 | sort: 2, |
93 | plateform: 3 | 92 | plateform: 3 |
94 | - }, params))); | 93 | + }, params)); |
95 | }; | 94 | }; |
96 | 95 | ||
97 | /** | 96 | /** |
@@ -160,9 +159,9 @@ const _searchSales = (params) => { | @@ -160,9 +159,9 @@ const _searchSales = (params) => { | ||
160 | params.order = typeCont[params.type][params.order]; | 159 | params.order = typeCont[params.type][params.order]; |
161 | } | 160 | } |
162 | 161 | ||
163 | - return api.get('', sign.apiSign(Object.assign({ | 162 | + return api.get('', Object.assign({ |
164 | method: method | 163 | method: method |
165 | - }, params)), true); | 164 | + }, params), true); |
166 | }; | 165 | }; |
167 | 166 | ||
168 | /** | 167 | /** |
@@ -177,10 +176,10 @@ const _getUserProfile = (uid) => { | @@ -177,10 +176,10 @@ const _getUserProfile = (uid) => { | ||
177 | data: {} | 176 | data: {} |
178 | }); | 177 | }); |
179 | } | 178 | } |
180 | - return api.get('', sign.apiSign({ | 179 | + return api.get('', { |
181 | method: 'app.passport.profile', | 180 | method: 'app.passport.profile', |
182 | uid: uid | 181 | uid: uid |
183 | - }), true); | 182 | + }, true); |
184 | }; | 183 | }; |
185 | 184 | ||
186 | /** | 185 | /** |
@@ -189,9 +188,9 @@ const _getUserProfile = (uid) => { | @@ -189,9 +188,9 @@ const _getUserProfile = (uid) => { | ||
189 | * @return {[array]} | 188 | * @return {[array]} |
190 | */ | 189 | */ |
191 | const _getResources = (page, channel) => { | 190 | const _getResources = (page, channel) => { |
192 | - return serviceAPI.get('operations/api/v5/resource/get', sign.apiSign({ | 191 | + return serviceAPI.get('operations/api/v5/resource/get', { |
193 | content_code: contentCode[channel][page] | 192 | content_code: contentCode[channel][page] |
194 | - })).then((result) => { | 193 | + }).then((result) => { |
195 | if (result && result.code === 200) { | 194 | if (result && result.code === 200) { |
196 | return resourcesProcess(result.data); | 195 | return resourcesProcess(result.data); |
197 | } else { | 196 | } else { |
@@ -207,10 +206,10 @@ const _getResources = (page, channel) => { | @@ -207,10 +206,10 @@ const _getResources = (page, channel) => { | ||
207 | * @return {[object]} | 206 | * @return {[object]} |
208 | */ | 207 | */ |
209 | const _getBreakingSort = (yhChannel) => { | 208 | const _getBreakingSort = (yhChannel) => { |
210 | - return api.get('', sign.apiSign({ | 209 | + return api.get('', { |
211 | method: 'app.sale.getBreakingSort', | 210 | method: 'app.sale.getBreakingSort', |
212 | yh_channel: channelType[yhChannel] || '1' | 211 | yh_channel: channelType[yhChannel] || '1' |
213 | - })).then((result) => { | 212 | + }).then((result) => { |
214 | if (result && result.code === 200) { | 213 | if (result && result.code === 200) { |
215 | return _processBreakingSort(result.data); | 214 | return _processBreakingSort(result.data); |
216 | } else { | 215 | } else { |
-
Please register or login to post a comment