Merge branch 'test' into 'qa'

Test See merge request !1128

Merge branch 'test' into 'qa'
Test See merge request !1128
后端研发-苏明海
2 parents 33d5eb9b eb6f4d8f
Showing 2 changed files with 53 additions and 50 deletions
pages/cart/cart/cart.js
pages/cart/cart/cart.wxml
@@ -267,7 +267,7 @@ Page({
     },
     //清空失效宝贝
-    delInva(obj=null){
+    delInva_all(obj=null){
         var th = this;
         wx.showModal({
@@ -275,62 +275,65 @@ Page({
             content: '确认要清空全部失效商品吗?',
             success(res) {
                 if (res.confirm) {
-                    let ainvalid='';
-                    let binvalid='';
-                    var user_id = getApp().globalData.user_id;
-
-                    let ab = 0; //选中
-                    let abc = 0; //
-                    let arr = obj.id ? [obj] : th.data.invalidList
-                    console.log('失效-----')
-                    console.log(arr);
-                    arr.map(item=>{
-                        if (item.classType ==0 ) {
-                            ainvalid+=item.id + ',';
-                            ab = 1;
-                        }
-                        if (item.classType ==1 ) {
-                            binvalid+=item.id + ',';
-                            abc = 1;
-                        }
-                    });
-
-
-                    if (ab == 0 && abc == 0 ) {
-                        t.my_warnning('没有需要清空的失效宝贝', 0, th);
-                        return false;
-                    }
-                    if (ab) {
-                        ainvalid = ainvalid.substring(0, ainvalid.length - 1);
-                        //要删除购物车中的商品
-                        var url = '/api/weshop/cart/delIds/' + oo.stoid + '/' + user_id + '/' + ainvalid;
-                        getApp().request.delete(url, {
-                            success: function (t) {
-                                th.getCardList();
-                                getApp().requestCardNum(th);
-                            }
-                        });
-                    }
-                    if (abc) {
-                        binvalid = binvalid.substring(0, binvalid.length - 1);
-                        //要删除购物车中的商品
-                        var url = '/api/weshop/cartService/delIds/' + oo.stoid + '/' + user_id + '/' + binvalid;
-                        getApp().request.delete(url, {
-                            success: function (t) {
-                                th.getCardList();
-                                getApp().requestCardNum(th);
-                            }
-                        });
-                    }
-
+                    th.delInva(obj);
                 }
             }
         })
+    },
+
+
+    delInva(obj){
+        var th=this;
+        let ainvalid='';
+        let binvalid='';
+        var user_id = getApp().globalData.user_id;
+        let ab = 0; //选中
+        let abc = 0; //
+        let arr = obj.id ? [obj] : th.data.invalidList
+        console.log('失效-----')
+        console.log(arr);
+        arr.map(item=>{
+            if (item.classType ==0 ) {
+                ainvalid+=item.id + ',';
+                ab = 1;
+            }
+            if (item.classType ==1 ) {
+                binvalid+=item.id + ',';
+                abc = 1;
+            }
+        });
+        if (ab == 0 && abc == 0 ) {
+            t.my_warnning('没有需要清空的失效宝贝', 0, th);
+            return false;
+        }
+        if (ab) {
+            ainvalid = ainvalid.substring(0, ainvalid.length - 1);
+            //要删除购物车中的商品
+            var url = '/api/weshop/cart/delIds/' + oo.stoid + '/' + user_id + '/' + ainvalid;
+            getApp().request.delete(url, {
+                success: function (t) {
+                    th.getCardList();
+                    getApp().requestCardNum(th);
+                }
+            });
+        }
+        if (abc) {
+            binvalid = binvalid.substring(0, binvalid.length - 1);
+            //要删除购物车中的商品
+            var url = '/api/weshop/cartService/delIds/' + oo.stoid + '/' + user_id + '/' + binvalid;
+            getApp().request.delete(url, {
+                success: function (t) {
+                    th.getCardList();
+                    getApp().requestCardNum(th);
+                }
+            });
+        }
     },
+
     //---------点击收藏------------
     collectGoods: async function () {
@@ -246,7 +246,7 @@
           <view class="shmd fs30" >失效宝贝{{invalidList.length}}件</view>
           <view class="flex fs26 ctb">
             <view bindtap="collectGoods">移到收藏夹</view>
-            <view class="mgl20" bindtap="delInva">清空失效宝贝</view>
+            <view class="mgl20" bindtap="delInva_all">清空失效宝贝</view>
           </view>
         </view>
         <view class="order-item" style="border: none;" data-item="{{idx}}" wx:for="{{invalidList}}" wx:for-item="items" wx:for-index="idx" wx:key="{{index}}">