diff --git a/src/pages/home/components/feature.tsx b/src/pages/home/components/feature.tsx index 4e77b2f..d6ae52b 100644 --- a/src/pages/home/components/feature.tsx +++ b/src/pages/home/components/feature.tsx @@ -20,7 +20,7 @@ const Feature: FC = () => { } return ( - + { list.map(d => jump(d.url)}> diff --git a/src/pages/home/home.module.scss b/src/pages/home/home.module.scss index e355f46..87195f0 100644 --- a/src/pages/home/home.module.scss +++ b/src/pages/home/home.module.scss @@ -15,18 +15,32 @@ font-weight: 500; } -.header{ - -} +.header { + position: fixed; + top: 0; + left: 0; + right: 0; + width: 100%; + padding-left: 20rpx; + z-index: 99999999999; + overflow: hidden; -.logo{ - width: 80rpx; - height: 80rpx; + &:after { + min-height: 100vh; + position: absolute; + top: 0; + left: -10%; + width: 120%; + content: ''; + display: block; + background: linear-gradient(to right, #DBF3F5, #B9ECD7, #C1EEDA) no-repeat; + min-height: 100vh; + background-size: 100% 600rpx; + z-index: -1; + } } - .content { - position: relative; padding: 0 20px; min-height: 90vh; box-sizing: border-box; @@ -41,8 +55,9 @@ height: 400rpx; content: ''; display: block; - background: linear-gradient(to bottom, #92ecc5, #f1f8f6) no-repeat; + background: linear-gradient(to right, #DBF3F5, #B9ECD7, #C1EEDA) no-repeat; z-index: -1; + filter: blur(50px); } } @@ -72,8 +87,8 @@ .featureList { font-size: 28rpx; - font-family: PingFang SC-Medium, PingFang SC; - font-weight: 500; + font-family: PingFang SC-Bold, PingFang SC; + font-weight: bold; color: #323635; margin-top: 10px; } @@ -90,14 +105,14 @@ color: #323635; background: #fff; padding: 30rpx 0 30rpx 30rpx; - margin-bottom: 50rpx; + margin-bottom: 40rpx; border-radius: 30rpx; } .featureTitle { max-width: 212px; - height: 42rpx; - padding-bottom: 30rpx; + height: 50rpx; + padding-bottom: 20rpx; } .featureText { @@ -105,7 +120,7 @@ } .featureTextTitle { - font-size: 30rpx; + font-size: 32rpx; font-family: PingFang SC-Medium, PingFang SC; font-weight: 500; color: #323635; @@ -113,11 +128,10 @@ white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; - line-height: 2; } .featureTextDescription { - font-size: 24rpx; + font-size: 28rpx; font-family: PingFang SC-Medium, PingFang SC; font-weight: 500; color: #909795; @@ -125,6 +139,7 @@ white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; + line-height: 2; } .ranking { @@ -142,4 +157,5 @@ border-radius: 12rpx; overflow: hidden; margin-right: 20rpx; + vertical-align: middle; } diff --git a/src/pages/home/home.tsx b/src/pages/home/home.tsx index bf38e35..b84caf3 100644 --- a/src/pages/home/home.tsx +++ b/src/pages/home/home.tsx @@ -15,9 +15,11 @@ import Spin from "@/components/spinner"; const Home: FC = () => { const globalData = Taro.getApp().globalData + const {bottom, top} = Taro.getMenuButtonBoundingClientRect() const {token} = Profile.useContainer() const [data, setData] = useState(null) const [enable, setEnable] = useState(true) + const titleBarHeight = bottom + top - (globalData.statusBarHeight * 2) function unLogin() { Taro.clearStorage() @@ -34,10 +36,13 @@ const Home: FC = () => { }) return ( - + - - + + diff --git a/src/pages/manage/spotMeeting/spotMeeting.tsx b/src/pages/manage/spotMeeting/spotMeeting.tsx index e8d3f08..788ab85 100644 --- a/src/pages/manage/spotMeeting/spotMeeting.tsx +++ b/src/pages/manage/spotMeeting/spotMeeting.tsx @@ -25,6 +25,7 @@ const SpotMeeting: FC = () => { const [loading, setLoading] = useState(false) const [status, setStatus] = useState(0) // 状态 const [id, setId] = useState(params.id ? Number(params.id) : undefined) + const pathUrl = process.env.TARO_ENV === 'h5' ? '/official/qrcode' : '/wechat/link' const {company} = Profile.useContainer() function setData(res: Meeting | null) { @@ -119,6 +120,9 @@ const SpotMeeting: FC = () => { //存储二维码 handleWriteFile() }, + fail() { + Taro.showToast({title: '保存授权失败', icon: "error"}) + } }); } else { handleWriteFile() @@ -133,7 +137,7 @@ const SpotMeeting: FC = () => { /** 获取二维码地址 */ const downUrl = (id: number, down = true) => { Taro.showLoading({title: '加载二维码'}) - const url = process.env.TARO_APP_API + '/official/qrcode?' + 'meeting_id=' + id + '&path=' + path + const url = process.env.TARO_APP_API + pathUrl + '?meeting_id=' + id + '&path=' + path if (process.env.TARO_ENV !== 'h5') { Taro.downloadFile({ @@ -302,17 +306,6 @@ const SpotMeeting: FC = () => { x.id == depid)?.name}/> - {/* setDescription(e.detail.value)}*/} - {/* style={{height: '60px'}}>*/} - {/**/} - { id !== undefined && <> diff --git a/src/pages/preview/videoFull/videoFull.tsx b/src/pages/preview/videoFull/videoFull.tsx index 21a3c6c..e44d64e 100644 --- a/src/pages/preview/videoFull/videoFull.tsx +++ b/src/pages/preview/videoFull/videoFull.tsx @@ -54,7 +54,7 @@ const VideoFull: FC = () => { onClick={click} className={styles.video} controls - poster={params.poster} + // poster={params.poster} src={params.url} autoplay showCenterPlayBtn diff --git a/src/static/css/module.scss b/src/static/css/module.scss index b021177..6f3295f 100644 --- a/src/static/css/module.scss +++ b/src/static/css/module.scss @@ -1,13 +1,10 @@ page, .taro_router .taro_page { - background-color: #f1f8f6 !important; + background-color: #f2f8f6 !important; font-family: PingFang SC-Bold, PingFang SC; -webkit-overflow-scrolling: touch; box-sizing: border-box; padding-bottom: env(safe-area-inset-bottom); -} - -body { font-size: 32rpx; } diff --git a/src/static/img/brandTop.png b/src/static/img/brandTop.png index 01c3545..15b84d4 100644 Binary files a/src/static/img/brandTop.png and b/src/static/img/brandTop.png differ diff --git a/src/static/img/logo.png b/src/static/img/logo.png index 5f9c2a9..03d0dfd 100644 Binary files a/src/static/img/logo.png and b/src/static/img/logo.png differ