Merge branch 'dev' of http://git.izouma.com/xiongzhu/raex_front into dev

src/views/user/ShoppingCart.vue

@@ -297,11 +297,21 @@ export default {
                             cancelButtonColor: '#626366'
                         })
                             .then(() => {
+                                this.collectionListSelected.forEach(item => {
+                                    if (item.enabled == true) {
+                                        item.check = false;
+                                        this.checkAllStatus = false;
+                                    }
+                                });
+                                this.collectionListSelected = this.collectionListSelected.filter(
+                                    item => item.enabled == false
+                                );
+                                this.totalSettlement = this.collectionListSelected.length;
+                                this.price = 0;
                                 this.del();
                             })
                             .catch(() => {});
                     } else {
-                        console.log('sdhdgdfgd');
                         let cartIds = [];
                         this.collectionListSelected.forEach(item => {
                             cartIds.push(Number(item.collectionId));