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 | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 insertions(+), 1 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.js b/packageBookService/pages/bookServices/detail/components/tree/index.js
index 379c69a..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: "",
@@ -181,7 +184,7 @@
}
}
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');
@@ -226,10 +229,60 @@
},
});
}
+<<<<<<< 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');
+ // //鎻愮ず鍔犺浇涓�
+ // util.showLoading();
+ // // 鍗曟涓嬭浇鍏佽鐨勬渶澶ф枃浠朵负 200MB
+ // 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) {
+ // var savedFilePath = res.savedFilePath;
+ // // 灏嗘枃浠朵繚瀛樹负 item.name
+ // wx.saveFile({
+ // tempFilePath: savedFilePath,
+ // filePath: wx.env.USER_DATA_PATH + '/' + item.name,
+ // success: function (res) {
+ // wx.openDocument({
+ // filePath: res.savedFilePath,
+ // showMenu: true,
+ // success: function (res) {
+ // util.hideLoading();
+ // },
+ // });
+ // },
+ // fail: function (err) {
+ // util.hideLoadingWithErrorTips();
+ // }
+ // });
+ // },
+ // fail: function (err) {
+ // util.hideLoadingWithErrorTips();
+ // }
+ // });
+ // },
+ // fail: function (err) {
+ // util.hideLoadingWithErrorTips();
+ // },
+ // });
+ // }
+>>>>>>> Stashed changes
if (item.selectType == "webpage") {
this.setData({
webpageSrc: item.jsek_link,
--
Gitblit v1.9.1