修复奖品列表触底加载

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>
@@ -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,
@@ -55,7 +59,9 @@
 				total: 0,
 				status: 'nomore',
 				hasAjax: true,
-				list:[]
+				list: [],
+				isLoading:false,
+				isEnd:false
 			}
 		},
 		onLoad(options) {
@@ -65,6 +71,14 @@
 			this.list = [];
 			this.getList()
 		},
+		// onReachBottom() {
+		// 	console.log('onReachBottom');
+		// 	if (this.isEnd || this.isLoading) {
+		// 		return
+		// 	}
+		// 	this.query.page+=1;
+		// 	this.getList()
+		// },
 		methods: {
 			toDuiHuan(item) {
 				uni.navigateTo({
@@ -83,7 +97,10 @@
 				} else {
 					url = "/app/userPrizeExchange/page"
 				}
+				this.isLoading=true
 				this.$Request.getT(url, this.query).then(res => {
+					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]
@@ -98,7 +115,7 @@
 			onReachBottom: function() {
 				console.log(this.query.page)
 				console.log(this.query.limit)
-			  if (this.query.page * this.query.limit < this.total) {
+				if (!this.isEnd&&!this.isLoading) {
 					this.query.page = this.query.page + 1;
 					this.getList();
 				}
@@ -108,7 +125,6 @@
 </script>
 
 <style lang="scss" scoped>
-	
 	.duihuan {
 		background: linear-gradient(87deg, #ED8087 0%, #ECA2AA 100%);
 		font-size: 24rpx;
@@ -139,6 +155,7 @@
 		}
 
 	}
+
 	.empty {
 		// min-height: 50vh;
 	}
@@ -155,8 +172,10 @@
 		border-radius: 18rpx 18rpx 18rpx 18rpx;
 		overflow: hidden;
 		background-color: #fff;
+
 		.tab {
 			display: flex;
+
 			.tab_item {
 				height: 80rpx;
 				line-height: 80rpx;
@@ -165,11 +184,13 @@
 				font-size: 32rpx;
 				color: #333;
 			}
+
 			.tab_item.active {
 				background-color: #ECA2AA;
 				color: #fff;
 			}
 		}
+
 		.item {
 			padding: 32rpx 24rpx;
 			border-bottom: 1rpx solid #E5E5E5;