Merge branch 'newVersion' into dev

src/views/App.tsx

@@ -29,7 +29,7 @@ export default defineComponent({
         <ColHeader />
         <div
           style={{
-            minHeight: 'calc(100vh - 263.5px)',
+            minHeight: 'calc(100vh - 422px)',
             background: '#fff'
           }}
         >

src/views/role-auth/teacherAuth/index.tsx

@@ -45,7 +45,7 @@ export default defineComponent({
   },
   render() {
     return (
-      <div class="mt-[72px] bg-white min-h-full m-auto text-[#333]">
+      <div class="mt-[62px] bg-white min-h-full m-auto text-[#333]">
         {this.authStatus || !teacherState.nextStatus ? <CertBrief /> : <Auth />}
         {/* <Auth /> */}
       </div>

src/views/student-info/index.tsx

@@ -7,8 +7,8 @@ export default defineComponent({
   name: 'user-info',
   render() {
     return (
-      <div class="bg-[#F6F7F8]">
-        <div class="w-[1002px] mt-[100px] rounded-[10px] bg-white py-5 overflow-hidden mb-14 min-h-full m-auto text-[#333] flex">
+      <div class="bg-[#F6F7F8] overflow-hidden">
+        <div class="w-[1002px] mt-[86px] rounded-[10px] bg-white py-5 overflow-hidden mb-14 min-h-full m-auto text-[#333] flex">
           <div class="w-[264px] ">
             <Users />
             <UserMenu />

src/views/user-info/components/users/index.tsx

@@ -70,7 +70,7 @@ export default defineComponent({
   render() {
     return (
       <div class={['text-center pb-8 relative overflow-hidden', styles.users]}>
-        <div class="bg-[#CFFFF0] absolute left-6 top-0 text-[#00AB76] text-xs py-0.5 px-2 rounded-[10px]">
+        <div class="bg-[#CFF2FF] absolute left-6 top-0 text-[#0089B9] text-xs py-0.5 px-2 rounded-[10px]">
           老师
         </div>
         <img

src/views/user-info/index.tsx

@@ -7,8 +7,8 @@ export default defineComponent({
   name: 'user-info',
   render() {
     return (
-      <div class="bg-[#F6F7F8]">
-        <div class="w-[1002px] mt-[100px] rounded-[10px] bg-white py-5 overflow-hidden mb-10 min-h-full m-auto text-[#333] flex">
+      <div class="bg-[#F6F7F8] overflow-hidden">
+        <div class="w-[1002px] mt-[86px] rounded-[10px] bg-white py-5 overflow-hidden mb-10 min-h-full m-auto text-[#333] flex">
           <div class="w-[264px] ">
             <Users />
             <UserMenu />