Merge branch 'hotfix/preference' into 'release/6.1'

preference-bug-fixed



See merge request !943

@@ -31,6 +31,10 @@ module.exports = class extends global.yoho.BaseModel {
             },
             param: {cache: true}
         }).then(result => {
+            if (!result) {
+                return '';
+            }
+
             let goodsContainer = $.load(result)('#shop-goods-container');
             let goodThumb = goodsContainer.find('.good-thumb');