From 558845242a07b68f42fa1802c45ab2769395d8b8 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期一, 29 四月 2024 14:31:30 +0800
Subject: [PATCH] 合并代码
---
packageBookService/pages/bookServices/detail/components/tree/index.js | 74 ++++++++++++++++++++-----------------
1 files changed, 40 insertions(+), 34 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.js b/packageBookService/pages/bookServices/detail/components/tree/index.js
index ef5aa5a..c6d26b1 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -48,6 +48,9 @@
checkAllState: {
type: Boolean,
},
+ deadline: {
+ type: String
+ }
},
data: {
sonPurchaseSaleMethodId: "",
@@ -132,7 +135,6 @@
goPlayer(e) {
// 妫�鏌ョ櫥褰曠姸鎬�
const token = wx.getStorageSync(app.config.tokenKey);
-
if (token) {
const item = e.currentTarget.dataset.item;
const parent = e.currentTarget.dataset.parent;
@@ -162,20 +164,48 @@
"璇峰厛璐拱璇ヨ祫婧�" : "璇峰厛鐐瑰嚮棰嗗彇鏌ョ湅鎸夐挳",
});
}
+ if (item.saleMethod.length == 0 && item.sysType == 'CmsItem' && this.properties.tab == "jsek_cloudLearning") {
+ return wx.showToast({
+ icon: 'error',
+ title: '鏆傛湭寮�濮嬮攢鍞紝璇疯仈绯荤鐞嗗憳',
+ })
+ }
+ if (this.properties.tab == "jsek_teachingResources" && item.fileMap) {
+ if (item.file && item.fileMap[item.file].protectType !== "Public") {
+ return wx.showToast({
+ icon: 'error',
+ title: '璧勬簮涓嶅彲鐢紝璇疯仈绯荤鐞嗗憳',
+ })
+ } else if (item.freeFile && item.fileMap[item.freeFile].protectType !== "Public") {
+ return wx.showToast({
+ icon: 'error',
+ title: '璧勬簮涓嶅彲鐢紝璇疯仈绯荤鐞嗗憳',
+ })
+ }
+ }
wx.navigateTo({
- url: `${url}?productLinkPath=${item.productLinkPath}&parentProductLinkPath=${parentProductLinkPath}&parentName=${parentName}&activeId=${item.id}&bookId=${this.properties.bookInfo.id}&bookName=${this.properties.bookInfo.name}&cmsId=${this.properties.bookInfo.rootCmsItemId}&formPath=${this.properties.tab}`,
+ url: `${url}?productLinkPath=${item.productLinkPath}&parentProductLinkPath=${parentProductLinkPath}&parentName=${parentName}&activeId=${item.id}&bookId=${this.properties.bookInfo.id}&bookName=${this.properties.bookInfo.name}&cmsId=${this.properties.bookInfo.rootCmsItemId}&formPath=${this.properties.tab}&applyState=${this.properties.applyState}&deadline=${this.properties.deadline}`,
});
-
+ console.log(item, '7899');
if (item.selectType == "document" || item.selectType == "pdf") {
- const fileLink =
- app.config.requestCtx + "/file/api/ApiDownload?md5=" + item.file;
+ // freeFile
+
+ if (item.selectType == "document") {
+ item.selectType = "pptx"
+
+ }
+ console.log(item);
+ const fileLink = item.file ?
+ app.config.requestCtx + "/file/api/ApiDownload?md5=" + item.file : app.config.requestCtx + "/file/api/ApiDownload?md5=" + item.freeFile
console.log(fileLink, "fileLink");
//鎻愮ず鍔犺浇涓�
util.showLoading();
// 鍗曟涓嬭浇鍏佽鐨勬渶澶ф枃浠朵负 200MB
wx.downloadFile({
url: fileLink,
+ // filePath: wx.env.USER_DATA_PATH + `/${item.name}.${item.selectType}`,
+ filePath: wx.env.USER_DATA_PATH + `/${item.name}.${item.selectType}`,
success: function (res) {
console.log(res, "wx.downloadFile success res");
if (res.statusCode != 200) {
@@ -183,8 +213,9 @@
return false;
}
var Path = res.tempFilePath; //杩斿洖鐨勬枃浠朵复鏃跺湴鍧�锛岀敤浜庡悗闈㈡墦寮�鏈湴棰勮鎵�鐢�
+ let data = res.filePath;
wx.openDocument({
- filePath: Path,
+ filePath: data,
showMenu: true,
success: function (res) {
console.log("鎵撳紑鎴愬姛");
@@ -198,32 +229,14 @@
},
});
}
+<<<<<<< Updated upstream
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+=======
// if (item.selectType == "document" || item.selectType == "pdf") {
// const fileLink = app.config.requestCtx + "/file/api/ApiDownload?md5=" + item.file;
-
// let filePath = wx.env.USER_DATA_PATH + '/' + item.name
// console.log(filePath, 'filePath');
// //鎻愮ず鍔犺浇涓�
@@ -232,13 +245,11 @@
// wx.downloadFile({
// url: fileLink,
// success: function (res) {
-
// if (res.statusCode != 200) {
// util.hideLoadingWithErrorTips();
// return false;
// }
// var Path = res.tempFilePath; //杩斿洖鐨勬枃浠朵复鏃跺湴鍧�锛岀敤浜庡悗闈㈡墦寮�鏈湴棰勮鎵�鐢�
-
// wx.saveFile({
// tempFilePath: Path,
// success: function (res) {
@@ -271,11 +282,7 @@
// },
// });
// }
-
-
-
-
-
+>>>>>>> Stashed changes
if (item.selectType == "webpage") {
this.setData({
webpageSrc: item.jsek_link,
@@ -600,7 +607,6 @@
item.isShopCar = false
this.triggerEvent("updateCloudLearning")
}
-
}
},
sadd() {
--
Gitblit v1.9.1