Merge branch 'master' of http://gitea.bugtc.com/zhouyanli/property-manager-side

wuye-manager-uniapp/pageSubPack/instrument/replacement_record.vue

@@ -49,7 +49,7 @@
 
 <script setup lang="ts">
 import { computed, nextTick, ref } from 'vue'
-import { onShow } from '@dcloudio/uni-app'
+import { onShow, onPullDownRefresh } from '@dcloudio/uni-app'
 import TabsComponents from '@/components/tabs/tabs.vue'
 import { getReplaceMainList } from '@/api/instrument.js'
 
@@ -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
@@ -138,12 +144,23 @@ function getlist() {
     })
     .finally(() => {
       isLoading.value = false
+      if (isRefresh) {
+        isRefresh = false
+        uni.stopPullDownRefresh()
+      }
     })
 }
 onShow(() => {
   resetList()
 })
 
+// 是否正在下拉刷新
+let isRefresh = false
+onPullDownRefresh(() => {
+  isRefresh = true
+  resetList()
+})
+
 // 重置
 function resetList() {
   infolist.value = []