diff --git a/src/components/popPut/popPut.tsx b/src/components/popPut/popPut.tsx index d9f2a0d..ea557ca 100644 --- a/src/components/popPut/popPut.tsx +++ b/src/components/popPut/popPut.tsx @@ -1,9 +1,8 @@ import {FC, ReactNode, useEffect, useState} from "react"; -import {View, Image, Text} from "@tarojs/components"; +import {View, Image} from "@tarojs/components"; import Icon from "@/components/icon"; import CustomPageContainer from "@/components/custom-page-container/custom-page-container"; - interface Props { height?: number | string title: string @@ -51,7 +50,7 @@ const PopPut: FC = ({title, chevron, content, image, isProp, children, sh {title} - {content} + {content} {!chevron && } {image && } diff --git a/src/pages/manage/spotMeeting/spotMeeting.config.ts b/src/pages/manage/spotMeeting/spotMeeting.config.ts index 475c44d..6b0f119 100644 --- a/src/pages/manage/spotMeeting/spotMeeting.config.ts +++ b/src/pages/manage/spotMeeting/spotMeeting.config.ts @@ -1,4 +1,7 @@ export default definePageConfig({ navigationBarTitleText: '现场会', - enableShareAppMessage: true + enableShareAppMessage: true, + navigationBarBackgroundColor: '#00d6ac', + backgroundColor: '#00d6ac', + navigationBarTextStyle: 'white', }) diff --git a/src/pages/manage/spotMeeting/spotMeeting.module.scss b/src/pages/manage/spotMeeting/spotMeeting.module.scss index 51ac92e..e0e99f7 100644 --- a/src/pages/manage/spotMeeting/spotMeeting.module.scss +++ b/src/pages/manage/spotMeeting/spotMeeting.module.scss @@ -26,6 +26,19 @@ position: relative; } +.empty{ + position: absolute; + left: 0; + right: 0; + top: 0; + bottom: 0; + margin: auto; + width: 300rpx; + height: 40rpx; + text-align: center; + font-weight: bold; +} + .failure{ width: 180rpx; height: 180rpx; diff --git a/src/pages/manage/spotMeeting/spotMeeting.tsx b/src/pages/manage/spotMeeting/spotMeeting.tsx index f1d4dd4..ed67854 100644 --- a/src/pages/manage/spotMeeting/spotMeeting.tsx +++ b/src/pages/manage/spotMeeting/spotMeeting.tsx @@ -1,5 +1,5 @@ import {FC, useCallback, useEffect, useState} from "react"; -import {Form, Image, Input, Picker, Textarea, View} from "@tarojs/components"; +import {Form, Image, Input, Picker, View} from "@tarojs/components"; import Taro, {getSetting, authorize} from "@tarojs/taro"; import {curriculum, Meeting, meetingAPi} from "@/api"; import {formatDate} from "@/utils/time"; @@ -227,14 +227,23 @@ const SpotMeeting: FC = () => { - 填完信息才能生成二维码 + 现场会 {process.env.TARO_ENV === 'h5' && 微信公众号,浏览器中请截图保存} { imgUrl - ? - : + ? + : <> + 填完写完整信息 + + } {status === 2 && } @@ -279,16 +288,16 @@ const SpotMeeting: FC = () => { x.id == depid)?.name}/> - + {/* setDescription(e.detail.value)}*/} + {/* style={{height: '60px'}}>*/} + {/**/} { id !== undefined && <> diff --git a/src/static/css/module.scss b/src/static/css/module.scss index 1df6bc3..f77d02a 100644 --- a/src/static/css/module.scss +++ b/src/static/css/module.scss @@ -49,7 +49,7 @@ taro-button-core::after { align-items: center; justify-content: space-between; border-bottom: 1px solid #F5F8F7; - padding: 10px 20rpx; + padding: 20rpx; font-size: 30rpx; &-content { @@ -74,6 +74,7 @@ taro-button-core::after { box-sizing: border-box; border: 1px solid #ddd; height: 200px; + text-align: left; } .button {