diff --git a/src/components/learningRecord/learningRecord.module.scss b/src/components/learningRecord/learningRecord.module.scss index d08d305..99b7e1e 100644 --- a/src/components/learningRecord/learningRecord.module.scss +++ b/src/components/learningRecord/learningRecord.module.scss @@ -9,7 +9,7 @@ } .total { - font-size: 40px; + font-size: 40rpx; font-family: PingFang SC-Heavy, PingFang SC; font-weight: 800; color: #323635; diff --git a/src/components/lineChart/lineChart.module.scss b/src/components/lineChart/lineChart.module.scss index 07c565e..4520b9a 100644 --- a/src/components/lineChart/lineChart.module.scss +++ b/src/components/lineChart/lineChart.module.scss @@ -22,10 +22,11 @@ } .records { - font-size: 30rpx; + font-size: 28rpx; font-family: PingFang SC-Medium, PingFang SC; font-weight: 500; color: #323635; + margin-top: 18rpx; margin-bottom: 42rpx; } diff --git a/src/components/popPut/popPut.tsx b/src/components/popPut/popPut.tsx index 8465ab1..d783f6c 100644 --- a/src/components/popPut/popPut.tsx +++ b/src/components/popPut/popPut.tsx @@ -16,6 +16,7 @@ interface Props { onClick?: () => void no_border?: boolean leftImage?: string + errorType?: "acquiesce" | 'avatar' } const PopPut: FC = ({title, chevron, content, image, isProp, children, show, ...opt}: Props) => { @@ -47,7 +48,7 @@ const PopPut: FC = ({title, chevron, content, image, isProp, children, sh <> - {opt.leftImage != null && } + {opt.leftImage != null && } {title} diff --git a/src/pages/index/components/videoList.tsx b/src/pages/index/components/videoList.tsx index c19f6ab..8df1599 100644 --- a/src/pages/index/components/videoList.tsx +++ b/src/pages/index/components/videoList.tsx @@ -76,7 +76,7 @@ export const VideoList: FC = ({categoryKey, setCategoryKey}) => { if (class_hour === find.finished_count) { return '100%' } - return ` ${((find.finished_count / class_hour) * 100).toFixed(0)}%` + return `${((find.finished_count / class_hour) * 100).toFixed(0)}%` } return '0%' } diff --git a/src/pages/manage/depAdmin/depAdmin.tsx b/src/pages/manage/depAdmin/depAdmin.tsx index 41a8e22..e571b2f 100644 --- a/src/pages/manage/depAdmin/depAdmin.tsx +++ b/src/pages/manage/depAdmin/depAdmin.tsx @@ -151,6 +151,7 @@ const DepAdmin: FC = () => { />)} {users.map(d => = ({data}) => { return ( <> - - + + - {data?.name} + {data?.name} {data?.is_lock ? '禁用' : '正常'} - {['学员', '管理员', '超级管理员'][data?.role_type || 0]} + + {['学员', '管理员', '超级管理员'][data?.role_type || 0]} + - + 学员编号 {data?.id}号 diff --git a/src/pages/manage/userInfo/userInfo.module.scss b/src/pages/manage/userInfo/userInfo.module.scss index 157c3eb..3e29cd0 100644 --- a/src/pages/manage/userInfo/userInfo.module.scss +++ b/src/pages/manage/userInfo/userInfo.module.scss @@ -1,8 +1,16 @@ .page { - padding: 15rpx; + padding: 30rpx; } - +.box { + background: #fff; + border-radius: 20rpx; + padding: 32rpx; + display: flex; + align-items: center; + box-sizing: border-box; + line-height: 1.75; +} .image { width: 120rpx; @@ -13,8 +21,10 @@ .tag { background: #00D6AC; - font-size: 24rpx; - color: #fff; + font-size: 22rpx; + font-family: PingFang SC-Regular, PingFang SC; + font-weight: 400; + color: #FFFFFF; margin-left: 20rpx; padding: 3rpx 10rpx; border-radius: 8rpx; @@ -23,8 +33,10 @@ .tag_muted { background: #909795; - font-size: 24rpx; - color: #fff; + font-size: 22rpx; + font-family: PingFang SC-Regular, PingFang SC; + font-weight: 400; + color: #FFFFFF; margin-left: 20rpx; padding: 3rpx 10rpx; border-radius: 8rpx; @@ -32,6 +44,8 @@ } .information { + height: 96rpx; + box-sizing: border-box; width: 100%; color: #606563; padding: 20rpx 0; diff --git a/src/pages/manage/userInfo/userInfo.tsx b/src/pages/manage/userInfo/userInfo.tsx index a6cc1f7..c9be6c3 100644 --- a/src/pages/manage/userInfo/userInfo.tsx +++ b/src/pages/manage/userInfo/userInfo.tsx @@ -79,7 +79,7 @@ const UserInfo: FC = () => { - + { data?.role_type !== 2 && {['设置为管理员', '设置为学员'][data?.role_type || 0]} @@ -87,14 +87,12 @@ const UserInfo: FC = () => { Taro.navigateTo({url: "/pages/manage/addStudent/addStudent?id=" + userId})} - className={'mt-3'}> + onClick={() => Taro.navigateTo({url: "/pages/manage/addStudent/addStudent?id=" + userId})}> 修改 删除