合并代码

闫增涛

2024-04-29 558845242a07b68f42fa1802c45ab2769395d8b8

 packageBookService/pages/bookServices/detail/components/tree/index.js

@@ -48,6 +48,9 @@
    checkAllState: {
      type: Boolean,
    },
    deadline: {
      type: String
    }
  },
  data: {
    sonPurchaseSaleMethodId: "",
@@ -181,12 +184,18 @@
          }
        }
        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") {
          // 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");
@@ -195,6 +204,8 @@
          // 单次下载允许的最大文件为 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) {
@@ -202,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("打开成功");
@@ -217,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');
        //   //提示加载中
@@ -251,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) {
@@ -290,11 +282,7 @@
        //     },
        //   });
        // }





>>>>>>> Stashed changes
        if (item.selectType == "webpage") {
          this.setData({
            webpageSrc: item.jsek_link,