1

1

src/school/approval-manage/components/end-approval.tsx

@@ -24,35 +24,34 @@ export default defineComponent({
 
     const getList = async () => {
       console.log('getList')
-      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 }
-          })
+      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 }
+        })
 
-          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
+        if (list.value.length > 0 && res.data.pages === 1) {
+          return
         }
-      }, 2000)
+        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
+      }
     }
     const onRefresh = () => {
       finished.value = false
@@ -78,6 +77,7 @@ export default defineComponent({
               style="min-height: 100vh;"
             >
               <List
+                loading-text=""
                 v-model:loading={loading.value}
                 finished={finished.value}
                 finished-text="没有更多了"

src/school/approval-manage/components/wait-approval.tsx

@@ -1,6 +1,7 @@
 import OEmpty from '@/components/o-empty'
 import dayjs from 'dayjs'
 import { List, PullRefresh, showToast } from 'vant'
+import OFullRefresh from '@/components/o-full-refresh'
 import { defineComponent, reactive, ref, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
 import styles from './wait-approval.module.less'
@@ -71,8 +72,8 @@ export default defineComponent({
       <>
         <div class={styles.approvalWrap}>
           {showContact.value ? (
-            <PullRefresh
-              v-model={refreshing.value}
+            <OFullRefresh
+              v-model:modelValue={refreshing.value}
               onRefresh={onRefresh}
               style="min-height: 100vh;"
             >
@@ -80,6 +81,7 @@ export default defineComponent({
                 v-model:loading={loading.value}
                 finished={finished.value}
                 finished-text="没有更多了"
+                loading-text=""
                 onLoad={getList}
               >
                 {list.value.map((item: any) => (
@@ -93,7 +95,7 @@ export default defineComponent({
                   </div>
                 ))}
               </List>
-            </PullRefresh>
+            </OFullRefresh>
           ) : (
             <OEmpty />
           )}