From 8f3c61c740322c6a9eb5314a05e43016a5f2191c Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期日, 13 七月 2025 18:17:41 +0800
Subject: [PATCH] 资源扫码
---
packageDomain/pages/resourceDetails/document/index.js | 160 +++++++++++------
packageBookService/pages/bookServices/detail/components/tree/index.js | 8
packageDomain/pages/resourceDetails/myVideo/index.js | 166 +++++++++++-------
packageDomain/pages/resourceDetails/myAudio/index.js | 183 ++++++++++---------
4 files changed, 300 insertions(+), 217 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.js b/packageBookService/pages/bookServices/detail/components/tree/index.js
index a36aa4a..2456492 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -111,7 +111,6 @@
const flag = list.findIndex((item) => item.checked == true);
},
},
-
methods: {
handleList(tree) {
for (let index = 0; index < tree.length; index++) {
@@ -281,7 +280,8 @@
url = "/packageDomain/pages/resourceDetails/document/index";
}
wx.navigateTo({
- url: `${url}?productLinkPath=${item.productLinkPath}&parentProductLinkPath=${parentProductLinkPath}&parentName=${parentName}&activeId=${item.id}&bookId=${this.properties.bookInfo.id}&bookName=${this.properties.bookInfo.name}&cmsId=${this.properties.bookInfo.rootCmsItemId}&formPath=${this.properties.tab}&applyState=${this.properties.applyState}&deadline=${this.properties.deadline}`,
+ // url: `${url}?productLinkPath=${item.productLinkPath}&parentProductLinkPath=${parentProductLinkPath}&parentName=${parentName}&activeId=${item.id}&bookId=${this.properties.bookInfo.id}&bookName=${this.properties.bookInfo.name}&cmsId=${this.properties.bookInfo.rootCmsItemId}&formPath=${this.properties.tab}&applyState=${this.properties.applyState}&deadline=${this.properties.deadline}`,
+ url: '/packageDomain/pages/resourceDetails/myVideo/index?formPath=jsek_cloudLearning&parentName=mingxing&cmsId=161796&productLinkPath=161796\\161798\\165396\\162299&activeId=162299&parentProductLinkPath=161798\\165396&source=qrcode&bookName=&bookId=7129'
});
}
const token = wx.getStorageSync(app.config.tokenKey);
@@ -293,7 +293,6 @@
goPlayerFun()
}
},
-
// 鎷垮埌鎵�鏈夐」
getAllChildren(id) {
let result = [];
@@ -338,7 +337,6 @@
});
return result;
},
-
// 鍙樹负true
findAndUpdateItemsByIds(tree, ids, state) {
function findAndUpdate(node) {
@@ -356,7 +354,6 @@
}
return tree; // 杩斿洖淇敼鍚庣殑瀹屾暣鏁扮粍
},
-
// 鍏ㄩ��
checkAll() {
wx.showLoading()
@@ -393,7 +390,6 @@
this.triggerEvent("changeCheckAll", myEventDetail, myEventOption);
wx.hideLoading()
},
-
// 绔犺妭鍕鹃��
checkResourceTitle(e) {
wx.showLoading()
diff --git a/packageDomain/pages/resourceDetails/document/index.js b/packageDomain/pages/resourceDetails/document/index.js
index 70a9293..3276d2a 100644
--- a/packageDomain/pages/resourceDetails/document/index.js
+++ b/packageDomain/pages/resourceDetails/document/index.js
@@ -1,3 +1,6 @@
+929710
+
+
// pages/resourceDetails/document/index.js
import Toast from 'tdesign-miniprogram/toast/index';
const app = getApp()
@@ -6,7 +9,6 @@
} from '../../../../assets/js/login';
import XLSX from '../../../../utils/xlsx.mini.min';
Page({
-
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
@@ -58,7 +60,6 @@
selectTypeData: '',
promptVisable: false,
showMd5: '',
- source: "",
confirmBtn: {
content: '纭畾',
variant: 'base',
@@ -88,7 +89,6 @@
applyState: options.applyState,
deadline: options.deadline,
formPath: options.formPath,
- source: options.source,
})
if (options.formPath == 'jsek_cloudLearning') {
this.setData({
@@ -98,14 +98,10 @@
}
this.getBookInfo(this.data.bookId)
},
-
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
*/
- onReady() {
-
- },
-
+ onReady() {},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
@@ -114,7 +110,6 @@
startTime: Date.now()
})
},
-
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
*/
@@ -131,7 +126,6 @@
}
}
},
-
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
*/
@@ -148,7 +142,6 @@
}
}
},
-
count(timeStr) {
const data = {
appRefCode: app.config.appRefCode,
@@ -211,15 +204,11 @@
/**
* 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
*/
- onPullDownRefresh() {
-
- },
-
+ onPullDownRefresh() {},
/**
* 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
*/
onReachBottom() {},
-
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
@@ -228,7 +217,6 @@
goBack() {
wx.navigateBack()
},
-
// 鑾峰彇鍥句功璇︽儏
getBookInfo(id) {
const query = {
@@ -305,6 +293,36 @@
})
},
+ // 鍒ゆ柇褰撳墠鐩爣鏄惁宸茶喘涔�
+ async getCmsDataByQrcode() {
+ let query = {
+ storeInfo: this.data.storeInfo,
+ path: '*',
+ queryType: '*',
+ productId: this.data.bookId,
+ itemId: this.data.activeId,
+ itemFields: {
+ // 璧勬簮绫诲瀷锛岃瘯璇绘枃浠讹紝鏄惁鍏佽涓嬭浇绛夊弬鏁�
+ selectType: [],
+ freeFile: [],
+ file: [],
+ protectedFile: [],
+ resourcesClassification: [],
+ isDownload: [],
+ jsek_resourceBrief: [],
+ jsek_link: [],
+ jsek_questionBank: [],
+ learnSelectType: []
+ },
+ pading: {
+ start: 0,
+ size: 999
+ }
+ }
+ const data = await app.MG.store.getProductDetail(query)
+ return data?.datas ?? []
+ },
+
resourceDetailsData() {
wx.showLoading({
title: '姝ｅ湪鍔犺浇...',
@@ -337,24 +355,18 @@
query.storeInfo = this.data.storeInfo
}
app.MG.store.getProductDetail(query).then(async (res) => {
- wx.hideLoading();
- const list = res.datas.cmsDatas[0]?.datas
- if (this.data.source == 'qrcode') {
- let qrData = res.datas.cmsDatas[0].datas.find(ditem => ditem.id == this.data.activeId)
- if (qrData) {
- this.setData({
- threeLeveData: [qrData]
- })
- }
- } else {
- this.setData({
- threeLeveData: []
- })
- }
this.setData({
isBuy: res.datas.purchasedSaleMethodIdList.includes(res.datas.defaultSaleMethodId)
})
- for (const item of list) {
+ res.datas.cmsDatas[0].datas.forEach((item) => {
+ if (this.data.productLinkPath == item.productLinkPath) {
+ this.handleTeachData(item)
+ this.setData({
+ titleName: item.name,
+ selectType: item.selectType,
+ learnSelectType: item.learnSelectType
+ })
+ }
if (this.data.storeInfo == 'jsek_digitalCourses') {
if (this.data.isBuy) {
if (this.data.productLinkPath == item.productLinkPath) {
@@ -366,34 +378,57 @@
}
}
} else {
- const isBuyCms = await app.MG.file.checkCmsItem({
- cmsItemId: Number(item.id)
- })
- item.isBuyCms = isBuyCms
- if (isBuyCms) {
- this.data.threeLeveData.push(item)
+ // 涔颁簡
+ if (this.data.buyList.length) {
+ if (this.data.buyList.some(citem => item.productLinkPath.includes(citem.productLinkPath))) {
+ if (this.data.productLinkPath == item.productLinkPath) {
+ this.data.threeLeveData.push(item)
+ }
+ }
} else {
- if (item.freeFile) {
- this.data.threeLeveData.push(item)
+ if (!item.saleMethod.length) {
+ // 娌′拱涓旀棤閿�鍞柟寮�
+ if (this.data.productLinkPath == item.productLinkPath) {
+ this.data.threeLeveData.push(item)
+ }
} else {
- wx.showModal({
- icon: 'error',
- title: '娓╅Θ鎻愮ず',
- content: '璇疯喘涔拌祫婧愶紝鍗冲皢杩斿洖璐拱椤�',
- confirmText: '纭畾',
- showCancel: false, // 鍏抽棴鍙栨秷鎸夐挳
- success: (cres) => {
- if (cres.confirm) {
- wx.navigateTo({
- url: '/packageBookService/pages/bookServices/detail/index?id=' + this.data.bookId + '&name=' + this.data.bookName + '&tabValue=' + this.data.formPath,
- })
- }
+ // 娌′拱涓旈攢鍞柟寮忚繃鏈�//娌′拱锛岄攢鍞柟寮忎环鏍间负0
+ const itemSaleMethod = item.saleMethod.find(citem => citem.SaleType == 'Normal')
+ if (new Date().getTime() > new Date(itemSaleMethod.EndDate).getTime() || itemSaleMethod.Price == 0) {
+ if (this.data.productLinkPath == item.productLinkPath) {
+ this.data.threeLeveData.push(item)
}
- });
- return; // 鐩存帴杩斿洖锛岄伩鍏嶆墽琛屽悗缁唬鐮�
+ }
+ // 娌′拱涓斿彧鏈夎瘯璇昏祫婧�
+ if (!item.file && item.freeFile) {
+ if (this.data.productLinkPath == item.productLinkPath) {
+ this.data.threeLeveData.push(item)
+ }
+ }
}
}
}
+ })
+ if (this.data.source == 'qrcode') {
+ let qrData = this.data.threeLeveData.find(ditem => ditem.id == this.data.activeId)
+ const currentSaleMaths = await this.getCmsDataByQrcode()
+ // 鍒ゆ柇鏄惁璐拱鐩綍
+ const catalg = currentSaleMaths?.saleMethod?.find(i => currentSaleMaths.purchasedSaleMethodIdList.includes(i.Id))
+ // 鍒ゆ柇鏄惁璐拱璧勬簮鏈韩
+ const ownCms = qrData.saleMethods?.find(i => currentSaleMaths.purchasedSaleMethodIdList.includes(i.Id))
+ if (catalg || ownCms) {
+ this.setData({
+ threeLeveData: [qrData]
+ })
+ } else {
+ this.setData({
+ threeLeveData: []
+ })
+ }
+ } else {
+ this.setData({
+ threeLeveData: this.data.threeLeveData
+ })
}
if (this.data.threeLeveData.length > 0) {
let item = this.data.threeLeveData[0]
@@ -403,6 +438,14 @@
selectType: item.selectType,
learnSelectType: item.learnSelectType,
})
+ } 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`,
+ // });
}
})
},
@@ -486,7 +529,7 @@
let that = this
//鍥剧墖
if (item.selectType == 'picture' || item.learnSelectType == 'picture') {
- const isBuy = item.isBuyCms
+ const isBuy = this.cmsItemIsBuy(item)
let file = isBuy ? item.protectedFile || item.file : item.freeFile
this.setData({
showData: app.config.requestCtx + '/file/api/ApiDownload?md5=' + file,
@@ -509,7 +552,7 @@
}
//鏂囨。绛�
if (item.selectType == 'document' || item.selectType == 'pdf' || item.learnSelectType == 'document' || item.learnSelectType == 'pdf') {
- const isBuy = item.isBuyCms
+ const isBuy = this.cmsItemIsBuy(item)
let md5 = isBuy ? item.protectedFile || item.file || item.freeFile : item.freeFile
if (item.fileMap[md5]?.extension == 'xlsx' || item.fileMap[md5]?.extension == 'xls') {
this.setData({
@@ -528,6 +571,7 @@
})
let worksheet = workbook.Sheets[workbook.SheetNames[0]]
let innerHTML = XLSX.utils.sheet_to_json(worksheet)
+ console.log(innerHTML)
that.setData({
naturalResources: innerHTML
})
@@ -559,7 +603,6 @@
}
}
},
-
onClick() {
this.setData({
images: [
@@ -576,19 +619,16 @@
} = e.detail;
console.log('change', index);
},
-
onDelete(e) {
const {
index
} = e.detail;
-
Toast({
context: this,
selector: '#t-toast',
message: `鍒犻櫎绗�${index + 1}涓猔,
});
},
-
onClose(e) {
const {
trigger
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index fddbf2f..409ae1c 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -7,7 +7,6 @@
// innerAudioContext.onPlay(function callback),
// InnerAudioContext.onTimeUpdate(function callback)
Page({
-
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
@@ -69,7 +68,6 @@
variant: 'base',
},
},
-
format(time) {
let minute = Math.floor(time / 60);
let second = Math.round(time % 60);
@@ -77,7 +75,6 @@
let secondStr = second < 10 ? "0" + second : "" + second;
return minuteStr + ":" + secondStr;
},
-
audio: null,
// 鏍煎紡鍖栫瑪璁版椂闂�
convertTimestamp(timestamp) {
@@ -91,7 +88,6 @@
const formattedDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
return formattedDate
},
-
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
@@ -131,13 +127,11 @@
this.resourceDetailsData()
this.getBookInfo(options.bookId)
},
-
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
*
*/
onReady() {},
-
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
@@ -153,7 +147,6 @@
})
})
},
-
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
*/
@@ -170,7 +163,6 @@
isplay: true
})
},
-
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
*
@@ -221,7 +213,6 @@
console.log('缁熻', data)
app.MG.job.newJobWithApiNewEvent(data).then((res) => {})
},
-
getLearnTime() {
app.MG.identity
.getUserKey({
@@ -327,7 +318,6 @@
})
})
},
-
onTabsChange(event) {},
onTabsClick(event) {},
handleChange(e) {
@@ -347,9 +337,7 @@
} else {
loginInfo(app, (data) => {})
}
-
},
-
closeDialog() {
this.setData({
dialogKey: false
@@ -358,6 +346,37 @@
goBack() {
wx.navigateBack();
},
+
+ // 鍒ゆ柇褰撳墠鐩爣鏄惁宸茶喘涔�
+ async getCmsDataByQrcode() {
+ let query = {
+ storeInfo: this.data.storeInfo,
+ path: '*',
+ queryType: '*',
+ productId: this.data.bookId,
+ itemId: this.data.activeId,
+ itemFields: {
+ // 璧勬簮绫诲瀷锛岃瘯璇绘枃浠讹紝鏄惁鍏佽涓嬭浇绛夊弬鏁�
+ selectType: [],
+ freeFile: [],
+ file: [],
+ protectedFile: [],
+ resourcesClassification: [],
+ isDownload: [],
+ jsek_resourceBrief: [],
+ jsek_link: [],
+ jsek_questionBank: [],
+ learnSelectType: []
+ },
+ pading: {
+ start: 0,
+ size: 999
+ }
+ }
+ const data = await app.MG.store.getProductDetail(query)
+ return data?.datas ?? []
+ },
+
resourceDetailsData() {
let query = {
path: '*',
@@ -390,67 +409,68 @@
let selectedId = -1; // 鍒濆鍖栭�変腑椤圭储寮�
let showDataUrl = '';
let titleName = '';
- const list = res.datas.cmsDatas[0]?.datas
+ res.datas.cmsDatas[0].datas.forEach((item, index) => {
+ if (item.selectType === "audio" || item.learnSelectType === "audio") {
+ if (this.data.storeInfo == 'jsek_digitalCourses') {
+ if (item.sysType == 'CmsItem') {
+ this.data.threeLeveData.push(item)
+ }
+ 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.protectedFile) && item.freeFile) {
+ const state = this.data.threeLeveData.find(citem => citem.id == item.id)
+ if (!state)
+ this.data.threeLeveData.push(item)
+ }
+ }
+ }
+ }
+ }
+ });
if (this.data.source == 'qrcode') {
- let qrData = res.datas.cmsDatas[0].datas.find(ditem => ditem.id == this.data.activeId)
- if (qrData) {
+ let qrData = this.data.threeLeveData.find(ditem => ditem.id == this.data.activeId)
+ const currentSaleMaths = await this.getCmsDataByQrcode()
+ // 鍒ゆ柇鏄惁璐拱鐩綍
+ const catalg = currentSaleMaths?.saleMethod?.find(i => currentSaleMaths.purchasedSaleMethodIdList.includes(i.Id))
+ // 鍒ゆ柇鏄惁璐拱璧勬簮鏈韩
+ const ownCms = qrData.saleMethods?.find(i => currentSaleMaths.purchasedSaleMethodIdList.includes(i.Id))
+ if (catalg || ownCms) {
this.setData({
threeLeveData: [qrData]
+ })
+ } else {
+ this.setData({
+ threeLeveData: []
})
}
} else {
this.setData({
- threeLeveData: []
+ threeLeveData: this.data.threeLeveData
})
- }
- for (const item of list) {
- if (item.selectType === "audio" || item.learnSelectType === "audio")
- if (this.data.storeInfo == 'jsek_digitalCourses') {
- 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 {
- const isBuyCms = await app.MG.file.checkCmsItem({
- cmsItemId: Number(item.id)
- })
- item.isBuyCms = isBuyCms
- if (isBuyCms) {
- this.data.threeLeveData.push(item)
- } else {
- if (item.freeFile) {
- this.data.threeLeveData.push(item)
- } else {
- wx.showModal({
- icon: 'error',
- title: '娓╅Θ鎻愮ず',
- content: '璇疯喘涔拌祫婧愶紝鍗冲皢杩斿洖璐拱椤�',
- confirmText: '纭畾',
- showCancel: false, // 鍏抽棴鍙栨秷鎸夐挳
- success: (cres) => {
- if (cres.confirm) {
- wx.navigateTo({
- url: '/packageBookService/pages/bookServices/detail/index?id=' + this.data.bookId + '&name=' + this.data.bookName + '&tabValue=' + this.data.formPath,
- })
- }
- }
- });
- return; // 鐩存帴杩斿洖锛岄伩鍏嶆墽琛屽悗缁唬鐮�
- }
- }
- }
}
if (this.data.threeLeveData.length > 0) {
selectedId = this.data.threeLeveData.findIndex(items => items.productLinkPath == this.data.productLinkPath)
if (selectedId !== -1) {
let datas = this.data.threeLeveData[selectedId];
if (this.data.formPath == 'jsek_cloudLearning') {
- let file = datas.isBuyCms ? datas.protectedFile || datas.freeFile : datas.freeFile
+ let file = this.cmsItemIsBuy(datas) ? datas.protectedFile || datas.freeFile : datas.freeFile
showDataUrl = app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + file + '&token=' + wx.getStorageSync(app.config.tokenKey);
} else {
showDataUrl = datas.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + datas.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + datas.freeFile
@@ -467,10 +487,26 @@
toView: 'activeName' + selectedId,
});
this.pubulicPlayFun();
+ } else {
+ wx.showModal({
+ title: '娓╅Θ鎻愮ず',
+ content: '璇ヨ祫婧愭湭璐拱锛屽皢杩斿洖璐拱',
+ success: (res) => {
+ if (res.confirm) {
+ if (this.data.source == 'qrcode') {
+ wx.navigateTo({
+ url: `/packageBookService/pages/bookServices/detail/index?id=${this.data.bookDetail.id}&name=${this.data.bookDetail.name}&tabValue=${this.data.formPath}`,
+ });
+ } else {
+ wx.navigateBack()
+ }
+ }
+ }
+ })
+
}
});
},
-
onVideo(e) {
this.setPlayerList()
this.setData({
@@ -503,7 +539,6 @@
}
}
},
-
getProductUserSubmitTopicGet() {
app.MG.ugc.getProductUserSubmitTopic({
productId: this.data.bookId,
@@ -514,7 +549,6 @@
})
})
},
-
newTopicMessageGet() {
let query = {
topicIdOrRefCode: topicId + '',
@@ -524,11 +558,8 @@
cmsTypeRefCode: '',
newDataListRequest: []
}
- app.MG.ugc.newTopicMessage(query).then(res => {
-
- })
+ app.MG.ugc.newTopicMessage(query).then(res => {})
},
-
// 鏍囬鏀瑰彉
changeTitle(e) {
this.setData({
@@ -541,14 +572,12 @@
submitTitle: e.detail.value
})
},
-
confirmSuggest() {
if (!this.data.textvalue.trim()) {
return wx.showToast({
icon: 'error',
title: '璇峰～鍐欑瑪璁板唴瀹�',
})
-
} else if (!this.data.submitTitle) {
return wx.showToast({
icon: 'error',
@@ -560,13 +589,10 @@
} else if (this.data.submitType == 'edit') {
this.updateNote()
}
-
this.setData({
dialogKey: false
});
-
this.getNoteList()
-
},
onTextarea() {},
textareaChange(e) {
@@ -574,7 +600,6 @@
textvalue: e.detail.value
})
},
-
// 鑾峰彇绗旇鍒楄〃
async getNoteList() {
// this.setData({
@@ -616,7 +641,6 @@
"pageCount.total": res.totalSize,
noteList: res.datas,
})
-
})
},
// 缂栬緫鎸夐挳
@@ -626,14 +650,11 @@
submitType: "edit",
textvalue: note.content,
submitTitle: note.name,
-
noteId: note.id,
dialogKey: true,
})
-
// this.showDialog()
},
-
// 鍒犻櫎绗旇
deleteNote(e) {
const id = e.currentTarget.dataset.id
@@ -761,11 +782,8 @@
});
}, 100);
});
-
-
//鎾斁浜嬩欢
myAudio.play();
-
// 鎾斁瀹屾垚澶勭悊锛屾寜閽彉涓�涓�
myAudio.onEnded((res) => {
this.setData({
@@ -778,7 +796,6 @@
myAudioPos: '',
})
});
-
//杩涘害鏉″彉鍖�
myAudio.onTimeUpdate(() => {
myAudio.startTime = 0
@@ -791,7 +808,6 @@
// console.log(myAudio.currentTime.toFixed(3), myAudio.duration);
})
},
-
//鎾斁
play() {
myAudio.startTime = this.data.myAudioCurrent; //鑰冭檻鍒拌繘搴︽潯琚嫋鍔紝涓嶄竴瀹氫粠00:00:00寮�濮�
@@ -800,7 +816,6 @@
isplay: false
});
},
-
// 鍋滄
stop() {
myAudio.pause();
@@ -808,7 +823,6 @@
isplay: true
});
},
-
// 鎾斁鍊嶉��
onSpeed() {
let c = this.data.speed;
@@ -823,13 +837,11 @@
speed: c,
})
}
-
setTimeout(() => {
myAudio.startTime = this.data.myAudioDuration //寮�濮嬫椂闂�
myAudio.playbackRate = this.data.speed; // 鎾斁閫熺巼
}, 200);
},
-
// 鎷栧姩杩涘害鏉★紝鍒版寚瀹氫綅缃�
hanle_slider_change(e) {
const position = e.detail.value;
@@ -840,7 +852,6 @@
myAudioCurrent: this.format(currentTime)
})
},
-
toggleDropdown() {
this.setData({
showDropdown: !this.data.showDropdown
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.js b/packageDomain/pages/resourceDetails/myVideo/index.js
index c4eece8..efda51a 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.js
+++ b/packageDomain/pages/resourceDetails/myVideo/index.js
@@ -5,7 +5,6 @@
} from '../../../../assets/js/login';
import moment from 'moment'
Page({
-
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
@@ -66,8 +65,7 @@
content: '纭畾',
variant: 'base',
},
- showMd5: '',
- isBuyCms: false
+ showMd5: ''
},
// 鏍煎紡鍖栫瑪璁版椂闂�
convertTimestamp(timestamp) {
@@ -97,6 +95,8 @@
activeId: options.activeId,
storeInfo: options.storeInfo,
bookId: options.bookId,
+ bookName: options.bookName,
+ cmsId: options.cmsId,
parentProductLinkPath: options.parentProductLinkPath,
productLinkPath: options.productLinkPath,
formPath: options.formPath,
@@ -116,7 +116,6 @@
}
this.getBookInfo(this.data.bookId)
},
-
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
@@ -125,7 +124,6 @@
startTime: Date.now()
})
},
-
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
*/
@@ -143,7 +141,6 @@
}
this.setPlayerList()
},
-
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
*/
@@ -221,8 +218,6 @@
app.MG.store.getProductDetail(query).then(async (res) => {
try {
this.setData({
- bookName: res.datas.name,
- cmsId: res.datas.rootCmsItemId,
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
@@ -232,9 +227,8 @@
} else {
this.resourceDetailsData()
}
-
} catch (error) {
- console.log(err)
+ console.log(error)
}
});
@@ -283,7 +277,6 @@
this.resourceDetailsData()
})
},
-
count(timeStr) {
const data = {
appRefCode: app.config.appRefCode,
@@ -302,7 +295,6 @@
}
app.MG.job.newJobWithApiNewEvent(data).then((res) => {})
},
-
onTabsChange(event) {
let tabValue = event.detail.value
if (tabValue == '1') {
@@ -314,9 +306,7 @@
activeValues: e.detail.value,
});
},
- onTakeNotes() {
-
- },
+ onTakeNotes() {},
showDialog(e) {
const token = wx.getStorageSync(app.config.tokenKey);
if (token) {
@@ -339,6 +329,37 @@
goBack() {
wx.navigateBack();
},
+
+ // 鍒ゆ柇褰撳墠鐩爣鏄惁宸茶喘涔�
+ async getCmsDataByQrcode() {
+ let query = {
+ storeInfo: this.data.storeInfo,
+ path: '*',
+ queryType: '*',
+ productId: this.data.bookId,
+ itemId: this.data.activeId,
+ itemFields: {
+ // 璧勬簮绫诲瀷锛岃瘯璇绘枃浠讹紝鏄惁鍏佽涓嬭浇绛夊弬鏁�
+ selectType: [],
+ freeFile: [],
+ file: [],
+ protectedFile: [],
+ resourcesClassification: [],
+ isDownload: [],
+ jsek_resourceBrief: [],
+ jsek_link: [],
+ jsek_questionBank: [],
+ learnSelectType: []
+ },
+ pading: {
+ start: 0,
+ size: 999
+ }
+ }
+ const data = await app.MG.store.getProductDetail(query)
+ return data?.datas ?? []
+ },
+
resourceDetailsData() {
this.setData({
videoLoading: true,
@@ -370,20 +391,10 @@
}
}
app.MG.store.getProductDetail(query).then(async (res) => {
- const list = res.datas.cmsDatas[0]?.datas
- if (this.data.source == 'qrcode') {
- let qrData = res.datas.cmsDatas[0].datas.find(ditem => ditem.id == this.data.activeId)
- if (qrData) {
- this.setData({
- threeLeveData: [qrData]
- })
- }
- } else {
- this.setData({
- threeLeveData: []
- })
- }
- for (const item of list) {
+ 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 (this.data.isBuy) {
@@ -396,45 +407,60 @@
}
}
} else {
- const isBuyCms = await app.MG.file.checkCmsItem({
- cmsItemId: Number(item.id)
- })
- item.isBuyCms = isBuyCms
- if (isBuyCms) {
- this.data.threeLeveData.push(item)
- } else {
- if (item.freeFile) {
- this.data.threeLeveData.push(item)
+ if (this.data.productLinkPath == item.productLinkPath) {
+ // 涔颁簡
+ if (this.data.buyList.length) {
+ if (this.data.buyList.some(citem => item.productLinkPath.includes(citem.productLinkPath))) {
+ this.data.threeLeveData.push(item)
+ }
} else {
- wx.showModal({
- icon: 'error',
- title: '娓╅Θ鎻愮ず',
- content: '璇疯喘涔拌祫婧愶紝鍗冲皢杩斿洖璐拱椤�',
- confirmText: '纭畾',
- showCancel: false, // 鍏抽棴鍙栨秷鎸夐挳
- success: (cres) => {
- if (cres.confirm) {
- wx.navigateTo({
- url: '/packageBookService/pages/bookServices/detail/index?id=' + this.data.bookId + '&name=' + this.data.bookName + '&tabValue=' + this.data.formPath,
- })
- }
+ 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)
}
- });
- return; // 鐩存帴杩斿洖锛岄伩鍏嶆墽琛屽悗缁唬鐮�
+ // 娌′拱涓斿彧鏈夎瘯璇昏祫婧�
+ 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)
+ const currentSaleMaths = await this.getCmsDataByQrcode()
+ // 鍒ゆ柇鏄惁璐拱鐩綍
+ const catalg = currentSaleMaths?.saleMethod?.find(i => currentSaleMaths.purchasedSaleMethodIdList.includes(i.Id))
+ // 鍒ゆ柇鏄惁璐拱璧勬簮鏈韩
+ const ownCms = qrData?.saleMethods?.find(i => currentSaleMaths.purchasedSaleMethodIdList.includes(i.Id))
+ if (catalg || ownCms) {
+ 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 (items.isBuyCms) {
+ if (flag) {
file = items.protectedFile || items.file ? file = items.protectedFile || items.file : file = items.freeFile
} else {
if (items.freeFile) {
@@ -463,6 +489,23 @@
}
}
});
+ } else {
+ wx.showModal({
+ title: '娓╅Θ鎻愮ず',
+ content: '璇ヨ祫婧愭湭璐拱锛屽皢杩斿洖璐拱',
+ success: (res) => {
+ if (res.confirm) {
+ if (this.data.source == 'qrcode') {
+ wx.navigateTo({
+ url: `/packageBookService/pages/bookServices/detail/index?id=${this.data.bookDetail.id}&name=${this.data.bookDetail.name}&tabValue=${this.data.formPath}`,
+ });
+ } else {
+ wx.navigateBack()
+ }
+ }
+ }
+ })
+
}
this.setData({
loading: false,
@@ -479,8 +522,9 @@
})
if (item.selectType == "video" || item.learnSelectType === "video") {
if (this.data.formPath === "jsek_cloudLearning") {
+ const flag = this.cmsItemIsBuy(item)
let file
- if (items.isBuyCms) {
+ if (flag) {
file =
item.protectedFile || item.file ? file = item.protectedFile || item.file : file = item.freeFile
} else {
@@ -515,7 +559,6 @@
}
}
},
-
aliVod(md5, currentVideo) {
if (md5) {
let query = {
@@ -558,13 +601,11 @@
})
}
},
-
timeUpdate(e) {
let {
currentTime,
duration
} = e.detail
-
this.setData({
progress: ((currentTime / duration) * 100).toFixed(2)
})
@@ -608,7 +649,6 @@
.then((res) => {})
}
},
-
getProductUserSubmitTopicGet() {
app.MG.ugc.getProductUserSubmitTopic({
productId: this.data.bookId,
@@ -619,7 +659,6 @@
})
})
},
-
newTopicMessageGet() {
let query = {
topicIdOrRefCode: topicId + '',
@@ -633,7 +672,6 @@
console.log(res);
})
},
-
// 鏍囬鏀瑰彉
changeTitle(e) {
this.setData({
@@ -646,7 +684,6 @@
submitTitle: e.detail.value
})
},
-
confirmSuggest() {
if (!this.data.textvalue.trim()) {
return wx.showToast({
@@ -734,7 +771,6 @@
dialogKey: true,
})
},
-
// 鍒犻櫎绗旇
deleteNote(e) {
const id = e.currentTarget.dataset.id
--
Gitblit v1.9.1