From 99dfeb5fc86bce593a5d3f43f45c26eedc00ab0a Mon Sep 17 00:00:00 2001 From: litian <C21AF165> Date: 星期二, 10 九月 2024 16:28:54 +0800 Subject: [PATCH] bug --- pages/digitalCourses/digitalCoursesDetails/index.js | 407 +++++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 330 insertions(+), 77 deletions(-) diff --git a/pages/digitalCourses/digitalCoursesDetails/index.js b/pages/digitalCourses/digitalCoursesDetails/index.js index 5f2bd6e..8b78e3a 100644 --- a/pages/digitalCourses/digitalCoursesDetails/index.js +++ b/pages/digitalCourses/digitalCoursesDetails/index.js @@ -2,8 +2,7 @@ const app = getApp() import SparkMD5 from 'spark-md5' import FormData from '../../../utils/formdata/index.js'; -// import Wxml2Canvas from 'wxml2canvas'; -// const Wxml2Canvas = require('Wxml2Canvas') +import Wxml2Canvas from '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: [], //鍒嗛〉 @@ -84,6 +85,7 @@ closeBtn: false, deleteBtn: false, bookId: '', + bookPath: '', playerList: [], worksInfo: [], isCertificate: {}, @@ -93,12 +95,15 @@ fullName: '', //鍚嶇О userPicture: '' //鐢宠璇佷功鐢ㄦ埛鍥剧墖 }, + userName: '', pictureMd5: '', publishingUnit: '', pubCertificateHide: true, cbzsImg: '', //鍑虹増璇佷功base64 - rzzsImg: '' //璁よ瘉璇佷功base64 - + rzzsImg: '', //璁よ瘉璇佷功base64 + imageWidth: '', //鐢诲湪鐢诲竷涓婄殑鍥剧墖鐨勫搴� + imageHeight: '', //鐢诲湪鐢诲竷涓婄殑鍥剧墖鐨勯珮搴� + website: 'https://jsek.bnuic.com', }, formatDate(dateString) { if (!dateString) { @@ -150,13 +155,28 @@ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇 */ onLoad(options) { + let parentPath = options.path.split('\\'); + parentPath.pop(); this.setData({ - bookId: options.id + bookId: options.id, + bookPath: parentPath.join('\\') }) + const token = wx.getStorageSync(app.config.tokenKey) + if (!token) { + loginInfo(app, (data) => { + if (data) { + this.digitalCoursesDetailsGet(options.id) + this.getPlayerList() + this.getType() + } else {} + }) + } this.digitalCoursesDetailsGet(options.id) this.getPlayerList() this.getType() - this.getCertificateList() + this.setData({ + userName: JSON.parse(wx.getStorageSync(app.config.userInfoKey)).name, + }) }, /** @@ -219,7 +239,6 @@ this.setData({ playerList: JSON.parse(res[0].value) }) - console.log(this.data.playerList, "playerList") } }) }, @@ -262,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 @@ -283,38 +301,89 @@ expire: res.false }) } - res.datas.publicationDate = moment(res.datas.publicationDate).format('YYYY骞碝M鏈圖D鏃�') + res.datas.publicationDate = moment(res.datas.publicationDate).format('YYYY骞碝M鏈�') res.datas.price = res.datas.price.toFixed(2) - + res.datas.oldPrice = res.datas.oldPrice.toFixed(2) wx.setNavigationBarTitle({ title: res.datas.name, }) if (res.datas.publishingUnit) { await this.getBookPublishUnit(res.datas.publishingUnit) } - let lecturer = [] if (res.datas.datas.speaker && res.datas.datas.speaker.length > 0) { - res.datas.datas.speaker.forEach(item => { - if (res.datas.subItems && res.datas.subItems.QueryCms.length > 0) { - res.datas.subItems.QueryCms.forEach(item1 => { + this.getSpeaker(res.datas.datas.speaker) + } + if (this.data.bookPath) { + this.getAboutBook(this.data.bookPath) + } else { + this.getAboutBook(res.datas.productLinkInfo[res.datas.productLinkInfo.length - 1].LinkPath) + } + this.getCertificateList() + res.datas.content = res.datas.content && res.datas.content.replace('../', app.config.requestCtx + '/').replace( + /\<img/gi, + '<img style="max-width:100%;height:auto;display:block;margin-top:0;margin-bottom:0;"' + ) + this.setData({ + digitalsData: res.datas, + loading: false + }) + }) + }, + //鑾峰彇涓昏浜� + getSpeaker(list) { + let query = { + path: 'jsek_speaker', + fields: { + content: [], + positionalTitle: [] + }, + coverSize: { + height: 250 + } + } + app.MG.resource.getItem(query).then((res) => { + let lecturerList = [] + if (list && res.datas.length > 0) { + list.forEach((item) => { + if (res.datas && res.datas.length > 0) { + res.datas.forEach((item1) => { if (JSON.parse(item.Data.Value).items[0] == item1.id) { - lecturer.push({ + lecturerList.push({ name: item1.name, - icon: item1.icon ? item1.icon : '', - description: item1.description ? item1.description : '', + positionalTitle: item1.positionalTitle, + icon: item1.icon, + description: item1.description ? item1.description : '鏆傛棤绠�浠�' }) } }) - } }) + this.getPositionalTitle(lecturerList) } - this.getAboutBook(res.datas.productLinkInfo[res.datas.productLinkInfo.length - 1].LinkPath) - + }) + }, + async getPositionalTitle(listStr) { + let list = [] + let query = { + refCodes: ['positionalTitle'] + } + await app.MG.store.getProductTypeField(query).then((res) => { + let option = JSON.parse(res[0].config).option + listStr.forEach((unit) => { + option.forEach((item) => { + if (item.value == unit.positionalTitle) { + unit.positionalName = item.name + } + }) + list.push({ + name: unit.name, + positionalTitle: unit.positionalName, + icon: unit.icon, + description: unit.description ? unit.description : '鏆傛棤绠�浠�' + }) + }) this.setData({ - lecturerList: lecturer, - digitalsData: res.datas, - loading: false + lecturerList: list }) }) }, @@ -346,9 +415,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 +431,6 @@ }, selectChange(event) { - console.log(event) const value = event.target.dataset.value this.setData({ selectActive: value @@ -401,6 +472,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 +510,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 +519,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, @@ -500,6 +574,7 @@ i.children = [] this.getTreeList(rootList, pathLength + addNum, i.children, i.productLinkPath, addNum) if (i.children.length == 0) { + newArr[0].istry = true delete i.children } } @@ -579,7 +654,96 @@ } }, - // 鑾峰彇鐩稿叧鏁欐潗 + //鍦ㄧ嚎娴嬭瘯鑾峰彇鏈�鍚庝竴涓妭鐐规暟閲� + 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) => { + if (res.datas.length > 0) { + 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}`, + }); + }, + + onCorrelationBook(e) { + const item = e.currentTarget.dataset.item; + // this.digitalCoursesDetailsGet(item.id) + // this.getPlayerList() + this.onLoad({ + loading: true, + id: item.id, + path: item.idPath + }) + }, + + // 鑾峰彇鐩稿叧璇剧▼ getAboutBook(path) { let query = { path, @@ -618,9 +782,8 @@ } }) this.setData({ - relatedBookData: bookArr + relatedBookData: bookArr.slice(0, 6) }) - console.log(this.data.relatedBookData); } else { this.setData({ relatedBookData: [] @@ -698,7 +861,6 @@ // 鍙戣捣璁㈠崟鍒濆鍖栬姹傚苟绛夊緟缁撴灉 const res = await app.MG.store.initOrder(query); // 鑾峰彇璁㈠崟鍙峰苟璧嬪�肩粰 orderNumber.value - console.log(res, 'res456'); bookOrdersId = res.orderNumber; // 妫�鏌ヨ鍗曞彿鏄惁瀛樺湪 if (bookOrdersId) { @@ -723,9 +885,7 @@ url, }); } - } else { - console.log(222); - } + } else {} } else { wx.showToast({ title: "鍟嗗搧涓嶅湪鏈夋晥鏈�", @@ -747,21 +907,116 @@ }, //鐢宠璇佷功 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, - }) - }) - // Wxml2Canvas(textCertificate.value).then((canvas1) => { - // const img1 = canvas1.toDataURL('image/png') - // rzzsImg.value = img1 - // }) - - pubCertificateHide.value = false + const that = this + const query = wx.createSelectorQuery().in(this) + query + .select('#pubCertificate') + .fields({ + // 閫夋嫨闇�瑕佺敓鎴恈anvas鐨勮寖鍥� + size: true, + node: true, + scrollOffset: true, + }, + (data) => { + let width = data.width + let height = data.height + that.setData({ + imageWidth: width, + imageHeight: height, + }) + }, + ) + .exec() + this.drawImage() + query + .select('#textCertificate') + .fields({ + // 閫夋嫨闇�瑕佺敓鎴恈anvas鐨勮寖鍥� + size: true, + node: true, + scrollOffset: true, + }, + (data) => { + let width = data.width + let height = data.height + that.setData({ + imageWidth: width, + imageHeight: height, + }) + }, + ) + .exec() + this.drawImage1() + }, + drawImage() { + let that = this; + let drawMyImage = new Wxml2Canvas({ + width: that.data.imageWidth, + height: that.data.imageHeight, + element: 'myCanvas', + progress(percent) {}, + finish(url) { + wx.getFileSystemManager().readFile({ + filePath: url, + encoding: 'base64', + success: (res) => { + let MyImageBase64 = 'data:image/jpg;base64,' + res.data + that.setData({ + cbzsImg: MyImageBase64, + pubCertificateHide: false, + }) + }, + }) + }, + error(res) { + console.log("鐢熸垚鐨勫浘鐗囧け璐�", res) + } + }, this); + let data = { + list: [{ + type: 'wxml', + class: '.my_canvas .my_draw_canvas', //.my_draw_canvas姣忎釜瑕佺粯鍒跺厓绱犵殑绫诲悕 + limit: '.my_canvas', //my_canvas鏍瑰厓绱犵被鍚� + x: 0, + y: 0 + }] + } + drawMyImage.draw(data, that); + }, + drawImage1() { + let that = this; + let drawMyImage1 = new Wxml2Canvas({ + width: that.data.imageWidth, + height: that.data.imageHeight, + element: 'myCanvas1', + progress(percent) {}, + finish(url) { + wx.getFileSystemManager().readFile({ + filePath: url, + encoding: 'base64', + success: (res) => { + let MyImageBase641 = 'data:image/jpg;base64,' + res.data + that.setData({ + rzzsImg: MyImageBase641, + pubCertificateHide: false, + }) + }, + }) + }, + error(res) { + console.log("鐢熸垚鐨勫浘鐗囧け璐�", res) + } + }, this); + let data = { + list: [{ + type: 'wxml', + class: '.my_canvas1 .my_draw_canvas1', //.my_draw_canvas姣忎釜瑕佺粯鍒跺厓绱犵殑绫诲悕 + limit: '.my_canvas1', //my_canvas鏍瑰厓绱犵被鍚� + x: 0, + y: 0 + }] + } + drawMyImage1.draw(data, that); }, //鑾峰彇瀛楁 getType() { @@ -794,36 +1049,37 @@ }) } }) + }) }, onCertificate() { - // if (!this.data.isBuy) { - // wx.showToast({ - // title: "璇峰厛璐拱锛屼綋楠屽畬鏁存湇鍔�", - // icon: "none", - // duration: 1000, - // }); - // return false - // } - // if (!this.data.isLearn) { - // wx.showToast({ - // title: "鎮ㄧ殑瀛︿範浠诲姟杩樻湭瀹屾垚锛屾殏涓嶈兘鐢宠璇佷功锛屽姞娌瑰摝锛�", - // icon: "none", - // duration: 1000, - // }); - // return false - // } - // if (this.data.isCertificate && this.data.isCertificate.state == 'WaitAudit') { - // wx.showToast({ - // title: "鎮ㄧ敵璇风殑璇佷功姝e湪瀹℃牳涓�", - // 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: "鎮ㄧ殑瀛︿範浠诲姟杩樻湭瀹屾垚锛屾殏涓嶈兘鐢宠璇佷功锛屽姞娌瑰摝锛�", + icon: "none", + duration: 1000, + }); + return false + } + if (this.data.isCertificate && this.data.isCertificate.state == 'WaitAudit') { + wx.showToast({ + title: "鎮ㄧ敵璇风殑璇佷功姝e湪瀹℃牳涓�", + icon: "none", + duration: 1000, + }); + return false + } var page = getCurrentPages().pop(); // 鑾峰彇褰撳墠椤甸潰瀹炰緥 page.setData({ @@ -860,7 +1116,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 +1145,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 +1287,14 @@ //璇佷功鏌ョ湅 onClick1() { this.setData({ - images: ['https://jsek.bnuic.com/home/certificate/szkc.jpg'], + images: [this.data.cbzsImg], showIndex: true, visible: true, }) }, onClick2() { this.setData({ - images: ['https://jsek.bnuic.com/home/certificate/kczs.jpg'], + images: [this.data.rzzsImg], showIndex: true, visible: true, }) @@ -1049,7 +1303,6 @@ const { trigger } = e.detail; - console.log(trigger); this.setData({ visible: false, }); -- Gitblit v1.9.1