diff --git a/src/app.tsx b/src/app.tsx index fd72db5..b94c2a6 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -50,7 +50,8 @@ function App(props) { windowHeight, safeArea, isIos, - textBarHeight + textBarHeight, + menu: Taro.getMenuButtonBoundingClientRect(), } } }) 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) => { 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 ( - <> - + { !token ? - + : <> + + 学习课程 + setCategoryKey(categoryKey)}/> } - - ) } diff --git a/src/pages/my/my.tsx b/src/pages/my/my.tsx index 76d986b..e5408b3 100644 --- a/src/pages/my/my.tsx +++ b/src/pages/my/my.tsx @@ -27,13 +27,15 @@ const My: FC = () => { return ( - { - !token ? - : <> -
setCompanyShow(true)}/> -