From 1cd8fba6a3201ba2cbe384d34e2ebc23e653a400 Mon Sep 17 00:00:00 2001
From: sunlizhou <296190577@qq.com>
Date: Thu, 31 Aug 2023 14:57:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=A7=86=E5=9B=BE=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app.tsx                                |  3 ++-
 src/components/loginView/index.module.scss |  2 +-
 src/components/loginView/index.tsx         |  5 +++--
 src/pages/index/index.config.ts            |  4 +---
 src/pages/index/index.tsx                  | 12 ++++++------
 src/pages/my/my.tsx                        |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/app.tsx b/src/app.tsx
index 61fca2e..05275e3 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -46,11 +46,12 @@ function App(props) {
         screenHeight: res.screenHeight,
         windowHeight: res.windowHeight,
         safeArea: res.safeArea,
+        menu:Taro.getMenuButtonBoundingClientRect(),
       }
+      console.log(Taro.getApp().globalData)
     }
   })
 
-
   // 对应 onShow
   useDidShow(() => {
   })
diff --git a/src/components/loginView/index.module.scss b/src/components/loginView/index.module.scss
index e7e2337..90a023d 100644
--- a/src/components/loginView/index.module.scss
+++ b/src/components/loginView/index.module.scss
@@ -23,7 +23,7 @@
     margin-bottom: 40rpx;
   }
   .button{
-    width: 70%;
+    width: 520rpx;
     height: 76rpx;
     background: #45D4A8;
     border-radius: 38rpx 38rpx 38rpx 38rpx;
diff --git a/src/components/loginView/index.tsx b/src/components/loginView/index.tsx
index 367e61e..b6bfb64 100644
--- a/src/components/loginView/index.tsx
+++ b/src/components/loginView/index.tsx
@@ -12,9 +12,10 @@ interface Props {
 const LoginView: FC<Props> =  (props) => {
   const {empty} = Profile.useContainer()
   const text = props.tips ?? '登录后可查看更多内容'
-  const size: string = props.height? `${props.height}px`:'750rpx'
+  const size: string = props.height? `${props.height}px`:'0rpx'
   const sizeStyle: CSSProperties = {
-    height:size,
+    height:'1000rpx',
+    paddingTop:size,
   }
 
 
diff --git a/src/pages/index/index.config.ts b/src/pages/index/index.config.ts
index 752ef7b..23c20dd 100644
--- a/src/pages/index/index.config.ts
+++ b/src/pages/index/index.config.ts
@@ -1,5 +1,3 @@
 export default definePageConfig({
-  navigationBarTitleText: '学习课程',
-  navigationBarBackgroundColor: '#92ecc5',
-  navigationBarTextStyle: 'white',
+  navigationStyle: 'custom'
 })
diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx
index 6eb859a..d1028c6 100644
--- a/src/pages/index/index.tsx
+++ b/src/pages/index/index.tsx
@@ -1,5 +1,5 @@
 import {FC, useState} from "react";
-import {View} from "@tarojs/components";
+import {View, Text} from "@tarojs/components";
 import styles from './index.module.scss'
 import {VideoList} from "@/pages/index/components/videoList";
 import Tabs, {OnChangOpt, TabList} from "@/components/tabs/tabs";
@@ -25,19 +25,19 @@ const Index: FC = () => {
 
 
   return (
-    <>
-      <View className={styles.content}>
+      <View className={styles.content} style={`paddingTop:${globalData.statusBarHeight}px`}>
         { !token ?
-          <LoginView height={globalData.windowHeight-100}></LoginView>
+          <LoginView></LoginView>
           :
           <>
+            <View className="flex justify-center align-center" style={{height:`${(globalData.menu.top-globalData.statusBarHeight)*2+globalData.menu.height}px`}}>
+              <Text className="font-28 text-white">学习课程</Text>
+            </View>
             <Tabs tabList={category} onChange={tabChange} current={categoryKey}/>
             <VideoList categoryKey={categoryKey} setCategoryKey={(categoryKey) => setCategoryKey(categoryKey)}/>
           </>
         }
-
       </View>
-    </>
   )
 }
 
diff --git a/src/pages/my/my.tsx b/src/pages/my/my.tsx
index 2b450f9..6d29e80 100644
--- a/src/pages/my/my.tsx
+++ b/src/pages/my/my.tsx
@@ -28,7 +28,7 @@ const My: FC = () => {
   return (
     <View className={styles.content} style={`paddingTop:${globalData.statusBarHeight}px`}>
       { !token ?
-        <LoginView height={globalData.windowHeight-100}></LoginView>
+        <LoginView></LoginView>
         :
         <>
           <Header showCompany={()=>{setCompanyShow(true)}}/>