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 | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/pages/cart/index.js b/pages/cart/index.js
index c873a64..b36954d 100644
--- a/pages/cart/index.js
+++ b/pages/cart/index.js
@@ -101,7 +101,7 @@
searchList: []
};
app.MG.store.getShoppingCartProductList(query).then(res => {
- console.log(res);
+ console.log(res.datas);
this.setData({
totalSize: res.totalSize
})
@@ -119,8 +119,6 @@
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 = "鏁板瓧鏁欐潗"
@@ -131,9 +129,14 @@
item.typeTxt = '鐢靛瓙涔�'
item.productType = "鍥句功鏈嶅姟-鐢靛瓙涔�"
- if (item.saleMethod.type == 'createProductItemSaleMethod') {
- 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 = "鍥句功鏈嶅姟-浜戝涔�"
+ }
}
}
//
--
Gitblit v1.9.1