提交

1

src/components/m-full-refresh/index.module.less

@@ -15,7 +15,7 @@
 .pullRefresh {
   :global {
     .van-pull-refresh__track {
-      min-height: inherit;
+      // min-height: inherit;
     }
   }
 }

src/components/m-sticky/index.tsx

@@ -63,16 +63,18 @@ export default defineComponent({
       } else {
         forms.divStyle.bottom = props.offsetBottom || '0px';
       }
-      // const resize = new ResizeObserver(() => {
-      //   const { height } = useRect(div2Ref.value);
-      //   __initHeight(height);
-      // });
-      // resize.observe(divRef.value);
-      useResizeObserver(divRef.value, (entries: any) => {
-        const entry = entries[0];
-        const { height } = entry.contentRect;
+      const resize = new ResizeObserver(() => {
+        const { height } = useRect(div2Ref.value);
         __initHeight(height);
       });
+      resize.observe(divRef.value);
+
+      // useResizeObserver(divRef.value, (entries: any) => {
+      //   const entry = entries[0];
+      //   const { height } = entry.contentRect;
+      //   __initHeight(height);
+      // });
+
 
       // nextTick(() => {
       //   // 为了处理刚开始头部高度为0的情况

src/views/tenantAllData/index.module.less

@@ -117,6 +117,7 @@
     margin-bottom: 12px;
     padding: 12px;
     border-radius: 10px;
+    min-height: 73px;
     .title {
       font-weight: 400;
       color: #777777;
@@ -201,12 +202,15 @@
   min-height: calc(100vh - var(--header-height));
 }
 .refreshC {
-  min-height: calc(100vh - var(--header-height));
+  min-height: calc(100vh - var(--header-height)- 120);
 }
-.top {
-  background: #f6f8f9;
-  padding: 0 12px;
-  .timerWrap {
-    font-size: 14px;
-  }
+.refreshD {
+  min-height: calc(100vh - var(--header-height)- 105);
+}
+.timerWrap {
+  font-size: 14px;
+  // width: 64px;
+}
+.schoolList {
+  display: block;
 }

src/views/tenantAllData/index.tsx

@@ -180,8 +180,7 @@ export default defineComponent({
     return () => (
       <div class={styles.tenantAllData}>
         {/* <OHeader isBack={false} /> */}
-        <MSticky position="top">
-          <div class={styles.top}>
+
             <div class={styles.topWrap}>
               <div class={styles.topHead}>
                 <img src={topDot} class={styles.topDot} alt="" />
@@ -257,8 +256,8 @@ export default defineComponent({
                 />
               </div>
             </div>
-          </div>
-        </MSticky>
+
+
         <div class={styles.schoolList}>
           {showContact.value ? (
             <OFullRefresh

src/views/tenantAllData/tenamtDataDetail.tsx

@@ -177,8 +177,7 @@ export default defineComponent({
     return () => (
       <div class={styles.tenantAllData}>
         {/* <OHeader /> */}
-        <MSticky position="top">
-          <div class={styles.top}>
+
         <div class={styles.topWrap}>
           <div class={styles.topHeadSchool} onClick={()=>forms.classStatus= true}>
 
@@ -256,8 +255,6 @@ export default defineComponent({
             />
           </div>
         </div>
-        </div>
-         </MSticky>
         <div class={styles.schoolList}>
           {showContact.value ? (
             <OFullRefresh
@@ -359,6 +356,7 @@ export default defineComponent({
               // getStat();
               forms.classStatus = false;
               refreshing.value = true;
+            getStat();
               getList()
             }}
           />