From ea3fb7a2d5841cf03d87c3e52f327fb0bb9553a5 Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期四, 31 七月 2025 15:22:02 +0800
Subject: [PATCH] 去掉首页教师认证、修改样书申请登录申请登录位置
---
packageBookService/pages/bookServices/detail/components/tree/index.js | 106 +++++++++++++----------------------------------------
1 files changed, 26 insertions(+), 80 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.js b/packageBookService/pages/bookServices/detail/components/tree/index.js
index 509c3a9..8b6a3ec 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -162,62 +162,6 @@
}; // 瑙﹀彂浜嬩欢鐨勯�夐」
this.triggerEvent("downloadTeach", myEventDetail, myEventOption);
},
- // 鍒ゆ柇璧勬簮鏄惁璐拱
- resourceIsBuy(data) {
- if (data.saleMethod && data.saleMethod.length) {
- const saleData = data.saleMethod.find((item) => item.SaleType == 'Normal')
- if (saleData.State == 'Disable') return false
- const isSHow = this.properties.buyIds.some(
- (item) => item == saleData.Id
- );
- // 宸茬粡璐拱
- if (isShow) return false
- // 鏈喘涔帮紝鏌ョ湅閿�鍞柟寮忔槸鍚﹁繃鏈�
- if (!isShow) {
- const flag = new Date(saleData.EndDate).getTime() >= new Date().getTime() &&
- new Date(saleData.BeginDate).getTime() <= new Date().getTime()
- if (flag) {
- // 涓鸿繃鏈� 锛岄渶瑕佽喘涔�
- return true
- } else {
- // 宸茶繃鏈� 鏃犻渶璐拱
- return false
- }
- }
- } else {
- return false;
- }
- },
-
-
- // 鍒ゆ柇褰撳墠鐩爣鏄惁宸茶喘涔�
- async getCmsDataByQrcode(item) {
- let query = {
- path: '*',
- queryType: '*',
- productId: this.properties.bookInfo.id,
- itemId: item.id,
- itemFields: {
- // 璧勬簮绫诲瀷锛岃瘯璇绘枃浠讹紝鏄惁鍏佽涓嬭浇绛夊弬鏁�
- selectType: [],
- freeFile: [],
- file: [],
- protectedFile: [],
- resourcesClassification: [],
- isDownload: [],
- jsek_resourceBrief: [],
- jsek_link: [],
- jsek_questionBank: [],
- learnSelectType: []
- },
- pading: {
- start: 0,
- size: 999
- }
- }
- const data = await app.MG.store.getProductDetail(query)
- return data?.datas ?? []
- },
// 璺宠浆闊宠棰戞挱鏀惧櫒
goPlayer(e) {
@@ -266,35 +210,33 @@
}
}
if (this.properties.tab == "jsek_cloudLearning") {
- // 1.鎵惧嚭鎵�鏈夌埗绾х洰褰曞拰鏈韩(鏈夐攢鍞柟寮�) 鍜� 浜戝涔犳湰韬�(鏈夐攢鍞柟寮�) 鏀惧埌涓�涓暟缁� 涓虹┖鍒欐殏鏈紑鏀鹃攢鍞�
- let learn = []
- if (this.properties.isCloundHaveSaleMethod) {
- // 1.1 浜戝涔犳湁閿�鍞柟寮忥紝鍔犲叆鐖剁骇鏁扮粍
- learn.push(this.properties.learnMenu)
- } else {
- // 1.2 浜戝涔犳棤閿�鍞柟寮忥紝灏嗙埗绾х洰褰曞拰鏈韩鍔犲叆鏁扮粍
- learn = this.handleTreeData(this.properties.learnList).filter(
- (citem) => citem.saleMethod &&
- citem.saleMethod.find((ditem) => ditem.SaleType == 'Normal' && ditem.Price > 0) &&
- new Date(citem.saleMethod.find((ditem) => ditem.SaleType == 'Normal').EndDate).getTime() >= new Date().getTime() &&
- new Date(citem.saleMethod.find((ditem) => ditem.SaleType == 'Normal').BeginDate).getTime() <= new Date().getTime() &&
- item.productLinkPath.includes(citem.productLinkPath)
- )
- }
- // 2.鎵惧嚭杩欎釜鏁扮粍閲屽凡璐拱鐨� 褰㈡垚鏂版暟缁� 涓虹┖鍒欐湭璐拱
- let buyList = []
- if (learn.length) buyList = learn.filter((item) => this.properties.buyIds.includes(item.saleMethod.find((citem) => citem.SaleType == 'Normal').Id))
- // 鏈夌埗绾�(鍖呭惈閿�鍞柟寮�)锛屼笖鏈喘涔�
- if (learn.length && !buyList.length && !item.freeFile) return wx.showToast({
+ // // 1.鎵惧嚭鎵�鏈夌埗绾х洰褰曞拰鏈韩(鏈夐攢鍞柟寮�) 鍜� 浜戝涔犳湰韬�(鏈夐攢鍞柟寮�) 鏀惧埌涓�涓暟缁� 涓虹┖鍒欐殏鏈紑鏀鹃攢鍞�
+ // let learn = []
+ // if (this.properties.isCloundHaveSaleMethod) {
+ // // 1.1 浜戝涔犳湁閿�鍞柟寮忥紝鍔犲叆鐖剁骇鏁扮粍
+ // learn.push(this.properties.learnMenu)
+ // } else {
+ // // 1.2 浜戝涔犳棤閿�鍞柟寮忥紝灏嗙埗绾х洰褰曞拰鏈韩鍔犲叆鏁扮粍
+ // learn = this.handleTreeData(this.properties.learnList).filter(
+ // (citem) => citem.saleMethod &&
+ // citem.saleMethod.find((ditem) => ditem.SaleType == 'Normal' && ditem.Price > 0) &&
+ // new Date(citem.saleMethod.find((ditem) => ditem.SaleType == 'Normal').EndDate).getTime() >= new Date().getTime() &&
+ // new Date(citem.saleMethod.find((ditem) => ditem.SaleType == 'Normal').BeginDate).getTime() <= new Date().getTime() &&
+ // item.productLinkPath.includes(citem.productLinkPath)
+ // )
+ // }
+ // // 2.鎵惧嚭杩欎釜鏁扮粍閲屽凡璐拱鐨� 褰㈡垚鏂版暟缁� 涓虹┖鍒欐湭璐拱
+ // let buyList = []
+ // if (learn.length) buyList = learn.filter((item) => this.properties.buyIds.includes(item.saleMethod.find((citem) => citem.SaleType == 'Normal').Id))
+ // // 鏈夌埗绾�(鍖呭惈閿�鍞柟寮�)锛屼笖鏈喘涔�
+ if (!item.isbuy && !item.freeFile) return wx.showToast({
icon: 'error',
title: '璇峰厛璐拱璇ヨ祫婧�',
})
if (item.protectedFile || item.freeFile) {
- const currentSaleMaths = await this.getCmsDataByQrcode(item)
let file = item.fileMap[item.protectedFile] ? item.fileMap[item.protectedFile] : item.fileMap[item.freeFile]
if (file && file.protectType !== "Public") {
- const isBuyData = currentSaleMaths.purchasedSaleMethodIdList?.includes(item.saleMethod[0]?.Id)
- if (!isBuyData) {
+ if (!item.isbuy) {
return wx.showToast({
icon: 'error',
title: '璇峰厛璐拱璇ヨ祫婧�',
@@ -324,7 +266,11 @@
const token = wx.getStorageSync(app.config.tokenKey);
if (!token && this.data.tab != 'jsek_teachingResources') {
loginInfo(app, (data) => {
- if (data) {}
+ if (data) {
+ wx.redirectTo({
+ url: '/packageBookService/pages/bookServices/detail/index?id=' + this.data.bookInfo.id + '&name=' + encodeURI(this.data.bookInfo.name),
+ })
+ }
})
} else {
goPlayerFun()
--
Gitblit v1.9.1