Merge branch 'newVersion' of http://git.dayaedu.com/lex/colexiu-project into newVersion

src/views/login/components/qr-login/index.tsx

@@ -153,11 +153,12 @@ export default defineComponent({
               underline={false}
               class="m-auto mt-3"
               onClick={async () => {
-                await this.getCode()
+                const scanCode = sessionStorage.getItem('scanCode')
+                await this.getCode(scanCode || '')
                 this.isScan = false
               }}
             >
-              返回扫码二维码
+              返回扫描二维码
             </ElLink>
           </>
         ) : (
@@ -181,8 +182,7 @@ export default defineComponent({
                     size="small"
                     onClick={async () => {
                       this.codeTimerOut = false
-                      const scanCode = sessionStorage.getItem('scanCode')
-                      await this.getCode(scanCode)
+                      await this.getCode()
                       state.loginPopupTimer = setInterval(async () => {
                         await this.getList()
                       }, 5000)

src/views/login/components/register-success/index.tsx

@@ -48,7 +48,7 @@ export default defineComponent({
     return (
       <div class={['text-center']}>
         <h2 class="text-2xl font-semibold text-[#333] mb-6 flex flex-col items-center">
-          {this.type ? '酷乐秀' : '注册成功'}
+          {this.type ? '酷乐秀' : '登录成功'}
           <i class="w-12 h-1 bg-[#2DC7AA] inline-block leading-none rounded-sm mt-1"></i>
         </h2>
 
@@ -89,8 +89,12 @@ export default defineComponent({
           round
           style={{ height: '48px' }}
           onClick={() => {
-            if (this.registerType == 'teacher') {
+            if (
+              this.registerType == 'teacher' &&
+              state.user.data.entryFlag !== 1
+            ) {
               // this.type = 'teacher-auth'
+
               this.onTypeChange('teacher-auth')
             } else {
               this.onClose()