From e96d67023b1888e423af418341f1fa8f40de18f6 Mon Sep 17 00:00:00 2001
From: wangzimeng <3297159934@qq.com>
Date: Wed, 6 Aug 2025 14:41:13 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=8B=9B=E7=A7=9F=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E4=B8=BB=E5=9B=BE=E4=BD=8D=E7=A7=BB=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=9A=E8=B6=B3=E8=BF=B9=E5=92=8C=E9=A3=9F=E5=A0=82=E6=8B=9B?=
 =?UTF-8?q?=E7=A7=9F=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=AD=98=E5=9C=A8=E6=9C=89?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=8E=A8=E8=8D=90=E5=92=8C=E9=9D=9E=E6=8E=A8?=
 =?UTF-8?q?=E8=8D=90=E7=9A=84=E6=A0=87=E7=AD=BE=E6=98=BE=E7=A4=BA=E6=89=80?=
 =?UTF-8?q?=E4=BB=A5=E4=BC=9A=E5=AD=98=E5=9C=A8=E9=94=99=E4=BD=8D=202?=
 =?UTF-8?q?=E3=80=81=E5=8F=91=E5=B8=83=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E8=A7=A6=E5=BA=95=203=E3=80=81=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8=E7=9A=84=E6=BB=A1=E5=87=8F=E5=88=B8=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/canteenRent/rentList.vue | 37 ++++++++++++-----------
 pages/coupon/list.vue          |  5 +++-
 pages/index/fabu.vue           |  2 +-
 pages/user/goods-collect.vue   |  6 ++--
 pages/user/goods-log.vue       | 55 ++++++++++++++++++----------------
 5 files changed, 57 insertions(+), 48 deletions(-)

diff --git a/pages/canteenRent/rentList.vue b/pages/canteenRent/rentList.vue
index 14c6d09..9519916 100644
--- a/pages/canteenRent/rentList.vue
+++ b/pages/canteenRent/rentList.vue
@@ -29,7 +29,8 @@
 								style="width: auto; position: relative;display: flex;justify-content: flex-start;align-items: center;">
 								<view
 									style="max-width: 110rpx; position: relative;font-size: 28rpx;font-weight: 400;color: #999999;line-height: 32rpx;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-									{{dictLabel || '标签'}}</view>
+									{{dictLabel || '标签'}}
+								</view>
 								<image style="width: 27rpx;height: 27rpx;margin-left: 6rpx;"
 									src="https://jiangxiaoxian.0rui.cn/rentMore.png" mode=""></image>
 							</view>
@@ -48,13 +49,16 @@
 				@refresherrefresh="onS" scroll-y="true" class="flex align-items"
 				style="height: 1250rpx;box-sizing: border-box;">
 				<view class="recommend-box">
-					<view class="rrecommList" >
+					<view class="rrecommList">
 						<view class="reListItem" v-for="(item,index) in rentList" :key="index" @click="toDetail(item)">
 							<!-- 左侧图片 -->
 							<view class="listItem-images">
 								<image v-if="item.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 v-if="item.recommend != 1"
+									style="width: 77rpx;height: 36rpx;z-index: 100;position: relative;top: 34rpx;left: 0rpx;"
+									src=""></image>
 								<image class="iamges-mainImg" :src="item.images[0]"></image>
 							</view>
 							<!-- 右侧内容 -->
@@ -72,14 +76,14 @@
 									<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;">{{item.address_city_text}}
+										<view class="title3" style="margin-left: 6rpx;">{{item.address_city_text}}
 										</view>
 									</view>
 									<view class="title3">{{item.release_time_text}}</view>
 									<view style="display: flex;align-items: center;justify-content: center;">
 										<image style="width: 26rpx;height: 20rpx;"
 											src="https://jiangxiaoxian.0rui.cn/eye.png"></image>
-										<view class="title3" style="margin-left: 10rpx;">{{item.views}}</view>
+										<view class="title3" style="margin-left: 6rpx;">{{item.views}}</view>
 									</view>
 								</view>
 							</view>
@@ -239,7 +243,7 @@
 
 		if (res.data && res.data.list) {
 			// rentList.value = res.data.list;
-			rentList.value =[...rentList.value,...res.data.list];
+			rentList.value = [...rentList.value, ...res.data.list];
 			rentCount.value = res.data.count;
 			// Safely process each item
 			rentList.value = rentList.value.map(item => {
@@ -281,7 +285,7 @@
 			title: '加载中...'
 		});
 		resetLists();
-		
+
 		setTimeout(() => {
 			homrS.value = false;
 			uni.hideLoading();
@@ -294,14 +298,13 @@
 		rentList.value = [];
 		getList();
 	}
-	
-	function toDetail(e){
-		console.log('跳转详情',e);
+
+	function toDetail(e) {
+		console.log('跳转详情', e);
 		uni.navigateTo({
-			url:'/pages/canteenRent/rentDetail?id=' + e.id
+			url: '/pages/canteenRent/rentDetail?id=' + e.id
 		})
 	}
-	
 </script>
 
 <style lang="scss" scoped>
@@ -311,7 +314,7 @@
 		background-color: #fff;
 		display: grid;
 		border-radius: 18rpx;
-	
+
 		.contactedBox {
 			width: 660rpx;
 			height: 325rpx;
@@ -321,7 +324,7 @@
 			justify-content: center;
 			align-items: center;
 		}
-	
+
 		.contactBtn {
 			width: 660rpx;
 			height: 92rpx;
@@ -329,7 +332,7 @@
 			display: flex;
 			border-radius: 0 0 18rpx 18rpx;
 			// margin-top: 40rpx;
-	
+
 			.tactBtnBox {
 				width: 330rpx;
 				height: 92rpx;
@@ -338,7 +341,7 @@
 				align-items: center;
 				justify-content: center;
 			}
-			
+
 			.tactBtnBox2 {
 				width: 330rpx;
 				height: 92rpx;
@@ -348,9 +351,9 @@
 				justify-content: center;
 			}
 		}
-	
+
 	}
-	
+
 	.search-result {
 		padding-top: 10px;
 		padding-bottom: 20px;
diff --git a/pages/coupon/list.vue b/pages/coupon/list.vue
index d354e8b..8d1024b 100644
--- a/pages/coupon/list.vue
+++ b/pages/coupon/list.vue
@@ -255,6 +255,8 @@
 	}
 
 	onShow(() => {
+		couponFullList.value = []
+		couponTimesList.value = []
 		getCouponFullList();
 	});
 </script>
@@ -344,7 +346,8 @@
 
 			.couponsListFull {
 				// width: 690rpx;
-				display: grid;
+				padding: 0 30rpx;
+				// display: grid;
 				justify-content: center;
 				align-items: center;
 				min-height: 80vh;
diff --git a/pages/index/fabu.vue b/pages/index/fabu.vue
index 941c8c9..c8caa6e 100644
--- a/pages/index/fabu.vue
+++ b/pages/index/fabu.vue
@@ -952,7 +952,7 @@
 
 	.bottomBtn {
 		width: 750rpx;
-		height: 200rpx;
+		// height: 200rpx;
 		background: #FFFFFF;
 		border-radius: 0rpx 0rpx 0rpx 0rpx;
 		position: fixed;
diff --git a/pages/user/goods-collect.vue b/pages/user/goods-collect.vue
index 0bd1df8..9d26711 100644
--- a/pages/user/goods-collect.vue
+++ b/pages/user/goods-collect.vue
@@ -36,7 +36,7 @@
 								<view class="cons-third">
 									<image style="width: 24rpx;height: 24rpx;"
 										src="https://jiangxiaoxian.0rui.cn/locationList.png"></image>
-									<view class="title3" style="margin-left: 10rpx;">{{item.address_city_text}}
+									<view class="title3" style="margin-left: 6rpx;">{{item.address_city_text}}
 									</view>
 								</view>
 							</view>
@@ -409,14 +409,14 @@
 							height: 190rpx;
 							position: relative;
 							right: 0rpx;
-							bottom: 18rpx;
+							bottom: 0rpx;
 							z-index: 1;
 
 						}
 					}
 
 					.listItem-contents {
-						width: 300rpx;
+						width: 326rpx;
 						height: auto;
 						margin-left: 20rpx;
 
diff --git a/pages/user/goods-log.vue b/pages/user/goods-log.vue
index ea51e4b..33fdf00 100644
--- a/pages/user/goods-log.vue
+++ b/pages/user/goods-log.vue
@@ -14,6 +14,9 @@
 									<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 v-if="e.information.recommend != 1"
+										style="width: 77rpx;height: 36rpx;z-index: 100;position: relative;top: 34rpx;left: 0rpx;"
+										src=""></image>
 									<image class="iamges-mainImg" :src="e.information.images[0]"></image>
 								</view>
 								<!-- 右侧内容 -->
@@ -32,7 +35,7 @@
 										<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;">
+											<view class="title3" style="margin-left: 6rpx;">
 												{{e.information.address_city_text}}
 											</view>
 										</view>
@@ -40,7 +43,7 @@
 										<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 class="title3" style="margin-left: 6rpx;">{{e.information.views}}
 											</view>
 										</view>
 									</view>
@@ -126,26 +129,26 @@
 		});
 		console.log('足迹返值', res);
 		if (res.code == 1) {
-			if(listQuery.value.page == 1) {
+			if (listQuery.value.page == 1) {
 				feetHisList.value = res.data.list;
-			}else {
+			} else {
 				if (feetHisList.value.length > 0 && res.data.list.length > 0) {
-				        const lastItemOfPrevPage = feetHisList.value[feetHisList.value.length - 1];
-				        const firstItemOfNewPage = res.data.list[0];
-				        
-				        // 判断日期是否相同
-				        if (isSameDate(lastItemOfPrevPage.date, firstItemOfNewPage.date)) {
-				          // 合并相同日期的数据
-				          lastItemOfPrevPage.log = [...lastItemOfPrevPage.log, ...firstItemOfNewPage.log];
-				          // 添加剩余的数据
-				          feetHisList.value = [...feetHisList.value, ...res.data.list.slice(1)];
-				        } else {
-				          // 日期不同，直接拼接
-				          feetHisList.value = [...feetHisList.value, ...res.data.list];
-				        }
-				      } else {
-				        feetHisList.value = [...feetHisList.value, ...res.data.list];
-				      }
+					const lastItemOfPrevPage = feetHisList.value[feetHisList.value.length - 1];
+					const firstItemOfNewPage = res.data.list[0];
+
+					// 判断日期是否相同
+					if (isSameDate(lastItemOfPrevPage.date, firstItemOfNewPage.date)) {
+						// 合并相同日期的数据
+						lastItemOfPrevPage.log = [...lastItemOfPrevPage.log, ...firstItemOfNewPage.log];
+						// 添加剩余的数据
+						feetHisList.value = [...feetHisList.value, ...res.data.list.slice(1)];
+					} else {
+						// 日期不同，直接拼接
+						feetHisList.value = [...feetHisList.value, ...res.data.list];
+					}
+				} else {
+					feetHisList.value = [...feetHisList.value, ...res.data.list];
+				}
 			}
 			// feetHisList.value = [...feetHisList.value, ...res.data.list]
 			feetCount.value = res.data.count
@@ -153,10 +156,10 @@
 		}
 
 	}
-	
+
 	// 辅助函数：比较两个日期是否相同
 	function isSameDate(date1, date2) {
-	  return date1 === date2;
+		return date1 === date2;
 	}
 
 	//加载更多
@@ -188,11 +191,11 @@
 		loadStatus.value = "loading";
 		getFeetList();
 	}
-	
-	function toDetail(e){
-		console.log('跳转详情',e);
+
+	function toDetail(e) {
+		console.log('跳转详情', e);
 		uni.navigateTo({
-			url:'/pages/canteenRent/rentDetail?id=' + e.id
+			url: '/pages/canteenRent/rentDetail?id=' + e.id
 		})
 	}