Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/app.tsx
#	src/pages/my/my.tsx

src/app.tsx

@@ -50,7 +50,8 @@ function App(props) {
         windowHeight,
         safeArea,
         isIos,
-        textBarHeight
+        textBarHeight,
+        menu: Taro.getMenuButtonBoundingClientRect(),
       }
     }
   })

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;

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,
   }
 
 

src/pages/index/index.config.ts

@@ -1,5 +1,3 @@
 export default definePageConfig({
-  navigationBarTitleText: '学习课程',
+  navigationStyle: 'custom'
-  navigationBarBackgroundColor: '#92ecc5',
-  navigationBarTextStyle: 'white',
 })

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} style={`paddingTop:${globalData.statusBarHeight}px`}>
-      <View className={styles.content}>
         { !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>
-    </>
   )
 }
 

src/pages/my/my.tsx

@@ -27,13 +27,15 @@ const My: FC = () => {
 
   return (
     <View className={styles.content} style={`paddingTop:${globalData.statusBarHeight}px`}>
-      {
+      { !token ?
-        !token ? <LoginView height={globalData.windowHeight - 100}></LoginView>
+        <LoginView></LoginView>
-          : <>
+        :
-            <Header showCompany={() => setCompanyShow(true)}/>
+        <>
-            <Time/>
+          <Header showCompany={()=>{setCompanyShow(true)}}/>
-            <Service/>
+          <Time/>
-          </>
+          <Service/>
+        </>
+
       }
 
       <PageContainer overlayStyle={'background:rgba(0,0,0,0.3)'} position={'bottom'} round={true} show={companyShow}