Merge remote-tracking branch 'origin/hotfix/rss'

@@ -346,6 +346,7 @@ let getintroIntro = (data) => {
     }, {
         cache: true
     }).then(result => {
+        result = result || '';
         result = $.load(result);
 
         result = result('#productDesc');

@@ -450,7 +450,7 @@ const _formShopData = (data, shopId, isApp) => {
                 shopCategory.list.push({
                     url: helpers.urlFormat('', {
                         shop_id: shopId,
-                        sort: item.relation_parameter.sort
+                        sort: (item.relation_parameter && item.relation_parameter.sort) || ''
                     }, 'search'),
                     categoryId: item.category_id,
                     name: item.category_name