From ea9ddc003f6eb0f37933deb947cba980384961df Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Tue, 25 Aug 2026 10:59:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       | 49 +++++++++++++++++--
 api/user.js                                   |  8 +++
 pages.json                                    |  2 +-
 pages/home/home.vue                           | 20 +++++---
 pages/login/login.vue                         |  6 +--
 pages/search/search.vue                       |  2 +-
 .../pages/activity-detail/activity-detail.vue |  3 --
 .../pages/activity-record/activity-record.vue |  3 --
 subpkg/pages/book-detail/book-detail.vue      |  7 +--
 subpkg/pages/feedback-list/feedback-list.vue  |  1 -
 subpkg/pages/register/register-form.vue       |  3 +-
 subpkg/pages/register/register.vue            |  5 +-
 subpkg/pages/seat-booking/seat-booking.vue    |  1 -
 utils/bookCover.js                            |  3 +-
 utils/global.js                               | 18 +++++++
 15 files changed, 101 insertions(+), 30 deletions(-)

diff --git a/App.vue b/App.vue
index 853d000..c4914c1 100644
--- a/App.vue
+++ b/App.vue
@@ -1,10 +1,11 @@
 <script>
-import { FetchLibcodeBycode } from '@/api/user'
+import { FetchLibcodeBycode,FetchInitFondsList } from '@/api/user'
 
 export default {
   globalData: {
     appid: '',
-    libcode: '', // 全局libcode，所有页面 getApp().globalData.libcode 访问
+    libcode: '', // 全局libcode
+    fondsName: '' // 新增：馆藏名称，全局使用
   },
   onLaunch() {
     this.initAppIdAndLibcode()
@@ -24,18 +25,25 @@ export default {
         if(cacheLibcode){
           this.globalData.libcode = cacheLibcode
           console.log('使用缓存libcode：', cacheLibcode)
+          // ✅ 缓存有libcode，直接去拿 fondsName
+          await this.getFondsName(cacheLibcode)
           return
         }
+
         // 2、调用接口 FetchLibcodeBycode，传入appid获取libcode
         const res = await FetchLibcodeBycode({ 
           code: 'vx_mini_appId',
           value: appid
-         })
+        })
         if(res.code === 200 && res.data){
           const libcode = res.data
           this.globalData.libcode = libcode
           uni.setStorageSync('GLOBAL_LIBCODE', libcode)
           console.log('接口获取全局libcode成功：', libcode)
+
+          // ✅拿到libcode之后，调用FetchInitFondsList获取馆藏名称
+          await this.getFondsName(libcode)
+
         }else{
           console.error('FetchLibcodeBycode 获取libcode失败', res)
         }
@@ -44,6 +52,36 @@ export default {
       }
       // #endif
     },
+    /**
+     * 根据libcode获取馆藏名称 fondsName
+     */
+    async getFondsName(libcode) {
+      try {
+        // 优先读缓存
+        let cacheFondsName = uni.getStorageSync('GLOBAL_FONDS_NAME')
+        if (cacheFondsName) {
+          this.globalData.fondsName = cacheFondsName
+          console.log('使用缓存 fondsName：', cacheFondsName)
+          return
+        }
+        // 调用接口，传入libcode
+        const fondRes = await FetchInitFondsList({ 
+          'fondsNo': libcode
+        })
+        // console.log('FetchInitFondsList返回结果', fondRes)
+        if (fondRes.code === 200 && fondRes.data) {
+          const fondsName = fondRes.data.fondsName || ''
+          this.globalData.fondsName = fondsName
+          uni.setStorageSync('GLOBAL_FONDS_NAME', fondsName)
+          console.log('获取馆藏名称成功：', fondsName)
+        } else {
+          console.error('FetchInitFondsList 获取馆藏失败', fondRes)
+        }
+      } catch (err) {
+        console.error('getFondsName异常', err)
+      }
+    },
+
     // 退出登录  待用
     // logout(){
     //   // 1. 清除登录缓存
@@ -53,15 +91,20 @@ export default {
 
     //   // 2.清除libcode缓存，强制重新拉取
     //   uni.removeStorageSync('GLOBAL_LIBCODE')
+    //   uni.removeStorageSync('GLOBAL_FONDS_NAME') // 也要清空馆藏缓存
     //   getApp().globalData.libcode = ''
+    //   getApp().globalData.fondsName = ''
 
     //   // 跳转登录页
     //   uni.reLaunch({url:'/pages/login/login'})
     // }
+
     // 刷新libcode 待用
     // refreshLibcode(){
     //   uni.removeStorageSync('GLOBAL_LIBCODE')
+    //   uni.removeStorageSync('GLOBAL_FONDS_NAME') // 清空馆藏
     //   getApp().globalData.libcode = ''
+    //   getApp().globalData.fondsName = ''
     //   uni.showToast({title:"已重置libcode，将重新获取",icon:"none"})
     //   // 重新执行App.vue里面的初始化方法
     //   getApp().$options.methods.initAppIdAndLibcode()
diff --git a/api/user.js b/api/user.js
index adbd0eb..aeab131 100644
--- a/api/user.js
+++ b/api/user.js
@@ -191,3 +191,11 @@ export function FetchLibcodeBycode(data) {
     data
   });
 }
+
+// 根据馆代码拿fondName
+export function FetchInitFondsList(data) {
+  return request({
+    url: '/api/fonds/getFondsDetailByFondsNo',
+    data
+  });
+}
diff --git a/pages.json b/pages.json
index bece2db..a4f664b 100644
--- a/pages.json
+++ b/pages.json
@@ -3,7 +3,7 @@
     {
       "path": "pages/home/home",
       "style": {
-        "navigationBarTitleText": "葛店经济技术开发区图书馆"
+        "navigationBarTitleText": ""
       }
     },
     {
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 4ab22d5..54e256a 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -5,13 +5,11 @@
       <image class="top-bar-bg" src="@/static/images/mingqi-beij@2x.png" mode="aspectFill"></image>
       <view class="library-info">
         <image class="avatar" :src="libraryLogo" mode="aspectFill"></image>
-        <view class="library-name">葛店经济技术开发区图书馆</view>
+        <view class="library-name">{{ fondsName }}</view>
       </view>
       <uni-icons class="search-icon" type="search" size="24" @click="onToSearch"></uni-icons>
     </view>
 
-
-
     <view class="status-cards">
       <view class="status-card" @click="toBorrowPage(0)">
         <view class="status-icon icon-color1" >
@@ -237,11 +235,12 @@ import { FetchInitScreenSetting, FetchOpenId, FetchFindAllReaderBindByOpenId} fr
 import { FetchInitScreenBookRecommend } from '@/api/book';
 import config from '@/utils/config';
 import { STORAGE_KEYS } from '@/utils/storage';
-import { waitLibcodeReady } from '@/utils/global'
+import { waitLibcodeReady,waitFondsNameReady } from '@/utils/global'
 
 export default {
   data() {
     return {
+      fondsName: getApp().globalData.fondsName || '',
       isLoading: true,
       recommendedBooks: [],
       userInfo: {},
@@ -255,9 +254,19 @@ export default {
       bannerList: [] // 新增 banner轮播数组
     };
   },
-  onLoad() {
+  async onLoad() {
     // this.getRecommendBooks();
     // this.getScreenSetting()
+    const fondsName = await waitFondsNameReady()
+    if(fondsName){
+      uni.setNavigationBarTitle({
+        title: fondsName
+      })
+    }else{
+      uni.setNavigationBarTitle({
+        title: "图书馆"
+      })
+    }
     this.initPage()
   },
   onShow() {
@@ -420,7 +429,6 @@ export default {
           if (item.imgVxPath) {
             // const imageUrl = this.baseUrl + '/api/fileRelevant/getImg?imgType=2&imgId=' + item.imgPath;
             const imageUrl = this.baseUrl + '/files/' + item.imgVxPath;
-            console.log('imageUrl:', imageUrl);
             item.base64Cover = imageUrl;
             // try {
             //   const base64 = await this.urlToBase64(imageUrl);
diff --git a/pages/login/login.vue b/pages/login/login.vue
index d12fec5..9565d49 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -4,7 +4,7 @@
       <image class="top-bar-bg" src="@/static/images/mingqi-beij@2x.png" mode="aspectFill"></image>
       <view class="library-info">
         <image class="avatar" :src="libraryLogo" mode="aspectFill"></image>
-        <view class="library-name">葛店经济技术开发区图书馆</view>
+        <view class="library-name">{{ fondsName }}</view>
       </view>
     </view>
 
@@ -57,6 +57,7 @@ import { STORAGE_KEYS } from '@/utils/storage';
 export default {
   data() {
     return {
+      fondsName: getApp().globalData.fondsName || '',
       queryvalue: '',
       rdpasswd: '',
       libraryLogo: null,  
@@ -215,10 +216,9 @@ export default {
           }
           // 调用绑定接口
           const bindRes = await FetchBindReadCard(bindParams);
-          // console.log('绑定结果', bindRes);
+          console.log('绑定结果', bindRes);
           
           if(bindRes.code === 200 ){
-            
             uni.hideLoading();
             uni.showToast({ 
               title: bindRes.data || '读者证绑定成功', 
diff --git a/pages/search/search.vue b/pages/search/search.vue
index 80d3f89..e5545a0 100644
--- a/pages/search/search.vue
+++ b/pages/search/search.vue
@@ -266,7 +266,7 @@ export default {
         ...item,
         id: collectId  // 添加收藏记录的 id
       };
-      console.log('itemWithCollectInfo',itemWithCollectInfo)
+      // console.log('itemWithCollectInfo',itemWithCollectInfo)
       const isCollectedParam = isCollected ? '&isCollected=true' : '';
       uni.navigateTo({
         url: "/subpkg/pages/book-detail/book-detail?searchData=" + encodeURIComponent(JSON.stringify(itemWithCollectInfo)) + isCollectedParam
diff --git a/subpkg/pages/activity-detail/activity-detail.vue b/subpkg/pages/activity-detail/activity-detail.vue
index e0b7cdb..c3f72d8 100644
--- a/subpkg/pages/activity-detail/activity-detail.vue
+++ b/subpkg/pages/activity-detail/activity-detail.vue
@@ -116,7 +116,6 @@ export default {
 		};
 	},
 	onLoad(options) {
-    console.log(options);
 		const item = JSON.parse(decodeURIComponent(options.item));
 		this.detail = item;
     console.log('this.detail',this.detail);
@@ -181,7 +180,6 @@ export default {
       try {
         uni.login({
           success: async (loginRes) => {
-            console.log('loginRes',loginRes)
             if (loginRes.code) {
               const res = await FetchSessionKey({
                 libcode: getApp().globalData.libcode,
@@ -319,7 +317,6 @@ export default {
         openid: this.openid,
         // sessionKey: this.sessionKey
       }
-      console.log('params',params)
       FetchSignActivity(params).then(res => {
         console.log('FetchSignActivity',res)
         if (res.code === 200) {
diff --git a/subpkg/pages/activity-record/activity-record.vue b/subpkg/pages/activity-record/activity-record.vue
index 932a29c..efd7eaf 100644
--- a/subpkg/pages/activity-record/activity-record.vue
+++ b/subpkg/pages/activity-record/activity-record.vue
@@ -191,7 +191,6 @@ export default {
 			return new Promise((resolve) => {
 				uni.login({
 					success: async (loginRes) => {
-						console.log('loginRes', loginRes)
 						if (loginRes.code) {
 							const res = await FetchSessionKey({
 								libcode: getApp().globalData.libcode,
@@ -238,7 +237,6 @@ export default {
 
       try {
         const res = await FetchMySignActivityInfo(params);
-        console.log('FetchMySignActivityInfo返回结果', res)
         if (res.code === 200) {
           const pageData = res.data;
           const list = pageData.content || [];
@@ -331,7 +329,6 @@ export default {
       })
     },
 		toActivityDetail(item) {
-      console.log('toActivityDetail',item);
 			uni.navigateTo({
 				url: "/subpkg/pages/activity-detail/activity-detail?item=" + encodeURIComponent(JSON.stringify(item))
 			});
diff --git a/subpkg/pages/book-detail/book-detail.vue b/subpkg/pages/book-detail/book-detail.vue
index c8ea734..a892b29 100644
--- a/subpkg/pages/book-detail/book-detail.vue
+++ b/subpkg/pages/book-detail/book-detail.vue
@@ -104,6 +104,7 @@ import { fetchBookCoverBase64 } from '@/utils/bookCover';
 export default {
   data() {
     return {
+      fondsName: getApp().globalData.fondsName || '',
       baseUrl: config.baseUrl,
       currentTab: 0,
       isCollected: false,
@@ -119,7 +120,7 @@ export default {
     };
   },
   onLoad(options) {
-    console.log('options',options)
+    // console.log('options',options)
     const fromShare = options.fromShare === 'true'
 
     // 1. 首页/推荐页 bookData
@@ -299,8 +300,8 @@ export default {
 
     // 获取所在馆名称
     getLibraryName(orglib) {
-      if (!orglib) return '葛店经济技术开发区图书馆';
-      return this.libraryMap[orglib] || orglib || '葛店经济技术开发区图书馆';
+      if (!orglib) return this.fondsName;
+      return this.libraryMap[orglib] || orglib || this.fondsName;
     },
 
     // 获取馆藏地名称
diff --git a/subpkg/pages/feedback-list/feedback-list.vue b/subpkg/pages/feedback-list/feedback-list.vue
index a5976e4..137d05d 100644
--- a/subpkg/pages/feedback-list/feedback-list.vue
+++ b/subpkg/pages/feedback-list/feedback-list.vue
@@ -90,7 +90,6 @@ export default {
       });
     },
     goDetail(item) {
-      console.log(item);
       uni.navigateTo({
         url: '/subpkg/pages/feedback-detail/feedback-detail?item=' + encodeURIComponent(JSON.stringify(item))
       });
diff --git a/subpkg/pages/register/register-form.vue b/subpkg/pages/register/register-form.vue
index 2d8fe7b..31aa952 100644
--- a/subpkg/pages/register/register-form.vue
+++ b/subpkg/pages/register/register-form.vue
@@ -5,7 +5,7 @@
       <image class="top-bar-bg" src="@/static/images/mingqi-beij@2x.png" mode="aspectFill"></image>
       <view class="library-info">
         <image class="avatar" :src="libraryLogo" mode="aspectFill"></image>
-        <view class="library-name">葛店经济技术开发区图书馆</view>
+        <view class="library-name">{{ fondsName }}</view>
         <view class="sub-title">读者证办理</view>
       </view>
     </view>
@@ -123,6 +123,7 @@ import {FetchInitScreenSetting, FetchSessionKey, FetchDecryptPhone } from '@/api
 export default {
   data() {
     return {
+      fondsName: getApp().globalData.fondsName || '',
       sessionKey: '',
       openid: '',
       formData: {
diff --git a/subpkg/pages/register/register.vue b/subpkg/pages/register/register.vue
index 32e3298..e130b64 100644
--- a/subpkg/pages/register/register.vue
+++ b/subpkg/pages/register/register.vue
@@ -5,7 +5,7 @@
       <image class="top-bar-bg" src="@/static/images/mingqi-beij@2x.png" mode="aspectFill"></image>
       <view class="library-info">
          <image class="avatar" :src="libraryLogo" mode="aspectFill"></image>
-        <view class="library-name">葛店经济技术开发区图书馆</view>
+        <view class="library-name">{{ fondsName }}</view>
         <view class="sub-title">信用免押金办证流程</view>
       </view>
     </view>
@@ -20,7 +20,7 @@
           <image src="/subpkg/static/register/2.jpg" mode="widthFix" />
        </view>
        <view class="online-item">
-          <text>点击“切换”进入“葛店经济技术开发区图书馆”</text>
+          <text>点击“切换”进入“{{ fondsName }}”</text>
           <text>然后点击“暂无借阅证，点击注册”</text>
           <image src="/subpkg/static/register/3.jpg" mode="widthFix" />
        </view>
@@ -59,6 +59,7 @@ import config from '@/utils/config';
 export default {
   data() {
     return {
+      fondsName: getApp().globalData.fondsName || '',
       libraryLogo: null,  
     };
   },
diff --git a/subpkg/pages/seat-booking/seat-booking.vue b/subpkg/pages/seat-booking/seat-booking.vue
index 84a7321..5547a7a 100644
--- a/subpkg/pages/seat-booking/seat-booking.vue
+++ b/subpkg/pages/seat-booking/seat-booking.vue
@@ -208,7 +208,6 @@ export default {
           libcode: getApp().globalData.libcode,
           openId: openId
         })
-        console.log('初始化我的预约',res)
         if(res.code === 200 && res.data){
           // 闭馆
           this.tempCloseDateList = []
diff --git a/utils/bookCover.js b/utils/bookCover.js
index 24d37ed..5020dad 100644
--- a/utils/bookCover.js
+++ b/utils/bookCover.js
@@ -157,9 +157,8 @@ export async function fetchCoversByBookrecno(bookrecnoList) {
       method: 'POST',
       success: (res) => {
         const result = {};
-        console.log('bookrecnoList',res)
         const existsList = res.data || [];
-        console.log('existsList',existsList)
+        // console.log('existsList',existsList)
         existsList.forEach(bookrecno => {
           const timestamp = new Date().getTime();
           result[bookrecno] = `http://218.200.95.251:8081/opac/bscover/${bookrecno}?timestamp=${timestamp}`;
diff --git a/utils/global.js b/utils/global.js
index 2db5d17..34d4739 100644
--- a/utils/global.js
+++ b/utils/global.js
@@ -16,3 +16,21 @@ export function waitLibcodeReady(){
     },100)
   })
 }
+
+// 新增：等待馆藏名称 fondsName
+export function waitFondsNameReady(){
+  return new Promise((resolve)=>{
+    const app = getApp()
+    if(app.globalData.fondsName){
+      return resolve(app.globalData.fondsName)
+    }
+    let count = 0
+    const timer = setInterval(()=>{
+      count++
+      if(app.globalData.fondsName || count>30){
+        clearInterval(timer)
+        resolve(app.globalData.fondsName || '')
+      }
+    },100)
+  })
+}