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 | 396 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 278 insertions(+), 118 deletions(-)
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.js b/packageDomain/pages/resourceDetails/myVideo/index.js
index d617ffb..3d65fe1 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.js
+++ b/packageDomain/pages/resourceDetails/myVideo/index.js
@@ -3,6 +3,7 @@
import {
loginInfo
} from '../../../../assets/js/login';
+import moment from 'moment'
Page({
/**
@@ -54,7 +55,12 @@
buyIdList: [],
buyList: [],
learnClassData: null,
- bookDetail: null
+ isLearnDataBuy: false,
+ bookDetail: null,
+ learnStartTime: 0,
+ learnTimeList: [],
+ learnTimeData: 0,
+ toView: 'activeName',
},
// 鏍煎紡鍖栫瑪璁版椂闂�
convertTimestamp(timestamp) {
@@ -72,7 +78,6 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
- console.log('璧勬簮', options);
wx.setNavigationBarTitle({
title: '璧勬簮璇︽儏-瑙嗛'
});
@@ -98,19 +103,13 @@
parentName: options.parentName,
})
}
- const token = wx.getStorageSync(app.config.tokenKey)
- if (!token) {
- loginInfo(app, (data) => {
- if (data) {
- this.resourceDetailsData()
- } else {
- this.resourceDetailsData()
- }
+ if (options.formPath == 'jsek_cloudLearning') {
+ this.setData({
+ learnStartTime: Date.now(),
})
- } else {
- this.resourceDetailsData()
+ this.getLearnTime()
}
- if (options.formPath == 'jsek_cloudLearning') this.getBookInfo(options.bookId)
+ this.getBookInfo(this.data.bookId)
},
/**
@@ -120,7 +119,6 @@
this.setData({
startTime: Date.now()
})
-
},
/**
@@ -133,6 +131,10 @@
if (wx.getStorageSync(app.config.tokenKey)) {
let duration = this.data.pauseTime - this.data.startTime
this.count(duration)
+ if (this.data.formPath == 'jsek_cloudLearning') {
+ let cloudDuration = this.data.pauseTime - this.data.learnStartTime
+ this.cloudCount(cloudDuration)
+ }
}
this.setPlayerList()
},
@@ -149,8 +151,52 @@
this.count(duration)
}
this.setPlayerList()
+ if (this.data.formPath == 'jsek_cloudLearning') {
+ let cloudDuration = this.data.pauseTime - this.data.learnStartTime
+ this.cloudCount(cloudDuration)
+ }
},
-
+ 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 = {
@@ -166,14 +212,20 @@
},
fields: {},
};
+ 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,
- learnClassData: res.datas.cmsDatas[0].datas.find(item => item.refCode == "jsek_cloudLearning")
- })
- this.getResourceDataList(this.data.learnClassData)
+ try {
+ this.setData({
+ bookDetail: res.datas,
+ buyIdList: res.datas.purchasedSaleMethodIdList,
+ learnClassData: res.datas.cmsDatas[0].datas.length > 0 ? res.datas.cmsDatas[0].datas.find(item => item.refCode == "jsek_cloudLearning") : null
+ })
+ } catch (error) {}
+ if (this.data.learnClassData) {
+ this.getResourceDataList(this.data.learnClassData)
+ } else {
+ this.resourceDetailsData()
+ }
});
},
// 鏁欏璧勬簮 浜戝涔� 鑾峰彇
@@ -196,12 +248,28 @@
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(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
+ })
+ }
+ }
+ } else {
+ this.setData({
+ isLearnDataBuy: true
+ })
}
this.setData({
- buyList
+ buyList: buyList
})
- console.log('浜戝涔�', buyList);
+ this.resourceDetailsData()
})
},
count(timeStr) {
@@ -222,15 +290,12 @@
}
app.MG.job.newJobWithApiNewEvent(data).then((res) => {})
},
-
onTabsChange(event) {
- console.log(event, 234)
let tabValue = event.detail.value
if (tabValue == '1') {
this.getNoteList()
}
},
-
handleChange(e) {
this.setData({
activeValues: e.detail.value,
@@ -240,12 +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({
@@ -292,71 +361,112 @@
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)
- // 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.selectType === "video" || item.learnSelectType === "video") {
+ if (this.data.storeInfo == 'jsek_digitalCourses') {
+ // if (item.sysType == 'CmsItem') this.data.threeLeveData.push(item)
+ if (this.data.isBuy) {
+ if (item.sysType == 'CmsItem') {
+ 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 {
- // 娌′拱涓旈攢鍞柟寮忚繃鏈�
- const itemSaleMethod = item.saleMethod.find(citem => citem.SaleType == 'Normal')
- if (new Date().getTime() > new Date(itemSaleMethod.EndDate).getTime()) this.data.threeLeveData.push(item)
- }
+ if (item.sysType == 'CmsItem' && item.freeFile) {
+ this.data.threeLeveData.push(item)
}
}
- this.setData({
- threeLeveData: this.data.threeLeveData
- })
- }
- }
- })
- this.data.threeLeveData.forEach((items, index) => { // 淇敼姝ゅ娣诲姞index鍙傛暟
- if (this.data.productLinkPath == items.productLinkPath) {
- if (this.data.formPath === "jsek_cloudLearning") {
- let file
- items.protectedFile || items.file ? file = items.protectedFile || items.file : file = items.freeFile
- 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,
- titleName: items.name
- })
- this.aliVod(items.file, this.data.showData)
+ // 涔颁簡
+ 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.freeFile) this.data.threeLeveData.push(item)
+ }
+ }
}
- let selectedIndex = index; // 瀛樺偍閫変腑椤圭殑绱㈠紩
- this.setData({
- selectedId: selectedIndex // 璁剧疆閫変腑椤圭殑绱㈠紩
- });
+
}
- });
+ // }
+ })
+ 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 {
+ this.setData({
+ threeLeveData: []
+ })
+ }
+ } else {
+ this.setData({
+ threeLeveData: this.data.threeLeveData
+ })
+ }
+ if (this.data.threeLeveData.length > 0) {
+ 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
+ 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,
+ titleName: items.name
+ })
+ this.aliVod(items.file, this.data.showData)
+ }
+ let selectedIndex = index; // 瀛樺偍閫変腑椤圭殑绱㈠紩
+ console.log(selectedIndex, "selectedIndex")
+ this.setData({
+ selectedId: selectedIndex // 璁剧疆閫変腑椤圭殑绱㈠紩
+ });
+ }
+ });
+ } 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`,
+ });
+
+ }
this.setData({
loading: false,
hidden: false,
+ toView: 'activeName' + this.data.selectedId,
})
})
},
@@ -365,22 +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)
}
@@ -388,41 +517,51 @@
},
aliVod(md5, currentVideo) {
- let query = {
- md5: md5,
- appRefCode: app.config.appRefCode
- }
- app.MG.file.getAliVod(query).then((res) => {
- if (res) {
- if (res && res.data == '') {
+ if (md5) {
+ let query = {
+ md5: md5,
+ appRefCode: app.config.appRefCode
+ }
+ app.MG.file.getAliVod(query).then((res) => {
+ if (res) {
+ if (res && res.data == '') {
+ this.setData({
+ showDataVod: currentVideo,
+ videoLoading: false,
+ })
+ } else {
+ this.setData({
+ showDataVod: res,
+ videoLoading: false,
+ })
+ }
+ this.setData({})
+ } else if (currentVideo) {
this.setData({
showDataVod: currentVideo,
videoLoading: false,
})
} else {
- this.setData({
- showDataVod: res,
- videoLoading: false,
+ return wx.showToast({
+ icon: 'error',
+ title: '鏃犳硶鑾峰彇瑙嗛璧勬簮',
})
}
- this.setData({})
- } else if (currentVideo) {
- this.setData({
- showDataVod: currentVideo,
- videoLoading: false,
- })
- } else {
- return ElMessage.error('鏃犳硶鑾峰彇瑙嗛璧勬簮')
- }
- })
+ })
+ } else {
+ return wx.showToast({
+ icon: 'error',
+ title: '鏆傛棤瑙嗛璧勬簮',
+ })
+ }
},
timeUpdate(e) {
- console.log(2);
let {
currentTime,
duration
} = e.detail
+
this.setData({
progress: ((currentTime / duration) * 100).toFixed(2)
})
@@ -443,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)
@@ -570,7 +711,7 @@
res.datas.forEach((item) => {
// item.compliceHover = false
// item.deleteHover = false
- item.createDate = this.convertTimestamp(item.createDate)
+ item.createDate = moment(item.createDate).format('YYYY-MM-DD HH:mm:ss')
})
this.setData({
"pageCount.total": res.totalSize,
@@ -720,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