From 1cacadcfe4e5103f67ba8a784456587607d99e48 Mon Sep 17 00:00:00 2001
From: wangzimeng <3297159934@qq.com>
Date: Thu, 24 Jul 2025 18:26:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=88=B7=E6=96=B0=E5=8D=B3?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=EF=BC=9A=E6=94=B6=E8=97=8F=E5=92=8C=E8=B6=B3?=
 =?UTF-8?q?=E8=BF=B9=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/goods-collect.vue |  45 +++++--
 pages/user/goods-log.vue     | 246 +++++++++++++++--------------------
 2 files changed, 142 insertions(+), 149 deletions(-)

diff --git a/pages/user/goods-collect.vue b/pages/user/goods-collect.vue
index 3a83651..e75a9a4 100644
--- a/pages/user/goods-collect.vue
+++ b/pages/user/goods-collect.vue
@@ -6,11 +6,11 @@
 				<su-tabs :list="tabMaps" @change="onChange" :scrollable="false" :current="currentTab"></su-tabs>
 			</view>
 
-			
+
 			<scroll-view @scrolltolower="onScrolltolower" :refresher-enabled="true" :refresher-triggered="homrS"
 				@refresherrefresh="onS" scroll-y="true" class="flex align-items"
 				style="height: 1250rpx;box-sizing: border-box;">
-				
+
 				<!-- 食堂招租 -->
 				<view class="recommend-box" v-if="currentTab == 0">
 					<view class="rrecommList" v-for="(item,index) in collectRentList" :key="index">
@@ -88,7 +88,7 @@
 					</view>
 
 				</view>
-				
+
 				<!-- 无数据展示 -->
 				<view class="flex flex-column flex-start align-items" style="margin-top: 400rpx;"
 					v-if="( currentTab == 0 && collectRentList.length == 0) || (currentTab == 1 && collectSchoolList.length == 0)">
@@ -98,7 +98,7 @@
 					<view style="margin-top: 30rpx;font-size: 28rpx;color: #323232;">暂无数据信息</view>
 				</view>
 			</scroll-view>
-			
+
 
 
 		</view>
@@ -159,6 +159,7 @@
 	const collectSchoolList = ref([])
 	const schoolCount = ref(0)
 	const homrS = ref(false)
+	const loadStatus = ref('')
 	//切换tabs
 	function onChange(e) {
 		console.log('onChange', e);
@@ -186,7 +187,7 @@
 		console.log('招租收藏列表', res);
 
 		if (res.code == 1) {
-			collectRentList.value =[...collectRentList.value,...res.data.list];
+			collectRentList.value = [...collectRentList.value, ...res.data.list];
 			rentCount.value = res.data.count
 		} else {
 			// Handle case where data is not in expected format
@@ -212,7 +213,7 @@
 		console.log('平台课程收藏列表', res);
 
 		if (res.code == 1) {
-			collectSchoolList.value =[...collectSchoolList.value,...res.data.list];
+			collectSchoolList.value = [...collectSchoolList.value, ...res.data.list];
 			schoolCount.value = res.data.count
 		} else {
 			// Handle case where data is not in expected format
@@ -229,20 +230,46 @@
 	function onScrolltolower() {
 		if (currentTab.value == 0) {
 			if (collectRentList.value.length < rentCount.value) {
-				listQuery.value.rentPage+=1;
+				listQuery.value.rentPage += 1;
 				getRentList();
 			}
 		} else {
 			if (collectSchoolList.value.length < schoolCount.value) {
-				listQuery.value.schoolPage+=1;
+				listQuery.value.schoolPage += 1;
 				getSchoolList();
 			}
 		}
 
 	}
-
+	//下拉刷新
 	function onS() {
 		homrS.value = true
+		uni.showLoading({
+			title: '加载中...'
+		});
+		resetLists();
+		if(currentTab.value == 0){
+			getRentList();
+		}else {
+			getSchoolList();
+		}
+		setTimeout(() => {
+			homrS.value = false;
+			uni.hideLoading();
+			uni.stopPullDownRefresh();
+		}, 2000)
+	}
+	// 重置列表
+	function resetLists() {
+		if (currentTab.value == 0) {
+			listQuery.value.rentPage = 1;
+			collectRentList.value = [];
+			loadStatus.value = "loading";
+		} else {
+			listQuery.value.schoolPage = 1;
+			collectSchoolList.value = [];
+			loadStatus.value = "loading";
+		}
 	}
 
 	onReachBottom(() => {});
diff --git a/pages/user/goods-log.vue b/pages/user/goods-log.vue
index 338e30e..3cb1acd 100644
--- a/pages/user/goods-log.vue
+++ b/pages/user/goods-log.vue
@@ -1,83 +1,66 @@
 <template>
 	<s-layout title="我的足迹" :bgStyle="{ color: '#f2f2f2' }">
 		<view class="cart-box ss-flex ss-flex-col ss-row-between">
-			<!-- 头部 -->
-			<!-- <view class="cart-header ss-flex ss-col-center ss-row-between ss-p-x-30">
-       <view class="header-left ss-flex ss-col-center ss-font-26">
-          共
-          <text class="goods-number ui-TC-Main ss-flex">
-            {{ state.pagination.total }}
-          </text>
-          件商品
-        </view> 
-        <view class="header-right">
-          <button
-            v-if="state.editMode && state.pagination.total"
-            class="ss-reset-button"
-            @tap="state.editMode = false"
-          >
-            取消
-          </button>
-          <button
-            v-if="!state.editMode && state.pagination.total"
-            class="ss-reset-button ui-TC-Main"
-            @tap="state.editMode = true"
-          >
-            编辑
-          </button>
-        </view>
-      </view>-->
-			<!-- 内容 -->
-			<view class="cart-content">
-				<view class="goods-box ss-r-10 ss-m-b-14" v-for="(item, index) in feetHisList" :key="index">
-					<view class="dataBox">{{item.date_text}}</view>
-					<view class="rrecommList" v-for="(e,i) in item.log" :key="i">
-						<view class="reListItem">
-							<!-- 左侧图片 -->
-							<view class="listItem-images">
-								<image v-if="e.information.recommend == 1"
-									style="width: 77rpx;height: 36rpx;z-index: 100;position: relative;top: 34rpx;left: 0rpx;"
-									src="https://jiangxiaoxian.0rui.cn/hot.png"></image>
-								<image class="iamges-mainImg" :src="e.information.images[0]"></image>
-							</view>
-							<!-- 右侧内容 -->
-							<view class="listItem-contents">
-								<view class="title2" style="margin-bottom: 20rpx;">{{e.information.platform_title}}</view>
-								<scroll-view class="score-box">
-									<view class="fs11 flex cate">
-										<view class="cate-e" v-for="(w,q) in e.information.cate" :key="q">
-											<view v-show="w" class="status-tag " style="margin-right: 20rpx;">{{w}}
+			<scroll-view @scrolltolower="onScrolltolower" :refresher-enabled="true" :refresher-triggered="homrS"
+				@refresherrefresh="onS" scroll-y="true" class="flex align-items"
+				style="height: 1000rpx;box-sizing: border-box;">
+				<view class="cart-content">
+					<view class="goods-box ss-r-10 ss-m-b-14" v-for="(item, index) in feetHisList" :key="index">
+						<view class="dataBox">{{item.date_text}}</view>
+						<view class="rrecommList" v-for="(e,i) in item.log" :key="i">
+							<view class="reListItem">
+								<!-- 左侧图片 -->
+								<view class="listItem-images">
+									<image v-if="e.information.recommend == 1"
+										style="width: 77rpx;height: 36rpx;z-index: 100;position: relative;top: 34rpx;left: 0rpx;"
+										src="https://jiangxiaoxian.0rui.cn/hot.png"></image>
+									<image class="iamges-mainImg" :src="e.information.images[0]"></image>
+								</view>
+								<!-- 右侧内容 -->
+								<view class="listItem-contents">
+									<view class="title2" style="margin-bottom: 20rpx;">{{e.information.platform_title}}
+									</view>
+									<scroll-view class="score-box">
+										<view class="fs11 flex cate">
+											<view class="cate-e" v-for="(w,q) in e.information.cate" :key="q">
+												<view v-show="w" class="status-tag " style="margin-right: 20rpx;">{{w}}
+												</view>
 											</view>
 										</view>
-									</view>
-								</scroll-view>
-								<view class="cons-third">
-									<view style="display: flex;">
-										<image style="width: 24rpx;height: 24rpx;"
-											src="https://jiangxiaoxian.0rui.cn/locationList.png"></image>
-										<view class="title3" style="margin-left: 10rpx;">{{e.information.address_city_text}}
+									</scroll-view>
+									<view class="cons-third">
+										<view style="display: flex;">
+											<image style="width: 24rpx;height: 24rpx;"
+												src="https://jiangxiaoxian.0rui.cn/locationList.png"></image>
+											<view class="title3" style="margin-left: 10rpx;">
+												{{e.information.address_city_text}}
+											</view>
+										</view>
+										<view class="title3">{{e.information.release_time_text}}</view>
+										<view style="display: flex;">
+											<image style="width: 26rpx;height: 20rpx;"
+												src="https://jiangxiaoxian.0rui.cn/eye.png"></image>
+											<view class="title3" style="margin-left: 10rpx;">{{e.information.views}}
+											</view>
 										</view>
-									</view>
-									<view class="title3">{{e.information.release_time_text}}</view>
-									<view style="display: flex;">
-										<image style="width: 26rpx;height: 20rpx;"
-											src="https://jiangxiaoxian.0rui.cn/eye.png"></image>
-										<view class="title3" style="margin-left: 10rpx;">{{e.information.views}}</view>
 									</view>
 								</view>
 							</view>
 						</view>
+
 					</view>
-					
 				</view>
-			</view>
-			
-			<view class="flex flex-column flex-start align-items"
-				v-if="feetHisList.length == 0" style="margin-top: 300rpx;">
-				<image src="https://jiangxiaoxian.0rui.cn/noneList.png" mode="" style="width: 180rpx;height: 180rpx;">
-				</image>
-				<view style="margin-top: 30rpx;font-size: 28rpx;color: #323232;">暂无数据信息</view>
-			</view>
+
+				<view class="flex flex-column flex-start align-items" v-if="feetHisList.length == 0"
+					style="margin-top: 300rpx;">
+					<image src="https://jiangxiaoxian.0rui.cn/noneList.png" mode=""
+						style="width: 180rpx;height: 180rpx;">
+					</image>
+					<view style="margin-top: 30rpx;font-size: 28rpx;color: #323232;">暂无数据信息</view>
+				</view>
+			</scroll-view>
+
+
 		</view>
 		<!-- <uni-load-more v-if="state.pagination.total > 0" :status="state.loadStatus" :content-text="{
         contentdown: '上拉加载更多',
@@ -108,6 +91,9 @@
 	// const today = ref('')
 
 	const feetHisList = ref([])
+	const homrS = ref('')
+	const feetCount = ref(0);
+	const loadStatus = ref('');
 	// 接口传参
 	const listQuery = ref({
 		page: 1,
@@ -129,7 +115,6 @@
 	})
 
 	onLoad(() => {
-		// getData();
 		getFeetList();
 	});
 
@@ -141,63 +126,44 @@
 		});
 		console.log('足迹返值', res);
 		if (res.code == 1) {
-			feetHisList.value = res.data.list
+			feetHisList.value = [...feetHisList.value, ...res.data.list]
+			feetCount.value = res.data.count
 			console.log('足迹列表', feetHisList.value);
 		}
 
 	}
 
-	const sys_navBar = sheep.$platform.navbar;
-	const pagination = {
-		data: [],
-		current_page: 1,
-		total: 1,
-		last_page: 1,
-	};
-	const state = reactive({
-		pagination: {
-			data: [],
-			current_page: 1,
-			total: 1,
-			last_page: 1,
-		},
-		loadStatus: '',
-		editMode: false,
-		selectedCollectList: [],
-		selectAll: false,
-	});
-
-	async function getData(page = 1, list_rows = 10) {
-		state.loadStatus = 'loading';
-		let res = await sheep.$api.user.goodsLog.list({
-			type: 'views',
-			list_rows,
-			page,
+	//加载更多
+	function onScrolltolower() {
+		if (feetHisList.value.length < feetCount.value) {
+			listQuery.value.page += 1;
+			getFeetList();
+		}
+	}
+	//下拉刷新
+	function onS() {
+		homrS.value = true
+		uni.showLoading({
+			title: '加载中...'
 		});
-		if (res.code === 1) {
-			let orderList = _.concat(state.pagination.data, res.data.data);
-			state.pagination = {
-				...res.data,
-				data: orderList,
-			};
-			if (state.pagination.current_page < state.pagination.last_page) {
-				state.loadStatus = 'more';
-			} else {
-				state.loadStatus = 'noMore';
-			}
-		}
+		resetLists();
+		setTimeout(() => {
+			homrS.value = false;
+			uni.hideLoading();
+			uni.stopPullDownRefresh();
+		}, 2000)
 	}
-	// 格式化价格
 
-	// 加载更多
-	function loadmore() {
-		if (state.loadStatus !== 'noMore') {
-			getData(state.pagination.current_page + 1);
-		}
+	// 重置列表
+	function resetLists() {
+		listQuery.value.page = 1;
+		feetHisList.value = [];
+		loadStatus.value = "loading";
+		getFeetList();
 	}
-	onReachBottom(() => {
-		loadmore();
-	});
+
+	const sys_navBar = sheep.$platform.navbar;
+	onReachBottom(() => {});
 </script>
 
 <style lang="scss" scoped>
@@ -207,27 +173,27 @@
 		font-weight: 800;
 		line-height: 34rpx;
 	}
-	
+
 	.intro {
 		font-size: 24rpx;
 		font-weight: 400;
 		line-height: 24rpx;
 	}
-	
+
 	.title2 {
 		color: #3d3d3d;
 		font-size: 30rpx;
 		font-weight: 800;
 		line-height: 42rpx;
 	}
-	
+
 	.title3 {
 		font-size: 20rpx;
 		font-weight: 400;
 		color: #999999;
 		line-height: 22rpx;
 	}
-	
+
 	.cart-box {
 		.cart-header {
 			height: 70rpx;
@@ -261,15 +227,15 @@
 
 			.goods-box {
 				// background-color: #fff;
-				
+
 				.dataBox {
 					margin: 30rpx;
 				}
-				
+
 				.rrecommList {
 					margin-top: 30rpx;
 					// padding: 30rpx;
-				
+
 					.reListItem {
 						background-color: #ffffff;
 						width: 640rpx;
@@ -279,11 +245,11 @@
 						justify-content: flex-start;
 						align-items: center;
 						border-radius: 18rpx;
-				
+
 						.listItem-images {
 							display: grid;
 							justify-content: flex-start;
-				
+
 							.iamges-mainImg {
 								width: 190rpx;
 								height: 190rpx;
@@ -291,23 +257,23 @@
 								right: 0rpx;
 								bottom: 18rpx;
 								z-index: 1;
-				
+
 							}
 						}
-				
+
 						.listItem-contents {
 							margin-left: 20rpx;
-				
+
 							.score-box {
 								display: flex;
-				
+
 								.cate {
 									display: flex;
 									justify-content: flex-start;
 									align-items: center;
-				
+
 									.cate-e {
-				
+
 										.status-tag {
 											padding: 5rpx 15rpx;
 											border-radius: 5rpx;
@@ -315,19 +281,19 @@
 											font-weight: 400;
 											line-height: 22rpx;
 											background-color: rgba(247, 97, 0, 0.2);
-				
+
 											// opacity: 0.2;
 											color: #F76100;
 											//flex-shrink: 0
 										}
 									}
 								}
-				
-				
-				
+
+
+
 							}
-				
-				
+
+
 							.cons-third {
 								margin-top: 20rpx;
 								display: flex;
@@ -336,9 +302,9 @@
 							}
 						}
 					}
-				
+
 				}
-				
+
 
 				&:last-child {
 					margin-bottom: 40rpx;