修改头部

src/school/approval-manage/components/end-approval.tsx

@@ -80,7 +80,11 @@ export default defineComponent({
             ))}
           </TransitionGroup>
         </List>
-        {!loading.value && !list.value.length && <OEmpty tips="暂无审批" />}
+        {!loading.value && !list.value.length && (
+          <div class="emptyFixedHeightContainer">
+            <OEmpty tips="暂无审批" />
+          </div>
+        )}
       </OFullRefresh>
     )
   }

src/student/music-group/pre-apply/qrcode-payment/index.module.less

@@ -14,6 +14,19 @@
   }
 }
 
+.btnHeader {
+  display: flex;
+  align-items: center;
+  height: var(--van-nav-bar-height);
+  .iconBack {
+    position: relative;
+    padding-left: var(--van-padding-md);
+    font-size: 20px;
+    color: #fff;
+    z-index: 9;
+  }
+}
+
 .previewSection {
   z-index: -1;
   position: absolute;

src/student/music-group/pre-apply/qrcode-payment/index.tsx

@@ -1,8 +1,11 @@
 import { defineComponent } from 'vue'
-import { Image } from 'vant'
+import { Icon, Image } from 'vant'
 import styles from './index.module.less'
 import orchestraTopBg from '@/school/save-share-image/images/orchestra-top_bg.png'
 import OQrcode from '@/components/o-qrcode'
+import { browser } from '@/helpers/utils'
+import { useRouter } from 'vue-router'
+import OHeader from '@/components/o-header'
 
 export default defineComponent({
   name: 'qrcode-payment',
@@ -21,8 +24,28 @@ export default defineComponent({
     }
   },
   setup(props) {
+    const router = useRouter()
+    const onBack = () => {
+      if (browser().isApp) {
+        postMessage({ api: 'goBack' })
+      } else {
+        router.back()
+      }
+    }
     return () => (
       <div class={[styles.saveShareImage]}>
+        {browser().isApp && (
+          <OHeader background="transparent">
+            {{
+              content: () => (
+                <div class={styles.btnHeader} onClick={onBack}>
+                  <Icon name="arrow-left" class={styles.iconBack} />
+                </div>
+              )
+            }}
+          </OHeader>
+        )}
+
         <Image src={orchestraTopBg} class={styles.topImage} />
         <div class={[styles.shareContaienr, styles.orchestraContainer]}>
           <div class={styles.schoolName}>{props.orderType === 'VIP' ? '会员购买' : '报名缴费'}</div>

src/student/my-orchestra/photo-detail.tsx

@@ -74,7 +74,7 @@ export default defineComponent({
 
     return () => (
       <div class={[styles.phoneDetail, !state.listState.dataShow && 'emptyRootContainer']}>
-        {/* <OHeader title={(route.query.name as any) || ''}></OHeader> */}
+        <OHeader title={(route.query.name as any) || ''} />
 
         {state.listState.dataShow ? (
           <List

src/student/trade-record/index.tsx

@@ -1,3 +1,4 @@
+import OHeader from '@/components/o-header'
 import OSticky from '@/components/o-sticky'
 import { useRect } from '@vant/use'
 import { Cell, CellGroup, Image, Tab, Tabs } from 'vant'
@@ -15,7 +16,8 @@ export default defineComponent({
     const tabs = sessionStorage.getItem('tradeRecordTabs')
     const state = reactive({
       tabValue: (route.query.tab || tabs || 'wait_pay') as 'wait_pay' | 'paid' | 'refund',
-      height: 50
+      height: 50,
+      headerHeight: 0
     })
     const tabsRef = ref()
 
@@ -25,13 +27,22 @@ export default defineComponent({
     })
     return () => (
       <div class={styles.tradeRecord}>
+        <OSticky
+          onGetHeight={(val: any) => {
+            console.log(val, 'height')
+            state.height = state.height + val
+            state.headerHeight = val
+          }}
+        >
+          <OHeader />
+        </OSticky>
         <Tabs
           lineWidth={20}
           lineHeight={4}
           sticky
           animated
           swipeable
-          offsetTop={0}
+          offsetTop={state.headerHeight}
           v-model:active={state.tabValue}
           onChange={(val: any) => {
             sessionStorage.setItem('tradeRecordTabs', val)

src/teacher/attendance-manage/index.tsx

@@ -1,3 +1,4 @@
+import OHeader from '@/components/o-header'
 import AttendStudent from '@/school/attendance/components/attend-student'
 import { defineComponent } from 'vue'
 
@@ -6,6 +7,7 @@ export default defineComponent({
   setup() {
     return () => (
       <>
+        <OHeader border={false} />
         <AttendStudent type="teacher" />
       </>
     )

src/teacher/screen-projection/index.tsx

@@ -60,7 +60,7 @@ export default defineComponent({
     }
     return () => (
       <div class={styles.screenProjection}>
-        
+        <OHeader />
         <div class={styles.container}>
           {data.name && (
             <div class={styles.tips}>
@@ -94,8 +94,7 @@ export default defineComponent({
             })}
           </CellGroup>
         </div>
-        {!data.loading && !data.knowledgePointList.length && <OEmpty tips='暂无内容' />}
-        
+        {!data.loading && !data.knowledgePointList.length && <OEmpty tips="暂无内容" />}
 
         <Button class={styles.playBtn} block type="primary" round onClick={() => hanldeOpenPlay()}>
           播放课件

vite.config.ts

@@ -12,7 +12,7 @@ function resolve(dir: string) {
 // https://vitejs.dev/config/
 // https://github.com/vitejs/vite/issues/1930 .env
 // const proxyUrl = 'https://test.lexiaoya.cn/';
-const proxyUrl = 'https://online.lexiaoya.cn/';
+const proxyUrl = 'https://test.lexiaoya.cn/';
 // const proxyUrl = 'http://47.98.131.38:8989/'
 // const proxyUrl = 'http://192.168.3.20:8989/' // 邹旋
 // const proxyUrl = 'http://192.168.3.143:8989/' // 尚科