From ccda9ec2fe70d8f51ef184eafc04b78d22dfbabd Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期三, 26 六月 2024 15:02:28 +0800
Subject: [PATCH] 小程序，教材，课程
---
packageBookService/pages/bookServices/detail/index.js | 849 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 621 insertions(+), 228 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index f4f4c86..57f03e7 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -1,7 +1,9 @@
// pages/bookServices/detail/index.js
import Toast from "tdesign-miniprogram/toast";
import tool from "../../../../assets/js/toolClass";
-import { loginInfo } from "../../../../assets/js/login";
+import {
+ loginInfo
+} from "../../../../assets/js/login";
const app = getApp();
Page({
/**
@@ -14,8 +16,10 @@
options: {
id: "",
name: "",
+ storeInfo: '',
},
bookDetail: {},
+ bookClass: [],
bookItemDetail: {},
link: {
jd: "",
@@ -34,6 +38,8 @@
openTeachids: [],
openLearnids: [],
openTestids: [],
+ isGoBuyResource: true,
+ learnPath: '',
applyResourceState: false, // 鐢宠鏁欏璧勬簮鎸夐挳闃叉姈
resourceClassList: [], // 璧勬簮鎵�灞炲垎绫�
applyState: "", // 鏁欏璧勬簮鐢宠鐘舵��
@@ -131,6 +137,24 @@
icon1: {
name: "/static/images/bookService/detail/dangdang.png",
},
+ rowCol: [{
+ width: '50%',
+ },
+ {
+ width: '100%'
+ },
+ {
+ width: '80%'
+ },
+ {
+ width: '100%'
+ }, {
+ width: '100%'
+ },
+ ],
+ showIndex: '',
+ successOrderNumber: '',
+ applicationState: '' // 鐢靛瓙鏍蜂功鐢宠鐘舵��
},
resetTree: function (e) {
@@ -156,15 +180,18 @@
options: {
id: options.id,
name: options.name,
+ storeInfo: options.storeInfo,
},
});
+ wx.setNavigationBarTitle({
+ title: options.name,
+ })
this.getBookInfo(options.id);
this.getResourceClass(); // 鑾峰彇璧勬簮鎵�灞炲垎绫�
const token = wx.getStorageSync(app.config.tokenKey);
if (token) {
this.getShoppingCartProductGet();
this.getApplyInfo(options.id);
- this.getMockData();
this.getAlreadyPBookList();
this.getAlreadyEBookList();
}
@@ -189,16 +216,16 @@
onShow() {
if (wx.getStorageSync("paperBookList")) {
this.setData({
- paperBookList: wx.getStorageSync("paperBookList"),
+ paperBookList: JSON.parse(wx.getStorageSync("paperBookList")),
});
}
if (wx.getStorageSync("electronicBookList")) {
this.setData({
- electronicBookList: wx.getStorageSync("electronicBookList"),
+ electronicBookList: JSON.parse(wx.getStorageSync("electronicBookList")),
});
}
this.setData({
- num: this.data.paperBookList.length + this.data.electronicBookList.length,
+ num: Number(this.data.paperBookList.length) + Number(this.data.electronicBookList.length),
});
},
@@ -223,7 +250,7 @@
onReachBottom() {
if (this.data.tabValue == "jsek_note") {
const child = this.selectComponent("#note");
- child.onReachBottom();
+ if (!child.data.noList) child.onReachBottom();
}
},
@@ -301,7 +328,19 @@
},
// 杩斿洖
goBack() {
- wx.navigateBack();
+ let bookPathList = wx.getStorageSync("bookPathList");
+ if (bookPathList && JSON.parse(bookPathList).length) {
+ bookPathList = JSON.parse(bookPathList);
+ this.setData({
+ pageLoading: true,
+ tabValue: "brief",
+ });
+ this.onLoad(bookPathList[bookPathList.length - 1]);
+ bookPathList.pop();
+ wx.setStorageSync("bookPathList", JSON.stringify(bookPathList));
+ } else {
+ wx.navigateBack();
+ }
},
// 鑾峰彇鍥句功璇︽儏
getBookInfo(id) {
@@ -311,6 +350,7 @@
"mockData.count": 0,
});
const query = {
+ storeInfo: this.data.options.storeInfo,
path: "*",
queryType: "*",
productId: id,
@@ -345,24 +385,36 @@
},
};
app.MG.store.getProductDetail(query).then(async (res) => {
+ console.log(res.datas, 'res.datas');
this.setData({
bookDetail: res.datas,
- cmsDatas: res.datas.cmsDatas[0].datas,
buyIdList: res.datas.purchasedSaleMethodIdList,
- relatedBookPath: JSON.parse(res.datas.datas.ProductLinkInfo)[0]
- .LinkPath,
});
+ if (res.datas.cmsDatas && res.datas.cmsDatas.length) {
+ this.setData({
+ cmsDatas: res.datas.cmsDatas[0].datas,
+ })
+ }
+ if (res.datas.datas.ProductLinkInfo) {
+ if (JSON.parse(res.datas.datas.ProductLinkInfo).length) this.setData({
+ relatedBookPath: JSON.parse(res.datas.datas.ProductLinkInfo)[0]
+ .LinkPath,
+ })
+ }
this.getSubTtem();
// 鑾峰彇鍥句功鍒嗙被
- let className = "";
- if (
- Array.isArray(res.datas.bookClassification) &&
- res.datas.bookClassification.length
- ) {
- const iconType = JSON.parse(res.datas.bookClassification)[0][0];
- const classType = JSON.parse(res.datas.bookClassification)[0][1];
- className = await this.getBookClass(iconType, classType);
+ if (res.datas.bookClassification) {
+ 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);
+ }
+ }
}
+
// 鑾峰彇缁勫嵎閿�鍞甶d
if (res.datas.saleMethod && res.datas.saleMethod.length) {
res.datas.saleMethod.forEach((item) => {
@@ -392,7 +444,6 @@
"bookDetail.publicationDate": this.formatDate(
this.data.bookDetail.publicationDate
),
- "bookDetail.class": className,
"bookDetail.price": this.numFormat(this.data.bookDetail.price),
"bookDetail.oldPrice": this.numFormat(this.data.bookDetail.oldPrice),
"bookDetail.paperPrice": this.numFormat(
@@ -400,7 +451,7 @@
),
pageLoading: false,
});
- console.log("鍥句功淇℃伅", this.data.bookDetail);
+ console.log("鍥句功淇℃伅", this.data.bookClass);
});
},
//璇锋眰瀛愬晢鍝佺殑鏂囦欢
@@ -430,10 +481,10 @@
this.setData({
bookItemDetail: res.datas[0],
selectedIds: res.datas[0].defaultSaleMethod.id,
- bookBuy:
- res.datas[0].purchasedSaleMethodIdList.indexOf(
- res.datas[0].defaultSaleMethodId
- ) > -1,
+ bookBuy: res.datas[0].purchasedSaleMethodIdList.indexOf(
+ res.datas[0].defaultSaleMethodId
+ ) > -1,
+ "bookDetail.price": this.numFormat(res.datas[0].price),
});
let times = new Date(res.datas[0].defaultSaleMethod.endDate).getTime();
let startTime = new Date(
@@ -485,6 +536,7 @@
"fileInfo.freePage": this.data.bookDetail.probationPage,
});
} else if (this.data.bookDetail.protectedEpub) {
+
this.setData({
"fileInfo.bookName": this.data.bookDetail.name,
"fileInfo.fileType": "epub",
@@ -495,10 +547,9 @@
}
this.setData({
selectedIds: this.data.bookDetail.defaultSaleMethodId,
- bookBuy:
- this.data.bookDetail.purchasedSaleMethodIdList.indexOf(
- this.data.bookDetail.defaultSaleMethodId
- ) > -1,
+ bookBuy: this.data.bookDetail.purchasedSaleMethodIdList.indexOf(
+ this.data.bookDetail.defaultSaleMethodId
+ ) > -1,
});
let times = new Date(
this.data.bookDetail.defaultSaleMethod.endDate
@@ -529,13 +580,19 @@
if (item.value == iconType) {
item.child.forEach((citem) => {
if (citem.value == classType) {
- name = citem.name;
+ 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
+ })
+ }
}
});
}
});
});
- return name;
},
// 鏀惰棌
setCollect() {
@@ -581,34 +638,26 @@
// 妫�鏌ョ櫥褰曠姸鎬�
const token = wx.getStorageSync(app.config.tokenKey);
const child = this.selectComponent("#suggest-component");
- if (!token) {
- wx.showLoading({
- title: "鍔犺浇涓�",
- });
- loginInfo(app, (data) => {
- // 濡傛灉涓嶆槸绗竴娆＄櫥褰曪紝浼氭墽琛屽洖璋�
- if (data) {
- // 鐧诲綍鎴愬姛锛岃嚜鍔ㄨ褰晅oken鍜岀敤鎴蜂俊鎭紝骞惰繑鍥瀟rue
- child.showDialog();
- wx.hideLoading();
- } else {
- // 鍑虹幇閿欒锛岃繑鍥瀎alse
- }
- });
- } else {
- // 濡傛灉鏄涓�娆＄櫥褰曪紝浼氳烦杞嚦缁戝畾鐢ㄦ埛淇℃伅椤甸潰锛屽～鍐欏畬鐢ㄦ埛淇℃伅鍚庤繘琛岀櫥褰曞苟鍌ㄥ瓨token鍜岀敤鎴蜂俊鎭紝缁撴潫鍚庤烦杞洖褰撳墠椤甸潰锛堟惡甯﹂〉闈㈠弬鏁帮級
- child.showDialog();
- }
+ if (token)
+ // child.showDialog();
+ this.setData({
+ showIndex: '1'
+ })
+ console.log(this.data.bookDetail.icon, '0111111');
+ console.log(this.data.bookDetail.name, '45688');
},
// 璺宠浆缃戝簵
goShop(e) {
- const { link } = e.currentTarget.dataset;
+ const {
+ link
+ } = e.currentTarget.dataset;
wx.navigateTo({
url: `/packageBookService/pages/bookServices/webpage/index?url=${link}`,
});
},
// tag鍒囨崲
onTabsChange(e) {
+ const token = wx.getStorageSync(app.config.tokenKey);
this.setData({
tabValue: e.detail.value,
noResources: false,
@@ -621,6 +670,7 @@
const checkData = this.data.cmsDatas.find(
(item) => item.refCode == e.detail.value
);
+
if (checkData) {
if (e.detail.value == "jsek_cloudLearning") {
this.setData({
@@ -628,14 +678,26 @@
"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" &&
+ // !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)) {
+ if (e.detail.value == "jsek_teachingResources") {
+ 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();
} else {
this.setData({
noResources: true,
@@ -648,6 +710,8 @@
if (token) {
child.changeLoading();
child.getNoteList();
+ } else {
+ child.changeNoList();
}
} else if (e.detail.label == "鐢靛瓙涔�") {
const child = this.selectComponent("#eBook");
@@ -669,7 +733,233 @@
});
});
},
- // 鑾峰彇鏁欏璧勬簮 浜戝涔� 浜戞祴璇�
+
+ // 鑾峰彇鎵�鏈夊瓙椤规暟閲�
+ 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, addNum) {
+ 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, addNum)
+ }
+ }
+ //缁欐暟缁勯噷闈㈠啀娣诲姞涓�涓猚hildren鐨勭┖鏁扮粍
+ for (const i of newArr) {
+ i.children = []
+ this.getTreeList(rootList, pathLength + addNum, i.children, i.productLinkPath, addNum)
+ 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, addNum) {
+ // 鏌ユ壘鏂板璞″簲璇ユ彃鍏ョ殑浣嶇疆
+ 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;
+ }
+ // 鎻掑叆鏂板璞″埌鏁扮粍
+ array.splice(insertIndex, 0, newObj);
+ // 娴嬭瘯6 姝ｅ紡5
+ // 瀵规暟缁勮繘琛屾帓搴�
+ array.sort((a, b) => {
+ 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 - addNum, a.productLinkPath.length)) > Number(b.productLinkPath.substring(b.productLinkPath.length - addNum, 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.getProductDetail(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
+ 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 > 12 ? 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)
+ 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,
+ });
+ } 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) {
this.setData({
loading: true,
@@ -678,8 +968,10 @@
let query = {
path: "*",
queryType: "*",
+ storeInfo: this.data.options.storeInfo,
productId: this.data.bookDetail.id,
cmsPath: type.productLinkPath,
+ cmsType: '*',
itemFields: {
SysType: "CmsFolder",
// 璧勬簮绫诲瀷锛岃瘯璇绘枃浠讹紝鏄惁鍏佽涓嬭浇绛夊弬鏁�
@@ -708,59 +1000,24 @@
}
// 浜戞祴璇曪紝閫掑綊璇锋眰閲屽眰鏁版嵁
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);
+ const data = res.datas.cmsDatas[0].datas.filter((item) => item.type == 'questionBankFolder' && item.childrenFolderCount > 0);
+ if (data.length > 0) {
+ let list = []
+ console.log(query.cmsPath, query.cmsPath.length)
+ // 娴嬭瘯 6浣�// 姝ｅ紡 5浣�// 娴嬭瘯璋冪敤浼�20锛屽唴閮�7 姝ｅ紡璋冪敤浼�17 鍐呴儴浼�6
+ const addNum = query.cmsPath.length > 12 ? 7 : query.cmsPath.length > 14 ? 8 : 6
+ const num = query.cmsPath.length + addNum
+ this.getTreeList(data, num, list, '\\', addNum)
+ list = this.ensureTreeConsistency(list)
let result = [];
- if (type.refCode == "jsek_teachingResources") {
- console.log("鏁欏璧勬簮", list);
- this.findChildIds(list, result);
- this.setData({
- teach: list,
- 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,
- loading: false,
- openLearnids: result,
- });
- }
- } else {
- // 鏃犳暟鎹�
+ this.findChildIds(list[0].children, result);
+ this.setData({
+ test: list[0].children,
+ loading: false,
+ openTeachids: result,
+ });
+ console.log(this.data.test, "test")
}
- } 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) => {
@@ -785,6 +1042,7 @@
let query = {
path: "*",
queryType: "*",
+ storeInfo: this.data.options.storeInfo,
productId: this.data.bookDetail.id,
cmsPath: path,
itemFields: {
@@ -806,8 +1064,21 @@
size: 999,
},
};
- const data = await app.MG.store.getProductDetail(query);
+ let data = await app.MG.store.getProductDetail(query);
+ // 濡傛灉item灞傜骇閲屾湁floder锛屽垹闄loder
+ const flag = data.datas.cmsDatas[0].datas.findIndex(
+ (item) => item.sysType == "CmsItem"
+ );
+ if (flag > -1)
+ data.datas.cmsDatas[0].datas = data.datas.cmsDatas[0].datas.filter(
+ (item) => item.sysType == "CmsItem"
+ );
data.datas.cmsDatas[0].datas.forEach((item) => {
+ // if (item.sysType == "CmsFolder" && flag > -1) {
+ // item.isShow = false;
+ // } else {
+ // item.isShow = true;
+ // }
this.data.resourceClassList.forEach((type) => {
if (type.value == item.resourcesClassification)
item.resourceClass = type.name;
@@ -821,7 +1092,7 @@
item.disabled = true;
}
}
- if (item.file) {
+ if (item.file && item.fileMap && item.fileMap[item.file]) {
if (item.fileMap[item.file].protectType == "Private")
item.disabled = true;
}
@@ -832,7 +1103,7 @@
item.checked = false;
} else if (this.data.tabValue == "jsek_cloudLearning") {
item.checked = false;
- item.isbuy = this.resourceIsBuy(item);
+ item.isbuy = this.isShowNeedBuy(item);
item.isShopCar = this.isShoppingCart(item);
}
});
@@ -840,29 +1111,29 @@
},
// 鑾峰彇灞曞紑椤�
findChildIds(data, result) {
- let index = 0;
+ let index = 0
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);
+ 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.children && item.children.length > 0) {
- result.push(childrenItme.id);
- index += 1;
+ const childrenItme = item.children[j]
+ if (item.childrenCount > 0) {
+ result.push(childrenItme.id)
+ index += 1
}
} else {
- break;
+ break
}
}
- } else if (item.children && item.children.length > 0) {
- result.push(item.id);
- index += 1;
+ } else if (item.childrenCount > 0) {
+ result.push(item.id)
+ index += 1
}
} else {
- break;
+ break
}
}
},
@@ -881,21 +1152,16 @@
res.datas.forEach((item) => {
shoppingCartGetId.push(item.saleMethod.id);
});
- console.log(shoppingCartGetId, "shoppingCartGetId");
- console.log(this.data.selectedIds, "閿�鍞柟寮廼d");
const determine = shoppingCartGetId.some(
(item) => item == this.data.selectedIds
);
- console.log(determine);
if (!determine) {
let query = {
- requests: [
- {
- saleMethodId: this.data.selectedIds,
- storeEventId: null,
- agentCode: "鐢靛瓙涔�",
- },
- ],
+ requests: [{
+ saleMethodId: this.data.selectedIds,
+ storeEventId: null,
+ agentCode: "鐢靛瓙涔�",
+ }, ],
};
const addRes = app.MG.store.addShoppingCart(query);
this.showSuccessToast();
@@ -928,34 +1194,43 @@
},
async buyBook() {
- console.log(
- this.data.bookItemDetail.defaultSaleMethodId,
- "this.data.bookItemDetail.defaultSaleMethodId"
- );
if (!this.data.expire) {
let bookOrdersId = "";
let query = {
remarks: "鐢靛瓙涔�",
- requests: [
- {
- saleMethodId: this.data.bookItemDetail.defaultSaleMethodId
- ? this.data.bookItemDetail.defaultSaleMethodId
- : this.data.bookDetail.defaultSaleMethodId,
- count: 1,
- },
- ],
+ requests: [{
+ saleMethodId: this.data.bookItemDetail.defaultSaleMethodId ?
+ this.data.bookItemDetail.defaultSaleMethodId : this.data.bookDetail.defaultSaleMethodId,
+ count: 1,
+ }, ],
};
// 鍙戣捣璁㈠崟鍒濆鍖栬姹傚苟绛夊緟缁撴灉
const res = await app.MG.store.initOrder(query);
// 鑾峰彇璁㈠崟鍙峰苟璧嬪�肩粰 orderNumber.value
bookOrdersId = res.orderNumber;
- console.log(bookOrdersId);
// 妫�鏌ヨ鍗曞彿鏄惁瀛樺湪
if (bookOrdersId) {
- const url = "/pages/cart/paymentPage/index?orderNumber=" + bookOrdersId;
- wx.navigateTo({
- url,
- });
+ if (this.data.bookDetail.price == "0.00") {
+ app.MG.store
+ .confirmOrder({
+ orderNum: bookOrdersId,
+ })
+ .then((res) => {
+ if (res) {
+ wx.showToast({
+ title: "棰嗗彇鎴愬姛",
+ icon: "none",
+ duration: 1000,
+ });
+ this.getBookInfo(this.data.bookDetail.id);
+ }
+ });
+ } else {
+ const url = "/pages/cart/paymentPage/index?orderNumber=" + bookOrdersId + '&onNorderSaleMethod=' + res.saleMethodLinks[0].orderSaleMethod.id;
+ wx.navigateTo({
+ url,
+ });
+ }
} else {
console.log(222);
}
@@ -1044,12 +1319,12 @@
},
// 鐢宠鏁欏璧勬簮
applyResource() {
- if (this.data.applyResourceState) {
- return wx.showToast({
- icon: "error",
- title: "璇峰嬁閲嶅鐐瑰嚮",
- });
- }
+ // if (this.data.applyResourceState) {
+ // return wx.showToast({
+ // icon: "error",
+ // title: "璇峰嬁閲嶅鐐瑰嚮",
+ // });
+ // }
this.setData({
applyResourceState: true,
});
@@ -1067,14 +1342,12 @@
cmsTypeRefCode: "",
newDataListRequest: [],
name: this.data.bookDetail.name, // name涓虹敵璇风殑涔︽湰鍚嶇О
- content: JSON.stringify([
- {
- name: this.data.bookDetail.name,
- id: this.data.bookDetail.id,
- // defaultSaleMethodId: bookData.value.defaultSaleMethodId,
- icon: this.data.bookDetail.icon,
- },
- ]),
+ content: JSON.stringify([{
+ name: this.data.bookDetail.name,
+ id: this.data.bookDetail.id,
+ // defaultSaleMethodId: bookData.value.defaultSaleMethodId,
+ icon: this.data.bookDetail.icon,
+ }, ]),
};
app.MG.ugc.newTopicMessage(query).then(async (res) => {
if (res) {
@@ -1089,9 +1362,10 @@
wx.showModal({
title: "灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�",
content: "璇峰厛杩涜鏁欏笀璁よ瘉锛�",
+ confirmColor: "#ff6c00",
+ cancelColor: "#949494",
complete: (res) => {
- if (res.cancel) {
- }
+ if (res.cancel) {}
if (res.confirm) {
wx.navigateTo({
url: "/packageDomain/pages/teacherCertification/index",
@@ -1104,9 +1378,10 @@
wx.showModal({
title: "灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�",
content: "璇峰厛杩涜鏁欏笀璁よ瘉锛�",
+ confirmColor: "#ff6c00",
+ cancelColor: "#949494",
complete: (res) => {
- if (res.cancel) {
- }
+ if (res.cancel) {}
if (res.confirm) {
wx.navigateTo({
url: "/packageDomain/pages/teacherCertification/index",
@@ -1133,9 +1408,10 @@
wx.showModal({
title: "灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�",
content: "璇峰厛杩涜鏁欏笀璁よ瘉锛�",
+ confirmColor: "#ff6c00",
+ cancelColor: "#949494",
complete: (res) => {
- if (res.cancel) {
- }
+ if (res.cancel) {}
if (res.confirm) {
wx.navigateTo({
url: "/packageDomain/pages/teacherCertification/index",
@@ -1269,6 +1545,22 @@
return false;
}
},
+ // 浜戝涔犺祫婧愭槸鍚︽樉绀洪攣鍥炬爣锛堟湭璐拱锛屼笖璧勬簮鍞环澶т簬闆讹級
+ isShowNeedBuy(data) {
+ if (data.saleMethod && data.saleMethod.length) {
+ const isSHow = this.data.buyIdList.some(
+ (item) => item == data.saleMethod[0].Id
+ );
+ if (isSHow) {
+ return false;
+ } else {
+ return data.saleMethod[0].Price > 0 ? true : false;
+ }
+ return !isSHow;
+ } else {
+ return false;
+ }
+ },
// 鑾峰彇宸茶喘涔板晢鍝�
getShoppingCartProductGet() {
let query = {
@@ -1309,6 +1601,22 @@
} else {
return false;
}
+ },
+
+ updateShoppingCartHidden() {
+ const isSHow = this.data.shoppingCartGetId.some(
+ (item) => item == data.saleMethod[0].Id
+ );
+ return !isSHow;
+ },
+ //鍒锋柊璐墿杞﹀浘鏍�
+ updateCloudLearning() {
+ this.getBookInfo()
+ this.getShoppingCartProductGet()
+ const checkData = this.data.cmsDatas.find(
+ (item) => item.refCode == "jsek_cloudLearning"
+ );
+ this.getResourceDataList(checkData);
},
// 閬嶅巻鏍戠粨鏋勮浆鎹负鏁扮粍鏂规硶
handleTreeData(array) {
@@ -1376,6 +1684,13 @@
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);
@@ -1475,9 +1790,9 @@
if (new RegExp("(" + k + ")").test(fmt)) {
fmt = fmt.replace(
RegExp.$1,
- RegExp.$1.length == 1
- ? o[k]
- : ("00" + o[k]).substr(("" + o[k]).length)
+ RegExp.$1.length == 1 ?
+ o[k] :
+ ("00" + o[k]).substr(("" + o[k]).length)
);
}
}
@@ -1488,6 +1803,8 @@
},
// 鑾峰彇缁勫嵎绛旈鏁版嵁
getMockData() {
+ // const child = this.selectComponent("#test-resource");
+ // if (child) child.changeTestLoaidng(true);
this.setData({
"mockData.useCount": 0,
"mockData.mockList": [],
@@ -1531,12 +1848,10 @@
try {
let query = {
remarks: "缁勫嵎",
- requests: [
- {
- saleMethodId: this.data.mockData.id,
- count: 1,
- },
- ],
+ requests: [{
+ saleMethodId: this.data.mockData.id,
+ count: 1,
+ }, ],
};
if (this.data.flag) {
this.setData({
@@ -1586,13 +1901,11 @@
});
// 璁板綍璐拱鏃堕棿锛屽苟璁剧姸鎬乻tate涓�1锛岃〃绀哄垰璐拱瀹屾垚缁勫嵎
app.MG.identity.setUserKey({
- setKeyRequests: [
- {
- domain: "mockData",
- key: this.data.bookDetail.id + "",
- value: JSON.stringify(this.data.mockData.mockList),
- },
- ],
+ setKeyRequests: [{
+ domain: "mockData",
+ key: this.data.bookDetail.id + "",
+ value: JSON.stringify(this.data.mockData.mockList),
+ }, ],
});
},
// 鑾峰彇鐩稿叧鍥句功
@@ -1617,39 +1930,57 @@
},
};
app.MG.store.getProductList(query).then((res) => {
- console.log("瀹屾暣鐩稿叧鍥句功", res.datas);
const Arr = res.datas.filter(
(item) => item.id != this.data.bookDetail.id
);
let bookArr = [];
- // if (Arr.length > 3) {
- // for (var i = 0; i < 3; i++) {
- // var _num = Math.floor(Math.random() * Arr.length);
- // var mm = Arr[_num];
- // Arr.splice(_num, 1);
- // bookArr.push(mm);
- // }
- // } else {
- // bookArr = Arr;
- // }
+ if (Arr.length > 9) {
+ for (var i = 0; i < 9; i++) {
+ var _num = Math.floor(Math.random() * Arr.length);
+ var mm = Arr[_num];
+ Arr.splice(_num, 1);
+ bookArr.push(mm);
+ }
+ } else {
+ bookArr = Arr;
+ }
this.setData({
- relatedBookData: Arr,
+ relatedBookData: bookArr,
relatedBookLoading: false,
});
if (!this.data.relatedBookData.length)
this.setData({
noRelatedBookData: true,
});
- console.log("鐩稿叧鍥句功", this.data.relatedBookData);
});
},
goBookDetails(e) {
- console.log(e);
this.setData({
tabValue: "brief",
pageLoading: true,
});
- this.onLoad({ id: e.detail.id, name: e.detail.name });
+ let bookPathList = wx.getStorageSync("bookPathList");
+ const bookPath = {
+ id: this.data.bookDetail.id,
+ name: this.data.bookDetail.name,
+ };
+ if (bookPathList) {
+ bookPathList = JSON.parse(bookPathList);
+ if (bookPathList.length > 8) bookPathList.shift();
+ bookPathList.push(bookPath);
+ } else {
+ bookPathList = [bookPath];
+ }
+
+ wx.setStorageSync("bookPathList", JSON.stringify(bookPathList));
+ this.setData({
+ learn: [],
+ teach: []
+ })
+ this.onLoad({
+ id: e.detail.id,
+ name: e.detail.name,
+ });
},
// 搴曢儴璐拱鎸夐挳
buyBtn() {
@@ -1673,8 +2004,7 @@
return false;
}
wx.navigateTo({
- url:
- "/packageBookService/pages/components/webView/index?md5=" +
+ url: "/packageBookService/pages/components/webView/index?md5=" +
this.data.fileInfo.md5 +
"&fileName=" +
this.data.fileInfo.bookName +
@@ -1686,6 +2016,7 @@
this.data.bookBuy +
"&bookId=" +
this.data.bookDetail.id,
+
});
},
@@ -1750,6 +2081,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,
});
@@ -1786,7 +2131,23 @@
//鐢宠鐢靛瓙鏍蜂功
appplyElectronicBook() {
- console.log(this.data.bookDetail);
+ // 鍏堝垽鏂笅鏁欏笀璁よ瘉锛屾湭瀵瑰師鏈夐�昏緫淇敼
+ 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
@@ -1809,14 +2170,7 @@
});
return false;
}
- if (this.data.electronicBookList.length >= 2) {
- wx.showToast({
- title: "姣忔鏈�澶氬彧鍙敵璇�2鏈牱涔�",
- icon: "none",
- duration: 1000,
- });
- return false;
- }
+
let isHas = this.data.electronicBookList.find(
(eitem) => eitem.id == this.data.bookDetail.id
);
@@ -1829,11 +2183,31 @@
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) {
+ 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({
- title: "璇ヤ功宸茬敵璇凤紒",
+ title: "姣忔鏈�澶氬彧鍙敵璇�2鏈牱涔�",
icon: "none",
duration: 1000,
});
@@ -1844,13 +2218,14 @@
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) {
- }
+ } else if (res.cancel) {}
},
});
}
@@ -1864,6 +2239,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
@@ -1879,14 +2270,18 @@
});
return false;
}
- if (this.data.paperBookList.length >= 2) {
+ let isApply = this.data.alreadyPaperBookList.find(
+ (pitem) => pitem.content[0].id == this.data.bookDetail.id
+ );
+ if (isApply) {
wx.showToast({
- title: "姣忔鏈�澶氬彧鍙敵璇�2鏈牱涔�",
+ title: "璇ヤ功宸茬敵璇凤紒",
icon: "none",
duration: 1000,
});
return false;
}
+
let isHas = this.data.paperBookList.find(
(pitem) => pitem.id == this.data.bookDetail.id
);
@@ -1898,12 +2293,9 @@
});
return false;
}
- let isApply = this.data.alreadyPaperBookList.find(
- (pitem) => pitem.id == this.data.bookDetail.id
- );
- if (isApply) {
+ if (this.data.paperBookList.length >= 2) {
wx.showToast({
- title: "璇ヤ功宸茬敵璇凤紒",
+ title: "姣忔鏈�澶氬彧鍙敵璇�2鏈牱涔�",
icon: "none",
duration: 1000,
});
@@ -1914,13 +2306,14 @@
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) {
- }
+ } else if (res.cancel) {}
},
});
}
@@ -1954,13 +2347,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,
@@ -2005,4 +2398,4 @@
teach: tree,
});
},
-});
+});
\ No newline at end of file
--
Gitblit v1.9.1