From 5606f63d8f5ad78057ca15403689dff134a74fd7 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Thu, 14 May 2026 15:02:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=89=8B=E6=9C=BA=E5=8F=B7/?=
 =?UTF-8?q?=E5=B0=81=E9=9D=A2=E5=9B=BEbase64?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/user.js                                  | 15 ++++
 components/book-list-item/book-list-item.vue | 22 +++---
 pages/lendCar/lendCar.vue                    | 20 ++++-
 pages/register/register.vue                  | 82 +++++++++++---------
 pages/search/search.vue                      | 14 +++-
 subpkg/pages/book-detail/book-detail.vue     | 21 +++++
 subpkg/pages/collect-list/collect-list.vue   | 27 +------
 subpkg/pages/myLending/myLending.vue         | 41 ++++------
 subpkg/pages/ranking/ranking.vue             | 12 +++
 utils/bookCover.js                           | 61 +++++++++++++++
 10 files changed, 216 insertions(+), 99 deletions(-)

diff --git a/api/user.js b/api/user.js
index 1509892..f4ae969 100644
--- a/api/user.js
+++ b/api/user.js
@@ -139,3 +139,18 @@ export function FetchReaderMessage(data) {
     data
   });
 }
+
+export function FetchSessionKey(data) {
+  return request({
+    url: '/api/weixin/getSessionKey',
+    data
+  });
+}
+
+export function FetchDecryptPhone(data) {
+  return request({
+    url: '/api/weixin/decryptPhone',
+    method: 'POST',
+    data
+  });
+}
\ No newline at end of file
diff --git a/components/book-list-item/book-list-item.vue b/components/book-list-item/book-list-item.vue
index 5431d41..c62cbc8 100644
--- a/components/book-list-item/book-list-item.vue
+++ b/components/book-list-item/book-list-item.vue
@@ -29,22 +29,17 @@ export default {
   },
   computed: {
     actualCover() {
-      // 优先级：base64Cover > cover > imgCover
+      // 优先使用 cover
+      if (this.data.cover) {
+        return this.data.cover;
+      }
       
-      // base64Cover 是本地 base64 图片，直接使用，不需要检查
+      // 其次使用 base64Cover（兼容推荐页面）
       if (this.data.base64Cover) {
         return this.data.base64Cover;
       }
       
-      // cover 和 imgCover 需要检查有效性
-      const cover = this.data.cover || this.data.imgCover;
-      
-      // 如果有封面链接，检查是否是无效域名
-      if (cover && this.isValidCoverLink(cover)) {
-        return cover;
-      }
-      
-      // 返回默认图片
+      // 最后使用默认图片
       return '/static/images/default-book.png';
     }
   },
@@ -59,6 +54,11 @@ export default {
         return false;
       }
       
+      // 支持 base64 图片格式
+      if (coverlink.indexOf('data:image/') === 0) {
+        return true;
+      }
+      
       // 检查是否包含 http
       if (coverlink.indexOf('http') === -1) {
         return false;
diff --git a/pages/lendCar/lendCar.vue b/pages/lendCar/lendCar.vue
index cad1d93..21e9b0e 100644
--- a/pages/lendCar/lendCar.vue
+++ b/pages/lendCar/lendCar.vue
@@ -65,6 +65,7 @@ import { FetchInitScreenSetting } from '@/api/user';
 import { FetchRdloanlist, FetchRenewbook } from '@/api/book';
 import { getCurrentReaderCard } from '@/utils/storage';
 import config from '@/utils/config';
+import { loadBookCoversBase64 } from '@/utils/bookCover';
 
 export default {
   data() {
@@ -190,13 +191,15 @@ export default {
         const res = await FetchRdloanlist(params);
         const result = typeof res.data === 'string' ? JSON.parse(res.data) : res.data;
 
-        // 添加选中状态和封面处理
+        // 添加选中状态
         this.bookList = (result.loanlist || []).map(item => ({
           ...item,
-          checked: false,
-          cover: this.getBookCover(item)
+          checked: false
         }));
 
+        // 加载封面
+        await this.loadCoversForList();
+
       } catch (err) {
         console.error('获取借阅列表失败：', err);
         uni.showToast({ title: '加载失败', icon: 'none' });
@@ -220,6 +223,17 @@ export default {
       }
       return null;
     },
+    
+    /**
+     * 加载封面
+     */
+    async loadCoversForList() {
+      await loadBookCoversBase64(this.bookList, (index, coverUrl) => {
+        if (this.bookList[index]) {
+          this.$set(this.bookList[index], 'cover', coverUrl);
+        }
+      });
+    },
 
     /**
      * 判断是否逾期
diff --git a/pages/register/register.vue b/pages/register/register.vue
index 1286f07..db07c34 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -106,10 +106,13 @@
 <script>
 import config from '@/utils/config';
 import { getOpenId } from '@/utils/storage';
+import { FetchSessionKey, FetchDecryptPhone } from '@/api/user.js';
 
 export default {
   data() {
     return {
+      sessionKey: '',
+      openid: '',
       formData: {
         name: '',
         idCard: '',
@@ -123,43 +126,59 @@ export default {
     };
   },
 
-  onLoad() {},
+  onLoad() {
+    this.getSessionKey();
+  },
 
   methods: {
+    async getSessionKey() {
+      try {
+        uni.login({
+          success: async (loginRes) => {
+            console.log('loginRes',loginRes)
+            if (loginRes.code) {
+              const res = await FetchSessionKey({
+                libcode: config.LIB_CODE,
+                code: loginRes.code
+              });
+              if (res.code === 200) {
+                this.sessionKey = res.data.session_key;
+                this.openid = res.data.openid;
+              }
+            }
+          }
+        });
+      } catch (error) {
+        console.error('获取sessionKey失败:', error);
+      }
+    },
+
     getPhoneNumber(e) {
       if (e.detail.errMsg !== 'getPhoneNumber:ok') {
         uni.showToast({ title: '取消授权', icon: 'none' });
         return;
       }
-      // #ifdef MP-WEIXIN
-      uni.login({
-        success: (loginRes) => {
-          uni.request({
-            url: config.baseUrl + '/api/wx/decryptPhone',
-            method: 'POST',
-            data: {
-              code: loginRes.code,
-              encryptedData: e.detail.encryptedData,
-              iv: e.detail.iv
-            },
-            success: (res) => {
-              if (res.data?.code === 200) {
-                this.formData.phone = res.data.data.phoneNumber || '';
-              } else {
-                uni.showToast({ title: res.data?.message || '获取失败', icon: 'none' });
-              }
-            },
-            fail: () => uni.showToast({ title: '获取手机号失败', icon: 'none' })
-          });
-        },
-        fail: () => uni.showToast({ title: '登录失败', icon: 'none' })
+      
+      if (!this.sessionKey) {
+        uni.showToast({ title: '请稍后再试', icon: 'none' });
+        return;
+      }
+
+      FetchDecryptPhone({
+        sessionKey: this.sessionKey,
+        encryptedData: e.detail.encryptedData,
+        iv: e.detail.iv
+      }).then(res => {
+        if (res.code === 200) {
+          this.formData.phone = res.data.phoneNumber || '';
+          uni.showToast({ title: '获取成功', icon: 'success' });
+        } else {
+          uni.showToast({ title: res.message || '获取失败', icon: 'none' });
+        }
+      }).catch(() => {
+        uni.showToast({ title: '获取手机号失败', icon: 'none' });
       });
-      // #endif
-      // #ifndef MP-WEIXIN
-      uni.showToast({ title: '仅支持微信小程序', icon: 'none' });
-      // #endif
     },
-
     togglePwd() {
       this.showPwd = !this.showPwd;
     },
@@ -170,26 +189,20 @@ export default {
     // 身份证验证（支持15位和18位，自动去除空格和连字符）
     validateIdCard(idCard) {
       if (!idCard) return false;
-      
       // 去除空格和连字符
       idCard = idCard.replace(/[\s-]/g, '');
-      
       // 15位身份证格式验证
       const idCard15Reg = /^[1-9]\d{5}\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}$/;
-      
       // 18位身份证格式验证
       const idCard18Reg = /^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}[\dXx]$/;
-      
       // 15位身份证直接验证格式
       if (idCard.length === 15) {
         return idCard15Reg.test(idCard);
       }
-      
       // 18位身份证需要验证格式、日期和校验码
       if (idCard.length !== 18 || !idCard18Reg.test(idCard)) {
         return false;
       }
-      
       // 验证日期有效性（宽松模式：跳过校验码验证）
       const year = +idCard.substring(6, 10);
       const month = +idCard.substring(10, 12);
@@ -197,7 +210,6 @@ export default {
       const date = new Date(year, month - 1, day);
       return date.getFullYear() === year && date.getMonth() === month - 1 && date.getDate() === day;
     },
-
     // 手机号验证
     validatePhone(phone) {
       return /^1[3-9]\d{9}$/.test(phone);
diff --git a/pages/search/search.vue b/pages/search/search.vue
index 1657380..26332b1 100644
--- a/pages/search/search.vue
+++ b/pages/search/search.vue
@@ -81,6 +81,7 @@ import { FetchBookSearch, FetchFindAllBookCollectionByOpenId } from '@/api/book'
 import BookListItem from "@/components/book-list-item/book-list-item.vue";
 import config from '@/utils/config';
 import { getOpenId } from '@/utils/storage';
+import { loadBookCoversBase64 } from '@/utils/bookCover';
 
 export default {
 	components: { BookListItem },
@@ -195,7 +196,9 @@ export default {
         }
 
         this.isSearched = true;
-        console.log('this.listData',this.listData)
+        
+        // 加载封面
+        this.loadCoversForList();
       } catch (err) {
         console.error('搜索接口异常', err);
         this.listData = [];
@@ -217,6 +220,15 @@ export default {
 			this.listData = [];
 			this.getBookList();
 		},
+		
+		// 加载封面
+		async loadCoversForList() {
+			await loadBookCoversBase64(this.listData, (index, coverUrl) => {
+				if (this.listData[index]) {
+					this.$set(this.listData[index], 'cover', coverUrl);
+				}
+			});
+		},
 
 		// 进入详情
 		async onItemClick(item) {
diff --git a/subpkg/pages/book-detail/book-detail.vue b/subpkg/pages/book-detail/book-detail.vue
index 1040d98..de57ec6 100644
--- a/subpkg/pages/book-detail/book-detail.vue
+++ b/subpkg/pages/book-detail/book-detail.vue
@@ -99,6 +99,7 @@ import { FetchInitScreenSetting } from '@/api/user';
 import { FetchFindbookByQuery, FetchDictionaryTree,FetchCollectionBook,FetchCancelCollectionBook } from '@/api/book';
 import { getOpenId } from '@/utils/storage';
 import config from '@/utils/config';
+import { fetchBookCoverBase64 } from '@/utils/bookCover';
 
 export default {
   data() {
@@ -134,6 +135,8 @@ export default {
       const bookData = JSON.parse(decodeURIComponent(options.searchData));
       this.searchListInfo = bookData;
       this.bookrecno = bookData.bookrecno || "";
+      this.bookInfo = bookData;
+      
     }
     
     // 3. 如果从收藏列表进入，直接设置为已收藏状态
@@ -165,6 +168,20 @@ export default {
     onImgError(e) {
       e.target.src = "/static/images/default-book.png";
     },
+    // 加载图书封面
+    async loadBookCover() {
+      console.log('this.bookInfo',this.bookInfo)
+      if (!this.bookInfo.isbn) return;
+      
+      try {
+        const coverUrl = await fetchBookCoverBase64(this.bookInfo.isbn);
+        if (coverUrl) {
+          this.$set(this.bookInfo, 'cover', coverUrl);
+        }
+      } catch (error) {
+        console.error('获取封面失败:', error);
+      }
+    },
     // 获取字典项 - 馆代码
     async getDictionaryTree() {
       try {
@@ -224,7 +241,11 @@ export default {
         // console.log('bookrecno-bookInfo详情',this.bookInfo);
         this.holdingsData = apiData.holdings || [];
         // console.log('bookrecno-holdingsData详情',this.holdingsData);
+        
+        // 加载封面
+        await this.loadBookCover();
 
+        // 检查收藏状态
         this.checkCollectStatus();
       } catch (err) {
         console.error(err);
diff --git a/subpkg/pages/collect-list/collect-list.vue b/subpkg/pages/collect-list/collect-list.vue
index 5748069..2fad6d9 100644
--- a/subpkg/pages/collect-list/collect-list.vue
+++ b/subpkg/pages/collect-list/collect-list.vue
@@ -28,7 +28,7 @@ import BookListItem from "@/components/book-list-item/book-list-item.vue";
 import { FetchFindAllBookCollectionByOpenId } from '@/api/book';
 import { getOpenId } from '@/utils/storage';
 import config from '@/utils/config';
-import { loadBookCovers } from '@/utils/bookCover';
+import { loadBookCoversBase64 } from '@/utils/bookCover';
 
 export default {
 	components: {
@@ -46,7 +46,6 @@ export default {
 	},
 
 	onLoad() {
-		// this.loadData();
 	},
 	onShow() {
 		// 检查是否需要刷新（从图书详情取消收藏回来）
@@ -69,19 +68,6 @@ export default {
 		this.loadMore();
 	},
 	methods: {
-    // getTest(){
-    //   //   34352,36153
-    //    wx.request({
-    //     url: `http://218.200.95.251:8081/opac/getExistsBookrecnoList/41534`,
-    //     method: 'POST',
-    //     success: (res) => {
-    //       console.log(res.data || []);
-    //     },
-    //     fail: () => {
-    //       resolve([]);
-    //     }
-    //   });
-    // },
 		async loadData() {
 			this.isLoading = true;
 			try {
@@ -150,10 +136,7 @@ export default {
 					page: this.pageNum,
 					size: this.pageSize,
 				});
-        console.log('res',res)
-        console.log('res.data',res.data)
-        console.log('res.data.content',res.data.content)
-
+        
 				if (res.code === 200) {
 					const newData = res.data.content || [];
 					this.bookCollectList = [...this.bookCollectList, ...newData];
@@ -176,17 +159,13 @@ export default {
 			}
 		},
 		async loadCoversForList() {
-			await loadBookCovers(this.bookCollectList, (index, coverUrl) => {
-				console.log('index', index);
-				console.log('coverUrl', coverUrl);
+			await loadBookCoversBase64(this.bookCollectList, (index, coverUrl) => {
 				if (this.bookCollectList[index]) {
-					// 使用 Vue.set 确保响应式更新
 					this.$set(this.bookCollectList[index], 'cover', coverUrl);
 				}
 			});
 		},
 		onItemClick(item) {
-      console.log('item',item)
       uni.navigateTo({
         url: "/subpkg/pages/book-detail/book-detail?searchData=" + encodeURIComponent(JSON.stringify(item)) + '&isCollected=true'
       })
diff --git a/subpkg/pages/myLending/myLending.vue b/subpkg/pages/myLending/myLending.vue
index c5fc06f..815b587 100644
--- a/subpkg/pages/myLending/myLending.vue
+++ b/subpkg/pages/myLending/myLending.vue
@@ -72,6 +72,7 @@ import myTabs from "@/components/my-tabs/my-tabs.vue";
 import lendingListItem from "@/components/lending-list-item/lending-list-item.vue";
 import { getCurrentReaderCard } from '@/utils/storage';
 import config from '@/utils/config';
+import { loadBookCoversBase64 } from '@/utils/bookCover';
 
 export default {
   components: { myTabs, lendingListItem },
@@ -129,25 +130,6 @@ export default {
   },
 
   methods: {
-    // 获取封面（你要的格式）
-    async getBookListWithCovers(bookList) {
-      const bookWithCovers = await Promise.all(
-        bookList.map(async (item) => {
-          if (!item.isbn) return { ...item, cover: '' };
-          
-          const isbn = item.isbn.replace(/\-/g, '').trim();
-          try {
-            const coverRes = await FetchCoverByISBN({ isbn });
-            return { ...item, cover: coverRes || '' };
-          } catch (e) {
-            console.error(`获取ISBN:${isbn}封面失败`, e);
-            return { ...item, cover: '' };
-          }
-        })
-      );
-      return bookWithCovers;
-    },
-
     async getScreenSetting() {
       try {
         const res = await FetchInitScreenSetting({ libcode: config.LIB_CODE });
@@ -191,10 +173,10 @@ export default {
         const result = typeof res.data === 'string' ? JSON.parse(res.data) : res.data;
         let list = result.hloanlist || [];
 
-        // 插入封面
-        // list = await this.getBookListWithCovers(list);
-
         this.allList = [...this.allList, ...list];
+        
+        // 加载封面
+        await this.loadCoversForList(this.allList);
         this.hasMoreAll = list.length === 10;
         this.loadMoreStatusAll = this.hasMoreAll ? '' : 'no-more';
 
@@ -223,14 +205,14 @@ export default {
         const result = typeof res.data === 'string' ? JSON.parse(res.data) : res.data;
         let list = result.loanlist || [];
 
-        // 插入封面
-        // list = await this.getBookListWithCovers(list);
-
         this.lendingList = list.map(item => ({
           ...item,
           loantime: item.loandate || '',
           returntime: item.returndate || '',
         }));
+        
+        // 加载封面
+        await this.loadCoversForList(this.lendingList);
       } catch (err) {
       } finally {
         this.loadingLending = false;
@@ -241,6 +223,15 @@ export default {
       }
     },
 
+    // 加载封面
+    async loadCoversForList(list) {
+      await loadBookCoversBase64(list, (index, coverUrl) => {
+        if (list[index]) {
+          this.$set(list[index], 'cover', coverUrl);
+        }
+      });
+    },
+    
     // 高度自适应（修复版）
     calcHeight(type) {
       const selector = `.list-item-${type}`;
diff --git a/subpkg/pages/ranking/ranking.vue b/subpkg/pages/ranking/ranking.vue
index ee23d56..69ce3c8 100644
--- a/subpkg/pages/ranking/ranking.vue
+++ b/subpkg/pages/ranking/ranking.vue
@@ -79,6 +79,7 @@
 import { FetchInitScreenSetting } from '@/api/user';
 import { FetchBookRanking } from '@/api/book';
 import config from '@/utils/config';
+import { loadBookCoversBase64 } from '@/utils/bookCover';
 
 export default {
 	data() {
@@ -137,6 +138,8 @@ export default {
         if (resultJson.success && resultJson.resultlist.length > 0) {
           // 按借阅次数降序
           this.rankingData = resultJson.resultlist.sort((a, b) => b.TOTALNUM - a.TOTALNUM);
+          // 加载封面
+          this.loadCoversForList();
         } else {
           this.rankingData = [];
         }
@@ -146,6 +149,15 @@ export default {
         this.rankingData = [];
         this.loading = false;
       })
+    },
+    
+    // 加载封面
+    async loadCoversForList() {
+      await loadBookCoversBase64(this.rankingData, (index, coverUrl) => {
+        if (this.rankingData[index]) {
+          this.$set(this.rankingData[index], 'cover', coverUrl);
+        }
+      });
     }
   }
 }
diff --git a/utils/bookCover.js b/utils/bookCover.js
index 7b8c007..24d37ed 100644
--- a/utils/bookCover.js
+++ b/utils/bookCover.js
@@ -1,3 +1,5 @@
+import config from '@/utils/config.js'
+
 /**
  * 获取已加载的 bookrecno 缓存
  * @returns {Set} - 已加载的 bookrecno 集合
@@ -7,6 +9,65 @@ function getLoadedBookrecnos() {
   return new Set(loadedList);
 }
 
+/**
+ * 通过新接口获取单个图书封面（返回 base64）
+ * @param {string} isbn - ISBN 号码
+ * @returns {Promise<string|null>} - base64 图片字符串或 null
+ */
+export async function fetchBookCoverBase64(isbn) {
+  if (!isbn) {
+    return null;
+  }
+  
+  const cleanIsbn = isbn.replace(/-/g, '');
+  const url = `${config.baseUrl}/api/fileRelevant/getBookCoverByISBN?isbn=${cleanIsbn}`;
+  
+  return new Promise((resolve) => {
+    uni.request({
+      url: url,
+      method: 'GET',
+      success: (res) => {
+        const data = res.data;
+        if (data && data !== null && data !== '') {
+          // 返回完整的 data URL
+          resolve(`${data}`);
+        } else {
+          resolve(null);
+        }
+      },
+      fail: () => {
+        resolve(null);
+      }
+    });
+  });
+}
+
+/**
+ * 批量获取图书封面（返回 base64）
+ * @param {Array} bookList - 图书列表
+ * @param {Function} callback - 回调函数 (index, coverUrl)
+ * @returns {Promise<void>}
+ */
+export async function loadBookCoversBase64(bookList, callback) {
+  if (!bookList || bookList.length === 0 || typeof callback !== 'function') {
+    return;
+  }
+  
+  for (let i = 0; i < bookList.length; i++) {
+    const book = bookList[i];
+    if (!book.isbn && !book.ISBN) continue;
+    
+    try {
+      const coverUrl = await fetchBookCoverBase64(book.isbn || book.ISBN);
+      if (coverUrl) {
+        callback(i, coverUrl);
+      }
+    } catch (error) {
+      console.error('获取封面失败:', error);
+    }
+  }
+}
+
 /**
  * 标记 bookrecno 已加载
  * @param {Array} bookrecnoList - 已加载的 bookrecno 列表