lex 2 年 前
コミット
75991b3025

+ 6 - 6
src/components/o-full-refresh/index.tsx

@@ -13,13 +13,9 @@ export default defineComponent({
     modelValue: {
       type: Boolean,
       default: false
-    },
-    onRefresh: {
-      type: Function,
-      default: () => {}
     }
   },
-
+  emits: ['refresh', 'update:modelValue'],
   setup(props, { emit, slots }) {
     const state = reactive({
       fullState: false
@@ -37,7 +33,11 @@ export default defineComponent({
       }
     )
     return () => (
-      <PullRefresh v-model:modelValue={state.fullState} onRefresh={props.onRefresh}>
+      <PullRefresh
+        v-model:modelValue={state.fullState}
+        onRefresh={() => emit('refresh')}
+        loadingText=" "
+      >
         {{
           loading: () => (
             <div>

+ 26 - 24
src/school/approval-manage/components/end-approval.tsx

@@ -24,33 +24,35 @@ export default defineComponent({
 
     const getList = async () => {
       console.log('getList')
-      loading.value = true
-      try {
-        if (refreshing.value) {
-          forms.page = 1
-          list.value = []
-          refreshing.value = false
-        }
+      setTimeout(async () => {
+        loading.value = true
+        try {
+          if (refreshing.value) {
+            forms.page = 1
+            list.value = []
+            refreshing.value = false
+          }
 
-        const res = await request.post('/api-school/userApproveRecord/page', {
-          data: { ...forms, hasHandle: true }
-        })
+          const res = await request.post('/api-school/userApproveRecord/page', {
+            data: { ...forms, hasHandle: true }
+          })
 
-        if (list.value.length > 0 && res.data.pages === 1) {
-          return
+          if (list.value.length > 0 && res.data.pages === 1) {
+            return
+          }
+          forms.page = res.data.current + 1
+          list.value = list.value.concat(res.data.rows || [])
+          showContact.value = list.value.length > 0
+          loading.value = false
+          finished.value = res.data.current >= res.data.pages
+        } catch (e: any) {
+          // console.log(e, 'e')
+          const message = e.message
+          showToast(message)
+          showContact.value = false
+          finished.value = true
         }
-        forms.page = res.data.current + 1
-        list.value = list.value.concat(res.data.rows || [])
-        showContact.value = list.value.length > 0
-        loading.value = false
-        finished.value = res.data.current >= res.data.pages
-      } catch (e: any) {
-        // console.log(e, 'e')
-        const message = e.message
-        showToast(message)
-        showContact.value = false
-        finished.value = true
-      }
+      }, 2000)
     }
     const onRefresh = () => {
       finished.value = false