From ab868f8180adb35fe080ef667f268b5e71bf7dca Mon Sep 17 00:00:00 2001 From: Zy <1448159279@qq.com> Date: Thu, 20 Aug 2026 09:29:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pageSubPack/complaint/Details.vue | 13 +- .../inspection/inspection_record.vue | 20 +- .../inspection/toDays_inscpection.vue | 13 +- .../instrument/replacement_record.vue | 13 +- .../pageSubPack/ticket/hall.vue | 13 +- .../pageSubPack/ticket/myticket.vue | 16 +- .../pageSubPack/ticket/repairMain.vue | 6 + .../pageSubPack/ticket/reportingRecord.vue | 419 ------------------ wuye-manager-uniapp/pages.json | 29 +- 9 files changed, 97 insertions(+), 445 deletions(-) delete mode 100644 wuye-manager-uniapp/pageSubPack/ticket/reportingRecord.vue diff --git a/wuye-manager-uniapp/pageSubPack/complaint/Details.vue b/wuye-manager-uniapp/pageSubPack/complaint/Details.vue index 26fce30..0b99bcf 100644 --- a/wuye-manager-uniapp/pageSubPack/complaint/Details.vue +++ b/wuye-manager-uniapp/pageSubPack/complaint/Details.vue @@ -69,7 +69,7 @@ - - diff --git a/wuye-manager-uniapp/pages.json b/wuye-manager-uniapp/pages.json index fbe4b3b..1192a9f 100644 --- a/wuye-manager-uniapp/pages.json +++ b/wuye-manager-uniapp/pages.json @@ -88,7 +88,8 @@ "pages": [{ "path": "toDays_inscpection", "style": { - "navigationBarTitleText": "今日巡检" + "navigationBarTitleText": "今日巡检", + "enablePullDownRefresh": true } }, { @@ -101,7 +102,8 @@ "path": "inspection_record", "style": { "navigationBarTitleText": "巡检记录", - "navigationStyle": "custom" + "navigationStyle": "custom", + "enablePullDownRefresh": true } }, { @@ -117,7 +119,8 @@ "pages": [{ "path": "replacement_record", "style": { - "navigationBarTitleText": "仪表换新记录" + "navigationBarTitleText": "仪表换新记录", + "enablePullDownRefresh": true } }, { @@ -156,7 +159,8 @@ "path": "Details", "style": { "navigationBarTitleText": "投诉详情", - "navigationBarBackgroundColor": "#f9f9f9" + "navigationBarBackgroundColor": "#f9f9f9", + "enablePullDownRefresh": true } }, { @@ -187,7 +191,8 @@ "path": "hall", "style": { "navigationBarTitleText": "工单大厅", - "navigationStyle": "custom" + "navigationStyle": "custom", + "enablePullDownRefresh": true } }, { @@ -206,7 +211,8 @@ "path": "myticket", "style": { "navigationBarTitleText": "我的工单", - "navigationStyle": "custom" + "navigationStyle": "custom", + "enablePullDownRefresh": true } }, { @@ -215,15 +221,6 @@ "navigationBarTitleText": "维修完成", "navigationBarBackgroundColor": "#fff" } - }, - { - "path": "reportingRecord", - "style": { - "navigationBarTitleText": "上报记录", - "navigationStyle": "custom", - "enablePullDownRefresh": true, - "onReachBottomDistance": 100 - } } ] }, @@ -287,7 +284,7 @@ "path": "deleteAccount", "style": { "navigationBarTitleText": "注销账号", - "navigationStyle": "custom" + "navigationStyle": "custom" } } ] From c5036ca09db901c1373e4f62b2983fff81eddca8 Mon Sep 17 00:00:00 2001 From: Zy <1448159279@qq.com> Date: Thu, 20 Aug 2026 09:34:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wuye-manager-uniapp/pages.json | 85 ++++++++++++---------------------- 1 file changed, 29 insertions(+), 56 deletions(-) diff --git a/wuye-manager-uniapp/pages.json b/wuye-manager-uniapp/pages.json index 761a5b5..18371b5 100644 --- a/wuye-manager-uniapp/pages.json +++ b/wuye-manager-uniapp/pages.json @@ -1,6 +1,5 @@ { - "pages": [ - { + "pages": [{ "path": "pages/index/index", "style": { "navigationBarTitleText": "工作台", @@ -24,11 +23,9 @@ } } ], - "subPackages": [ - { + "subPackages": [{ "root": "pageSubPack/loginSub", - "pages": [ - { + "pages": [{ "path": "pwd-login", "style": { "navigationBarTitleText": "账号登录", @@ -72,8 +69,7 @@ }, { "root": "pageSubPack/notice-list", - "pages": [ - { + "pages": [{ "path": "select-community", "style": { "navigationBarTitleText": "选择小区" @@ -91,8 +87,7 @@ }, { "root": "pageSubPack/inspection", - "pages": [ - { + "pages": [{ "path": "toDays_inscpection", "style": { "navigationBarTitleText": "今日巡检", @@ -123,8 +118,7 @@ }, { "root": "pageSubPack/instrument", - "pages": [ - { + "pages": [{ "path": "replacement_record", "style": { "navigationBarTitleText": "仪表换新记录", @@ -153,21 +147,18 @@ }, { "root": "pageSubPack/statistics", - "pages": [ - { - "path": "statistics", - "style": { - "navigationBarTitleText": "收费总览", - "enablePullDownRefresh": true, - "backgroundTextStyle": "dark" - } + "pages": [{ + "path": "statistics", + "style": { + "navigationBarTitleText": "收费总览", + "enablePullDownRefresh": true, + "backgroundTextStyle": "dark" } - ] + }] }, { "root": "pageSubPack/complaint", - "pages": [ - { + "pages": [{ "path": "Details", "style": { "navigationBarTitleText": "投诉详情", @@ -199,8 +190,7 @@ }, { "root": "pageSubPack/ticket", - "pages": [ - { + "pages": [{ "path": "hall", "style": { "navigationBarTitleText": "工单大厅", @@ -234,35 +224,22 @@ "navigationBarTitleText": "维修完成", "navigationBarBackgroundColor": "#fff" } - }, - { - "path": "reportingRecord", - "style": { - "navigationBarTitleText": "上报记录", - // "navigationStyle": "custom", - "enablePullDownRefresh": true, - "backgroundTextStyle": "dark" - // "onReachBottomDistance": 100 - } } ] }, { "root": "pageSubPack/oneClickOpen", - "pages": [ - { - "path": "oneClickOpen", - "style": { - "navigationBarTitleText": "一键开门", - "navigationStyle": "custom" - } + "pages": [{ + "path": "oneClickOpen", + "style": { + "navigationBarTitleText": "一键开门", + "navigationStyle": "custom" } - ] + }] }, { "root": "pageSubPack/fault-reporting", - "pages": [ - { + "pages": [{ "path": "fault-reporting", "style": { "navigationBarTitleText": "填写维修信息" @@ -278,19 +255,16 @@ }, { "root": "pageSubPack/report-record", - "pages": [ - { - "path": "report-record", - "style": { - "navigationBarTitleText": "上报记录" - } + "pages": [{ + "path": "report-record", + "style": { + "navigationBarTitleText": "上报记录" } - ] + }] }, { "root": "pageSubPack/setting", - "pages": [ - { + "pages": [{ "path": "setting", "style": { "navigationBarTitleText": "设置" @@ -331,8 +305,7 @@ "backgroundColor": "#F5F6F6", "borderStyle": "white", "selectedColor": "#666666", - "list": [ - { + "list": [{ "pagePath": "pages/index/index", "iconPath": "/static/imgs/index.png", "selectedIconPath": "/static/imgs/index-lan.png", From de0f8b711a775867e977324219780252d0f47336 Mon Sep 17 00:00:00 2001 From: Zy <1448159279@qq.com> Date: Thu, 20 Aug 2026 10:22:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E6=8B=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wuye-manager-uniapp/components/navbar/navbar.vue | 4 ++-- wuye-manager-uniapp/pageSubPack/complaint/Details.vue | 8 +++++++- .../pageSubPack/inspection/inspection_record.vue | 8 +++++++- .../pageSubPack/inspection/toDays_inscpection.vue | 8 +++++++- .../pageSubPack/instrument/replacement_record.vue | 8 +++++++- wuye-manager-uniapp/pageSubPack/ticket/hall.vue | 8 +++++++- wuye-manager-uniapp/pageSubPack/ticket/myticket.vue | 7 +++++-- 7 files changed, 42 insertions(+), 9 deletions(-) diff --git a/wuye-manager-uniapp/components/navbar/navbar.vue b/wuye-manager-uniapp/components/navbar/navbar.vue index 115240a..de56f7a 100644 --- a/wuye-manager-uniapp/components/navbar/navbar.vue +++ b/wuye-manager-uniapp/components/navbar/navbar.vue @@ -181,8 +181,8 @@ const goBack = () => { } .nav-title { - font-size: 25rpx; - font-size: 28rpx; + font-size: 32rpx; + font-weight: bold; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/wuye-manager-uniapp/pageSubPack/complaint/Details.vue b/wuye-manager-uniapp/pageSubPack/complaint/Details.vue index 0b99bcf..7251fbb 100644 --- a/wuye-manager-uniapp/pageSubPack/complaint/Details.vue +++ b/wuye-manager-uniapp/pageSubPack/complaint/Details.vue @@ -116,7 +116,13 @@ const querySearch = ref({ }) function init() { // 1. 如果正在加载或没有更多数据,直接返回 - if (isLoading.value || !hasMore.value) return + if (isLoading.value || !hasMore.value) { + if (isRefresh) { + uni.stopPullDownRefresh() + isRefresh = false + } + return + } // 2. 开启锁 isLoading.value = true getComplainList(querySearch.value) diff --git a/wuye-manager-uniapp/pageSubPack/inspection/inspection_record.vue b/wuye-manager-uniapp/pageSubPack/inspection/inspection_record.vue index d164109..e9474a2 100644 --- a/wuye-manager-uniapp/pageSubPack/inspection/inspection_record.vue +++ b/wuye-manager-uniapp/pageSubPack/inspection/inspection_record.vue @@ -113,7 +113,13 @@ const total = ref(0) function getlist() { // 1. 如果正在加载或没有更多数据,直接返回 - if (isLoading.value || !hasMore.value) return + if (isLoading.value || !hasMore.value) { + if (isRefresh) { + uni.stopPullDownRefresh() + isRefresh = false + } + return + } // 2. 开启锁 isLoading.value = true const { pageNum, pageSize, date, status } = queryParmas.value diff --git a/wuye-manager-uniapp/pageSubPack/inspection/toDays_inscpection.vue b/wuye-manager-uniapp/pageSubPack/inspection/toDays_inscpection.vue index 7bda867..c15bc2f 100644 --- a/wuye-manager-uniapp/pageSubPack/inspection/toDays_inscpection.vue +++ b/wuye-manager-uniapp/pageSubPack/inspection/toDays_inscpection.vue @@ -99,7 +99,13 @@ const hasMore = ref(true) // 是否还有更多数据 const total = ref(0) function getlist() { - if (isLoading.value || !hasMore.value) return + if (isLoading.value || !hasMore.value) { + if (isRefresh) { + uni.stopPullDownRefresh() + isRefresh = false + } + return + } isLoading.value = true const { pageNum, pageSize, date, status } = queryParmas.value diff --git a/wuye-manager-uniapp/pageSubPack/instrument/replacement_record.vue b/wuye-manager-uniapp/pageSubPack/instrument/replacement_record.vue index dc87db9..ee7bbe2 100644 --- a/wuye-manager-uniapp/pageSubPack/instrument/replacement_record.vue +++ b/wuye-manager-uniapp/pageSubPack/instrument/replacement_record.vue @@ -116,7 +116,13 @@ function scrolltolower() { function getlist() { // 1. 如果正在加载或没有更多数据,直接返回 - if (isLoading.value || !hasMore.value) return + if (isLoading.value || !hasMore.value) { + if (isRefresh) { + uni.stopPullDownRefresh() + isRefresh = false + } + return + } // 2. 开启锁 isLoading.value = true const { pageNum, pageSize, deviceType } = queryParmas.value diff --git a/wuye-manager-uniapp/pageSubPack/ticket/hall.vue b/wuye-manager-uniapp/pageSubPack/ticket/hall.vue index b94a6a2..54d8f21 100644 --- a/wuye-manager-uniapp/pageSubPack/ticket/hall.vue +++ b/wuye-manager-uniapp/pageSubPack/ticket/hall.vue @@ -149,7 +149,13 @@ function scrolltolower() { } function getlist() { - if (isLoading.value || !hasMore.value) return + if (isLoading.value || !hasMore.value) { + if (isRefresh) { + uni.stopPullDownRefresh() + isRefresh = false + } + return + } isLoading.value = true getTicketHallList(queryParmas.value) .then(res => { diff --git a/wuye-manager-uniapp/pageSubPack/ticket/myticket.vue b/wuye-manager-uniapp/pageSubPack/ticket/myticket.vue index a36e1c4..993dc4c 100644 --- a/wuye-manager-uniapp/pageSubPack/ticket/myticket.vue +++ b/wuye-manager-uniapp/pageSubPack/ticket/myticket.vue @@ -132,7 +132,11 @@ onLoad(data => { }) function getlist() { - if (isLoading.value || !hasMore.value) return + if (isLoading.value || !hasMore.value) { + uni.stopPullDownRefresh() + isRefresh = false + return + } isLoading.value = true getUserTicketlist(queryParmas.value) @@ -227,7 +231,6 @@ onPullDownRefresh(() => { isRefresh = true resetList() }) - /* 预览图片 */ function handlePrivew(imgs) { // if (imgs.length > 0) {