藏馆接口处理完成

pages/xingmaLab/xingmaLab.less

@@ -142,6 +142,14 @@
             font-size: 36rpx;
             color: #000;
             font-weight: 400;
+            width: 707rpx;
+            height: 40rpx;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            display: block;
+            max-width: 707rpx;
+            word-break: keep-all;
           }
           
           .nicheng_shoucang_zhaungtai{

pages/xingmaLab/xingmaLab.vue

@@ -3,7 +3,9 @@
 		<!-- 第一层：顶部导航 -->
 		<view class="top-navigation">
 			<view class="nav-left">
-				<image class="back-btn" src="../../static/xingmaLab/1001/backBtn.png" mode="aspectFit" @click="handleBack" />
+				<image class="back-btn" 
+				:src="$baseUrl + `xingmaLab/1001/backBtn.png`" 
+				mode="aspectFit" @click="handleBack" />
 			</view>
 			<view class="nav-center">
 				<text class="nav-title">星妈Lab</text>
@@ -16,7 +18,7 @@
 			<!-- 藏馆内容 - 单列瀑布流 -->
 			<scroll-view v-if="activeTab === 'cangguan'" scroll-y="true" class="cangguan-content" @scrolltolower="handleScroll_cangguan">
 				<view class="banner_content">
-					<image class="banner_img" src="../../static/xingmaLab/1001/bannerImg0.png" mode="aspectFill"  />
+					<image class="banner_img" :src="$baseUrl + `xingmaLab/1001/bannerImg0.png`" mode="aspectFill"  />
 				</view>
 				
 				<view 
@@ -28,7 +30,7 @@
 					<view class="item_cangguan_bottom">
 						<view class="item_cangguan_bottom_bg">
 						</view>
-						<image class="item_logo" src="../../static/xingmaLab/1001/item_logo_cangguan.png" mode="aspectFill" />
+						<image class="item_logo" :src="$baseUrl + `xingmaLab/1001/item_logo_cangguan.png`" mode="aspectFill" />
 						<view class="title_line"></view>
 						<view class="nick_name_content">
 							<text class="nick_name">No.{{ item.bizNo }}</text>
@@ -39,10 +41,10 @@
 						<text class="item_desc">{{ item.content }}</text>
 						<view class="nicheng_shoucang_zhaungtai">
 							<view class="nicheng_shoucang_item">
-								<image class="avatar_img" src="../../static/xingmaLab/1001/avatar.png" mode="aspectFill" />
+								<image class="avatar_img" :src="`${item.avatar}`" mode="aspectFill" />
 								<text class="nick_name_text">{{ item.nickname }}</text>
 								<text class="shoucang_text">{{ item.collection ? '已收藏' : '未收藏' }}</text>
-								<image class="shoucang_icon" :src="item.collection ? '../../static/xingmaLab/1001/shoucang_on.png' : '../../static/xingmaLab/1001/shoucang_off.png'" mode="aspectFit" />
+								<image class="shoucang_icon" :src="item.collection ? $baseUrl + `xingmaLab/1001/shoucang_on.png` : $baseUrl + `xingmaLab/1001/shoucang_off.png`" mode="aspectFit" />
 							</view>
 						</view>
 					</view>
@@ -151,17 +153,17 @@
 			<view class="bottom-nav-item1" :class="{ active: activeTab === 'cangguan' }" @click="handleBottomNavClick('cangguan')">
 				<image 
 					class="bottom-nav-icon1" 
-					:src="activeTab === 'cangguan' ? '../../static/xingmaLab/1001/tab_cangguang_selected.png' : '../../static/xingmaLab/1001/tab_cangguang_normal.png'" 
+					:src="activeTab === 'cangguan' ? $baseUrl + `xingmaLab/1001/tab_cangguang_selected.png` : $baseUrl + `xingmaLab/1001/tab_cangguang_normal.png`" 
 					mode="aspectFit" 
 				/>
 			</view>
 			<view class="bottom-nav-item2">
-				<image class="publish-icon" src="../../static/xingmaLab/1001/tab_fabu.png" @click="handleBottomNavFabu" mode="aspectFit" />
+				<image class="publish-icon" :src="$baseUrl + `xingmaLab/1001/tab_fabu.png`" @click="handleBottomNavFabu" mode="aspectFit" />
 			</view>
 			<view class="bottom-nav-item3" :class="{ active: activeTab === 'wodecangguan' }" @click="handleBottomNavClick('wodecangguan')">
 				<image 
 					class="bottom-nav-icon3" 
-					:src="activeTab === 'wodecangguan' ? '../../static/xingmaLab/1001/tab_wodecangguan_selected.png' : '../../static/xingmaLab/1001/tab_wodecangguan_normal.png'" 
+					:src="activeTab === 'wodecangguan' ? $baseUrl + `xingmaLab/1001/tab_wodecangguan_selected.png` : $baseUrl + `xingmaLab/1001/tab_wodecangguan_normal.png`" 
 					mode="aspectFit" 
 				/>
 			</view>
@@ -173,6 +175,7 @@
 import { ref, onMounted } from 'vue'
 import { fetchRecordList } from '../../api/xingmaLab'
 import { onPageScroll } from "@dcloudio/uni-app";
+import { showLoading, hideLoading } from '../../utils/index.js'
 
 // 定义组件名称
 defineOptions({
@@ -193,12 +196,26 @@ const shoucangList = ref([]);
 			
 
 // });
-const handleScroll_cangguan = (e) => {
+const isGeting = ref(false);
+const handleScroll_cangguan = async (e) => {
 
 	console.log('以移动到底部');
+	if(cangguanListIdx.value > cangguanTotalPage.value - 1) return;
+
+	if(isGeting.value) return;
+
+	showLoading()
+	isGeting.value = true;
+	cangguanListIdx.value++;
+	const data1 = await fetchRecordList(cangguanListIdx.value,1);
+	cangguanList.value = cangguanList.value.concat(data1.data.list);
+	setTimeout(() => {
+		isGeting.value = false;
+	}, 500);
+	hideLoading();
 	// cangguanList.value = cangguanList.value.concat(data.data.list);
 
-	cangguanList.value = data.data.list.concat(data.data.list);
+	// cangguanList.value = data.data.list.concat(data.data.list);
 }
 
 const handleScroll1 = (e) => {
@@ -230,12 +247,16 @@ const handleImageLoad = (e, item, index) => {
 	console.log(`图片 ${index} 加载完成，设置高度为: ${item.itemHeight}px`);
 }
 
+const cangguanListIdx = ref(1);
+const cangguanTotalPage = ref(0);
 onMounted(async () => {  
 
 	
 	//获取藏馆列表
-	const data1 = await fetchRecordList(1,4);
-	console.log('data1=',data1);
+	const data1 = await fetchRecordList(cangguanListIdx.value,1);
+	cangguanList.value = cangguanList.value.concat(data1.data.list);
+	cangguanTotalPage.value = data1.data.totalPage;
+	// console.log('data1=',data1);
 
 	//获取我的藏品列表
 	// const data = await fetchRecordMyrecords();
@@ -243,7 +264,7 @@ onMounted(async () => {
 	//获取我的收藏列表
 	// const data = await fetchFavoriteList();
 
-	cangguanList.value = data.data.list;
+	// cangguanList.value = data.data.list;
 	
 	shoucangList.value = cangguanList.value;//convertDobuleList(data.data.list);
 })