From 34dd2d10cf26c86ed170a59aa36718f7c27f24d0 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 03 四月 2024 15:30:29 +0800
Subject: [PATCH] 图书详情bug修改，云学习无销售方法check禁用
---
packageBookService/pages/bookServices/detail/index.js | 258 ++++++++++++++++++++++++++++-----------------------
1 files changed, 142 insertions(+), 116 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 589b46c..f4f4c86 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({
/**
@@ -59,6 +57,8 @@
residue: 0, // 缁勫嵎鍓╀綑娆℃暟
mockList: [], // 鐢ㄦ埛缁勫嵎鎻愪氦淇℃伅
},
+ relatedBookLoading: false,
+ noRelatedBookData: false,
relatedBookPath: "", // 鐩稿叧鍥句功path
relatedBookData: [], // 鐩稿叧鍥句功鍒楄〃
flag: true,
@@ -143,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,
});
@@ -173,7 +158,6 @@
name: options.name,
},
});
-
this.getBookInfo(options.id);
this.getResourceClass(); // 鑾峰彇璧勬簮鎵�灞炲垎绫�
const token = wx.getStorageSync(app.config.tokenKey);
@@ -446,9 +430,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,
});
let times = new Date(res.datas[0].defaultSaleMethod.endDate).getTime();
let startTime = new Date(
@@ -510,9 +495,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
@@ -616,9 +602,7 @@
},
// 璺宠浆缃戝簵
goShop(e) {
- const {
- link
- } = e.currentTarget.dataset;
+ const { link } = e.currentTarget.dataset;
wx.navigateTo({
url: `/packageBookService/pages/bookServices/webpage/index?url=${link}`,
});
@@ -749,8 +733,8 @@
openTeachids: result,
});
} 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;
@@ -759,7 +743,6 @@
this.setData({
isshowDrawBtn: false,
});
- debugger;
this.findChildIds(list, result);
this.setData({
learn: list,
@@ -906,11 +889,13 @@
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();
@@ -951,12 +936,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);
@@ -1080,12 +1067,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) {
@@ -1101,7 +1090,8 @@
title: "灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�",
content: "璇峰厛杩涜鏁欏笀璁よ瘉锛�",
complete: (res) => {
- if (res.cancel) {}
+ if (res.cancel) {
+ }
if (res.confirm) {
wx.navigateTo({
url: "/packageDomain/pages/teacherCertification/index",
@@ -1115,7 +1105,8 @@
title: "灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�",
content: "璇峰厛杩涜鏁欏笀璁よ瘉锛�",
complete: (res) => {
- if (res.cancel) {}
+ if (res.cancel) {
+ }
if (res.confirm) {
wx.navigateTo({
url: "/packageDomain/pages/teacherCertification/index",
@@ -1143,7 +1134,8 @@
title: "灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�",
content: "璇峰厛杩涜鏁欏笀璁よ瘉锛�",
complete: (res) => {
- if (res.cancel) {}
+ if (res.cancel) {
+ }
if (res.confirm) {
wx.navigateTo({
url: "/packageDomain/pages/teacherCertification/index",
@@ -1483,9 +1475,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)
);
}
}
@@ -1539,10 +1531,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({
@@ -1592,16 +1586,21 @@
});
// 璁板綍璐拱鏃堕棿锛屽苟璁剧姸鎬乻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),
+ },
+ ],
});
},
// 鑾峰彇鐩稿叧鍥句功
getAboutBook(path) {
- // loadings.value.aboutBook = true
+ this.setData({
+ relatedBookLoading: true,
+ noRelatedBookData: false,
+ });
let query = {
path,
queryType: "*",
@@ -1623,24 +1622,34 @@
(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 > 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;
+ // }
+ this.setData({
+ relatedBookData: Arr,
+ relatedBookLoading: false,
+ });
+ if (!this.data.relatedBookData.length)
this.setData({
- relatedBookData: bookArr,
+ noRelatedBookData: true,
});
- console.log("鐩稿叧鍥句功", this.data.relatedBookData);
- }
+ console.log("鐩稿叧鍥句功", this.data.relatedBookData);
});
- // loadings.value.aboutBook = false
+ },
+ goBookDetails(e) {
+ console.log(e);
+ this.setData({
+ tabValue: "brief",
+ pageLoading: true,
+ });
+ this.onLoad({ id: e.detail.id, name: e.detail.name });
},
// 搴曢儴璐拱鎸夐挳
buyBtn() {
@@ -1664,7 +1673,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 +
@@ -1776,24 +1786,27 @@
//鐢宠鐢靛瓙鏍蜂功
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 && role == 'Teacher') {
+ 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 && role == "Teacher") {
if (!this.data.noFile) {
wx.showToast({
title: "鏆傛棤鐢靛瓙涔︽枃浠�,璇疯仈绯荤鐞嗗憳!",
- icon: 'none',
+ icon: "none",
duration: 1000,
- })
- return
+ });
+ return;
}
if (this.data.ebookCount == 0) {
wx.showToast({
title: "鎮ㄧ殑鐢靛瓙鏍蜂功鐢宠娆℃暟宸茬敤灏斤紝鑻ヨ缁х画锛岃鑱旂郴绠＄悊鍛橈紒",
icon: "none",
duration: 1000,
- })
+ });
return false;
}
if (this.data.electronicBookList.length >= 2) {
@@ -1801,40 +1814,45 @@
title: "姣忔鏈�澶氬彧鍙敵璇�2鏈牱涔�",
icon: "none",
duration: 1000,
- })
+ });
return false;
}
- let isHas = this.data.electronicBookList.find((eitem) => eitem.id == this.data.bookDetail.id)
+ 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)
+ 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")
+ this.addBookFun(this.data.bookDetail, "eBook");
} else {
wx.showModal({
- title: '灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�', //鎻愮ず鐨勬爣棰�
- content: '璇峰厛杩涜鏁欏笀璁よ瘉锛�', //鎻愮ず鐨勫唴瀹�
+ title: "灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�", //鎻愮ず鐨勬爣棰�
+ content: "璇峰厛杩涜鏁欏笀璁よ瘉锛�", //鎻愮ず鐨勫唴瀹�
success: function (res) {
if (res.confirm) {
wx.navigateTo({
url: "/packageDomain/pages/teacherCertification/index",
});
- } else if (res.cancel) {}
- }
- })
+ } else if (res.cancel) {
+ }
+ },
+ });
}
} else {
wx.showToast({
@@ -1846,16 +1864,19 @@
},
//鐢宠绾歌川鏍蜂功
appplyPaperBook() {
- if (this.data.bookDetail.isApplyBook == 3 || this.data.bookDetail.isApplyBook == 4) {
- let role = this.data.userInfo != null ? this.data.userInfo.role : null
- if (role && role == 'Teacher') {
+ if (
+ this.data.bookDetail.isApplyBook == 3 ||
+ this.data.bookDetail.isApplyBook == 4
+ ) {
+ let role = this.data.userInfo != null ? this.data.userInfo.role : null;
+ if (role && role == "Teacher") {
// 鐐瑰嚮閫変腑
if (this.data.paperBookCount == 0) {
wx.showToast({
title: "鎮ㄧ殑绾歌川鏍蜂功鐢宠娆℃暟宸茬敤灏斤紝鑻ヨ缁х画锛岃鑱旂郴绠＄悊鍛橈紒",
icon: "none",
duration: 1000,
- })
+ });
return false;
}
if (this.data.paperBookList.length >= 2) {
@@ -1863,40 +1884,45 @@
title: "姣忔鏈�澶氬彧鍙敵璇�2鏈牱涔�",
icon: "none",
duration: 1000,
- })
+ });
return false;
}
- let isHas = this.data.paperBookList.find((pitem) => pitem.id == this.data.bookDetail.id)
+ 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)
+ 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")
+ this.addBookFun(this.data.bookDetail, "pBook");
} else {
wx.showModal({
- title: '灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�', //鎻愮ず鐨勬爣棰�
- content: '璇峰厛杩涜鏁欏笀璁よ瘉锛�', //鎻愮ず鐨勫唴瀹�
+ title: "灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�", //鎻愮ず鐨勬爣棰�
+ content: "璇峰厛杩涜鏁欏笀璁よ瘉锛�", //鎻愮ず鐨勫唴瀹�
success: function (res) {
if (res.confirm) {
wx.navigateTo({
url: "/packageDomain/pages/teacherCertification/index",
});
- } else if (res.cancel) {}
- }
- })
+ } else if (res.cancel) {
+ }
+ },
+ });
}
} else {
wx.showToast({
@@ -1979,4 +2005,4 @@
teach: tree,
});
},
-});
\ No newline at end of file
+});
--
Gitblit v1.9.1