Merge branch 'hotfix/shop'

@@ -640,7 +640,8 @@ const getShopData = (shopId, channel, params, shopInfo) => {
                 finalResult.leftContent = searchHandler.handleSortData(groupSort, params);
 
                 if (finalResult.allGoods) {
-                    Object.assign(finalResult.allGoods, searchHandler.setShopSort(groupSort, params));
+                    Object.assign(finalResult.allGoods, searchHandler.setShopSort(groupSort, Object.assign({},
+                        params, {page: 1})));
                 }
             }
 
@@ -692,8 +693,7 @@ const getShopGoodsData = (shopId, channel, params) => {
         // 获取商品数据和顶部筛选条件
         if (result[0].code === 200) {
             Object.assign(resData, {
-                sort: searchHandler.handleOptsData(Object.assign(params,
-                    {page: 1}), _.get(result[0], 'data.total', 0)),
+                sort: searchHandler.handleOptsData(params, _.get(result[0], 'data.total', 0)),
                 list: productProcess.processProductList(_.get(result[0], 'data.product_list', []), {
                     newCoverSort: true,
                     showDiscount: false,
@@ -716,7 +716,8 @@ const getShopGoodsData = (shopId, channel, params) => {
             if (subRes.code === 200) {
                 let groupSort = _.get(subRes, 'data.sort', []);
 
-                Object.assign(resData, searchHandler.setShopSort(groupSort, params));
+                Object.assign(resData, searchHandler.setShopSort(groupSort, Object.assign(params,
+                    {page: 1})));
             }
 
             return resData;