From 32986b54a0e2661f7ad6ed79f3ef12c4289eace9 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期五, 20 十二月 2024 17:52:52 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
pages/cart/index.js | 81 +++++++++++++++++++++++++++++++++-------
1 files changed, 66 insertions(+), 15 deletions(-)
diff --git a/pages/cart/index.js b/pages/cart/index.js
index 9f187c7..b36954d 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';
@@ -11,6 +10,7 @@
Page({
data: {
+ price: '',
loading: true,
hidden: true,
swipeOpened: false,
@@ -34,7 +34,6 @@
title: '璐墿杞�'
});
this.shoppingCartGet();
-
this.setData({
swipeOpened: true
})
@@ -56,7 +55,26 @@
})
},
-
+ // 閲戦鏄剧ず.00鏍煎紡
+ numFormat(value) {
+ if (!value) return "0.00";
+ value = Number(value).toFixed(2);
+ var intPart = Math.trunc(value); // 鑾峰彇鏁存暟閮ㄥ垎
+ var intPartFormat = intPart
+ .toString()
+ .replace(/(\d)(?=(?:\d{3})+$)/g, "$1,"); // 灏嗘暣鏁伴儴鍒嗛�笁涓�鏂�
+ var floatPart = ".00"; // 棰勫畾涔夊皬鏁伴儴鍒�
+ var value2Array = value.split(".");
+ // =2琛ㄧず鏁版嵁鏈夊皬鏁颁綅
+ if (value2Array.length === 2) {
+ floatPart = value2Array[1].toString(); // 鎷垮埌灏忔暟閮ㄥ垎
+ if (floatPart.length === 1) {
+ return `${intPartFormat}.${floatPart}0`;
+ }
+ return `${intPartFormat}.${floatPart}`;
+ }
+ return intPartFormat + floatPart;
+ },
onDelete(e) {
const item = e.currentTarget.dataset.item;
app.MG.store.delShoppingCart({
@@ -83,14 +101,15 @@
searchList: []
};
app.MG.store.getShoppingCartProductList(query).then(res => {
-
+ console.log(res.datas);
this.setData({
totalSize: res.totalSize
})
res.datas.forEach(item => {
this.setData({
bookId: res.id,
- bookName: res.name
+ bookName: res.name,
+ price: item.saleMethod.price.toFixed(2),
})
item.imgUrl = getPublicImage(item.productMonWithLinkDto.product.icon, '', '160');
// this.setData({
@@ -98,8 +117,29 @@
// })
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
+ 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.type = '浜戞祴璇�'
+ item.productType = '鍥句功鏈嶅姟-浜戞祴璇�'
+ } else {
+ item.typeTxt = '浜戝涔�'
+ item.productType = "鍥句功鏈嶅姟-浜戝涔�"
+ }
+ }
+ }
+ //
});
this.setData({
@@ -288,17 +328,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