From 3c042e234dcb9f154d04b7f9c8335d252e271127 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Wed, 28 Sep 2022 11:43:43 +0800
Subject: [PATCH] 购物车失效的优化

---
 pages/cart/cart/cart.js   | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------
 pages/cart/cart/cart.wxml |   6 +++---
 pages/cart/cart/cart.wxss |   3 +++
 3 files changed, 81 insertions(+), 49 deletions(-)

diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index b7504ec..f23d607 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -49,9 +49,9 @@ Page({
 
     },
     onLoad: function () {
+
         var a = this,
             ee = a;
-      
 
         wx.setNavigationBarTitle({
             title: "购物车",
@@ -268,53 +268,67 @@ Page({
     },
     //清空失效宝贝
     delInva(obj=null){
-      let ainvalid='';
-      let binvalid='';
-      var user_id = getApp().globalData.user_id;
-      var th = this;
-      let ab = 0; //选中
-      let abc = 0; //
-      let arr = obj.id ? [obj] : this.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;
-          }
-      });
+
+        var th = this;
+        wx.showModal({
+            title: '提示',
+            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);
+                            }
+                        });
+                    }
+
+                }
+            }
+        })
+
 
 
-      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);
-              }
-          });
-      }
     },
 
     //---------点击收藏------------
@@ -3242,6 +3256,21 @@ Page({
             });
         }
 
+        setTimeout(()=>{
+            if ((!th.data.requestData|| th.data.requestData.length==0) && (!th.data.service_data|| th.data.service_data.length==0)){
+
+                   console.log('---1111---bb');
+                    var goods_list = th.selectComponent("#goods_list"); //组件的id
+                    if (goods_list) {
+                        goods_list.init();
+                        goods_list.get_list();
+                    }
+
+            }
+
+        },1200)
+
+
     },
     //跳到首页
     goto: function (e) {
diff --git a/pages/cart/cart/cart.wxml b/pages/cart/cart/cart.wxml
index b9dadfd..82571d8 100644
--- a/pages/cart/cart/cart.wxml
+++ b/pages/cart/cart/cart.wxml
@@ -23,7 +23,7 @@
 </block>
 
 
-<view class="container" wx:if="{{(requestData && requestData.length>0) || (service_data && service_data.length>0) }}">
+<view class="container {{(requestData && requestData.length>0) || (service_data && service_data.length>0)?'margin_b':''}} " wx:if="{{(requestData && requestData.length>0) || (service_data && service_data.length>0) || invalidList && invalidList.length  }}">
   <!-- 购物车商品框架 -->
   <view class="login-in">
     <!-- 编辑 -->
@@ -276,7 +276,7 @@
     </block>    
   
   </view>
-  <view class="pay-for flex-vertical-between">
+  <view class="pay-for flex-vertical-between"  wx:if="{{(requestData && requestData.length>0) || (service_data && service_data.length>0)}}" >
     <view class="allradio flex-vertical-between">
       <view class="flex-vertical mlr" bindtap="checkAll">
         <!--<radio class="order-raido" color="red" checked="{{checkAllToggle}}"></radio>-->
@@ -306,7 +306,7 @@
 </view>
 
 <!-- 购物车为空 -->
-<view class="empty_order" wx:if="{{(!requestData|| requestData.length==0) && (!service_data|| service_data.length==0) && is_load}}">
+<view class="empty_order" wx:if="{{(!requestData|| requestData.length==0) && (!service_data|| service_data.length==0) &&  (!invalidList || invalidList.length==0)  && is_load}}">
   <view class="flex-level">
     <image src="{{iurl}}miniapp/images/stores/nocart.png"></image>
   </view>
diff --git a/pages/cart/cart/cart.wxss b/pages/cart/cart/cart.wxss
index 7a4bfb3..699321e 100644
--- a/pages/cart/cart/cart.wxss
+++ b/pages/cart/cart/cart.wxss
@@ -30,6 +30,9 @@ page {
   align-items: center;
   justify-content: center;
   background-color: rgb(255, 255, 255);
+  /*margin-bottom: 160rpx;*/
+}
+.container.margin_b{
   margin-bottom: 160rpx;
 }
 
--
libgit2 0.21.4