From 1053bf2995141d5f73868bd2fb58deb1bc68c480 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 27 三月 2024 11:07:46 +0800
Subject: [PATCH] 图书详情，答题器bug修改
---
packageBookService/pages/bookServices/detail/index.js | 126 +++++++++++++++++++++++++++++++++++------
1 files changed, 106 insertions(+), 20 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 9f8eae4..6d5226d 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -34,6 +34,7 @@
openTeachids: [],
openLearnids: [],
openTestids: [],
+ applyResourceState: false, // 鐢宠鏁欏璧勬簮鎸夐挳闃叉姈
resourceClassList: [], // 璧勬簮鎵�灞炲垎绫�
applyState: "", // 鏁欏璧勬簮鐢宠鐘舵��
deadline: "", // 鏁欏璧勬簮鐢宠鏈夋晥鏃ユ湡
@@ -53,7 +54,6 @@
mockList: [] // 鐢ㄦ埛缁勫嵎鎻愪氦淇℃伅
},
flag: true,
- applyResourceLoading: false,
noResources: false,
selectedIds: "",//鍟嗗搧鎴栧瓙鍟嗗搧閿�鍞柟寮�
bookBuy: false, //鍟嗗搧鎴栧瓙鍟嗗搧鏄惁璐拱
@@ -76,6 +76,45 @@
buyResourceData: {
productLinkPath: '',
refCode: '',
+ },
+ briefIcon: {
+ name: "/static/images/bookService/detail/tushujianjie-g.png"
+ },
+ briefIconClick: {
+ name: '/static/images/bookService/detail/tushujianjie-click.png'
+ },
+ eBookIcon: {
+ name: '/static/images/bookService/detail/ebook-g.png'
+ },
+ eBookClickIcon: {
+ name: '/static/images/bookService/detail/ebook-click.png'
+ },
+ teachResourcesIcon: {
+ name: '/static/images/bookService/detail/jiaoxueziyuan.png'
+ },
+ teachResourcesClickIcon: {
+ name: '/static/images/bookService/detail/jiaoxueziyuan-click.png'
+ },
+ learnResourceIcon: {
+ name: '/static/images/bookService/detail/yunxuexi.png'
+ },
+ learnResourceClickIcon: {
+ name: '/static/images/bookService/detail/yunxuexi-click.png'
+ },
+ testResourceIocn: {
+ name: '/static/images/bookService/detail/test-icon-g.png'
+ },
+ testResourceClickIocn: {
+ name: '/static/images/bookService/detail/test-click-icon.png'
+ },
+ noteIcon: {
+ name: '/static/images/bookService/detail/biji-icon-g.png'
+ },
+ noteClickIcon: {
+ name: '/static/images/bookService/detail/biji-click-icon.png'
+ },
+ icon1: {
+ name: "/static/images/bookService/detail/dangdang.png"
}
},
@@ -180,7 +219,7 @@
// 鏍煎紡鍖栨棩鏈�
formatDate(dateString) {
if (!dateString) {
- return 'Invalid date';
+ return '';
}
const match = dateString.match(/^(\d{4})\/(\d{1,2})\/(\d{1,2}) (\d{1,2}):(\d{1,2}):(\d{1,2})$/);
if (!match) {
@@ -281,9 +320,12 @@
});
this.getSubTtem();
// 鑾峰彇鍥句功鍒嗙被
- const iconType = JSON.parse(res.datas.bookClassification)[0][0];
- const classType = JSON.parse(res.datas.bookClassification)[0][1];
- const className = await this.getBookClass(iconType, classType)
+ 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)
+ }
// 鑾峰彇缁勫嵎閿�鍞甶d
if (res.datas.saleMethod && res.datas.saleMethod.length) {
res.datas.saleMethod.forEach((item) => {
@@ -399,7 +441,6 @@
});
}
}
- console.log(this.data.fileInfo, 456)
this.setData({
selectedIds: this.data.bookDetail.defaultSaleMethodId,
bookBuy: this.data.bookDetail.purchasedSaleMethodIdList.indexOf(this.data.bookDetail.defaultSaleMethodId) > -1
@@ -597,7 +638,7 @@
loading: false,
openTeachids: result
})
- console.log('鏁欏璧勬簮', this.data.teach);
+ console.log('鏁欏璧勬簮', this.data.teach, this.data.applyState);
} else if (type.refCode == 'jsek_cloudLearning') {
// res.datas.cmsDatas[0].datas.forEach(item => {
// item.checked = false
@@ -702,12 +743,12 @@
for (let i = 0; i < data.length; i++) {
if (index < 3) {
const item = data[i]
- if (item.childrenFolderCount > 0) {
+ if (item.children && item.children.length > 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) {
+ if (item.children && item.children.length > 0) {
result.push(childrenItme.id)
index += 1
}
@@ -715,7 +756,7 @@
break
}
}
- } else if (item.childrenCount > 0) {
+ } else if (item.children && item.children.length > 0) {
result.push(item.id)
index += 1
}
@@ -799,9 +840,8 @@
});
},
-
-
async buyBook() {
+ console.log(this.data.bookItemDetail.defaultSaleMethodId, 'this.data.bookItemDetail.defaultSaleMethodId');
if (!this.data.expire) {
let bookOrdersId = ''
let query = {
@@ -837,7 +877,7 @@
},
// 鑾峰彇鏁欏璧勬簮涓嬭浇鏄惁鐢宠閫氳繃
- getApplyInfo(id) {
+ async getApplyInfo(id) {
// 鑾峰彇褰撳墠鏃堕棿
const currentDate = new Date()
let query = {
@@ -850,7 +890,7 @@
appRefCode: app.config.appRefCode,
topicIdOrRefCode: 'productDownLoad'
}
- app.MG.ugc.getTopicMessageList(query).then((res) => {
+ await app.MG.ugc.getTopicMessageList(query).then((res) => {
const applyResource = res.datas.find((item) => {
let content = []
try {
@@ -906,13 +946,23 @@
}
})
this.setData({
- applyResourceLoading: false
+ applyResourceState: false,
})
+ wx.hideLoading()
},
// 鐢宠鏁欏璧勬簮
applyResource() {
+ if (this.data.applyResourceState) {
+ return wx.showToast({
+ icon: 'error',
+ title: '璇峰嬁閲嶅鐐瑰嚮',
+ })
+ }
this.setData({
- applyResourceLoading: true
+ applyResourceState: true
+ })
+ wx.showLoading({
+ title: '鍔犺浇涓�',
})
// let role = userStore.userInfo ? userStore.userInfo.role : null
// if (role) {
@@ -934,13 +984,13 @@
}
])
}
- app.MG.ugc.newTopicMessage(query).then((res) => {
+ app.MG.ugc.newTopicMessage(query).then(async (res) => {
if (res) {
wx.showToast({
title: '鐢宠宸叉彁浜わ紝璇峰緟瀹℃牳閫氳繃鍚庝笅杞�',
})
}
- this.getApplyInfo(this.data.bookDetail.id)
+ await this.getApplyInfo(this.data.bookDetail.id)
})
// } else {
// ElMessageBox.confirm('璇峰厛杩涜鏁欏笀璁よ瘉锛�', '灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�', {
@@ -1306,7 +1356,6 @@
keys: [this.data.bookId]
})
.then((res) => {
- console.log(JSON.parse(res[0].value));
if (res && res.length) {
const mock = JSON.parse(res[0].value)
mock.forEach(item => {
@@ -1431,6 +1480,7 @@
appplyElectronicBook() {
console.log(this.data.bookDetail)
if (this.data.bookDetail.isApplyBook == 2 || this.data.bookDetail.isApplyBook == 4) {
+
let role = this.data.userInfo != null ? this.data.userInfo.role : null
if (role) {
if (role == 'Teacher') {
@@ -1458,6 +1508,12 @@
})
}
}
+ } else {
+ wx.showToast({
+ title: "璇ヤ功涓嶈兘鐢宠鐢靛瓙鏍蜂功",
+ icon: 'none',
+ duration: 1000,
+ })
}
},
//鐢宠绾歌川鏍蜂功
@@ -1482,6 +1538,12 @@
})
}
}
+ } else {
+ wx.showToast({
+ title: "璇ヤ功涓嶈兘鐢宠绾歌川鏍蜂功",
+ icon: 'none',
+ duration: 1000,
+ })
}
},
//鑾峰彇褰撳墠宸茬敵璇锋鏁帮紙绾歌川锛�
@@ -1700,5 +1762,29 @@
url: "/packageDomain/pages/sampleBookList/applicationForm/index",
});
},
-
+ handleTree() {
+ // const child = this.selectComponent('#teach-tree')
+ let tree
+ // let openIds = child.data.openIds
+ if (this.data.tabValue == 'jsek_teachingResources') {
+ tree = this.data.teach
+ } else {
+ tree = this.data.learn
+ }
+ for (let index = 0; index < tree.length; index++) {
+ const item = tree[index];
+ if (item.children && item.children.length > 0) {
+ const num = this.data.openTeachids.findIndex(citem => item.id == citem)
+ if (num >= 0) {
+ item.open = true
+ } else {
+ item.open = false
+ }
+ this.handleTree(item.children)
+ }
+ }
+ this.setData({
+ teach: tree
+ })
+ },
})
--
Gitblit v1.9.1