From de70d8479531b491bbdc20f5f259fe1c7df70379 Mon Sep 17 00:00:00 2001
From: linzj <208781239@qq.com>
Date: Tue, 20 Apr 2021 17:25:50 +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

---
 mall4m/pages/basket/basket.js | 71 ++++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/mall4m/pages/basket/basket.js b/mall4m/pages/basket/basket.js
index 62e4c2c..bcf25f4 100644
--- a/mall4m/pages/basket/basket.js
+++ b/mall4m/pages/basket/basket.js
@@ -14,7 +14,7 @@ Page({
     finalMoney: 0,
     totalMoney: 0,
     subtractMoney: 0,
-    allChecked: true
+    allChecked: false
   },
 
   /**
@@ -35,41 +35,42 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    wx.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();//计算总价
-        wx.hideLoading();
-      }
-    };
-    http.request(params);
-
+	this.loadBasketData();
     http.getCartCount();//重新计算购物车总数量
-    
   },
+  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);
+		},
 
   /**
    * 去结算
@@ -290,7 +291,7 @@ Page({
               data: basketIds,
               callBack: function (res) {
                 wx.hideLoading();
-                ths.onShow();
+                ths.loadBasketData();
               }
             };
             http.request(params);