From 338ad19ee45b5380a0d8433cbbce2a727a576dfa Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期五, 19 四月 2024 17:34:36 +0800
Subject: [PATCH] bug2
---
packageDomain/pages/resourceDetails/myVideo/index.js | 87 +++++++++++++++++++++++++++----------------
1 files changed, 55 insertions(+), 32 deletions(-)
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.js b/packageDomain/pages/resourceDetails/myVideo/index.js
index 1b03a19..b9898fc 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.js
+++ b/packageDomain/pages/resourceDetails/myVideo/index.js
@@ -37,7 +37,10 @@
videoChange: true,
startTime: "", //杩涘叆椤甸潰褰撳墠鏃堕棿
- pauseTime: 0 //鏆傚仠鏃堕棿
+ pauseTime: 0, //鏆傚仠鏃堕棿
+ formPath: '',
+ loading: true,
+ hidden: true
},
// 鏍煎紡鍖栫瑪璁版椂闂�
convertTimestamp(timestamp) {
@@ -56,6 +59,11 @@
*/
onLoad(options) {
+ wx.setNavigationBarTitle({
+
+ title: '璧勬簮璇︽儏-闊抽'
+
+ });
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
@@ -67,12 +75,17 @@
bookId: options.bookId,
bookName: options.bookName,
cmsId: options.cmsId,
- parentName: options.parentName,
parentProductLinkPath: options.parentProductLinkPath,
productLinkPath: options.productLinkPath,
+ formPath: options.formPath,
flag: false
})
-
+ if (options.parentName !== "鏁欏璧勬簮" && options.parentName !== "浜戝涔�") {
+ this.setData({
+ parentName: options.parentName,
+ })
+ }
+ console.log(options, 'options');
this.resourceDetailsData()
this.getNoteList()
},
@@ -175,16 +188,14 @@
showDialog(e) {
this.setData({
- submitTitle: this.data.bookName,
- dialogKey: true,
- // textvalue: ''
+ dialogKey: true,
+ textvalue: '',
+ submitTitle: this.data.titleName
});
},
-
closeDialog() {
-
this.setData({
dialogKey: false,
textvalue: '',
@@ -219,27 +230,28 @@
size: 999
}
}
-
app.MG.store.getProductDetail(query).then(res => {
res.datas.cmsDatas[0].datas.forEach((item) => {
- if (item.selectType === "video") {
+ console.log(item);
+ 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 (!items.file) {
- console.log(1111);
+ if (this.data.formPath === "jsek_cloudLearning") {
+ console.log(items);
+ this.setData({
+ showData: app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + items.protectedFile + '&token=' + wx.getStorageSync(app.config.tokenKey),
+ titleName: items.name
+ })
+ } else {
+ this.setData({
+ showData: app.config.requestCtx + '/file/api/ApiDownload?md5=' + items.file,
+ titleName: items.name
+ })
}
-
-
- this.setData({
- showData: app.config.requestCtx + '/file/api/ApiDownload?md5=' + items.file,
- titleName: items.name
- })
-
console.log(index, 'index');
let selectedIndex = index; // 瀛樺偍閫変腑椤圭殑绱㈠紩
this.setData({
@@ -248,11 +260,13 @@
}
});
}
-
-
})
this.data.threeLeveData.forEach((item) => {
console.log(item.name);
+ })
+ this.setData({
+ loading: false,
+ hidden: false
})
})
},
@@ -271,14 +285,23 @@
titleName: item.name
})
- if (item.selectType == "video") {
+ if (item.selectType == "video" || item.learnSelectType === "video") {
// if (!item.file) {
// console.log(1111);
// }
- this.setData({
- showData: app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file
- })
+
+ if (this.data.formPath === "jsek_cloudLearning") {
+
+ this.setData({
+ showData: app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + item.protectedFile + '&token=' + wx.getStorageSync(app.config.tokenKey)
+ })
+ } else {
+ this.setData({
+ showData: app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file
+ })
+ }
+
console.log(this.data.showData, 'item.file');
}
@@ -323,18 +346,17 @@
// 鏍囬杈撳叆妗嗗��
inputChange(e) {
this.setData({
- titleName: e.detail.value
+ submitTitle: e.detail.value
})
},
confirmSuggest() {
- if (!this.data.textvalue) {
+ if (!this.data.textvalue.trim()) {
return wx.showToast({
icon: 'error',
title: '璇峰～鍐欑瑪璁板唴瀹�',
})
-
- } else if (!this.data.titleName) {
+ } else if (!this.data.submitTitle) {
return wx.showToast({
icon: 'error',
title: '璇峰～鍐欑瑪璁版爣棰�',
@@ -417,9 +439,10 @@
submitType: "edit",
textvalue: note.content,
submitTitle: note.name,
- noteId: note.id
+ noteId: note.id,
+ dialogKey: true,
})
- this.showDialog()
+ // this.showDialog()
},
// 鍒犻櫎绗旇
--
Gitblit v1.9.1