Authored by yyq

Merge branch 'feature/newGolbal' into release/5.6

@@ -140,10 +140,10 @@ const getGlobalProductListData = (params, yoho) => { @@ -140,10 +140,10 @@ const getGlobalProductListData = (params, yoho) => {
140 140
141 return Promise.props({ 141 return Promise.props({
142 header: headerModel.requestHeaderData(yoho.channel), 142 header: headerModel.requestHeaderData(yoho.channel),
143 - fullList: globalApi.getGlobalProductListAsync({ 143 + fullList: globalApi.getGlobalProductListAsync(Object.assign({
144 physical_channel: yoho.channelNum, 144 physical_channel: yoho.channelNum,
145 limit: 1 145 limit: 1
146 - }), 146 + }, dps)),
147 list: globalApi.getGlobalProductListAsync(Object.assign({ 147 list: globalApi.getGlobalProductListAsync(Object.assign({
148 physical_channel: yoho.channelNum 148 physical_channel: yoho.channelNum
149 }, params, {limit: params.limit ? params.limit - 1 : 59})) 149 }, params, {limit: params.limit ? params.limit - 1 : 59}))