From 2077b19cc3d1b9b7a505d7869ec52de496866963 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Fri, 3 Jan 2025 21:25:13 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=85=91=E6=8D=A2=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=85=91=E6=8D=A2=E6=88=90=E5=8A=9F=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 me/gift/duihuan.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/me/gift/duihuan.vue b/me/gift/duihuan.vue
index 35a466e..a6611ba 100644
--- a/me/gift/duihuan.vue
+++ b/me/gift/duihuan.vue
@@ -66,6 +66,7 @@
 				this.$Request.postJson("app/userPrizeExchange/exchange", this.query).then(res => {
 					if (res.code == 0 ) {
 						uni.navigateBack()
+						uni.showToast({ title: '兑换成功', icon: 'none' });
 					} else {
 						uni.showToast({ title: res.msg, icon: 'none' });
 					}

From 688f814c2e7541f5765f9dc79b23a1747ecff377 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Fri, 3 Jan 2025 21:27:06 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A5=96=E5=93=81?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=A7=A6=E5=BA=95=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 me/gift/gift.vue | 81 ++++++++++++++++++++++++++++++------------------
 1 file changed, 51 insertions(+), 30 deletions(-)

diff --git a/me/gift/gift.vue b/me/gift/gift.vue
index 1dc6af0..cd10d2b 100644
--- a/me/gift/gift.vue
+++ b/me/gift/gift.vue
@@ -5,17 +5,15 @@
 		</view>
 		<view class="list">
 			<view class="tab">
-				<view class="tab_item"
-					:class="{active: item.type == tabIndex}"
-					@click="tabClick(item)"
-					v-for="(item,index) in tab" :key="index"
-					>{{item.label}}</view>
+				<view class="tab_item" :class="{active: item.type == tabIndex}" @click="tabClick(item)"
+					v-for="(item,index) in tab" :key="index">{{item.label}}</view>
 			</view>
 			<view class="item" v-for="(item,index) in list" :key="index">
 				<view class="color-666 u-font-24">{{tabIndex==1?'中奖时间':'兑换时间'}} {{item.createTime}}</view>
 				<view class="u-m-t-24 u-flex u-row-between">
 					<view class="u-flex-1 u-flex u-col-top">
-						<u-image width="128rpx" height="128rpx" v-if="item.type == 2 " src="/static/red-pack.png"></u-image>
+						<u-image width="128rpx" height="128rpx" v-if="item.type == 2 "
+							src="/static/red-pack.png"></u-image>
 						<u-image width="128rpx" height="128rpx" v-else :src="item.imgUrl"></u-image>
 						<view class="u-m-l-16">
 							<view v-if="tabIndex == 1">{{item.name}}</view>
@@ -30,7 +28,7 @@
 				</view>
 			</view>
 			<view class="u-p-t-30 u-p-b-30 empty" v-if="hasAjax&&!list.length">
-				<u-empty text="暂无记录"  src="/static/icon-empty.svg"></u-empty>
+				<u-empty text="暂无记录" src="/static/icon-empty.svg"></u-empty>
 			</view>
 		</view>
 		<!-- <view class="u-p-30">
@@ -46,7 +44,13 @@
 				background: {
 					backgroundColor: 'transparent'
 				},
-				tab: [{label: '抽奖记录', type: 1},{label: '兑换记录', type: 2}],
+				tab: [{
+					label: '抽奖记录',
+					type: 1
+				}, {
+					label: '兑换记录',
+					type: 2
+				}],
 				tabIndex: 1,
 				query: {
 					page: 1,
@@ -54,61 +58,73 @@
 				},
 				total: 0,
 				status: 'nomore',
-				hasAjax:true,
-				list:[]
+				hasAjax: true,
+				list: [],
+				isLoading:false,
+				isEnd:false
 			}
 		},
 		onLoad(options) {
-		
+
 		},
 		onShow() {
 			this.list = [];
 			this.getList()
 		},
+		// onReachBottom() {
+		// 	console.log('onReachBottom');
+		// 	if (this.isEnd || this.isLoading) {
+		// 		return
+		// 	}
+		// 	this.query.page+=1;
+		// 	this.getList()
+		// },
 		methods: {
-			toDuiHuan(item){
+			toDuiHuan(item) {
 				uni.navigateTo({
-					url:`/me/gift/duihuan?id=${item.id}`
+					url: `/me/gift/duihuan?id=${item.id}`
 				})
 			},
-			tabClick(item){
+			tabClick(item) {
 				this.list = [];
 				this.tabIndex = item.type;
 				this.getList()
 			},
-			getList(){
+			getList() {
 				let url = ""
-				if ( this.tabIndex == 1) {
+				if (this.tabIndex == 1) {
 					url = "app/discSpinningRecord/selectDiscSpinningRecord"
 				} else {
 					url = "/app/userPrizeExchange/page"
 				}
+				this.isLoading=true
 				this.$Request.getT(url, this.query).then(res => {
-					if (res.code == 0 ) {
-						if ( this.tabIndex == 1) {
-							this.list = [...this.list,...res.data.records]
+					this.isLoading=false
+					this.isEnd=this.query.page>=res.data.totalPage
+					if (res.code == 0) {
+						if (this.tabIndex == 1) {
+							this.list = [...this.list, ...res.data.records]
 							this.total = res.data.total
 						} else {
-							this.list = [...this.list,...res.page.list]
+							this.list = [...this.list, ...res.page.list]
 							this.total = res.page.totalCount
 						}
 					}
 				})
 			},
-			onReachBottom: function () {
+			onReachBottom: function() {
 				console.log(this.query.page)
 				console.log(this.query.limit)
-			  if (this.query.page * this.query.limit < this.total) {
-			    this.query.page = this.query.page + 1;
-			    this.getList();
-			  }
+				if (!this.isEnd&&!this.isLoading) {
+					this.query.page = this.query.page + 1;
+					this.getList();
+				}
 			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	
 	.duihuan {
 		background: linear-gradient(87deg, #ED8087 0%, #ECA2AA 100%);
 		font-size: 24rpx;
@@ -139,7 +155,8 @@
 		}
 
 	}
-	.empty{
+
+	.empty {
 		// min-height: 50vh;
 	}
 
@@ -155,9 +172,11 @@
 		border-radius: 18rpx 18rpx 18rpx 18rpx;
 		overflow: hidden;
 		background-color: #fff;
-		.tab{
+
+		.tab {
 			display: flex;
-			.tab_item{
+
+			.tab_item {
 				height: 80rpx;
 				line-height: 80rpx;
 				width: 50%;
@@ -165,11 +184,13 @@
 				font-size: 32rpx;
 				color: #333;
 			}
-			.tab_item.active{
+
+			.tab_item.active {
 				background-color: #ECA2AA;
 				color: #fff;
 			}
 		}
+
 		.item {
 			padding: 32rpx 24rpx;
 			border-bottom: 1rpx solid #E5E5E5;

From 5662fd6e4f9d8e894c671b515bd11203129aa373 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Fri, 3 Jan 2025 21:52:19 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=91=E6=8D=A2?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 me/gift/gift.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/me/gift/gift.vue b/me/gift/gift.vue
index cd10d2b..fd1a172 100644
--- a/me/gift/gift.vue
+++ b/me/gift/gift.vue
@@ -88,6 +88,7 @@
 			tabClick(item) {
 				this.list = [];
 				this.tabIndex = item.type;
+				this.query.page=1;
 				this.getList()
 			},
 			getList() {
@@ -100,7 +101,7 @@
 				this.isLoading=true
 				this.$Request.getT(url, this.query).then(res => {
 					this.isLoading=false
-					this.isEnd=this.query.page>=res.data.totalPage
+					this.isEnd=this.query.page>=( this.tabIndex == 1?res.data.totalPage:res.page.totalPage)
 					if (res.code == 0) {
 						if (this.tabIndex == 1) {
 							this.list = [...this.list, ...res.data.records]