Merge branch 'feature/favShopDelAll' into release/5.3.1

@@ -393,7 +393,6 @@ $('#me-checkall').click(function() {
 //删除收藏
 //删除收藏
 $('.del-favorite').click(function(e) {
 $('.del-favorite').click(function(e) {
     var id = $(this).closest('.fav-row').data('id'),
     var id = $(this).closest('.fav-row').data('id'),
-        shopid = $(this).closest('.fav-row').data('shopid'),
         brandorshoptype = $(this).closest('.fav-row').data('brandorshoptype');
         brandorshoptype = $(this).closest('.fav-row').data('brandorshoptype');
 
 
     e.preventDefault();
     e.preventDefault();
@@ -403,9 +402,7 @@ $('.del-favorite').click(function(e) {
         url: '/home/favorite/cancel',
         url: '/home/favorite/cancel',
         data: {
         data: {
             id: id,
             id: id,
-            shopid: shopid,
-            brandorshoptype: brandorshoptype,
-            type: favType
+            type: brandorshoptype || favType
         }
         }
     }).then(function(data) {
     }).then(function(data) {
         if (data.code === 200) {
         if (data.code === 200) {
@@ -418,16 +415,27 @@ $('.del-favorite').click(function(e) {
 $('#me-del-checked').click(function() {
 $('#me-del-checked').click(function() {
     var ids = [],
     var ids = [],
         name = '商品';
         name = '商品';
+    var optType, group = {};
 
 
     if (favType === 'brand') {
     if (favType === 'brand') {
-        name = '品牌';
+        name = '品牌店铺';
     } else if (favType === 'article') {
     } else if (favType === 'article') {
         name = '文章';
         name = '文章';
     }
     }
 
 
     if (confirm('您确定要删除您收藏的' + name + '吗？')) {
     if (confirm('您确定要删除您收藏的' + name + '吗？')) {
         $('.checkbox input[type="checkbox"]:checked').each(function() {
         $('.checkbox input[type="checkbox"]:checked').each(function() {
-            ids.push($(this).closest('.fav-row').data('id'));
+            var $favRow = $(this).closest('.fav-row'),
+                rdata = $favRow.data();
+
+            ids.push(rdata.id);
+
+            if (rdata.brandorshoptype) {
+                if (!group[rdata.brandorshoptype]) {
+                    group[rdata.brandorshoptype] = [];
+                }
+                group[rdata.brandorshoptype].push(rdata.id);
+            }
         });
         });
 
 
         if (ids.length === 0) {
         if (ids.length === 0) {
@@ -440,6 +448,10 @@ $('#me-del-checked').click(function() {
             url: '/home/favorite/cancel',
             url: '/home/favorite/cancel',
             data: {
             data: {
                 id: ids.join(','),
                 id: ids.join(','),
+                group: {
+                    bid: group.brand ? group.brand.join(',') : '',
+                    sid: group.shop ? group.shop.join(',') : ''
+                },
                 type: favType
                 type: favType
             }
             }
         }).then(function(data) {
         }).then(function(data) {

@@ -181,19 +181,27 @@ class FavoriteController extends WebAction
             $uid = $this->getUid(true);
             $uid = $this->getUid(true);
             $id = $this->get('id', '');
             $id = $this->get('id', '');
             $type = $this->get('type', '');
             $type = $this->get('type', '');
-            $shopid = $this->get('shopid', '');
-            $brandorshoptype = $this->get('brandorshoptype', '');
+            $group = $this->get('group', ''); // 组操作
 
 
             if (!$uid || !$id) {
             if (!$uid || !$id) {
                 $result = array('code' => 400, 'message' => '缺少参数', 'data' => '');
                 $result = array('code' => 400, 'message' => '缺少参数', 'data' => '');
                 break;
                 break;
             }
             }
-            if ($brandorshoptype && $shopid && $brandorshoptype === 'shop') {
-                $result = FavoriteData::cancelProductFav($uid, $shopid, false, true); //取消店铺收藏
-                break;
-            }
+
             switch (strval($type)) {
             switch (strval($type)) {
+                case 'shop':
+                    $result = FavoriteData::cancelProductFav($uid, $id, false, true); //取消店铺收藏
+                    break;
                 case 'brand':
                 case 'brand':
+                    if ($group) {
+                        if ($group['bid']) {
+                            $result = FavoriteData::cancelProductFav($uid, $group['bid'], true); //取消品牌收藏
+                        }
+                        if ($group['sid']) {
+                            $result = FavoriteData::cancelProductFav($uid, $group['sid'], false, true); //取消店铺收藏
+                        }
+                        break;
+                    }
                     $result = FavoriteData::cancelProductFav($uid, $id, true); //取消品牌收藏
                     $result = FavoriteData::cancelProductFav($uid, $id, true); //取消品牌收藏
                     break;
                     break;
                 case 'article':
                 case 'article':