fe / yohobuy-node · Commits

Go to a project

Authored by 郭成尧
Commit cdcb1a7360d750ae351e238b6654ab81357273e3 1 parent 3bcdb37c

'endPageNum'

Inline Side-by-side
Showing 2 changed files with 7 additions and 6 deletions
@@ -830,11 +830,12 @@ exports.handlePagerData = (total, params) => { @@ -830,11 +830,12 @@ exports.handlePagerData = (total, params) => {
830 // 商品开始结束数 830 // 商品开始结束数
831 dest.tip = { 831 dest.tip = {
832 total: total, 832 total: total,
833 - start: (currentPage ? currentPage - 1 : 0) * perPageCount + 1,  
834 - end: (total < perPageCount) ? total : (dest.pageCount === parseInt(params.page, 10)) ?  
835 - total : parseInt(dest.start, 10) + perPageCount - 1 833 + start: (currentPage ? currentPage - 1 : 0) * perPageCount + 1
836 }; 834 };
837 835
  836 + dest.tip.end = (total < perPageCount) ? total : ((dest.pageCount === parseInt(params.page, 10)) ?
  837 + total : parseInt(dest.tip.start, 10) + perPageCount - 1);
  838 +
838 dest.pages = _.concat(prevPages, pages, nextPages); 839 dest.pages = _.concat(prevPages, pages, nextPages);
839 840
840 return dest; 841 return dest;
@@ -250,7 +250,7 @@ exports.getSaleOthersData = (params, channel) => { @@ -250,7 +250,7 @@ exports.getSaleOthersData = (params, channel) => {
250 // 处理排序数据 250 // 处理排序数据
251 finalResult.opts = publicHandler.handleSaleOptsData(params, result[1].data.total); 251 finalResult.opts = publicHandler.handleSaleOptsData(params, result[1].data.total);
252 finalResult.totalCount = result[1].data.total; 252 finalResult.totalCount = result[1].data.total;
253 - finalResult.pager = publicHandler.handleSalePagerData(result[1].data.total, params); 253 + finalResult.footPager = publicHandler.handlePagerData(result[1].data.total, params);
254 254
255 // 处理所有商品标题数据 255 // 处理所有商品标题数据
256 finalResult.saleTitle = { 256 finalResult.saleTitle = {
@@ -327,7 +327,7 @@ exports.getSaleDiscountData = (params, channel) => { @@ -327,7 +327,7 @@ exports.getSaleDiscountData = (params, channel) => {
327 Object.assign(finalResult, { 327 Object.assign(finalResult, {
328 leftContent: publicHandler.handleSaleSortData(result[1].data.filter.group_sort, params, 'discount'), 328 leftContent: publicHandler.handleSaleSortData(result[1].data.filter.group_sort, params, 'discount'),
329 saleList: { 329 saleList: {
330 - pager: publicHandler.handleSalePagerData(result[1].data.total, params), 330 + footPager: publicHandler.handlePagerData(result[1].data.total, params),
331 opts: publicHandler.handleSaleOptsData(params, result[1].data.total) 331 opts: publicHandler.handleSaleOptsData(params, result[1].data.total)
332 } 332 }
333 }); 333 });
@@ -425,7 +425,7 @@ exports.getSalebreakingYardsData = (params, channel) => { @@ -425,7 +425,7 @@ exports.getSalebreakingYardsData = (params, channel) => {
425 goods: productProcess.processProductList(subResult[1].data.product_list), 425 goods: productProcess.processProductList(subResult[1].data.product_list),
426 opts: publicHandler.handleSaleOptsData(params, subResult[1].data.total), 426 opts: publicHandler.handleSaleOptsData(params, subResult[1].data.total),
427 totalCount: subResult[1].data.total, 427 totalCount: subResult[1].data.total,
428 - pager: publicHandler.handleSalePagerData(subResult[1].data.total, params) 428 + footPager: publicHandler.handlePagerData(subResult[1].data.total, params)
429 }); 429 });
430 430
431 // 处理所有商品标题数据 431 // 处理所有商品标题数据