From 338ad19ee45b5380a0d8433cbbce2a727a576dfa Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期五, 19 四月 2024 17:34:36 +0800
Subject: [PATCH] bug2
---
packageBookService/pages/bookServices/detail/index.js | 282 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 154 insertions(+), 128 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 8f2c887..ff204b8 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -1,7 +1,9 @@
// 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({
/**
@@ -16,6 +18,7 @@
name: "",
},
bookDetail: {},
+ bookClass: [],
bookItemDetail: {},
link: {
jd: "",
@@ -131,6 +134,23 @@
icon1: {
name: "/static/images/bookService/detail/dangdang.png",
},
+ rowCol: [{
+ width: '50%',
+ },
+ {
+ width: '100%'
+ },
+ {
+ width: '80%'
+ },
+ {
+ width: '100%'
+ }, {
+ width: '100%'
+ },
+ ],
+ showIndex: '',
+ successOrderNumber: ''
},
resetTree: function (e) {
@@ -158,6 +178,9 @@
name: options.name,
},
});
+ wx.setNavigationBarTitle({
+ title: options.name,
+ })
this.getBookInfo(options.id);
this.getResourceClass(); // 鑾峰彇璧勬簮鎵�灞炲垎绫�
const token = wx.getStorageSync(app.config.tokenKey);
@@ -188,16 +211,16 @@
onShow() {
if (wx.getStorageSync("paperBookList")) {
this.setData({
- paperBookList: wx.getStorageSync("paperBookList"),
+ paperBookList: JSON.parse(wx.getStorageSync("paperBookList")),
});
}
if (wx.getStorageSync("electronicBookList")) {
this.setData({
- electronicBookList: wx.getStorageSync("electronicBookList"),
+ electronicBookList: JSON.parse(wx.getStorageSync("electronicBookList")),
});
}
this.setData({
- num: this.data.paperBookList.length + this.data.electronicBookList.length,
+ num: Number(this.data.paperBookList.length) + Number(this.data.electronicBookList.length),
});
},
@@ -356,22 +379,33 @@
},
};
app.MG.store.getProductDetail(query).then(async (res) => {
+ console.log(res.datas, 'res.datas');
this.setData({
bookDetail: res.datas,
- cmsDatas: res.datas.cmsDatas[0].datas,
buyIdList: res.datas.purchasedSaleMethodIdList,
- relatedBookPath: JSON.parse(res.datas.datas.ProductLinkInfo)[0]
- .LinkPath,
});
+ if (res.datas.cmsDatas && res.datas.cmsDatas.length) {
+ this.setData({
+ cmsDatas: res.datas.cmsDatas[0].datas,
+ })
+ }
+ if (res.datas.datas.ProductLinkInfo) {
+ if (JSON.parse(res.datas.datas.ProductLinkInfo).length) this.setData({
+ relatedBookPath: JSON.parse(res.datas.datas.ProductLinkInfo)[0]
+ .LinkPath,
+ })
+ }
this.getSubTtem();
// 鑾峰彇鍥句功鍒嗙被
- let className = "";
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);
+ for (let index = 0; index < bookClassification.length; index++) {
+ const element = bookClassification[index];
+ const iconType = element[0];
+ const classType = element[1];
+ await this.getBookClass(iconType, classType);
+ }
}
}
@@ -404,7 +438,6 @@
"bookDetail.publicationDate": this.formatDate(
this.data.bookDetail.publicationDate
),
- "bookDetail.class": className,
"bookDetail.price": this.numFormat(this.data.bookDetail.price),
"bookDetail.oldPrice": this.numFormat(this.data.bookDetail.oldPrice),
"bookDetail.paperPrice": this.numFormat(
@@ -412,7 +445,7 @@
),
pageLoading: false,
});
- console.log("鍥句功淇℃伅", this.data.bookDetail);
+ console.log("鍥句功淇℃伅", this.data.bookClass);
});
},
//璇锋眰瀛愬晢鍝佺殑鏂囦欢
@@ -439,14 +472,12 @@
};
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,
- 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();
@@ -491,6 +522,7 @@
this.setData({
noFile: true,
});
+ // debugger
if (this.data.bookDetail.pdf) {
this.setData({
"fileInfo.bookName": this.data.bookDetail.name,
@@ -499,6 +531,7 @@
"fileInfo.freePage": this.data.bookDetail.probationPage,
});
} else if (this.data.bookDetail.protectedEpub) {
+
this.setData({
"fileInfo.bookName": this.data.bookDetail.name,
"fileInfo.fileType": "epub",
@@ -509,10 +542,9 @@
}
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
@@ -543,13 +575,19 @@
if (item.value == iconType) {
item.child.forEach((citem) => {
if (citem.value == classType) {
- name = citem.name;
+ const flag = this.data.bookClass.findIndex((ditem) => ditem == citem.name)
+ if (flag == -1) {
+ let list = this.data.bookClass
+ list.push(citem.name)
+ this.setData({
+ bookClass: list
+ })
+ }
}
});
}
});
});
- return name;
},
// 鏀惰棌
setCollect() {
@@ -595,28 +633,17 @@
// 妫�鏌ョ櫥褰曠姸鎬�
const token = wx.getStorageSync(app.config.tokenKey);
const child = this.selectComponent("#suggest-component");
- if (!token) {
- wx.showLoading({
- title: "鍔犺浇涓�",
- });
- loginInfo(app, (data) => {
- // 濡傛灉涓嶆槸绗竴娆＄櫥褰曪紝浼氭墽琛屽洖璋�
- if (data) {
- // 鐧诲綍鎴愬姛锛岃嚜鍔ㄨ褰晅oken鍜岀敤鎴蜂俊鎭紝骞惰繑鍥瀟rue
- child.showDialog();
- wx.hideLoading();
- } else {
- // 鍑虹幇閿欒锛岃繑鍥瀎alse
- }
- });
- } else {
- // 濡傛灉鏄涓�娆＄櫥褰曪紝浼氳烦杞嚦缁戝畾鐢ㄦ埛淇℃伅椤甸潰锛屽～鍐欏畬鐢ㄦ埛淇℃伅鍚庤繘琛岀櫥褰曞苟鍌ㄥ瓨token鍜岀敤鎴蜂俊鎭紝缁撴潫鍚庤烦杞洖褰撳墠椤甸潰锛堟惡甯﹂〉闈㈠弬鏁帮級
- child.showDialog();
- }
+ if (token)
+ // child.showDialog();
+ this.setData({
+ showIndex: '1'
+ })
},
// 璺宠浆缃戝簵
goShop(e) {
- const { link } = e.currentTarget.dataset;
+ const {
+ link
+ } = e.currentTarget.dataset;
wx.navigateTo({
url: `/packageBookService/pages/bookServices/webpage/index?url=${link}`,
});
@@ -650,6 +677,9 @@
(e.detail.value == "jsek_cloudLearning" && !this.data.learn.length) ||
(e.detail.value == "questionBank" && !this.data.test.length)
) {
+ if (e.detail.value == "jsek_teachingResources") {
+ wx.setStorageSync('teachResourcesPath', checkData.productLinkPath)
+ }
this.getResourceData(checkData);
}
if (e.detail.value == "questionBank" && token) this.getMockData();
@@ -750,7 +780,6 @@
loading: false,
openTeachids: result,
});
- console.log("鏁欏璧勬簮", list);
} else if (type.refCode == "jsek_cloudLearning") {
let arr = this.handleTreeData(list).filter(
(item) => item.saleMethod[0]
@@ -769,6 +798,7 @@
openLearnids: result,
});
}
+ console.log(list, '浜戝缈�789');
} else {
// 鏃犳暟鎹�
}
@@ -853,7 +883,7 @@
item.disabled = true;
}
}
- if (item.file) {
+ if (item.file && item.fileMap && item.fileMap[item.file]) {
if (item.fileMap[item.file].protectType == "Private")
item.disabled = true;
}
@@ -872,29 +902,29 @@
},
// 鑾峰彇灞曞紑椤�
findChildIds(data, result) {
- let index = 0;
+ let index = 0
for (let i = 0; i < data.length; i++) {
if (index < 3) {
- const item = data[i];
- if (item.children && item.children.length > 0) {
- result.push(item.id);
+ const item = data[i]
+ if (item.childrenFolderCount > 0) {
+ result.push(item.id)
for (let j = 0; j < item.children.length; j++) {
if (index < 3) {
- const childrenItme = item.children[j];
- if (item.children && item.children.length > 0) {
- result.push(childrenItme.id);
- index += 1;
+ const childrenItme = item.children[j]
+ if (item.childrenCount > 0) {
+ result.push(childrenItme.id)
+ index += 1
}
} else {
- break;
+ break
}
}
- } else if (item.children && item.children.length > 0) {
- result.push(item.id);
- index += 1;
+ } else if (item.childrenCount > 0) {
+ result.push(item.id)
+ index += 1
}
} else {
- break;
+ break
}
}
},
@@ -918,13 +948,11 @@
);
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();
@@ -957,28 +985,21 @@
},
async buyBook() {
- console.log(
- this.data.bookItemDetail.defaultSaleMethodId,
- "this.data.bookItemDetail.defaultSaleMethodId"
- );
if (!this.data.expire) {
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);
// 鑾峰彇璁㈠崟鍙峰苟璧嬪�肩粰 orderNumber.value
+ console.log(res, 'res456');
bookOrdersId = res.orderNumber;
- console.log(bookOrdersId);
// 妫�鏌ヨ鍗曞彿鏄惁瀛樺湪
if (bookOrdersId) {
if (this.data.bookDetail.price == "0.00") {
@@ -997,8 +1018,7 @@
}
});
} else {
- const url =
- "/pages/cart/paymentPage/index?orderNumber=" + bookOrdersId;
+ const url = "/pages/cart/paymentPage/index?orderNumber=" + bookOrdersId + '&onNorderSaleMethod=' + res.saleMethodLinks[0].orderSaleMethod.id;
wx.navigateTo({
url,
});
@@ -1091,12 +1111,13 @@
},
// 鐢宠鏁欏璧勬簮
applyResource() {
- if (this.data.applyResourceState) {
- return wx.showToast({
- icon: "error",
- title: "璇峰嬁閲嶅鐐瑰嚮",
- });
- }
+
+ // if (this.data.applyResourceState) {
+ // return wx.showToast({
+ // icon: "error",
+ // title: "璇峰嬁閲嶅鐐瑰嚮",
+ // });
+ // }
this.setData({
applyResourceState: true,
});
@@ -1114,14 +1135,12 @@
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) {
@@ -1139,8 +1158,7 @@
confirmColor: "#ff6c00",
cancelColor: "#949494",
complete: (res) => {
- if (res.cancel) {
- }
+ if (res.cancel) {}
if (res.confirm) {
wx.navigateTo({
url: "/packageDomain/pages/teacherCertification/index",
@@ -1156,8 +1174,7 @@
confirmColor: "#ff6c00",
cancelColor: "#949494",
complete: (res) => {
- if (res.cancel) {
- }
+ if (res.cancel) {}
if (res.confirm) {
wx.navigateTo({
url: "/packageDomain/pages/teacherCertification/index",
@@ -1187,8 +1204,7 @@
confirmColor: "#ff6c00",
cancelColor: "#949494",
complete: (res) => {
- if (res.cancel) {
- }
+ if (res.cancel) {}
if (res.confirm) {
wx.navigateTo({
url: "/packageDomain/pages/teacherCertification/index",
@@ -1381,19 +1397,23 @@
},
updateShoppingCartHidden() {
+
const isSHow = this.data.shoppingCartGetId.some(
(item) => item == data.saleMethod[0].Id
);
- console.log(isSHow);
return !isSHow;
},
+ //鍒锋柊璐墿杞﹀浘鏍�
updateCloudLearning() {
+ this.getBookInfo()
+ this.getShoppingCartProductGet()
const checkData = this.data.cmsDatas.find(
(item) => item.refCode == "jsek_cloudLearning"
);
this.getResourceData(checkData);
- debugger;
- console.log(55555);
+
+
+
},
// 閬嶅巻鏍戠粨鏋勮浆鎹负鏁扮粍鏂规硶
handleTreeData(array) {
@@ -1455,12 +1475,21 @@
};
// 纭璁㈠崟
const confirmOrderRes = await app.MG.store.confirmOrder(parameter);
+ console.log(confirmOrderRes.orderNumber, 'confirmOrderRes.orderNumber');
+
+
+
if (confirmOrderRes.orderNumber) {
child.changeReceive(false);
wx.showToast({
title: "棰嗗彇鎴愬姛",
});
this.getBookInfo(this.data.bookId);
+ this.setData({
+ successOrderNumber: confirmOrderRes.orderNumber
+ })
+
+
}
} catch (error) {
console.log(error);
@@ -1560,9 +1589,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)
);
}
}
@@ -1618,12 +1647,10 @@
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({
@@ -1673,13 +1700,11 @@
});
// 璁板綍璐拱鏃堕棿锛屽苟璁剧姸鎬乻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),
+ }, ],
});
},
// 鑾峰彇鐩稿叧鍥句功
@@ -1704,7 +1729,6 @@
},
};
app.MG.store.getProductList(query).then((res) => {
- console.log("瀹屾暣鐩稿叧鍥句功", res.datas);
const Arr = res.datas.filter(
(item) => item.id != this.data.bookDetail.id
);
@@ -1748,6 +1772,10 @@
}
wx.setStorageSync("bookPathList", JSON.stringify(bookPathList));
+ this.setData({
+ learn: [],
+ teach: []
+ })
this.onLoad({
id: e.detail.id,
name: e.detail.name,
@@ -1774,9 +1802,10 @@
});
return false;
}
+
+ // debugger
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 +
@@ -1888,7 +1917,6 @@
//鐢宠鐢靛瓙鏍蜂功
appplyElectronicBook() {
- console.log(this.data.bookDetail);
if (
this.data.bookDetail.isApplyBook == 2 ||
this.data.bookDetail.isApplyBook == 4
@@ -1954,8 +1982,7 @@
wx.navigateTo({
url: "/packageDomain/pages/teacherCertification/index",
});
- } else if (res.cancel) {
- }
+ } else if (res.cancel) {}
},
});
}
@@ -2027,8 +2054,7 @@
wx.navigateTo({
url: "/packageDomain/pages/teacherCertification/index",
});
- } else if (res.cancel) {
- }
+ } else if (res.cancel) {}
},
});
}
@@ -2113,4 +2139,4 @@
teach: tree,
});
},
-});
+});
\ No newline at end of file
--
Gitblit v1.9.1