Merge branch 'feature/activity' into release/6.2

@@ -36,11 +36,11 @@ const _getProductBySkns = function(productObj) {
 /**
  * 获取店铺组店铺数据
  */
-const _getShopGroup = (shopRawData, order) => {
+const _getShopGroup = (shopRawData) => {
     return api.get('', {
         method: 'app.shops.batchGetShops',
         shop_ids: shopRawData.defaultShopIds,
-        order: order === 1 ? 'pools_id_asc' : 'pool_id_desc' // pools_id_desc
+        order: _.get(shopRawData, 'linkParams.order') || 'pool_id_desc'
     }).then(result => {
         let renderData = _.get(result, 'data', []);
 
@@ -104,10 +104,7 @@ module.exports = {
 
                     // 新增店铺组
                     if (_.get(f, 'component[0].type') === 'shopGroup') {
-                        let tableComp = _.get(f, 'tableComp');
-                        let tableCompObj = JSON.parse(tableComp);
-
-                        shopGroups.push(_getShopGroup(f.component[0], tableCompObj.orderBy));
+                        shopGroups.push(_getShopGroup(f.component[0]));
                     }
 
                     if (_.get(f, 'type') === 'bottombar') {