From 3d73fb33c46aada16a6060adcd4ea14bb33b6b2a Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 09 四月 2024 10:39:11 +0800
Subject: [PATCH] 详情页tabs样式优化，答题添加页面退出拦截，合并代码
---
packageBookService/pages/bookServices/detail/index.js | 444 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 273 insertions(+), 171 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 16c9cf8..8f2c887 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -57,6 +57,8 @@
residue: 0, // 缁勫嵎鍓╀綑娆℃暟
mockList: [], // 鐢ㄦ埛缁勫嵎鎻愪氦淇℃伅
},
+ relatedBookLoading: false,
+ noRelatedBookData: false,
relatedBookPath: "", // 鐩稿叧鍥句功path
relatedBookData: [], // 鐩稿叧鍥句功鍒楄〃
flag: true,
@@ -141,27 +143,12 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
- // 妫�鏌ョ櫥褰曠姸鎬�
- // const token = wx.getStorageSync(app.config.tokenKey)
- // if (!token) {
- // loginInfo(app, (data) => {
- // // 濡傛灉涓嶆槸绗竴娆＄櫥褰曪紝浼氭墽琛屽洖璋�
- // if (data) {
- // // 鐧诲綍鎴愬姛锛岃嚜鍔ㄨ褰晅oken鍜岀敤鎴蜂俊鎭紝骞惰繑鍥瀟rue
- // } else {
- // // 鍑虹幇閿欒锛岃繑鍥瀎alse
- // }
- // })
- // } else {
- // // 濡傛灉鏄涓�娆＄櫥褰曪紝浼氳烦杞嚦缁戝畾鐢ㄦ埛淇℃伅椤甸潰锛屽～鍐欏畬鐢ㄦ埛淇℃伅鍚庤繘琛岀櫥褰曞苟鍌ㄥ瓨token鍜岀敤鎴蜂俊鎭紝缁撴潫鍚庤烦杞洖褰撳墠椤甸潰锛堟惡甯﹂〉闈㈠弬鏁帮級
- // }
-
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight =
(menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
this.setData({
- bookId: options.id,
+ bookId: options.id + "",
barHeight: systInfo.statusBarHeight,
navBarHeight: navBarHeight,
});
@@ -171,14 +158,12 @@
name: 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();
}
@@ -237,7 +222,7 @@
onReachBottom() {
if (this.data.tabValue == "jsek_note") {
const child = this.selectComponent("#note");
- child.onReachBottom();
+ if (!child.data.noList) child.onReachBottom();
}
},
@@ -315,7 +300,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) {
@@ -369,14 +366,15 @@
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) {
+ const iconType = bookClassification[0][0];
+ const classType = bookClassification[0][1];
+ className = await this.getBookClass(iconType, classType);
+ }
}
+
// 鑾峰彇缁勫嵎閿�鍞甶d
if (res.datas.saleMethod && res.datas.saleMethod.length) {
res.datas.saleMethod.forEach((item) => {
@@ -441,6 +439,7 @@
};
app.MG.store.getProductList(obj).then((res) => {
if (res.datas && res.datas.length > 0) {
+ console.log(res.datas[0], 2);
this.setData({
bookItemDetail: res.datas[0],
selectedIds: res.datas[0].defaultSaleMethod.id,
@@ -448,6 +447,7 @@
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(
@@ -623,6 +623,7 @@
},
// tag鍒囨崲
onTabsChange(e) {
+ const token = wx.getStorageSync(app.config.tokenKey);
this.setData({
tabValue: e.detail.value,
noResources: false,
@@ -635,6 +636,7 @@
const checkData = this.data.cmsDatas.find(
(item) => item.refCode == e.detail.value
);
+
if (checkData) {
if (e.detail.value == "jsek_cloudLearning") {
this.setData({
@@ -650,6 +652,7 @@
) {
this.getResourceData(checkData);
}
+ if (e.detail.value == "questionBank" && token) this.getMockData();
} else {
this.setData({
noResources: true,
@@ -662,6 +665,8 @@
if (token) {
child.changeLoading();
child.getNoteList();
+ } else {
+ child.changeNoList();
}
} else if (e.detail.label == "鐢靛瓙涔�") {
const child = this.selectComponent("#eBook");
@@ -739,16 +744,16 @@
const list = await this.getAllResource(res.datas.cmsDatas[0].datas);
let result = [];
if (type.refCode == "jsek_teachingResources") {
- console.log("鏁欏璧勬簮", list);
this.findChildIds(list, result);
this.setData({
teach: list,
loading: false,
openTeachids: result,
});
+ console.log("鏁欏璧勬簮", list);
} else if (type.refCode == "jsek_cloudLearning") {
- let arr = this.handleTreeData(list).filter((item) =>
- this.resourceIsBuy(item)
+ let arr = this.handleTreeData(list).filter(
+ (item) => item.saleMethod[0]
);
let freeIds = arr.filter((item) => {
return item.saleMethod[0].Price == 0;
@@ -757,7 +762,6 @@
this.setData({
isshowDrawBtn: false,
});
- debugger;
this.findChildIds(list, result);
this.setData({
learn: list,
@@ -821,8 +825,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;
@@ -847,7 +864,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);
}
});
@@ -896,12 +913,9 @@
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: [
@@ -967,10 +981,28 @@
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;
+ wx.navigateTo({
+ url,
+ });
+ }
} else {
console.log(222);
}
@@ -1104,6 +1136,8 @@
wx.showModal({
title: "灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�",
content: "璇峰厛杩涜鏁欏笀璁よ瘉锛�",
+ confirmColor: "#ff6c00",
+ cancelColor: "#949494",
complete: (res) => {
if (res.cancel) {
}
@@ -1119,6 +1153,8 @@
wx.showModal({
title: "灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�",
content: "璇峰厛杩涜鏁欏笀璁よ瘉锛�",
+ confirmColor: "#ff6c00",
+ cancelColor: "#949494",
complete: (res) => {
if (res.cancel) {
}
@@ -1148,6 +1184,8 @@
wx.showModal({
title: "灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�",
content: "璇峰厛杩涜鏁欏笀璁よ瘉锛�",
+ confirmColor: "#ff6c00",
+ cancelColor: "#949494",
complete: (res) => {
if (res.cancel) {
}
@@ -1284,6 +1322,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 = {
@@ -1324,6 +1378,22 @@
} else {
return false;
}
+ },
+
+ updateShoppingCartHidden() {
+ const isSHow = this.data.shoppingCartGetId.some(
+ (item) => item == data.saleMethod[0].Id
+ );
+ console.log(isSHow);
+ return !isSHow;
+ },
+ updateCloudLearning() {
+ const checkData = this.data.cmsDatas.find(
+ (item) => item.refCode == "jsek_cloudLearning"
+ );
+ this.getResourceData(checkData);
+ debugger;
+ console.log(55555);
},
// 閬嶅巻鏍戠粨鏋勮浆鎹负鏁扮粍鏂规硶
handleTreeData(array) {
@@ -1503,6 +1573,8 @@
},
// 鑾峰彇缁勫嵎绛旈鏁版嵁
getMockData() {
+ // const child = this.selectComponent("#test-resource");
+ // if (child) child.changeTestLoaidng(true);
this.setData({
"mockData.useCount": 0,
"mockData.mockList": [],
@@ -1612,7 +1684,10 @@
},
// 鑾峰彇鐩稿叧鍥句功
getAboutBook(path) {
- // loadings.value.aboutBook = true
+ this.setData({
+ relatedBookLoading: true,
+ noRelatedBookData: false,
+ });
let query = {
path,
queryType: "*",
@@ -1634,24 +1709,49 @@
(item) => item.id != this.data.bookDetail.id
);
let bookArr = [];
- if (Arr.length) {
- 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);
}
- this.setData({
- relatedBookData: bookArr,
- });
- console.log("鐩稿叧鍥句功", this.data.relatedBookData);
+ } else {
+ bookArr = Arr;
}
+ this.setData({
+ relatedBookData: bookArr,
+ relatedBookLoading: false,
+ });
+ if (!this.data.relatedBookData.length)
+ this.setData({
+ noRelatedBookData: true,
+ });
});
- // loadings.value.aboutBook = false
+ },
+ goBookDetails(e) {
+ this.setData({
+ tabValue: "brief",
+ pageLoading: true,
+ });
+ 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.onLoad({
+ id: e.detail.id,
+ name: e.detail.name,
+ });
},
// 搴曢儴璐拱鎸夐挳
buyBtn() {
@@ -1794,69 +1894,70 @@
this.data.bookDetail.isApplyBook == 4
) {
let role = this.data.userInfo != null ? this.data.userInfo.role : null;
- if (role) {
- if (role == "Teacher") {
- if (!this.data.noFile) {
- wx.showToast({
- title: "鏆傛棤鐢靛瓙涔︽枃浠�,璇疯仈绯荤鐞嗗憳!",
- icon: "none",
- duration: 1000,
- });
- return;
- }
- if (this.data.ebookCount == 0) {
- wx.showToast({
- title: "鎮ㄧ殑鐢靛瓙鏍蜂功鐢宠娆℃暟宸茬敤灏斤紝鑻ヨ缁х画锛岃鑱旂郴绠＄悊鍛橈紒",
- icon: "none",
- duration: 1000,
- });
- 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
- );
- if (isHas) {
- wx.showToast({
- title: "璇ヤ功宸插湪娓呭崟鍒楄〃涓�",
- icon: "none",
- duration: 1000,
- });
- return false;
- }
- let isApply = this.data.alreadyElectronicBookList.find(
- (eitem) => eitem.id == this.data.bookDetail.id
- );
- if (isApply) {
- wx.showToast({
- title: "璇ヤ功宸茬敵璇凤紒",
- icon: "none",
- duration: 1000,
- });
- return false;
- }
- this.addBookFun(this.data.bookDetail, "eBook");
- } else {
- wx.showModal({
- title: "灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�", //鎻愮ず鐨勬爣棰�
- content: "璇峰厛杩涜鏁欏笀璁よ瘉锛�", //鎻愮ず鐨勫唴瀹�
- success: function (res) {
- if (res.confirm) {
- wx.navigateTo({
- url: "/packageDomain/pages/teacherCertification/index",
- });
- } else if (res.cancel) {
- }
- },
+ if (role && role == "Teacher") {
+ if (!this.data.noFile) {
+ wx.showToast({
+ title: "鏆傛棤鐢靛瓙涔︽枃浠�,璇疯仈绯荤鐞嗗憳!",
+ icon: "none",
+ duration: 1000,
});
+ return;
}
+ if (this.data.ebookCount == 0) {
+ wx.showToast({
+ title: "鎮ㄧ殑鐢靛瓙鏍蜂功鐢宠娆℃暟宸茬敤灏斤紝鑻ヨ缁х画锛岃鑱旂郴绠＄悊鍛橈紒",
+ icon: "none",
+ duration: 1000,
+ });
+ return false;
+ }
+
+ let isHas = this.data.electronicBookList.find(
+ (eitem) => eitem.id == this.data.bookDetail.id
+ );
+ if (isHas) {
+ wx.showToast({
+ title: "璇ヤ功宸插湪娓呭崟鍒楄〃涓�",
+ icon: "none",
+ duration: 1000,
+ });
+ return false;
+ }
+ let isApply = this.data.alreadyElectronicBookList.find(
+ (eitem) => eitem.id == this.data.bookDetail.id
+ );
+ if (isApply) {
+ wx.showToast({
+ title: "璇ヤ功宸茬敵璇凤紒",
+ icon: "none",
+ duration: 1000,
+ });
+ return false;
+ }
+ if (this.data.electronicBookList.length >= 2) {
+ wx.showToast({
+ title: "姣忔鏈�澶氬彧鍙敵璇�2鏈牱涔�",
+ icon: "none",
+ duration: 1000,
+ });
+ return false;
+ }
+ this.addBookFun(this.data.bookDetail, "eBook");
+ } else {
+ 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 {
wx.showToast({
@@ -1873,62 +1974,63 @@
this.data.bookDetail.isApplyBook == 4
) {
let role = this.data.userInfo != null ? this.data.userInfo.role : null;
- if (role) {
- if (role == "Teacher") {
- // 鐐瑰嚮閫変腑
- if (this.data.paperBookCount == 0) {
- wx.showToast({
- title: "鎮ㄧ殑绾歌川鏍蜂功鐢宠娆℃暟宸茬敤灏斤紝鑻ヨ缁х画锛岃鑱旂郴绠＄悊鍛橈紒",
- icon: "none",
- duration: 1000,
- });
- return false;
- }
- if (this.data.paperBookList.length >= 2) {
- wx.showToast({
- title: "姣忔鏈�澶氬彧鍙敵璇�2鏈牱涔�",
- icon: "none",
- duration: 1000,
- });
- return false;
- }
- let isHas = this.data.paperBookList.find(
- (pitem) => pitem.id == this.data.bookDetail.id
- );
- if (isHas) {
- wx.showToast({
- title: "璇ヤ功宸插湪娓呭崟鍒楄〃涓�",
- icon: "none",
- duration: 1000,
- });
- return false;
- }
- let isApply = this.data.alreadyPaperBookList.find(
- (pitem) => pitem.id == this.data.bookDetail.id
- );
- if (isApply) {
- wx.showToast({
- title: "璇ヤ功宸茬敵璇凤紒",
- icon: "none",
- duration: 1000,
- });
- return false;
- }
- this.addBookFun(this.data.bookDetail, "pBook");
- } else {
- wx.showModal({
- title: "灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�", //鎻愮ず鐨勬爣棰�
- content: "璇峰厛杩涜鏁欏笀璁よ瘉锛�", //鎻愮ず鐨勫唴瀹�
- success: function (res) {
- if (res.confirm) {
- wx.navigateTo({
- url: "/packageDomain/pages/teacherCertification/index",
- });
- } else if (res.cancel) {
- }
- },
+ if (role && role == "Teacher") {
+ // 鐐瑰嚮閫変腑
+ if (this.data.paperBookCount == 0) {
+ wx.showToast({
+ title: "鎮ㄧ殑绾歌川鏍蜂功鐢宠娆℃暟宸茬敤灏斤紝鑻ヨ缁х画锛岃鑱旂郴绠＄悊鍛橈紒",
+ icon: "none",
+ duration: 1000,
});
+ return false;
}
+ let isApply = this.data.alreadyPaperBookList.find(
+ (pitem) => pitem.id == this.data.bookDetail.id
+ );
+ if (isApply) {
+ wx.showToast({
+ title: "璇ヤ功宸茬敵璇凤紒",
+ icon: "none",
+ duration: 1000,
+ });
+ return false;
+ }
+
+ let isHas = this.data.paperBookList.find(
+ (pitem) => pitem.id == this.data.bookDetail.id
+ );
+ if (isHas) {
+ wx.showToast({
+ title: "璇ヤ功宸插湪娓呭崟鍒楄〃涓�",
+ icon: "none",
+ duration: 1000,
+ });
+ return false;
+ }
+ if (this.data.paperBookList.length >= 2) {
+ wx.showToast({
+ title: "姣忔鏈�澶氬彧鍙敵璇�2鏈牱涔�",
+ icon: "none",
+ duration: 1000,
+ });
+ return false;
+ }
+ this.addBookFun(this.data.bookDetail, "pBook");
+ } else {
+ 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 {
wx.showToast({
--
Gitblit v1.9.1