From 6d02ede2ec0389544df0da423e1fd0ab75d0f981 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Sat, 9 May 2026 16:07:27 +0800
Subject: [PATCH] 0509

---
 api/book.js                                   |  72 ++-
 components/book-list-item/book-list-item.vue  |   8 +-
 .../lending-list-item/lending-list-item.vue   | 111 +++-
 pages.json                                    |   6 -
 pages/home/home.vue                           |  35 +-
 pages/lendCar/lendCar copy.vue                | 273 +++++++++
 pages/lendCar/lendCar.vue                     | 293 +++++-----
 pages/search/search.vue                       | 279 +++++----
 pages/user/user.vue                           |   1 -
 static/iconfont.css                           |   4 +
 static/iconfont.ttf                           | Bin 15796 -> 17172 bytes
 static/images/default-book.png                | Bin 0 -> 8327 bytes
 .../activity-list/activity-list copy.vue      | 157 +++++
 subpkg/pages/activity-list/activity-list.vue  | 125 ++--
 subpkg/pages/book-detail/book-detail.vue      | 204 ++++---
 subpkg/pages/book-list/book-list.vue          |   8 +-
 subpkg/pages/feedback-list/feedback-list.vue  |  76 +--
 subpkg/pages/myLending/myLending copy.vue     | 335 +++++++++++
 subpkg/pages/myLending/myLending.vue          | 538 +++++++-----------
 subpkg/pages/ranking/ranking.vue              | 217 ++++---
 subpkg/pages/unbind-card/unbind-card.vue      | 189 ------
 21 files changed, 1834 insertions(+), 1097 deletions(-)
 create mode 100644 pages/lendCar/lendCar copy.vue
 create mode 100644 static/images/default-book.png
 create mode 100644 subpkg/pages/activity-list/activity-list copy.vue
 create mode 100644 subpkg/pages/myLending/myLending copy.vue
 delete mode 100644 subpkg/pages/unbind-card/unbind-card.vue

diff --git a/api/book.js b/api/book.js
index a6e5b65..5dd8a87 100644
--- a/api/book.js
+++ b/api/book.js
@@ -1,6 +1,7 @@
 import request from '../utils/request';
 
 // 查询读者当前借阅（群）
+// http://192.168.99.63:14000/api/screenSetting/rdloanlist?rdid=420703GD0000748&sm4Key=86ACEF6CE6A65A4A&thirdAppid=feitian_gdlib&thirdSecret=edi56b6p5hi69dwk03so86uv2olhszqp&thirdUrl=http://218.200.95.251:8088/openlib
 export function FetchRdloanlist(data) {
   return request({
     url: '/api/screenSetting/rdloanlist',
@@ -8,6 +9,25 @@ export function FetchRdloanlist(data) {
   })
 }
 
+// 查询读者历史借阅
+// http://192.168.99.63:14000/api/screenSetting/historyloan?rdid=420703GD0000748&sm4Key=86ACEF6CE6A65A4A&thirdAppid=feitian_gdlib&thirdSecret=edi56b6p5hi69dwk03so86uv2olhszqp&thirdUrl=http://218.200.95.251:8088/openlib
+export function FetchHistoryloan(data) {
+  return request({
+    url: '/api/screenSetting/historyloan',
+    data
+  })
+}
+
+
+// 续借（群）
+// http://192.168.99.63:14000/api/screenSetting/renewbook?barcode=420703GD00004461&logtype=30007&opuser=JH001&rdid=420703GD0000748&sm4Key=86ACEF6CE6A65A4A&thirdAppid=feitian_gdlib&thirdSecret=edi56b6p5hi69dwk03so86uv2olhszqp&thirdUrl=http://218.200.95.251:8088/openlib
+export function FetchRenewbook(data) {
+  return request({
+    url: '/api/screenSetting/renewbook',
+    data
+  })
+}
+
 
 // 图书推荐
 export function FetchInitScreenBookRecommend(data) {
@@ -17,10 +37,50 @@ export function FetchInitScreenBookRecommend(data) {
   })
 }
 
+// 图书检索接口
+// http://192.168.99.63:14000/api/screenSetting/bookSearch?opacUrl=http%3A%2F%2F218.200.95.251%3A8081%2Fopac%2F&page=1&query=%E5%BE%AE%E4%BF%A1&rows=10&scWay=dim&searchWay=title&sortOrder=desc&sortWay=score
+
+// opacUrl /  page:'1'  / query / rows:'10' / scWay / searchWay / sortOrder desc / sortWay
+export function FetchBookSearch(data) {
+  return request({
+    url: '/api/screenSetting/bookSearch',
+    data
+  })
+}
+
+
+// 书目记录号获取书目信息接口
+// /api/screenSetting/findbookByQuery?opacUrl=http://218.200.95.251:8081/opac/&bookrecno=
+
+export function FetchFindbookByQuery(data) {
+  return request({
+    url: '/api/screenSetting/findbookByQuery',
+    data
+  })
+}
+
+// 通过isbn获取图书封面
+export function FetchCoverByISBN(data) {
+  return request({
+    url: '/dxhtsg/getCoverByISBN',
+    data
+  })
+}
+
+
+// 文献排行榜
+// /api/screenSetting/sync36
+
+// 读者借阅排行榜
+export function FetchBookRanking(data) {
+  return request({
+    url: '/api/screenSetting/sync36',
+    data
+  })
+}
+
+// 馆藏量
+// /api/screenSetting/sync35
 
-// export function FetchInitScreenBookRecommend(data) {
-//   return request({
-//     url: '/qyzt/getNewBook',
-//     data
-//   })
-// }
\ No newline at end of file
+// 累计借出
+//  /api/screenSetting/sync82
\ 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 85ecef4..cbaf45e 100644
--- a/components/book-list-item/book-list-item.vue
+++ b/components/book-list-item/book-list-item.vue
@@ -9,12 +9,13 @@
         /> -->
         <image 
           class="img-item"
-          :src="data.imgPath ? baseUrl + '/api/fileRelevant/getImg?imgType=2&imgId=' + data.imgPath : '' "
+          :src="data.cover || data.imgCover || (data.imgPath ? baseUrl + '/api/fileRelevant/getImg?imgType=2&imgId=' + data.imgPath : '/static/images/default-book.png')"
           mode="scaleToFill"
+          @error="onImgError"
         ></image>
       </view>
       <view class="item-box-right">
-        <view class="item-title line-clamp-2">{{ data.name || '暂无标题' }}</view>
+        <view class="item-title line-clamp-2">{{ data.title || data.name  || '暂无标题' }}</view>
         <text class="item-author">{{ data.author || '佚名' }}</text>
         <text class="item-publish">{{ data.publisher || '暂无出版社数据' }}</text>
         <!-- <view class="item-desc line-clamp-2">{{ data.desc || '暂无简介' }}</view> -->
@@ -45,6 +46,9 @@ export default {
     }
   },
   methods: {
+    onImgError(e) {
+      e.target.src = "/static/images/default-book.png";
+    },
     hotNumber(num) {
       if (!num) return "0";
       if (num >= 10000) {
diff --git a/components/lending-list-item/lending-list-item.vue b/components/lending-list-item/lending-list-item.vue
index 410d2e0..4265829 100644
--- a/components/lending-list-item/lending-list-item.vue
+++ b/components/lending-list-item/lending-list-item.vue
@@ -4,31 +4,39 @@
       <view class="item-box-left">
         <image
           class="img-item"
-          :src="data.imgCover"
+          :src="data.cover || data.imgCover || '/static/images/default-book.png'"
           mode="scaleToFill"
+          @error="onImgError"
         />
       </view>
       <view class="item-box-right">
         <view class="item-title line-clamp-2">{{ data.title || '暂无标题' }}</view>
         <view>
-          <text class="item-author">{{ data.nickname || '佚名' }}</text>
-          <text class="item-publish">{{ data.publish || '暂无出版社数据' }}</text>
+          <text class="item-author">{{ data.author || '佚名' }}</text>
         </view>
-        <view class="item-desc line-clamp-2">{{ data.desc || '暂无简介' }}</view>
+        <view class="item-desc line-clamp-2">{{ data.localname || data.oplocalname }}</view>
       </view>
     </view>
+
     <view class="lending-info">
       <view class="lending-time">
-        <text>借阅开始时间：{{ data.startTime || '' }}</text>
-        <text>最后归还时间：{{ data.returnTime || '' }}</text>
-        <text v-if="data.realityTime" style="color: #FF3871;">实际归还时间：{{ data.realityTime }}</text>
+        <text>借书时间：{{ data.loantime || '' }}</text>
+        <text>应还时间：{{ data.returntime || '' }}</text>
       </view>
-      <!-- 临期 → 1 -->
-      <image v-if="data.returnBook === 1" class="lending-status" src="@/static/images/mylending-img3.png" mode="heightFix" />
-      <!-- 准时 → 2 -->
-      <image v-if="data.returnBook === 2" class="lending-status" src="@/static/images/mylending-img2.png" mode="heightFix" />
-      <!-- 逾期 → 3 -->
-      <image v-if="data.returnBook === 3" class="lending-status" src="@/static/images/mylending-img1.png" mode="heightFix" />
+
+      <!-- 只在 在借中 显示状态 -->
+      <image
+        v-if="isLending && status === 'overdue'"
+        class="lending-status"
+        src="@/static/images/mylending-img1.png"
+        mode="heightFix"
+      />
+      <image
+        v-if="isLending && status === 'warning'"
+        class="lending-status"
+        src="@/static/images/mylending-img3.png"
+        mode="heightFix"
+      />
     </view>
   </view>
 </template>
@@ -40,10 +48,44 @@ export default {
     data: {
       type: Object,
       required: true
+    },
+    // 父组件传：是否是在借列表
+    isLending: {
+      type: Boolean,
+      default: false
+    }
+  },
+  computed: {
+    status() {
+      if (!this.isLending || !this.data.returntime) return '';
+
+      const now = Date.now();
+      const returnTime = new Date(this.data.returntime).getTime();
+      
+      // 相差毫秒数
+      const diffTime = returnTime - now;
+      // 换算成天数
+      const day = diffTime / (1000 * 60 * 60 * 24);
+
+      // 1. 已经过期 → 逾期
+      if (day < 0) {
+        return 'overdue';
+      }
+
+      // 2. 没过期，但 ≤3 天 → 临期
+      if (day <= 3) {
+        return 'warning';
+      }
+
+      // 3. 大于3天 → 正常，不显示
+      return '';
     }
   },
   methods: {
-  }
+    onImgError(e) {
+      e.target.src = "/static/images/default-book.png";
+    }
+  },
 };
 </script>
 
@@ -54,40 +96,44 @@ export default {
   border-radius: 6px;
   border-bottom: 1px solid #f4f4f4;
   margin-bottom: 10px;
+
   .book-item-box {
     display: flex;
     justify-content: flex-start;
     align-items: flex-start;
+
     .item-box-left {
       margin-right: 10px;
-      .img-item{
+
+      .img-item {
         width: 64px;
         height: 90px;
         border-radius: 5px;
       }
     }
+
     .item-box-right {
       display: flex;
       flex-direction: column;
       justify-content: flex-start;
       flex: 1;
+
       .item-title {
         font-size: 15px;
         font-weight: bold;
         color: #000;
-        padding-bottom: 6px;
+        margin-bottom: 6px;
       }
-      .item-author,
-      .item-publish {
+
+      .item-author {
         font-size: 12px;
         color: #191A1A;
         padding: 2px 4px;
         border-radius: 2px;
         background-color: #F4F6FC;
-      }
-      .item-author{
         margin-right: 6px;
       }
+
       .item-desc {
         font-size: 12px;
         color: #191A1A;
@@ -96,20 +142,39 @@ export default {
     }
   }
 }
-.lending-info{
+
+.lending-info {
   display: flex;
   justify-content: space-between;
   align-items: center;
   padding: 10px 10px 10px 0;
-  .lending-time{
+
+  .lending-time {
     font-size: 12px;
     display: flex;
     flex-direction: column;
     justify-content: flex-start;
     line-height: 22px;
   }
-  .lending-status{
+
+  .lending-status {
     height: 50px;
   }
+
+  .type-tag {
+    padding: 4px 10px;
+    border-radius: 12px;
+    font-size: 12px;
+    color: #fff;
+    font-weight: bold;
+  }
+
+  .tag-lend {
+    background-color: #409eff;
+  }
+
+  .tag-return {
+    background-color: #ff3871;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 5de74b1..9b18b57 100644
--- a/pages.json
+++ b/pages.json
@@ -150,12 +150,6 @@
 			"style": {
 				"navigationBarTitleText": ""
 			}
-		},
-		{
-			"path": "pages/unbind-card/unbind-card",
-			"style": {
-				"navigationBarTitleText": ""
-			}
 		}
       ]
     }
diff --git a/pages/home/home.vue b/pages/home/home.vue
index de824db..a622c63 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -16,7 +16,7 @@
         </view>
         <view class="status-label">在借中</view>
       </view>
-      <view class="status-card" @click="toBorrowPage(2)">
+      <!-- <view class="status-card" @click="toBorrowPage(2)">
         <view class="status-icon icon-color2" >
           <uni-icons custom-prefix="iconfont" type="icon-zuofei05" size="22"></uni-icons>
         </view>
@@ -27,12 +27,12 @@
           <uni-icons custom-prefix="iconfont" type="icon-yuqi04" size="22"></uni-icons>
         </view>
         <view class="status-label">已过期</view>
-      </view>
-      <view class="status-card" @click="toBorrowCar">
+      </view> -->
+      <view class="status-card" @click="toBorrowPage(0)">
         <view class="status-icon icon-color4" >
           <uni-icons custom-prefix="iconfont" type="icon-a-zhidu4" size="22"></uni-icons>
         </view>
-        <view class="status-label">借阅清单</view>
+        <view class="status-label">历史借阅</view>
       </view>
     </view>
 
@@ -54,19 +54,25 @@
             </view>
             <view class="menu-label">书目检索</view>
           </view>
-          <view class="menu-item">
+          <view class="menu-item" @click="onToLendCar">
             <view class="menu-icon">
               <uni-icons custom-prefix="iconfont" type="icon-z_renew_normal" size="24"></uni-icons>
             </view>
             <view class="menu-label">图书续借</view>
           </view>
-          <view class="menu-item" >
+          <!-- <view class="menu-item" >
             <view class="menu-icon">
               <uni-icons custom-prefix="iconfont" type="icon-guanwaizhuanjie1" size="26"></uni-icons>
             </view>
             <view class="menu-label">图书转借</view>
+          </view> -->
+          <view class="menu-item" @click="toLibraryCard">
+            <view class="menu-icon">
+              <uni-icons custom-prefix="iconfont" type="icon-duzhezheng" size="26"></uni-icons>
+            </view>
+            <view class="menu-label">电子证</view>
           </view>
-          <view class="menu-item" @click="toRanking">
+           <view class="menu-item" @click="toRanking">
             <view class="menu-icon">
               <uni-icons custom-prefix="iconfont" type="icon-paihangbang" size="22"></uni-icons>
             </view>
@@ -84,12 +90,6 @@
             </view>
             <view class="menu-label">读者留言</view>
           </view>
-          <view class="menu-item" @click="toLibraryCard">
-            <view class="menu-icon">
-              <uni-icons custom-prefix="iconfont" type="icon-duzhezheng" size="26"></uni-icons>
-            </view>
-            <view class="menu-label">电子证</view>
-          </view>
           <view class="menu-item" @click="onToUser">
             <view class="menu-icon">
               <uni-icons custom-prefix="iconfont" type="icon-yonghuxinxi-gerenxinxi" size="20"></uni-icons>
@@ -262,8 +262,9 @@ export default {
       }
     },
     goToBookDetail(item) {
+      // 把整个图书对象 转成字符串 带过去
       uni.navigateTo({
-        url: "/subpkg/pages/book-detail/book-detail?isbn=" + item.isbn
+        url: "/subpkg/pages/book-detail/book-detail?bookData=" + encodeURIComponent(JSON.stringify(item))
       })
     },
     
@@ -279,6 +280,12 @@ export default {
         url: "/pages/search/search"
       });
     },
+    // 去图书借阅车页
+    onToLendCar() {
+      uni.switchTab({
+        url: "/pages/lendCar/lendCar"
+      });
+    },
     // 点击未绑定借阅证区域 触发跳转
     toCheckLogin() {
       uni.navigateTo({
diff --git a/pages/lendCar/lendCar copy.vue b/pages/lendCar/lendCar copy.vue
new file mode 100644
index 0000000..a75097f
--- /dev/null
+++ b/pages/lendCar/lendCar copy.vue	
@@ -0,0 +1,273 @@
+<template>
+  <view class="item-container">
+    <!-- 图书数量 + 右侧设置按钮 -->
+    <view class="count-text">
+      <text>图书数量 ({{ bookList.length }})</text>
+      <text class="edit-btn" @click="toggleEdit">{{ editMode ? "完成" : "管理" }}</text>
+    </view>
+
+    <checkbox-group @change="checkboxChange">
+      <view class="car-list" v-for="item in bookList" :key="item.isbn">
+        <checkbox :value="item.isbn" :checked="item.checked" />
+        <view class="book-item-box">
+          <view class="item-box-left">
+            <image class="img-item" :src="defaultCover" mode="aspectFill" />
+          </view>
+          <view class="item-box-right">
+            <view class="item-title line-clamp-2">{{ item.title || '暂无标题' }}</view>
+            <view class="tag-box">
+              <text class="item-author">{{ item.author || '佚名' }}</text>
+            </view>
+            <view class="item-desc">
+              应还时间：{{ item.returndate || '暂无' }}
+            </view>
+          </view>
+        </view>
+      </view>
+    </checkbox-group>
+
+    <view class="bottom-placeholder"></view>
+
+    <view class="car-bottom">
+      <!-- 全选 -->
+      <view class="all-check" @click="handleAllCheck">
+        <checkbox :checked="isAllChecked" />
+        <text style="margin-left:6px">全选</text>
+      </view>
+
+      <!-- 根据编辑状态切换按钮：续借 / 删除 -->
+      <button 
+        class="join-btn" 
+        @click="editMode ? handleDelete() : handleRenew()" 
+        :disabled="!hasChecked"
+      >
+        {{ editMode ? "删除选中" : "一键续借" }}
+      </button>
+    </view>
+  </view>
+</template>
+
+<script>
+import { FetchInitScreenSetting } from '@/api/user';
+import { FetchRdloanlist, FetchRenewbook } from '@/api/book';
+
+export default {
+  data() {
+    return {
+      editMode: false,
+      bookList: [],
+      defaultCover: 'https://qiniu.aiyxlib.com/1606124577077',
+      screenConfig: {},
+      // 用数组维护选中项（更稳定）
+      checkedValues: []
+    };
+  },
+  onLoad() {
+    this.getConfigAndList();
+  },
+  computed: {
+    isAllChecked() {
+      return this.bookList.length > 0 && this.checkedValues.length === this.bookList.length;
+    },
+    hasChecked() {
+      return this.checkedValues.length > 0;
+    }
+  },
+  methods: {
+    async getConfigAndList() {
+      try {
+        const res = await FetchInitScreenSetting({ libcode: '1201' });
+        this.screenConfig = {
+          thirdUrl: res.data.open_lib_http?.context || '',
+          thirdAppid: res.data.open_lib_appId?.context || '',
+          thirdSecret: res.data.open_lib_secret?.context || '',
+          sm4Key: res.data.sm4_key?.context || ''
+        };
+        this.getLendingList();
+      } catch (err) {}
+    },
+
+    async getLendingList() {
+      try {
+        const params = {
+          ...this.screenConfig,
+          rdid: uni.getStorageSync('currentReaderCard'),
+        };
+        const res = await FetchRdloanlist(params);
+        const result = typeof res.data === 'string' ? JSON.parse(res.data) : res.data;
+        this.bookList = result.loanlist || [];
+        // 切换列表时清空选中
+        this.checkedValues = [];
+      } catch (err) {
+        uni.showToast({ title: '加载失败', icon: 'none' });
+      }
+    },
+
+    toggleEdit() {
+      this.editMode = !this.editMode;
+      if (!this.editMode) {
+        this.checkedValues = [];
+      }
+    },
+
+    // ✅ 修复2：稳定的 checkbox 变更
+    checkboxChange(e) {
+      // 直接保存数组（字符串类型）
+      this.checkedValues = e.detail.value;
+    },
+
+    handleAllCheck() {
+      if (this.isAllChecked) {
+        // 取消全选
+        this.checkedValues = [];
+      } else {
+        // 全选：把所有 isbn 转字符串放进数组
+        this.checkedValues = this.bookList.map(item => String(item.isbn));
+      }
+    },
+
+    async handleRenew() {
+      // 从 checkedValues 过滤出对应图书
+      const checkedBooks = this.bookList.filter(item => 
+        this.checkedValues.includes(String(item.isbn))
+      );
+
+      if (checkedBooks.length === 0) {
+        uni.showToast({ title: '请选择要续借的图书', icon: 'none' });
+        return;
+      }
+
+      const barcodes = checkedBooks.map(item => item.barcode).join('|');
+      uni.showLoading({ title: '续借中...' });
+
+      try {
+        const params = {
+          ...this.screenConfig,
+          rdid: uni.getStorageSync('currentReaderCard'),
+          barcode: barcodes,
+          logtype: '30007'
+        };
+        console.log('续借参数', params);
+        await FetchRenewbook(params);
+
+        uni.hideLoading();
+        uni.showToast({
+          title: `成功续借 ${checkedBooks.length} 本`,
+          icon: 'success'
+        });
+        this.getLendingList();
+      } catch (err) {
+        uni.hideLoading();
+        uni.showToast({ title: '续借失败', icon: 'none' });
+      }
+    },
+
+    handleDelete() {
+      // 只保留未选中的
+      this.bookList = this.bookList.filter(item => 
+        !this.checkedValues.includes(String(item.isbn))
+      );
+      uni.showToast({
+        title: `已删除 ${this.checkedValues.length} 本`,
+        icon: "success"
+      });
+      this.checkedValues = [];
+      this.editMode = false;
+    }
+  }
+};
+</script>
+
+<style lang="scss" scss>
+.item-container {
+  padding: 10px;
+  background: #f5f6f7;
+  min-height: 100vh;
+}
+.count-text {
+  margin-bottom: 10px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.edit-btn {
+  color: #01a4fe;
+  font-size: 14px;
+}
+.car-list {
+  display: flex;
+  align-items: flex-start;
+  margin-bottom: 10px;
+  checkbox {
+    margin-top: 15px;
+    padding: 0 10px;
+  }
+}
+.book-item-box {
+  flex: 1;
+  background: #fff;
+  border-radius: 8px;
+  padding: 12px;
+  display: flex;
+  .item-box-left {
+    margin-right: 12px;
+    .img-item {
+      width: 64px;
+      height: 90px;
+      border-radius: 6px;
+    }
+  }
+  .item-box-right {
+    flex: 1;
+  }
+  .item-title {
+    font-weight: bold;
+    margin-bottom: 4px;
+  }
+  .item-author {
+    font-size: 12px;
+    background: #f4f6fc;
+    padding: 2px 6px;
+    border-radius: 4px;
+    margin-right: 6px;
+  }
+  .item-desc {
+    font-size: 12px;
+    color: #999;
+    margin-top: 6px;
+  }
+}
+.bottom-placeholder {
+  height: 60px;
+}
+.car-bottom {
+  position: fixed;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  background: #fff;
+  padding: 12px 15px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.05);
+}
+.all-check {
+  display: flex;
+  align-items: center;
+}
+.join-btn {
+  font-size: 14px;
+  color: #fff;
+  margin: 0 !important;
+  background-color: #01a4fe !important;
+  border-radius: 23px;
+  padding: 0 30px;
+  &::after{
+    border: none !important;
+  }
+  &[disabled] {
+    background: #ccc !important;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pages/lendCar/lendCar.vue b/pages/lendCar/lendCar.vue
index 4bb161b..45cceba 100644
--- a/pages/lendCar/lendCar.vue
+++ b/pages/lendCar/lendCar.vue
@@ -1,151 +1,170 @@
 <template>
   <view class="item-container">
-    <!-- 图书数量 + 右侧设置按钮 -->
     <view class="count-text">
       <text>图书数量 ({{ bookList.length }})</text>
-      <text class="edit-btn" @click="toggleEdit">{{ editMode ? "完成" : "管理" }}</text>
     </view>
 
-    <checkbox-group @change="checkboxChange">
-      <view class="car-list" v-for="item in bookList" :key="item.isbn">
-        <checkbox :value="item.isbn" :checked="item.checked" />
-        <view class="book-item-box">
-          <view class="item-box-left">
-            <image class="img-item" :src="item.imgCover" mode="aspectFill" />
-          </view>
-          <view class="item-box-right">
-            <view class="item-title line-clamp-2">{{ item.title || '暂无标题' }}</view>
-            <view class="tag-box">
-              <text class="item-author">{{ item.nickname || '佚名' }}</text>
-              <text class="item-publish">{{ item.publish || '暂无出版社' }}</text>
-            </view>
-            <view class="item-desc line-clamp-2">{{ item.desc || '暂无简介' }}</view>
+    <!-- 购物车式列表 → 不用 checkbox-group！-->
+    <view class="car-list" v-for="item in bookList" :key="item.barcode">
+      <checkbox :checked="item.checked" @click="toggleItem(item)" />
+      
+      <view class="book-item-box">
+        <view class="item-box-left">
+          <image class="img-item" :src="defaultCover" mode="aspectFill" />
+        </view>
+        <view class="item-box-right">
+          <view class="item-title line-clamp-2">{{ item.title || '暂无标题' }}</view>
+          <view class="tag-box">
+            <text class="item-author">{{ item.author || '佚名' }}</text>
           </view>
+          <view class="item-desc">应还时间：{{ item.returndate || '暂无' }}</view>
         </view>
       </view>
-    </checkbox-group>
+    </view>
 
     <view class="bottom-placeholder"></view>
 
     <view class="car-bottom">
       <!-- 全选 -->
-      <view class="all-check" @click="handleAllCheck">
+      <view class="all-check" @click="toggleAllCheck">
         <checkbox :checked="isAllChecked" />
         <text style="margin-left:6px">全选</text>
       </view>
 
-      <!-- 根据编辑状态切换按钮：续借 / 删除 -->
-      <button 
-        class="join-btn" 
-        @click="editMode ? handleDelete() : handleRenew()" 
-        :disabled="!hasChecked"
-      >
-        {{ editMode ? "删除选中" : "一键续借" }}
+      <button class="join-btn" @click="handleRenew" :disabled="!hasChecked">
+        一键续借
       </button>
     </view>
   </view>
 </template>
 
 <script>
+import { FetchInitScreenSetting } from '@/api/user';
+import { FetchRdloanlist, FetchRenewbook } from '@/api/book';
+
 export default {
   data() {
     return {
-      editMode: false, // 控制编辑/删除状态
-      bookList: [
-        {
-          imgCover: "https://qiniu.aiyxlib.com/1606124577077",
-          title: "名侦探柯南",
-          nickname: "青山刚昌",
-          publish: "长春出版社",
-          isbn: "1001",
-          desc: "测试图书简介",
-          checked: true,
-        },
-        {
-          imgCover: "https://qiniu.aiyxlib.com/1606124577077",
-          title: "测试图书",
-          nickname: "测试作者",
-          publish: "测试出版社",
-          isbn: "1002",
-          desc: "测试简介",
-          checked: true,
-        },
-        {
-          imgCover: "https://qiniu.aiyxlib.com/1606124577077",
-          title: "测试图书",
-          nickname: "测试作者",
-          publish: "测试出版社",
-          isbn: "1003",
-          desc: "测试简介",
-          checked: false,
-        }
-      ],
+      bookList: [],
+      defaultCover: '/static/images/default-book.png',
+      screenConfig: {},
     };
   },
+  onLoad() {
+    this.getConfigAndList();
+  },
   computed: {
-    // 是否全选
+    // 全选状态
     isAllChecked() {
-      return this.bookList.every((item) => item.checked);
+      return this.bookList.length > 0 && this.bookList.every(item => item.checked);
     },
     // 是否有选中
     hasChecked() {
-      return this.bookList.some((item) => item.checked);
-    },
+      return this.bookList.some(item => item.checked);
+    }
   },
   methods: {
-    // 切换编辑模式
-    toggleEdit() {
-      this.editMode = !this.editMode;
-      // 退出编辑时可以取消所有选中（可选）
-      if (!this.editMode) {
-        this.bookList.forEach(item => item.checked = false);
-      }
+    async getConfigAndList() {
+      try {
+        const res = await FetchInitScreenSetting({ libcode: '1201' });
+        this.screenConfig = {
+          thirdUrl: res.data.open_lib_http?.context || '',
+          thirdAppid: res.data.open_lib_appId?.context || '',
+          thirdSecret: res.data.open_lib_secret?.context || '',
+          sm4Key: res.data.sm4_key?.context || '',
+          opuser: res.data.op_user?.context || 'JH001',
+        };
+        this.getLendingList();
+      } catch (err) {}
     },
-    checkboxChange(e) {
-      console.log("checkbox选中value：", e.detail.value);
-      const values = e.detail.value;
-      const items = this.bookList;
-
-      for (let i = 0, lenI = items.length; i < lenI; ++i) {
-        items[i].checked = false;
-        for (let j = 0, lenJ = values.length; j < lenJ; ++j) {
-          if (items[i].isbn === values[j]) {
-            items[i].checked = true;
-            break;
-          }
-        }
+
+    async getLendingList() {
+      try {
+        const params = {
+          ...this.screenConfig,
+          rdid: uni.getStorageSync('currentReaderCard'),
+        };
+        const res = await FetchRdloanlist(params);
+        const result = typeof res.data === 'string' ? JSON.parse(res.data) : res.data;
+        
+        // 每条数据加 checked: false 购物车选中状态
+        this.bookList = (result.loanlist || []).map(item => ({
+          ...item,
+          checked: false
+        }));
+        
+      } catch (err) {
+        uni.showToast({ title: '加载失败', icon: 'none' });
       }
-      this.bookList = items;
     },
-    handleAllCheck() {
+
+    // 单个勾选（购物车逻辑）
+    toggleItem(item) {
+      item.checked = !item.checked;
+    },
+
+    // 全选/取消全选
+    toggleAllCheck() {
       const isAll = this.isAllChecked;
-      this.bookList.forEach((item) => {
+      this.bookList.forEach(item => {
         item.checked = !isAll;
       });
     },
 
     // 一键续借
-    handleRenew() {
-      const checkedBooks = this.bookList.filter((item) => item.checked);
-      uni.showToast({
-        title: `已续借 ${checkedBooks.length} 本`,
-        icon: "success",
-      });
-    },
-    
-    // 删除选中图书
-    handleDelete() {
-      const beforeLen = this.bookList.length;
-      // 过滤掉选中的项
-      this.bookList = this.bookList.filter(item => !item.checked);
-      const deleteCount = beforeLen - this.bookList.length;
-      
-      uni.showToast({
-        title: `已删除 ${deleteCount} 本`,
-        icon: "success"
-      });
+    async handleRenew() {
+      const checkedBooks = this.bookList.filter(item => item.checked);
+      if (checkedBooks.length === 0) {
+        uni.showToast({ title: '请选择图书', icon: 'none' });
+        return;
+      }
+
+      const barcodes = checkedBooks.map(item => item.barcode).join('|');
+      uni.showLoading({ title: '续借中...' });
+
+      try {
+        const params = {
+          ...this.screenConfig,
+          rdid: uni.getStorageSync('currentReaderCard'),
+          barcode: barcodes,
+          logtype: '30007'
+        };
+
+        const res = await FetchRenewbook(params);
+        
+        // 解析接口返回的 data 字符串
+        const result = typeof res.data === 'string' ? JSON.parse(res.data) : res.data;
+
+        uni.hideLoading();
+
+        if (result.success === true) {
+          // 续借成功
+          uni.showToast({
+            title: `续借成功！`,
+            icon: 'success'
+          });
+          // 刷新列表
+          this.getLendingList();
+        } else {
+          // 续借失败 → 取后台提示信息
+          let msg = '续借失败';
+          if (result.messagelist && result.messagelist.length > 0) {
+            msg = result.messagelist[0].message;
+          }
+          uni.showToast({
+            title: msg,
+            icon: 'none',
+            duration: 3000
+          });
+        }
+
+      } catch (err) {
+        uni.hideLoading();
+        uni.showToast({ title: '网络异常，续借失败', icon: 'none' });
+        console.error('续借异常：', err);
+      }
     },
-  },
+  }
 };
 </script>
 
@@ -157,13 +176,8 @@ export default {
 }
 .count-text {
   margin-bottom: 10px;
-  display: flex;
-  justify-content: space-between; /* 数量左，设置右 */
-  align-items: center;
-}
-.edit-btn {
-  color: #01a4fe;
   font-size: 14px;
+  color: #333;
 }
 .car-list {
   display: flex;
@@ -188,58 +202,27 @@ export default {
       border-radius: 6px;
     }
   }
-  .item-box-right {
-    flex: 1;
-  }
-  .item-title {
-    font-weight: bold;
-    margin-bottom: 4px;
-  }
-  .item-author,
-  .item-publish {
-    font-size: 12px;
-    background: #f4f6fc;
-    padding: 2px 6px;
-    border-radius: 4px;
-    margin-right: 6px;
-  }
-  .item-desc {
-    font-size: 12px;
-    color: #999;
-    margin-top: 6px;
+  .item-box-right { flex: 1; }
+  .item-title { font-weight: bold; margin-bottom: 4px; }
+  .item-author {
+    font-size: 12px; background: #f4f6fc;
+    padding: 2px 6px; border-radius: 4px; margin-right: 6px;
   }
+  .item-desc { font-size: 12px; color: #999; margin-top: 6px; }
 }
-.bottom-placeholder {
-  height: 60px;
-}
+.bottom-placeholder { height: 60px; }
 .car-bottom {
-  position: fixed;
-  left: 0;
-  bottom: 0;
-  right: 0;
-  background: #fff;
-  padding: 12px 15px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.05);
-}
-.all-check {
-  display: flex;
-  align-items: center;
+  position: fixed; left: 0; bottom: 0; right: 0;
+  background: #fff; padding: 12px 15px;
+  display: flex; justify-content: space-between; align-items: center;
+  box-shadow: 0 -2px 5px rgba(0,0,0,0.05);
 }
+.all-check { display: flex; align-items: center; }
 .join-btn {
-  font-size: 14px;
-  color: #fff;
-  margin: 0 !important;
-  background-color: #01a4fe !important;
-  border-radius: 23px;
+  font-size: 14px; color: #fff;
+  background: #01a4fe !important; border-radius: 23px;
   padding: 0 30px;
-  &::after{
-    border: none !important;
-  }
-  &[disabled] {
-    background: #ccc !important;
-  }
+  &::after{ border: none !important; }
+  &[disabled] { background: #ccc !important; }
 }
 </style>
\ No newline at end of file
diff --git a/pages/search/search.vue b/pages/search/search.vue
index 60867ef..8e1ef92 100644
--- a/pages/search/search.vue
+++ b/pages/search/search.vue
@@ -32,141 +32,210 @@
 			</view>
 
 			<view class="search-btn-container" @click="onSearch">
-				<button class="search-btn" type="primary" >搜索</button>
+				<button class="search-btn" type="primary">搜索</button>
 			</view>
 
-      <!-- 有数据才显示 -->
-      <view class="filter-container">
-        <view class="total-reslut"  v-if="listData.length > 0"> 
-          搜索到 {{ total }} 条记录，共 {{ totalPage }} 页，当前第 {{ page }} 页
-        </view>
-        <view>筛选</view>
-      </view>
+			<view class="filter-container">
+				<view class="total-reslut" v-if="listData.length > 0">
+					搜索到 {{ total }} 条记录，共 {{ totalPage }} 页，当前第 {{ page }} 页
+				</view>
+				<!-- <view>筛选</view> -->
+			</view>
 		</view>
 
-    <!-- 有数据才显示列表 -->
-    <view style="padding-top: 154px;" v-if="listData.length > 0">
-      <scroll-view
-        scroll-y
-        style="height: calc(100vh - 80px);"
-        @scrolltolower="onScrollLower"
-      >
-        <book-list-item
-          class="hot-list-item"
-          v-for="(item, index) in listData"
-          :key="index"
-          :data="item"
-          :ranking="index + 1"
-          @click="onItemClick(item)"
-        ></book-list-item>
-
-        <view class="load-more" v-if="total > listData.length">
-          上拉加载更多...
-        </view>
-        <view class="load-more" v-if="total <= listData.length && listData.length > 0">
-          没有更多数据了
-        </view>
-		  </scroll-view>
-    </view>
+		<view style="padding-top: 154px;" v-if="listData.length > 0">
+			<scroll-view
+				scroll-y
+				style="height: calc(100vh - 80px);"
+				@scrolltolower="onScrollLower"
+			>
+				<book-list-item
+					class="hot-list-item"
+					v-for="(item, index) in listData"
+					:key="index"
+					:data="item"
+					:ranking="index + 1"
+					@click="onItemClick(item)"
+				></book-list-item>
+
+				<view class="load-more" v-if="total > listData.length">
+					上拉加载更多...
+				</view>
+				<view class="load-more" v-if="total <= listData.length && listData.length > 0">
+					没有更多数据了
+				</view>
+			</scroll-view>
+		</view>
+    
+    <!-- 空状态 -->
+	  <view class="empty-box" v-if="isSearched && listData.length === 0">
+			<text>没有检索到相关数据</text>
+		</view>
 	</view>
 </template>
 
 <script>
+import { FetchInitScreenSetting } from '@/api/user';
+import { FetchBookSearch } from '@/api/book';
 import BookListItem from "@/components/book-list-item/book-list-item.vue";
 
 export default {
-	components: {
-		BookListItem
-	},
+	components: { BookListItem },
 	data() {
 		return {
 			selectValue: '',
 			selectValueText: '',
 			selectIndex: 0,
-			value:'',
+			value: '',
 			range: [
-				{ value: 0, text: "任意词" },
-				{ value: 1, text: "题名" },
-				{ value: 2, text: "著者" },
-				{ value: 3, text: "ISBN" },
-				{ value: 4, text: "主题" },
-				{ value: 5, text: "出版社" },
-				{ value: 6, text: "分类号" }
+				// { value: '', text: "任意词" },
+				{ value: 'title', text: "题名" },
+				{ value: 'title200a', text: "正题名" },
+				{ value: 'author', text: "著者" },
+				{ value: 'isbn', text: "ISBN" },
+				{ value: 'subject', text: "主题" },
+				{ value: 'publisher', text: "出版社" },
+				{ value: 'class', text: "分类号" },
+				{ value: 'ctrlno', text: "控制号" },
+				{ value: 'orderno', text: "订购号" },
+				{ value: 'callno', text: "索书号" },
 			],
 			rangeText: [],
-			listData:[],
+			opacUrl: '',
+			listData: [],
 			size: 10,
 			page: 1,
 			total: 0,
-			totalPage: 0
+			totalPage: 0,
+			isSearched: false
 		};
 	},
 	onLoad() {
 		this.rangeText = this.range.map(item => item.text);
 		this.selectValue = this.range[0].value;
 		this.selectValueText = this.range[0].text;
+		this.getOpacUrl();
 	},
 	methods: {
+		// 获取opacUrl
+		async getOpacUrl() {
+			try {
+				const res = await FetchInitScreenSetting({ libcode: '1201' });
+				this.opacUrl = res.data.opac_url?.context || '';
+			} catch (err) {
+				console.error('获取配置失败', err);
+			}
+		},
+
+		// 切换检索类型
 		onPickerChange(e) {
 			const index = e.detail.value;
 			this.selectIndex = index;
 			this.selectValue = this.range[index].value;
 			this.selectValueText = this.range[index].text;
 		},
-		async getBookList() {
-			uni.showLoading({ title: '搜索中...' });
-			await new Promise(resolve => setTimeout(resolve, 500));
-
-			const mockList = [];
-			for (let i = 0; i < this.size; i++) {
-				const idx = (this.page - 1) * this.size + i + 1;
-				mockList.push({
-					id: idx,
-					title: `穆尔西医生带你走出孤独`,
-					desc: `关键词：${this.value}｜检索类型：${this.selectValueText}`,
-					nickname: `穆尔西`,
-					imgCover:'http://wxtest.twgbz.cn/spider/bookcover/978-7-5546-1700-7',
-					publish: "中国青年出版社",
-				});
-			}
+		// 真实图书检索接口
+    async getBookList() {
+      if (!this.value) {
+        uni.showToast({ title: '请输入搜索内容', icon: 'none' });
+        return;
+      }
+      if (!this.opacUrl) {
+        uni.showToast({ title: '未获取到检索配置', icon: 'none' });
+        return;
+      }
 
-			this.total = 37;
-			this.totalPage = 4;
+      uni.showLoading({ title: '搜索中...' });
 
-			if (this.page === 1) {
-				this.listData = mockList;
-			} else {
-				this.listData = [...this.listData, ...mockList];
-			}
-			uni.hideLoading();
-		},
+      try {
+        const params = {
+          opacUrl: this.opacUrl,
+          page: this.page.toString(),
+          query: this.value,
+          rows: this.size.toString(),
+          scWay: 'dim',
+          searchWay: this.selectValue,
+          sortOrder: 'desc',
+          sortWay: 'score'
+        };
+
+        const res = await FetchBookSearch(params);
+
+        let result = {};
+        if (typeof res.data === 'string') {
+          try {
+            result = JSON.parse(res.data);
+          } catch (e) {}
+        } else {
+          result = res.data || {};
+        }
+
+        // 如果返回的是 {} → 说明无数据
+        const isEmptyData = Object.keys(result).length === 0;
+
+        // 有数据 → 取 list & total
+        let list = [];
+        let total = 0;
+
+        if (!isEmptyData) {
+          list = result.data || [];
+          total = Number(result.total || 0);
+        }
+
+        this.total = total;
+        this.totalPage = Math.ceil(this.total / this.size);
+
+        if (this.page === 1) {
+          this.listData = list;
+        } else {
+          this.listData = [...this.listData, ...list];
+        }
+
+        this.isSearched = true;
+
+      } catch (err) {
+        this.listData = [];
+        uni.showToast({ title: '搜索失败', icon: 'none' });
+      } finally {
+        uni.hideLoading();
+      }
+    },
+		// 上拉加载
 		onScrollLower() {
 			if (this.listData.length >= this.total) return;
 			this.page++;
 			this.getBookList();
 		},
+
+		// 搜索
 		onSearch() {
 			this.page = 1;
+			this.listData = [];
 			this.getBookList();
-			uni.showToast({ title: '搜索：' + this.value, icon: 'none' });
 		},
+
+		// 进入详情
 		onItemClick(item) {
-			// uni.showToast({ title: '点击了：' + item.title, icon: 'none' });
       uni.navigateTo({
-        url: "/subpkg/pages/book-detail/book-detail?isbn=" + item.isbn
+        url: "/subpkg/pages/book-detail/book-detail?bookrecno=" + item.bookrecno
       })
-		},
-		onFocus() {},
-		onBlur() {},
-		onClear() { 
+    },
+
+		// 清空搜索
+		onClear() {
 			this.value = '';
-			this.listData = []; // 清空列表
+			this.listData = [];
 			this.total = 0;
+			this.totalPage = 0;
+			this.isSearched = false;
 		},
+
+		onFocus() {},
+		onBlur() {},
 		onCancel() {},
 		onInput(val) { this.value = val; }
 	}
-}
+};
 </script>
 
 <style lang="scss" scoped>
@@ -175,25 +244,28 @@ export default {
 	flex-direction: column;
 	padding: 15px 20px;
 	background: #fff;
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  z-index: 99;
-  height: 124px;
-	.my-search-wrapper{
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	z-index: 99;
+	height: 124px;
+
+	.my-search-wrapper {
 		display: flex;
 		align-items: center;
 		width: 100%;
-    padding: 5px 0;
+		padding: 5px 0;
 		background-color: #f7f7f7;
 		border-radius: 36px;
 		overflow: hidden;
 	}
+
 	.picker-select {
 		width: 60px;
 		border-right: 1px solid #c9c9c9;
 	}
+
 	.picker-display {
 		display: flex;
 		align-items: center;
@@ -202,23 +274,28 @@ export default {
 		font-size: 14px;
 		color: #333;
 	}
+
 	.my-search-bar {
 		flex: 1;
+
 		::v-deep .uni-searchbar {
 			padding: 0 !important;
 			background: transparent !important;
 		}
 	}
-	.search-btn-container{
+
+	.search-btn-container {
 		width: 100%;
 		margin-top: 10px;
-		.search-btn{
+
+		.search-btn {
 			background-color: #01a4fe;
 			font-size: 15px;
 			border-radius: 20px;
 		}
 	}
 }
+
 .filter-container {
 	display: flex;
 	justify-content: flex-end;
@@ -226,17 +303,29 @@ export default {
 	font-size: 13px;
 	color: #666;
 }
+
 .load-more {
 	text-align: center;
 	padding: 10px;
 	font-size: 13px;
 	color: #999;
 }
-.total-reslut{
-  flex: 1;
-  line-height: 20px;
-  font-size: 13px;
-  color: #01a4fe;
-  font-weight: 400;
+
+.total-reslut {
+	flex: 1;
+	line-height: 20px;
+	font-size: 13px;
+	color: #01a4fe;
+	font-weight: 400;
+}
+
+.empty-box {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	height: 50vh;
+	font-size: 14px;
+	color: #999;
+  padding-top: 100px;
 }
 </style>
\ No newline at end of file
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 38ccde9..6a3cd8d 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -263,7 +263,6 @@ export default {
         font-weight: 40;
         color: #fff;
         line-height: 17px;
-		opacity: 0.9;
       }
     }
   }
diff --git a/static/iconfont.css b/static/iconfont.css
index 5862b0d..dcde0dd 100644
--- a/static/iconfont.css
+++ b/static/iconfont.css
@@ -11,6 +11,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-kongshuju:before {
+  content: "\e61c";
+}
+
 .icon-tuichu:before {
   content: "\e7ed";
 }
diff --git a/static/iconfont.ttf b/static/iconfont.ttf
index 486df6feb8fb045e38784170ca645f61476ed6df..b35479f062824cf30cb4f6a57db298ac0f22196e 100644
GIT binary patch
delta 2504
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
Cqk7x`

delta 1120
zcmZ9KO-NKx9L3LlGjE(Xj`JLKbV^h6qtqfRWYls|;U-bDkTyjz<ySF&P!dMaNJz^N
zo<vkcP*{r=r2}n5q6k{q$HIbKNXVTDOlToR3#W7Ew#j$-y?5{by~jQObMDklk+?Rw
zH$HKH@&#Z_0q*hs*wwyMtJnatV!*z~1HI9nhK`O40G3H)fCc}WcY*UcQZ+C*I`*=X
zGl*5*p2mjHM@9R33I8wP`s84AY(%t*GQJOUT|N{Y?9F}D@*HT+<(~Z`!<XZu{$Gvl
zz`-#VS|9+|czPVCttud$wro}T@2bmGSe=<$SUhXDtRvf<`9RteGisur=}VUFy3M5*
zM&>m&@L4DF!L50zst-PAk9gyR4BK%VPwHcOH_-=IX11G8A3u%3Ee`Pe2+H9`p){pW
z=E{6$$!K<pT<79~Z(48!ZJS0Xx;BjyP@_9DfH1aTD+*DJ5^O^$@=$>?6d)fV1dxLu
zcQdG=3fobHYE-hD9k8isCu*qBga=vh2T)64*=)>WmmVkR-f&(C)3HrYT;-syT{MO*
zE4VGBOG5#W^iM%4kfw&BAhR@-2kF&NC?t1LP%<R#QBXXjU&A&ab2M>w1R2n<H>RUu
zmyk?C!G0nC!OkIhq!jc3vRXqoAUibl1@gLv4ne-ts7&QY4PAp=L|ol?Qn~o7p_Pzd
zG&B|RtA_SME@@~q<g$jABgw86G#|+(4P!vERih3`@~DQ<AW5ML)WkXYp;0F)MIj0%
zhZHwdFhitjHB1w!;~LP;)Ljh&M(Uo1Q6u$U!_blXsZr<pd!vR2K^VoPpV=`FVU%RZ
zSj|c|62cHSjD)+%EH#JBHBXOc-dpOuW3^egtZD0y?~3n3_WtZ?e}(^9&Y7IKz{S98
vyVG9DeHe@cSMq-6Cqf84DC{cyRx}Zggg?#B`|BG-owIhRTVVFs;kV*12h-i;

diff --git a/static/images/default-book.png b/static/images/default-book.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d6579a09c33238a5b5d0291139285ff4f7c24be
GIT binary patch
literal 8327
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

literal 0
HcmV?d00001

diff --git a/subpkg/pages/activity-list/activity-list copy.vue b/subpkg/pages/activity-list/activity-list copy.vue
new file mode 100644
index 0000000..f93579a
--- /dev/null
+++ b/subpkg/pages/activity-list/activity-list copy.vue	
@@ -0,0 +1,157 @@
+<template>
+	<view class="activity-list">
+		<!-- 下拉刷新区域 -->
+		<scroll-view
+			scroll-y
+			refresher-enabled
+			:refresher-triggered="refreshing"
+			@refresherrefresh="onRefresh"
+			@scrolltolower="onLoadMore"
+			lower-threshold="100"
+		>
+			<view class="activity-item" v-for="(item, index) in activityList" @click="toActivityDetail(item)" :key="index">
+				<image class="activity-img" :src="item.imgUrl"></image>
+				<view class="activity-info">
+					<view class="activity-info-left">
+						<text class="title">{{ item.title }}</text>
+            <view class="time">
+              <uni-icons class="time-icon" custom-prefix="iconfont" type="icon-shijian" size="15"></uni-icons>
+              <text>{{ item.time }}</text>
+            </view>
+					</view>
+					<button
+						class="activity-btn"
+						:class="item.status === 0 ? 'disabled-btn' : ''"
+						type="primary"
+						:disabled="item.status === 0"
+					>
+						{{ item.status === 1 ? '立即参加' : '活动结束' }}
+					</button>
+				</view>
+			</view>
+
+			<!-- 加载提示 -->
+			<view class="load-tip" v-if="loading">
+				<text>加载中...</text>
+			</view>
+			<view class="load-tip" v-if="noMore">
+				<text>没有更多数据了</text>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			activityList: [], // 活动列表数据
+			refreshing: false, // 下拉刷新状态
+			loading: false, // 加载中
+			noMore: false, // 是否没有更多数据
+			page: 1, // 当前页码
+			pageSize: 5, // 每页条数
+			total: 20, // 模拟总数据量
+		};
+	},
+	onLoad() {
+		// 页面加载时获取第一页数据
+		this.getActivityList();
+	},
+	methods: {
+		/**
+		 * 模拟请求活动列表接口
+		 * @param {Number} page 页码
+		 * @param {Number} pageSize 每页条数
+		 */
+		getActivityList() {
+			this.loading = true;
+
+			// 模拟网络请求延迟
+			setTimeout(() => {
+				// 生成模拟数据
+				const list = this.mockData(this.page, this.pageSize);
+
+				// 下拉刷新：直接替换数据
+				if (this.refreshing) {
+					this.activityList = list;
+					this.refreshing = false;
+				} else {
+					// 上拉加载：追加数据
+					this.activityList = [...this.activityList, ...list];
+				}
+
+				// 判断是否还有更多数据
+				if (this.activityList.length >= this.total) {
+					this.noMore = true;
+				} else {
+					this.noMore = false;
+				}
+
+				this.loading = false;
+			}, 1000);
+		},
+
+		/**
+		 * 模拟生成活动数据
+		 */
+		mockData(page, pageSize) {
+			let arr = [];
+			for (let i = 0; i < pageSize; i++) {
+				const num = (page - 1) * pageSize + i + 1;
+				arr.push({
+					imgUrl: "https://qiniu.aiyxlib.com/1605060269830",
+					title: `活动标题${num}`,
+					time: "2025-11-03 00:00 ~2025-11-09 00:00",
+					status: num % 3 === 0 ? 0 : 1, // 0=结束 1=可参加
+				});
+			}
+			return arr;
+		},
+
+		/**
+		 * 下拉刷新
+		 */
+		onRefresh() {
+			// 重置状态
+			this.page = 1;
+			this.noMore = false;
+			this.refreshing = true;
+			this.getActivityList();
+		},
+
+		/**
+		 * 上拉加载更多
+		 */
+		onLoadMore() {
+			if (this.loading || this.noMore) return;
+			this.page++;
+			this.getActivityList();
+		},
+    toActivityDetail(item){
+      uni.navigateTo({
+        url: "/subpkg/pages/activity-detail/activity-detail?title=" + item.title
+      })
+    }
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+.activity-list {
+	padding: 20px;
+	height: 100vh;
+	box-sizing: border-box;
+}
+
+scroll-view {
+	height: 100%;
+}
+
+.load-tip {
+	text-align: center;
+	padding: 20px;
+	color: #999;
+	font-size: 14px;
+}
+</style>
\ No newline at end of file
diff --git a/subpkg/pages/activity-list/activity-list.vue b/subpkg/pages/activity-list/activity-list.vue
index f93579a..e5accee 100644
--- a/subpkg/pages/activity-list/activity-list.vue
+++ b/subpkg/pages/activity-list/activity-list.vue
@@ -9,15 +9,17 @@
 			@scrolltolower="onLoadMore"
 			lower-threshold="100"
 		>
+
+			<!-- 活动列表 -->
 			<view class="activity-item" v-for="(item, index) in activityList" @click="toActivityDetail(item)" :key="index">
 				<image class="activity-img" :src="item.imgUrl"></image>
 				<view class="activity-info">
 					<view class="activity-info-left">
 						<text class="title">{{ item.title }}</text>
-            <view class="time">
-              <uni-icons class="time-icon" custom-prefix="iconfont" type="icon-shijian" size="15"></uni-icons>
-              <text>{{ item.time }}</text>
-            </view>
+						<view class="time">
+							<uni-icons class="time-icon" custom-prefix="iconfont" type="icon-shijian" size="15"></uni-icons>
+							<text>{{ item.time }}</text>
+						</view>
 					</view>
 					<button
 						class="activity-btn"
@@ -30,11 +32,17 @@
 				</view>
 			</view>
 
+			<!-- 空状态：没有活动时显示 -->
+			<view class="empty-box" v-if="activityList.length === 0 && !loading">
+        <uni-icons custom-prefix="iconfont" type="icon-kongshuju" size="80"></uni-icons>
+				<text style="margin-top: 20px;">暂无活动，敬请期待~</text>
+			</view>
+
 			<!-- 加载提示 -->
 			<view class="load-tip" v-if="loading">
 				<text>加载中...</text>
 			</view>
-			<view class="load-tip" v-if="noMore">
+			<view class="load-tip" v-if="noMore && activityList.length > 0">
 				<text>没有更多数据了</text>
 			</view>
 		</scroll-view>
@@ -55,33 +63,24 @@ export default {
 		};
 	},
 	onLoad() {
-		// 页面加载时获取第一页数据
 		this.getActivityList();
 	},
 	methods: {
-		/**
-		 * 模拟请求活动列表接口
-		 * @param {Number} page 页码
-		 * @param {Number} pageSize 每页条数
-		 */
 		getActivityList() {
 			this.loading = true;
 
-			// 模拟网络请求延迟
 			setTimeout(() => {
-				// 生成模拟数据
-				const list = this.mockData(this.page, this.pageSize);
+				// 模拟接口没数据
+				// const list = this.mockData(this.page, this.pageSize);
+				const list = []; // 测试空状态
 
-				// 下拉刷新：直接替换数据
 				if (this.refreshing) {
 					this.activityList = list;
 					this.refreshing = false;
 				} else {
-					// 上拉加载：追加数据
 					this.activityList = [...this.activityList, ...list];
 				}
 
-				// 判断是否还有更多数据
 				if (this.activityList.length >= this.total) {
 					this.noMore = true;
 				} else {
@@ -89,12 +88,9 @@ export default {
 				}
 
 				this.loading = false;
-			}, 1000);
+			}, 500);
 		},
 
-		/**
-		 * 模拟生成活动数据
-		 */
 		mockData(page, pageSize) {
 			let arr = [];
 			for (let i = 0; i < pageSize; i++) {
@@ -103,36 +99,30 @@ export default {
 					imgUrl: "https://qiniu.aiyxlib.com/1605060269830",
 					title: `活动标题${num}`,
 					time: "2025-11-03 00:00 ~2025-11-09 00:00",
-					status: num % 3 === 0 ? 0 : 1, // 0=结束 1=可参加
+					status: num % 3 === 0 ? 0 : 1,
 				});
 			}
 			return arr;
 		},
 
-		/**
-		 * 下拉刷新
-		 */
 		onRefresh() {
-			// 重置状态
 			this.page = 1;
 			this.noMore = false;
 			this.refreshing = true;
 			this.getActivityList();
 		},
 
-		/**
-		 * 上拉加载更多
-		 */
 		onLoadMore() {
 			if (this.loading || this.noMore) return;
 			this.page++;
 			this.getActivityList();
 		},
-    toActivityDetail(item){
-      uni.navigateTo({
-        url: "/subpkg/pages/activity-detail/activity-detail?title=" + item.title
-      })
-    }
+
+		toActivityDetail(item){
+			uni.navigateTo({
+				url: "/subpkg/pages/activity-detail/activity-detail?title=" + item.title
+			});
+		}
 	},
 };
 </script>
@@ -148,10 +138,77 @@ scroll-view {
 	height: 100%;
 }
 
+/* 空状态 */
+.empty-box {
+	display: flex;
+  flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	height: calc(100vh - 150rpx);
+	color: #999;
+	font-size: 15px;
+}
+
 .load-tip {
 	text-align: center;
 	padding: 20px;
 	color: #999;
 	font-size: 14px;
 }
+
+.activity-item {
+	background: #fff;
+	border-radius: 12px;
+	margin-bottom: 15px;
+	overflow: hidden;
+	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+
+	.activity-img {
+		width: 100%;
+		height: 180rpx;
+	}
+
+	.activity-info {
+		padding: 15px;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+
+		.activity-info-left {
+			flex: 1;
+
+			.title {
+				font-size: 16px;
+				font-weight: bold;
+				color: #333;
+				display: block;
+				margin-bottom: 8px;
+			}
+
+			.time {
+				display: flex;
+				align-items: center;
+				font-size: 12px;
+				color: #999;
+
+				.time-icon {
+					margin-right: 4px;
+				}
+			}
+		}
+
+		.activity-btn {
+			background-color: #01a4fe;
+			font-size: 14px;
+			border-radius: 30px;
+			padding: 0 15px;
+			height: 36px;
+			line-height: 36px;
+		}
+
+		.disabled-btn {
+			background-color: #ccc !important;
+		}
+	}
+}
 </style>
\ No newline at end of file
diff --git a/subpkg/pages/book-detail/book-detail.vue b/subpkg/pages/book-detail/book-detail.vue
index 30048dd..766799f 100644
--- a/subpkg/pages/book-detail/book-detail.vue
+++ b/subpkg/pages/book-detail/book-detail.vue
@@ -3,48 +3,57 @@
     <!-- 书籍头部信息 -->
     <view class="article-detail-container">
       <view class="article-detail-left">
-        <view class="article-detail-title">名侦探柯南</view>
+        <view class="article-detail-title">{{ bookInfo.title || bookInfo.name || '暂无书名' }}</view>
         <view class="article-detail-info">
-          <view class="article-detail-author">（日）青山刚昌 著</view>
-          <view class="article-detail-time">长春出版社</view>
-          <view class="article-detail-time">ISBN：7-80664-373-7</view>
-          <view class="article-detail-time">出版时间：2023年</view>
+          <view class="article-detail-author">作者：{{ bookInfo.author || '暂无' }}</view>
+          <view class="article-detail-time">出版社：{{ bookInfo.publisher || '暂无' }}</view>
+          <view class="article-detail-time">ISBN：{{ bookInfo.isbn || '暂无' }}</view>
+          <!-- <view class="article-detail-time">出版时间：{{ bookInfo.publishdate || '暂无' }}</view> -->
         </view>
       </view>
       <view class="article-detail-right">
-        <image
-          src="https://qiniu.aiyxlib.com/1606124577077"
+        <!-- <image
+          :src="bookInfo.imgPath 
+            ? baseUrl + '/api/fileRelevant/getImg?imgType=2&imgId=' + bookInfo.imgPath 
+            : bookInfo.cover || '/static/images/default-book.png'"
           mode="widthFix"
-        />
+        /> -->
+        <image 
+          class="img-item"
+          :src="bookInfo.cover || (bookInfo.imgPath ? baseUrl + '/api/fileRelevant/getImg?imgType=2&imgId=' + bookInfo.imgPath : '/static/images/default-book.png')"
+          mode="widthFix"
+          @error="onImgError"
+        ></image>
       </view>
     </view>
 
     <!-- 馆藏信息 -->
     <view class="book-store-info">
       <view class="book-store-info-item">
-        <text class="store-txt1">39</text>
-        <text class="store-txt2">总馆藏量</text>
+        <text class="store-txt1">{{ bookInfo.orglib || '暂无' }}</text>
+        <text class="store-txt2">所属馆</text>
       </view>
       <view class="book-store-info-item">
-        <text class="store-txt1">38</text>
+        <text class="store-txt1">{{ bookInfo.loancount || 0 }}</text>
         <text class="store-txt2">在馆（本）</text>
       </view>
+        <!-- 编目=1,在馆=2,借出=3,丢失=4,剔除=5,交换=6,赠送=7,装订=8,锁定=9,预借=10， 清点=12 -->
       <view class="book-store-info-item">
-        <text class="store-txt1">1</text>
-        <text class="store-txt2">借出（本）</text>
+        <text class="store-txt1">{{ stateText }}</text>
+        <text class="store-txt2">馆藏状态</text>
       </view>
     </view>
 
     <!-- 索书号/条码号 -->
-    <view class="store-info-list">
-      <view class="store-info-item">
+    <view v-if="bookInfo.collection" class="store-info-list">
+      <view class="store-info-item" v-for="(item, index) in bookInfo.collection" :key="index">
         <view>
           <text>索书号</text>
-          <text>J238.7/5</text>
+          <text>{{ item.callno || '暂无' }}</text>
         </view>
         <view>
           <text>条码号</text>
-          <text>14018019711</text>
+          <text>{{ item.barcode || '暂无' }}</text>
         </view>
       </view>
     </view>
@@ -61,83 +70,142 @@
 
     <!-- TAB 内容 -->
     <view class="content-item" v-if="currentTab === 0">
-      《名侦探柯南》是日本漫画家青山刚昌创作的著名侦探漫画作品，讲述了高中生侦探工藤新一被灌下毒药后身体缩小，化名为江户川柯南，秘密调查黑暗组织，并解决无数离奇案件的故事。作品兼具推理、冒险、情感与幽默元素，是全球极具影响力的经典漫画。
+      {{ bookInfo.summary || bookInfo.explain || '暂无内容简介' }}
     </view>
     <view class="content-item" v-if="currentTab === 1">
-      青山刚昌，日本著名漫画家，1963 年生于鸟取县。代表作包括《名侦探柯南》《魔术快斗》等。他擅长推理题材与人物塑造，画风细腻，剧情严谨，作品在全球多个国家出版，深受各年龄层读者喜爱。
+      {{ bookInfo.authorbio || '暂无作者简介' }}
     </view>
 
     <view class="detail-bottom">
-      <!-- <view class="detail-left"> -->
-        <!-- #ifdef MP-WEIXIN -->
-        <button open-type="share" class="handle-btn">
-          <uni-icons custom-prefix="iconfont" type="icon-fenxiang01" size="20"></uni-icons>
-          <text class="share-text">分享</text>
-        </button>
-        <!-- #endif -->
-        <button class="handle-btn" @click="toggleCollect">
-          <!-- 已收藏 / 未收藏 自动切换图标 -->
-          <uni-icons :type="isCollected ? 'heart-filled' : 'heart'" size="20" color="#ff4444"></uni-icons>
-          <text class="share-text">{{ isCollected ? '已收藏' : '收藏' }}</text>
-        </button>
-      </view>
-      <!-- <button class="join-btn">
-        <text>我要借书</text>
-      </button> -->
-    <!-- </view> -->
+      <button open-type="share" class="handle-btn">
+        <uni-icons custom-prefix="iconfont" type="icon-fenxiang01" size="20"></uni-icons>
+        <text class="share-text">分享</text>
+      </button>
+      <button class="handle-btn" @click="toggleCollect">
+        <uni-icons :type="isCollected ? 'heart-filled' : 'heart'" size="20" color="#ff4444"></uni-icons>
+        <text class="share-text">{{ isCollected ? '已收藏' : '收藏' }}</text>
+      </button>
+    </view>
   </view>
 </template>
 
 <script>
+import { FetchInitScreenSetting } from '@/api/user';
+import { FetchFindbookByQuery } from '@/api/book';
+import config from '@/utils/config';
+
 export default {
   data() {
     return {
-      currentTab: 0, // 0=内容简介 1=作者简介
-      isCollected: false, // 收藏状态
-      bookIsbn: "" // 图书唯一标识 ISBN
+      baseUrl: config.baseUrl,
+      currentTab: 0,
+      isCollected: false,
+      bookrecno: '',
+      opacUrl: '',
+      bookInfo: {} // 图书详情
     };
   },
   onLoad(options) {
-    // 接收从上一页传来的 ISBN
-    this.bookIsbn = options.isbn || "7-80664-373-7";
-    // 检查是否已收藏
-    this.checkCollectStatus();
+    // 接收从首页带过来的完整图书数据
+    if (options.bookData) {
+      const bookData = JSON.parse(decodeURIComponent(options.bookData));
+      this.bookInfo = bookData; // 直接赋值渲染
+      this.bookrecno = bookData.bookrecno || "";
+      this.checkCollectStatus();
+      return;
+    }
+
+    // 如果是从检索页过来（走bookrecno请求）
+    this.bookrecno = options.bookrecno || "";
+    this.getOpacUrl();
+  },
+  computed: {
+    // 馆藏状态转换：数字 → 文字
+    stateText() {
+      const state = this.bookInfo.state || 0
+      const map = {
+        1: '编目',
+        2: '在馆',
+        3: '借出',
+        4: '丢失',
+        5: '剔除',
+        6: '交换',
+        7: '赠送',
+        8: '装订',
+        9: '锁定',
+        10: '预借',
+        12: '清点'
+      }
+      return map[state] || '未知'
+    }
   },
   methods: {
-    // 检查收藏状态
-    checkCollectStatus() {
-      const collectList = uni.getStorageSync("collectList") || [];
-      this.isCollected = collectList.includes(this.bookIsbn);
+    onImgError(e) {
+      e.target.src = "/static/images/default-book.png";
+    },
+    // 获取配置
+    async getOpacUrl() {
+      try {
+        const res = await FetchInitScreenSetting({ libcode: '1201' });
+        this.opacUrl = res.data.opac_url?.context || '';
+        this.getBookDetail();
+      } catch (err) {}
     },
 
-    // 切换收藏 / 取消收藏
-    toggleCollect() {
-      let collectList = uni.getStorageSync("collectList") || [];
+    // 获取图书详情
+    async getBookDetail() {
+      if (!this.bookrecno || !this.opacUrl) return;
+      
+      uni.showLoading({ title: '加载中...' });
+      try {
+        const params = {
+          opacUrl: this.opacUrl,
+          bookrecno: this.bookrecno
+        };
+        const res = await FetchFindbookByQuery(params);
+        
+        // 解析数据
+        let detail = {};
+        if (typeof res.data === 'string') {
+          detail = JSON.parse(res.data);
+        } else {
+          detail = res.data || {};
+        }
+        
+        this.bookInfo = detail;
+        this.checkCollectStatus();
+      } catch (err) {
+      } finally {
+        uni.hideLoading();
+      }
+    },
 
+    // 收藏逻辑
+    checkCollectStatus() {
+      const list = uni.getStorageSync('collectList') || [];
+      this.isCollected = list.includes(this.bookrecno);
+    },
+    toggleCollect() {
+      let list = uni.getStorageSync('collectList') || [];
       if (this.isCollected) {
-        // 取消收藏
-        collectList = collectList.filter((item) => item !== this.bookIsbn);
-        uni.showToast({ title: "取消收藏成功", icon: "success" });
+        list = list.filter(i => i !== this.bookrecno);
+        uni.showToast({ title: '取消收藏', icon: 'success' });
       } else {
-        // 添加收藏
-        collectList.push(this.bookIsbn);
-        uni.showToast({ title: "收藏成功", icon: "success" });
+        list.push(this.bookrecno);
+        uni.showToast({ title: '收藏成功', icon: 'success' });
       }
-
-      // 保存到本地
-      uni.setStorageSync("collectList", collectList);
-      // 更新状态
+      uni.setStorageSync('collectList', list);
       this.isCollected = !this.isCollected;
     }
   },
-  // 微信分享
-	onShareAppMessage() {
-		return {
-			title: '名侦探柯南',
-			path: '/subpkg/pages/book-detail/book-detail?isbn=7-80664-373-7',
-			imageUrl: 'https://qiniu.aiyxlib.com/1606124577077'
-		};
-	}
+
+  onShareAppMessage() {
+    return {
+      title: this.bookInfo.title || '图书详情',
+      path: '/subpkg/pages/book-detail/book-detail?bookrecno=' + this.bookrecno,
+      imageUrl: this.bookInfo.cover
+    };
+  }
 };
 </script>
 
diff --git a/subpkg/pages/book-list/book-list.vue b/subpkg/pages/book-list/book-list.vue
index 5e3b4ef..e68ee34 100644
--- a/subpkg/pages/book-list/book-list.vue
+++ b/subpkg/pages/book-list/book-list.vue
@@ -62,12 +62,12 @@ export default {
       }
     },
 
-    // 跳详情
     goToDetail(item) {
+      // 把整个图书对象 转成字符串 带过去
       uni.navigateTo({
-        url: "/subpkg/pages/book-detail/book-detail?isbn=" + item.isbn
-      });
-    }
+        url: "/subpkg/pages/book-detail/book-detail?bookData=" + encodeURIComponent(JSON.stringify(item))
+      })
+    },
   }
 };
 </script>
diff --git a/subpkg/pages/feedback-list/feedback-list.vue b/subpkg/pages/feedback-list/feedback-list.vue
index fbea0e5..4a63bb6 100644
--- a/subpkg/pages/feedback-list/feedback-list.vue
+++ b/subpkg/pages/feedback-list/feedback-list.vue
@@ -2,6 +2,14 @@
   <view class="feedback-page">
     <!-- 留言列表 -->
     <view class="feedback-list">
+      
+      <!-- 空状态：无留言时显示 -->
+      <view class="empty-box" v-if="feedbackList.length === 0">
+        <uni-icons style="margin-left: 20px;" custom-prefix="iconfont" type="icon-kongshuju" size="80" color="#ccc"></uni-icons>
+        <text style="margin-top: 20px;">暂无留言</text>
+      </view>
+
+      <!-- 有数据时显示列表 -->
       <view 
         class="feedback-item" 
         v-for="(item, index) in feedbackList" 
@@ -12,7 +20,7 @@
           <view class="user-info">
             <image 
               class="avatar" 
-              :src="item.avatar || '@/static/images/avatar.png'" 
+              :src="item.avatar || '/static/images/avatar.png'" 
               mode="aspectFill"
             ></image>
             <text class="username">{{ item.nickname }}</text>
@@ -37,8 +45,8 @@
       </view>
     </view>
 
-    <!-- 写留言按钮 -->
-    <view class="write-btn-box">
+    <!-- 写留言按钮 → 有数据才显示 -->
+    <view class="write-btn-box" v-if="feedbackList.length > 0">
       <button class="write-btn" @click="goWriteComment">写留言</button>
     </view>
   </view>
@@ -48,58 +56,17 @@
 export default {
   data() {
     return {
-      // 留言列表数据（可从接口获取）
-      feedbackList: [
-        {
-          nickname: "用户1",
-          avatar: "/static/images/avatar.png",
-          content: "这篇文章充满了激情，从字里行间能体会到作者的喜爱之情，全文层次清晰，语句流畅，叙事生动具体，趣味性强。",
-          createTime: "2026-04-23 10:23:01",
-          likeNum: 12,
-          isLike: false
-        },
-        {
-          nickname: "热情读者",
-          avatar: "/static/images/avatar.png",
-          content: "写得非常棒！情感真挚，结构完整，非常有感染力，值得大家阅读学习。",
-          createTime: "2026-04-23 11:10:05",
-          likeNum: 8,
-          isLike: false
-        },
-        {
-          nickname: "热情读者",
-          avatar: "/static/images/avatar.png",
-          content: "写得非常棒！情感真挚，结构完整，非常有感染力，值得大家阅读学习。",
-          createTime: "2026-04-23 11:10:05",
-          likeNum: 8,
-          isLike: false
-        },
-        {
-          nickname: "热情读者",
-          avatar: "/static/images/avatar.png",
-          content: "写得非常棒！情感真挚，结构完整，非常有感染力，值得大家阅读学习。",
-          createTime: "2026-04-23 11:10:05",
-          likeNum: 8,
-          isLike: false
-        }
-      ]
+      feedbackList: [] // 测试空数据
+      // feedbackList: [你的数据]
     };
   },
   methods: {
-    // 点赞功能
     likeComment(index) {
       const item = this.feedbackList[index];
-      if (item.isLike) {
-        // 取消点赞
-        item.likeNum--;
-      } else {
-        // 点赞
-        item.likeNum++;
-      }
+      item.isLike ? item.likeNum-- : item.likeNum++;
       item.isLike = !item.isLike;
     },
     
-    // 写留言
     goWriteComment() {
       uni.navigateTo({
         url: '/subpkg/pages/feedback/feedback'
@@ -119,6 +86,18 @@ export default {
 .feedback-list {
   height: calc(100vh - 80px);
   overflow-y: scroll;
+  padding: 10px;
+}
+
+/* 空状态 */
+.empty-box {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  height: calc(100vh - 200px);
+  color: #999;
+  font-size: 15px;
 }
 
 /* 单条留言 */
@@ -130,7 +109,6 @@ export default {
   box-shadow: 0 1px 6px rgba(0, 0, 0, 0.06);
 }
 
-/* 顶部：头像 + 用户名 + 点赞 */
 .feedback-item-top {
   display: flex;
   justify-content: space-between;
@@ -156,7 +134,6 @@ export default {
   font-weight: 500;
 }
 
-/* 点赞 */
 .like-box {
   display: flex;
   align-items: center;
@@ -168,7 +145,6 @@ export default {
   margin-left: 4px;
 }
 
-/* 留言内容 */
 .feedback-content {
   line-height: 1.6;
 }
diff --git a/subpkg/pages/myLending/myLending copy.vue b/subpkg/pages/myLending/myLending copy.vue
new file mode 100644
index 0000000..1a89dfd
--- /dev/null
+++ b/subpkg/pages/myLending/myLending copy.vue	
@@ -0,0 +1,335 @@
+<template>
+  <view class="lending-container">
+    <view class="tab-sticky">
+      <my-tabs
+        :tabData="tabData"
+        :defaultIndex="currentIndex"
+        :config="{ textColor: '#333' }"
+        @tabClick="tabClick"
+      />
+    </view>
+
+    <swiper
+      class="swiper"
+      :current="currentIndex"
+      :style="{ height: currentSwiperHeight + 'px' }"
+      @animationfinish="onSwiperEnd"
+      @change="onSwiperChange"
+    >
+      <swiper-item v-for="(tabItem, idx) in tabData" :key="idx">
+        <view class="list-wrapper">
+          <!-- 首次加载 -->
+          <uni-load-more status="loading" v-if="loadingMap[tabItem.status]" />
+          
+          <!-- 空数据 -->
+          <view class="empty" v-else-if="!listData[tabItem.status] || listData[tabItem.status].length === 0">
+            暂无{{ tabItem.label }}记录
+          </view>
+          
+          <!-- 列表 -->
+          <block v-else>
+            <lending-list-item
+              :class="'list-item-' + tabItem.status"
+              v-for="(item, index) in listData[tabItem.status]"
+              :key="index"
+              :data="item"
+              :ranking="index + 1"
+            />
+          </block>
+
+          <!-- 上拉加载更多 -->
+          <uni-load-more
+            v-if="listData[tabItem.status] && listData[tabItem.status].length > 0 && !loadingMap[tabItem.status]"
+            :status="loadMoreStatusMap[tabItem.status]"
+          />
+        </view>
+      </swiper-item>
+    </swiper>
+  </view>
+</template>
+
+<script>
+import { FetchInitScreenSetting } from '@/api/user';
+import { FetchHistoryloan, FetchRdloanlist } from '@/api/book';
+import myTabs from "@/components/my-tabs/my-tabs.vue";
+import lendingListItem from "@/components/lending-list-item/lending-list-item.vue";
+
+export default {
+  components: { myTabs, lendingListItem },
+  data() {
+    return {
+      screenConfig: {},
+      tabData: [
+        { label: "全部", status: "all", apiStatus: -1 },
+        { label: "在借中", status: "lending", apiStatus: 0 },
+        // { label: "将过期", status: "expiring", apiStatus: 1 },
+        // { label: "已过期", status: "expired", apiStatus: 2 },
+      ],
+      currentIndex: 0,
+      listData: {},
+      loadingMap: {},
+      loadMoreStatusMap: {},
+      pageMap: {},
+      sizeMap: {},
+      hasMoreMap: {},
+      
+      swiperHeightData: {},
+      currentSwiperHeight: 400,
+      currentPageScrollTop: 0,
+      isRefreshing: false
+    };
+  },
+
+  onLoad() {
+    this.getScreenSetting();
+    this.initDataStructure();
+  },
+
+  onShow() {
+    const tabIndex = uni.getStorageSync('switch_tab_index');
+    if (tabIndex !== undefined && tabIndex !== '') {
+      this.currentIndex = Number(tabIndex);
+      uni.removeStorageSync('switch_tab_index');
+    }
+  },
+
+  onPullDownRefresh() {
+    this.isRefreshing = true;
+    const currentTab = this.getCurrentTab();
+    this.refreshList(currentTab.status);
+  },
+
+  onReachBottom() {
+    const currentTab = this.getCurrentTab();
+    this.loadMoreList(currentTab.status);
+  },
+
+  onPageScroll(res) {
+    this.currentPageScrollTop = res.scrollTop;
+  },
+
+  methods: {
+    async getScreenSetting() {
+      try {
+        const res = await FetchInitScreenSetting({ libcode: '1201' });
+        const data = res.data;
+        this.screenConfig = {
+          thirdUrl: data.open_lib_http?.context || '',
+          thirdAppid: data.open_lib_appId?.context || '',
+          thirdSecret: data.open_lib_secret?.context || '',
+          sm4Key: data.sm4_key?.context || ''
+        };
+      } catch (err) {
+        console.error('获取配置失败：', err);
+      }
+    },
+
+    // 获取 在借中 列表（字段已对齐）
+    async getRealBorrowList(statusKey) {
+      this.loadingMap[statusKey] = true;
+      try {
+        const rdid = uni.getStorageSync('currentReaderCard');
+        const params = { ...this.screenConfig, rdid };
+        const res = await FetchRdloanlist(params);
+        
+        const result = typeof res.data === 'string' ? JSON.parse(res.data) : res.data;
+        let loanList = result.loanlist || [];
+
+        // 对齐字段：loandate → loantime，returndate → returntime
+        loanList = loanList.map(item => {
+          const loantime = item.loandate || '';
+          const returntime = item.returndate || '';
+          
+          const now = new Date();
+          const returnDate = new Date(returntime);
+          const diffDay = Math.ceil((returnDate - now) / (1000 * 3600 * 24));
+
+          let returnBook = 0;
+          if (diffDay < 0) {
+            returnBook = 3;
+          } else if (diffDay <= 3) {
+            returnBook = 1;
+          } else {
+            returnBook = 0;
+          }
+
+          return {
+            ...item,
+            loantime,
+            returntime,
+            startTime: loantime,
+            returnTime: returntime,
+            returnBook
+          };
+        });
+        console.log('当前借阅', loanList);
+        this.listData['lending'] = loanList;
+        this.listData['expiring'] = loanList.filter(i => i.returnBook === 1);
+        this.listData['expired'] = loanList.filter(i => i.returnBook === 3);
+
+        this.hasMoreMap[statusKey] = false;
+        this.loadMoreStatusMap[statusKey] = "no-more";
+
+      } catch (err) {
+        console.error('获取在借列表失败', err);
+        this.listData[statusKey] = [];
+      } finally {
+        this.loadingMap[statusKey] = false;
+        this.isRefreshing = false;
+        uni.stopPullDownRefresh();
+        setTimeout(() => this.calcSwiperHeight(statusKey), 0);
+      }
+    },
+
+    // 获取 全部/历史 列表
+    async getHistoryList(statusKey) {
+      this.loadingMap[statusKey] = true;
+      try {
+        const rdid = uni.getStorageSync('currentReaderCard');
+        const params = { ...this.screenConfig, rdid, logtype:'30002' };
+        const res = await FetchHistoryloan(params);
+        
+        const result = typeof res.data === 'string' ? JSON.parse(res.data) : res.data;
+        let loanList = result.hloanlist || [];
+
+        loanList = loanList.map(item => {
+          return {
+            ...item,
+            returnTime: item.returntime || '',
+            startTime: item.loantime || item.optime || '',
+            returnBook: 2
+          };
+        });
+        console.log('历史借阅', loanList);
+        this.listData[statusKey] = loanList;
+        this.hasMoreMap[statusKey] = false;
+        this.loadMoreStatusMap[statusKey] = "no-more";
+
+      } catch (err) {
+        console.error('获取历史列表失败', err);
+        this.listData[statusKey] = [];
+      } finally {
+        this.loadingMap[statusKey] = false;
+        this.isRefreshing = false;
+        uni.stopPullDownRefresh();
+        setTimeout(() => this.calcSwiperHeight(statusKey), 0);
+      }
+    },
+
+    initDataStructure() {
+      this.tabData.forEach(tab => {
+        const key = tab.status;
+        this.$set(this.listData, key, []);
+        this.$set(this.loadingMap, key, true);
+        this.$set(this.loadMoreStatusMap, key, "");
+        this.$set(this.pageMap, key, 1);
+        this.$set(this.sizeMap, key, 10);
+        this.$set(this.hasMoreMap, key, true);
+      });
+    },
+
+    getCurrentTab() {
+      return this.tabData[this.currentIndex];
+    },
+
+    async getListData(statusKey) {
+      if (statusKey === 'all') {
+        await this.getHistoryList(statusKey);
+      }
+      if (statusKey === 'lending') {
+        await this.getRealBorrowList(statusKey);
+      }
+      if (statusKey === 'expiring' || statusKey === 'expired') {
+        await this.getRealBorrowList('lending');
+        this.loadingMap[statusKey] = false;
+      }
+    },
+
+    loadMoreList(statusKey) {
+      this.loadMoreStatusMap[statusKey] = "no-more";
+    },
+
+    refreshList(statusKey) {
+      this.getListData(statusKey);
+    },
+
+    calcSwiperHeight(statusKey) {
+      const selector = `.list-item-${statusKey}`;
+      const query = uni.createSelectorQuery().in(this);
+      query.selectAll(selector).boundingClientRect((res) => {
+        let total = 200;
+        if (res?.length) {
+          total = res.reduce((t, h) => t + h.height + 8, 0);
+        }
+        this.swiperHeightData[statusKey] = total;
+        this.currentSwiperHeight = total;
+      }).exec();
+    },
+
+    tabClick(index) {
+      this.currentIndex = index;
+      const tab = this.getCurrentTab();
+      if (this.currentPageScrollTop > 100) {
+        uni.pageScrollTo({ scrollTop: 0, duration: 100 });
+      }
+      this.getListData(tab.status);
+    },
+
+    onSwiperChange(e) {
+      if (e.detail.source === "touch") {
+        this.currentIndex = e.detail.current;
+      }
+    },
+
+    onSwiperEnd() {
+      const tab = this.getCurrentTab();
+      this.getListData(tab.status);
+    },
+
+    goToDetail(item) {
+      uni.navigateTo({
+        url: `/subpkg/pages/book-detail/book-detail?isbn=${item.isbn}`
+      });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.lending-container {
+  background-color: #f5f5f5;
+  min-height: 100vh;
+
+  .tab-sticky {
+    position: sticky;
+    top: 0;
+    z-index: 99;
+    background: #fff;
+  }
+
+  .swiper {
+    width: 100%;
+    min-height: 300px;
+  }
+
+  .swiper-item {
+    width: 100%;
+    height: 100%;
+  }
+
+  .list-wrapper {
+    padding: 10px;
+    box-sizing: border-box;
+  }
+
+  .empty {
+    text-align: center;
+    padding: 100px 0;
+    color: #999;
+    font-size: 14px;
+  }
+}
+::v-deep .uni-load-more{
+  height: auto !important;
+}
+</style>
\ No newline at end of file
diff --git a/subpkg/pages/myLending/myLending.vue b/subpkg/pages/myLending/myLending.vue
index 0d33f75..3202c77 100644
--- a/subpkg/pages/myLending/myLending.vue
+++ b/subpkg/pages/myLending/myLending.vue
@@ -1,5 +1,6 @@
 <template>
   <view class="lending-container">
+    <!-- 固定只有两个 tab -->
     <view class="tab-sticky">
       <my-tabs
         :tabData="tabData"
@@ -16,32 +17,45 @@
       @animationfinish="onSwiperEnd"
       @change="onSwiperChange"
     >
-      <swiper-item v-for="(tabItem, idx) in tabData" :key="idx">
+      <!-- 全部（历史借阅） -->
+      <swiper-item>
         <view class="list-wrapper">
-          <!-- 首次加载 -->
-          <uni-load-more status="loading" v-if="loadingMap[tabItem.status]" />
-          
-          <!-- 空数据 -->
-          <view class="empty" v-else-if="!listData[tabItem.status] || listData[tabItem.status].length === 0">
-            暂无{{ tabItem.label }}记录
+          <uni-load-more status="loading" v-if="loadingAll" />
+
+          <view class="empty" v-else-if="allList.length === 0">
+            暂无全部记录
           </view>
-          
-          <!-- 列表 -->
-          <block v-else>
-            <!--  @click="goToDetail(item)" -->
-            <lending-list-item
-              :class="'list-item-' + tabItem.status"
-              v-for="(item, index) in listData[tabItem.status]"
-              :key="index"
-              :data="item"
-              :ranking="index + 1"
-            />
-          </block>
-
-          <!-- 上拉加载更多 -->
+
+          <lending-list-item
+            class="list-item-all"
+            v-for="(item, index) in allList"
+            :key="index"
+            :data="item"
+            :is-lending="false"
+          />
+
           <uni-load-more
-            v-if="listData[tabItem.status] && listData[tabItem.status].length > 0 && !loadingMap[tabItem.status]"
-            :status="loadMoreStatusMap[tabItem.status]"
+            v-if="allList.length > 0 && hasMoreAll"
+            :status="loadMoreStatusAll"
+          />
+        </view>
+      </swiper-item>
+
+      <!-- 在借中 -->
+      <swiper-item>
+        <view class="list-wrapper">
+          <uni-load-more status="loading" v-if="loadingLending" />
+
+          <view class="empty" v-else-if="lendingList.length === 0">
+            暂无在借记录
+          </view>
+
+          <lending-list-item
+            class="list-item-lending"
+            v-for="(item, index) in lendingList"
+            :key="index"
+            :data="item"
+            :is-lending="true"
           />
         </view>
       </swiper-item>
@@ -50,6 +64,8 @@
 </template>
 
 <script>
+import { FetchInitScreenSetting } from '@/api/user';
+import { FetchHistoryloan, FetchRdloanlist, FetchCoverByISBN } from '@/api/book';
 import myTabs from "@/components/my-tabs/my-tabs.vue";
 import lendingListItem from "@/components/lending-list-item/lending-list-item.vue";
 
@@ -57,382 +73,228 @@ export default {
   components: { myTabs, lendingListItem },
   data() {
     return {
+      screenConfig: {},
       tabData: [
-        { label: "全部", status: "all", apiStatus: -1 },
-        { label: "在借中", status: "lending", apiStatus: 0 },
-        { label: "将过期", status: "expiring", apiStatus: 1 },
-        { label: "已过期", status: "expired", apiStatus: 2 },
+        { label: '历史借阅', status: 'all' },
+        { label: '在借中', status: 'lending' },
       ],
       currentIndex: 0,
-      listData: {},
-      loadingMap: {}, // 首次加载/刷新 loading
-      loadMoreStatusMap: {}, // 加载更多状态：loading / no-more / ""
-      pageMap: {}, // 分页页码
-      sizeMap: {}, // 每页条数
-      hasMoreMap: {}, // 是否还有更多
-      
+
+      // 全部（历史）独立数据
+      allList: [],
+      loadingAll: false,
+      pageAll: 1,
+      hasMoreAll: true,
+      loadMoreStatusAll: '',
+
+      // 在借中 独立数据
+      lendingList: [],
+      loadingLending: false,
+
       swiperHeightData: {},
       currentSwiperHeight: 400,
-      currentPageScrollTop: 0,
-      isRefreshing: false // 是否正在下拉刷新
     };
   },
 
-onLoad() {
-  this.initDataStructure();
-  // 加载第一个tab的数据
-  const firstTab = this.getCurrentTab();
-  if (firstTab) {
-    this.getListData(firstTab.status);
-  }
-},
-
-onShow() {
-  // 读取要切换的 tabIndex
-  const tabIndex = uni.getStorageSync('switch_tab_index');
-  
-  if (tabIndex !== undefined && tabIndex !== '') {
-    this.currentIndex = Number(tabIndex);
-    
-    // 加载对应 tab 数据
-    const currentTab = this.getCurrentTab();
-    if (currentTab) {
-      this.getListData(currentTab.status);
+  onLoad() {
+    this.getScreenSetting();
+  },
+
+  onShow() {
+    const tabIndex = uni.getStorageSync('switch_tab_index');
+    if (tabIndex !== '') {
+      this.currentIndex = Number(tabIndex);
+      uni.removeStorageSync('switch_tab_index');
     }
-    
-    // 用完清除，防止下次进来重复触发
-    uni.removeStorageSync('switch_tab_index');
-  }
-},
+  },
 
-  // 下拉刷新
   onPullDownRefresh() {
-    this.isRefreshing = true;
-    const currentTab = this.getCurrentTab();
-    this.refreshList(currentTab.status);
+    if (this.currentIndex === 0) {
+      this.getAllList(true);
+    } else {
+      this.getLendingList();
+    }
   },
 
-  // 上拉加载更多
   onReachBottom() {
-    const currentTab = this.getCurrentTab();
-    this.loadMoreList(currentTab.status);
-  },
-
-  onPageScroll(res) {
-    this.currentPageScrollTop = res.scrollTop;
+    if (this.currentIndex === 0 && this.hasMoreAll) {
+      this.getAllList();
+    }
   },
 
   methods: {
-    // 初始化所有状态
-    initDataStructure() {
-      this.tabData.forEach(tab => {
-        const key = tab.status;
-        this.$set(this.listData, key, []);
-        this.$set(this.loadingMap, key, true);
-        this.$set(this.loadMoreStatusMap, key, "");
-        this.$set(this.pageMap, key, 1);
-        this.$set(this.sizeMap, key, 10);
-        this.$set(this.hasMoreMap, key, true);
-      });
+    // 获取封面（你要的格式）
+    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;
     },
 
-    getCurrentTab() {
-      return this.tabData[this.currentIndex];
+    async getScreenSetting() {
+      try {
+        const res = await FetchInitScreenSetting({ libcode: '1201' });
+        const data = res.data;
+        this.screenConfig = {
+          thirdUrl: data.open_lib_http?.context || '',
+          thirdAppid: data.open_lib_appId?.context || '',
+          thirdSecret: data.open_lib_secret?.context || '',
+          sm4Key: data.sm4_key?.context || ''
+        };
+
+        // 默认加载第一个 tab
+        this.getAllList(true);
+      } catch (err) {}
     },
 
-    // 获取列表（首次/刷新）
-    async getListData(statusKey, isRefresh = false) {
-      const tab = this.tabData.find(item => item.status === statusKey);
-      if (!tab) return;
+    async getAllList(isRefresh = false) {
+      if (this.loadingAll) return;
+      this.loadingAll = true;
 
-      if (!isRefresh && this.listData[statusKey]?.length > 0) {
-        this.loadingMap[statusKey] = false;
-        return;
+      if (isRefresh) {
+        this.pageAll = 1;
+        this.allList = [];
+        this.hasMoreAll = true;
+        this.loadMoreStatusAll = '';
       }
 
-      this.loadingMap[statusKey] = true;
-      this.pageMap[statusKey] = 1;
-
       try {
-        const data = await this.fetchBorrowList(tab.apiStatus, this.pageMap[statusKey], this.sizeMap[statusKey]);
-        
-        let list = data.records || [];
-        list = list.map(item => {
-          // 已归还
-          if (item.realityTime) {
-            if (new Date(item.realityTime) <= new Date(item.returnTime)) {
-              item.returnBook = 2; // 准时归还
-            } else {
-              item.returnBook = 3; // 逾期归还
-            }
-          } else {
-            // 未归还
-            const now = new Date();
-            const returnDate = new Date(item.returnTime);
-            const diffDay = Math.ceil((returnDate - now) / (1000 * 3600 * 24));
-           
-            if (diffDay < 0) {
-               // 1. 已逾期（应还时间 < 当前时间）
-              item.returnBook = 3;
-            }else if (diffDay <= 3) {
-               // 2. 临期（剩余 0~3 天）
-              item.returnBook = 1;
-            } else {
-              // 3. 正常在借
-              item.returnBook = 0;
-            }
-          }
-          return item;
-        });
-        this.listData[statusKey] = list;
-        this.hasMoreMap[statusKey] = list.length === this.sizeMap[statusKey];
-        this.loadMoreStatusMap[statusKey] = this.hasMoreMap[statusKey] ? "" : "no-more";
-        
+        const params = {
+          ...this.screenConfig,
+          rdid: uni.getStorageSync('currentReaderCard'),
+          logtype: '30002',
+          page: this.pageAll,
+          rows: 10,
+        };
+
+        const res = await FetchHistoryloan(params);
+        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];
+        this.hasMoreAll = list.length === 10;
+        this.loadMoreStatusAll = this.hasMoreAll ? '' : 'no-more';
+
+        if (this.hasMoreAll) this.pageAll++;
       } catch (err) {
-        this.listData[statusKey] = [];
       } finally {
-        this.loadingMap[statusKey] = false;
-        this.isRefreshing = false;
+        this.loadingAll = false;
         uni.stopPullDownRefresh();
-        
-        setTimeout(async () => {
-          this.calcSwiperHeight(statusKey);
-        }, 0);
+        setTimeout(() => {
+          this.calcHeight('all');
+        }, 100);
       }
     },
 
-    // 加载更多
-    async loadMoreList(statusKey) {
-      if (this.loadingMap[statusKey] || !this.hasMoreMap[statusKey] || this.isRefreshing) return;
-
-      this.loadMoreStatusMap[statusKey] = "loading";
-      this.pageMap[statusKey] += 1;
-
-      const tab = this.tabData.find(item => item.status === statusKey);
+    async getLendingList() {
+      this.loadingLending = true;
       try {
-        const data = await this.fetchBorrowList(tab.apiStatus, this.pageMap[statusKey], this.sizeMap[statusKey]);
-        
-        let newList = data.records || [];
-
-        newList = newList.map(item => {
-          // 已归还
-          if (item.realityTime) {
-            if (new Date(item.realityTime) <= new Date(item.returnTime)) {
-              item.returnBook = 2; // 准时归还
-            } else {
-              item.returnBook = 3; // 逾期归还
-            }
-          } else {
-             // 未归还
-            const now = new Date();
-            const returnDate = new Date(item.returnTime);
-            const diffDay = Math.ceil((returnDate - now) / (1000 * 3600 * 24));
-           
-            if (diffDay < 0) {
-               // 1. 已逾期（应还时间 < 当前时间）
-              item.returnBook = 3;
-            }else if (diffDay <= 3) {
-               // 2. 临期（剩余 0~3 天）
-              item.returnBook = 1;
-            } else {
-              // 3. 正常在借
-              item.returnBook = 0;
-            }
-          }
-          return item;
-        });
-        
-        if (newList.length > 0) {
-          this.listData[statusKey] = [...this.listData[statusKey], ...newList];
-          this.hasMoreMap[statusKey] = newList.length === this.sizeMap[statusKey];
-          this.loadMoreStatusMap[statusKey] = this.hasMoreMap[statusKey] ? "" : "no-more";
-        } else {
-          this.hasMoreMap[statusKey] = false;
-          this.loadMoreStatusMap[statusKey] = "no-more";
-        }
+        const params = {
+          ...this.screenConfig,
+          rdid: uni.getStorageSync('currentReaderCard'),
+        };
+        const res = await FetchRdloanlist(params);
+        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 || '',
+        }));
       } catch (err) {
-        this.loadMoreStatusMap[statusKey] = "";
-      }
-
-      setTimeout(async () => {
-        this.calcSwiperHeight(statusKey);
-      }, 0);
-    },
-
-    // 下拉刷新
-    refreshList(statusKey) {
-      this.getListData(statusKey, true);
-    },
-
-    // 模拟接口（带分页）
-    async fetchBorrowList(apiStatus, pageNum, pageSize) {
-      return new Promise((resolve) => {
+      } finally {
+        this.loadingLending = false;
+        uni.stopPullDownRefresh();
         setTimeout(() => {
-          const mock = this.getMockData(apiStatus, pageNum, pageSize);
-          resolve({
-            records: mock,
-            total: mock.length * 3
-          });
-        }, 500);
-      });
-    },
-
-    // 模拟分页数据
-    getMockData(apiStatus, pageNum, pageSize) {
-      const base = [
-        {
-          imgCover: "https://qiniu.aiyxlib.com/1606124577077",
-          title: "名侦探柯南",
-          nickname: "青山刚昌",
-          publish: "长春出版社",
-          isbn: "1001",
-          desc: '精心提炼20种GPT提问方法及指令，从入门到进阶再到精通，100个。',
-          startTime: "2026-03-01",
-          returnTime: "2026-04-30", // 应还时间：还有10天左右 → 在借中
-          realityTime: ""
-        },
-        {
-          imgCover: "https://qiniu.aiyxlib.com/1606124577077",
-          title: "三体",
-          nickname: "刘慈慈",
-          publish: "重庆出版社",
-          isbn: "1002",
-          desc: '精心提炼20种GPT提问方法及指令，从入门到进阶再到精通，100个。',
-          startTime: "2026-03-10",
-          returnTime: "2026-04-22", // 应还时间：剩2天 → 临期
-          realityTime: ""
-        },
-        {
-          imgCover: "https://qiniu.aiyxlib.com/1606124577077",
-          title: "红楼梦",
-          nickname: "曹雪芹",
-          publish: "人民文学",
-          isbn: "1003",
-          desc: '精心提炼20种GPT提问方法及指令，从入门到进阶再到精通，100个。',
-          startTime: "2026-02-01",
-          returnTime: "2026-03-25", // 已过期 → 逾期
-          realityTime: ""
-        },
-        {
-          imgCover: "https://qiniu.aiyxlib.com/1606124577077",
-          title: "西游记",
-          nickname: "吴承恩",
-          publish: "中华书局",
-          isbn: "1004",
-          desc: '精心提炼20种GPT提问方法及指令，从入门到进阶再到精通，100个。',
-          startTime: "2026-02-10",
-          returnTime: "2026-04-01",
-          realityTime: "2026-03-31" // 提前归还 → 准时
-        }
-      ];
-
-      if (pageNum >= 3) { // 第3页开始返回空
-        return [];
-      }
-
-      const list = [...base];
-      if (pageNum > 1) {
-        list.push(...base.map(item => ({ ...item, isbn: item.isbn + pageNum })));
-      }
-
-      switch (apiStatus) {
-        case -1: return list;
-        case 0: return list;
-        case 1: return [list[0], list[1]];
-        case 2: return [];
-        default: return [];
+          this.calcHeight('lending');
+        }, 100);
       }
     },
 
-    // 计算swiper高度
-    calcSwiperHeight(statusKey) {
-      const selector = `.list-item-${statusKey}`;
+    // 高度自适应（修复版）
+    calcHeight(type) {
+      const selector = `.list-item-${type}`;
       const query = uni.createSelectorQuery().in(this);
+      
       query.selectAll(selector).boundingClientRect((res) => {
-        let total = 200;
-        if (res?.length) {
-          total = res.reduce((t, h) => t + h.height + 8, 0);
+        let totalHeight = 200;
+        if (res && res.length > 0) {
+          totalHeight = res.reduce((sum, rect) => sum + rect.height, 0);
+          totalHeight += res.length * 10 + 40;
         }
-        this.swiperHeightData[statusKey] = total;
-        this.currentSwiperHeight = total;
+        this.swiperHeightData[type] = totalHeight;
+        this.currentSwiperHeight = totalHeight;
       }).exec();
     },
 
-    // tab切换
     tabClick(index) {
       this.currentIndex = index;
-      const tab = this.getCurrentTab();
-      
-      if (this.currentPageScrollTop > 100) {
-        uni.pageScrollTo({ scrollTop: 0, duration: 100 });
-      }
-
-      if (!this.listData[tab.status]?.length) {
-        this.getListData(tab.status);
+      if (index === 0) {
+        if (this.allList.length === 0) {
+          this.getAllList(true);
+        } else {
+          this.currentSwiperHeight = this.swiperHeightData.all || 600;
+        }
       } else {
-        this.currentSwiperHeight = this.swiperHeightData[tab.status] || 400;
+        if (this.lendingList.length === 0) {
+          this.getLendingList();
+        } else {
+          this.currentSwiperHeight = this.swiperHeightData.lending || 600;
+        }
       }
     },
 
     onSwiperChange(e) {
-      if (e.detail.source === "touch") {
-        this.currentIndex = e.detail.current;
-      }
+      if (e.detail.source === 'touch') this.currentIndex = e.detail.current;
     },
 
     onSwiperEnd() {
-      const tab = this.getCurrentTab();
-      if (!this.listData[tab.status]?.length) {
-        this.getListData(tab.status);
-      } else {
-        this.currentSwiperHeight = this.swiperHeightData[tab.status] || 400;
-      }
+      this.tabClick(this.currentIndex);
     },
-
-    goToDetail(item) {
-      uni.navigateTo({
-        url: `/subpkg/pages/book-detail/book-detail?isbn=${item.isbn}`
-      });
-    }
   }
 };
 </script>
 
 <style lang="scss" scoped>
 .lending-container {
-  background-color: #f5f5f5;
+  background: #f5f5f5;
   min-height: 100vh;
-
-  .tab-sticky {
-    position: sticky;
-    top: 0;
-    z-index: 99;
-    background: #fff;
-  }
-
-  .swiper {
-    width: 100%;
-    min-height: 300px;
-  }
-
-  .swiper-item {
-    width: 100%;
-    height: 100%;
-  }
-
-  .list-wrapper {
-    padding: 10px;
-    box-sizing: border-box;
-  }
-
-  .empty {
-    text-align: center;
-    padding: 100px 0;
-    color: #999;
-    font-size: 14px;
-  }
 }
-::v-deep .uni-load-more{
-  height: auto !important;
+.tab-sticky {
+  position: sticky;
+  top: 0;
+  z-index: 99;
+  background: #fff;
+}
+.swiper {
+  width: 100%;
+  transition: height 0.2s ease;
+}
+.list-wrapper {
+  padding: 10px;
+  box-sizing: border-box;
+}
+.empty {
+  text-align: center;
+  padding: 100px 0;
+  color: #999;
 }
 </style>
\ No newline at end of file
diff --git a/subpkg/pages/ranking/ranking.vue b/subpkg/pages/ranking/ranking.vue
index b643a2f..39db3e0 100644
--- a/subpkg/pages/ranking/ranking.vue
+++ b/subpkg/pages/ranking/ranking.vue
@@ -9,13 +9,19 @@
       <view class="ranking-header-txt">
         <view class="ranking-title">
           <uni-icons custom-prefix="iconfont" type="icon-paihangbang2" size="20"></uni-icons>
-          <text class="title-text">借阅排行</text>
+          <text class="title-text">读者借阅排行</text>
         </view>
-        <text class="ranking-header-tip">由本图书馆累计借阅而定期生成排行榜单</text>
-        <!-- <text class="ranking-num">共{{ bookList.length }}本</text> -->
+        <text class="ranking-header-tip">由本图书馆近30天读者借阅次数生成排行榜单</text>
       </view>
     </view>
+
     <view class="ranking-list">
+      <!-- 空状态 -->
+      <view class="empty-box" v-if="rankingData.length === 0">
+        <uni-icons type="cube" size="70" color="#ccc"></uni-icons>
+        <text>暂无读者排行数据</text>
+      </view>
+
       <view 
         class="ranking-item" 
         :class="[
@@ -23,7 +29,7 @@
           index === 1 ? 'two-item' : '',
           index === 2 ? 'three-item' : ''
         ]"
-        v-for="(item, index) in bookList" 
+        v-for="(item, index) in rankingData" 
         :key="index"
       >
         <!-- 第一名 -->
@@ -32,129 +38,106 @@
         <uni-icons class="ranking-icon" v-if="index === 1" custom-prefix="iconfont" type="icon-TOP" size="26" color="#a2b2c3"></uni-icons>
         <!-- 第三名 -->
         <uni-icons class="ranking-icon" v-if="index === 2" custom-prefix="iconfont" type="icon-TOP1" size="26" color="#D0BA9D"></uni-icons>
-        <!-- 4~15名 显示数字 -->
+        <!-- 4~10名 显示数字 -->
         <view  v-if="index >= 3" class="ranking-common-icon"> 
           <uni-icons custom-prefix="iconfont" type="icon-tag" size="28" color="#8899ab"></uni-icons>
           <text class="common-num">{{ index + 1 }}</text>
         </view>
-        <!-- 书籍封面 -->
+         <!-- 书籍封面 -->
         <view class="ranking-item-img">
           <image
             class="book-cover"
-            :src="item.cover"
+            :src="item.cover || defaultCover"
             mode="scaleToFill"
+            @error="onImgError"
           />
         </view>
+
         <!-- 书籍信息 -->
         <view class="ranking-book-info">
-          <text class="book-info-title">{{ item.title }}</text>
-          <text class="book-info-name">{{ item.author }}</text>
-          <text class="book-info-desc line-clamp-3 ">{{ item.desc }}</text>
+          <text class="book-info-title">{{ item.TITLE || '暂无书名' }}</text>
+          <text class="book-info-name">{{ item.AUTHOR || '佚名' }}</text>
+          <text class="book-info-desc line-clamp-3">
+            借阅次数：{{ item.TOTALNUM || 0 }} 次
+          </text>
         </view>
       </view>
     </view>
 	</view>
 </template>
 
+
+
 <script>
-	export default {
-		data() {
-			return {
-        bookList: [
-          {
-            cover: "https://qiniu.aiyxlib.com/1606124577077",
-            title: "名侦探柯南",
-            author: "青山刚昌",
-            desc: "《名侦探柯南》是日本漫画家青山刚昌创作的著名侦探漫画作品，讲述了高中生侦探工藤新一被灌下毒药后身体缩小，化名为江户川柯南，秘密调查黑暗组织，并解决无数离奇案件的故事。作品兼具推理、冒险、情感与幽默元素，是全球极具影响力的经典漫画。"
-          },
-          {
-            cover: "https://qiniu.aiyxlib.com/1606124577077",
-            title: "海贼王",
-            author: "尾田荣一郎",
-            desc: "《海贼王》讲述了主角蒙奇·D·路飞为了成为海贼王，与伙伴们在伟大航路上冒险，寻找传说中的One Piece的故事。"
-          },
-          {
-            cover: "https://qiniu.aiyxlib.com/1606124577077",
-            title: "火影忍者",
-            author: "岸本齐史",
-            desc: "《火影忍者》讲述了鸣人从小被孤立，通过努力成为忍者，最终成为英雄守护村子的故事。"
-          },
-          {
-            cover: "https://qiniu.aiyxlib.com/1606124577077",
-            title: "三体",
-            author: "刘慈欣",
-            desc: "《三体》是刘慈欣创作的长篇科幻小说，讲述了人类与三体文明之间的生死博弈。"
-          },
-          {
-            cover: "https://qiniu.aiyxlib.com/1606124577077",
-            title: "盗墓笔记",
-            author: "南派三叔",
-            desc: "《盗墓笔记》讲述了吴邪等人在古墓中探险，揭开一系列神秘谜团的故事。"
-          },
-          {
-            cover: "https://qiniu.aiyxlib.com/1606124577077",
-            title: "斗罗大陆",
-            author: "唐家三少",
-            desc: "《斗罗大陆》讲述了唐三穿越到斗罗大陆，一步步成为魂师巅峰的故事。"
-          },
-          {
-            cover: "https://qiniu.aiyxlib.com/1606124577077",
-            title: "斗破苍穹",
-            author: "天蚕土豆",
-            desc: "《斗破苍穹》讲述了萧炎从废柴少年逆袭成为斗气大陆最强者的故事。"
-          },
-          {
-            cover: "https://qiniu.aiyxlib.com/1606124577077",
-            title: "西游记",
-            author: "吴承恩",
-            desc: "《西游记》是中国古典四大名著之一，讲述了唐僧师徒西天取经的故事。"
-          },
-          {
-            cover: "https://qiniu.aiyxlib.com/1606124577077",
-            title: "红楼梦",
-            author: "曹雪芹",
-            desc: "《红楼梦》以贾史王薛四大家族为背景，讲述了贾宝玉与林黛玉的爱情悲剧。"
-          },
-          {
-            cover: "https://qiniu.aiyxlib.com/1606124577077",
-            title: "水浒传",
-            author: "施耐庵",
-            desc: "《水浒传》讲述了108位好汉在梁山起义，最终接受招安的故事。"
-          },
-          {
-            cover: "https://qiniu.aiyxlib.com/1606124577077",
-            title: "三国演义",
-            author: "罗贯中",
-            desc: "《三国演义》描写了从东汉末年到西晋初年的群雄割据与英雄争霸。"
-          },
-          {
-            cover: "https://qiniu.aiyxlib.com/1606124577077",
-            title: "沉默的大多数",
-            author: "王小波",
-            desc: "《沉默的大多数》是王小波的杂文精选，探讨了社会、文化与人性。"
-          },
-          {
-            cover: "https://qiniu.aiyxlib.com/1606124577077",
-            title: "活着",
-            author: "余华",
-            desc: "《活着》讲述了福贵在苦难中坚守生命的故事。"
-          },
-          {
-            cover: "https://qiniu.aiyxlib.com/1606124577077",
-            title: "人间失格",
-            author: "太宰治",
-            desc: "《人间失格》讲述了主人公叶藏从青年到颓废堕落的人生历程。"
-          },
-          {
-            cover: "https://qiniu.aiyxlib.com/1606124577077",
-            title: "解忧杂货店",
-            author: "东野圭吾",
-            desc: "《解忧杂货店》讲述了一家神奇杂货店帮助人们解决烦恼的温暖故事。"
-          }
-        ]
-			};
-		}
-	}
+import { FetchInitScreenSetting } from '@/api/user';
+import { FetchBookRanking } from '@/api/book';
+
+export default {
+	data() {
+		return {
+      rankingData: [],
+      defaultCover: '/static/images/default-book.png',
+		};
+	},
+
+  onLoad() {
+    this.getScreenConfig();
+  },
+
+  methods: {
+    async getScreenConfig() {
+      try {
+        const res = await FetchInitScreenSetting({ libcode: '1201' });
+        this.getReadRanking(res.data);
+      } catch (err) {
+        console.log(err)
+      }
+    },
+
+    getFormattedDate(date) {
+      const year = date.getFullYear();
+      const month = date.getMonth() + 1;
+      const day = date.getDate();
+      return `${year}-${month < 10 ? '0' + month : month}-${day < 10 ? '0' + day : day}`;
+    },
+
+    getReadRanking(result) {
+      const currentDate = new Date()
+      currentDate.setDate(currentDate.getDate() - 30)
+      const year = currentDate.getFullYear()
+      const month = currentDate.getMonth() + 1
+      const day = currentDate.getDate()
+      const formattedDate = `${year}-${month < 10 ? '0' + month : month}-${day < 10 ? '0' + day : day}`
+
+      const params = {
+        'libcode': '1201',
+        'starttime': formattedDate,
+        'endtime': this.getFormattedDate(new Date()),
+        'rownum': 10,
+        'thirdAppid': result.open_lib_appId?.context || '',
+        'thirdSecret': result.open_lib_secret?.context || '',
+        'thirdUrl': result.open_lib_http?.context || ''
+      }
+
+      FetchBookRanking(params).then(res => {
+        console.log('排行接口返回数据', res)
+        const innerStr = res.data;
+        const resultJson = JSON.parse(innerStr);
+        console.log(resultJson)
+
+        if (resultJson.success && resultJson.resultlist.length > 0) {
+          // 按借阅次数降序
+          this.rankingData = resultJson.resultlist.sort((a, b) => b.TOTALNUM - a.TOTALNUM);
+        } else {
+          this.rankingData = [];
+        }
+      }).catch(error => {
+        console.error('排行接口错误', error)
+        this.rankingData = [];
+      })
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
@@ -186,10 +169,9 @@
         color: #01a4fe !important;
       }
       .title-text{
-        // 多层阴影 = 立体 + 好看
         text-shadow: 0 2px 4px rgba(0, 0, 0, 0.15),
                     0 1px 2px rgba(0, 0, 0, 0.1);
-        letter-spacing: 1px; /* 文字间距更舒服 */
+        letter-spacing: 1px;
         margin-left: 8px;
       }
     }
@@ -208,7 +190,20 @@
   margin-top: -30px;
   z-index: 999;
   padding: 20px 0;
+  min-height: 60vh;
 }
+
+/* 空状态 */
+.empty-box {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  height: 50vh;
+  color: #999;
+  font-size: 15px;
+}
+
 .ranking-item{
   position: relative;
   display: flex;
@@ -258,8 +253,6 @@
     position: absolute;
     right: 10px;
     top: -10px;
-    // width: 64px;
-    // height: 28px;
   }
   .ranking-common-icon{
     position: absolute;
diff --git a/subpkg/pages/unbind-card/unbind-card.vue b/subpkg/pages/unbind-card/unbind-card.vue
deleted file mode 100644
index b9020c1..0000000
--- a/subpkg/pages/unbind-card/unbind-card.vue
+++ /dev/null
@@ -1,189 +0,0 @@
-<template>
-	<view class="reader-card">
-    <image class="card-top-bg" src="@/static/images/card-img1.png" mode="widthFix" />
-    
-    <view class="card-list">
-      <view 
-        class="card-list-item" 
-        v-for="(item, index) in cardList" 
-        :key="item.id"
-        @click="handleSelectItem(item.bindValue)"
-        :class="{ active: selectedValue === item.bindValue }"
-      >
-        <image class="card-left-img" src="@/static/images/card-img2.png" mode="widthFix" />
-        <view class="card-right-info">
-            <text class="info-title">读者证号</text>
-            <text class="info-num">{{ item.bindValue }}</text>
-        </view>
-        <radio :value="item.bindValue" :checked="selectedValue === item.bindValue"/>
-      </view>
-    </view>
-
-    <button 
-      class="unbind-btn" 
-      :disabled="!selectedValue"
-      :class="{disabled: !selectedValue}"
-      @click="handleUnbind"
-    >
-      确认解绑
-    </button>
-	</view>
-</template>
-
-<script>
-import { 
-  FetchFindAllReaderBindByOpenId, 
-  FetchUnbindReadCard,
-  FetchSetDefaultReadCard
-} from '@/api/user';
-
-const READLIST = 'reader-card-list';
-
-export default {
-	data() {
-		return {
-      selectedValue: '',
-      cardList: [],
-		}
-	},
-  onShow() {
-    this.getBindReaderCardList();
-  },
-	methods: {
-    async getBindReaderCardList() {
-      try {
-        const openId = uni.getStorageSync('wx_login_code');
-        if (!openId) return;
-
-        const res = await FetchFindAllReaderBindByOpenId({
-          libcode: '1201',
-          openId: openId
-        });
-
-        if (res.code === 200) {
-          this.cardList = res.data;
-          uni.setStorageSync(READLIST, res.data);
-        } else {
-          this.cardList = [];
-          uni.setStorageSync(READLIST, []);
-        }
-      } catch (err) {
-        this.cardList = uni.getStorageSync(READLIST) || [];
-      }
-    },
-
-    handleSelectItem(value) {
-      if (this.selectedValue === value) {
-        this.selectedValue = '';
-      } else {
-        this.selectedValue = value;
-      }
-    },
-
-    // 确认解绑
-    async handleUnbind() {
-      if (!this.selectedValue) {
-        uni.showToast({ title: '请选择要解绑的读者证', icon: 'none' });
-        return;
-      }
-
-      const openId = uni.getStorageSync('wx_login_code');
-      if (!openId) return;
-
-      // 判断：当前解绑的是不是【默认证】
-      const unbindItem = this.cardList.find(item => item.bindValue === this.selectedValue);
-      const isUnbindDefault = unbindItem?.bindDefault === true;
-
-      uni.showModal({
-        title: '提示',
-        content: `确定要解绑读者证【${this.selectedValue}】吗？`,
-        success: async (res) => {
-          if (!res.confirm) return;
-
-          try {
-            // 1. 执行解绑
-            const result = await FetchUnbindReadCard({
-              bindType: "rdid",
-              bindValue: this.selectedValue,
-              libcode: "1201",
-              openid: openId
-            });
-
-            if (result.code !== 200) {
-              uni.showToast({ title: result.msg || '解绑失败', icon: 'none' });
-              return;
-            }
-
-            uni.showToast({ title: '解绑成功', icon: 'success' });
-            this.selectedValue = '';
-
-            // 刷新列表
-            await this.getBindReaderCardList();
-
-            if (isUnbindDefault && this.cardList.length > 0) {
-              const newDefaultCard = this.cardList[0];
-              const newValue = newDefaultCard.bindValue;
-
-              const setResult = await FetchSetDefaultReadCard({
-                bindType: 'rdid',
-                bindValue: newValue,
-                libcode: '1201',
-                openid: openId
-              });
-
-              if (setResult.code === 200) {
-                uni.setStorageSync('currentReaderCard', newValue);
-                // 刷新列表，让界面显示新默认
-                await this.getBindReaderCardList();
-                uni.showToast({ title: '已自动设置默认证', icon: 'success' });
-              }
-            }
-
-            if (this.cardList.length === 0) {
-              setTimeout(() => {
-                uni.navigateBack();
-              }, 1500);
-            }
-
-          } catch (err) {
-            uni.showToast({ title: '解绑失败', icon: 'none' });
-          }
-        }
-      });
-    },
-	}
-}
-</script>
-
-<style lang="scss" scoped>
-.reader-card{
-  position: relative;
-  min-height: 100vh;
-  background-color: #f5f5f5;
-  
-  .card-top-bg{ 
-    position: absolute;
-    left: 0;
-    top: 0;
-    width: 100%;
-    display: block;
-  }
-
-  .unbind-btn{
-    position: fixed;
-    bottom: 40px;
-    left: 0;
-    right: 0;
-    width: calc(100% - 40px);
-    margin: 0 auto;
-    padding: 4px 0;
-    color: #fff;
-    background-color: #01a4fe;
-    border-radius: 23px;
-    font-size: 16px;
-		&.disabled{
-			background-color: #ccc;
-		}
-  }
-}
-</style>
\ No newline at end of file