skyblued hace 2 años
padre
commit
3f179d966a
Se han modificado 2 ficheros con 17 adiciones y 10 borrados
  1. 5 0
      src/views/accompany/index.module.less
  2. 12 10
      src/views/accompany/music-list.tsx

+ 5 - 0
src/views/accompany/index.module.less

@@ -39,6 +39,11 @@
 }
 }
 
 
 .accompany-music-list {
 .accompany-music-list {
+  :global{
+    .van-pull-refresh{
+      min-height: 100vh;
+    }
+  }
   div {
   div {
     box-sizing: border-box;
     box-sizing: border-box;
   }
   }

+ 12 - 10
src/views/accompany/music-list.tsx

@@ -125,17 +125,15 @@ export default defineComponent({
         if (Array.isArray(res?.data?.rows)) {
         if (Array.isArray(res?.data?.rows)) {
           data.list = [].concat(data.list, res.data.rows)
           data.list = [].concat(data.list, res.data.rows)
           data.pagenation.page += 1
           data.pagenation.page += 1
-          if (!res.data.rows.length) {
-            data.finished = true
-          }
-          if (data.refreshing) {
-            data.refreshing = false
-          }
+          data.finished = res.data.rows.length ? false : true
         } else {
         } else {
           data.finished = true
           data.finished = true
         }
         }
-      } catch (error) {}
+      } catch (error) {
+        data.finished = true
+      }
       data.loading = false
       data.loading = false
+      data.refreshing = false
     }
     }
     const onRefresh = () => {
     const onRefresh = () => {
       console.log('下拉刷新')
       console.log('下拉刷新')
@@ -172,12 +170,16 @@ export default defineComponent({
       })
       })
     }
     }
     onMounted(() => {
     onMounted(() => {
-      // getTree()
+      getTree()
     })
     })
     return () => (
     return () => (
       <div class={styles['accompany-music-list']}>
       <div class={styles['accompany-music-list']}>
         <OSticky
         <OSticky
+          mode='sticky'
           class={styles.heade}
           class={styles.heade}
+          onGetHeight={(height: number) => {
+            document.documentElement.style.setProperty('--header-height', height + 'px')
+          }}
         >
         >
           <div>
           <div>
             <DropdownMenu>
             <DropdownMenu>
@@ -229,9 +231,9 @@ export default defineComponent({
         <OFullRefresh
         <OFullRefresh
           v-model:modelValue={data.refreshing}
           v-model:modelValue={data.refreshing}
           onRefresh={onRefresh}
           onRefresh={onRefresh}
-          style="min-height: calc(100vh - var(--van-dropdown-menu-height) - 1.6rem)"
+          style="min-height: calc(100vh - var(--header-height))"
         >
         >
-          {!data.loading && !!data.list.length && (
+          {!!data.list.length && (
             <List
             <List
               loading-text=" "
               loading-text=" "
               immediateCheck={false}
               immediateCheck={false}