From 4496721cd3af3c68ed4d55218d3e83ea0664c57e Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期一, 29 四月 2024 17:53:10 +0800
Subject: [PATCH] bug3

---
 packageBookService/pages/bookServices/detail/components/tree/index.js |  101 ++++++++++++++++++++++++--------------------------
 1 files changed, 48 insertions(+), 53 deletions(-)

diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.js b/packageBookService/pages/bookServices/detail/components/tree/index.js
index c6d26b1..b15157c 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -61,7 +61,8 @@
     selectAll: [],
     shoppingCart: true,
     stop: false,
-    cart: true
+    cart: true,
+    canExecute: true
   },
   ready() {},
 
@@ -134,13 +135,25 @@
     // 璺宠浆闊宠棰戞挱鏀惧櫒
     goPlayer(e) {
       // 妫�鏌ョ櫥褰曠姸鎬�
+
+
+
+
       const token = wx.getStorageSync(app.config.tokenKey);
       if (token) {
+
+
+
+
+
         const item = e.currentTarget.dataset.item;
         const parent = e.currentTarget.dataset.parent;
         const parentProductLinkPath = parent ? parent.productLinkPath : wx.getStorageSync('teachResourcesPath')
         const parentName = parent ? parent.name : '鏁欏璧勬簮'
         let url;
+
+
+
         if (this.properties.isShowCheck && this.resourceIsBuy(item)) {
           return false;
         }
@@ -187,8 +200,26 @@
           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") {
+
+        // || item.selectType == "pdf"
+
+
+
+        if (item.selectType == "pdf") {
+          console.log(item, '79825');
+          const fileLink = item.file ? item.file : item.freeFile
+          console.log(fileLink);
+          wx.navigateTo({
+            url: "/packageBookService/pages/components/webView/index?md5=" +
+              fileLink +
+              "&fileName=" +
+              item.name +
+              "&fileType=" +
+              item.selectType + "&bookBuy=true"
+
+          });
+        }
+        if (item.selectType == "document") {
           // freeFile
 
           if (item.selectType == "document") {
@@ -228,67 +259,31 @@
               util.hideLoadingWithErrorTips();
             },
           });
+
+
+
+
         }
-<<<<<<< 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,
           });
           console.log(this.data.webpageSrc, "webpageSrc");
         }
+
+
+
+
+
+
+
+
+
+
       }
     },
 

--
Gitblit v1.9.1