Merge branch 'hotfix/shop'

@@ -420,7 +420,7 @@ const getShopAbout = (shopId, uid, channel) => {
 
 
         if (result[1].code === 200) {
         if (result[1].code === 200) {
             let data = result[1].data || {},
             let data = result[1].data || {},
-                decorator = shopHandler.getShopDecorator(data, {}, shopId);
+                decorator = shopHandler.getShopDecorator(data, {}, shopId, true);
 
 
             Object.assign(decorator.shopTopBannerBase, {
             Object.assign(decorator.shopTopBannerBase, {
                 shopId: shopId,
                 shopId: shopId,
@@ -797,6 +797,9 @@ const getShopListData = (channel, params, uid) => {
                     }),
                     }),
                     footPager: {tip: tip}
                     footPager: {tip: tip}
                 });
                 });
+
+                _.set(finalResult, 'filters.checkedConditions.clearUrl',
+                    `?navBar=${params.navBar}&shopId=${params.shopId}`);
             } else {
             } else {
                 finalResult.searchEmpty = true;
                 finalResult.searchEmpty = true;