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 | 173 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 134 insertions(+), 39 deletions(-)
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.js b/packageDomain/pages/resourceDetails/myVideo/index.js
index ef8f945..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({
/**
@@ -50,7 +51,14 @@
videoLoading: false,
progress: 0,
playerList: [],
- videoLoading: true
+ videoLoading: true,
+ buyIdList: [],
+ buyList: [],
+ learnClassData: null,
+ bookDetail: null,
+ learnStartTime: 0,
+ learnTimeList: [],
+ learnTimeData: 0
},
// 鏍煎紡鍖栫瑪璁版椂闂�
convertTimestamp(timestamp) {
@@ -106,13 +114,13 @@
} else {
this.resourceDetailsData()
}
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
- */
- onReady() {
-
+ if (options.formPath == 'jsek_cloudLearning') {
+ this.setData({
+ learnStartTime: Date.now(),
+ })
+ this.getLearnTime()
+ }
+ this.getBookInfo(options.bookId)
},
/**
@@ -151,6 +159,106 @@
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) {
+ const query = {
+ path: "*",
+ queryType: "*",
+ productId: id,
+ favoriteTypes: "FavoriteBookCity",
+ itemFields: {
+ "SysType=": "CmsFolder",
+ },
+ coverSize: {
+ height: 1,
+ },
+ fields: {},
+ };
+ 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)
+ });
+ },
+ // 鏁欏璧勬簮 浜戝涔� 鑾峰彇
+ 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(learnClassData)
+ }
+ this.setData({
+ buyList
+ })
+ console.log('浜戝涔�', buyList);
+ })
},
count(timeStr) {
const data = {
@@ -170,25 +278,7 @@
}
app.MG.job.newJobWithApiNewEvent(data).then((res) => {})
},
- /**
- * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
- */
- onPullDownRefresh() {
- },
-
- /**
- * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
- */
- onReachBottom() {
-
- },
-
- /**
- * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
- */
- onShareAppMessage() {},
- onShareTimeline() {},
onTabsChange(event) {
console.log(event, 234)
let tabValue = event.detail.value
@@ -254,15 +344,9 @@
}
}
app.MG.store.getProductDetail(query).then(res => {
- if (res.datas.purchasedSaleMethodIdList.includes(res.datas.defaultSaleMethodId)) {
- this.setData({
- isBuy: true
- })
- } else {
- this.setData({
- isBuy: false
- })
- }
+ this.setData({
+ 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) {
@@ -271,6 +355,7 @@
} 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)
@@ -281,8 +366,19 @@
}
}
} else {
- if (res.datas.purchasedSaleMethodIdList.includes(item.defaultSaleMethodId) || item.freeFile) {
- this.data.threeLeveData.push(item)
+ // 涔颁簡
+ 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)
+ }
}
}
this.setData({
@@ -425,7 +521,6 @@
}
},
-
getProductUserSubmitTopicGet() {
app.MG.ugc.getProductUserSubmitTopic({
productId: this.data.bookId,
@@ -531,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