From 521c2455840c6bc4ee1d98b13d1da78236078192 Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期四, 10 七月 2025 17:22:08 +0800
Subject: [PATCH] 资源扫码---云学习
---
packageDomain/pages/resourceDetails/document/index.js | 104 ++++++-----------
assets/js/middleGround/api/file.js | 1
packageDomain/pages/resourceDetails/myVideo/index.js | 108 ++++++++---------
packageDomain/pages/resourceDetails/myAudio/index.js | 102 +++++++---------
packageBookService/pages/bookServices/detail/index.js | 1
5 files changed, 131 insertions(+), 185 deletions(-)
diff --git a/assets/js/middleGround/api/file.js b/assets/js/middleGround/api/file.js
index 1dc4075..cbc691d 100644
--- a/assets/js/middleGround/api/file.js
+++ b/assets/js/middleGround/api/file.js
@@ -93,6 +93,7 @@
data
})
},
+
// 妫�鏌msItem 鏉冮檺
checkCmsItem(data) {
return request({
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 07cb6b1..772deaf 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -1149,7 +1149,6 @@
learnPath: type.productLinkPath
});
}
- console.log('1', result);
})
},
// 鑾峰彇 浜戞祴璇�
diff --git a/packageDomain/pages/resourceDetails/document/index.js b/packageDomain/pages/resourceDetails/document/index.js
index f1399bd..999ad4c 100644
--- a/packageDomain/pages/resourceDetails/document/index.js
+++ b/packageDomain/pages/resourceDetails/document/index.js
@@ -337,18 +337,24 @@
query.storeInfo = this.data.storeInfo
}
app.MG.store.getProductDetail(query).then((res) => {
+ wx.hideLoading();
+ const list = res.datas.cmsDatas[0]?.datas
+ if (this.data.source == 'qrcode') {
+ let qrData = res.datas.cmsDatas[0].datas.find(ditem => ditem.id == this.data.activeId)
+ if (qrData) {
+ this.setData({
+ threeLeveData: [qrData]
+ })
+ }
+ } else {
+ this.setData({
+ threeLeveData: []
+ })
+ }
this.setData({
isBuy: res.datas.purchasedSaleMethodIdList.includes(res.datas.defaultSaleMethodId)
})
- res.datas.cmsDatas[0].datas.forEach((item) => {
- if (this.data.productLinkPath == item.productLinkPath) {
- this.handleTeachData(item)
- this.setData({
- titleName: item.name,
- selectType: item.selectType,
- learnSelectType: item.learnSelectType
- })
- }
+ list?.forEach(async (item) => {
if (this.data.storeInfo == 'jsek_digitalCourses') {
if (this.data.isBuy) {
if (this.data.productLinkPath == item.productLinkPath) {
@@ -360,53 +366,34 @@
}
}
} else {
- // 涔颁簡
- if (this.data.buyList.length) {
- if (this.data.buyList.some(citem => item.productLinkPath.includes(citem.productLinkPath))) {
- if (this.data.productLinkPath == item.productLinkPath) {
- this.data.threeLeveData.push(item)
- }
- }
+ const isBuyCms = await app.MG.file.checkCmsItem({
+ cmsItemId: Number(item.id)
+ })
+ if (isBuyCms && this.data.productLinkPath == item.productLinkPath) {
+ this.data.threeLeveData(item)
} else {
- if (!item.saleMethod.length) {
- // 娌′拱涓旀棤閿�鍞柟寮�
- if (this.data.productLinkPath == item.productLinkPath) {
- this.data.threeLeveData.push(item)
- }
+ if (item.freeFile && this.data.productLinkPath == item.productLinkPath) {
+ this.data.threeLeveData(item)
} else {
- // 娌′拱涓旈攢鍞柟寮忚繃鏈�//娌′拱锛岄攢鍞柟寮忎环鏍间负0
- const itemSaleMethod = item.saleMethod.find(citem => citem.SaleType == 'Normal')
- if (new Date().getTime() > new Date(itemSaleMethod.EndDate).getTime() || itemSaleMethod.Price == 0) {
- if (this.data.productLinkPath == item.productLinkPath) {
- this.data.threeLeveData.push(item)
+ wx.showModal({
+ icon: 'error',
+ title: '娓╅Θ鎻愮ず',
+ content: '璇疯喘涔伴搴擄紝鍗冲皢杩斿洖璐拱椤�',
+ confirmText: '纭畾',
+ showCancel: false, // 鍏抽棴鍙栨秷鎸夐挳
+ success: (cres) => {
+ if (cres.confirm) {
+ wx.navigateTo({
+ url: '/packageBookService/pages/bookServices/detail/index?id=' + this.data.bookId + '&name=' + this.data.bookName + '&tabValue=' + this.data.formPath,
+ })
+ }
}
- }
- // 娌′拱涓斿彧鏈夎瘯璇昏祫婧�
- if (!item.file && item.freeFile) {
- if (this.data.productLinkPath == item.productLinkPath) {
- this.data.threeLeveData.push(item)
- }
- }
+ });
+ return; // 鐩存帴杩斿洖锛岄伩鍏嶆墽琛屽悗缁唬鐮�
}
}
}
})
- if (this.data.source == 'qrcode') {
- let qrData = this.data.threeLeveData.find(ditem => ditem.id == this.data.activeId)
- if (qrData && this.cmsItemIsBuy(qrData)) {
- this.setData({
- threeLeveData: [qrData]
- })
- } else {
- this.setData({
- threeLeveData: []
- })
- }
- } else {
- this.setData({
- threeLeveData: this.data.threeLeveData
- })
- }
if (this.data.threeLeveData.length > 0) {
let item = this.data.threeLeveData[0]
this.handleTeachData(item)
@@ -415,25 +402,6 @@
selectType: item.selectType,
learnSelectType: item.learnSelectType,
})
- } else {
- // wx.showToast({
- // icon: 'none',
- // title: '璇峰厛杩斿洖璧勬簮鎵�鍦ㄥ浘涔﹁鎯呰喘涔拌棰戣祫婧�',
- // })
- wx.showModal({
- title: '娓╅Θ鎻愮ず',
- content: '璇峰厛杩斿洖璧勬簮鎵�鍦ㄥ浘涔﹁鎯呰喘涔拌棰戣祫婧�',
- confirmText: '纭畾',
- showCancel: false, // 鍏抽棴鍙栨秷鎸夐挳
- success: (res) => {
- if (res.confirm) {
- wx.navigateTo({
- url: `/packageBookService/pages/bookServices/detail/index?id=${this.data.bookDetail.id}&name=${this.data.bookDetail.name}&tabValue=jsek_cloudLearning`,
- });
- }
- }
- })
-
}
})
},
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index 69afdd2..ee37022 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -390,58 +390,60 @@
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 (item.sysType == 'CmsItem') {
- this.data.threeLeveData.push(item)
- }
- if (item.sysType == 'CmsItem' && item.freeFile) {
- this.data.threeLeveData.push(item)
- }
- } else {
- if (this.data.buyList.length) {
- if (this.data.buyList.some(citem => item.productLinkPath.includes(citem.productLinkPath))) {
- this.data.threeLeveData.push(item)
- }
- } else {
-
- if (!item.saleMethod.length) {
- // 娌′拱涓旀棤閿�鍞柟寮�
- this.data.threeLeveData.push(item)
- } else {
- // 娌′拱涓旈攢鍞柟寮忚繃鏈�//娌′拱锛岄攢鍞柟寮忎环鏍间负0
- const itemSaleMethod = item.saleMethod.find(citem => citem.SaleType == 'Normal')
- if (new Date().getTime() > new Date(itemSaleMethod.EndDate).getTime() || itemSaleMethod.Price == 0) {
- this.data.threeLeveData.push(item)
- }
- // 娌′拱涓斿彧鏈夎瘯璇昏祫婧�
- if ((!item.file && !item.protectedFile) && item.freeFile) {
- const state = this.data.threeLeveData.find(citem => citem.id == item.id)
- if (!state)
- this.data.threeLeveData.push(item)
- }
- }
- }
- }
- }
- });
+ const list = res.datas.cmsDatas[0]?.datas
if (this.data.source == 'qrcode') {
- let qrData = this.data.threeLeveData.find(ditem => ditem.id == this.data.activeId)
- if (qrData && this.cmsItemIsBuy(qrData)) {
+ let qrData = res.datas.cmsDatas[0].datas.find(ditem => ditem.id == this.data.activeId)
+ if (qrData) {
this.setData({
threeLeveData: [qrData]
- })
- } else {
- this.setData({
- threeLeveData: []
})
}
} else {
this.setData({
- threeLeveData: this.data.threeLeveData
+ threeLeveData: []
})
}
+ list?.forEach(async (item) => {
+ if (item.selectType === "audio" || item.learnSelectType === "audio")
+ if (this.data.storeInfo == 'jsek_digitalCourses') {
+ if (this.data.isBuy) {
+ if (item.sysType == 'CmsItem') {
+ this.data.threeLeveData.push(item)
+ }
+ } else {
+ if (item.sysType == 'CmsItem' && item.freeFile) {
+ this.data.threeLeveData.push(item)
+ }
+ }
+ } else {
+ const isBuyCms = await app.MG.file.checkCmsItem({
+ cmsItemId: Number(item.id)
+ })
+ if (isBuyCms) {
+ this.data.threeLeveData(item)
+ } else {
+ if (item.freeFile) {
+ this.data.threeLeveData(item)
+ } else {
+ wx.showModal({
+ icon: 'error',
+ title: '娓╅Θ鎻愮ず',
+ content: '璇疯喘涔伴搴擄紝鍗冲皢杩斿洖璐拱椤�',
+ confirmText: '纭畾',
+ showCancel: false, // 鍏抽棴鍙栨秷鎸夐挳
+ success: (cres) => {
+ if (cres.confirm) {
+ wx.navigateTo({
+ url: '/packageBookService/pages/bookServices/detail/index?id=' + this.data.bookId + '&name=' + this.data.bookName + '&tabValue=' + this.data.formPath,
+ })
+ }
+ }
+ });
+ return; // 鐩存帴杩斿洖锛岄伩鍏嶆墽琛屽悗缁唬鐮�
+ }
+ }
+ }
+ })
if (this.data.threeLeveData.length > 0) {
selectedId = this.data.threeLeveData.findIndex(items => items.productLinkPath == this.data.productLinkPath)
if (selectedId !== -1) {
@@ -464,20 +466,6 @@
toView: 'activeName' + selectedId,
});
this.pubulicPlayFun();
- } else {
- wx.showModal({
- title: '娓╅Θ鎻愮ず',
- content: '璇峰厛杩斿洖璧勬簮鎵�鍦ㄥ浘涔﹁鎯呰喘涔拌棰戣祫婧�',
- confirmText: '纭畾',
- showCancel: false, // 鍏抽棴鍙栨秷鎸夐挳
- success: (res) => {
- if (res.confirm) {
- wx.navigateTo({
- url: `/packageBookService/pages/bookServices/detail/index?id=${this.data.bookDetail.id}&name=${this.data.bookDetail.name}&tabValue=${this.data.formPath}`,
- });
- }
- }
- })
}
});
},
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.js b/packageDomain/pages/resourceDetails/myVideo/index.js
index f34c79f..c729acb 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.js
+++ b/packageDomain/pages/resourceDetails/myVideo/index.js
@@ -96,8 +96,6 @@
activeId: options.activeId,
storeInfo: options.storeInfo,
bookId: options.bookId,
- bookName: options.bookName,
- cmsId: options.cmsId,
parentProductLinkPath: options.parentProductLinkPath,
productLinkPath: options.productLinkPath,
formPath: options.formPath,
@@ -222,17 +220,22 @@
app.MG.store.getProductDetail(query).then(async (res) => {
try {
this.setData({
+ bookName: res.datas.name,
+ cmsId: res.datas.rootCmsItemId,
bookDetail: res.datas,
buyIdList: res.datas.purchasedSaleMethodIdList,
learnClassData: res.datas.cmsDatas[0].datas.length > 0 ? res.datas.cmsDatas[0].datas.find(item => item.refCode == "jsek_cloudLearning") : null
})
- } catch (error) {}
- if (this.data.learnClassData) {
- debugger
- this.getResourceDataList(this.data.learnClassData)
- } else {
- this.resourceDetailsData()
+ if (this.data.learnClassData) {
+ this.getResourceDataList(this.data.learnClassData)
+ } else {
+ this.resourceDetailsData()
+ }
+
+ } catch (error) {
+ console.log(err)
}
+
});
},
// 鏁欏璧勬簮 浜戝涔� 鑾峰彇
@@ -279,6 +282,7 @@
this.resourceDetailsData()
})
},
+
count(timeStr) {
const data = {
appRefCode: app.config.appRefCode,
@@ -297,6 +301,7 @@
}
app.MG.job.newJobWithApiNewEvent(data).then((res) => {})
},
+
onTabsChange(event) {
let tabValue = event.detail.value
if (tabValue == '1') {
@@ -364,10 +369,20 @@
}
}
app.MG.store.getProductDetail(query).then(res => {
- this.setData({
- isBuy: res.datas.purchasedSaleMethodIdList.includes(res.datas.defaultSaleMethodId)
- })
- res.datas.cmsDatas[0].datas.forEach((item) => {
+ const list = res.datas.cmsDatas[0]?.datas
+ if (this.data.source == 'qrcode') {
+ let qrData = res.datas.cmsDatas[0].datas.find(ditem => ditem.id == this.data.activeId)
+ if (qrData) {
+ this.setData({
+ threeLeveData: [qrData]
+ })
+ }
+ } else {
+ this.setData({
+ threeLeveData: []
+ })
+ }
+ list?.forEach(async (item) => {
if (item.selectType === "video" || item.learnSelectType === "video") {
if (this.data.storeInfo == 'jsek_digitalCourses') {
// if (item.sysType == 'CmsItem') this.data.threeLeveData.push(item)
@@ -381,23 +396,30 @@
}
}
} else {
- // 涔颁簡
- if (this.data.buyList.length) {
- if (this.data.buyList.some(citem => item.productLinkPath.includes(citem.productLinkPath))) {
- this.data.threeLeveData.push(item)
- }
+ const isBuyCms = await app.MG.file.checkCmsItem({
+ cmsItemId: Number(item.id)
+ })
+ if (isBuyCms) {
+ this.data.threeLeveData(item)
} else {
- if (!item.saleMethod.length) {
- // 娌′拱涓旀棤閿�鍞柟寮�
- this.data.threeLeveData.push(item)
+ if (item.freeFile) {
+ this.data.threeLeveData(item)
} else {
- // 娌′拱涓旈攢鍞柟寮忚繃鏈�//娌′拱锛岄攢鍞柟寮忎环鏍间负0
- const itemSaleMethod = item.saleMethod.find(citem => citem.SaleType == 'Normal')
- if (new Date().getTime() > new Date(itemSaleMethod.EndDate).getTime() || itemSaleMethod.Price == 0) {
- this.data.threeLeveData.push(item)
- }
- // 娌′拱涓斿彧鏈夎瘯璇昏祫婧�
- if (!item.file && item.freeFile) this.data.threeLeveData.push(item)
+ wx.showModal({
+ icon: 'error',
+ title: '娓╅Θ鎻愮ず',
+ content: '璇疯喘涔伴搴擄紝鍗冲皢杩斿洖璐拱椤�',
+ confirmText: '纭畾',
+ showCancel: false, // 鍏抽棴鍙栨秷鎸夐挳
+ success: (cres) => {
+ if (cres.confirm) {
+ wx.navigateTo({
+ url: '/packageBookService/pages/bookServices/detail/index?id=' + this.data.bookId + '&name=' + this.data.bookName + '&tabValue=' + this.data.formPath,
+ })
+ }
+ }
+ });
+ return; // 鐩存帴杩斿洖锛岄伩鍏嶆墽琛屽悗缁唬鐮�
}
}
}
@@ -405,24 +427,6 @@
}
// }
})
- if (this.data.source == 'qrcode') {
- let qrData = this.data.threeLeveData.find(ditem => ditem.id == this.data.activeId)
- if (qrData && this.data.isLearnDataBuy) {
- if (qrData) {
- this.setData({
- threeLeveData: [qrData]
- })
- }
- } else {
- this.setData({
- threeLeveData: []
- })
- }
- } else {
- this.setData({
- threeLeveData: this.data.threeLeveData
- })
- }
if (this.data.threeLeveData.length > 0) {
this.data.threeLeveData.forEach((items, index) => { // 淇敼姝ゅ娣诲姞index鍙傛暟
if (this.data.productLinkPath == items.productLinkPath) {
@@ -455,20 +459,6 @@
selectedId: index
})
this.aliVod(items.file, this.data.showData)
- }
- }
- });
- } else {
- wx.showModal({
- title: '娓╅Θ鎻愮ず',
- content: '璇峰厛杩斿洖璧勬簮鎵�鍦ㄥ浘涔﹁鎯呰喘涔拌棰戣祫婧�',
- confirmText: '纭畾',
- showCancel: false, // 鍏抽棴鍙栨秷鎸夐挳
- success: function (res) {
- if (res.confirm) {
- wx.navigateTo({
- url: `/packageBookService/pages/bookServices/detail/index?id=${this.data.bookDetail.id}&name=${this.data.bookDetail.name}&tabValue=${this.data.formPath}`,
- });
}
}
});
--
Gitblit v1.9.1