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 | 527 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 432 insertions(+), 95 deletions(-)
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.js b/packageDomain/pages/resourceDetails/myVideo/index.js
index 5033850..3d65fe1 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.js
+++ b/packageDomain/pages/resourceDetails/myVideo/index.js
@@ -1,6 +1,9 @@
// pages/resourceDetails/index.js
const app = getApp()
-
+import {
+ loginInfo
+} from '../../../../assets/js/login';
+import moment from 'moment'
Page({
/**
@@ -16,19 +19,23 @@
dialogKey: false,
style: 'border: 2rpx solid rgba(220,220,220,1);border-radius: 12rpx;',
activeId: '',
+ storeInfo: '',
bookId: '',
bookName: '',
cmsId: '',
parentName: '',
parentProductLinkPath: '',
productLinkPath: '',
+ isBuy: false,
threeLeveData: [],
+ source: "",
showData: '',
+ showDataVod: '',
src: '',
selectedId: null,
topicId: '',
titleName: '',
- submitTitle: "",
+ submitTitle: "1",
inputStyle: 'border: 2rpx solid rgba(220,220,220,1);border-radius: 12rpx; padding:16rpx',
textvalue: '',
style: 'height: 248rpx',
@@ -38,9 +45,22 @@
startTime: "", //杩涘叆椤甸潰褰撳墠鏃堕棿
pauseTime: 0, //鏆傚仠鏃堕棿
formPath: '',
- loading: true,
+ loading: false,
hidden: true,
- videoError: false
+ videoError: false,
+ videoLoading: false,
+ progress: 0,
+ playerList: [],
+ videoLoading: true,
+ buyIdList: [],
+ buyList: [],
+ learnClassData: null,
+ isLearnDataBuy: false,
+ bookDetail: null,
+ learnStartTime: 0,
+ learnTimeList: [],
+ learnTimeData: 0,
+ toView: 'activeName',
},
// 鏍煎紡鍖栫瑪璁版椂闂�
convertTimestamp(timestamp) {
@@ -64,34 +84,32 @@
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
- console.log(options, 'options');
this.setData({
navBarHeight: navBarHeight,
barHeight: systInfo.statusBarHeight,
activeId: options.activeId,
+ storeInfo: options.storeInfo,
bookId: options.bookId,
bookName: options.bookName,
cmsId: options.cmsId,
parentProductLinkPath: options.parentProductLinkPath,
productLinkPath: options.productLinkPath,
formPath: options.formPath,
- flag: false
+ flag: false,
+ source: options.source,
})
if (options.parentName !== "鏁欏璧勬簮" && options.parentName !== "浜戝涔�") {
this.setData({
parentName: options.parentName,
})
}
- console.log(options, 'options');
- this.resourceDetailsData()
- this.getNoteList()
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
- */
- onReady() {
-
+ if (options.formPath == 'jsek_cloudLearning') {
+ this.setData({
+ learnStartTime: Date.now(),
+ })
+ this.getLearnTime()
+ }
+ this.getBookInfo(this.data.bookId)
},
/**
@@ -101,7 +119,6 @@
this.setData({
startTime: Date.now()
})
-
},
/**
@@ -114,7 +131,12 @@
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()
},
/**
@@ -128,6 +150,127 @@
let duration = this.data.pauseTime - this.data.startTime
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 = {
+ path: "*",
+ queryType: "*",
+ productId: id,
+ favoriteTypes: "FavoriteBookCity",
+ itemFields: {
+ "SysType=": "CmsFolder",
+ },
+ coverSize: {
+ height: 1,
+ },
+ fields: {},
+ };
+ if (this.data.storeInfo) query['storeInfo'] = this.data.storeInfo
+ app.MG.store.getProductDetail(query).then(async (res) => {
+ 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()
+ }
+ });
+ },
+ // 鏁欏璧勬簮 浜戝涔� 鑾峰彇
+ 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(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
+ })
+ this.resourceDetailsData()
+ })
},
count(timeStr) {
const data = {
@@ -147,32 +290,11 @@
}
app.MG.job.newJobWithApiNewEvent(data).then((res) => {})
},
- /**
- * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
- */
- onReachBottom() {
-
- },
-
- /**
- * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
- */
- onShareAppMessage() {
-
- },
onTabsChange(event) {
-
- },
-
- onTabsClick(event) {
-
+ let tabValue = event.detail.value
+ if (tabValue == '1') {
+ this.getNoteList()
+ }
},
handleChange(e) {
this.setData({
@@ -183,13 +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({
@@ -202,7 +327,12 @@
wx.navigateBack();
},
resourceDetailsData() {
+ this.setData({
+ videoLoading: true,
+ loading: true
+ })
let query = {
+ storeInfo: this.data.storeInfo,
path: '*',
queryType: '*',
productId: this.data.bookId,
@@ -227,63 +357,252 @@
}
}
app.MG.store.getProductDetail(query).then(res => {
- res.datas.cmsDatas[0].datas.forEach((item) => {
- console.log(item);
- if (item.selectType === "video" || item.learnSelectType === "video") {
- 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 ? file = items.protectedFile : file = items.freeFile
- this.setData({
- showData: app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + file + '&token=' + wx.getStorageSync(app.config.tokenKey),
- titleName: items.name
- })
- } else {
- this.setData({
- showData: item.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.freeFile,
- titleName: items.name
- })
- }
- let selectedIndex = index; // 瀛樺偍閫変腑椤圭殑绱㈠紩
- this.setData({
- selectedId: selectedIndex // 璁剧疆閫変腑椤圭殑绱㈠紩
- });
- }
- });
- }
+ this.setData({
+ isBuy: res.datas.purchasedSaleMethodIdList.includes(res.datas.defaultSaleMethodId)
})
+ res.datas.cmsDatas[0].datas.forEach((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 (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 (!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)
+ }
+ }
+ }
+
+ }
+ // }
+ })
+ 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
+ hidden: false,
+ toView: 'activeName' + this.data.selectedId,
})
- console.log('鍦板潃', this.data.showData);
})
},
onVideo(e) {
+ this.setPlayerList()
const item = e.currentTarget.dataset.item
this.setData({
- selectedId: e.currentTarget.dataset.index,
- showData: '',
- titleName: item.name
+ videoLoading: true,
})
if (item.selectType == "video" || item.learnSelectType === "video") {
if (this.data.formPath === "jsek_cloudLearning") {
+ const flag = this.cmsItemIsBuy(item)
let file
- item.protectedFile ? file = item.protectedFile : file = item.freeFile
+ 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)
})
- console.log(this.data.showData);
+ 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)
}
+ }
+ },
+
+ aliVod(md5, currentVideo) {
+ 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 {
+ return wx.showToast({
+ icon: 'error',
+ title: '鏃犳硶鑾峰彇瑙嗛璧勬簮',
+ })
+ }
+ })
+ } else {
+ return wx.showToast({
+ icon: 'error',
+ title: '鏆傛棤瑙嗛璧勬簮',
+ })
+ }
+ },
+
+ timeUpdate(e) {
+ let {
+ currentTime,
+ duration
+ } = e.detail
+
+ this.setData({
+ progress: ((currentTime / duration) * 100).toFixed(2)
+ })
+ },
+ //鑾峰彇瑙嗛瀛︿範
+ getPlayerList() {
+ app.MG.identity
+ .getUserKey({
+ domain: 'videoPlayer',
+ keys: [this.data.bookId]
+ })
+ .then((res) => {
+ if (res.length > 0) {
+ this.setData({
+ playerList: JSON.parse(res[0].value)
+ })
+ }
+ })
+ },
+ 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)
+ if (index > -1) {
+ that.data.playerList.splice(index, 1)
+ }
+ that.data.playerList.push({
+ cmsItemId: that.data.activeId,
+ progress: that.data.progress
+ })
+ app.MG.identity
+ .setUserKey({
+ setKeyRequests: [{
+ domain: 'videoPlayer',
+ key: that.data.bookId,
+ value: JSON.stringify(that.data.playerList)
+ }]
+ })
+ .then((res) => {})
}
},
@@ -342,8 +661,6 @@
} else if (this.data.submitType == 'edit') {
this.updateNote()
}
- console.log(this.data.textvalue);
- console.log(this.data.titleName);
this.setData({
dialogKey: false
});
@@ -356,13 +673,11 @@
textvalue: e.detail.value
})
},
-
-
// 鑾峰彇绗旇鍒楄〃
async getNoteList() {
- // this.setData({
- // loading: true
- // })
+ this.setData({
+ loading: true
+ })
let topicId
await app.MG.ugc
.getProductUserSubmitTopic({
@@ -396,9 +711,8 @@
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')
})
- console.log(res, 'res');
this.setData({
"pageCount.total": res.totalSize,
noteList: res.datas,
@@ -539,9 +853,32 @@
console.log(e);
},
videoError: function (e) {
- console.log('瑙嗛鍔犺浇澶辫触', e);
this.setData({
videoError: true
});
+ },
+ loadedmetadata(e) {
+ 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