From 412cba8aae4d14f97da95e08884086810011fea0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com>
Date: Wed, 14 Aug 2024 22:14:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E4=B8=8B=E6=8B=89=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E6=9B=B4=E5=A4=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/dataConfirm/index.vue | 35 ++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/views/order/dataConfirm/index.vue b/src/views/order/dataConfirm/index.vue
index 3cd7237..0e9e61b 100644
--- a/src/views/order/dataConfirm/index.vue
+++ b/src/views/order/dataConfirm/index.vue
@@ -15,7 +15,7 @@
 				</el-header>
 				<el-main class="nopadding" v-loading="listLoading" element-loading-text="加载中...">
 					<el-scrollbar height="100%" ref="scrollbar" @scroll="onScroll">
-						<div class="emailMain">
+						<div class="emailMain" ref="emailMain">
 							<div class="itemBox" :class="[item.is_confirm==2?'part':item.is_confirm==1?'complete':'notStarted', emailId == item.id?'itemTrue':'']" v-for="item in confirmList" :key="item" @click="()=>{this.emailChange(item,true);}">
 								<div class="name text">{{item.from && item.from.email}}</div>
 								<div class="title text">{{item.subject}}</div>
@@ -184,6 +184,7 @@ export default {
 				show: false,
 			},
 			confirmList:[],
+			listMore:false,
 			listLoading:false,
 			listParams:{
 				page:1,
@@ -276,7 +277,6 @@ export default {
 				return 'all-disabled'
 			}
 		},
-
 		async getData() {
 			this.listLoading = true;
 			const res = await this.$API.orders.order.mail.list.get(this.listParams);
@@ -285,8 +285,17 @@ export default {
 					res.data.rows.forEach(item=>{
 						item.text = this.stripHtmlTags(item.summary)
 					})
+				}
+				if(res.data.rows && res.data.rows.length < this.listParams.pageSize){
+					this.listMore = true;
+				}else{
+					this.listMore = false;
+				}
+				if(this.listParams.page == 1){
 					this.confirmList = res.data.rows;
 					await this.emailChange(res.data.rows[0])
+				}else{
+					this.confirmList = this.confirmList.concat(res.data.rows);
 				}
 			}
 			this.listLoading = false;
@@ -298,14 +307,21 @@ export default {
 		},
 		// 滚动分页
 		onScroll(event){
-			const scrollbar = this.$refs.scrollbar;
-			const remainingDistance = scrollbar.$el.scrollHeight - (event.scrollTop + scrollbar.$el.clientHeight);
-			if (remainingDistance <= this.threshold) {
-				this.loadMore();
-			}
+			this.$nextTick(()=>{
+				const scrollbar = this.$refs.scrollbar;
+				const emailHeight = this.$refs.emailMain;
+				const remainingDistance = scrollbar.$el.scrollHeight + event.scrollTop + 100;
+				if (remainingDistance > emailHeight.clientHeight) {
+						this.loadMore();
+				}
+			})
 		},
 		loadMore(){
-			console.log('加载更多')
+			if(this.listLoading || this.listMore){
+				return
+			}
+			this.listParams.page ++;
+			this.getData();
 		},
 
 		emailChange(item,isChange) {
@@ -363,6 +379,7 @@ export default {
 				res = await this.$API.orders.order.mail.confirm.post(params);
 			}
 			if(res.code == 200){
+				this.listParams.page = 1;
 				await this.getData();
 			}
 		},
@@ -393,7 +410,7 @@ export default {
 			let searchParams = this.$TOOL.objCopy(params);
 			searchParams.mail_data_id = this.emailId;
 			searchParams.field = ""
-			if(typeof data.code === String){
+			if(typeof data.code === 'string'){
 				searchParams.field = data.code;
 			}else{
 				searchParams.field = data.code[0];