fe / yohobuy-node · Commits

Go to a project

Authored by 周少峰
Commit d0b2d311d101089ef25fd5aeadc3ed0ac60927a2 2 parents a9460c8b d52c57eb

Merge branch 'release/5.0.0'

Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
... ... @@ -93,8 +93,8 @@ const handleBrandCheckedData = (params, origin) => {
if (!_.isEmpty(origin)) {
_.forEach(origin, (value) => {
if (typeof _.find(intBrands, o => {
return _.isEqual(o, value.id);
}) !== 'undefined') {
return _.isEqual(o, value.id);
}) !== 'undefined') {
let checked = {
name: value.name
}; // push 到已选择数组
... ... @@ -1258,7 +1258,7 @@ exports.handleNextPage = (params, total) => {
let href;
let currentPage = parseInt((_.isEmpty(params.page) ? 1 : params.page), 10); // 当前页
let perPageCount = parseInt((_.isEmpty(params.limit) ? 60 : params.limit), 10); // 每页商品数
let perPageCount = parseInt((_.isEmpty(params.limit) ? 60 : params.limit) - 1, 10); // 每页商品数
let totalPage = parseInt(total / perPageCount, 10) + 1; // 总页数
if (currentPage === totalPage) {
... ...