From abbd7d18ea431ee8b6b8e634abf3e8ccb1fbb1b3 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期五, 28 三月 2025 18:43:33 +0800
Subject: [PATCH] 登录迁移
---
packageDomain/pages/resourceDetails/myAudio/index.js | 166 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 107 insertions(+), 59 deletions(-)
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index 0fd23bd..85e1bc6 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -57,10 +57,12 @@
buyIdList: [],
buyList: [],
learnClassData: null,
+ isLearnDataBuy: false,
bookDetail: null,
learnStartTime: 0,
learnTimeList: [],
- learnTimeData: 0
+ learnTimeData: 0,
+ toView: 'activeName',
},
format(time) {
@@ -114,27 +116,14 @@
parentName: options.parentName,
})
}
- const token = wx.getStorageSync(app.config.tokenKey)
- if (!token) {
- loginInfo(app, (data) => {
- if (data) {
- this.resourceDetailsData()
- this.getNoteList()
- } else {
- this.resourceDetailsData()
- this.getNoteList()
- }
- })
- } else {
- this.resourceDetailsData()
- this.getNoteList()
- }
if (options.formPath == 'jsek_cloudLearning') {
+ this.getNoteList()
this.setData({
learnStartTime: Date.now(),
})
this.getLearnTime()
}
+ this.resourceDetailsData()
this.getBookInfo(options.bookId)
},
@@ -279,7 +268,6 @@
};
if (this.data.storeInfo) query['storeInfo'] = this.data.storeInfo
app.MG.store.getProductDetail(query).then(async (res) => {
- console.log('鍥句功璇︽儏', res);
this.setData({
bookDetail: res.datas,
buyIdList: res.datas.purchasedSaleMethodIdList,
@@ -308,12 +296,24 @@
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)
+ // if (this.data.buyIdList.includes(learnSaleMethod.Id)) buyList.push(learnClassData)
+ if (this.data.buyIdList.includes(learnSaleMethod.Id)) {
+ buyList.push(this.data.learnClassData)
+ } else {
+ if (new Date().getTime() > new Date(learnSaleMethod.EndDate).getTime() || learnSaleMethod.Price == 0) {
+ this.setData({
+ isLearnDataBuy: true
+ })
+ } else {
+ this.setData({
+ isLearnDataBuy: false
+ })
+ }
+ }
}
this.setData({
buyList
})
- console.log('浜戝涔�', buyList);
})
},
@@ -326,11 +326,17 @@
},
onTakeNotes() {},
showDialog(e) {
- this.setData({
- submitTitle: this.data.titleName,
- dialogKey: true,
- textvalue: ''
- });
+ const token = wx.getStorageSync(app.config.tokenKey);
+ if (token) {
+ this.setData({
+ submitTitle: this.data.titleName,
+ dialogKey: true,
+ textvalue: ''
+ });
+ } else {
+ loginInfo(app, (data) => {})
+ }
+
},
closeDialog() {
@@ -373,53 +379,94 @@
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) {
- this.data.threeLeveData.push(item);
- }
- } else {
- 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) {
+ // if (this.data.source == 'qrcode') {
+ // if (item.id == this.data.activeId) {
+ // this.data.threeLeveData.push(item);
+ // }
+ // } else {
+ 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 (this.data.buyList.length) {
- if (this.data.buyList.some(citem => item.productLinkPath.includes(citem.productLinkPath))) this.data.threeLeveData.push(item)
+ // if (!item.saleMethod.length) this.data.threeLeveData.push(item)
+ if (!item.saleMethod.length) {
+ // 娌′拱涓旀棤閿�鍞柟寮�
+ this.data.threeLeveData.push(item)
} else {
- if (!item.saleMethod.length) this.data.threeLeveData.push(item)
+ // 娌′拱涓旈攢鍞柟寮忚繃鏈�//娌′拱锛岄攢鍞柟寮忎环鏍间负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)
}
}
}
}
+ // }
});
- 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.freeFile
- showDataUrl = app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + file + '&token=' + wx.getStorageSync(app.config.tokenKey);
+ 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 {
- showDataUrl = datas.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + datas.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + datas.freeFile
+ this.setData({
+ threeLeveData: []
+ })
}
- titleName = datas.name;
+ } else {
+ this.setData({
+ threeLeveData: this.data.threeLeveData
+ })
}
+ 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.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
+ }
+ titleName = datas.name;
+ }
- this.setData({
- threeLeveData: this.data.threeLeveData,
- selectedId: selectedId,
- showData: showDataUrl,
- titleName: titleName,
- loading: false,
- hidden: false
- });
- console.log(1, this.data);
- this.pubulicPlayFun();
+ this.setData({
+ threeLeveData: this.data.threeLeveData,
+ selectedId: selectedId,
+ showData: showDataUrl,
+ titleName: titleName,
+ loading: false,
+ hidden: false,
+ toView: 'activeName' + selectedId,
+ });
+ this.pubulicPlayFun();
+ } else {
+ wx.showToast({
+ icon: 'none',
+ title: '璇峰厛杩斿洖璧勬簮鎵�鍦ㄥ浘涔﹁鎯呰喘涔拌棰戣祫婧�',
+ })
+ wx.navigateTo({
+ url: `/packageBookService/pages/bookServices/detail/index?id=${this.data.bookDetail.id}&name=${this.data.bookDetail.name}&tabValue=jsek_cloudLearning`,
+ });
+ }
});
},
@@ -440,7 +487,7 @@
})
if (item.selectType == "audio" || item.learnSelectType === "audio") {
if (this.data.formPath == 'jsek_cloudLearning') {
- let file = item.protectedFile ? item.protectedFile : item.file
+ let file = item.protectedFile ? item.protectedFile : item.freeFile
// 杩欓噷澶勭悊浜戝涔犵殑
this.setData({
showData: app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + file + '&token=' + wx.getStorageSync(app.config.tokenKey)
@@ -450,7 +497,6 @@
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()
}
}
@@ -856,6 +902,8 @@
})
},
setPlayerList() {
+ const token = wx.getStorageSync(app.config.tokenKey);
+ if (!token) return
let that = this
if (that.data.progress > 0) {
let index = that.data.playerList.findIndex((itemData) => itemData.cmsItemId == that.data.activeId)
--
Gitblit v1.9.1