From dd20c89b9c333f356927ed0bfed9a4dd9121b964 Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期三, 16 七月 2025 22:26:07 +0800
Subject: [PATCH] 优化
---
packageDomain/pages/resourceDetails/myAudio/index.js | 182 +++++++++++++++++++++++----------------------
1 files changed, 93 insertions(+), 89 deletions(-)
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index fddbf2f..74a580a 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -7,7 +7,6 @@
// innerAudioContext.onPlay(function callback),
// InnerAudioContext.onTimeUpdate(function callback)
Page({
-
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
@@ -69,7 +68,6 @@
variant: 'base',
},
},
-
format(time) {
let minute = Math.floor(time / 60);
let second = Math.round(time % 60);
@@ -77,7 +75,6 @@
let secondStr = second < 10 ? "0" + second : "" + second;
return minuteStr + ":" + secondStr;
},
-
audio: null,
// 鏍煎紡鍖栫瑪璁版椂闂�
convertTimestamp(timestamp) {
@@ -91,7 +88,6 @@
const formattedDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
return formattedDate
},
-
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
@@ -131,13 +127,11 @@
this.resourceDetailsData()
this.getBookInfo(options.bookId)
},
-
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
*
*/
onReady() {},
-
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
@@ -153,7 +147,6 @@
})
})
},
-
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
*/
@@ -170,7 +163,6 @@
isplay: true
})
},
-
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
*
@@ -221,7 +213,6 @@
console.log('缁熻', data)
app.MG.job.newJobWithApiNewEvent(data).then((res) => {})
},
-
getLearnTime() {
app.MG.identity
.getUserKey({
@@ -327,7 +318,6 @@
})
})
},
-
onTabsChange(event) {},
onTabsClick(event) {},
handleChange(e) {
@@ -347,9 +337,7 @@
} else {
loginInfo(app, (data) => {})
}
-
},
-
closeDialog() {
this.setData({
dialogKey: false
@@ -358,6 +346,86 @@
goBack() {
wx.navigateBack();
},
+
+ 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) {
+ isBuy = 3;
+ break;
+ } else {
+ break;
+ }
+ }
+ }
+ }
+ if (isBuy == 2) {
+ // 鏈喘涔�
+ if (dataList[0].freeFile) {
+ 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() {
let query = {
path: '*',
@@ -390,67 +458,28 @@
let selectedId = -1; // 鍒濆鍖栭�変腑椤圭储寮�
let showDataUrl = '';
let titleName = '';
- 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: []
- })
- }
- for (const item of list) {
- if (item.selectType === "audio" || item.learnSelectType === "audio")
+ res.datas.cmsDatas[0].datas.forEach((item, index) => {
+ 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)
- })
- item.isBuyCms = isBuyCms
- if (isBuyCms) {
+ if (item.sysType == 'CmsItem') {
this.data.threeLeveData.push(item)
- } else {
- if (item.freeFile) {
- this.data.threeLeveData.push(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 (item.sysType == 'CmsItem' && item.freeFile) {
+ this.data.threeLeveData.push(item)
}
}
+ }
+ });
+ 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 = datas.isBuyCms ? datas.protectedFile || datas.freeFile : datas.freeFile
+ let file = this.cmsItemIsBuy(datas) ? datas.protectedFile || datas.freeFile : 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
@@ -503,7 +532,6 @@
}
}
},
-
getProductUserSubmitTopicGet() {
app.MG.ugc.getProductUserSubmitTopic({
productId: this.data.bookId,
@@ -514,7 +542,6 @@
})
})
},
-
newTopicMessageGet() {
let query = {
topicIdOrRefCode: topicId + '',
@@ -524,11 +551,8 @@
cmsTypeRefCode: '',
newDataListRequest: []
}
- app.MG.ugc.newTopicMessage(query).then(res => {
-
- })
+ app.MG.ugc.newTopicMessage(query).then(res => {})
},
-
// 鏍囬鏀瑰彉
changeTitle(e) {
this.setData({
@@ -541,14 +565,12 @@
submitTitle: e.detail.value
})
},
-
confirmSuggest() {
if (!this.data.textvalue.trim()) {
return wx.showToast({
icon: 'error',
title: '璇峰～鍐欑瑪璁板唴瀹�',
})
-
} else if (!this.data.submitTitle) {
return wx.showToast({
icon: 'error',
@@ -560,13 +582,10 @@
} else if (this.data.submitType == 'edit') {
this.updateNote()
}
-
this.setData({
dialogKey: false
});
-
this.getNoteList()
-
},
onTextarea() {},
textareaChange(e) {
@@ -574,7 +593,6 @@
textvalue: e.detail.value
})
},
-
// 鑾峰彇绗旇鍒楄〃
async getNoteList() {
// this.setData({
@@ -616,7 +634,6 @@
"pageCount.total": res.totalSize,
noteList: res.datas,
})
-
})
},
// 缂栬緫鎸夐挳
@@ -626,14 +643,11 @@
submitType: "edit",
textvalue: note.content,
submitTitle: note.name,
-
noteId: note.id,
dialogKey: true,
})
-
// this.showDialog()
},
-
// 鍒犻櫎绗旇
deleteNote(e) {
const id = e.currentTarget.dataset.id
@@ -761,11 +775,8 @@
});
}, 100);
});
-
-
//鎾斁浜嬩欢
myAudio.play();
-
// 鎾斁瀹屾垚澶勭悊锛屾寜閽彉涓�涓�
myAudio.onEnded((res) => {
this.setData({
@@ -778,7 +789,6 @@
myAudioPos: '',
})
});
-
//杩涘害鏉″彉鍖�
myAudio.onTimeUpdate(() => {
myAudio.startTime = 0
@@ -791,7 +801,6 @@
// console.log(myAudio.currentTime.toFixed(3), myAudio.duration);
})
},
-
//鎾斁
play() {
myAudio.startTime = this.data.myAudioCurrent; //鑰冭檻鍒拌繘搴︽潯琚嫋鍔紝涓嶄竴瀹氫粠00:00:00寮�濮�
@@ -800,7 +809,6 @@
isplay: false
});
},
-
// 鍋滄
stop() {
myAudio.pause();
@@ -808,7 +816,6 @@
isplay: true
});
},
-
// 鎾斁鍊嶉��
onSpeed() {
let c = this.data.speed;
@@ -823,13 +830,11 @@
speed: c,
})
}
-
setTimeout(() => {
myAudio.startTime = this.data.myAudioDuration //寮�濮嬫椂闂�
myAudio.playbackRate = this.data.speed; // 鎾斁閫熺巼
}, 200);
},
-
// 鎷栧姩杩涘害鏉★紝鍒版寚瀹氫綅缃�
hanle_slider_change(e) {
const position = e.detail.value;
@@ -840,7 +845,6 @@
myAudioCurrent: this.format(currentTime)
})
},
-
toggleDropdown() {
this.setData({
showDropdown: !this.data.showDropdown
--
Gitblit v1.9.1