Merge branch 'iteration_header_to_h5' into jenkins

src/school/approval-manage/subsidy/exercise-detail.tsx

@@ -38,8 +38,7 @@ export default defineComponent({
         .post(`${state.platformApi}/schoolWeekSalaryRecord/detailInfo/course`, {
           data: {
             ...route.query
-          },
-          hideLoading: refreshing.value
+          }
         })
         .then((res: any) => {
           data.record = res?.data || {}

src/school/save-share-image/index.tsx

@@ -234,7 +234,7 @@ export default defineComponent({
     }
     return () => (
       <div class={[styles.saveShareImage]}>
-        <OHeader background="transparent">
+        <OHeader background="transparent" style="position: fixed; width: 100%;">
           {{
             content: () => (
               <div class={styles.btnHeader} onClick={onBack}>

src/student/trade-record/component/paid-list.tsx

@@ -168,7 +168,7 @@ export default defineComponent({
 
         <div
           style={{
-            height: 'calc(100vh -  var(--van-tabs-line-height) - 1.17333rem)',
+            height: 'calc(100vh -  var(--van-tabs-line-height) -var(--header-height) - 1.17333rem)',
             overflow: 'hidden',
             overflowY: 'auto'
           }}
@@ -178,7 +178,8 @@ export default defineComponent({
               v-model:modelValue={form.listState.refreshing}
               onRefresh={() => onSearch(true)}
               style={{
-                minHeight: 'calc(100vh -  var(--van-tabs-line-height) - 1.17333rem)'
+                minHeight:
+                  'calc(100vh -  var(--van-tabs-line-height) -var(--header-height) - 1.17333rem)'
               }}
             >
               <List

src/student/trade-record/component/refund-list.tsx

@@ -158,7 +158,7 @@ export default defineComponent({
 
         <div
           style={{
-            height: 'calc(100vh -  var(--van-tabs-line-height) - 1.17333rem)',
+            height: 'calc(100vh -  var(--van-tabs-line-height) -var(--header-height) - 1.17333rem)',
             overflow: 'hidden',
             overflowY: 'auto'
           }}
@@ -168,7 +168,8 @@ export default defineComponent({
               v-model:modelValue={form.listState.refreshing}
               onRefresh={() => onSearch(true)}
               style={{
-                minHeight: 'calc(100vh -  var(--van-tabs-line-height) - 1.17333rem)'
+                minHeight:
+                  'calc(100vh -  var(--van-tabs-line-height) -var(--header-height) - 1.17333rem)'
               }}
             >
               <List

src/student/trade-record/component/wait-pay.tsx

@@ -200,7 +200,7 @@ export default defineComponent({
 
         <div
           style={{
-            height: 'calc(100vh -  var(--van-tabs-line-height) - 1.17333rem)',
+            height: 'calc(100vh -  var(--van-tabs-line-height) -var(--header-height) - 1.17333rem)',
             overflow: 'hidden',
             overflowY: 'auto'
           }}
@@ -210,7 +210,8 @@ export default defineComponent({
               v-model:modelValue={form.listState.refreshing}
               onRefresh={() => onSearch(false)}
               style={{
-                minHeight: 'calc(100vh -  var(--van-tabs-line-height) - 1.17333rem)'
+                minHeight:
+                  'calc(100vh -  var(--van-tabs-line-height) -var(--header-height) - 1.17333rem)'
               }}
             >
               <List

src/student/trade-record/index.tsx

@@ -32,6 +32,7 @@ export default defineComponent({
             console.log(val, 'height')
             state.height = state.height + val
             state.headerHeight = val
+            document.documentElement.style.setProperty('--header-height', val + 'px')
           }}
         >
           <OHeader />

src/views/follow-account/index.module.less

@@ -1,9 +1,4 @@
 .btnHeader {
-  position: fixed;
-  top: 0;
-  left: 0;
-  z-index: 99;
-  width: 100%;
   display: flex;
   align-items: center;
   height: var(--van-nav-bar-height);
@@ -15,6 +10,7 @@
     z-index: 9;
   }
 }
+
 .followAccount {
   position: relative;
   min-height: 100vh;

src/views/mine-orchestra/my-photo/index.tsx

@@ -128,13 +128,14 @@ export default defineComponent({
         >
           <OHeader />
         </OSticky>
-        <OSticky
-          offsetTop={`var(--header-height)`}
-          onGetHeight={(height: number) => {
-            document.documentElement.style.setProperty('--header-cellGroup', height + 'px')
-          }}
-        >
-          {data.schoolList.length > 0 && (
+
+        {data.schoolList.length > 0 && (
+          <OSticky
+            offsetTop={`var(--header-height)`}
+            onGetHeight={(height: number) => {
+              document.documentElement.style.setProperty('--header-cellGroup', height + 'px')
+            }}
+          >
             <div
               style={{
                 overflow: 'hidden'
@@ -154,8 +155,9 @@ export default defineComponent({
                 </Cell>
               </CellGroup>
             </div>
-          )}
-        </OSticky>
+          </OSticky>
+        )}
+
         <OFullRefresh v-model={data.refreshing} onRefresh={() => getList()}>
           <div class={[styles.phoneDetail]}>
             {!data.loading && !!data.list.length && (

src/views/mine-orchestra/photo-list/detail.tsx

@@ -63,8 +63,7 @@ export default defineComponent({
           data: {
             ...data.pages,
             orchestraPhotoAlbumId: route.query.photoId
-          },
-          hideLoading: data.refreshing
+          }
         })
         if (Array.isArray(res?.data?.rows)) {
           data.list = data.list.concat(res.data.rows)

src/views/unit-test/index.tsx

@@ -191,6 +191,7 @@ export default defineComponent({
             form.listState.height = height
           }}
         >
+          <OHeader border={false} />
           <OSearch
             placeholder="请输入测验名称"
             // inputBackground="white"