From 6df96b3e7a7da1985ee875e84711e9f15c5fbff0 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 24 十二月 2024 18:25:02 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packageDomain/pages/resourceDetails/myAudio/index.js | 162 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 125 insertions(+), 37 deletions(-)
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index 06c0fb7..03888b5 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -54,6 +54,13 @@
hidden: true,
playerList: [],
progress: 0,
+ buyIdList: [],
+ buyList: [],
+ learnClassData: null,
+ bookDetail: null,
+ learnStartTime: 0,
+ learnTimeList: [],
+ learnTimeData: 0
},
format(time) {
@@ -102,7 +109,6 @@
formPath: options.formPath,
source: options.source,
})
-
if (options.parentName !== "鏁欏璧勬簮" && options.parentName !== "浜戝涔�") {
this.setData({
parentName: options.parentName,
@@ -123,6 +129,13 @@
this.resourceDetailsData()
this.getNoteList()
}
+ if (options.formPath == 'jsek_cloudLearning') {
+ this.setData({
+ learnStartTime: Date.now(),
+ })
+ this.getLearnTime()
+ }
+ this.getBookInfo(options.bookId)
},
/**
@@ -183,6 +196,10 @@
this.count(duration)
}
this.setPlayerList()
+ if (this.data.fromPath == 'jsek_cloudLearning') {
+ let cloudDuration = this.data.pauseTime - this.data.learnStartTime
+ this.cloudCount(cloudDuration)
+ }
},
count(timeStr) {
const data = {
@@ -203,27 +220,103 @@
console.log('缁熻', data)
app.MG.job.newJobWithApiNewEvent(data).then((res) => {})
},
- /**
- * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
- */
- onPullDownRefresh() {
+ getLearnTime() {
+ app.MG.identity
+ .getUserKey({
+ domain: 'cloudLearningTime',
+ keys: [this.data.bookId]
+ })
+ .then((res) => {
+ if (res.length > 0) {
+ if (JSON.parse(res[0].value) && JSON.parse(res[0].value).length > 0) {
+ this.setData({
+ learnTimeList: JSON.parse(res[0].value),
+ learnTimeData: JSON.parse(res[0].value)[0].learnTime,
+ })
+ } else {
+ this.setData({
+ learnTimeList: [],
+ learnTimeData: 0
+ })
+ }
+ }
+ })
+ },
+ cloudCount(timeStr) {
+ let time = Number(this.data.learnTimeData) + Number(timeStr)
+ this.setData({
+ learnTimeList: [{
+ learnTime: time
+ }],
+ })
+ app.MG.identity
+ .setUserKey({
+ setKeyRequests: [{
+ domain: 'cloudLearningTime',
+ key: this.data.bookId,
+ value: JSON.stringify(this.data.learnTimeList)
+ }]
+ })
+ .then((res) => {
+ console.log(timeStr, '瀛︿範鏃堕暱')
+ })
+ },
+ // 鑾峰彇鍥句功璇︽儏
+ getBookInfo(id) {
+ const query = {
+ path: "*",
+ queryType: "*",
+ productId: id,
+ favoriteTypes: "FavoriteBookCity",
+ itemFields: {
+ "SysType=": "CmsFolder",
+ },
+ coverSize: {
+ height: 1,
+ },
+ fields: {},
+ };
+ app.MG.store.getProductDetail(query).then(async (res) => {
+ console.log('鍥句功璇︽儏', res);
+ this.setData({
+ bookDetail: res.datas,
+ buyIdList: res.datas.purchasedSaleMethodIdList,
+ learnClassData: res.datas.cmsDatas[0].datas.find(item => item.refCode == "jsek_cloudLearning")
+ })
+ this.getResourceDataList(this.data.learnClassData)
+ });
+ },
+ // 鏁欏璧勬簮 浜戝涔� 鑾峰彇
+ getResourceDataList(type) {
+ let query = {
+ path: '*',
+ queryType: '*',
+ productId: this.data.bookDetail.id,
+ cmsPath: type.productLinkPath,
+ cmsType: '*',
+ itemFields: {
+ SysType: 'CmsFolder',
+ },
+ pading: {
+ start: 0,
+ size: 999
+ },
+ }
+ app.MG.store.getProductDetailNoChildren(query).then((res) => {
+ const buyList = res.datas.cmsDatas[0].datas.filter(item => item.saleMethod.length && this.data.buyIdList.includes(item.saleMethod.find(citem => citem.SaleType == 'Normal').Id))
+ if (this.data.learnClassData && this.data.learnClassData.saleMethod.length) {
+ const learnSaleMethod = this.data.learnClassData.saleMethod.find(citem => citem.SaleType == 'Normal')
+ if (this.data.buyIdList.includes(learnSaleMethod.Id)) buyList.push(learnClassData)
+ }
+ this.setData({
+ buyList
+ })
+ console.log('浜戝涔�', buyList);
+ })
},
- /**
- * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
- */
- onReachBottom() {
-
- },
-
- /**
- * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
- */
- onShareAppMessage() {},
- onShareTimeline() {},
onTabsChange(event) {},
-
onTabsClick(event) {},
handleChange(e) {
this.setData({
@@ -279,7 +372,7 @@
let selectedId = -1; // 鍒濆鍖栭�変腑椤圭储寮�
let showDataUrl = '';
let titleName = '';
-
+ console.log(res.datas.cmsDatas[0].datas, 1)
res.datas.cmsDatas[0].datas.forEach((item, index) => {
if (this.data.source == 'qrcode') {
if (item.id == this.data.activeId) {
@@ -287,35 +380,28 @@
}
} else {
if (item.selectType === "audio" || item.learnSelectType === "audio") {
- // this.data.threeLeveData.push(item);
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)
- }
+ if (item.sysType == 'CmsItem') {
+ this.data.threeLeveData.push(item)
+ }
+ if (item.sysType == 'CmsItem' && item.freeFile) {
+ this.data.threeLeveData.push(item)
}
} else {
- if (res.datas.purchasedSaleMethodIdList.includes(item.defaultSaleMethodId) || item.freeFile) {
- this.data.threeLeveData.push(item)
+ 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)
}
}
}
}
-
});
- this.data.threeLeveData.forEach((items, indexs) => {
- if (this.data.productLinkPath == items.productLinkPath) {
- selectedId = indexs;
- }
- })
+ 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.protectedFile ? datas.protectedFile : datas.file
+ let file = datas.protectedFile ? datas.protectedFile : 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
@@ -331,6 +417,7 @@
loading: false,
hidden: false
});
+ console.log(1, this.data);
this.pubulicPlayFun();
});
},
@@ -362,6 +449,7 @@
this.setData({
showData: item.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.freeFile
})
+ console.log(2, this.data);
this.pubulicPlayFun()
}
}
--
Gitblit v1.9.1