From dd20c89b9c333f356927ed0bfed9a4dd9121b964 Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期三, 16 七月 2025 22:26:07 +0800
Subject: [PATCH] 优化
---
packageDomain/pages/resourceDetails/document/index.js | 213 ++++++++++++++++------------------------------------
1 files changed, 66 insertions(+), 147 deletions(-)
diff --git a/packageDomain/pages/resourceDetails/document/index.js b/packageDomain/pages/resourceDetails/document/index.js
index 70a9293..ae51bb6 100644
--- a/packageDomain/pages/resourceDetails/document/index.js
+++ b/packageDomain/pages/resourceDetails/document/index.js
@@ -6,7 +6,6 @@
} from '../../../../assets/js/login';
import XLSX from '../../../../utils/xlsx.mini.min';
Page({
-
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
@@ -58,7 +57,6 @@
selectTypeData: '',
promptVisable: false,
showMd5: '',
- source: "",
confirmBtn: {
content: '纭畾',
variant: 'base',
@@ -88,7 +86,6 @@
applyState: options.applyState,
deadline: options.deadline,
formPath: options.formPath,
- source: options.source,
})
if (options.formPath == 'jsek_cloudLearning') {
this.setData({
@@ -98,14 +95,10 @@
}
this.getBookInfo(this.data.bookId)
},
-
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
*/
- onReady() {
-
- },
-
+ onReady() {},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
@@ -114,7 +107,6 @@
startTime: Date.now()
})
},
-
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
*/
@@ -131,7 +123,6 @@
}
}
},
-
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
*/
@@ -148,7 +139,6 @@
}
}
},
-
count(timeStr) {
const data = {
appRefCode: app.config.appRefCode,
@@ -211,15 +201,11 @@
/**
* 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
*/
- onPullDownRefresh() {
-
- },
-
+ onPullDownRefresh() {},
/**
* 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
*/
onReachBottom() {},
-
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
@@ -228,7 +214,6 @@
goBack() {
wx.navigateBack()
},
-
// 鑾峰彇鍥句功璇︽儏
getBookInfo(id) {
const query = {
@@ -246,63 +231,19 @@
};
if (this.data.storeInfo) query['storeInfo'] = this.data.storeInfo
app.MG.store.getProductDetail(query).then(async (res) => {
- try {
- this.setData({
- bookDetail: res.datas,
- buyIdList: res.datas.purchasedSaleMethodIdList,
- learnClassData: res.datas.cmsDatas[0].datas.length > 0 ? res.datas.cmsDatas[0].datas.find(item => item.refCode == "jsek_cloudLearning") : null
- })
- } catch (error) {}
- if (this.data.learnClassData) {
- this.getResourceDataList(this.data.learnClassData)
- } else {
- this.resourceDetailsData()
- }
+ this.setData({
+ bookDetail: res.datas
+ })
+ this.resourceDetailsData();
});
},
- // 鏁欏璧勬簮 浜戝涔� 鑾峰彇
- getResourceDataList(type) {
- let query = {
- path: '*',
- queryType: '*',
- productId: this.data.bookDetail.id,
- cmsPath: type.productLinkPath,
- cmsType: '*',
- itemFields: {
- SysType: 'CmsFolder',
- },
- pading: {
- start: 0,
- size: 999
- },
- }
- app.MG.store.getProductDetailNoChildren(query).then((res) => {
- const buyList = res.datas.cmsDatas[0].datas.filter(item => item.saleMethod.length && this.data.buyIdList.includes(item.saleMethod.find(citem => citem.SaleType == 'Normal').Id))
- if (this.data.learnClassData && this.data.learnClassData.saleMethod.length) {
- const learnSaleMethod = this.data.learnClassData.saleMethod.find(citem => citem.SaleType == 'Normal')
- if (this.data.buyIdList.includes(learnSaleMethod.Id)) {
- buyList.push(this.data.learnClassData)
- } else {
- if (new Date().getTime() > new Date(learnSaleMethod.EndDate).getTime() || learnSaleMethod.Price == 0) {
- this.setData({
- isLearnDataBuy: true
- })
- } else {
- this.setData({
- isLearnDataBuy: false
- })
- }
- }
- } else {
- this.setData({
- isLearnDataBuy: true
- })
- }
- this.setData({
- buyList: buyList
- })
- this.resourceDetailsData()
- })
+
+ // 鍒ゆ柇褰撳墠鐩爣鏄惁宸茶喘涔�
+ async getCmsDataByQrcode() {
+ const query = {
+ cmsItemId: Number(this.data.activeId)
+ };
+ return app.MG.file.checkCmsItem(query)
},
resourceDetailsData() {
@@ -312,11 +253,10 @@
let query = {
path: '*',
queryType: '*',
+ cmsType: '*',
productId: this.data.bookId,
- cmsPath: this.data.parentProductLinkPath,
+ cmsPath: this.data.bookDetail.rootCmsItemId,
itemFields: {
- SysType: 'CmsFolder',
- // 璧勬簮绫诲瀷锛岃瘯璇绘枃浠讹紝鏄惁鍏佽涓嬭浇绛夊弬鏁�
selectType: [],
freeFile: [],
file: [],
@@ -337,72 +277,51 @@
query.storeInfo = this.data.storeInfo
}
app.MG.store.getProductDetail(query).then(async (res) => {
- wx.hideLoading();
- const list = res.datas.cmsDatas[0]?.datas
- if (this.data.source == 'qrcode') {
- let qrData = res.datas.cmsDatas[0].datas.find(ditem => ditem.id == this.data.activeId)
- if (qrData) {
- this.setData({
- threeLeveData: [qrData]
+ let linkData = this.data.productLinkPath.split("\\");
+ linkData.reverse()
+ let dataList = linkData.map(item => {
+ let data = res.datas.cmsDatas[0].datas.find(citem => citem.id == item);
+ if (data) return data;
+ })
+ let isBuy = 1;
+ for (let i = 0; i < dataList.length; i++) {
+ const dataItem = dataList[i];
+ if (dataItem) {
+ if (dataItem.saleMethod.length > 0) {
+ isBuy = 2;
+ if (this.data.bookDetail.purchasedSaleMethodIdList.indexOf(dataItem.saleMethod[0].Id) > -1) {
+ isBuy = 3;
+ break;
+ } else {
+ break;
+ }
+ }
+ }
+ }
+ if (isBuy == 2) {
+ // 鏈喘涔�
+ if (dataList[0].freeFile) {
+ this.handleTeachData(dataList[0], true)
+ } else {
+ wx.hideLoading();
+ wx.showModal({
+ title: '娓╅Θ鎻愮ず',
+ content: '璇ヨ祫婧愭湭璐拱锛屽皢杩斿洖璐拱',
+ success: (res) => {
+ if (res.confirm) {
+ if (this.data.source == 'qrcode') {
+ wx.navigateTo({
+ url: `/packageBookService/pages/bookServices/detail/index?id=${this.data.bookDetail.id}&name=${this.data.bookDetail.name}&tabValue=${this.data.formPath}`,
+ });
+ } else {
+ wx.navigateBack()
+ }
+ }
+ }
})
}
} else {
- this.setData({
- threeLeveData: []
- })
- }
- this.setData({
- isBuy: res.datas.purchasedSaleMethodIdList.includes(res.datas.defaultSaleMethodId)
- })
- for (const item of list) {
- if (this.data.storeInfo == 'jsek_digitalCourses') {
- if (this.data.isBuy) {
- if (this.data.productLinkPath == item.productLinkPath) {
- this.data.threeLeveData.push(item)
- }
- } else {
- if (this.data.productLinkPath == item.productLinkPath && item.freeFile) {
- this.data.threeLeveData.push(item)
- }
- }
- } else {
- const isBuyCms = await app.MG.file.checkCmsItem({
- cmsItemId: Number(item.id)
- })
- item.isBuyCms = isBuyCms
- if (isBuyCms) {
- this.data.threeLeveData.push(item)
- } else {
- if (item.freeFile) {
- this.data.threeLeveData.push(item)
- } else {
- wx.showModal({
- icon: 'error',
- title: '娓╅Θ鎻愮ず',
- content: '璇疯喘涔拌祫婧愶紝鍗冲皢杩斿洖璐拱椤�',
- confirmText: '纭畾',
- showCancel: false, // 鍏抽棴鍙栨秷鎸夐挳
- success: (cres) => {
- if (cres.confirm) {
- wx.navigateTo({
- url: '/packageBookService/pages/bookServices/detail/index?id=' + this.data.bookId + '&name=' + this.data.bookName + '&tabValue=' + this.data.formPath,
- })
- }
- }
- });
- return; // 鐩存帴杩斿洖锛岄伩鍏嶆墽琛屽悗缁唬鐮�
- }
- }
- }
- }
- if (this.data.threeLeveData.length > 0) {
- let item = this.data.threeLeveData[0]
- this.handleTeachData(item)
- this.setData({
- titleName: item.name,
- selectType: item.selectType,
- learnSelectType: item.learnSelectType,
- })
+ this.handleTeachData(dataList[0], false)
}
})
},
@@ -482,12 +401,16 @@
});
},
//鍒氳繘鏉ョ殑鏃跺�欒皟鐢�
- handleTeachData(item) {
+ handleTeachData(item, isTry) {
+ this.setData({
+ titleName: item.name,
+ selectType: item.selectType,
+ learnSelectType: item.learnSelectType,
+ })
let that = this
//鍥剧墖
if (item.selectType == 'picture' || item.learnSelectType == 'picture') {
- const isBuy = item.isBuyCms
- let file = isBuy ? item.protectedFile || item.file : item.freeFile
+ let file = isTry ? item.freeFile : item.protectedFile || item.file
this.setData({
showData: app.config.requestCtx + '/file/api/ApiDownload?md5=' + file,
})
@@ -509,8 +432,7 @@
}
//鏂囨。绛�
if (item.selectType == 'document' || item.selectType == 'pdf' || item.learnSelectType == 'document' || item.learnSelectType == 'pdf') {
- const isBuy = item.isBuyCms
- let md5 = isBuy ? item.protectedFile || item.file || item.freeFile : item.freeFile
+ let md5 = isTry ? item.freeFile : item.protectedFile || item.file || item.freeFile
if (item.fileMap[md5]?.extension == 'xlsx' || item.fileMap[md5]?.extension == 'xls') {
this.setData({
selectTypeData: 'excel',
@@ -528,6 +450,7 @@
})
let worksheet = workbook.Sheets[workbook.SheetNames[0]]
let innerHTML = XLSX.utils.sheet_to_json(worksheet)
+ console.log(innerHTML)
that.setData({
naturalResources: innerHTML
})
@@ -559,7 +482,6 @@
}
}
},
-
onClick() {
this.setData({
images: [
@@ -576,19 +498,16 @@
} = e.detail;
console.log('change', index);
},
-
onDelete(e) {
const {
index
} = e.detail;
-
Toast({
context: this,
selector: '#t-toast',
message: `鍒犻櫎绗�${index + 1}涓猔,
});
},
-
onClose(e) {
const {
trigger
--
Gitblit v1.9.1