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

@@ -9,8 +9,7 @@ var $ = require('yoho-jquery');
 var $brandFavor = $('#brand-favor'),
     $shopFavor = $('#shop-favor'),
     shopId = $shopFavor.data('id'),
-    id = $brandFavor.data('id'),
-    isFavorite = $shopFavor.find('i').hasClass('coled');
+    id = $brandFavor.data('id');
 
 var BRAND_FAV = {
     add: 'add',
@@ -41,17 +40,18 @@ $brandFavor.on('click', function() {
  * 店铺收藏
  */
 $shopFavor.on('click', function() {
+    var $dom = $shopFavor.find('i');
+
     $.ajax({
         type: 'post',
         url: '/product/shop/togglecollect',
         data: {
-            isFavorite: isFavorite ? 0 : 1,
+            isFavorite: $dom.hasClass('coled') ? 0 : 1,
             shopId: shopId
         }
     }).then(function(res) {
         if (res.code === 200) {
-            $shopFavor.find('i').toggleClass('coled');
-            isFavorite = !isFavorite;
+            $dom.toggleClass('coled');
         } else if (res.code === 401) {
             location.href = '//www.yohobuy.com/signin.html?refer=' + encodeURIComponent(location.href);
         }