From b8e3dc3c89fcc278ed8fe409c09fe938bdda0e23 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 26 九月 2024 11:31:04 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packageDomain/pages/resourceDetails/myVideo/index.js | 94 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 79 insertions(+), 15 deletions(-)
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.js b/packageDomain/pages/resourceDetails/myVideo/index.js
index 54d914b..41f8562 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,10 @@
buyIdList: [],
buyList: [],
learnClassData: null,
- bookDetail: null
+ bookDetail: null,
+ learnStartTime: 0,
+ learnTimeList: [],
+ learnTimeData: 0
},
// 鏍煎紡鍖栫瑪璁版椂闂�
convertTimestamp(timestamp) {
@@ -110,7 +114,13 @@
} else {
this.resourceDetailsData()
}
- if (options.formPath == 'jsek_cloudLearning') this.getBookInfo(options.bookId)
+ if (options.formPath == 'jsek_cloudLearning') {
+ this.setData({
+ learnStartTime: Date.now(),
+ })
+ this.getLearnTime()
+ }
+ this.getBookInfo(options.bookId)
},
/**
@@ -149,7 +159,53 @@
this.count(duration)
}
this.setPlayerList()
+ if (this.data.fromPath == '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) {
@@ -298,23 +354,31 @@
}
} 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.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)
+
+ 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)
+ }
}
}
this.setData({
@@ -562,7 +626,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,
--
Gitblit v1.9.1