Merge branch 'hotfix/shop'

@@ -268,7 +268,7 @@ const getBrandData = (params, extra, channel) => {
     let apiMethod = [
     let apiMethod = [
         headerModel.requestHeaderData(channel),
         headerModel.requestHeaderData(channel),
         searchApi.getSortList(queryBase),
         searchApi.getSortList(queryBase),
-        searchApi.getProductList(Object.assign({order: order}, searchParams, queryBase))
+        searchApi.getProductList(Object.assign(searchParams, {order: order}, queryBase))
 
 
     ];
     ];
 
 
@@ -891,6 +891,7 @@ const getBaseShopData = (params, extra, channel, shopId) => {
                 pathTitle: shopName
                 pathTitle: shopName
             });
             });
         }
         }
+
         // 临时删除seo信息
         // 临时删除seo信息
         _.unset(resData, 'title');
         _.unset(resData, 'title');
         _.unset(resData, 'keywords');
         _.unset(resData, 'keywords');

@@ -311,7 +311,7 @@ exports.handleOptsData = (params, total, extra) => {
 
 
         switch (i) {
         switch (i) {
             case 0:
             case 0:
-                opt.href = handleFilterUrl(params, {order: ''}, {page: true});
+                opt.href = handleFilterUrl(params, {}, {page: true, order: true});
                 if (extra === 'discont') { // 如果是折扣专场
                 if (extra === 'discont') { // 如果是折扣专场
                     opt.name = '全部';
                     opt.name = '全部';
                     if (_.isEmpty(params.order) || params.order === 's_t_desc') {
                     if (_.isEmpty(params.order) || params.order === 's_t_desc') {