From 9d5789148e866f95f86d975011a9ef39d534c807 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 17 七月 2024 17:37:19 +0800
Subject: [PATCH] 拼树结构优化
---
packageBookService/pages/bookServices/detail/index.js | 384 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 256 insertions(+), 128 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index f4d5cd8..d0fa544 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -16,6 +16,7 @@
options: {
id: "",
name: "",
+ storeInfo: '',
},
bookDetail: {},
bookClass: [],
@@ -37,6 +38,8 @@
openTeachids: [],
openLearnids: [],
openTestids: [],
+ isGoBuyResource: true,
+ learnPath: '',
applyResourceState: false, // 鐢宠鏁欏璧勬簮鎸夐挳闃叉姈
resourceClassList: [], // 璧勬簮鎵�灞炲垎绫�
applyState: "", // 鏁欏璧勬簮鐢宠鐘舵��
@@ -150,7 +153,8 @@
},
],
showIndex: '',
- successOrderNumber: ''
+ successOrderNumber: '',
+ applicationState: '' // 鐢靛瓙鏍蜂功鐢宠鐘舵��
},
resetTree: function (e) {
@@ -176,13 +180,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 +350,7 @@
"mockData.count": 0,
});
const query = {
+ storeInfo: this.data.options.storeInfo,
path: "*",
queryType: "*",
productId: id,
@@ -383,6 +389,7 @@
this.setData({
bookDetail: res.datas,
buyIdList: res.datas.purchasedSaleMethodIdList,
+ pageLoading: false
});
if (res.datas.cmsDatas && res.datas.cmsDatas.length) {
this.setData({
@@ -398,14 +405,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,7 +455,7 @@
"bookDetail.paperPrice": this.numFormat(
this.data.bookDetail.paperPrice
),
- pageLoading: false,
+
});
console.log("鍥句功淇℃伅", this.data.bookClass);
});
@@ -506,14 +518,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,
});
}
}
@@ -527,7 +539,7 @@
"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) {
@@ -535,7 +547,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,
});
}
}
@@ -564,28 +576,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
+ })
+ }
+ }
+ });
}
- });
- }
- });
+
+ }
+ });
+ }
+
});
},
// 鏀惰棌
@@ -637,6 +658,8 @@
this.setData({
showIndex: '1'
})
+ console.log(this.data.bookDetail.icon, '0111111');
+ console.log(this.data.bookDetail.name, '45688');
},
// 璺宠浆缃戝簵
goShop(e) {
@@ -662,7 +685,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({
@@ -682,9 +705,7 @@
// this.getResourceData(checkData);
// }
if ((e.detail.value == "jsek_teachingResources" && !this.data.teach.length) || (e.detail.value == "jsek_cloudLearning" && !this.data.learn.length)) {
- if (e.detail.value == "jsek_teachingResources") {
- wx.setStorageSync('teachResourcesPath', checkData.productLinkPath)
- }
+ wx.setStorageSync('teachResourcesPath', checkData.productLinkPath)
this.getResourceDataList(checkData)
} else if (e.detail.value == "questionBank" && !this.data.test.length) {
this.getResourceData(checkData);
@@ -726,10 +747,49 @@
});
},
+ // 鑾峰彇鎵�鏈夊瓙椤规暟閲�
+ 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) {
+ getTreeList(rootList, pathLength, newArr, path, addNum) {
for (const item of rootList) {
- if (item.productLinkPath.length == pathLength && item.productLinkPath.includes(path)) {
+ // 姝ゅ鍘熸湰 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
@@ -744,13 +804,17 @@
}
// newArr.push(item)
// 鍦ㄦ彃鍏ヨ繃绋嬩腑瀵规暟鎹繘琛屾帓搴�
- newArr = this.insertAndSortObjectsByProductLinkPath(newArr, item)
+ newArr = this.insertAndSortObjectsByProductLinkPath(newArr, item, addNum)
+ // 鎻掕繘鏁扮粍鍚� 浠庡師鏁版嵁涓垹闄�
+ rootList = rootList.filter(nitem => nitem.id != item.id)
}
}
//缁欐暟缁勯噷闈㈠啀娣诲姞涓�涓猚hildren鐨勭┖鏁扮粍
+ // let addnum1 = pathLength - path.length == 6 ? 6 : 7
for (const i of newArr) {
i.children = []
- this.getTreeList(rootList, pathLength + 6, i.children, i.productLinkPath)
+ let addnum1 = i.productLinkPath.length - path.length == 6 ? 6 : 7
+ this.getTreeList(rootList, pathLength + addnum1, i.children, i.productLinkPath, addnum1)
if (i.children.length == 0) {
delete i.children
}
@@ -775,10 +839,9 @@
},
// 鎺掑簭鏁扮粍 鎸夌収productLinkPath
- insertAndSortObjectsByProductLinkPath(array, newObj) {
+ insertAndSortObjectsByProductLinkPath(array, newObj, addNum) {
// 鏌ユ壘鏂板璞″簲璇ユ彃鍏ョ殑浣嶇疆
- let insertIndex = array.findIndex(obj => Number(newObj.productLinkPath.substring(newObj.productLinkPath.length - 6, newObj.productLinkPath.length)) < Number(obj.productLinkPath.substring(obj.productLinkPath.length - 6, obj.productLinkPath.length)));
-
+ let insertIndex = array.findIndex(obj => Number(newObj.productLinkPath.substring(newObj.productLinkPath.length - addNum, newObj.productLinkPath.length)) < Number(obj.productLinkPath.substring(obj.productLinkPath.length - addNum, obj.productLinkPath.length)));
// 濡傛灉娌℃湁鎵惧埌鍚堥�傜殑浣嶇疆锛屽垯鏀惧湪鏁扮粍鏈熬
if (insertIndex === -1) {
insertIndex = array.length;
@@ -788,10 +851,10 @@
// 娴嬭瘯6 姝ｅ紡5
// 瀵规暟缁勮繘琛屾帓搴�
array.sort((a, b) => {
- if (Number(a.productLinkPath.substring(a.productLinkPath.length - 5, a.productLinkPath.length)) < Number(b.productLinkPath.substring(b.productLinkPath.length - 5, b.productLinkPath.length))) {
+ if (Number(a.productLinkPath.substring(a.productLinkPath.length - addNum, a.productLinkPath.length)) < Number(b.productLinkPath.substring(b.productLinkPath.length - addNum, b.productLinkPath.length))) {
return -1;
}
- if (Number(a.productLinkPath.substring(a.productLinkPath.length - 5, a.productLinkPath.length)) > Number(b.productLinkPath.substring(b.productLinkPath.length - 5, b.productLinkPath.length))) {
+ if (Number(a.productLinkPath.substring(a.productLinkPath.length - addNum, a.productLinkPath.length)) > Number(b.productLinkPath.substring(b.productLinkPath.length - addNum, b.productLinkPath.length))) {
return 1;
}
// a must be equal to b
@@ -810,6 +873,7 @@
let query = {
path: '*',
queryType: '*',
+ storeInfo: this.data.options.storeInfo,
productId: this.data.bookDetail.id,
cmsPath: type.productLinkPath,
cmsType: '*',
@@ -817,6 +881,7 @@
SysType: 'CmsFolder',
// 璧勬簮绫诲瀷锛岃瘯璇绘枃浠讹紝鏄惁鍏佽涓嬭浇绛夊弬鏁�
selectType: [],
+ learnSelectType: [],
freeFile: [],
file: [],
protectedFile: [],
@@ -831,7 +896,7 @@
size: 999
},
}
- app.MG.store.getProductDetail(query).then((res) => {
+ app.MG.store.getProductDetailNoChildren(query).then((res) => {
if (!res.datas.cmsDatas[0].datas.length) {
return this.setData({
noResources: true,
@@ -859,16 +924,35 @@
}
}
});
- this.getTreeList(res.datas.cmsDatas[0].datas, 17, list, '\\')
+ if (type.refCode == "jsek_cloudLearning") {
+ this.setData({
+ learnPath: type.productLinkPath
+ })
+ const dataList = res.datas.cmsDatas[0].datas
+ 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 > 14 ? 8 : 6
+ const num = query.cmsPath.length + addNum
+ this.getTreeList(res.datas.cmsDatas[0].datas, num, list, '\\', addNum)
list = this.ensureTreeConsistency(list)
- console.log('淇敼鍚庝簯', list);
+ list = this.changeResourceChildren(list)
+ console.log('淇敼鍚�', list);
let result = [];
if (type.refCode == "jsek_teachingResources") {
this.findChildIds(list, result);
this.setData({
- teach: list,
- loading: false,
openTeachids: result,
+ loading: false,
+ teach: list,
});
} else if (type.refCode == "jsek_cloudLearning") {
let arr = this.handleTreeData(list).filter(
@@ -900,8 +984,10 @@
let query = {
path: "*",
queryType: "*",
+ storeInfo: this.data.options.storeInfo,
productId: this.data.bookDetail.id,
cmsPath: type.productLinkPath,
+ cmsType: '*',
itemFields: {
SysType: "CmsFolder",
// 璧勬簮绫诲瀷锛岃瘯璇绘枃浠讹紝鏄惁鍏佽涓嬭浇绛夊弬鏁�
@@ -922,67 +1008,47 @@
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);
+ let data = []
+ let result = [];
+ if (this.data.options.storeInfo == 'jsek_jslx') {
+ data = res.datas.cmsDatas[0].datas.filter((item) => item.type == 'questionBankFolder');
+ if (data.length > 0) {
this.setData({
- teach: list,
+ 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);
+ } else {
this.setData({
- learn: list,
+ noResources: true,
loading: false,
- openLearnids: result,
});
}
- console.log(list, '浜戝缈�789');
} else {
- // 鏃犳暟鎹�
+ data = res.datas.cmsDatas[0].datas.filter((item) => item.type == 'questionBankFolder' && item.childrenFolderCount > 0);
+ if (data.length > 0) {
+ let list = []
+ // 娴嬭瘯 6浣�// 姝ｅ紡 5浣�// 娴嬭瘯璋冪敤浼�20锛屽唴閮�7 姝ｅ紡璋冪敤浼�17 鍐呴儴浼�6
+
+ const addNum = query.cmsPath.length > 10 ? 7 : query.cmsPath.length > 14 ? 8 : 6
+ const num = query.cmsPath.length + addNum
+ this.getTreeList(data, num, list, '\\', addNum)
+ list = this.ensureTreeConsistency(list)
+ this.findChildIds(list[0].children, result);
+ this.setData({
+ test: list[0].children,
+ loading: false,
+ openTeachids: result,
+ });
+ } else {
+ this.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) => {
@@ -1007,6 +1073,7 @@
let query = {
path: "*",
queryType: "*",
+ storeInfo: this.data.options.storeInfo,
productId: this.data.bookDetail.id,
cmsPath: path,
itemFields: {
@@ -1076,30 +1143,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
}
- }
},
// 鍥句功娣诲姞璐墿杞�
@@ -1171,7 +1241,6 @@
// 鍙戣捣璁㈠崟鍒濆鍖栬姹傚苟绛夊緟缁撴灉
const res = await app.MG.store.initOrder(query);
// 鑾峰彇璁㈠崟鍙峰苟璧嬪�肩粰 orderNumber.value
- console.log(res, 'res456');
bookOrdersId = res.orderNumber;
// 妫�鏌ヨ鍗曞彿鏄惁瀛樺湪
if (bookOrdersId) {
@@ -1284,7 +1353,6 @@
},
// 鐢宠鏁欏璧勬簮
applyResource() {
-
// if (this.data.applyResourceState) {
// return wx.showToast({
// icon: "error",
@@ -1520,7 +1588,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 {
@@ -1570,7 +1638,6 @@
},
updateShoppingCartHidden() {
-
const isSHow = this.data.shoppingCartGetId.some(
(item) => item == data.saleMethod[0].Id
);
@@ -1645,19 +1712,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);
@@ -1983,6 +2050,7 @@
this.data.bookBuy +
"&bookId=" +
this.data.bookDetail.id,
+
});
},
@@ -2047,6 +2115,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,
});
@@ -2083,6 +2165,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
@@ -2118,15 +2217,28 @@
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') {
+ console.log(isApply.state, "isApply.state")
+ 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({
@@ -2162,6 +2274,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
@@ -2178,7 +2306,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({
@@ -2254,13 +2382,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,
--
Gitblit v1.9.1