From e40fa3df043df12622fd0b654cd3ea9c147b96d7 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期三, 16 七月 2025 23:29:10 +0800
Subject: [PATCH] 增加价格为0的判断，留下逻辑遗漏点
---
packageDomain/pages/resourceDetails/document/index.js | 4 +++-
packageDomain/pages/resourceDetails/myVideo/index.js | 17 +++++++++--------
packageDomain/pages/resourceDetails/myAudio/index.js | 18 ++++++++++--------
3 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/packageDomain/pages/resourceDetails/document/index.js b/packageDomain/pages/resourceDetails/document/index.js
index ae51bb6..c5247eb 100644
--- a/packageDomain/pages/resourceDetails/document/index.js
+++ b/packageDomain/pages/resourceDetails/document/index.js
@@ -86,6 +86,7 @@
applyState: options.applyState,
deadline: options.deadline,
formPath: options.formPath,
+ source: options.source,
})
if (options.formPath == 'jsek_cloudLearning') {
this.setData({
@@ -284,12 +285,13 @@
if (data) return data;
})
let isBuy = 1;
+ // ###杩欓噷鐨勯�昏緫鏄粠鏈�瀛愬眰寮�濮嬪垽鏂紝鏈�瀛愬眰鐨剆alemethod浼樺厛绾ф渶楂橈紝濡傛灉灏嗕簯瀛︿範鐨剆alemethod浼樺厛绾ц涓烘渶楂橈紝闇�瑕佸湪鍒ゆ柇鍓嶏紝灏哾ataList涓殑浜戝涔犻�氳繃refcode婊ゅ嚭锛屽厛鍒ゆ柇浜戝涔狅紝鍐嶅垽鏂悗缁殑浠ｇ爜
for (let i = 0; i < dataList.length; i++) {
const dataItem = dataList[i];
if (dataItem) {
if (dataItem.saleMethod.length > 0) {
isBuy = 2;
- if (this.data.bookDetail.purchasedSaleMethodIdList.indexOf(dataItem.saleMethod[0].Id) > -1) {
+ if (this.data.bookDetail.purchasedSaleMethodIdList.indexOf(dataItem.saleMethod[0].Id) > -1 || dataItem.saleMethod[0].Price == 0) {
isBuy = 3;
break;
} else {
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index 74a580a..243bcda 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -388,7 +388,7 @@
if (dataItem) {
if (dataItem.saleMethod.length > 0) {
isBuy = 2;
- if (this.data.bookDetail.purchasedSaleMethodIdList.indexOf(dataItem.saleMethod[0].Id) > -1) {
+ if (this.data.bookDetail.purchasedSaleMethodIdList.indexOf(dataItem.saleMethod[0].Id) > -1 || dataItem.saleMethod[0].Price == 0) {
isBuy = 3;
break;
} else {
@@ -458,9 +458,10 @@
let selectedId = -1; // 鍒濆鍖栭�変腑椤圭储寮�
let showDataUrl = '';
let titleName = '';
- res.datas.cmsDatas[0].datas.forEach((item, index) => {
- if (item.selectType === "audio" || item.learnSelectType === "audio") {
- if (this.data.storeInfo == 'jsek_digitalCourses') {
+ // ###瑙嗛椤甸潰杩欓噷鍒ゆ柇浜嗘槸鍚﹁喘涔帮紝浣嗛煶棰戣繖閲屾病鏈夊垽鏂紝闇�瑕佸啀鏍稿疄
+ if (this.data.storeInfo == 'jsek_digitalCourses') {
+ res.datas.cmsDatas[0].datas.forEach((item, index) => {
+ if (item.selectType === "audio" || item.learnSelectType === "audio") {
if (item.sysType == 'CmsItem') {
this.data.threeLeveData.push(item)
}
@@ -468,11 +469,12 @@
this.data.threeLeveData.push(item)
}
}
+ });
+ } else {
+ const itemCms = await this.getBuyCmsItem()
+ if (itemCms != null) {
+ this.data.threeLeveData.push(itemCms)
}
- });
- const itemCms = await this.getBuyCmsItem()
- if (itemCms != null) {
- this.data.threeLeveData.push(itemCms)
}
if (this.data.threeLeveData.length > 0) {
selectedId = this.data.threeLeveData.findIndex(items => items.productLinkPath == this.data.productLinkPath)
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.js b/packageDomain/pages/resourceDetails/myVideo/index.js
index f98e0da..c3f44a1 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.js
+++ b/packageDomain/pages/resourceDetails/myVideo/index.js
@@ -372,7 +372,7 @@
if (dataItem) {
if (dataItem.saleMethod.length > 0) {
isBuy = 2;
- if (this.data.bookDetail.purchasedSaleMethodIdList.indexOf(dataItem.saleMethod[0].Id) > -1) {
+ if (this.data.bookDetail.purchasedSaleMethodIdList.indexOf(dataItem.saleMethod[0].Id) > -1 || dataItem.saleMethod[0].Price == 0) {
isBuy = 3;
break;
} else {
@@ -444,9 +444,9 @@
this.setData({
isBuy: res.datas.purchasedSaleMethodIdList.includes(res.datas.defaultSaleMethodId)
})
- res.datas.cmsDatas[0].datas.forEach((item) => {
- if (item.selectType === "video" || item.learnSelectType === "video") {
- if (this.data.storeInfo == 'jsek_digitalCourses') {
+ if (this.data.storeInfo == 'jsek_digitalCourses') {
+ res.datas.cmsDatas[0].datas.forEach((item) => {
+ if (item.selectType === "video" || item.learnSelectType === "video") {
if (this.data.isBuy) {
if (item.sysType == 'CmsItem') {
this.data.threeLeveData.push(item)
@@ -457,11 +457,12 @@
}
}
}
+ })
+ } else {
+ const itemCms = await this.getBuyCmsItem()
+ if (itemCms != null) {
+ this.data.threeLeveData.push(itemCms)
}
- })
- const itemCms = await this.getBuyCmsItem()
- if (itemCms != null) {
- this.data.threeLeveData.push(itemCms)
}
if (this.data.threeLeveData.length > 0) {
this.data.threeLeveData.forEach((items, index) => { // 淇敼姝ゅ娣诲姞index鍙傛暟
--
Gitblit v1.9.1