From 04c7b0163caeae4ab1c5da62e301fa993101cfad Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期一, 31 三月 2025 10:40:45 +0800
Subject: [PATCH] bug修改
---
packageDomain/pages/resourceDetails/myVideo/index.js | 117 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 78 insertions(+), 39 deletions(-)
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.js b/packageDomain/pages/resourceDetails/myVideo/index.js
index 24190cd..3d65fe1 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.js
+++ b/packageDomain/pages/resourceDetails/myVideo/index.js
@@ -59,7 +59,8 @@
bookDetail: null,
learnStartTime: 0,
learnTimeList: [],
- learnTimeData: 0
+ learnTimeData: 0,
+ toView: 'activeName',
},
// 鏍煎紡鍖栫瑪璁版椂闂�
convertTimestamp(timestamp) {
@@ -102,27 +103,13 @@
parentName: options.parentName,
})
}
- const token = wx.getStorageSync(app.config.tokenKey)
- if (!token) {
- loginInfo(app, (data) => {
- if (options.formPath == 'jsek_cloudLearning') {
- this.setData({
- learnStartTime: Date.now(),
- })
- this.getLearnTime()
- }
- this.getBookInfo(this.data.bookId)
+ if (options.formPath == 'jsek_cloudLearning') {
+ this.setData({
+ learnStartTime: Date.now(),
})
- } else {
- if (options.formPath == 'jsek_cloudLearning') {
- this.setData({
- learnStartTime: Date.now(),
- })
- this.getLearnTime()
- }
- this.getBookInfo(this.data.bookId)
+ this.getLearnTime()
}
-
+ this.getBookInfo(this.data.bookId)
},
/**
@@ -318,11 +305,16 @@
},
showDialog(e) {
- this.setData({
- dialogKey: true,
- textvalue: '',
- submitTitle: this.data.titleName
- });
+ const token = wx.getStorageSync(app.config.tokenKey);
+ if (token) {
+ this.setData({
+ dialogKey: true,
+ textvalue: '',
+ submitTitle: this.data.titleName
+ });
+ } else {
+ loginInfo(app, (data) => {})
+ }
},
closeDialog() {
this.setData({
@@ -369,11 +361,6 @@
isBuy: res.datas.purchasedSaleMethodIdList.includes(res.datas.defaultSaleMethodId)
})
res.datas.cmsDatas[0].datas.forEach((item) => {
- // if (this.data.source == 'qrcode') {
- // if (item.id == this.data.activeId) {
- // this.data.threeLeveData.push(item);
- // }
- // } else {
if (item.selectType === "video" || item.learnSelectType === "video") {
if (this.data.storeInfo == 'jsek_digitalCourses') {
// if (item.sysType == 'CmsItem') this.data.threeLeveData.push(item)
@@ -433,14 +420,25 @@
this.data.threeLeveData.forEach((items, index) => { // 淇敼姝ゅ娣诲姞index鍙傛暟
if (this.data.productLinkPath == items.productLinkPath) {
if (this.data.formPath === "jsek_cloudLearning") {
+ const flag = this.cmsItemIsBuy(items)
let file
- items.protectedFile || items.file ? file = items.protectedFile || items.file : file = items.freeFile
+ if (flag) {
+ file = items.protectedFile || items.file ? file = items.protectedFile || items.file : file = items.freeFile
+ } else {
+ if (items.freeFile) {
+ file = items.freeFile
+ } else {
+ file = ''
+ wx.showToast({
+ title: '鏆傛棤鍏嶈垂璧勬簮',
+ })
+ }
+ }
this.setData({
showData: app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + file + '&token=' + wx.getStorageSync(app.config.tokenKey),
titleName: items.name
})
this.aliVod(file, this.data.showData)
-
} else {
this.setData({
showData: items.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + items.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + items.freeFile,
@@ -449,6 +447,7 @@
this.aliVod(items.file, this.data.showData)
}
let selectedIndex = index; // 瀛樺偍閫変腑椤圭殑绱㈠紩
+ console.log(selectedIndex, "selectedIndex")
this.setData({
selectedId: selectedIndex // 璁剧疆閫変腑椤圭殑绱㈠紩
});
@@ -467,6 +466,7 @@
this.setData({
loading: false,
hidden: false,
+ toView: 'activeName' + this.data.selectedId,
})
})
},
@@ -475,23 +475,41 @@
const item = e.currentTarget.dataset.item
this.setData({
videoLoading: true,
- selectedId: e.currentTarget.dataset.index,
- activeId: item.id,
- // showData: '',
- titleName: item.name
})
-
if (item.selectType == "video" || item.learnSelectType === "video") {
if (this.data.formPath === "jsek_cloudLearning") {
- let file =
- item.protectedFile || item.file ? file = item.protectedFile || item.file : file = item.freeFile
+ const flag = this.cmsItemIsBuy(item)
+ let file
+ if (flag) {
+ file =
+ item.protectedFile || item.file ? file = item.protectedFile || item.file : file = item.freeFile
+ } else {
+ if (item.freeFile) {
+ file = item.freeFile
+ } else {
+ file = ''
+ this.setData({
+ videoLoading: false
+ })
+ return wx.showToast({
+ icon: 'error',
+ title: '鏆傛棤鍏嶈垂璧勬簮',
+ })
+ }
+ }
this.setData({
+ selectedId: e.currentTarget.dataset.index,
+ activeId: item.id,
+ titleName: item.name,
showData: app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + file + '&token=' + wx.getStorageSync(app.config.tokenKey)
})
this.aliVod(file, this.data.showData)
} else {
this.setData({
showData: item.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.freeFile,
+ selectedId: e.currentTarget.dataset.index,
+ activeId: item.id,
+ titleName: item.name
})
this.aliVod(item.file, this.data.showData)
}
@@ -564,6 +582,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)
@@ -841,5 +861,24 @@
this.setData({
videoLoading: false
})
+ },
+ // 鍒ゆ柇褰撳墠鐐瑰嚮鐨勬暟鎹槸鍚﹁喘涔�
+ cmsItemIsBuy(item) {
+ let flag = false
+ // 涔颁簡
+ if (this.data.buyList.length) {
+ if (this.data.buyList.some(citem => item.productLinkPath.includes(citem.productLinkPath)))
+ flag = true
+ } else {
+ // 娌′拱涓旀棤閿�鍞柟寮�
+ if (!item.saleMethod.length) {
+ flag = true
+ } else {
+ // 娌′拱涓旈攢鍞柟寮忚繃鏈�//娌′拱锛岄攢鍞柟寮忎环鏍间负0
+ const itemSaleMethod = item.saleMethod.find(citem => citem.SaleType == 'Normal')
+ if (new Date().getTime() > new Date(itemSaleMethod.EndDate).getTime() || itemSaleMethod.Price == 0) flag = true
+ }
+ }
+ return flag
}
})
\ No newline at end of file
--
Gitblit v1.9.1