From f86bd75868eb9b0e81d5cb43d6e76c08a0da3083 Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期一, 15 四月 2024 16:55:49 +0800
Subject: [PATCH] 音频bug3

---
 pages/cart/index.js |   72 ++++++++++++++++++++++++++---------
 1 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/pages/cart/index.js b/pages/cart/index.js
index 672eecc..9f187c7 100644
--- a/pages/cart/index.js
+++ b/pages/cart/index.js
@@ -11,6 +11,9 @@
 
 Page({
   data: {
+    loading: true,
+    hidden: true,
+    swipeOpened: false,
     onDisabled: false,
     imgUrl: [],
     shoppingCartData: [],
@@ -22,18 +25,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
@@ -45,9 +54,9 @@
       selectedCount: 0,
       checkAll: false,
     })
-
-
   },
+
+
   onDelete(e) {
     const item = e.currentTarget.dataset.item;
     app.MG.store.delShoppingCart({
@@ -58,6 +67,11 @@
         title: '鍒犻櫎鍥句功鎴愬姛',
         icon: 'none'
       });
+      this.setData({
+        totalPrice: 0.00,
+        selectedCount: 0,
+        checkAll: false,
+      })
     });
   },
 
@@ -73,37 +87,40 @@
       this.setData({
         totalSize: res.totalSize
       })
-
       res.datas.forEach(item => {
-        console.log(item, 'item456');
+        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'
         // })
         const type = item.saleMethod.type == 'createProductItemSaleMethod' ? 'item' : 'product';
         item.type = type; // 灏唗ype璁剧疆涓篿tem瀵硅薄鐨勫睘鎬э紝鑰屼笉鏄娇鐢╯etData
 
-        // debugger
-
+        item.name = item.linkCmsItems[0].name ? item.productMonWithLinkDto.product.name + ':' + item.linkCmsItems[0].name : item.productMonWithLinkDto.product.name
       });
 
       this.setData({
         shoppingCartData: res.datas
       });
-
-
       if (this.data.shoppingCartData.length === 0) {
-        console.log(11111);
         this.setData({
           onDisabled: true
         })
       } else {
-        console.log(2222);
         this.setData({
           onDisabled: false
         })
       }
+      setTimeout(() => {
+        this.setData({
+          loading: false,
+          hidden: false,
+        })
+      }, 600)
+
     });
     wx.stopPullDownRefresh()
 
@@ -180,7 +197,9 @@
             let data = {
               linkIds: selectedIds
             }
+            // '&onNorderSaleMethod=' + 
             app.MG.store.shoppingCartCreateOrder(data).then(res => {
+
               const url = '/pages/cart/paymentPage/index?orderNumber=' + res.orderNumber
               wx.navigateTo({
                 url
@@ -209,7 +228,8 @@
           linkIds: selectedIds
         }
         app.MG.store.shoppingCartCreateOrder(data).then(res => {
-          const url = '/pages/cart/paymentPage/index?orderNumber=' + res.orderNumber
+          console.log(res.saleMethodLinks[0].orderSaleMethod.id, 'ressss798');
+          const url = '/pages/cart/paymentPage/index?orderNumber=' + res.orderNumber + '&onNorderSaleMethod=' + res.saleMethodLinks[0].orderSaleMethod.id
           wx.navigateTo({
             url
           });
@@ -233,8 +253,9 @@
       url: '/pages/testLogin/index'
     });
   },
-  //瑙﹀簳鍑芥暟
-  onReachBottom() {
+
+
+  onScrollToLower() {
     if (this.data.shoppingCartData.length < this.data.totalSize) {
       this.setData({
         isMore: true,
@@ -251,12 +272,10 @@
         })
         console.log('300');
       }, 300)
-
     }
   },
   // 涓嬫媺鍑芥暟
   onPullDownRefresh() {
-
     this.setData({
       start: 1,
       checkAll: false,
@@ -266,5 +285,20 @@
     console.log(978);
     this.shoppingCartGet()
   },
-
+  async onBook(e) {
+    const item = e.currentTarget.dataset.item
+    console.log(item);
+    let parentData = null;
+    parentData = await app.MG.store.getProductBySaleMethod({
+      'saleMethodId': item.saleMethod.id
+    })
+    console.log(parentData)
+    let bookId = item.productMonWithLinkDto.product.id;
+    if (parentData.parentProduct.length > 0) {
+      bookId = parentData.parentProduct[parentData.parentProduct.length - 1].id;
+    }
+    wx.navigateTo({
+      url: '/packageBookService/pages/bookServices/detail/index?id=' + bookId + '&name=' + item.productMonWithLinkDto.product.name
+    })
+  }
 });
\ No newline at end of file

--
Gitblit v1.9.1