Merge branch 'release/5.7' into 'gray'

shop fixed sort

shop fixed sort

See merge request !127

@@ -583,9 +583,9 @@ exports.setShopSort = (data, params) => {
         _.forEach(data, value => {
             _.forEach(value.sub, subValue => {
                 list.push({
-                    name: subValue.sort_name,
-                    href: handleFilterUrl(params, {msort: value.sort_id, misort: subValue.sort_id}),
-                    curMenu: params.misort === subValue.sort_id
+                    name: subValue.category_name,
+                    href: handleFilterUrl(params, {category_id: subValue.category_id}),
+                    curMenu: `${params.category_id}` === `${subValue.category_id}`
                 });
             });
         });