Merge branch 'hotfix/salePage' into gray
Showing
2 changed files
with
2 additions
and
2 deletions
@@ -62,7 +62,7 @@ | @@ -62,7 +62,7 @@ | ||
62 | "gulp-ftp": "^1.1.0", | 62 | "gulp-ftp": "^1.1.0", |
63 | "gulp-postcss": "^6.1.0", | 63 | "gulp-postcss": "^6.1.0", |
64 | "gulp-rename": "^1.2.2", | 64 | "gulp-rename": "^1.2.2", |
65 | - "gulp-sourcemaps": "^2.0.0-alpha", | 65 | + "gulp-sourcemaps": "2.0.0-alpha", |
66 | "gulp-util": "^3.0.7", | 66 | "gulp-util": "^3.0.7", |
67 | "handlebars-loader": "^1.4.0", | 67 | "handlebars-loader": "^1.4.0", |
68 | "husky": "^0.11.4", | 68 | "husky": "^0.11.4", |
@@ -107,7 +107,7 @@ exports.setPager = (total, params)=>{ | @@ -107,7 +107,7 @@ exports.setPager = (total, params)=>{ | ||
107 | }, {num: '...'}, pages); | 107 | }, {num: '...'}, pages); |
108 | } else { | 108 | } else { |
109 | pages = _.concat({ | 109 | pages = _.concat({ |
110 | - url: '?page=1', | 110 | + url: joinUrl(Object.assign(params, {page: 1})), |
111 | num: 1 | 111 | num: 1 |
112 | }, pages); | 112 | }, pages); |
113 | } | 113 | } |
-
Please register or login to post a comment