From bfdd1a936731cf9b5f0d2c78d363cbb0ec93d941 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 04 九月 2024 09:43:52 +0800
Subject: [PATCH] 树结构排序优化
---
packageBookService/pages/bookServices/detail/index.js | 933 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 791 insertions(+), 142 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index ff204b8..8e0ddd0 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -4,18 +4,23 @@
import {
loginInfo
} from "../../../../assets/js/login";
+import FormData from '../../../../utils/formdata/index.js';
const app = getApp();
Page({
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
+ // 杩涢〉闈㈤粯璁ゅ垏鎹� 灞曞紑鐨刬d
+ // defaultactiveTeachid 鏁欏璧勬簮
+ // defaultactiveLearnid 浜戝涔�
bookId: "",
barHeight: "",
navBarHeight: "",
options: {
id: "",
name: "",
+ storeInfo: '',
},
bookDetail: {},
bookClass: [],
@@ -34,9 +39,12 @@
teach: [],
learn: [],
test: [],
+ jslx: true,
openTeachids: [],
openLearnids: [],
openTestids: [],
+ isGoBuyResource: true,
+ learnPath: '',
applyResourceState: false, // 鐢宠鏁欏璧勬簮鎸夐挳闃叉姈
resourceClassList: [], // 璧勬簮鎵�灞炲垎绫�
applyState: "", // 鏁欏璧勬簮鐢宠鐘舵��
@@ -77,6 +85,7 @@
electronicBookList: [], //鏍蜂功鍗曠數瀛愪功
paperBookCount: 0, //绾歌川涔﹀墿浣欐鏁�
ebookCount: 0, //鐢靛瓙涔﹀墿浣欐鏁�
+ resourceCodeList: [], // 璧勬簮refcode鍒楄〃
userInfo: {},
pageLoading: true,
fileInfo: {
@@ -150,7 +159,19 @@
},
],
showIndex: '',
- successOrderNumber: ''
+ successOrderNumber: '',
+ applicationState: '', // 鐢靛瓙鏍蜂功鐢宠鐘舵��
+ dialogBox: false,
+ resourceInfo: {
+ resourceName: '',
+ fileType: '',
+ description: '',
+ agree: false
+ },
+ fileList: [],
+ isShowUp: true,
+ protocolShow: false,
+ protocolTxt: ''
},
resetTree: function (e) {
@@ -176,13 +197,14 @@
options: {
id: options.id,
name: options.name,
+ storeInfo: options.storeInfo,
},
});
wx.setNavigationBarTitle({
title: options.name,
})
this.getBookInfo(options.id);
- this.getResourceClass(); // 鑾峰彇璧勬簮鎵�灞炲垎绫�
+ // this.getResourceClass(); // 鑾峰彇璧勬簮鎵�灞炲垎绫�
const token = wx.getStorageSync(app.config.tokenKey);
if (token) {
this.getShoppingCartProductGet();
@@ -345,6 +367,7 @@
"mockData.count": 0,
});
const query = {
+ storeInfo: this.data.options.storeInfo,
path: "*",
queryType: "*",
productId: id,
@@ -367,6 +390,7 @@
dangdangLink: [],
weidianLink: [],
content: [],
+ catalogue: [],
authorIntroduction: [],
// isApplyPaperBook: [],
// isApplyEBook: [],
@@ -379,10 +403,11 @@
},
};
app.MG.store.getProductDetail(query).then(async (res) => {
- console.log(res.datas, 'res.datas');
+ this.getResourceCode(id, res.datas.rootCmsItemId)
this.setData({
bookDetail: res.datas,
buyIdList: res.datas.purchasedSaleMethodIdList,
+ pageLoading: false
});
if (res.datas.cmsDatas && res.datas.cmsDatas.length) {
this.setData({
@@ -398,14 +423,19 @@
this.getSubTtem();
// 鑾峰彇鍥句功鍒嗙被
if (res.datas.bookClassification) {
+ let classData = []
const bookClassification = JSON.parse(res.datas.bookClassification);
if (Array.isArray(bookClassification) && bookClassification.length) {
for (let index = 0; index < bookClassification.length; index++) {
const element = bookClassification[index];
const iconType = element[0];
const classType = element[1];
- await this.getBookClass(iconType, classType);
+ classData.push({
+ iconType,
+ classType
+ })
}
+ await this.getBookClass(classData);
}
}
@@ -443,10 +473,30 @@
"bookDetail.paperPrice": this.numFormat(
this.data.bookDetail.paperPrice
),
- pageLoading: false,
+
});
- console.log("鍥句功淇℃伅", this.data.bookClass);
});
+ },
+ getResourceCode(bookId, cmsId) {
+ let query = {
+ path: '*',
+ queryType: '*',
+ productId: bookId,
+ cmsPath: cmsId,
+ itemFields: {
+ SysType: 'Cms'
+ },
+ pading: {
+ start: 99,
+ size: 0
+ }
+ }
+ app.MG.store.getProductDetail(query).then((res) => {
+ this.setData({
+ resourceCodeList: res.datas.cmsDatas[0].datas
+ })
+ // console.log('鍥句功璧勬簮', res.datas.cmsDatas[0].datas)
+ })
},
//璇锋眰瀛愬晢鍝佺殑鏂囦欢
getSubTtem() {
@@ -506,14 +556,14 @@
"fileInfo.bookName": this.data.bookDetail.name,
"fileInfo.fileType": "pdf",
"fileInfo.md5": res.datas[0].bookshelf_pdf,
- "fileInfo.freePage": res.datas[0].bookshelf_probationPage,
+ "fileInfo.freePage": res.datas[0].bookshelf_probationPage ? res.datas[0].bookshelf_probationPage : 30,
});
} else if (res.datas[0].bookshelf_protectedEpub) {
this.setData({
"fileInfo.bookName": this.data.bookDetail.name,
"fileInfo.fileType": "epub",
"fileInfo.md5": res.datas[0].bookshelf_protectedEpub,
- "fileInfo.freePage": res.datas[0].bookshelf_freeEpub,
+ "fileInfo.freePage": res.datas[0].bookshelf_freeEpub ? res.datas[0].bookshelf_freeEpub : 30,
});
}
}
@@ -522,13 +572,12 @@
this.setData({
noFile: true,
});
- // debugger
if (this.data.bookDetail.pdf) {
this.setData({
"fileInfo.bookName": this.data.bookDetail.name,
"fileInfo.fileType": "pdf",
"fileInfo.md5": this.data.bookDetail.pdf,
- "fileInfo.freePage": this.data.bookDetail.probationPage,
+ "fileInfo.freePage": this.data.bookDetail.probationPage ? this.data.bookDetail.probationPage : 30,
});
} else if (this.data.bookDetail.protectedEpub) {
@@ -536,7 +585,7 @@
"fileInfo.bookName": this.data.bookDetail.name,
"fileInfo.fileType": "epub",
"fileInfo.md5": this.data.bookDetail.protectedEpub,
- "fileInfo.freePage": this.data.bookDetail.freeEpubPage,
+ "fileInfo.freePage": this.data.bookDetail.freeEpubPage ? this.data.bookDetail.freeEpubPage : 30,
});
}
}
@@ -565,28 +614,37 @@
});
},
// 鑾峰彇鍥句功鍒嗙被
- async getBookClass(iconType, classType) {
+ async getBookClass(list) {
let name = "";
const query = {
refCodes: ["bookClassification"],
};
await app.MG.store.getProductTypeField(query).then((res) => {
- JSON.parse(res[0].config).option.forEach((item) => {
- if (item.value == iconType) {
- item.child.forEach((citem) => {
- if (citem.value == classType) {
- const flag = this.data.bookClass.findIndex((ditem) => ditem == citem.name)
- if (flag == -1) {
- let list = this.data.bookClass
- list.push(citem.name)
- this.setData({
- bookClass: list
- })
- }
+ for (let aindex = 0; aindex < list.length; aindex++) {
+ const aitem = list[aindex];
+ const iconType = aitem.iconType
+ const classType = aitem.classType
+ JSON.parse(res[0].config).option.forEach((item) => {
+ if (item.value == iconType) {
+ if (item.child && item.child.length) {
+ item.child.forEach((citem) => {
+ if (citem.value == classType) {
+ const flag = this.data.bookClass.findIndex((ditem) => ditem == citem.name)
+ if (flag == -1) {
+ let list = this.data.bookClass
+ list.push(citem.name)
+ this.setData({
+ bookClass: list
+ })
+ }
+ }
+ });
}
- });
- }
- });
+
+ }
+ });
+ }
+
});
},
// 鏀惰棌
@@ -663,7 +721,7 @@
const checkData = this.data.cmsDatas.find(
(item) => item.refCode == e.detail.value
);
-
+ if (!this.data.resourceClassList.length) this.getResourceClass()
if (checkData) {
if (e.detail.value == "jsek_cloudLearning") {
this.setData({
@@ -671,15 +729,21 @@
"buyResourceData.refCode": checkData.refCode,
});
}
- if (
- (e.detail.value == "jsek_teachingResources" &&
- !this.data.teach.length) ||
- (e.detail.value == "jsek_cloudLearning" && !this.data.learn.length) ||
- (e.detail.value == "questionBank" && !this.data.test.length)
- ) {
- if (e.detail.value == "jsek_teachingResources") {
- wx.setStorageSync('teachResourcesPath', checkData.productLinkPath)
- }
+ // if (
+ // (e.detail.value == "jsek_teachingResources" &&
+ // !this.data.teach.length) ||
+ // (e.detail.value == "jsek_cloudLearning" && !this.data.learn.length) ||
+ // (e.detail.value == "questionBank" && !this.data.test.length)
+ // ) {
+ // if (e.detail.value == "jsek_teachingResources") {
+ // wx.setStorageSync('teachResourcesPath', checkData.productLinkPath)
+ // }
+ // this.getResourceData(checkData);
+ // }
+ if ((e.detail.value == "jsek_teachingResources" && !this.data.teach.length) || (e.detail.value == "jsek_cloudLearning" && !this.data.learn.length)) {
+ wx.setStorageSync('teachResourcesPath', checkData.productLinkPath)
+ this.getResourceDataList(checkData)
+ } else if (e.detail.value == "questionBank" && !this.data.test.length) {
this.getResourceData(checkData);
}
if (e.detail.value == "questionBank" && token) this.getMockData();
@@ -718,17 +782,263 @@
});
});
},
- // 鑾峰彇鏁欏璧勬簮 浜戝涔� 浜戞祴璇�
- getResourceData(type) {
+
+ // 鑾峰彇鎵�鏈夊瓙椤规暟閲�
+ getChildrenItem(data) {
+ let num = 0
+
+ function getNum(data) {
+ for (let index = 0; index < data.length; index++) {
+ const item = data[index];
+ if (item.sysType == 'CmsItem') {
+ num += 1
+ } else if (item.sysType == 'CmsFolder') {
+ if (item.children && item.children.length)
+ getNum(item.children)
+ }
+ }
+ }
+ getNum(data)
+ return num
+ },
+
+ // 缁欑洰褰曟坊鍔犲瓙椤规暟閲�
+ changeResourceChildren(list) {
+ const changeList = (list) => {
+ for (let index = 0; index < list.length; index++) {
+ const item = list[index];
+ if (item.sysType == 'CmsFolder' && item.children && item.children.length) {
+ item.childrenItem = this.getChildrenItem([item])
+ changeList(item.children)
+ } else if (item.sysType == 'CmsFolder' && item.children && !item.children.length) {
+ item.childrenItem = 0
+ } else if (item.sysType == 'CmsFolder' && !item.children) {
+ item.childrenItem = 0
+ }
+ }
+ }
+ changeList(list)
+ return list
+ },
+
+ // 鎵佸钩鍖栨暟鎹浆鎹ree
+ getTreeList(rootList, pathLength, newArr, path) {
+ for (const item of rootList) {
+ // 姝ゅ鍘熸湰 item.productLinkPath.length == pathLength 浣� productLinkPath 闀垮害涓埆涔﹀瓨鍦�4銆�5浣嶄氦閿�
+ if ((pathLength - item.productLinkPath.length >= 0 && pathLength - item.productLinkPath.length <= 3) && item.productLinkPath.includes(path)) {
+ if (item.sysType == 'CmsItem') {
+ if (item.selectType == 'webpage') {
+ item.disabled = true
+ } else {
+ if (item.isDownload != 1) {
+ item.disabled = true
+ }
+ }
+ if (item.file && item.fileMap && item.fileMap[item.file]) {
+ if (item.fileMap[item.file].protectType == 'Private') item.disabled = true
+ }
+ }
+ // newArr.push(item)
+ // 鍦ㄦ彃鍏ヨ繃绋嬩腑瀵规暟鎹繘琛屾帓搴�
+ newArr = this.insertAndSortObjectsByProductLinkPath(newArr, item)
+ // 鎻掕繘鏁扮粍鍚� 浠庡師鏁版嵁涓垹闄�
+ rootList = rootList.filter(nitem => nitem.id != item.id)
+ }
+ }
+ //缁欐暟缁勯噷闈㈠啀娣诲姞涓�涓猚hildren鐨勭┖鏁扮粍
+ // let addnum1 = pathLength - path.length == 6 ? 6 : 7
+ for (const i of newArr) {
+ i.children = []
+ let addnum1 = i.productLinkPath.length - path.length == 6 ? 6 : 7
+ this.getTreeList(rootList, pathLength + addnum1, i.children, i.productLinkPath)
+ if (i.children.length == 0) {
+ delete i.children
+ }
+ }
+ return newArr
+ },
+
+ // 鍘婚櫎鏍戠粨鏋勫浣欓」
+ ensureTreeConsistency(tree) {
+ for (let index = 0; index < tree.length; index++) {
+ const item = tree[index];
+ if (item.children && item.children.length) {
+ const isFloder = item.children.findIndex(citem => citem.sysType == 'CmsFolder')
+ const isItem = item.children.findIndex(citem => citem.sysType == 'CmsItem')
+ if (isFloder > -1 && isItem > -1) {
+ item.children = item.children.filter(ditem => ditem.sysType == 'CmsItem')
+ }
+ this.ensureTreeConsistency(item.children)
+ }
+ }
+ return tree
+ },
+
+ // 鎺掑簭鏁扮粍 鎸夌収productLinkPath
+ insertAndSortObjectsByProductLinkPath(array, newObj) {
+ // 鏌ユ壘鏂板璞″簲璇ユ彃鍏ョ殑浣嶇疆
+ let insertIndex = array.findIndex(obj => Number(newObj.productLinkPath.substring(newObj.productLinkPath.lastIndexOf('\\') + 1, newObj.productLinkPath.length)) < Number(obj.productLinkPath.substring(obj.productLinkPath.lastIndexOf('\\') + 1, obj.productLinkPath.length)));
+ // 濡傛灉娌℃湁鎵惧埌鍚堥�傜殑浣嶇疆锛屽垯鏀惧湪鏁扮粍鏈熬
+ if (insertIndex === -1) {
+ insertIndex = array.length;
+ }
+ // 鎻掑叆鏂板璞″埌鏁扮粍
+ array.splice(insertIndex, 0, newObj);
+ // 娴嬭瘯6 姝ｅ紡5
+ // 瀵规暟缁勮繘琛屾帓搴�
+ array.sort((a, b) => {
+ if (Number(a.productLinkPath.substring(a.productLinkPath.lastIndexOf('\\') + 1, a.productLinkPath.length)) < Number(b.productLinkPath.substring(b.productLinkPath.lastIndexOf('\\') + 1, b.productLinkPath.length))) {
+ return -1;
+ }
+ if (Number(a.productLinkPath.substring(a.productLinkPath.lastIndexOf('\\') + 1, a.productLinkPath.length)) > Number(b.productLinkPath.substring(b.productLinkPath.lastIndexOf('\\') + 1, b.productLinkPath.length))) {
+ return 1;
+ }
+ // a must be equal to b
+ return 0;
+ });
+
+ // 杩斿洖鏇存柊鍚庣殑鏁扮粍
+ return array;
+ },
+ // 鏁欏璧勬簮 浜戝涔� 鑾峰彇
+ getResourceDataList(type) {
this.setData({
+ loading: true,
+ noResources: false,
+ });
+ let query = {
+ path: '*',
+ queryType: '*',
+ storeInfo: this.data.options.storeInfo,
+ productId: this.data.bookDetail.id,
+ cmsPath: type.productLinkPath,
+ cmsType: '*',
+ itemFields: {
+ SysType: 'CmsFolder',
+ // 璧勬簮绫诲瀷锛岃瘯璇绘枃浠讹紝鏄惁鍏佽涓嬭浇绛夊弬鏁�
+ selectType: [],
+ learnSelectType: [],
+ freeFile: [],
+ file: [],
+ protectedFile: [],
+ resourcesClassification: [],
+ isDownload: [],
+ jsek_resourceBrief: [],
+ jsek_link: [],
+ jsek_questionBank: []
+ },
+ pading: {
+ start: 0,
+ size: 999
+ },
+ }
+ app.MG.store.getProductDetailNoChildren(query).then((res) => {
+ if (!res.datas.cmsDatas[0].datas.length) {
+ return this.setData({
+ noResources: true,
+ loading: false,
+ });
+ }
+ let list = []
+ // 娴嬭瘯 6浣�// 姝ｅ紡 5浣�// 娴嬭瘯璋冪敤浼�20锛屽唴閮�7 姝ｅ紡璋冪敤浼�17 鍐呴儴浼�6
+ //鏁欏璧勬簮 浜戝涔�
+ if (
+ type.refCode == "jsek_teachingResources" ||
+ type.refCode == "jsek_cloudLearning"
+ ) {
+ res.datas.cmsDatas[0].datas.forEach((item) => {
+ item.checked = false;
+ if (item.sysType == 'CmsItem') {
+ // 鏁欏璧勬簮 绫诲瀷鍚嶇О璧嬪��
+ this.data.resourceClassList.forEach((type) => {
+ if (type.value == item.resourcesClassification)
+ item.resourceClass = type.name;
+ });
+ if (this.data.tabValue == "jsek_teachingResources") {} else if (this.data.tabValue == "jsek_cloudLearning") {
+ item.isbuy = this.isShowNeedBuy(item);
+ item.isShopCar = this.isShoppingCart(item);
+ }
+ }
+ });
+ if (type.refCode == "jsek_cloudLearning") {
+ this.setData({
+ learnPath: type.productLinkPath
+ })
+ const dataList = res.datas.cmsDatas[0].datas
+ // 鍏堝垽鏂槸鍚﹀惁涔颁簯瀛︿範鏁翠釜鐩綍
+ let couldId = null
+ let codeData = null
+ if (this.data.resourceCodeList.length) {
+ codeData = this.data.resourceCodeList.find(item => item.refCode == 'jsek_cloudLearning')
+ if (codeData && codeData.saleMethod && codeData.saleMethod.length)
+ couldId = codeData.saleMethod[0].Id
+ }
+ if (couldId) {
+ this.setData({
+ isGoBuyResource: this.data.buyIdList.indexOf(couldId) > -1 ? false : true
+ })
+ } else if (dataList.length) {
+ const tag = dataList.findIndex(item => item.saleMethod.length && item.saleMethod[0].Price > 0)
+ this.setData({
+ isGoBuyResource: tag > -1 ? true : false
+ })
+ } else {
+ this.setData({
+ isGoBuyResource: false
+ })
+ }
+ }
+ const addNum = query.cmsPath.length > 10 ? 7 : query.cmsPath.length > 13 ? 8 : 6
+ const num = query.cmsPath.length + addNum
+ this.getTreeList(res.datas.cmsDatas[0].datas, num, list, '\\')
+ list = this.ensureTreeConsistency(list)
+ list = this.changeResourceChildren(list)
+ let result = [];
+ if (type.refCode == "jsek_teachingResources") {
+ this.findChildIds(list, result);
+ // const newUSeList = this.deleteTreeData(list, result)
+ // console.log('鏍戝墧闄�', result, newUSeList);
+ // console.log('鏍戝姞涓�', this.increaseTreeData(list, newUSeList, 16094));
+ this.setData({
+ openTeachids: result,
+ loading: false,
+ teach: list,
+ });
+ } else if (type.refCode == "jsek_cloudLearning") {
+ let arr = this.handleTreeData(list).filter(
+ (item) => item.saleMethod[0]
+ );
+ let freeIds = arr.filter((item) => {
+ return item.saleMethod[0].Price == 0;
+ });
+ if (!freeIds.length)
+ this.setData({
+ isshowDrawBtn: false,
+ });
+ this.findChildIds(list, result);
+ this.setData({
+ learn: list,
+ loading: false,
+ openLearnids: result,
+ });
+ }
+ }
+ })
+ },
+ // 鑾峰彇 浜戞祴璇�
+ getResourceData(type) {
+ var that = this
+ that.setData({
loading: true,
noResources: false,
});
let query = {
path: "*",
queryType: "*",
- productId: this.data.bookDetail.id,
+ storeInfo: that.data.options.storeInfo,
+ productId: that.data.bookDetail.id,
cmsPath: type.productLinkPath,
+ cmsType: '*',
itemFields: {
SysType: "CmsFolder",
// 璧勬簮绫诲瀷锛岃瘯璇绘枃浠讹紝鏄惁鍏佽涓嬭浇绛夊弬鏁�
@@ -749,67 +1059,66 @@
app.MG.store
.getProductDetail(query)
.then(async (res) => {
- if (!res.datas.cmsDatas[0].datas.length) {
- return this.setData({
- noResources: true,
- loading: false,
- });
- }
// 浜戞祴璇曪紝閫掑綊璇锋眰閲屽眰鏁版嵁
if (type.refCode == "questionBank") {
- const data = res.datas.cmsDatas[0].datas.filter(
- (item) => item.refCode == "jsek_questionBank"
- );
- if (data.length) return this.getResourceData(data[0]);
- }
- //鏁欏璧勬簮 浜戝涔�
- if (
- type.refCode == "jsek_teachingResources" ||
- type.refCode == "jsek_cloudLearning"
- ) {
- if (res.datas.cmsDatas[0].datas.length > 0) {
- res.datas.cmsDatas[0].datas.forEach((item) => {
- item.checked = false;
- });
- const list = await this.getAllResource(res.datas.cmsDatas[0].datas);
- let result = [];
- if (type.refCode == "jsek_teachingResources") {
- this.findChildIds(list, result);
- this.setData({
- teach: list,
+ let data = []
+ let result = [];
+ const isTSFW = res.datas.cmsDatas[0].datas.filter(
+ (item) =>
+ item.type == 'questionBankFolder' &&
+ (item.name == '濉┖棰�' ||
+ item.name == '鍒ゆ柇棰�' ||
+ item.name == '鍗曢�夐' ||
+ item.name == '澶氶�夐' ||
+ item.name == '绠�绛旈')
+ )
+ if (that.data.options.storeInfo == 'jsek_jslx') {
+ data = res.datas.cmsDatas[0].datas.filter((item) => item.type == 'questionBankFolder');
+ if (data.length > 0) {
+ that.setData({
+ test: data,
loading: false,
openTeachids: result,
});
- } else if (type.refCode == "jsek_cloudLearning") {
- let arr = this.handleTreeData(list).filter(
- (item) => item.saleMethod[0]
- );
- let freeIds = arr.filter((item) => {
- return item.saleMethod[0].Price == 0;
- });
- if (!freeIds.length)
- this.setData({
- isshowDrawBtn: false,
- });
- this.findChildIds(list, result);
- this.setData({
- learn: list,
+ } else {
+ that.setData({
+ noResources: true,
loading: false,
- openLearnids: result,
});
}
- console.log(list, '浜戝缈�789');
} else {
- // 鏃犳暟鎹�
+ if (isTSFW.length > 0) {
+ data = res.datas.cmsDatas[0].datas.filter((item) => item.type == 'questionBankFolder' && item.childrenFolderCount > 0)
+ that.setData({
+ jslx: false,
+ });
+ } else {
+ data = res.datas.cmsDatas[0].datas.filter((item) => item.type == 'questionBankFolder')
+ that.setData({
+ jslx: true,
+ });
+ }
+ if (data.length > 0) {
+ let list = []
+ // 娴嬭瘯 6浣�// 姝ｅ紡 5浣�// 娴嬭瘯璋冪敤浼�20锛屽唴閮�7 姝ｅ紡璋冪敤浼�17 鍐呴儴浼�6
+
+ const addNum = query.cmsPath.length > 10 ? 7 : query.cmsPath.length > 13 ? 8 : 6
+ const num = query.cmsPath.length + addNum
+ that.getTreeList(data, num, list, '\\')
+ list = that.ensureTreeConsistency(list)
+ that.findChildIds(list[0].children, result);
+ that.setData({
+ test: list.length == 1 && list[0].name == '棰樺簱' ? list[0].children : list,
+ loading: false,
+ openTeachids: result,
+ });
+ } else {
+ that.setData({
+ noResources: true,
+ loading: false,
+ });
+ }
}
- } else if (type.refCode == "jsek_questionBank") {
- // const list = await this.getAllResource(res.datas.cmsDatas[0].datas)
- this.setData({
- test: res.datas.cmsDatas[0].datas,
- loading: false,
- });
- } else {
- console.log("鍏朵粬");
}
})
.catch((e) => {
@@ -834,6 +1143,7 @@
let query = {
path: "*",
queryType: "*",
+ storeInfo: this.data.options.storeInfo,
productId: this.data.bookDetail.id,
cmsPath: path,
itemFields: {
@@ -903,30 +1213,33 @@
// 鑾峰彇灞曞紑椤�
findChildIds(data, result) {
let index = 0
- for (let i = 0; i < data.length; i++) {
- if (index < 3) {
- const item = data[i]
- if (item.childrenFolderCount > 0) {
- result.push(item.id)
- for (let j = 0; j < item.children.length; j++) {
- if (index < 3) {
- const childrenItme = item.children[j]
- if (item.childrenCount > 0) {
- result.push(childrenItme.id)
- index += 1
+ if (data)
+ for (let i = 0; i < data.length; i++) {
+ if (index < 3) {
+ const item = data[i]
+ if (item.children && item.children.length > 0) {
+ result.push(item.id)
+ if (item.children) {
+ for (let j = 0; j < item.children.length; j++) {
+ if (index < 3) {
+ const childrenItme = item.children[j]
+ if (item.childrenCount > 0) {
+ result.push(childrenItme.id)
+ index += 1
+ }
+ } else {
+ break
+ }
}
- } else {
- break
}
+ } else if (item.childrenCount > 0) {
+ result.push(item.id)
+ index += 1
}
- } else if (item.childrenCount > 0) {
- result.push(item.id)
- index += 1
+ } else {
+ break
}
- } else {
- break
}
- }
},
// 鍥句功娣诲姞璐墿杞�
@@ -998,7 +1311,6 @@
// 鍙戣捣璁㈠崟鍒濆鍖栬姹傚苟绛夊緟缁撴灉
const res = await app.MG.store.initOrder(query);
// 鑾峰彇璁㈠崟鍙峰苟璧嬪�肩粰 orderNumber.value
- console.log(res, 'res456');
bookOrdersId = res.orderNumber;
// 妫�鏌ヨ鍗曞彿鏄惁瀛樺湪
if (bookOrdersId) {
@@ -1023,9 +1335,7 @@
url,
});
}
- } else {
- console.log(222);
- }
+ } else {}
} else {
wx.showToast({
title: "鍟嗗搧涓嶅湪鏈夋晥鏈�",
@@ -1111,7 +1421,6 @@
},
// 鐢宠鏁欏璧勬簮
applyResource() {
-
// if (this.data.applyResourceState) {
// return wx.showToast({
// icon: "error",
@@ -1329,7 +1638,16 @@
},
// 鍒ゆ柇璧勬簮鏄惁璐拱
resourceIsBuy(data) {
- if (data.saleMethod && data.saleMethod.length) {
+ let couldId = null
+ let codeData = null
+ if (this.data.resourceCodeList.length) {
+ codeData = this.data.resourceCodeList.find(item => item.refCode == 'jsek_cloudLearning')
+ if (codeData && codeData.saleMethod && codeData.saleMethod.length)
+ couldId = codeData.saleMethod[0].Id
+ }
+ if (couldId) {
+ return this.data.buyIdList.indexOf(couldId) > -1 ? false : true
+ } else if (data.saleMethod && data.saleMethod.length) {
const isSHow = this.data.buyIdList.some(
(item) => item == data.saleMethod[0].Id
);
@@ -1347,7 +1665,7 @@
if (isSHow) {
return false;
} else {
- return data.saleMethod[0].price > 0 ? true : false;
+ return data.saleMethod[0].Price > 0 ? true : false;
}
return !isSHow;
} else {
@@ -1375,7 +1693,16 @@
},
// 鍒ゆ柇璧勬簮鍔犲叆璐墿杞︽寜閽槸鍚︽樉绀�
isShoppingCart(data) {
- if (data.saleMethod && data.saleMethod.length) {
+ let couldId = null
+ let codeData = null
+ if (this.data.resourceCodeList.length) {
+ codeData = this.data.resourceCodeList.find(item => item.refCode == 'jsek_cloudLearning')
+ if (codeData && codeData.saleMethod && codeData.saleMethod.length)
+ couldId = codeData.saleMethod[0].Id
+ }
+ if (couldId) {
+ return this.data.buyIdList.indexOf(couldId) > -1 ? false : true
+ } else if (data.saleMethod && data.saleMethod.length) {
if (data.saleMethod[0].Price <= 0) return false;
// 鍐嶅垽鏂槸鍚﹁喘涔�
const isBuy = this.data.buyIdList.some(
@@ -1397,7 +1724,6 @@
},
updateShoppingCartHidden() {
-
const isSHow = this.data.shoppingCartGetId.some(
(item) => item == data.saleMethod[0].Id
);
@@ -1410,10 +1736,7 @@
const checkData = this.data.cmsDatas.find(
(item) => item.refCode == "jsek_cloudLearning"
);
- this.getResourceData(checkData);
-
-
-
+ this.getResourceDataList(checkData);
},
// 閬嶅巻鏍戠粨鏋勮浆鎹负鏁扮粍鏂规硶
handleTreeData(array) {
@@ -1475,21 +1798,19 @@
};
// 纭璁㈠崟
const confirmOrderRes = await app.MG.store.confirmOrder(parameter);
- console.log(confirmOrderRes.orderNumber, 'confirmOrderRes.orderNumber');
-
-
-
if (confirmOrderRes.orderNumber) {
child.changeReceive(false);
wx.showToast({
title: "棰嗗彇鎴愬姛",
});
this.getBookInfo(this.data.bookId);
+ this.getResourceDataList({
+ refCode: 'jsek_cloudLearning',
+ productLinkPath: this.data.learnPath
+ })
this.setData({
successOrderNumber: confirmOrderRes.orderNumber
})
-
-
}
} catch (error) {
console.log(error);
@@ -1802,8 +2123,6 @@
});
return false;
}
-
- // debugger
wx.navigateTo({
url: "/packageBookService/pages/components/webView/index?md5=" +
this.data.fileInfo.md5 +
@@ -1817,6 +2136,7 @@
this.data.bookBuy +
"&bookId=" +
this.data.bookDetail.id,
+
});
},
@@ -1881,6 +2201,20 @@
list.push(item);
}
});
+ const smBook = list.find(item => item.content[0].id == this.data.bookDetail.id)
+ console.log('宸茬敵璇�', smBook);
+ if (smBook && smBook.state == 'Normal') {
+ const flag = new Date(smBook.feedBack.endDate + ' 23:59:59').getTime() > new Date().getTime()
+ if (flag) {
+ this.setData({
+ applicationState: 'Normal'
+ })
+ } else {
+ this.setData({
+ applicationState: 'overdue'
+ })
+ }
+ }
this.setData({
alreadyElectronicBookList: list,
});
@@ -1917,6 +2251,23 @@
//鐢宠鐢靛瓙鏍蜂功
appplyElectronicBook() {
+ // 鍏堝垽鏂笅鏁欏笀璁よ瘉锛屾湭瀵瑰師鏈夐�昏緫淇敼
+ let role = this.data.userInfo != null ? this.data.userInfo.role : null;
+ if (role && role == "Teacher") {} else {
+ return wx.showModal({
+ title: "灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�", //鎻愮ず鐨勬爣棰�
+ content: "璇峰厛杩涜鏁欏笀璁よ瘉锛�", //鎻愮ず鐨勫唴瀹�
+ confirmColor: "#ff6c00",
+ cancelColor: "#949494",
+ success: function (res) {
+ if (res.confirm) {
+ wx.navigateTo({
+ url: "/packageDomain/pages/teacherCertification/index",
+ });
+ } else if (res.cancel) {}
+ },
+ });
+ }
if (
this.data.bookDetail.isApplyBook == 2 ||
this.data.bookDetail.isApplyBook == 4
@@ -1952,15 +2303,27 @@
return false;
}
let isApply = this.data.alreadyElectronicBookList.find(
- (eitem) => eitem.id == this.data.bookDetail.id
+ (eitem) => eitem.content[0].id == this.data.bookDetail.id
);
if (isApply) {
- wx.showToast({
- title: "璇ヤ功宸茬敵璇凤紒",
- icon: "none",
- duration: 1000,
- });
- return false;
+ if (isApply.state == 'WaitAudit') {
+ wx.showToast({
+ title: "璇ヤ功宸茬敵璇凤紒",
+ icon: "none",
+ duration: 1000,
+ });
+ return false;
+ } else if (isApply.state == 'Normal') {
+ const flag = new Date(isApply.feedBack.endDate + ' 23:59:59').getTime() > new Date().getTime()
+ if (flag) {
+ wx.showToast({
+ title: "璇ヤ功宸茬敵璇凤紒",
+ icon: "none",
+ duration: 1000,
+ });
+ return false;
+ }
+ }
}
if (this.data.electronicBookList.length >= 2) {
wx.showToast({
@@ -1996,6 +2359,22 @@
},
//鐢宠绾歌川鏍蜂功
appplyPaperBook() {
+ let role = this.data.userInfo != null ? this.data.userInfo.role : null;
+ if (role && role == "Teacher") {} else {
+ return wx.showModal({
+ title: "灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�", //鎻愮ず鐨勬爣棰�
+ content: "璇峰厛杩涜鏁欏笀璁よ瘉锛�", //鎻愮ず鐨勫唴瀹�
+ confirmColor: "#ff6c00",
+ cancelColor: "#949494",
+ success: function (res) {
+ if (res.confirm) {
+ wx.navigateTo({
+ url: "/packageDomain/pages/teacherCertification/index",
+ });
+ } else if (res.cancel) {}
+ },
+ });
+ }
if (
this.data.bookDetail.isApplyBook == 3 ||
this.data.bookDetail.isApplyBook == 4
@@ -2012,7 +2391,7 @@
return false;
}
let isApply = this.data.alreadyPaperBookList.find(
- (pitem) => pitem.id == this.data.bookDetail.id
+ (pitem) => pitem.content[0].id == this.data.bookDetail.id
);
if (isApply) {
wx.showToast({
@@ -2088,13 +2467,13 @@
this.setData({
electronicBookList: eList,
});
- wx.setStorageSync("electronicBookList", eList);
+ wx.setStorageSync("electronicBookList", JSON.stringify(eList));
} else {
pList.push(itemAttr);
this.setData({
paperBookList: pList,
});
- wx.setStorageSync("paperBookList", pList);
+ wx.setStorageSync("paperBookList", JSON.stringify(pList));
}
this.setData({
num: this.data.num + 1,
@@ -2139,4 +2518,274 @@
teach: tree,
});
},
-});
\ No newline at end of file
+
+ // 鍓旈櫎鏍戠粨鏋勫浣欙紝鍙繚鐣欏垵濮嬮渶瑕佸睍寮�鐨�
+ // 绗竴姝ワ細淇濈暀鏍戠粨鏋勫墠涓ゅ眰锛屽苟灏嗗睍寮�椤瑰姞鍏ユ暟缁�
+ deleteTreeData(list, openids) {
+ let resultList = []
+ for (let index = 0; index < list.length; index++) {
+ const item = list[index];
+ if (item.children.length > 0) {
+ for (let cindex = 0; cindex < item.children.length; cindex++) {
+ const citem = item.children[cindex];
+ citem.children = []
+ }
+ }
+ resultList.push(item)
+ }
+ for (let index = 0; index < openids.length; index++) {
+ const id = openids[index];
+ // 灞曞紑椤瑰姞鍏ユ暟缁�
+ this.increaseTreeData(list, resultList, id)
+ }
+ return resultList
+ },
+ // 浼犻�抜ds锛屽皢闇�瑕佸睍寮�鐨刬d鐨刢hildren 璧嬪��
+ increaseTreeData(treeList, list, openid) {
+ let num = 0;
+ // let useData = treeList.find(item => item.id == openid)
+ for (let index = 0; index < treeList.length; index++) {
+ const item = treeList[index];
+ if (item.id == openid && num >= 3) {
+ let useArr = item.children ? item.children : []
+ this.changeList(list, openid, useArr)
+ } else {
+ num += 1
+ this.increaseTreeData(item.children, list, openid)
+ }
+ }
+
+ },
+ // 閫掑綊鍓嶄袱灞傦紝鎵惧嚭闇�瑕佸睍寮�鐨�
+ changeList(isList, id, childrenList) {
+ for (let dindex = 0; dindex < isList.length; dindex++) {
+ const ditem = isList[dindex];
+ if (ditem.id == id) {
+ ditem.children = childrenList
+ return true
+ } else {
+ this.changeList(ditem.children, id, childrenList)
+ }
+ }
+ return childrenList
+ },
+ uploadFile(e) {
+ console.log(123)
+ this.setData({
+ dialogBox: true,
+ isShowUp: true
+ });
+ },
+ closeDialog() {
+ this.setData({
+ dialogBox: false,
+ });
+ },
+ onCloseProtocol() {
+ this.setData({
+ protocolShow: false,
+ });
+ },
+ onVisibleChange(e) {
+ this.setData({
+ protocolShow: e.detail.visible,
+ });
+ },
+ //鏌ョ湅鍗忚
+ getAgreement() {
+ let query = {
+ path: 'jsek_protocol',
+ fields: {
+ content: [],
+ }
+ }
+ app.MG.resource.getItem(query).then((res) => {
+ try {
+
+ const data = res.datas.find((e) => e.refCode == 'jsek_authorizationAndConsentLetter')
+ this.setData({
+ protocolTxt: data && data.content ? data.content : '鏆傛棤鍗忚',
+ protocolShow: true
+ });
+ } catch (error) {
+ this.setData({
+ protocolTxt: '鏆傛棤鍗忚',
+ protocolShow: true,
+ });
+ }
+ })
+
+ },
+ onNameInput(e) {
+ console.log(e.detail.value)
+ this.setData({
+ 'resourceInfo.resourceName': e.detail.value,
+ });
+ },
+ onFileTypeInput(e) {
+ this.setData({
+ 'resourceInfo.fileType': e.detail.value,
+ });
+ },
+ textareaChange(e) {
+ this.setData({
+ 'resourceInfo.description': e.detail.value,
+ });
+ },
+ onChange() {
+ if (this.data.resourceInfo.agree) {
+ this.setData({
+ 'resourceInfo.agree': false,
+ });
+ } else {
+ this.setData({
+ 'resourceInfo.agree': true,
+ });
+ }
+ },
+ uploadPicture() {
+ var that = this;
+ wx.chooseMessageFile({
+ count: 1,
+ type: 'file',
+ success(res) {
+ const isLt2M = res.tempFiles[0].size / 1024 / 1024 < 50
+ if (!isLt2M) {
+ return wx.showToast({
+ title: "涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃 50MB!",
+ icon: "none",
+ duration: 1000,
+ });
+ }
+ const FileName = res.tempFiles[0].name.split('.')[0]
+ const Extension = res.tempFiles[0].name.split('.')[1]
+ var medioType = ''
+ const audioData = ['mp3', 'mp3']
+ const videoData = ['mp4', 'avi']
+ const pdfData = ['pdf']
+ const Compression = ['rar', 'zip']
+ const pictureData = ['jpg', 'png']
+ if (audioData.indexOf(Extension) > -1) {
+ medioType = '闊抽'
+ } else if (videoData.indexOf(Extension) > -1) {
+ medioType = '瑙嗛'
+ } else if (pdfData.indexOf(Extension) > -1) {
+ medioType = 'PDF'
+ } else if (Compression.indexOf(Extension) > -1) {
+ medioType = '璧勬簮鍖�'
+ } else if (pictureData.indexOf(Extension) > -1) {
+ medioType = '鍥剧墖'
+ } else {
+ medioType = '鍏朵粬'
+ }
+ wx.getFileSystemManager().getFileInfo({
+ filePath: res.tempFiles[0].path, //閫夋嫨鍥剧墖杩斿洖鐨勭浉瀵硅矾寰�
+ // encoding: 'binary', //缂栫爜鏍煎紡
+ success: ress => {
+ //鎴愬姛鐨勫洖璋�
+ let md5 = ress.digest;
+ let formData = new FormData();
+ formData.append('Md5', md5);
+ formData.append('FileName', FileName);
+ formData.append('FileType', res.tempFiles[0].type);
+ formData.appendFile("file", res.tempFiles[0].path);
+ const data = formData.getData();
+ let _token = wx.getStorageSync(app.config.tokenKey);
+ let header = {};
+ if (_token == null) {
+ header["Authorization"] = `Basic ${Base64.encode(website.clientId + ":" + website.clientSecret)}`;
+ } else {
+ header["Authorization"] = `Bearer ` + _token;
+ }
+ new Promise((resolve, reject) => {
+ wx.request({
+ url: app.config.requestCtx + '/file/api/ApiUpload',
+ method: 'POST',
+ header: {
+ 'content-type': data.contentType,
+ ...header
+ },
+ data: data.buffer,
+ success(res1) {
+ resolve(res1.data);
+ if (res1.data) {
+ let file = [{
+ name: res.tempFiles[0].name,
+ md5: md5,
+ type: medioType,
+ FileType: Extension
+ }]
+ that.setData({
+ "resourceInfo.resourceName": FileName,
+ "resourceInfo.fileType": medioType,
+ fileList: file,
+ isShowUp: false
+ })
+ }
+ }
+ })
+ })
+ }
+ })
+ }
+ })
+
+ },
+ handleRemove(e) {
+ console.log(e)
+ let md5 = e.currentTarget.dataset.md5
+ for (let i = 0; i < this.data.fileList.length; i++) {
+ if (this.data.fileList.md5 == md5) {
+ this.data.fileList.splice(i, 1)
+ }
+ }
+ this.setData({
+ isShowUp: true,
+ });
+ },
+ confirmM() {
+ if (this.data.resourceInfo.resourceName == '') {
+ return wx.showToast({
+ icon: "error",
+ title: "璇峰～鍐欒祫婧愬悕绉�",
+ });
+ }
+ if (this.data.resourceInfo.fileType == '') {
+ return wx.showToast({
+ icon: "error",
+ title: "璇峰～鍐欒祫婧愮被鍨�",
+ });
+ }
+
+ if (!this.data.fileList.length) {
+ return wx.showToast({
+ icon: "error",
+ title: "璇蜂笂浼犺祫婧愭枃浠�",
+ });
+ }
+ if (!this.data.resourceInfo.agree) {
+ return wx.showToast({
+ icon: "none",
+ title: "璇峰悓鎰忋�婃巿鏉冨悓鎰忎功銆嬶紒",
+ });
+ }
+ let query = {
+ topicIdOrRefCode: "uploadFiles",
+ name: this.data.bookDetail.name,
+ content: JSON.stringify(JSON.parse(JSON.stringify(this.data.fileList))),
+ type: 'UserSubmit',
+ description: this.data.resourceInfo.description,
+ cmsTypeRefCode: '',
+ newDataListRequest: []
+ }
+ app.MG.ugc.newTopicMessage(query).then((res) => {
+ wx.showToast({
+ icon: "success",
+ title: "璇蜂笂浼犺祫婧愭枃浠�",
+ });
+ this.setData({
+ dialogBox: false,
+ });
+ })
+ }
+})
\ No newline at end of file
--
Gitblit v1.9.1