Merge remote-tracking branch 'origin/release/5.3.1' into release/5.3.1

@@ -89,7 +89,7 @@ exports.statusFav = function(sid, bid) {
         return $.post('/product/index/isFavoriteShop', {
         return $.post('/product/index/isFavoriteShop', {
             shopId: sid
             shopId: sid
         }).then(function(result) {
         }).then(function(result) {
-            if (result.code === 200) {
+            if (result.code === 200 && result.data) {
                 return $.Deferred().resolve().promise();//eslint-disable-line
                 return $.Deferred().resolve().promise();//eslint-disable-line
             } else {
             } else {
                 return $.Deferred().reject().promise();//eslint-disable-line
                 return $.Deferred().reject().promise();//eslint-disable-line
@@ -109,6 +109,6 @@ exports.statusFav = function(sid, bid) {
         });
         });
     }
     }
 
 
-    return $.Deferred().reject().promise();
+    return $.Deferred().reject().promise();//eslint-disable-line
 };
 };