From b55024ee2f42aa93e0ecaa3113bdeb286f6e59ac Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期二, 29 七月 2025 18:01:55 +0800
Subject: [PATCH] 优化按钮显示，教学互动
---
packageDomain/pages/resourceDetails/myAudio/index.js | 184 ++++++++++++++++++++++++++-------------------
1 files changed, 106 insertions(+), 78 deletions(-)
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index 9803f75..3a5af21 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -124,7 +124,6 @@
})
this.getLearnTime()
}
- this.resourceDetailsData()
this.getBookInfo(options.bookId)
},
/**
@@ -267,15 +266,19 @@
coverSize: {
height: 1,
},
- fields: {},
+ fields: {
+ IsTextbook: []
+ },
};
if (this.data.storeInfo) query['storeInfo'] = this.data.storeInfo
app.MG.store.getProductDetail(query).then(async (res) => {
this.setData({
bookDetail: res.datas,
+ bookName: res.datas.name,
buyIdList: res.datas.purchasedSaleMethodIdList,
learnClassData: res.datas.cmsDatas[0].datas.find(item => item.refCode == "jsek_cloudLearning")
})
+ this.resourceDetailsData()
this.getResourceDataList(this.data.learnClassData)
});
},
@@ -347,12 +350,84 @@
wx.navigateBack();
},
- // 鍒ゆ柇褰撳墠鐩爣鏄惁宸茶喘涔�
- async getCmsDataByQrcode() {
- const query = {
- cmsItemId: Number(this.data.activeId)
- };
- return app.MG.file.checkCmsItem(query)
+ async getBuyCmsItem() {
+ let cmsItemData = null
+ let query = {
+ path: '*',
+ queryType: '*',
+ cmsType: '*',
+ productId: this.data.bookId,
+ cmsPath: this.data.bookDetail.rootCmsItemId,
+ itemFields: {
+ selectType: [],
+ freeFile: [],
+ file: [],
+ protectedFile: [],
+ resourcesClassification: [],
+ isDownload: [],
+ jsek_resourceBrief: [],
+ jsek_link: [],
+ jsek_questionBank: [],
+ learnSelectType: []
+ },
+ pading: {
+ start: 0,
+ size: 999
+ }
+ }
+ if (this.data.storeInfo) {
+ query.storeInfo = this.data.storeInfo
+ }
+ const res = await app.MG.store.getProductDetail(query)
+ let linkData = this.data.productLinkPath.split("\\");
+ linkData.reverse()
+ let dataList = linkData.map(item => {
+ let data = res.datas.cmsDatas[0].datas.find(citem => citem.id == item);
+ if (data) return data;
+ })
+ let isBuy = 1;
+ 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 || dataItem.saleMethod[0].Price == 0) {
+ isBuy = 3;
+ break;
+ } else {
+ break;
+ }
+ }
+ }
+ }
+ if (isBuy == 2) {
+ // 鏈喘涔�
+ if (dataList[0].freeFile) {
+ dataList[0].isFreeFile = true; // 杩欎釜璧勬簮鍙互璇曠湅
+ cmsItemData = dataList[0]
+ } else {
+ wx.hideLoading();
+ wx.showModal({
+ title: '娓╅Θ鎻愮ず',
+ content: '璇ヨ祫婧愭湭婵�娲绘垨璐拱锛屽嵆灏嗚繑鍥炲浘涔﹁鎯呴〉闈�',
+ success: (res) => {
+ if (res.confirm) {
+ if (this.data.source == 'qrcode') {
+ wx.navigateTo({
+ url: `/packageBookService/pages/bookServices/detail/index?id=${this.data.bookDetail.id}&name=${this.data.bookDetail.name}&tabValue=${this.data.formPath}`,
+ });
+ } else {
+ wx.navigateBack()
+ }
+ }
+ }
+ })
+ }
+ } else {
+ cmsItemData = dataList[0]
+ }
+
+ return cmsItemData
},
resourceDetailsData() {
@@ -387,72 +462,36 @@
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)
}
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)
- }
- }
- }
}
- }
- });
- if (this.data.source == 'qrcode') {
- let qrData = this.data.threeLeveData.find(ditem => ditem.id == this.data.activeId)
- const isBuyCms = await this.getCmsDataByQrcode() // 褰撳墠璧勬簮鎴栫埗绾х洰褰曟槸鍚﹁喘涔�
- const isDefualtPrice = this.data.bookDetail?.defaultSaleMethod?.price // 褰撳墠涔︾殑浠烽粯璁ら攢鍞柟寮忎环鏍兼槸鍚︿负0
- const isBuyBook = this.data.bookDetail?.alreadyBuy // 褰撳墠涔︽槸鍚﹁喘涔�
- if (isBuyCms) {
- this.setData({
- threeLeveData: [qrData]
- })
- } else {
- if (isDefualtPrice == 0 || isBuyBook) {
- this.setData({
- threeLeveData: [qrData]
- })
- } else {
- this.setData({
- threeLeveData: []
- })
- }
- }
+ });
} else {
- this.setData({
- threeLeveData: this.data.threeLeveData
- })
+ 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)
if (selectedId !== -1) {
let datas = this.data.threeLeveData[selectedId];
if (this.data.formPath == 'jsek_cloudLearning') {
- let file = this.cmsItemIsBuy(datas) ? datas.protectedFile || datas.freeFile : datas.freeFile
+ // let file = this.cmsItemIsBuy(datas) ? datas.protectedFile || datas.freeFile : datas.freeFile
+ let file
+ if (!datas.isFreeFile) {
+ file = datas.protectedFile
+ } else {
+ file = datas.freeFile
+ }
showDataUrl = app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + file + '&token=' + wx.getStorageSync(app.config.tokenKey);
} else {
showDataUrl = datas.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + datas.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + datas.freeFile
@@ -469,26 +508,10 @@
toView: 'activeName' + selectedId,
});
this.pubulicPlayFun();
- } else {
- wx.showModal({
- title: '娓╅Θ鎻愮ず',
- content: '璇ヨ祫婧愭湭璐拱锛屽皢杩斿洖璐拱',
- success: (res) => {
- if (res.confirm) {
- if (this.data.source == 'qrcode') {
- wx.navigateTo({
- url: `/packageBookService/pages/bookServices/detail/index?id=${this.data.bookDetail.id}&name=${this.data.bookDetail.name}&tabValue=${this.data.formPath}`,
- });
- } else {
- wx.navigateBack()
- }
- }
- }
- })
-
}
});
},
+
onVideo(e) {
this.setPlayerList()
this.setData({
@@ -506,7 +529,12 @@
})
if (item.selectType == "audio" || item.learnSelectType === "audio") {
if (this.data.formPath == 'jsek_cloudLearning') {
- let file = item.protectedFile ? item.protectedFile : item.freeFile
+ let file
+ if (!item.isFreeFile) {
+ file = item.protectedFile
+ } else {
+ file = item.freeFile
+ }
// 杩欓噷澶勭悊浜戝涔犵殑
this.setData({
showData: app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + file + '&token=' + wx.getStorageSync(app.config.tokenKey)
--
Gitblit v1.9.1