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 |   44 +++++++++++++++++++++++++++++---------------
 1 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/pages/cart/index.js b/pages/cart/index.js
index aed9193..9f187c7 100644
--- a/pages/cart/index.js
+++ b/pages/cart/index.js
@@ -11,6 +11,8 @@
 
 Page({
   data: {
+    loading: true,
+    hidden: true,
     swipeOpened: false,
     onDisabled: false,
     imgUrl: [],
@@ -32,7 +34,7 @@
       title: '璐墿杞�'
     });
     this.shoppingCartGet();
-    console.log(this.data.shoppingCartData.length, 'this.data.shoppingCartData.length');
+
     this.setData({
       swipeOpened: true
     })
@@ -81,13 +83,11 @@
       searchList: []
     };
     app.MG.store.getShoppingCartProductList(query).then(res => {
-      console.log(res, 'res');
+
       this.setData({
         totalSize: res.totalSize
       })
       res.datas.forEach(item => {
-        console.log(res);
-
         this.setData({
           bookId: res.id,
           bookName: res.name
@@ -98,24 +98,29 @@
         // })
         const type = item.saleMethod.type == 'createProductItemSaleMethod' ? 'item' : 'product';
         item.type = type; // 灏唗ype璁剧疆涓篿tem瀵硅薄鐨勫睘鎬э紝鑰屼笉鏄娇鐢╯etData
-        console.log(item.linkCmsItems[0].name);
+
         item.name = item.linkCmsItems[0].name ? item.productMonWithLinkDto.product.name + ':' + item.linkCmsItems[0].name : item.productMonWithLinkDto.product.name
       });
 
       this.setData({
         shoppingCartData: res.datas
       });
-      console.log(this.data.shoppingCartData, 'shoppingCartData');
       if (this.data.shoppingCartData.length === 0) {
         this.setData({
           onDisabled: true
         })
       } else {
-        console.log(2222);
         this.setData({
           onDisabled: false
         })
       }
+      setTimeout(() => {
+        this.setData({
+          loading: false,
+          hidden: false,
+        })
+      }, 600)
+
     });
     wx.stopPullDownRefresh()
 
@@ -192,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
@@ -221,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
           });
@@ -268,7 +276,6 @@
   },
   // 涓嬫媺鍑芥暟
   onPullDownRefresh() {
-
     this.setData({
       start: 1,
       checkAll: false,
@@ -278,13 +285,20 @@
     console.log(978);
     this.shoppingCartGet()
   },
-  onBook(e) {
+  async onBook(e) {
     const item = e.currentTarget.dataset.item
     console.log(item);
-    console.log(item.productMonWithLinkDto.product.id);
-    console.log(item.productMonWithLinkDto.product.name);
-    // wx.navigateTo({
-    //   url: '/packageBookService/pages/bookServices/detail/index?id=' + item.productMonWithLinkDto.product.id + '&name=' + item.productMonWithLinkDto.product.name
-    // })
+    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