From 668c0a4058510a6022be06818540ba89778a5486 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期一, 09 九月 2024 14:31:22 +0800
Subject: [PATCH] bug
---
pages/digitalCourses/index.js | 1
pages/digitalCourses/digitalCoursesDetails/index.js | 7 ---
packageBookService/pages/bookServices/detail/components/testResource/testResource.js | 2 +
packageDomain/pages/resourceDetails/myVideo/index.js | 18 ++++++--
packageDomain/pages/resourceDetails/myAudio/index.js | 15 ++++++-
packageBookService/pages/bookServices/detail/index.js | 19 +++++----
6 files changed, 38 insertions(+), 24 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/testResource/testResource.js b/packageBookService/pages/bookServices/detail/components/testResource/testResource.js
index eb3f075..c215457 100644
--- a/packageBookService/pages/bookServices/detail/components/testResource/testResource.js
+++ b/packageBookService/pages/bookServices/detail/components/testResource/testResource.js
@@ -94,6 +94,7 @@
size: 999,
},
};
+ console.log(value.childrenFolderCount, 1234578)
if (value.childrenFolderCount == 0) {
wx.hideLoading();
return wx.showToast({
@@ -110,6 +111,7 @@
type: item.type,
});
});
+ console.log(idPathList, 123413456578)
}
}
wx.hideLoading();
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 2006165..815a389 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -229,14 +229,7 @@
this.setData({
tabValue: options.tabValue,
});
- const checkData = this.data.cmsDatas.find(
- (item) => item.refCode == options.tabValue
- );
- if (this.data.tabValue == "questionBank") {
- this.getResourceData(checkData)
- } else {
- this.getResourceDataList(checkData)
- }
+
}
},
@@ -457,6 +450,16 @@
await this.getBookClass(classData);
}
}
+ if (this.data.tabValue == 'questionBank' || this.data.tabValue == 'jsek_cloudLearning' || this.data.tabValue == 'jsek_teachingResources') {
+ const checkData = this.data.cmsDatas.find(
+ (item) => item.refCode == this.data.tabValue
+ );
+ if (this.data.tabValue == "questionBank") {
+ this.getResourceData(checkData)
+ } else {
+ this.getResourceDataList(checkData)
+ }
+ }
// 鑾峰彇缁勫嵎閿�鍞甶d
if (res.datas.saleMethod && res.datas.saleMethod.length) {
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index d87cef4..9c6860f 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -30,6 +30,7 @@
parentProductLinkPath: '',
productLinkPath: '',
threeLeveData: [],
+ source: "",
showData: '',
src: '',
selectedId: null,
@@ -99,7 +100,8 @@
cmsId: options.cmsId,
parentProductLinkPath: options.parentProductLinkPath,
productLinkPath: options.productLinkPath,
- formPath: options.formPath
+ formPath: options.formPath,
+ source: options.source,
})
if (options.parentName !== "鏁欏璧勬簮" && options.parentName !== "浜戝涔�") {
@@ -282,9 +284,16 @@
let titleName = '';
res.datas.cmsDatas[0].datas.forEach((item, index) => {
- if (item.selectType === "audio" || item.learnSelectType === "audio") {
- this.data.threeLeveData.push(item);
+ if (this.data.source == 'qrcode') {
+ if (item.id == this.data.activeId) {
+ this.data.threeLeveData.push(item);
+ }
+ } else {
+ if (item.selectType === "audio" || item.learnSelectType === "audio") {
+ this.data.threeLeveData.push(item);
+ }
}
+
});
this.data.threeLeveData.forEach((items, indexs) => {
if (this.data.productLinkPath == items.productLinkPath) {
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.js b/packageDomain/pages/resourceDetails/myVideo/index.js
index 6beb84e..74ffbd1 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.js
+++ b/packageDomain/pages/resourceDetails/myVideo/index.js
@@ -26,6 +26,7 @@
parentProductLinkPath: '',
productLinkPath: '',
threeLeveData: [],
+ source: "",
showData: '',
showDataVod: '',
src: '',
@@ -85,6 +86,7 @@
productLinkPath: options.productLinkPath,
formPath: options.formPath,
flag: false,
+ source: options.source,
})
if (options.parentName !== "鏁欏璧勬簮" && options.parentName !== "浜戝涔�") {
this.setData({
@@ -253,11 +255,17 @@
}
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鍙傛暟
diff --git a/pages/digitalCourses/digitalCoursesDetails/index.js b/pages/digitalCourses/digitalCoursesDetails/index.js
index 23c4db3..98dfa53 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.js
+++ b/pages/digitalCourses/digitalCoursesDetails/index.js
@@ -281,7 +281,6 @@
}
}
app.MG.store.getProductDetail(query).then(async res => {
- console.log('淇℃伅', res);
if (res.datas.purchasedSaleMethodIdList.includes(res.datas.defaultSaleMethodId)) {
this.setData({
isBuy: true
@@ -873,7 +872,6 @@
(data) => {
let width = data.width
let height = data.height
- console.log(width, height)
that.setData({
imageWidth: width,
imageHeight: height,
@@ -893,7 +891,6 @@
(data) => {
let width = data.width
let height = data.height
- console.log(width, height)
that.setData({
imageWidth: width,
imageHeight: height,
@@ -911,13 +908,11 @@
element: 'myCanvas',
progress(percent) {},
finish(url) {
- console.log("鐢熸垚鐨勫浘鐗囧湴鍧�", url)
wx.getFileSystemManager().readFile({
filePath: url,
encoding: 'base64',
success: (res) => {
let MyImageBase64 = 'data:image/jpg;base64,' + res.data
- console.log('MyImageBase64', MyImageBase64)
that.setData({
cbzsImg: MyImageBase64,
pubCertificateHide: false,
@@ -948,13 +943,11 @@
element: 'myCanvas1',
progress(percent) {},
finish(url) {
- console.log("鐢熸垚鐨勫浘鐗囧湴鍧�", url)
wx.getFileSystemManager().readFile({
filePath: url,
encoding: 'base64',
success: (res) => {
let MyImageBase641 = 'data:image/jpg;base64,' + res.data
- console.log('MyImageBase64', MyImageBase641)
that.setData({
rzzsImg: MyImageBase641,
pubCertificateHide: false,
diff --git a/pages/digitalCourses/index.js b/pages/digitalCourses/index.js
index fefc22f..97960e4 100644
--- a/pages/digitalCourses/index.js
+++ b/pages/digitalCourses/index.js
@@ -248,7 +248,6 @@
this.setData({
"sortActive": e.detail.value,
});
- console.log(e)
this.getCourseList(this.data.activeItem);
},
courseDetail(e) {
--
Gitblit v1.9.1