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) {