From c99f9976a5ef9d8974105feb8fc0580a10adf98c Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期一, 23 十二月 2024 14:58:49 +0800
Subject: [PATCH] 111
---
packageBookService/pages/bookServices/detail/index.js | 181 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 168 insertions(+), 13 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index a8a444c..9294513 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -7,6 +7,7 @@
} from "../../../../assets/js/login";
import FormData from '../../../../utils/formdata/index.js';
const app = getApp();
+var pastData = require('../../psychologyAnswer/testdata/index')
Page({
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
@@ -50,10 +51,12 @@
resourceClassList: [], // 璧勬簮鎵�灞炲垎绫�
applyState: "", // 鏁欏璧勬簮鐢宠鐘舵��
deadline: "", // 鏁欏璧勬簮鐢宠鏈夋晥鏃ユ湡,
+ isShowBuyCloundBtn: false,
isshowDrawBtn: true, // 浜戝涔犻鍙栨煡鐪嬫寜閽槸鍚︽樉绀�
isShowBuyCloundMenu: false, // 浜戝涔犲叏閮ㄨ喘涔版寜閽槸鍚︽樉绀�
isCloundHaveSaleMethod: false, // 浜戝涔犳槸鍚︽湁閿�鍞柟寮�
cloundMenuIsBuy: false,
+ learnTaskData: {},
rejectCause: "", // 涓嬭浇鎷掔粷鍘熷洜
buyIdList: [],
shoppingCartGetId: [], // 宸茶喘涔癷d鍒楄〃
@@ -72,6 +75,9 @@
residue: 0, // 缁勫嵎鍓╀綑娆℃暟
mockList: [], // 鐢ㄦ埛缁勫嵎鎻愪氦淇℃伅
},
+ isBuyBank: false, // 棰樺簱鏄惁璐拱
+ isShoppingBank: false, // 棰樺簱鏄惁鍔犲叆璐墿杞�
+ bankSaleData: null,
relatedBookLoading: false,
noRelatedBookData: false,
relatedBookPath: "", // 鐩稿叧鍥句功path
@@ -206,7 +212,9 @@
fileList: [],
isShowUp: true,
protocolShow: false,
- protocolTxt: ''
+ protocolTxt: '',
+ learnMenu: null,
+ md5List: []
},
resetTree: function (e) {
@@ -271,7 +279,7 @@
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
- onShow() {
+ onShow(options) {
if (wx.getStorageSync("paperBookList")) {
this.setData({
paperBookList: JSON.parse(wx.getStorageSync("paperBookList")),
@@ -285,6 +293,9 @@
this.setData({
num: Number(this.data.paperBookList.length) + Number(this.data.electronicBookList.length),
});
+ if (this.data.bookDetail) {
+ this.getBookInfo(this.data.bookDetail.id)
+ }
},
/**
@@ -426,6 +437,7 @@
};
app.MG.store.getProductDetail(query).then(async (res) => {
this.getResourceCode(id, res.datas.rootCmsItemId)
+ console.log(res.datas, "res.datas")
this.setData({
bookDetail: res.datas,
buyIdList: res.datas.purchasedSaleMethodIdList,
@@ -497,7 +509,7 @@
}
}
this.setData({
- "bookDetail.publicationDate": moment(this.data.bookDetail.publicationDate).format("YYYY骞碝M鏈�"),
+ "bookDetail.publicationDate": this.data.bookDetail.publicationDate ? moment(this.data.bookDetail.publicationDate).format("YYYY骞碝M鏈�") : '',
"bookDetail.price": this.numFormat(this.data.bookDetail.price),
"bookDetail.oldPrice": this.numFormat(this.data.bookDetail.oldPrice),
"bookDetail.paperPrice": this.numFormat(
@@ -522,10 +534,30 @@
}
}
app.MG.store.getProductDetail(query).then((res) => {
+ let isBuyBank = true
+ let isShoppingBank = true
+ let bankSaleData = null
+ // 鍒ゆ柇棰樺簱鏄惁鏁翠綋璐拱
+ const bank = res.datas.cmsDatas[0].datas.find((item) => item.refCode == 'questionBank')
+ if (bank) {
+ if (bank.saleMethod.length) {
+ bankSaleData = bank.saleMethod.find((item) => item.SaleType == 'Normal')
+ if (bankSaleData) {
+ isBuyBank = this.data.buyIdList.includes(bankSaleData.Id)
+ isShoppingBank = this.data.buyIdList.includes(bankSaleData.Id) ? true : this.data.shoppingCartGetId.includes(bankSaleData.Id)
+ }
+ }
+ }
this.setData({
resourceCodeList: res.datas.cmsDatas[0].datas,
+ learnTaskData: res.datas.cmsDatas[0].datas.filter((item) => item.refCode == 'jsek_learningTasks')[0],
+ isBuyBank,
+ isShoppingBank,
+ bankSaleData
})
- console.log('refcode', this.data.resourceCodeList);
+ if (res.datas.cmsDatas[0].datas.length) this.setData({
+ learnMenu: res.datas.cmsDatas[0].datas.find(item => item.refCode == 'jsek_cloudLearning')
+ })
})
},
//璇锋眰瀛愬晢鍝佺殑鏂囦欢
@@ -869,7 +901,7 @@
}
// newArr.push(item)
// 鍦ㄦ彃鍏ヨ繃绋嬩腑瀵规暟鎹繘琛屾帓搴�
- newArr = this.insertAndSortObjectsByProductLinkPath(newArr, item)
+ newArr = this.insertAndSortObjectsById(newArr, item)
// 鎻掕繘鏁扮粍鍚� 浠庡師鏁版嵁涓垹闄�
rootList = rootList.filter(nitem => nitem.id != item.id)
}
@@ -901,8 +933,8 @@
return tree
},
- // 鎺掑簭鏁扮粍 鎸夌収productLinkPath
- insertAndSortObjectsByProductLinkPath(array, newObj) {
+ // 鎺掑簭鏁扮粍 鎸夌収id
+ insertAndSortObjectsById(array, newObj) {
// 鏌ユ壘鏂板璞″簲璇ユ彃鍏ョ殑浣嶇疆
let insertIndex = array.findIndex(obj => newObj.id < obj.id);
// 濡傛灉娌℃湁鎵惧埌鍚堥�傜殑浣嶇疆锛屽垯鏀惧湪鏁扮粍鏈熬
@@ -971,12 +1003,13 @@
},
}
app.MG.store.getProductDetailNoChildren(query).then((res) => {
- if (!res.datas.cmsDatas[0].datas.length) {
+ if (!res.datas.cmsDatas[0].datas.length || res.datas.cmsDatas[0].datas.length == 0) {
return this.setData({
noResources: true,
loading: false,
});
}
+
let list = []
// 鍒ゆ柇浜戝涔犳湁鏃犻攢鍞柟寮忓拰鏈夋晥鏈�
const cloundSaleMethod =
@@ -988,8 +1021,19 @@
cloundSaleMethod &&
new Date().getTime() <= new Date(cloundSaleMethod.EndDate).getTime() &&
new Date().getTime() >= new Date(cloundSaleMethod.BeginDate).getTime()
+ let md5s = []
res.datas.cmsDatas[0].datas.forEach((item) => {
// 浜戝涔犱笂鏈夐攢鍞柟寮忥紝鍘绘帀浜戝涔犱笅鎵�鏈夐攢鍞柟寮�
+ if (this.data.tabValue == "jsek_teachingResources") {
+
+ if (item.file || item.freeFile) {
+ let md5 = item.file ? item.file : item.freeFile
+ md5s.push(md5)
+ }
+ this.setData({
+ md5List: md5s,
+ });
+ }
if (flags) item.saleMethod = []
item.checked = false;
if (item.sysType == 'CmsItem') {
@@ -1038,7 +1082,9 @@
new Date(item.saleMethod.find((citem) => citem.SaleType == 'Normal').BeginDate).getTime() <= new Date().getTime()
) || (flags && cloundSaleMethod.Price == 0)
// 鍒ゆ柇浜戝涔犲叏閮ㄨ喘涔版寜閽槸鍚︽樉绀�
- let isShowBuyCloundMenu = flags && cloundSaleMethod.Price >= 0
+ let isShowBuyCloundMenu = flags && cloundSaleMethod.Price >= 0 && !this.data.buyIdList.includes(cloundSaleMethod.Id)
+ // 鍒ゆ柇璧勬簮璐拱鎸夐挳鏄惁鏄剧ず
+ let isShowBuyCloundBtn = !flags && res.datas.cmsDatas[0].datas.some(citem => citem.saleMethod.length != 0)
// 鍒ゆ柇璐墿杞︽寜閽拰閿佹寜閽槸鍚︽樉绀�
this.handleTreeData(list).forEach(item => {
item.isbuy = this.resourceIsBuy(item);
@@ -1048,6 +1094,7 @@
this.setData({
isshowDrawBtn,
isShowBuyCloundMenu,
+ isShowBuyCloundBtn,
isCloundHaveSaleMethod: flags,
learn: list,
loading: false,
@@ -1120,17 +1167,22 @@
}
} else {
if (isTSFW.length > 0) {
- data = res.datas.cmsDatas[0].datas.filter((item) => item.type == 'questionBankFolder' && item.childrenFolderCount > 0)
+ data = res.datas.cmsDatas[0].datas.filter((item) => item.type == 'questionBankFolder' && item.refCode != 'jsek_interaction' && (item.childrenFolderCount > 0 || item.childrenCount > 0) && (item.name !== '濉┖棰�' &&
+ item.name !== '鍒ゆ柇棰�' &&
+ item.name !== '澶氶�夐' &&
+ item.name !== '绠�绛旈') && item.name !== '鍗曢�夐')
that.setData({
jslx: false,
});
} else {
- data = res.datas.cmsDatas[0].datas.filter((item) => item.type == 'questionBankFolder')
+ data = res.datas.cmsDatas[0].datas.filter((item) => item.type == 'questionBankFolder' && item.refCode != 'jsek_interaction')
+ // && item.refCode != 'jsek_interaction'
that.setData({
jslx: true,
});
}
if (data.length > 0) {
+ console.log('data', data);
let list = []
that.getTreeList(data, list, query.cmsPath)
list = that.ensureTreeConsistency(list)
@@ -1140,6 +1192,20 @@
loading: false,
openTeachids: result,
});
+ //Json璧嬪��
+ // const bookId = that.data.bookId
+ // if (bookId == 6619) {
+ // const jsonData = {}
+ // jsonData.name = "蹇冪悊娴嬭瘎"
+ // jsonData.children = [...pastData.postData.list]
+ // var test = that.data.test;
+ // test.push(jsonData);
+ // that.setData({
+ // test: test,
+ // });
+ // console.log(that.data.test, "鏁欏浜掑姩");
+ // }
+
} else {
that.setData({
noResources: true,
@@ -1833,6 +1899,32 @@
});
}
},
+ // 浜戝涔犲叏閮ㄨ喘涔�
+ async buyCloudLearnClass() {
+ const cloundMenu = this.data.resourceCodeList.find((item) => item.refCode == 'jsek_cloudLearning')
+ debugger
+ let query = {
+ remarks: '浜戝涔�',
+ requests: [{
+ saleMethodId: cloundMenu.saleMethod.find((eitem) => eitem.SaleType == 'Normal').Id,
+ count: 1
+ }]
+ }
+ const initOrderRes = await app.MG.store.initOrder(query)
+ // 妫�鏌ヨ鍗曞彿鏄惁瀛樺湪
+ if (initOrderRes.orderNumber) {
+ // bookService: orderNumber.value, 灏戜紶杩欎釜 锛屾殏鏃朵笉鐭ラ亾鏈変粈涔堢敤
+ wx.navigateTo({
+ url: `/pages/cart/paymentPage/index?&bookId=${this.data.bookDetail.id}&bookName=${this.data.bookDetail.name}&orderNumber=${initOrderRes.orderNumber}`,
+ });
+ } else {
+ // 璁㈠崟鍙蜂笉瀛樺湪锛屾樉绀鸿鍛婃秷鎭�
+ wx.showToast({
+ icon: "error",
+ title: "璇烽噸璇�",
+ });
+ }
+ },
// 浜戝涔犲瓧娈佃喘涔�
async buyCloundMenu() {
const cloundData = this.data.resourceCodeList.find(item => item.refCode == 'jsek_cloudLearning')
@@ -1858,6 +1950,59 @@
},
handleTrue() {
// findAndUpdateItemsByIds(this.date.)
+ },
+
+ // 棰樺簱璐拱
+ async buyBank() {
+ let query = {
+ remarks: '浜戞祴璇�',
+ requests: [{
+ saleMethodId: this.data.bankSaleData.Id,
+ count: 1
+ }]
+ }
+ const initOrderRes = await app.MG.store.initOrder(query)
+ if (this.data.bankSaleData.Price) {
+ // 璐拱
+ const url = "/pages/cart/paymentPage/index?orderNumber=" + initOrderRes.orderNumber + '&onNorderSaleMethod=' + initOrderRes.saleMethodLinks[0].orderSaleMethod.id;
+ wx.navigateTo({
+ url,
+ });
+ } else {
+ // 鍏嶈垂棰嗗彇
+ app.MG.store
+ .confirmOrder({
+ orderNum: initOrderRes.orderNumber,
+ })
+ .then((res) => {
+ if (res) {
+ wx.showToast({
+ title: "棰嗗彇鎴愬姛",
+ icon: "none",
+ duration: 1000,
+ });
+ this.getBookInfo(this.data.bookDetail.id);
+ }
+ });
+ }
+ },
+ // 棰樺簱鍔犲叆璐墿杞�
+ handleShoppingBank() {
+ let query = {
+ requests: [{
+ saleMethodId: this.data.bankSaleData.Id,
+ storeEventId: null,
+ agentCode: "浜戞祴璇�",
+ }, ],
+ };
+ app.MG.store.addShoppingCart(query).then(res => {
+ wx.showToast({
+ icon: 'success',
+ title: '鍔犲叆鎴愬姛',
+ })
+ this.getShoppingCartProductGet();
+ this.getBookInfo(this.data.bookDetail.id)
+ })
},
// 缁勫嵎鏍煎紡鍖栨棩鏈熸樉绀�
DateFormat(date, fmt) {
@@ -2541,6 +2686,11 @@
return childrenList
},
uploadFile(e) {
+ const userInfo = JSON.parse(wx.getStorageSync(app.config.userInfoKey))
+ if (userInfo.role != 'Teacher') return wx.showToast({
+ icon: 'error',
+ title: '璇峰厛杩涜鏁欏笀璁よ瘉',
+ })
this.setData({
dialogBox: true,
isShowUp: true
@@ -2770,7 +2920,7 @@
app.MG.ugc.newTopicMessage(query).then((res) => {
wx.showToast({
icon: "success",
- title: "璇蜂笂浼犺祫婧愭枃浠�",
+ title: "涓婁紶鎴愬姛",
});
this.closeDialog()
})
@@ -2785,5 +2935,10 @@
this.setData({
cloundMenuIsBuy: flag
})
- }
+ },
+ /**
+ * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+ */
+ onShareAppMessage() {},
+ onShareTimeline() {}
})
\ No newline at end of file
--
Gitblit v1.9.1