From 2115fa126543700a7a15235bf3e5fceeb7e39e00 Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期三, 18 十二月 2024 10:57:22 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packageBookService/pages/bookServices/detail/index.js | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 5d71e49..01c88af 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -436,6 +436,7 @@
};
app.MG.store.getProductDetail(query).then(async (res) => {
this.getResourceCode(id, res.datas.rootCmsItemId)
+ console.log(res.datas, "res.datas")
this.setData({
bookDetail: res.datas,
buyIdList: res.datas.purchasedSaleMethodIdList,
@@ -507,7 +508,7 @@
}
}
this.setData({
- "bookDetail.publicationDate": moment(this.data.bookDetail.publicationDate).format("YYYY骞碝M鏈�"),
+ "bookDetail.publicationDate": this.data.bookDetail.publicationDate ? moment(this.data.bookDetail.publicationDate).format("YYYY骞碝M鏈�") : '',
"bookDetail.price": this.numFormat(this.data.bookDetail.price),
"bookDetail.oldPrice": this.numFormat(this.data.bookDetail.oldPrice),
"bookDetail.paperPrice": this.numFormat(
@@ -1165,16 +1166,15 @@
if (isTSFW.length > 0) {
data = res.datas.cmsDatas[0].datas.filter((item) => item.type == 'questionBankFolder' && (item.childrenFolderCount > 0 || item.childrenCount > 0) && (item.name !== '濉┖棰�' &&
- item.name !== '鍒ゆ柇棰�' &&
- item.name !== '澶氶�夐' &&
- item.name !== '绠�绛旈')) &&
- item.refCode != 'jsek_interaction'
+ item.name !== '鍒ゆ柇棰�' &&
+ item.name !== '澶氶�夐' &&
+ item.name !== '绠�绛旈') && item.name !== '鍗曢�夐')
that.setData({
jslx: false,
});
} else {
- data = res.datas.cmsDatas[0].datas.filter((item) => item.type == 'questionBankFolder' &&
- item.refCode != 'jsek_interaction')
+ data = res.datas.cmsDatas[0].datas.filter((item) => item.type == 'questionBankFolder' && item.refCode != 'jsek_interaction')
+ // && item.refCode != 'jsek_interaction'
that.setData({
jslx: true,
});
--
Gitblit v1.9.1