Merge branch 'newVersion' into dev

src/components/col-header/index.css

@@ -42,12 +42,12 @@
 
 }
 
-.isdark.headerSection {
+.isdark.top.headerSection {
   background-color: #252627!important;
   animation:none;
   /* isdark */
 }
-.isdark .normalItem {
+.isdark.top.normalItem {
   color: #fff;
 
 }

src/components/col-header/index.tsx

@@ -82,9 +82,10 @@ export default defineComponent({
         >
           <div class="flex items-center h-full">
             <div class="logoWrap" onClick={() => this.gotoMain()}>
+              {/* this.isdark || */}
               <img
                 class="w-full"
-                src={this.isdark || !this.isTop ? logo : whileLogo}
+                src={ !this.isTop ? logo : whileLogo}
                 alt=""
               />
             </div>

src/components/col-header/modals/index.module.less

@@ -69,11 +69,11 @@
         .teacherTag {
           width: 38px;
           height: 22px;
-          background: #cffff0;
+          background: #CFF2FF;
           border-radius: 11px;
           line-height: 22px;
           font-weight: 400;
-          color: #00ab76;
+          color: #0089B9;
           text-align: center;
         }
         .studentTag {

src/components/col-header/modals/loganInfo.tsx

@@ -151,7 +151,8 @@ export default defineComponent({
             loginUserType: userType
           })
         )
-        router.push({ path: nowPath, query: { ...route.query } })
+        router.push({ path: '/' })
+        // router.push({ path: nowPath, query: { ...route.query } })
         setTimeout(() => {
           window.location.reload()
         }, 500)