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 | 250 ++++++++++++++++++++++++++++++++------------------
1 files changed, 160 insertions(+), 90 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 97cf4ee..8f2c887 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -1,9 +1,7 @@
// 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({
/**
@@ -166,7 +164,6 @@
if (token) {
this.getShoppingCartProductGet();
this.getApplyInfo(options.id);
- this.getMockData();
this.getAlreadyPBookList();
this.getAlreadyEBookList();
}
@@ -225,7 +222,7 @@
onReachBottom() {
if (this.data.tabValue == "jsek_note") {
const child = this.selectComponent("#note");
- child.onReachBottom();
+ if (!child.data.noList) child.onReachBottom();
}
},
@@ -303,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) {
@@ -357,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) => {
@@ -429,13 +439,14 @@
};
app.MG.store.getProductList(obj).then((res) => {
if (res.datas && res.datas.length > 0) {
- console.log(res.datas[0], 2)
+ console.log(res.datas[0], 2);
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();
@@ -498,9 +509,10 @@
}
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
@@ -604,15 +616,14 @@
},
// 璺宠浆缃戝簵
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,
@@ -641,6 +652,7 @@
) {
this.getResourceData(checkData);
}
+ if (e.detail.value == "questionBank" && token) this.getMockData();
} else {
this.setData({
noResources: true,
@@ -653,6 +665,8 @@
if (token) {
child.changeLoading();
child.getNoteList();
+ } else {
+ child.changeNoList();
}
} else if (e.detail.label == "鐢靛瓙涔�") {
const child = this.selectComponent("#eBook");
@@ -730,13 +744,13 @@
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) => item.saleMethod[0]
@@ -850,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);
}
});
@@ -899,19 +913,18 @@
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();
@@ -952,11 +965,14 @@
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);
@@ -966,20 +982,23 @@
// 妫�鏌ヨ鍗曞彿鏄惁瀛樺湪
if (bookOrdersId) {
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);
- }
- })
+ 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;
+ const url =
+ "/pages/cart/paymentPage/index?orderNumber=" + bookOrdersId;
wx.navigateTo({
url,
});
@@ -987,7 +1006,6 @@
} else {
console.log(222);
}
-
} else {
wx.showToast({
title: "鍟嗗搧涓嶅湪鏈夋晥鏈�",
@@ -1096,12 +1114,14 @@
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) {
@@ -1116,8 +1136,11 @@
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",
@@ -1130,8 +1153,11 @@
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",
@@ -1158,8 +1184,11 @@
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",
@@ -1288,6 +1317,22 @@
const isSHow = this.data.buyIdList.some(
(item) => item == data.saleMethod[0].Id
);
+ return !isSHow;
+ } else {
+ 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;
@@ -1515,9 +1560,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)
);
}
}
@@ -1528,6 +1573,8 @@
},
// 鑾峰彇缁勫嵎绛旈鏁版嵁
getMockData() {
+ // const child = this.selectComponent("#test-resource");
+ // if (child) child.changeTestLoaidng(true);
this.setData({
"mockData.useCount": 0,
"mockData.mockList": [],
@@ -1571,10 +1618,12 @@
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({
@@ -1624,11 +1673,13 @@
});
// 璁板綍璐拱鏃堕棿锛屽苟璁剧姸鎬乻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),
+ },
+ ],
});
},
// 鑾峰彇鐩稿叧鍥句功
@@ -1658,33 +1709,45 @@
(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,
});
+ 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,
@@ -1712,7 +1775,8 @@
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 +
@@ -1883,12 +1947,15 @@
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) {
+ }
},
});
}
@@ -1953,12 +2020,15 @@
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) {
+ }
},
});
}
@@ -2043,4 +2113,4 @@
teach: tree,
});
},
-});
\ No newline at end of file
+});
--
Gitblit v1.9.1