Browse Source

修改样式

lex 2 years ago
parent
commit
66377c1c1b

+ 4 - 3
src/school/train-report/components/list.tsx

@@ -140,7 +140,7 @@ export default defineComponent({
     return () => (
       <div
         style={{
-          minHeight: 'calc(100vh  - var(--van-tabs-line-height))',
+          minHeight: 'calc(100vh  - var(--van-tabs-line-height) - var(--header-height))',
           overflow: 'hidden'
         }}
       >
@@ -167,7 +167,7 @@ export default defineComponent({
         <div
           style={{
             overflowY: 'auto',
-            height: 'calc(100vh - var(--van-tabs-line-height)  - 1.17333rem)'
+            height: 'calc(100vh - var(--van-tabs-line-height) - var(--header-height)  - 1.17333rem)'
           }}
         >
           {state.listState.dataShow ? (
@@ -175,7 +175,8 @@ export default defineComponent({
               v-model:modelValue={state.listState.refreshing}
               onRefresh={onRefresh}
               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

+ 14 - 2
src/school/train-report/index.tsx

@@ -1,3 +1,5 @@
+import OHeader from '@/components/o-header'
+import OSticky from '@/components/o-sticky'
 import request from '@/helpers/request'
 import { Tab, Tabs } from 'vant'
 import { defineComponent, reactive } from 'vue'
@@ -9,7 +11,8 @@ export default defineComponent({
   setup() {
     const state = reactive({
       loading: true,
-      orchestraList: [] as any
+      orchestraList: [] as any,
+      height: 'auto'
     })
     // 获取乐团列表
     const getOrchestras = async () => {
@@ -46,8 +49,17 @@ export default defineComponent({
     getOrchestras()
     return () => (
       <div class={styles.train}>
+        <OSticky
+          position="top"
+          onGetHeight={(height: any) => {
+            document.documentElement.style.setProperty('--header-height', height + 'px')
+            state.height = height
+          }}
+        >
+          <OHeader />
+        </OSticky>
         {!state.loading && (
-          <Tabs sticky lineWidth={20} lineHeight={4} swipeable animated>
+          <Tabs sticky lineWidth={20} lineHeight={4} offsetTop={state.height} swipeable animated>
             <Tab title="周报" name="WEEKLY">
               <List type="WEEKLY" orchestraList={state.orchestraList} />
             </Tab>

+ 0 - 3
src/school/train-report/month-report.tsx

@@ -233,9 +233,6 @@ export default defineComponent({
 
         <div class={[styles.trainPhoto, styles.teacherTrainPhoto]}>
           <Image src={iconPhoto} class={styles.iconPhoto} />
-          <p>
-            本月上传<span>{reportData.PHOTO.TOTAL || 0}</span>张训练照片
-          </p>
           <p
             onClick={() => {
               if (forms.share == 1) return