From 103db27cd0ca6b3305e95170dc297380f97fcc70 Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期四, 25 四月 2024 17:05:47 +0800
Subject: [PATCH] bug3

---
 pages/bibliographyList/index.js |  115 +++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 79 insertions(+), 36 deletions(-)

diff --git a/pages/bibliographyList/index.js b/pages/bibliographyList/index.js
index 27743d5..2432d98 100644
--- a/pages/bibliographyList/index.js
+++ b/pages/bibliographyList/index.js
@@ -1,4 +1,5 @@
 // pages/bibliographyList/index.js
+import Toast from 'tdesign-miniprogram/toast/index';
 const app = getApp()
 const config =
   Page({
@@ -27,6 +28,8 @@
       keyword: '',
       Md5: '',
       emailError: false,
+      loading: true, //寮�鍚鏋跺睆鍔犺浇
+      hidden: true, //鏄惁灞曠ず鍐呭
     },
 
     /**
@@ -174,8 +177,13 @@
           higherTotal: res.total
         })
         console.log(this.data.higherList, '5555');
+        this.setData({
+          loading: false, //寮�鍚鏋跺睆鍔犺浇
+          hidden: false, //鏄惁灞曠ず鍐呭
+        })
       })
       wx.stopPullDownRefresh()
+
 
     },
 
@@ -244,6 +252,8 @@
           fileType: [],
           jsek_resource: [],
           freeFile: [],
+          bookshelf_freeEpub: [], //epub璇曡鐧惧垎姣�
+          bookshelf_probationPage: [], //pdf璇曡椤垫暟
           ...searchObj
         },
         SysType: 'CmsItem'
@@ -258,44 +268,77 @@
       })
       wx.stopPullDownRefresh()
     },
+    // downloadData(event) {
+    //   this.setData({
+    //     downloadLoadin: true
+    //   })
+    //   console.log(111);
+    //   const item = event.currentTarget.dataset.item;
+    //   // console.log(item.datas.freeFile.Value);
+    //   const URL = app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.datas.freeFile.Value
+    //   item.determine = false
+    //   console.log(URL, 'URL');
+    //   setTimeout(() => {
+    //     if (URL) {
+    //       item.determine = true
+    //     }
+    //   }, 600)
+    //   wx.downloadFile({
+    //     url: URL,
+    //     success: function (res) {
+    //       const filePath = res.tempFilePath;
+    //       wx.openDocument({
+    //         filePath: filePath,
+    //         success: function (res) {
+    //           console.log('鎵撳紑鏂囨。鎴愬姛');
+    //         },
+    //         fail: function (res) {
+    //           console.log('鎵撳紑鏂囨。澶辫触', res);
+    //         }
+    //       });
+    //     },
+    //     fail: function (res) {
+    //       console.log('涓嬭浇鏂囦欢澶辫触', res);
+    //     }
+    //   });
+    //   setTimeout(() => {
+    //     this.setData({
+    //       downloadLoadin: false
+    //     });
+    //   }, 2000);
+    // },
     downloadData(event) {
-      this.setData({
-        downloadLoadin: true
-      })
-      console.log(111);
-      const item = event.currentTarget.dataset.item;
-      // console.log(item.datas.freeFile.Value);
-      const URL = app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.datas.freeFile.Value
-      item.determine = false
-      console.log(URL, 'URL');
-      setTimeout(() => {
-        if (URL) {
-          item.determine = true
-        }
-      }, 600)
-      wx.downloadFile({
-        url: URL,
-        success: function (res) {
-          const filePath = res.tempFilePath;
-          wx.openDocument({
-            filePath: filePath,
-            success: function (res) {
-              console.log('鎵撳紑鏂囨。鎴愬姛');
-            },
-            fail: function (res) {
-              console.log('鎵撳紑鏂囨。澶辫触', res);
-            }
-          });
-        },
-        fail: function (res) {
-          console.log('涓嬭浇鏂囦欢澶辫触', res);
-        }
-      });
-      setTimeout(() => {
-        this.setData({
-          downloadLoadin: false
+
+      const item = event.currentTarget.dataset.item
+      console.log(item);
+      if (item.fileType == "pdf") {
+        wx.navigateTo({
+          url: "/packageBookService/pages/components/webView/index?md5=" +
+            item.freeFile +
+            "&fileName=" +
+            item.name +
+            "&fileType=" +
+            item.fileType + "&bookBuy=true"
+          // "&freePage=" +
+          // this.data.fileInfo.freePage +
+
+          // +
+          // "&bookId=" +
+          // this.data.bookDetail.id,
         });
-      }, 2000);
+      } else {
+        Toast({
+          context: this,
+          selector: '#t-toast',
+          message: '姝や功涓嶈兘鏌ョ湅',
+          theme: 'warning',
+          direction: 'column',
+        });
+        console.log(456);
+      }
+
+
+
     },
     onSearchSubmit: function (e) {
       const keyword = e.detail.value;

--
Gitblit v1.9.1