From c0ff00c32bca4077b140d0d69b2863851ae31273 Mon Sep 17 00:00:00 2001 From: zhongshujie <2862698242@qq.com> Date: 星期二, 08 七月 2025 16:29:17 +0800 Subject: [PATCH] 优化 --- packageDomain/pages/resourceDetails/myVideo/index.js | 177 +++++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 123 insertions(+), 54 deletions(-) diff --git a/packageDomain/pages/resourceDetails/myVideo/index.js b/packageDomain/pages/resourceDetails/myVideo/index.js index 5c4a6ee..f34c79f 100644 --- a/packageDomain/pages/resourceDetails/myVideo/index.js +++ b/packageDomain/pages/resourceDetails/myVideo/index.js @@ -55,12 +55,18 @@ buyIdList: [], buyList: [], learnClassData: null, - isLearnDataBuy: false, + isLearnDataBuy: true, bookDetail: null, learnStartTime: 0, learnTimeList: [], learnTimeData: 0, toView: 'activeName', + promptVisable: false, + confirmBtn: { + content: '纭畾', + variant: 'base', + }, + showMd5: '' }, // 鏍煎紡鍖栫瑪璁版椂闂� convertTimestamp(timestamp) { @@ -103,27 +109,13 @@ parentName: options.parentName, }) } - const token = wx.getStorageSync(app.config.tokenKey) - if (!token) { - loginInfo(app, (data) => { - if (options.formPath == 'jsek_cloudLearning') { - this.setData({ - learnStartTime: Date.now(), - }) - this.getLearnTime() - } - this.getBookInfo(this.data.bookId) + if (options.formPath == 'jsek_cloudLearning') { + this.setData({ + learnStartTime: Date.now(), }) - } else { - if (options.formPath == 'jsek_cloudLearning') { - this.setData({ - learnStartTime: Date.now(), - }) - this.getLearnTime() - } - this.getBookInfo(this.data.bookId) + this.getLearnTime() } - + this.getBookInfo(this.data.bookId) }, /** @@ -236,6 +228,7 @@ }) } catch (error) {} if (this.data.learnClassData) { + debugger this.getResourceDataList(this.data.learnClassData) } else { this.resourceDetailsData() @@ -319,11 +312,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({ @@ -370,11 +368,6 @@ 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) @@ -434,37 +427,51 @@ 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 - items.protectedFile || items.file ? file = items.protectedFile || items.file : file = items.freeFile + 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 + titleName: items.name, + selectedId: index }) this.aliVod(file, this.data.showData) - } else { + let file = items.file ? items.file : items.freeFile 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 + showData: app.config.requestCtx + '/file/api/ApiDownload?md5=' + file, + titleName: items.name, + selectedId: index }) 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`, + wx.showModal({ + title: '娓╅Θ鎻愮ず', + content: '璇峰厛杩斿洖璧勬簮鎵�鍦ㄥ浘涔﹁鎯呰喘涔拌棰戣祫婧�', + confirmText: '纭畾', + showCancel: false, // 鍏抽棴鍙栨秷鎸夐挳 + success: function (res) { + if (res.confirm) { + wx.navigateTo({ + url: `/packageBookService/pages/bookServices/detail/index?id=${this.data.bookDetail.id}&name=${this.data.bookDetail.name}&tabValue=${this.data.formPath}`, + }); + } + } }); - } this.setData({ loading: false, @@ -478,23 +485,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) } @@ -508,6 +533,9 @@ appRefCode: app.config.appRefCode } app.MG.file.getAliVod(query).then((res) => { + this.setData({ + showMd5: md5 + }) if (res) { if (res && res.data == '') { this.setData({ @@ -567,6 +595,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) @@ -844,5 +874,44 @@ 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 + }, + videoEnd() { + const data = this.data.threeLeveData.find(item => item.id == this.data.activeId) + if (data.freeFile && (this.data.showDataVod.includes(data.freeFile) || this.data.showMd5 == data.freeFile) && data.protectedFile) + this.setData({ + promptVisable: true + }) + }, + // 鎻愮ず寮圭獥鍏抽棴 + closePromapDialog() { + this.setData({ + promptVisable: false + }) + 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() + } } }) \ No newline at end of file -- Gitblit v1.9.1