From bfdd1a936731cf9b5f0d2c78d363cbb0ec93d941 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 04 九月 2024 09:43:52 +0800
Subject: [PATCH] 树结构排序优化
---
pages/digitalCourses/digitalCoursesDetails/index.js | 193 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 147 insertions(+), 46 deletions(-)
diff --git a/pages/digitalCourses/digitalCoursesDetails/index.js b/pages/digitalCourses/digitalCoursesDetails/index.js
index 1abf9ba..7066a1d 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.js
+++ b/pages/digitalCourses/digitalCoursesDetails/index.js
@@ -3,7 +3,6 @@
import SparkMD5 from 'spark-md5'
import FormData from '../../../utils/formdata/index.js';
// import Wxml2Canvas from 'wxml2canvas';
-// const Wxml2Canvas = require('Wxml2Canvas')
import {
worksDataBytool
} from "../../../assets/js/toolClass.js";
@@ -60,12 +59,14 @@
testResourceIocn: {
name: "/static/images/digitalTextbooks/link-t@3x.png",
},
-
+ relationTextBook: null,
+ isTextBookBuy: false,
dialogBox: false,
lecturerList: [],
selectActive: 'learn',
learnList: [],
testList: [],
+ testCount: 0,
openTeachids: [],
onlineQuestionsList: [],
//鍒嗛〉
@@ -156,7 +157,7 @@
this.digitalCoursesDetailsGet(options.id)
this.getPlayerList()
this.getType()
- this.getCertificateList()
+
},
/**
@@ -219,7 +220,6 @@
this.setData({
playerList: JSON.parse(res[0].value)
})
- console.log(this.data.playerList, "playerList")
}
})
},
@@ -262,7 +262,6 @@
}
}
app.MG.store.getProductDetail(query).then(async res => {
- console.log(res);
if (res.datas.purchasedSaleMethodIdList.includes(res.datas.defaultSaleMethodId)) {
this.setData({
isBuy: true
@@ -310,7 +309,7 @@
})
}
this.getAboutBook(res.datas.productLinkInfo[res.datas.productLinkInfo.length - 1].LinkPath)
-
+ this.getCertificateList()
this.setData({
lecturerList: lecturer,
digitalsData: res.datas,
@@ -346,9 +345,12 @@
this.setData({
tabValue: value
})
- console.log(this.data.tabValue);
+ if (this.data.tabValue == 1) {
+ // this.saveAsImage()
+ }
if (this.data.tabValue == 2) {
this.getResource()
+ this.getRelationBook()
}
if (this.data.tabValue == 3) {
this.selectComponent("#note").getNoteList();
@@ -359,7 +361,6 @@
},
selectChange(event) {
- console.log(event)
const value = event.target.dataset.value
this.setData({
selectActive: value
@@ -401,6 +402,7 @@
res.datas.cmsDatas[0].datas.forEach((item) => {
if (item.type == 'questionBankFolder' || item.type == 'questionBankItem') {
test.push(item)
+
} else if (item.type != "resourceItem") {
this.data.playerList.forEach(pItem => {
if (pItem.cmsItemId == item.id) {
@@ -438,6 +440,7 @@
const data = test.filter(
(item) => item.type == 'questionBankFolder' && item.childrenFolderCount > 0
)
+
if (data.length > 0) {
let list = []
let addNum = query.cmsPath.length > 5 ? 7 : query.cmsPath.length > 6 ? 8 : 6
@@ -446,6 +449,7 @@
list = this.ensureTreeConsistency(list)
let result = [];
this.findChildIds(list[0].children, result)
+ this.countLeafNodes(list[0].children)
this.setData({
testList: list[0].children,
openTeachids: result,
@@ -579,7 +583,83 @@
}
},
- // 鑾峰彇鐩稿叧鏁欐潗
+ //鍦ㄧ嚎娴嬭瘯鑾峰彇鏈�鍚庝竴涓妭鐐规暟閲�
+ countLeafNodes(tree) {
+ tree.forEach(node => {
+ if (!node.children || node.children.length === 0) {
+ this.setData({
+ testCount: this.data.testCount + 1
+ })
+ } else {
+ this.countLeafNodes(node.children);
+ }
+ });
+ },
+
+ //鑾峰彇鍏宠仈瀛愬晢鍝�/鏁板瓧鏁欐潗
+ getRelationBook() {
+ app.MG.store.getProductList({
+ path: '*',
+ storeInfo: app.config.digitalCourses,
+ mainProductId: this.data.digitalsData.id,
+ queryType: 'Related', // 鏌ヨ绫诲瀷锛� Related锛氭煡璇㈠叧鑱斿晢鍝侊紱SubProduct: 鏌ヨ瀛愬晢鍝侊紱
+ paging: {
+ start: 0,
+ size: 1
+ },
+ fields: {
+ author: [],
+ publicationDate: [],
+ isbn: [],
+ content: [],
+ Creator: [],
+ probationPage: []
+ }
+ })
+ .then((res) => {
+ this.setData({
+ relationTextBook: res.datas[0]
+ })
+ if (this.data.relationTextBook.purchasedSaleMethodIdList.includes(this.data.relationTextBook.defaultSaleMethodId)) {
+ this.setData({
+ isTextBookBuy: true
+ })
+ } else {
+ this.setData({
+ isTextBookBuy: false
+ })
+ }
+ })
+ },
+
+ readTextBook() {
+ wx.navigateTo({
+ url: '/pages/digitalCourses/digitalCoursesDetails/components/digitalRead/index?refCode=' + this.data.relationTextBook.refCode + '&tryPageCount=' + this.data.relationTextBook.probationPage + '&isTextBookBuy=' + this.data.isTextBookBuy
+ })
+ },
+
+ //鍦ㄧ嚎娴嬭瘯鎴戠殑鏀惰棌銆佹垜鐨勯敊棰�
+ goMycollect(e) {
+ const answertype = e.currentTarget.dataset.answertype;
+ const token = wx.getStorageSync("jsek-token");
+ if (!token) {
+ return wx.getUserProfile({
+ desc: "鐢ㄦ埛鐧诲綍",
+ success: (res) => {
+ console.log(res);
+ },
+ });
+ }
+ wx.navigateTo({
+ url: `/packageBookService/pages/bookServices/examination/examination?bookId=${
+ this.data.digitalsData.id
+ }&rootCmsItemId=${this.data.digitalsData.rootCmsItemId}&answerTitle=${
+ answertype == "collectQuestion" ? "鎴戠殑鏀惰棌" : "鎴戠殑閿欓"
+ }&answerType=${answertype}&storeInfo=${app.config.digitalCourses}`,
+ });
+ },
+
+ // 鑾峰彇鐩稿叧璇剧▼
getAboutBook(path) {
let query = {
path,
@@ -620,7 +700,6 @@
this.setData({
relatedBookData: bookArr
})
- console.log(this.data.relatedBookData);
} else {
this.setData({
relatedBookData: []
@@ -698,7 +777,6 @@
// 鍙戣捣璁㈠崟鍒濆鍖栬姹傚苟绛夊緟缁撴灉
const res = await app.MG.store.initOrder(query);
// 鑾峰彇璁㈠崟鍙峰苟璧嬪�肩粰 orderNumber.value
- console.log(res, 'res456');
bookOrdersId = res.orderNumber;
// 妫�鏌ヨ鍗曞彿鏄惁瀛樺湪
if (bookOrdersId) {
@@ -723,9 +801,7 @@
url,
});
}
- } else {
- console.log(222);
- }
+ } else {}
} else {
wx.showToast({
title: "鍟嗗搧涓嶅湪鏈夋晥鏈�",
@@ -747,21 +823,48 @@
},
//鐢宠璇佷功
async saveAsImage() {
- await nextTick()
- let query = wx.createSelectorQuery();
- let value = query.select("#pubCertificate").boundingClientRect();
- Wxml2Canvas(value).then((canvas) => {
- const img = canvas.toDataURL('image/png')
- this.setData({
- cbzsImg: img,
- })
- })
+ let query = wx.createSelectorQuery().in(this);
+ query.select("#pubCertificate").boundingClientRect();
+ query.exec(function (res) {
+ console.log("View 鐨勪俊鎭細", res[0]);
+ });
+ console.log(value, 123)
+ let drawImage = new Wxml2Canvas({
+ element: 'pubCertificate', // canvas鑺傜偣鐨刬d,
+ obj: that, // 鍦ㄧ粍浠朵腑浣跨敤鏃讹紝闇�瑕佷紶鍏ュ綋鍓嶇粍浠剁殑this
+ width: this.width * 2, // 瀹介珮
+ height: this.height * 2,
+ background: '#fff', // 榛樿鑳屾櫙鑹�
+ progress(percent) { // 缁樺埗杩涘害
+ },
+ finish(url) {
+ console.log("鍒涘缓鐨勫浘鐗�", url);
+ },
+ error(res) {
+ console.log(res);
+ // uni.hideLoading()
+ // 鐢诲け璐ョ殑鍘熷洜
+ }
+ }, this);
+ // const canvas = Wxml2Canvas.wxmlToCanvas(value);
+ // // 杞崲涓哄浘鐗�
+ // const img = Wxml2Canvas.canvasToTempImage(canvas);
+ // const path = Wxml2Canvas.canvasToTempFilePath(canvas);
+ // console.log(canvas)
+ // Wxml2Canvas(value).then((canvas) => {
+ // const img = canvas.toDataURL('image/png')
+ // this.setData({
+ // cbzsImg: img,
+ // })
+ // })
+
// Wxml2Canvas(textCertificate.value).then((canvas1) => {
// const img1 = canvas1.toDataURL('image/png')
// rzzsImg.value = img1
// })
-
- pubCertificateHide.value = false
+ this.setData({
+ pubCertificateHide: false,
+ })
},
//鑾峰彇瀛楁
getType() {
@@ -794,20 +897,21 @@
})
}
})
+
})
},
onCertificate() {
- // if (!this.data.isBuy) {
- // wx.showToast({
- // title: "璇峰厛璐拱锛屼綋楠屽畬鏁存湇鍔�",
- // icon: "none",
- // duration: 1000,
- // });
- // return false
- // }
+ if (!this.data.isBuy) {
+ wx.showToast({
+ title: "璇峰厛璐拱锛屼綋楠屽畬鏁存湇鍔�",
+ icon: "none",
+ duration: 1000,
+ });
+ return false
+ }
// if (!this.data.isLearn) {
// wx.showToast({
// title: "鎮ㄧ殑瀛︿範浠诲姟杩樻湭瀹屾垚锛屾殏涓嶈兘鐢宠璇佷功锛屽姞娌瑰摝锛�",
@@ -816,14 +920,14 @@
// });
// return false
// }
- // if (this.data.isCertificate && this.data.isCertificate.state == 'WaitAudit') {
- // wx.showToast({
- // title: "鎮ㄧ敵璇风殑璇佷功姝ｅ湪瀹℃牳涓�",
- // icon: "none",
- // duration: 1000,
- // });
- // return false
- // }
+ if (this.data.isCertificate && this.data.isCertificate.state == 'WaitAudit') {
+ wx.showToast({
+ title: "鎮ㄧ敵璇风殑璇佷功姝ｅ湪瀹℃牳涓�",
+ icon: "none",
+ duration: 1000,
+ });
+ return false
+ }
var page = getCurrentPages().pop(); // 鑾峰彇褰撳墠椤甸潰瀹炰緥
page.setData({
@@ -860,7 +964,6 @@
// encoding: 'binary', //缂栫爜鏍煎紡
success: ress => {
//鎴愬姛鐨勫洖璋�
- console.log(ress.data, 45613489)
let spark = new SparkMD5.ArrayBuffer();
spark.append(ress.data);
let md5 = spark.end(false);
@@ -890,7 +993,6 @@
if (res.statusCode == 200) {
resolve(res.data);
if (res.data) {
- console.log(md5, "md5555")
that.setData({
'userInfo.userPicture': app.config.requestCtx + `/file/GetPreViewImage?md5=` + md5,
pictureMd5: md5
@@ -1033,14 +1135,14 @@
//璇佷功鏌ョ湅
onClick1() {
this.setData({
- images: ['/static/images/certificate/szkc.jpg'],
+ images: ['https://jsek.bnuic.com/home/certificate/szkc.jpg'],
showIndex: true,
visible: true,
})
},
onClick2() {
this.setData({
- images: ['/static/images/certificate/kczs.jpg'],
+ images: ['https://jsek.bnuic.com/home/certificate/kczs.jpg'],
showIndex: true,
visible: true,
})
@@ -1049,7 +1151,6 @@
const {
trigger
} = e.detail;
- console.log(trigger);
this.setData({
visible: false,
});
--
Gitblit v1.9.1