Authored by 周少峰

Merge branch 'hotfix/salePage' into gray

... ... @@ -62,7 +62,7 @@
"gulp-ftp": "^1.1.0",
"gulp-postcss": "^6.1.0",
"gulp-rename": "^1.2.2",
"gulp-sourcemaps": "^2.0.0-alpha",
"gulp-sourcemaps": "2.0.0-alpha",
"gulp-util": "^3.0.7",
"handlebars-loader": "^1.4.0",
"husky": "^0.11.4",
... ...
... ... @@ -107,7 +107,7 @@ exports.setPager = (total, params)=>{
}, {num: '...'}, pages);
} else {
pages = _.concat({
url: '?page=1',
url: joinUrl(Object.assign(params, {page: 1})),
num: 1
}, pages);
}
... ...