diff --git a/pagesA/xjPage/xjRecord.vue b/pagesA/xjPage/xjRecord.vue
index cd069f6..8009fc4 100644
--- a/pagesA/xjPage/xjRecord.vue
+++ b/pagesA/xjPage/xjRecord.vue
@@ -63,6 +63,7 @@
加载中...
+ 没有更多了
暂无数据~
@@ -122,7 +123,7 @@ export default {
},
// 加载更多数据(分页)
loadMore() {
- console.log("上拉加载");
+ console.log("上拉加载",this.isLoading,this.noMore);
if (this.isLoading || this.noMore) return; // 新增 noMore 判断
this.isLoading = true;
this.form.pageNum++;
@@ -142,12 +143,17 @@ export default {
}
}
// 判断是否还有更多
- if (tempList.length < this.form.pageSize) {
+ console.log(res.total,this.form.pageSize,res.total <= this.form.pageSize * this.form.pageNum,'tempList.total');
+
+ if (res.total <= this.form.pageSize * this.form.pageNum) {
this.noMore = true;
+ console.log(this.noMore,'noM');
+
if (page !== 1) {
- uni.showToast({
- content: "已经加载全部",
- });
+ // uni.showToast({
+ // title: "已经加载全部",
+ // icon: "none",
+ // });
}
}
this.isLoading = false;