From 04c7b0163caeae4ab1c5da62e301fa993101cfad Mon Sep 17 00:00:00 2001 From: 闫增涛 <1829501689@qq.com> Date: 星期一, 31 三月 2025 10:40:45 +0800 Subject: [PATCH] bug修改 --- pages/cart/index.js | 70 ++++++++++++++++++++++++++--------- 1 files changed, 52 insertions(+), 18 deletions(-) diff --git a/pages/cart/index.js b/pages/cart/index.js index 61b7040..4a4ceb1 100644 --- a/pages/cart/index.js +++ b/pages/cart/index.js @@ -1,5 +1,4 @@ const app = getApp(); -// import { getPublicImage } from '@/assets/js/middleGround/tool.js' import { loginInfo } from '../../assets/js/login'; @@ -34,12 +33,21 @@ wx.setNavigationBarTitle({ title: '璐墿杞�' }); - this.shoppingCartGet(); + // this.shoppingCartGet(); this.setData({ swipeOpened: true }) }, onShow() { + loginInfo(app, (data) => { + if (data) { + this.shoppingCartGet(); + } else { + wx.switchTab({ + url: '/pages/home/home', + }) + } + }) this.setData({ swipeOpened: false }) @@ -48,7 +56,6 @@ active: 3 }) } - this.shoppingCartGet(); this.setData({ totalPrice: 0.00, selectedCount: 0, @@ -102,7 +109,7 @@ searchList: [] }; app.MG.store.getShoppingCartProductList(query).then(res => { - console.log(res); + console.log(res.datas); this.setData({ totalSize: res.totalSize }) @@ -120,6 +127,27 @@ item.type = type; // 灏唗ype璁剧疆涓篿tem瀵硅薄鐨勫睘鎬э紝鑰屼笉鏄娇鐢╯etData item.name = item.linkCmsItems[0].name ? item.productMonWithLinkDto.product.name + ':' + item.linkCmsItems[0].name : item.productMonWithLinkDto.product.name item.saleMethod.price = this.numFormat(item.saleMethod.price) + if (item.productMonWithLinkDto.links[0].storeRefCode == 'jsek_digitalTextbooks') { + item.typeTxt = '鏁板瓧鏁欐潗' + item.productType = "鏁板瓧鏁欐潗" + } else if (item.productMonWithLinkDto.links[0].storeRefCode == 'jsek_digitalCourses') { + item.typeTxt = '鏁板瓧璇剧▼' + item.productType = "鏁板瓧璇剧▼" + } else { + item.typeTxt = '鐢靛瓙涔�' + item.productType = "鍥句功鏈嶅姟-鐢靛瓙涔�" + + if (item.saleMethod.type == 'createProductItemSaleMethod' || item.saleMethod.type == 'createProductFolderSaleMethod') { + if (item.linkCmsItems[0].refCode == 'questionBank') { + item.typeTxt = '浜戞祴璇�' + item.productType = '鍥句功鏈嶅姟-浜戞祴璇�' + } else { + item.typeTxt = '浜戝涔�' + item.productType = "鍥句功鏈嶅姟-浜戝涔�" + } + } + } + // }); this.setData({ @@ -196,12 +224,7 @@ }); }, - - - - goPaymentPage() { - // 棣栭〉娴嬭瘯鐧诲綍鍔熻兘锛屽悗缁敞閲� // 妫�鏌ョ櫥褰曠姸鎬� const token = wx.getStorageSync(app.config.tokenKey) @@ -308,17 +331,28 @@ 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; + const type = item.productMonWithLinkDto.links[0].storeRefCode + let url = '' + if (type == 'jsek_digitalCourses') { + // 璇剧▼ + url = '/pages/digitalCourses/digitalCoursesDetails/index?id=' + item.productMonWithLinkDto.product.id + '&path=' + '' + } else if (type == 'jsek_digitalTextbooks') { + // 鏁板瓧鏁欐潗 + url = '/pages/digitalTextbooks/digitalTextbooksDetails/index?id=' + item.productMonWithLinkDto.product.id + } else { + 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; + } + url = '/packageBookService/pages/bookServices/detail/index?id=' + bookId + '&name=' + item.productMonWithLinkDto.product.name } wx.navigateTo({ - url: '/packageBookService/pages/bookServices/detail/index?id=' + bookId + '&name=' + item.productMonWithLinkDto.product.name + url }) } }); \ No newline at end of file -- Gitblit v1.9.1