From 5e649be819c7297c79c21c6dc120b4b6b362db9e Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 03 四月 2024 17:23:39 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master

---
 pages/cart/index.js |   30 +++++++++++++++++++++++++-----
 1 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/pages/cart/index.js b/pages/cart/index.js
index 175bdd6..9cfaaba 100644
--- a/pages/cart/index.js
+++ b/pages/cart/index.js
@@ -11,6 +11,7 @@
 
 Page({
   data: {
+    swipeOpened: false,
     onDisabled: false,
     imgUrl: [],
     shoppingCartData: [],
@@ -22,18 +23,24 @@
     start: 1,
     totalSize: '',
     isMore: null,
+    bookId: '',
+    bookName: ''
   },
 
   onLoad(options) {
-
     wx.setNavigationBarTitle({
       title: '璐墿杞�'
     });
     this.shoppingCartGet();
     console.log(this.data.shoppingCartData.length, 'this.data.shoppingCartData.length');
-
+    this.setData({
+      swipeOpened: true
+    })
   },
   onShow() {
+    this.setData({
+      swipeOpened: false
+    })
     if (typeof this.getTabBar === 'function' && this.getTabBar()) {
       this.getTabBar().setData({
         active: 3
@@ -46,6 +53,8 @@
       checkAll: false,
     })
   },
+
+
   onDelete(e) {
     const item = e.currentTarget.dataset.item;
     app.MG.store.delShoppingCart({
@@ -76,8 +85,13 @@
       this.setData({
         totalSize: res.totalSize
       })
-
       res.datas.forEach(item => {
+        console.log(res);
+
+        this.setData({
+          bookId: res.id,
+          bookName: res.name
+        })
         item.imgUrl = getPublicImage(item.productMonWithLinkDto.product.icon, '', '160');
         // this.setData({
         //   type: item.saleMethod.type == 'createProductItemSaleMethod' ? 'item' : 'product'
@@ -92,7 +106,6 @@
         shoppingCartData: res.datas
       });
       console.log(this.data.shoppingCartData, 'shoppingCartData');
-
       if (this.data.shoppingCartData.length === 0) {
         this.setData({
           onDisabled: true
@@ -265,5 +278,12 @@
     console.log(978);
     this.shoppingCartGet()
   },
-
+  onBook(e) {
+    // console.log(e);
+    const item = e.currentTarget.dataset.item
+    console.log(item);
+    // wx.navigateTo({
+    //   url: '/packageBookService/pages/bookServices/detail/index?id=' + item.id + '&name=' + item.name
+    // })
+  }
 });
\ No newline at end of file

--
Gitblit v1.9.1