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 | 473 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 319 insertions(+), 154 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index d35e650..ff204b8 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -18,6 +18,7 @@
name: "",
},
bookDetail: {},
+ bookClass: [],
bookItemDetail: {},
link: {
jd: "",
@@ -133,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) {
@@ -160,13 +178,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();
}
@@ -191,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),
});
},
@@ -225,7 +245,7 @@
onReachBottom() {
if (this.data.tabValue == "jsek_note") {
const child = this.selectComponent("#note");
- child.onReachBottom();
+ if (!child.data.noList) child.onReachBottom();
}
},
@@ -303,7 +323,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,24 +379,36 @@
},
};
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 (
- 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) => {
@@ -394,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(
@@ -402,7 +445,7 @@
),
pageLoading: false,
});
- console.log("鍥句功淇℃伅", this.data.bookDetail);
+ console.log("鍥句功淇℃伅", this.data.bookClass);
});
},
//璇锋眰瀛愬晢鍝佺殑鏂囦欢
@@ -435,6 +478,7 @@
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(
@@ -478,6 +522,7 @@
this.setData({
noFile: true,
});
+ // debugger
if (this.data.bookDetail.pdf) {
this.setData({
"fileInfo.bookName": this.data.bookDetail.name,
@@ -486,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",
@@ -529,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() {
@@ -581,24 +633,11 @@
// 妫�鏌ョ櫥褰曠姸鎬�
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) {
@@ -611,6 +650,7 @@
},
// tag鍒囨崲
onTabsChange(e) {
+ const token = wx.getStorageSync(app.config.tokenKey);
this.setData({
tabValue: e.detail.value,
noResources: false,
@@ -623,6 +663,7 @@
const checkData = this.data.cmsDatas.find(
(item) => item.refCode == e.detail.value
);
+
if (checkData) {
if (e.detail.value == "jsek_cloudLearning") {
this.setData({
@@ -636,8 +677,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,
@@ -650,6 +695,8 @@
if (token) {
child.changeLoading();
child.getNoteList();
+ } else {
+ child.changeNoList();
}
} else if (e.detail.label == "鐢靛瓙涔�") {
const child = this.selectComponent("#eBook");
@@ -727,7 +774,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,
@@ -735,8 +781,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;
@@ -745,7 +791,6 @@
this.setData({
isshowDrawBtn: false,
});
- debugger;
this.findChildIds(list, result);
this.setData({
learn: list,
@@ -753,6 +798,7 @@
openLearnids: result,
});
}
+ console.log(list, '浜戝缈�789');
} else {
// 鏃犳暟鎹�
}
@@ -809,8 +855,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;
@@ -824,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;
}
@@ -835,7 +894,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);
}
});
@@ -843,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
}
}
},
@@ -884,12 +943,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: [{
@@ -929,32 +985,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,
+ 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);
}
@@ -1043,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,
});
@@ -1086,6 +1155,8 @@
wx.showModal({
title: "灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�",
content: "璇峰厛杩涜鏁欏笀璁よ瘉锛�",
+ confirmColor: "#ff6c00",
+ cancelColor: "#949494",
complete: (res) => {
if (res.cancel) {}
if (res.confirm) {
@@ -1100,6 +1171,8 @@
wx.showModal({
title: "灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�",
content: "璇峰厛杩涜鏁欏笀璁よ瘉锛�",
+ confirmColor: "#ff6c00",
+ cancelColor: "#949494",
complete: (res) => {
if (res.cancel) {}
if (res.confirm) {
@@ -1128,6 +1201,8 @@
wx.showModal({
title: "灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�",
content: "璇峰厛杩涜鏁欏笀璁よ瘉锛�",
+ confirmColor: "#ff6c00",
+ cancelColor: "#949494",
complete: (res) => {
if (res.cancel) {}
if (res.confirm) {
@@ -1263,6 +1338,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 = {
@@ -1303,6 +1394,26 @@
} else {
return false;
}
+ },
+
+ updateShoppingCartHidden() {
+
+ const isSHow = this.data.shoppingCartGetId.some(
+ (item) => item == data.saleMethod[0].Id
+ );
+ return !isSHow;
+ },
+ //鍒锋柊璐墿杞﹀浘鏍�
+ updateCloudLearning() {
+ this.getBookInfo()
+ this.getShoppingCartProductGet()
+ const checkData = this.data.cmsDatas.find(
+ (item) => item.refCode == "jsek_cloudLearning"
+ );
+ this.getResourceData(checkData);
+
+
+
},
// 閬嶅巻鏍戠粨鏋勮浆鎹负鏁扮粍鏂规硶
handleTreeData(array) {
@@ -1364,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);
@@ -1482,6 +1602,8 @@
},
// 鑾峰彇缁勫嵎绛旈鏁版嵁
getMockData() {
+ // const child = this.selectComponent("#test-resource");
+ // if (child) child.changeTestLoaidng(true);
this.setData({
"mockData.useCount": 0,
"mockData.mockList": [],
@@ -1607,35 +1729,57 @@
},
};
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.onLoad({ id: e.detail.id, name: e.detail.name });
+ 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.setData({
+ learn: [],
+ teach: []
+ })
+ this.onLoad({
+ id: e.detail.id,
+ name: e.detail.name,
+ });
},
// 搴曢儴璐拱鎸夐挳
buyBtn() {
@@ -1658,6 +1802,8 @@
});
return false;
}
+
+ // debugger
wx.navigateTo({
url: "/packageBookService/pages/components/webView/index?md5=" +
this.data.fileInfo.md5 +
@@ -1771,24 +1917,49 @@
//鐢宠鐢靛瓙鏍蜂功
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') {
+ 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;
+ }
+
+ 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) {
@@ -1796,40 +1967,24 @@
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")
+ this.addBookFun(this.data.bookDetail, "eBook");
} else {
wx.showModal({
- title: '灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�', //鎻愮ず鐨勬爣棰�
- content: '璇峰厛杩涜鏁欏笀璁よ瘉锛�', //鎻愮ず鐨勫唴瀹�
+ 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({
@@ -1841,16 +1996,42 @@
},
//鐢宠绾歌川鏍蜂功
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;
+ }
+ 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) {
@@ -1858,40 +2039,24 @@
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")
+ this.addBookFun(this.data.bookDetail, "pBook");
} else {
wx.showModal({
- title: '灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�', //鎻愮ず鐨勬爣棰�
- content: '璇峰厛杩涜鏁欏笀璁よ瘉锛�', //鎻愮ず鐨勫唴瀹�
+ 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