From 99dfeb5fc86bce593a5d3f43f45c26eedc00ab0a Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 10 九月 2024 16:28:54 +0800
Subject: [PATCH] bug
---
packageBookService/pages/bookServices/detail/index.js | 138 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 104 insertions(+), 34 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index a5395e2..8d73b89 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -1,6 +1,7 @@
// pages/bookServices/detail/index.js
import Toast from "tdesign-miniprogram/toast";
import tool from "../../../../assets/js/toolClass";
+import moment from 'moment'
import {
loginInfo
} from "../../../../assets/js/login";
@@ -11,6 +12,9 @@
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
+ // 杩涢〉闈㈤粯璁ゅ垏鎹� 灞曞紑鐨刬d
+ // defaultactiveTeachid 鏁欏璧勬簮
+ // defaultactiveLearnid 浜戝涔�
bookId: "",
barHeight: "",
navBarHeight: "",
@@ -165,6 +169,37 @@
description: '',
agree: false
},
+ resourceVisible: false,
+ resourceValue: [],
+ fileTypeList: [{
+ label: '闊抽',
+ value: '闊抽'
+ },
+ {
+ label: '瑙嗛',
+ value: '瑙嗛'
+ },
+ {
+ label: '鍥剧墖',
+ value: '鍥剧墖'
+ },
+ {
+ label: 'PDF',
+ value: 'PDF'
+ },
+ {
+ label: '璧勬簮鍖�',
+ value: '璧勬簮鍖�'
+ },
+ {
+ label: '鏂囨。',
+ value: '鏂囨。'
+ },
+ {
+ label: '鍏朵粬',
+ value: '鍏朵粬'
+ }
+ ],
fileList: [],
isShowUp: true,
protocolShow: false,
@@ -189,20 +224,24 @@
bookId: options.id + "",
barHeight: systInfo.statusBarHeight,
navBarHeight: navBarHeight,
- });
- this.setData({
options: {
id: options.id,
- name: options.name,
+ name: decodeURI(options.name),
storeInfo: options.storeInfo,
},
});
wx.setNavigationBarTitle({
- title: options.name,
+ title: decodeURI(options.name),
})
+ let token = wx.getStorageSync(app.config.tokenKey)
+ if (!token) {
+ loginInfo(app, (data) => {
+ if (data) {} else {}
+ })
+ }
this.getBookInfo(options.id);
// this.getResourceClass(); // 鑾峰彇璧勬簮鎵�灞炲垎绫�
- const token = wx.getStorageSync(app.config.tokenKey);
+ token = wx.getStorageSync(app.config.tokenKey)
if (token) {
this.getShoppingCartProductGet();
this.getApplyInfo(options.id);
@@ -216,6 +255,13 @@
// 鑾峰彇鐢宠娆℃暟
this.getSelectPaperBookCount();
this.getSelectBookCount();
+ }
+ if (options.tabValue) {
+ this.setData({
+ tabValue: options.tabValue,
+ });
+
+
}
},
@@ -435,6 +481,16 @@
await this.getBookClass(classData);
}
}
+ if (this.data.tabValue == 'questionBank' || this.data.tabValue == 'jsek_cloudLearning' || this.data.tabValue == 'jsek_teachingResources') {
+ const checkData = this.data.cmsDatas.find(
+ (item) => item.refCode == this.data.tabValue
+ );
+ if (this.data.tabValue == "questionBank") {
+ this.getResourceData(checkData)
+ } else {
+ this.getResourceDataList(checkData)
+ }
+ }
// 鑾峰彇缁勫嵎閿�鍞甶d
if (res.datas.saleMethod && res.datas.saleMethod.length) {
@@ -462,9 +518,7 @@
}
}
this.setData({
- "bookDetail.publicationDate": this.formatDate(
- this.data.bookDetail.publicationDate
- ),
+ "bookDetail.publicationDate": moment(this.data.bookDetail.publicationDate).format("YYYY骞碝M鏈�"),
"bookDetail.price": this.numFormat(this.data.bookDetail.price),
"bookDetail.oldPrice": this.numFormat(this.data.bookDetail.oldPrice),
"bookDetail.paperPrice": this.numFormat(
@@ -700,7 +754,7 @@
link
} = e.currentTarget.dataset;
wx.navigateTo({
- url: `/packageBookService/pages/bookServices/webpage/index?url=${link}`,
+ url: `/packageBookService/pages/bookServices/linkPage/index?path=${link}`,
});
},
// tag鍒囨崲
@@ -716,7 +770,7 @@
e.detail.label == "浜戞祴璇�"
) {
const checkData = this.data.cmsDatas.find(
- (item) => item.refCode == e.detail.value
+ (item) => item.refCode == this.data.tabValue
);
if (!this.data.resourceClassList.length) this.getResourceClass()
if (checkData) {
@@ -819,7 +873,7 @@
},
// 鎵佸钩鍖栨暟鎹浆鎹ree
- getTreeList(rootList, pathLength, newArr, path, addNum) {
+ 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)) {
@@ -837,7 +891,7 @@
}
// newArr.push(item)
// 鍦ㄦ彃鍏ヨ繃绋嬩腑瀵规暟鎹繘琛屾帓搴�
- newArr = this.insertAndSortObjectsByProductLinkPath(newArr, item, addNum)
+ newArr = this.insertAndSortObjectsByProductLinkPath(newArr, item)
// 鎻掕繘鏁扮粍鍚� 浠庡師鏁版嵁涓垹闄�
rootList = rootList.filter(nitem => nitem.id != item.id)
}
@@ -847,7 +901,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, addnum1)
+ this.getTreeList(rootList, pathLength + addnum1, i.children, i.productLinkPath)
if (i.children.length == 0) {
delete i.children
}
@@ -872,9 +926,9 @@
},
// 鎺掑簭鏁扮粍 鎸夌収productLinkPath
- insertAndSortObjectsByProductLinkPath(array, newObj, addNum) {
+ insertAndSortObjectsByProductLinkPath(array, newObj) {
// 鏌ユ壘鏂板璞″簲璇ユ彃鍏ョ殑浣嶇疆
- 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)));
+ 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;
@@ -884,10 +938,10 @@
// 娴嬭瘯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))) {
+ 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.length - addNum, a.productLinkPath.length)) > Number(b.productLinkPath.substring(b.productLinkPath.length - addNum, b.productLinkPath.length))) {
+ 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
@@ -987,7 +1041,7 @@
}
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, '\\', addNum)
+ this.getTreeList(res.datas.cmsDatas[0].datas, num, list, '\\')
list = this.ensureTreeConsistency(list)
list = this.changeResourceChildren(list)
let result = [];
@@ -995,7 +1049,7 @@
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,
@@ -1101,7 +1155,7 @@
const addNum = query.cmsPath.length > 10 ? 7 : query.cmsPath.length > 13 ? 8 : 6
const num = query.cmsPath.length + addNum
- that.getTreeList(data, num, list, '\\', addNum)
+ that.getTreeList(data, num, list, '\\')
list = that.ensureTreeConsistency(list)
that.findChildIds(list[0].children, result);
that.setData({
@@ -2567,7 +2621,6 @@
return childrenList
},
uploadFile(e) {
- console.log(123)
this.setData({
dialogBox: true,
isShowUp: true
@@ -2576,6 +2629,12 @@
closeDialog() {
this.setData({
dialogBox: false,
+ resourceInfo: {
+ resourceName: '',
+ fileType: '',
+ description: '',
+ agree: false
+ },
});
},
onCloseProtocol() {
@@ -2619,9 +2678,24 @@
'resourceInfo.resourceName': e.detail.value,
});
},
- onFileTypeInput(e) {
+ onResourcePicker(e) {
this.setData({
- 'resourceInfo.fileType': e.detail.value,
+ resourceVisible: true,
+ });
+ },
+ onPickerChange(e) {
+ const {
+ value
+ } = e.detail;
+ this.setData({
+ resourceVisible: false,
+ resourceValue: value,
+ 'resourceInfo.fileType': value.join(' '),
+ });
+ },
+ onPickerCancel(e) {
+ this.setData({
+ resourceVisible: false,
});
},
textareaChange(e) {
@@ -2662,6 +2736,7 @@
const pdfData = ['pdf']
const Compression = ['rar', 'zip']
const pictureData = ['jpg', 'png']
+ const documentData = ['doc', 'docx', 'xls', 'xlsx', "ppt", "pptx"]
if (audioData.indexOf(Extension) > -1) {
medioType = '闊抽'
} else if (videoData.indexOf(Extension) > -1) {
@@ -2672,6 +2747,8 @@
medioType = '璧勬簮鍖�'
} else if (pictureData.indexOf(Extension) > -1) {
medioType = '鍥剧墖'
+ } else if (documentData.indexOf(Extension) > -1) {
+ medioType = '鏂囨。'
} else {
medioType = '鍏朵粬'
}
@@ -2715,6 +2792,7 @@
that.setData({
"resourceInfo.resourceName": FileName,
"resourceInfo.fileType": medioType,
+
fileList: file,
isShowUp: false
})
@@ -2729,15 +2807,9 @@
},
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,
+ fileList: []
});
},
confirmM() {
@@ -2750,7 +2822,7 @@
if (this.data.resourceInfo.fileType == '') {
return wx.showToast({
icon: "error",
- title: "璇峰～鍐欒祫婧愮被鍨�",
+ title: "璇烽�夋嫨璧勬簮绫诲瀷",
});
}
@@ -2780,9 +2852,7 @@
icon: "success",
title: "璇蜂笂浼犺祫婧愭枃浠�",
});
- this.setData({
- dialogBox: false,
- });
+ this.closeDialog()
})
}
})
\ No newline at end of file
--
Gitblit v1.9.1