From e60946e95b6e624d3ed5879bda9beea85b87d4bc Mon Sep 17 00:00:00 2001
From: linzj <208781239@qq.com>
Date: Tue, 20 Apr 2021 17:18:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=97=AE=E9=A2=98=E4=B8=8E=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mall4uni/pages/basket/basket.vue | 69 +++++++++++++++++---------------
 1 file changed, 36 insertions(+), 33 deletions(-)

diff --git a/mall4uni/pages/basket/basket.vue b/mall4uni/pages/basket/basket.vue
index 713405a..a4776e0 100644
--- a/mall4uni/pages/basket/basket.vue
+++ b/mall4uni/pages/basket/basket.vue
@@ -129,7 +129,7 @@ export default {
       finalMoney: 0,
       totalMoney: 0,
       subtractMoney: 0,
-      allChecked: true
+      allChecked: false
     };
   },
 
@@ -150,40 +150,43 @@ export default {
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    uni.showLoading(); //加载购物车
-
-    var params = {
-      url: "/p/shopCart/info",
-      method: "POST",
-      data: {},
-      callBack: res => {
-        if (res.length > 0) {
-          // 默认全选
-          var shopCartItemDiscounts = res[0].shopCartItemDiscounts;
-          shopCartItemDiscounts.forEach(shopCartItemDiscount => {
-            shopCartItemDiscount.shopCartItems.forEach(shopCartItem => {
-              shopCartItem.checked = true;
-            });
-          });
-          this.setData({
-            shopCartItemDiscounts: shopCartItemDiscounts,
-            allChecked: true
-          });
-        } else {
-          this.setData({
-            shopCartItemDiscounts: []
-          });
-        }
-
-        this.calTotalPrice(); //计算总价
-
-        uni.hideLoading();
-      }
-    };
-    http.request(params);
+    this.loadBasketData();
     http.getCartCount(); //重新计算购物车总数量
   },
   methods: {
+    loadBasketData(){
+			uni.showLoading(); //加载购物车
+			
+			var params = {
+			  url: "/p/shopCart/info",
+			  method: "POST",
+			  data: {},
+			  callBack: res => {
+			    if (res.length > 0) {
+			      // 默认不选中
+			      var shopCartItemDiscounts = res[0].shopCartItemDiscounts;
+			      shopCartItemDiscounts.forEach(shopCartItemDiscount => {
+			        shopCartItemDiscount.shopCartItems.forEach(shopCartItem => {
+			          shopCartItem.checked = false;
+			        });
+			      });
+			      this.setData({
+			        shopCartItemDiscounts: shopCartItemDiscounts,
+			        allChecked: false
+			      });
+			    } else {
+			      this.setData({
+			        shopCartItemDiscounts: []
+			      });
+			    }
+			
+			    this.calTotalPrice(); //计算总价
+			
+			    uni.hideLoading();
+			  }
+			};
+			http.request(params);
+		},
     /**
      * 去结算
      */
@@ -416,7 +419,7 @@ export default {
                 data: basketIds,
                 callBack: function (res) {
                   uni.hideLoading();
-                  ths.onShow();
+                  ths.loadBasketData();
                 }
               };
               http.request(params);