From b62967248e7aa0e4565c120399d256776b1d7bf5 Mon Sep 17 00:00:00 2001 From: liutong <836164388@qq.com> Date: Thu, 29 May 2025 16:10:18 +0800 Subject: [PATCH] =?UTF-8?q?fix(coach):=20=E4=BF=AE=E5=A4=8D=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E6=9A=82=E6=97=A0=E6=9B=B4=E5=A4=9A=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=9A=84=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91-=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=A4=9A=E4=B8=AA=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=95=B0=E6=8D=AE=E5=8A=A0=E8=BD=BD=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=9D=A1=E4=BB=B6=20-=20=E4=BC=98=E5=8C=96=E4=BA=86?= =?UTF-8?q?=E6=9A=82=E6=97=A0=E6=9B=B4=E5=A4=9A=E6=95=B0=E6=8D=AE=E7=9A=84?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91=EF=BC=8C=E6=8F=90=E9=AB=98?= =?UTF-8?q?=E4=BA=86=E4=BB=A3=E7=A0=81=E7=9A=84=E5=87=86=E7=A1=AE=E6=80=A7?= =?UTF-8?q?=E5=92=8C=E5=8F=AF=E9=9D=A0=E6=80=A7=20-=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E4=BA=86=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6=E7=9A=84=E5=86=99?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E6=8F=90=E9=AB=98=E4=BA=86=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=9A=84=E5=8F=AF=E8=AF=BB=E6=80=A7=E5=92=8C=E5=8F=AF=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/coach/class/info.vue | 2 +- pages/coach/class/list.vue | 2 +- pages/coach/course/list.vue | 2 +- pages/coach/job/list.vue | 2 +- pages/coach/my/arrival_statistics.vue | 2 +- pages/coach/my/my_attendance.vue | 2 +- pages/coach/student/info.vue | 2 +- pages/common/my_attendance.vue | 2 +- pages/common/sys_msg_list.vue | 2 +- pages/market/clue/edit_clues_log.vue | 2 +- pages/market/my/signed_client_list.vue | 2 +- pages/student/index/job_list.vue | 2 +- pages/student/index/physical_examination.vue | 2 +- pages/student/my/lesson_consumption.vue | 2 +- pages/student/timetable/index.vue | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pages/coach/class/info.vue b/pages/coach/class/info.vue index 5b4bdb8..b98df59 100644 --- a/pages/coach/class/info.vue +++ b/pages/coach/class/info.vue @@ -276,7 +276,7 @@ export default { } //判断是否还有数据 - if (this.filteredData.page * this.filteredData.limit > this.filteredData.total || this.filteredData.limit > this.filteredData.total) { + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', diff --git a/pages/coach/class/list.vue b/pages/coach/class/list.vue index 2a5a6fb..bad9243 100644 --- a/pages/coach/class/list.vue +++ b/pages/coach/class/list.vue @@ -116,7 +116,7 @@ export default { console.log(111,(this.filteredData.page * this.filteredData.limit) ,(this.filteredData.total)) //判断是否还有数据 - if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){ + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', diff --git a/pages/coach/course/list.vue b/pages/coach/course/list.vue index 4c61483..9e76d06 100644 --- a/pages/coach/course/list.vue +++ b/pages/coach/course/list.vue @@ -328,7 +328,7 @@ export default { let data = {...this.filteredData} //判断是否还有数据 - if (this.filteredData.page * this.filteredData.limit > this.filteredData.total || this.filteredData.limit > this.filteredData.total) { + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', diff --git a/pages/coach/job/list.vue b/pages/coach/job/list.vue index dfd5d73..8f31169 100644 --- a/pages/coach/job/list.vue +++ b/pages/coach/job/list.vue @@ -96,7 +96,7 @@ export default { let data = {...this.filteredData} //判断是否还有数据 - if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){ + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', diff --git a/pages/coach/my/arrival_statistics.vue b/pages/coach/my/arrival_statistics.vue index a582a8c..9c903f1 100644 --- a/pages/coach/my/arrival_statistics.vue +++ b/pages/coach/my/arrival_statistics.vue @@ -114,7 +114,7 @@ export default { } //判断是否还有数据 - if (this.filteredData.page * this.filteredData.limit > this.filteredData.total || this.filteredData.limit > this.filteredData.total) { + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', diff --git a/pages/coach/my/my_attendance.vue b/pages/coach/my/my_attendance.vue index 84511c4..b892593 100644 --- a/pages/coach/my/my_attendance.vue +++ b/pages/coach/my/my_attendance.vue @@ -355,7 +355,7 @@ export default { let data = {...this.filteredData} //判断是否还有数据 - if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){ + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', diff --git a/pages/coach/student/info.vue b/pages/coach/student/info.vue index c2171bd..904152f 100644 --- a/pages/coach/student/info.vue +++ b/pages/coach/student/info.vue @@ -239,7 +239,7 @@ export default { let data = {...this.filteredData} //判断是否还有数据 - if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){ + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', diff --git a/pages/common/my_attendance.vue b/pages/common/my_attendance.vue index 8e79839..7b36c0e 100644 --- a/pages/common/my_attendance.vue +++ b/pages/common/my_attendance.vue @@ -469,7 +469,7 @@ export default { let data = {...this.filteredData} //判断是否还有数据 - if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){ + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', diff --git a/pages/common/sys_msg_list.vue b/pages/common/sys_msg_list.vue index 10e61ad..8e24630 100644 --- a/pages/common/sys_msg_list.vue +++ b/pages/common/sys_msg_list.vue @@ -98,7 +98,7 @@ export default { let data = {...this.filteredData} //判断是否还有数据 - if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){ + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', diff --git a/pages/market/clue/edit_clues_log.vue b/pages/market/clue/edit_clues_log.vue index 0dc0d53..76f1f00 100644 --- a/pages/market/clue/edit_clues_log.vue +++ b/pages/market/clue/edit_clues_log.vue @@ -227,7 +227,7 @@ export default { let data = {...this.filteredData} //判断是否还有数据 - if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){ + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', diff --git a/pages/market/my/signed_client_list.vue b/pages/market/my/signed_client_list.vue index e98dca9..5972794 100644 --- a/pages/market/my/signed_client_list.vue +++ b/pages/market/my/signed_client_list.vue @@ -113,7 +113,7 @@ export default { let data = {...this.filteredData} //判断是否还有数据 - if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){ + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', diff --git a/pages/student/index/job_list.vue b/pages/student/index/job_list.vue index 86b52f9..08b9009 100644 --- a/pages/student/index/job_list.vue +++ b/pages/student/index/job_list.vue @@ -104,7 +104,7 @@ import memberApi from '@/api/member.js'; let data = {...this.filteredData} //判断是否还有数据 - if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){ + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', diff --git a/pages/student/index/physical_examination.vue b/pages/student/index/physical_examination.vue index ed96bc3..2dfd81c 100644 --- a/pages/student/index/physical_examination.vue +++ b/pages/student/index/physical_examination.vue @@ -102,7 +102,7 @@ import memberApi from '@/api/member.js'; let data = {...this.filteredData} //判断是否还有数据 - if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){ + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', diff --git a/pages/student/my/lesson_consumption.vue b/pages/student/my/lesson_consumption.vue index 6fc2ea2..6dca018 100644 --- a/pages/student/my/lesson_consumption.vue +++ b/pages/student/my/lesson_consumption.vue @@ -92,7 +92,7 @@ import memberApi from '@/api/member.js'; let data = {...this.filteredData} //判断是否还有数据 - if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){ + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多', diff --git a/pages/student/timetable/index.vue b/pages/student/timetable/index.vue index 12cd2ca..a01020a 100644 --- a/pages/student/timetable/index.vue +++ b/pages/student/timetable/index.vue @@ -232,7 +232,7 @@ export default { let data = {...this.filteredData} //判断是否还有数据 - if (this.filteredData.page * this.filteredData.limit > this.filteredData.total || this.filteredData.limit > this.filteredData.total) { + if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) { this.loading = false uni.showToast({ title: '暂无更多',