From cb15c57d0ff984f5a100cf25d560fb0a69c00984 Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期二, 16 四月 2024 18:21:05 +0800
Subject: [PATCH] 音频bug4
---
packageBookService/pages/bookServices/detail/index.js | 468 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 280 insertions(+), 188 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index ee021b8..4399b17 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,22 @@
icon1: {
name: "/static/images/bookService/detail/dangdang.png",
},
+ rowCol: [{
+ width: '50%',
+ },
+ {
+ width: '100%'
+ },
+ {
+ width: '80%'
+ },
+ {
+ width: '100%'
+ }, {
+ width: '100%'
+ },
+ ],
+ showIndex: ''
},
resetTree: function (e) {
@@ -158,13 +177,15 @@
name: options.name,
},
});
+ wx.setNavigationBarTitle({
+ title: 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();
}
@@ -189,16 +210,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),
});
},
@@ -223,7 +244,7 @@
onReachBottom() {
if (this.data.tabValue == "jsek_note") {
const child = this.selectComponent("#note");
- child.onReachBottom();
+ if (!child.data.noList) child.onReachBottom();
}
},
@@ -301,7 +322,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) {
@@ -347,22 +380,34 @@
app.MG.store.getProductDetail(query).then(async (res) => {
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 (
- 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) {
+ 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);
+ }
+ }
}
+
// 鑾峰彇缁勫嵎閿�鍞甶d
if (res.datas.saleMethod && res.datas.saleMethod.length) {
res.datas.saleMethod.forEach((item) => {
@@ -392,7 +437,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(
@@ -400,7 +444,7 @@
),
pageLoading: false,
});
- console.log("鍥句功淇℃伅", this.data.bookDetail);
+ console.log("鍥句功淇℃伅", this.data.bookClass);
});
},
//璇锋眰瀛愬晢鍝佺殑鏂囦欢
@@ -430,10 +474,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,
+ "bookDetail.price": this.numFormat(res.datas[0].price),
});
let times = new Date(res.datas[0].defaultSaleMethod.endDate).getTime();
let startTime = new Date(
@@ -495,10 +539,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
@@ -529,13 +572,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() {
@@ -581,37 +630,26 @@
// 妫�鏌ョ櫥褰曠姸鎬�
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}`,
});
},
// tag鍒囨崲
onTabsChange(e) {
+ const token = wx.getStorageSync(app.config.tokenKey);
this.setData({
tabValue: e.detail.value,
-<<<<<<< Updated upstream
noResources: false,
});
if (
@@ -622,14 +660,7 @@
const checkData = this.data.cmsDatas.find(
(item) => item.refCode == e.detail.value
);
-=======
- noResources: false
- })
- if (e.detail.label == '鏁欏璧勬簮' || e.detail.label == '浜戝涔�' || e.detail.label == '浜戞祴璇�') {
- const checkData = this.data.cmsDatas.find(item => item.refCode == e.detail.value)
-
->>>>>>> Stashed changes
if (checkData) {
if (e.detail.value == "jsek_cloudLearning") {
this.setData({
@@ -643,8 +674,12 @@
(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();
} else {
this.setData({
noResources: true,
@@ -657,6 +692,8 @@
if (token) {
child.changeLoading();
child.getNoteList();
+ } else {
+ child.changeNoList();
}
} else if (e.detail.label == "鐢靛瓙涔�") {
const child = this.selectComponent("#eBook");
@@ -734,7 +771,6 @@
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,
@@ -815,8 +851,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;
@@ -830,7 +879,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;
}
@@ -841,7 +890,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);
}
});
@@ -849,29 +898,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
}
}
},
@@ -890,21 +939,16 @@
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();
@@ -937,34 +981,44 @@
},
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) {
- 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 + '&onNorderSaleMethod=' + res.saleMethodLinks[0].orderSaleMethod.id;
+ wx.navigateTo({
+ url,
+ });
+ }
} else {
console.log(222);
}
@@ -1076,14 +1130,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) {
@@ -1098,9 +1150,10 @@
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",
@@ -1113,9 +1166,10 @@
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",
@@ -1142,9 +1196,10 @@
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",
@@ -1278,6 +1333,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 = {
@@ -1321,16 +1392,23 @@
},
updateShoppingCartHidden() {
- const isSHow = this.data.shoppingCartGetId.some((item) => item == data.saleMethod[0].Id)
- console.log(isSHow);
- return !isSHow
+ const isSHow = this.data.shoppingCartGetId.some(
+ (item) => item == data.saleMethod[0].Id
+ );
+ return !isSHow;
},
+ //鍒锋柊璐墿杞﹀浘鏍�
updateCloudLearning() {
- const checkData = this.data.cmsDatas.find(item => item.refCode == 'jsek_cloudLearning')
- this.getResourceData(checkData)
- debugger
- console.log(55555);
+ this.getBookInfo()
+ this.getShoppingCartProductGet()
+ const checkData = this.data.cmsDatas.find(
+ (item) => item.refCode == "jsek_cloudLearning"
+ );
+ this.getResourceData(checkData);
+
+
+
},
// 閬嶅巻鏍戠粨鏋勮浆鎹负鏁扮粍鏂规硶
handleTreeData(array) {
@@ -1497,9 +1575,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)
);
}
}
@@ -1510,6 +1588,8 @@
},
// 鑾峰彇缁勫嵎绛旈鏁版嵁
getMockData() {
+ // const child = this.selectComponent("#test-resource");
+ // if (child) child.changeTestLoaidng(true);
this.setData({
"mockData.useCount": 0,
"mockData.mockList": [],
@@ -1553,12 +1633,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({
@@ -1608,13 +1686,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),
+ }, ],
});
},
// 鑾峰彇鐩稿叧鍥句功
@@ -1639,39 +1715,53 @@
},
};
app.MG.store.getProductList(query).then((res) => {
- console.log("瀹屾暣鐩稿叧鍥句功", res.datas);
const Arr = res.datas.filter(
(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,
});
- this.onLoad({ id: e.detail.id, name: e.detail.name });
+ 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() {
@@ -1695,8 +1785,7 @@
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 +
@@ -1808,7 +1897,6 @@
//鐢宠鐢靛瓙鏍蜂功
appplyElectronicBook() {
- console.log(this.data.bookDetail);
if (
this.data.bookDetail.isApplyBook == 2 ||
this.data.bookDetail.isApplyBook == 4
@@ -1831,14 +1919,7 @@
});
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
);
@@ -1861,18 +1942,27 @@
});
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 if (res.cancel) {}
},
});
}
@@ -1901,25 +1991,6 @@
});
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
);
@@ -1931,18 +2002,39 @@
});
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 if (res.cancel) {}
},
});
}
@@ -2027,4 +2119,4 @@
teach: tree,
});
},
-});
+});
\ No newline at end of file
--
Gitblit v1.9.1