From cb15c57d0ff984f5a100cf25d560fb0a69c00984 Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期二, 16 四月 2024 18:21:05 +0800
Subject: [PATCH] 音频bug4

---
 pages/cart/index.js |  136 ++++++++++++++++++++++++++++++++++-----------
 1 files changed, 102 insertions(+), 34 deletions(-)

diff --git a/pages/cart/index.js b/pages/cart/index.js
index 546e1c1..9f187c7 100644
--- a/pages/cart/index.js
+++ b/pages/cart/index.js
@@ -1,11 +1,19 @@
 const app = getApp();
 // import { getPublicImage } from '@/assets/js/middleGround/tool.js'
-import { getPublicImage } from '../../assets/js/middleGround/tool';
+import {
+  loginInfo
+} from '../../assets/js/login';
+import {
+  getPublicImage
+} from '../../assets/js/middleGround/tool';
 import Toast from 'tdesign-miniprogram/toast/index';
 
-import { loginInfo } from '../../assets/js/login';
+
 Page({
   data: {
+    loading: true,
+    hidden: true,
+    swipeOpened: false,
     onDisabled: false,
     imgUrl: [],
     shoppingCartData: [],
@@ -17,35 +25,53 @@
     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
       })
     }
     this.shoppingCartGet();
-    this.setData({ totalPrice: 0.00, selectedCount: 0, checkAll: false, })
-
-
+    this.setData({
+      totalPrice: 0.00,
+      selectedCount: 0,
+      checkAll: false,
+    })
   },
+
+
   onDelete(e) {
     const item = e.currentTarget.dataset.item;
     app.MG.store.delShoppingCart({
       ids: [item.id]
     }).then(res => {
       this.shoppingCartGet();
-      wx.showToast({ title: '鍒犻櫎鍥句功鎴愬姛', icon: 'none' });
+      wx.showToast({
+        title: '鍒犻櫎鍥句功鎴愬姛',
+        icon: 'none'
+      });
+      this.setData({
+        totalPrice: 0.00,
+        selectedCount: 0,
+        checkAll: false,
+      })
     });
   },
 
@@ -61,33 +87,40 @@
       this.setData({
         totalSize: res.totalSize
       })
-
       res.datas.forEach(item => {
-        // console.log(item, 'item456');
-        item.imgUrl = getPublicImage(item.productMonWithLinkDto.product.icon, '', '160');
-
         this.setData({
-          type: item.saleMethod.type == 'createProductItemSaleMethod' ? 'item' : 'product'
+          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
 
+        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()
 
@@ -108,7 +141,9 @@
   },
 
   HandelItemChange(e) {
-    const { item } = e.target.dataset;
+    const {
+      item
+    } = e.target.dataset;
     const items = this.data.shoppingCartData
     items.map(eitem => {
       if (eitem.id == item.id) {
@@ -147,7 +182,6 @@
 
   goPaymentPage() {
 
-
     // 棣栭〉娴嬭瘯鐧诲綍鍔熻兘锛屽悗缁敞閲�
     // 妫�鏌ョ櫥褰曠姸鎬�
     const token = wx.getStorageSync(app.config.tokenKey)
@@ -155,8 +189,6 @@
       loginInfo(app, (data) => {
         // 濡傛灉涓嶆槸绗竴娆$櫥褰曪紝浼氭墽琛屽洖璋�
         if (data) {
-
-
           const selectedItems = this.data.shoppingCartData.filter(item => item.checked);
           // console.log(selectedItems, 789);
           const selectedIds = selectedItems.map(item => item.id);
@@ -165,9 +197,8 @@
             let data = {
               linkIds: selectedIds
             }
+            // '&onNorderSaleMethod=' + 
             app.MG.store.shoppingCartCreateOrder(data).then(res => {
-              // console.log(res, 456);
-
 
               const url = '/pages/cart/paymentPage/index?orderNumber=' + res.orderNumber
               wx.navigateTo({
@@ -188,11 +219,31 @@
         }
       })
     } else {
-      // 濡傛灉鏄涓�娆$櫥褰曪紝浼氳烦杞嚦缁戝畾鐢ㄦ埛淇℃伅椤甸潰锛屽~鍐欏畬鐢ㄦ埛淇℃伅鍚庤繘琛岀櫥褰曞苟鍌ㄥ瓨token鍜岀敤鎴蜂俊鎭紝缁撴潫鍚庤烦杞洖褰撳墠椤甸潰锛堟惡甯﹂〉闈㈠弬鏁帮級
+      const selectedItems = this.data.shoppingCartData.filter(item => item.checked);
+      // console.log(selectedItems, 789);
+      const selectedIds = selectedItems.map(item => item.id);
+      console.log('閫変腑鐨勫晢鍝� id:', selectedIds);
+      if (selectedIds.length) {
+        let data = {
+          linkIds: selectedIds
+        }
+        app.MG.store.shoppingCartCreateOrder(data).then(res => {
+          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
+          });
+        })
+      } else {
+        Toast({
+          context: this,
+          selector: '#t-toast',
+          message: '璇烽�夋嫨鍟嗗搧',
+          theme: 'warning',
+          direction: 'column',
+        });
+      }
     }
-
-
-
 
 
 
@@ -202,8 +253,9 @@
       url: '/pages/testLogin/index'
     });
   },
-  //瑙﹀簳鍑芥暟
-  onReachBottom() {
+
+
+  onScrollToLower() {
     if (this.data.shoppingCartData.length < this.data.totalSize) {
       this.setData({
         isMore: true,
@@ -220,17 +272,33 @@
         })
         console.log('300');
       }, 300)
-
     }
   },
   // 涓嬫媺鍑芥暟
   onPullDownRefresh() {
-
     this.setData({
-      start: 1
+      start: 1,
+      checkAll: false,
+      selectedCount: 0,
+      totalPrice: 0.00,
     })
     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