Merge branch 'iteration_header_to_h5' into jenkins

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

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

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

@@ -158,7 +158,8 @@ export default defineComponent({
 
         <div
           style={{
-            height: 'calc(100vh -  var(--van-tabs-line-height) -var(--header-height) - 1.17333rem)',
+            height:
+              'calc(100vh -  var(--van-tabs-line-height) - var(--header-height) - 1.17333rem)',
             overflow: 'hidden',
             overflowY: 'auto'
           }}
@@ -169,7 +170,7 @@ export default defineComponent({
               onRefresh={() => onSearch(true)}
               style={{
                 minHeight:
-                  'calc(100vh -  var(--van-tabs-line-height) -var(--header-height) - 1.17333rem)'
+                  'calc(100vh -  var(--van-tabs-line-height) - var(--header-height) - 1.17333rem)'
               }}
             >
               <List
@@ -178,6 +179,7 @@ export default defineComponent({
                 finishedText=" "
                 class={[styles.liveList]}
                 onLoad={getList}
+                style={{ paddingTop: '12px' }}
                 immediateCheck={false}
               >
                 {form.list.map((item: any) => (

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) -var(--header-height) - 1.17333rem)',
+            height: 'calc(100vh - var(--van-tabs-line-height) - var(--header-height) - 1.17333rem)',
             overflow: 'hidden',
             overflowY: 'auto'
           }}
@@ -211,7 +211,7 @@ export default defineComponent({
               onRefresh={() => onSearch(false)}
               style={{
                 minHeight:
-                  'calc(100vh -  var(--van-tabs-line-height) -var(--header-height) - 1.17333rem)'
+                  'calc(100vh - var(--van-tabs-line-height) - var(--header-height) - 1.17333rem)'
               }}
             >
               <List
@@ -220,6 +220,7 @@ export default defineComponent({
                 finishedText=" "
                 class={[styles.liveList]}
                 onLoad={getList}
+                style={{ paddingTop: '12px' }}
                 immediateCheck={false}
               >
                 {form.list.map((item: any) => (