From 99dfeb5fc86bce593a5d3f43f45c26eedc00ab0a Mon Sep 17 00:00:00 2001 From: litian <C21AF165> Date: 星期二, 10 九月 2024 16:28:54 +0800 Subject: [PATCH] bug --- packageDomain/pages/resourceDetails/myVideo/index.js | 74 ++++++++++++++++++++++++++----------- 1 files changed, 52 insertions(+), 22 deletions(-) diff --git a/packageDomain/pages/resourceDetails/myVideo/index.js b/packageDomain/pages/resourceDetails/myVideo/index.js index 24c52d0..74ffbd1 100644 --- a/packageDomain/pages/resourceDetails/myVideo/index.js +++ b/packageDomain/pages/resourceDetails/myVideo/index.js @@ -1,6 +1,8 @@ // pages/resourceDetails/index.js const app = getApp() - +import { + loginInfo +} from '../../../../assets/js/login'; Page({ /** @@ -24,13 +26,14 @@ parentProductLinkPath: '', productLinkPath: '', 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', @@ -46,7 +49,7 @@ videoLoading: false, progress: 0, playerList: [], - videoLoaidng: true + videoLoading: true }, // 鏍煎紡鍖栫瑪璁版椂闂� convertTimestamp(timestamp) { @@ -64,6 +67,7 @@ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇 */ onLoad(options) { + console.log('璧勬簮', options); wx.setNavigationBarTitle({ title: '璧勬簮璇︽儏-瑙嗛' }); @@ -81,15 +85,26 @@ 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, }) } - this.resourceDetailsData() - + const token = wx.getStorageSync(app.config.tokenKey) + if (!token) { + loginInfo(app, (data) => { + if (data) { + this.resourceDetailsData() + } else { + this.resourceDetailsData() + } + }) + } else { + this.resourceDetailsData() + } }, /** @@ -210,7 +225,7 @@ }, resourceDetailsData() { this.setData({ - videoLoaidng: true, + videoLoading: true, loading: true }) let query = { @@ -240,24 +255,29 @@ } app.MG.store.getProductDetail(query).then(res => { res.datas.cmsDatas[0].datas.forEach((item) => { - if (item.selectType === "video" || item.learnSelectType === "video") { - this.data.threeLeveData.push(item) - this.setData({ - threeLeveData: this.data.threeLeveData - }) + if (this.data.source == 'qrcode') { + if (item.id == this.data.activeId) { + this.data.threeLeveData.push(item); + } + } else { + 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 || item.file ? file = items.protectedFile || item.file : file = items.freeFile + items.protectedFile || items.file ? file = items.protectedFile || items.file : file = items.freeFile 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, @@ -273,7 +293,7 @@ }); this.setData({ loading: false, - hidden: false + hidden: false, }) }) }, @@ -281,7 +301,7 @@ this.setPlayerList() const item = e.currentTarget.dataset.item this.setData({ - videoLoaidng: true, + videoLoading: true, selectedId: e.currentTarget.dataset.index, activeId: item.id, // showData: '', @@ -307,16 +327,26 @@ aliVod(md5, currentVideo) { let query = { md5: md5, - appRefCode: config.appRefCode + appRefCode: app.config.appRefCode } - MG.file.getAliVod(query).then((res) => { + app.MG.file.getAliVod(query).then((res) => { if (res) { - this.setData({ - showDataVod: 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 ElMessage.error('鏃犳硶鑾峰彇瑙嗛璧勬簮') @@ -627,7 +657,7 @@ loadedmetadata(e) { console.log(1); this.setData({ - videoLoaidng: false + videoLoading: false }) } }) \ No newline at end of file -- Gitblit v1.9.1