Merge branch 'release/5.7' into gray

@@ -504,14 +504,15 @@ exports.handleSortData = (origin, params, originParams, baseUrl) => {
     let list = [],
         allCount = 0;
 
+    baseUrl = baseUrl || '';
+
     let all = [{
         name: '全部品类',
         num: allCount,
-        href: `${baseUrl}${handleFilterUrl(params, {}, {msort: true, misort: true, sort: true})}`
+        href: `${baseUrl}${handleFilterUrl(params, {}, {msort: true, misort: true, sort: true, category_id: true})}`
     }];
 
     originParams = originParams || {};
-    baseUrl = baseUrl || '';
 
     _.forEach(origin, value => {
         let equalCategory = `${originParams.category_id}` === `${value.category_id}`;

@@ -66,6 +66,7 @@
     "gulp-rename": "^1.2.2",
     "gulp-sourcemaps": "2.0.0-alpha",
     "gulp-util": "^3.0.7",
+    "handlebars": "4.0.5",
     "handlebars-loader": "^1.4.0",
     "husky": "^0.11.4",
     "jquery-ui": "^1.12.1",