From a70dcc2de10045bf5e6ae5109381246189aa51d1 Mon Sep 17 00:00:00 2001
From: king <2229249788@qq.com>
Date: Tue, 5 Sep 2023 13:50:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=A6=E5=91=98=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../learningRecord/learningRecord.module.scss |  2 +-
 .../lineChart/lineChart.module.scss           |  3 ++-
 src/components/popPut/popPut.tsx              |  3 ++-
 src/pages/index/components/videoList.tsx      |  2 +-
 src/pages/manage/depAdmin/depAdmin.tsx        |  1 +
 src/pages/manage/userInfo/components/info.tsx | 15 ++++++-----
 .../manage/userInfo/userInfo.module.scss      | 26 ++++++++++++++-----
 src/pages/manage/userInfo/userInfo.tsx        |  8 +++---
 8 files changed, 39 insertions(+), 21 deletions(-)

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<Props> = ({title, chevron, content, image, isProp, children, show, ...opt}: Props) => {
@@ -47,7 +48,7 @@ const PopPut: FC<Props> = ({title, chevron, content, image, isProp, children, sh
     <>
       <View className='card' onClick={click} style={style()}>
         <View className='flex align-center'>
-          {opt.leftImage != null && <Img width={68} height={68} src={opt.leftImage} className='mr-3' mode='aspectFit'/>}
+          {opt.leftImage != null && <Img errorType={opt.errorType} width={68} height={68} src={opt.leftImage} className='mr-3' mode='aspectFit'/>}
           <View>{title}</View>
         </View>
         <View className='card-content'>
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<Props> = ({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 => <PopPut
+          errorType='avatar'
           key={d.id}
           leftImage={d.avatar}
           title={d.name}
diff --git a/src/pages/manage/userInfo/components/info.tsx b/src/pages/manage/userInfo/components/info.tsx
index 973fdf0..76ff19e 100644
--- a/src/pages/manage/userInfo/components/info.tsx
+++ b/src/pages/manage/userInfo/components/info.tsx
@@ -1,5 +1,5 @@
 import {FC} from "react";
-import { Text, View} from "@tarojs/components";
+import {Text, View} from "@tarojs/components";
 import styles from '../userInfo.module.scss'
 import Img from "@/components/image/image";
 
@@ -12,21 +12,24 @@ const Info: FC<Props> = ({data}) => {
 
   return (
     <>
-      <View className={styles.box}>
-        <Img width={120} height={120} src={data?.avatar || ''} className={styles.image}/>
+      <View className={styles.box} style={{height: '184rpx'}}>
+        <Img width={120} height={120} src={data?.avatar || ''} className={styles.image} errorType='avatar'/>
         <View className='ml-2'>
           <View>
-            <Text className='font-weight'>{data?.name}</Text>
+            <Text className='font-weight font-32'>{data?.name}</Text>
             <Text
               className={data?.is_lock ? styles.tag_muted : styles.tag}>
               {data?.is_lock ? '禁用' : '正常'}
             </Text>
           </View>
-          <View className='text-muted font-24 mt-2'>{['学员', '管理员', '超级管理员'][data?.role_type || 0]}</View>
+          <View className='text-muted font-28'
+                style={{marginTop: '2px'}}>
+            {['学员', '管理员', '超级管理员'][data?.role_type || 0]}
+          </View>
         </View>
       </View>
 
-      <View className={`${styles.box} mt-3`} style={{display: 'block'}}>
+      <View className={`${styles.box}`} style={{display: 'block', margin: '16rpx 0', padding: '0 32rpx'}}>
         <View className={styles.information} style={{borderBottom: "1px solid #F5F8F7"}}>
           <Text style={{width: '100px', display: 'inline-block'}}>学员编号</Text>
           <Text>{data?.id}号</Text>
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 = () => {
       <LearningRecord userId={userId}/>
 
 
-      <View className='mt-5'>
+      <View className='mt-2'>
         {
           data?.role_type !== 2
           && <MyButton onClick={setRoleType}>{['设置为管理员', '设置为学员'][data?.role_type || 0]}</MyButton>
@@ -87,14 +87,12 @@ const UserInfo: FC = () => {
         <MyButton
           type='default'
           style={{background: '#fff'}}
-          onClick={() => Taro.navigateTo({url: "/pages/manage/addStudent/addStudent?id=" + userId})}
-          className={'mt-3'}>
+          onClick={() => Taro.navigateTo({url: "/pages/manage/addStudent/addStudent?id=" + userId})}>
           修改
         </MyButton>
         <MyButton
           type='default'
-          style={{background: '#fff', color: 'red'}}
-          className={'mt-3'}
+          style={{background: '#fff', color: 'red', marginTop: "16rpx"}}
           onClick={delUser}>
           删除
         </MyButton>