From bc18edead5775dfb6c98d5489b8af779de4f44e1 Mon Sep 17 00:00:00 2001
From: baicai <18221243570@163.com>
Date: Tue, 5 Aug 2025 17:26:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=BB=9A=E5=8A=A8=E3=80=81?=
 =?UTF-8?q?=E5=8D=95=E4=BD=93=E7=94=B5=E6=B1=A0=E6=BB=9A=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                |  3 ++-
 pages/index.vue           | 46 +++++++++++++++++++--------------------
 pages/work/dtdc/index.vue | 13 ++++++-----
 3 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/pages.json b/pages.json
index 5a6fad0..be3f6bc 100644
--- a/pages.json
+++ b/pages.json
@@ -13,7 +13,8 @@
 			"path": "pages/index",
 			"style": {
 				"navigationBarTitleText": "移动端框架",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"onReachBottomDistance": 100
 			}
 		}, {
 			"path": "pages/work/index",
diff --git a/pages/index.vue b/pages/index.vue
index 894f112..f392050 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -12,21 +12,19 @@
 				</uni-col>
 			</uni-row>
 		</view>
-		<scroll-view class="scroll-y" :scroll-y="true" @scrolltolower="lower" scrolltoupper="upper">
-			<view class="content">
-				<view class="item-list" v-for="item in list" :key="item.ticketNo+'ticket'" @click="toDetail(item.id)">
-					<view class="item-title" :class="item.status === 1 ? 'done' : 'undone'">工单号：{{item.ticketNo}}</view>
-					<view class="item-content">
-						<view class="item-info">工单标题:{{item.title}}</view>
-						<view class="item-info">问题描述:{{item.content}}</view>
-						<view class="item-info">工单状态:{{ticketStatusOptions[item.status]}}</view>
-						<view class="item-info">预期完成时间:{{item.expectedCompleteTime || '-'}}</view>
-						<view class="item-info">处理人:{{item.workName || '-'}}</view>
-					</view>
+		<view v-if="list.length===0" class="no-data">暂无数据</view>
+		<view class="content scroll-y" v-else>
+			<view class="item-list" v-for="item in list" :key="item.ticketNo+'ticket'" @click="toDetail(item.id)">
+				<view class="item-title" :class="item.status === 1 ? 'done' : 'undone'">工单号：{{item.ticketNo}}</view>
+				<view class="item-content">
+					<view class="item-info">工单标题:{{item.title}}</view>
+					<view class="item-info">问题描述:{{item.content}}</view>
+					<view class="item-info">工单状态:{{ticketStatusOptions[item.status]}}</view>
+					<view class="item-info">预期完成时间:{{item.expectedCompleteTime || '-'}}</view>
+					<view class="item-info">处理人:{{item.workName || '-'}}</view>
 				</view>
-				<view v-if="list.length===0" class="no-data">暂无数据</view>
 			</view>
-		</scroll-view>
+		</view>
 	</view>
 </template>
 <script>
@@ -58,15 +56,6 @@
 				this.reset()
 				this.init()
 			},
-			lower() {
-				if (this.list.length >= this.total) {
-					return console.log('数据已经加载完成')
-				}
-				this.pageNum += 1;
-				this.init().catch(() => {
-					this.pageNum -= 1
-				})
-			},
 			init() {
 				//0:'待处理', 1:'已处理', 2:'处理中'
 				let url = `/ticket/list?pageNum=${this.pageNum}&pageSize=${this.pageSize}`
@@ -93,6 +82,17 @@
 				this.pageNum = 1
 			}
 		},
+		onReachBottom() {
+			console.log('触底了')
+			if (this.list.length >= this.total) {
+				return console.log('数据已经加载完成')
+			}
+			this.pageNum += 1;
+			this.init().catch(() => {
+				this.pageNum -= 1
+			})
+
+		},
 		onShow() {
 			this.reset()
 			this.init()
@@ -135,7 +135,7 @@
 	}
 
 	.scroll-y {
-		height: calc(100vh - var(--window-bottom) - var(--window-top));
+		// height: calc(100vh - var(--window-bottom) - var(--window-top));
 		z-index: 1;
 	}
 
diff --git a/pages/work/dtdc/index.vue b/pages/work/dtdc/index.vue
index 1993b62..62e9a9d 100644
--- a/pages/work/dtdc/index.vue
+++ b/pages/work/dtdc/index.vue
@@ -126,6 +126,14 @@
 		onPageScroll(e) {
 			this.pageScrollTop = e.scrollTop
 		},
+		onReachBottom() {
+			console.log('触底了')
+			if (this.list.length >= this.total) {
+				return console.log('数据已经加载完成')
+			}
+			this.pageNum += 1 //每次搜索从1开始搜索
+			this.getTableData()
+		},
 		methods: {
 			openSearch() {
 				this.$refs.searchPopup.open()
@@ -146,11 +154,6 @@
 					deviceId
 				}, dataType)
 			},
-			onReachBottom() {
-				console.log('触底了')
-				this.pageNum += 1 //每次搜索从1开始搜索
-				this.getTableData()
-			},
 			// 搜索
 			onSearch() {
 				this.pageNum = 1 //每次搜索从1开始搜索