收藏图书

api/book.js

@@ -93,3 +93,52 @@ export function FetchBookRanking(data) {
 
 // 累计借出
 //  /api/screenSetting/sync82
+
+
+
+// 根据用户openID获取收藏图书
+// ?libcode=ftzn&openId=11&page=1&size=10&title=11
+export function FetchFindAllBookCollectionByOpenId(data) {
+  return request({
+    url: '/api/weixin/findAllBookCollectionByOpenId',
+    data
+  })
+}
+
+// 
+// 收藏图书
+//{
+//   "author": "string",
+//   "bookrecno": "string",
+//   "booktype": "string",
+//   "classno": "string",
+
+//   "isbn": "string",
+//   "libcode": "string",
+//   "openid": "string",
+//   "page": "string",
+//   "price": "string",
+//   "pubdate": "string",
+//   "publisher": "string",
+//   "subject": "string",
+//   "title": "string"
+// }
+export function FetchCollectionBook(data) {
+  return request({
+    url: '/api/weixin/collectionBook',
+    method: 'POST',
+    data
+  })
+}
+
+// 取消收藏
+// {
+//   "id": 0
+// }
+export function FetchCancelCollectionBook(data) {
+  return request({
+    url: '/api/weixin/cancelCollectionBook',
+    method: 'POST',
+    data
+  })
+}

pages/home/home.vue

@@ -114,7 +114,8 @@
         :circular="false"
       >
         <swiper-item  v-for="item in readerCardList" :key="item.id">
-          <view class="card-item" :class="{'active': item.bindDefault}"   @click.stop="showQrcode(item.bindValue)">
+          <!-- :class="{'active': item.bindDefault}"  -->
+          <view class="card-item" @click.stop="showQrcode(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>

pages/search/search.vue

@@ -77,9 +77,10 @@
 
 <script>
 import { FetchInitScreenSetting } from '@/api/user';
-import { FetchBookSearch } from '@/api/book';
+import { FetchBookSearch, FetchFindAllBookCollectionByOpenId } from '@/api/book';
 import BookListItem from "@/components/book-list-item/book-list-item.vue";
 import config from '@/utils/config';
+import { getOpenId } from '@/utils/storage';
 
 export default {
 	components: { BookListItem },
@@ -194,7 +195,7 @@ export default {
         }
 
         this.isSearched = true;
-
+        console.log('this.listData',this.listData)
       } catch (err) {
         console.error('搜索接口异常', err);
         this.listData = [];
@@ -218,10 +219,46 @@ export default {
 		},
 
 		// 进入详情
-		onItemClick(item) {
+		async onItemClick(item) {
+      console.log('item', item);
+      let isCollected = false;
+      let collectId = null;
+      
+      try {
+        const openId = await getOpenId();
+        if (openId) {
+          const res = await FetchFindAllBookCollectionByOpenId({
+            libcode: config.LIB_CODE,
+            openId: openId,
+            page: 0,
+            size: 100
+          });
+          
+          if (res.code === 200) {
+            const collectList = res.data.content || [];
+            const bookrecno = String(item.bookrecno);
+            // 查找匹配的收藏记录
+            const matchedItem = collectList.find(collectItem => String(collectItem.bookrecno) === bookrecno);
+            if (matchedItem) {
+              isCollected = true;
+              collectId = matchedItem.id;  // 获取收藏记录的 id
+            }
+          }
+        }
+      } catch (err) {
+        console.error('获取收藏列表失败', err);
+      }
+      
+      // 创建包含收藏信息的新对象
+      const itemWithCollectInfo = {
+        ...item,
+        id: collectId  // 添加收藏记录的 id
+      };
+      console.log('itemWithCollectInfo',itemWithCollectInfo)
+      const isCollectedParam = isCollected ? '&isCollected=true' : '';
       uni.navigateTo({
-        url: "/subpkg/pages/book-detail/book-detail?bookrecno=" + item.bookrecno
-      })
+        url: "/subpkg/pages/book-detail/book-detail?searchData=" + encodeURIComponent(JSON.stringify(itemWithCollectInfo)) + isCollectedParam
+      });
     },
 
 		// 清空搜索

subpkg/pages/activity-detail/activity-detail.vue

@@ -45,7 +45,6 @@ export default {
 	data() {
 		return {
 			detail: {},
-			isCollected: false,
 			activityId: "",
 			contentNodes: ""
 		};
@@ -55,22 +54,11 @@ export default {
 		this.detail = item;
 		this.activityId = item.title;
 		this.formatContent();
-		this.checkCollectStatus();
 	},
 
 	methods: {
     formatContent() {
       let content = this.detail.content || "";
-
-      // const localImgReg = /<image[^>]*\s+src\s*=\s*['"]@\/static\/([^'"]+)['"][^>]*>/gi;
-      // content = content.replace(localImgReg, (match, path) => {
-      //   return `
-      //   <div style="text-align:center; margin:12px 0;">
-      //     <img src="/static/${path}" style="width:90%; border-radius:8px;">
-      //   </div>
-      //   `;
-      // });
-
       const httpImgReg = /https:\/\/mmbiz\.qpic\.cn[^ \n\r'"]+/g;
       content = content.replace(httpImgReg, url => {
         return `
@@ -82,25 +70,6 @@ export default {
 
       this.contentNodes = content;
     },
-        
-		checkCollectStatus() {
-			const list = uni.getStorageSync('activityCollectList') || [];
-			this.isCollected = list.includes(this.activityId);
-		},
-
-		toggleCollect() {
-			let list = uni.getStorageSync('activityCollectList') || [];
-			if (this.isCollected) {
-				list = list.filter(i => i !== this.activityId);
-				uni.showToast({ title: "取消收藏" });
-			} else {
-				list.push(this.activityId);
-				uni.showToast({ title: "收藏成功", icon: "success" });
-			}
-			uni.setStorageSync('activityCollectList', list);
-			this.isCollected = !this.isCollected;
-		},
-
 		handleJoin() {
 			if (this.detail.status === 0) {
 				return;

subpkg/pages/book-detail/book-detail.vue

@@ -96,7 +96,8 @@
 
 <script>
 import { FetchInitScreenSetting } from '@/api/user';
-import { FetchFindbookByQuery, FetchDictionaryTree } from '@/api/book';
+import { FetchFindbookByQuery, FetchDictionaryTree,FetchCollectionBook,FetchCancelCollectionBook } from '@/api/book';
+import { getOpenId } from '@/utils/storage';
 import config from '@/utils/config';
 
 export default {
@@ -109,6 +110,7 @@ export default {
       opacUrl: '',
       fromRecommend: false,
       bookInfo: {},
+      searchListInfo: {},
       holdingsData: [],
       dictionaryTree: {},
       libraryMap: {},
@@ -126,9 +128,19 @@ export default {
       this.checkCollectStatus();
       return;
     }
-
+    console.log('options',options)
     // 2. 检索页只传 bookrecno，请求接口拿详情
-    this.bookrecno = options.bookrecno || "";
+    if(options.searchData){
+      const bookData = JSON.parse(decodeURIComponent(options.searchData));
+      this.searchListInfo = bookData;
+      this.bookrecno = bookData.bookrecno || "";
+    }
+    
+    // 3. 如果从收藏列表进入，直接设置为已收藏状态
+    if (options.isCollected === 'true') {
+      this.isCollected = true;
+    }
+    
     this.fromRecommend = false;
     this.getOpacUrl();
     this.getDictionaryTree();
@@ -194,7 +206,7 @@ export default {
       } catch (err) {}
     },
 
-    // 获取图书详情（适配新接口结构）
+    // 获取图书详情
     async getBookDetail() {
       if (!this.bookrecno || !this.opacUrl) return;
 
@@ -251,25 +263,66 @@ export default {
       return this.locationMap[orglocal] || orglocal || '葛店图书馆';
     },
 
-    // 收藏
+    // 收藏状态检查（如果已经通过参数传入则跳过）
     checkCollectStatus() {
+      if (this.isCollected) return;
       const list = uni.getStorageSync('collectList') || [];
       this.isCollected = list.includes(this.bookrecno);
     },
-    toggleCollect() {
-      let list = uni.getStorageSync('collectList') || [];
+    async toggleCollect() {
+      const openId = await getOpenId();
+
+      if (!openId) {
+        uni.showToast({ title: '获取用户信息失败', icon: 'none' });
+        return;
+      }
+
       if (this.isCollected) {
-        list = list.filter(i => i !== this.bookrecno);
+        try {
+          console.log(' this.searchListInfo.id',this.searchListInfo.id);
+          const res = await FetchCancelCollectionBook({id: this.searchListInfo.id});
+          if (res.code === 200) {
+            this.isCollected = false;
+            // 清空收藏记录 id，避免影响后续收藏操作
+            if (this.searchListInfo) {
+              this.searchListInfo.id = null;
+            }
+            // 设置取消收藏标记，通知收藏列表页面刷新
+            uni.setStorageSync('needRefreshCollect', true);
             uni.showToast({ title: '取消收藏', icon: 'success' });
           } else {
-        list.push(this.bookrecno);
+            uni.showToast({ title: res.message || '取消收藏失败', icon: 'none' });
+          }
+        } catch (err) {
+          console.error('取消收藏图书失败', err);
+          uni.showToast({ title: '取消收藏失败', icon: 'none' });
+        }
+
+      } else {
+        try {
+          const params = {
+            ...this.searchListInfo,
+            openid: openId,
+            libcode: config.LIB_CODE
+          };
+          const res = await FetchCollectionBook(params);
+          if (res.code === 200) {
+            this.isCollected = true;
+            // 保存收藏记录的 id，供后续取消收藏使用
+            if (res.data && res.data.id) {
+              this.searchListInfo.id = res.data.id;
+            }
             uni.showToast({ title: '收藏成功', icon: 'success' });
+          } else {
+            uni.showToast({ title: res.message || '收藏失败', icon: 'none' });
+          }
+        } catch (err) {
+          console.error('收藏图书失败', err);
+          uni.showToast({ title: '收藏失败', icon: 'none' });
+        }
       }
-      uni.setStorageSync('collectList', list);
-      this.isCollected = !this.isCollected;
     }
   },
-
   onShareAppMessage() {
     return {
       title: this.bookInfo.title || '图书详情',

subpkg/pages/collect-list/collect-list.vue

@@ -1,22 +1,21 @@
 <template>
 	<view class="collection-page">
 		<view class="content-box">
-			<view class="empty" v-if="bookCollectList.length === 0">
+			<view class="empty" v-if="bookCollectList.length === 0 && !isLoading">
         <uni-icons style="margin-left: 20px;" custom-prefix="iconfont" type="icon-kongshuju" size="80"></uni-icons>
         <text style="margin-top: 20px;">暂无收藏的图书~</text>
 			</view>
 			<view class="recommendation-list" v-else>
-				<view
-					class="book-item"
+        <book-list-item
+					class="hot-list-item"
 					v-for="(item, index) in bookCollectList"
-					@click="goToBookDetail(item)"
 					:key="index"
-				>
-					<image class="book-cover" :src="item.cover"></image>
-					<view class="book-title">{{ item.title }}</view>
+					:data="item"
+					:ranking="index + 1"
+					@click="onItemClick(item)"
+				></book-list-item>
 			</view>
-			</view>
-			<uni-load-more status="loading" v-if="isLoading"></uni-load-more>
+			<uni-load-more status="loading" v-if="isLoading && bookCollectList.length > 0"></uni-load-more>
 			<view class="no-more" v-if="noMore && bookCollectList.length > 0">
 				没有更多数据了
 			</view>
@@ -25,61 +24,143 @@
 </template>
 
 <script>
+import BookListItem from "@/components/book-list-item/book-list-item.vue";
+import { FetchFindAllBookCollectionByOpenId } from '@/api/book';
+import { getOpenId } from '@/utils/storage';
+import config from '@/utils/config';
+
 export default {
+	components: {
+		BookListItem,
+	},
 	data() {
 		return {
 			isLoading: false,
 			noMore: false,
-			pageNum: 1,
-			pageSize: 5,
-
-			bookCollectList: [
-				{ isbn: '9787544741110', title: '人工智能基础——数学知识', cover: 'https://qiniu.aiyxlib.com/1606124577077' },
-				{ isbn: '9787539938032', title: 'Vim 8文本处理实战', cover: 'https://qiniu.aiyxlib.com/1606178450151' },
-				{ isbn: '9787536692930', title: 'Oracle从入门到精通', cover: 'https://qiniu.aiyxlib.com/1606123986028' }
-			],
+			pageNum: 0,
+			pageSize: 10,
+			bookCollectList: [],
+			hasLoadedAll: false,
 		}
 	},
 
 	onLoad() {
+		// this.loadData();
 	},
+	onShow() {
+		// 检查是否需要刷新（从图书详情取消收藏回来）
+		const needRefresh = uni.getStorageSync('needRefreshCollect');
+		uni.removeStorageSync('needRefreshCollect');
 		
+		// 如果已经加载到最后，或者有取消收藏操作，需要刷新数据
+		if (this.hasLoadedAll || needRefresh) {
+			this.refreshData();
+		} else if (this.bookCollectList.length === 0) {
+			// 如果还没加载过数据，也需要加载
+			this.refreshData();
+		}
+	},
 	onPullDownRefresh() {
-		this.refreshData()
+		this.refreshData();
 	},
-
 	onReachBottom() {
-		if (this.noMore || this.isLoading) return
-		this.loadMore()
+		if (this.noMore || this.isLoading) return;
+		this.loadMore();
 	},
 
 	methods: {
-		refreshData() {
-			this.isLoading = true
-			setTimeout(() => {
-				this.bookCollectList = [
-					{ isbn: '9787544741110', title: '人工智能基础——数学知识', cover: 'https://qiniu.aiyxlib.com/1606124577077' },
-					{ isbn: '9787539938032', title: 'Vim 8文本处理实战', cover: 'https://qiniu.aiyxlib.com/1606178450151' },
-					{ isbn: '9787536692930', title: 'Oracle从入门到精通', cover: 'https://qiniu.aiyxlib.com/1606123986028' }
-				]
-				this.isLoading = false
-				uni.stopPullDownRefresh()
-			}, 500)
-		},
+		async loadData() {
+			this.isLoading = true;
+			try {
+				const openId = await getOpenId();
+				if (!openId) {
+					uni.showToast({ title: '获取用户信息失败', icon: 'none' });
+					this.isLoading = false;
+					return;
+				}
+
+				const res = await FetchFindAllBookCollectionByOpenId({
+					libcode: config.LIB_CODE,
+					openId: openId,
+					page: this.pageNum,
+					size: this.pageSize,
+				});
 
-		loadMore() {
-			this.isLoading = true
-			this.pageNum++
-			setTimeout(() => {
-				this.noMore = true
-				this.isLoading = false
-			}, 500)
+				if (res.code === 200) {
+				this.bookCollectList = res.data.content || [];
+				this.noMore = (res.data.content || []).length < this.pageSize;
+				this.hasLoadedAll = this.noMore;
+			} else {
+					uni.showToast({ title: res.message || '获取收藏列表失败', icon: 'none' });
+				}
+			} catch (err) {
+				console.error('获取收藏列表失败', err);
+				uni.showToast({ title: '获取收藏列表失败', icon: 'none' });
+			} finally {
+				this.isLoading = false;
+			}
 		},
 
-		goToBookDetail(item) {
-			uni.navigateTo({ url: "/subpkg/pages/book-detail/book-detail?isbn=" + item.isbn })
+		async refreshData() {
+      this.pageNum = 0;
+      this.noMore = false;
+      this.bookCollectList = [];
+      await this.loadData();
+      // 滚动条回到顶部
+      uni.pageScrollTo({
+        scrollTop: 0,
+        duration: 300
+      });
+      uni.stopPullDownRefresh();
     },
+
+		async loadMore() {
+			if (this.noMore || this.isLoading) return;
+			
+			this.pageNum++;
+			this.isLoading = true;
+
+			try {
+				const openId = await getOpenId();
+				if (!openId) {
+					uni.showToast({ title: '获取用户信息失败', icon: 'none' });
+					this.isLoading = false;
+					return;
+				}
+
+				const res = await FetchFindAllBookCollectionByOpenId({
+					libcode: config.LIB_CODE,
+					openId: openId,
+					page: this.pageNum,
+					size: this.pageSize,
+				});
+        console.log('res',res)
+        console.log('res.data',res.data)
+        console.log('res.data.content',res.data.content)
+
+				if (res.code === 200) {
+					const newData = res.data.content || [];
+					this.bookCollectList = [...this.bookCollectList, ...newData];
+					this.noMore = newData.length < this.pageSize;
+				} else {
+					this.pageNum--;
+					uni.showToast({ title: res.message || '加载更多失败', icon: 'none' });
+				}
+			} catch (err) {
+				console.error('加载更多收藏失败', err);
+				this.pageNum--;
+				uni.showToast({ title: '加载更多失败', icon: 'none' });
+			} finally {
+				this.isLoading = false;
+			}
 		},
+		onItemClick(item) {
+      console.log('item',item)
+      uni.navigateTo({
+        url: "/subpkg/pages/book-detail/book-detail?searchData=" + encodeURIComponent(JSON.stringify(item)) + '&isCollected=true'
+      })
+    }
+	}
 }
 </script>
 
@@ -96,7 +177,10 @@ export default {
 
 .empty {
 	padding: 60px 0;
+	text-align: center;
+	color: #999;
 }
+
 .no-more {
 	text-align: center;
 	padding: 20px 0;
@@ -105,9 +189,56 @@ export default {
 }
 
 .recommendation-list {
-  flex-wrap: wrap;
+	display: flex;
+	flex-direction: column;
+	gap: 12px;
+}
+
 .book-item {
-    margin-bottom: 16px;
+	display: flex;
+	background: #fff;
+	border-radius: 8px;
+	padding: 12px;
+	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
+}
+
+.book-cover {
+	width: 80px;
+	height: 100px;
+	border-radius: 4px;
+	flex-shrink: 0;
+	background: #f5f5f5;
 }
+
+.book-info {
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	padding-left: 12px;
+	overflow: hidden;
+}
+
+.book-title {
+	font-size: 15px;
+	font-weight: 500;
+	color: #333;
+	line-height: 1.4;
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+	overflow: hidden;
+}
+
+.book-author {
+	font-size: 13px;
+	color: #999;
+	margin-top: 6px;
+}
+
+.book-publisher {
+	font-size: 12px;
+	color: #ccc;
+	margin-top: 4px;
 }
 </style>