Merge branch 'feature/errorAmend' into 'release/5.5.1'

报错修改



See merge request !431

@@ -71,7 +71,8 @@ let getCateData = (channel) => {
     }, {
     }, {
         cache: true
         cache: true
     }).then((result) => {
     }).then((result) => {
-        if (!result.code || result.code !== 200 || !result.data) {
+
+        if (!result || !result.code || result.code !== 200 || !result.data) {
             return [];
             return [];
         }
         }
 
 

@@ -862,6 +862,10 @@ if ($brandHeader.data('isbaseshop') === true) {
         url: location.protocol + '//m.yohobuy.com/product/search/filter',
         url: location.protocol + '//m.yohobuy.com/product/search/filter',
         data: defaultOpt,
         data: defaultOpt,
         success: function(data) {
         success: function(data) {
+            if (data === '') {
+                return false;
+            }
+
             $goodsContainer.append(data);
             $goodsContainer.append(data);
 
 
             // 初始化filter&注册filter回调
             // 初始化filter&注册filter回调