From 78068d49c20a8b90db902d955f558af507eb8b96 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 11 四月 2024 16:06:12 +0800
Subject: [PATCH] 各页面添加骨架屏

---
 pages/cart/index.js |   33 ++++++++++++++++++++-------------
 1 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/pages/cart/index.js b/pages/cart/index.js
index 9cfaaba..c31356e 100644
--- a/pages/cart/index.js
+++ b/pages/cart/index.js
@@ -32,7 +32,7 @@
       title: '璐墿杞�'
     });
     this.shoppingCartGet();
-    console.log(this.data.shoppingCartData.length, 'this.data.shoppingCartData.length');
+
     this.setData({
       swipeOpened: true
     })
@@ -81,13 +81,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,20 +96,18 @@
         // })
         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
         })
@@ -192,7 +188,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 +219,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
           });
@@ -278,12 +277,20 @@
     console.log(978);
     this.shoppingCartGet()
   },
-  onBook(e) {
-    // console.log(e);
+  async onBook(e) {
     const item = e.currentTarget.dataset.item
     console.log(item);
-    // wx.navigateTo({
-    //   url: '/packageBookService/pages/bookServices/detail/index?id=' + item.id + '&name=' + item.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