Xiao_123 hace 7 meses
padre
commit
6db9e960a1
Se han modificado 1 ficheros con 9 adiciones y 6 borrados
  1. 9 6
      src/views/login/index.vue

+ 9 - 6
src/views/login/index.vue

@@ -18,7 +18,7 @@
             <v-tabs v-model="tab1" align-tabs="center" color="primary" class="mb-10">
               <v-tab :value="1">企业邮箱登录</v-tab>
             </v-tabs>
-            <passwordFrom ref="passRef" placeholder="请输入企业邮箱" :validEmail="true" @handleEnter="handleLogin"></passwordFrom>
+            <passwordFrom ref="entPassRef" placeholder="请输入企业邮箱" :validEmail="true" @handleEnter="handleLogin"></passwordFrom>
           </div>
           <!-- 个人登录 -->
           <div v-show="!isEnterpriseLogin" class="login-tab">
@@ -111,6 +111,7 @@ const handleChangeLogin = () => {
 // 验证码登录
 const phoneRef = ref()
 const passRef = ref()
+const entPassRef = ref()
 const loginLoading = ref(false)
 const userStore = useUserStore()
 
@@ -125,9 +126,9 @@ const handleCheckEnterprise = async () => {
 }
 
 const handleLogin = async () => {
-  const { valid } = tab.value === 1 ? await phoneRef.value.phoneForm.validate() : await passRef.value.passwordForm.validate()
+  const { valid } = isEnterpriseLogin.value ? await entPassRef.value.passwordForm.validate() : tab.value === 1 ? await phoneRef.value.phoneForm.validate() : await passRef.value.passwordForm.validate()
   if (!valid) return
-  if (tab.value === 2 && !captchaVerification) {
+  if (!captchaVerification) {
     getCode() // 验证码组件
     return
   }
@@ -135,8 +136,10 @@ const handleLogin = async () => {
   loginLoading.value = true
   try {
     let params, api = {}
-    if (tab.value === 1) { params = { ...phoneRef.value.loginData }; api = 'handleSmsLogin'}
-    else { params = { ...passRef.value.loginData, captchaVerification }; api = 'handlePasswordLogin'}
+    // if (tab.value === 1) { params = { ...phoneRef.value.loginData }; api = 'handleSmsLogin'}
+    // else { params = { ...passRef.value.loginData, captchaVerification }; api = 'handlePasswordLogin'}
+    if (isEnterpriseLogin.value) { params = { ...entPassRef.value.loginData, captchaVerification }; api = 'handlePasswordLogin'}
+    else { params = tab.value === 1 ? { ...phoneRef.value.loginData, captchaVerification } : { ...passRef.value.loginData, captchaVerification }; api = tab.value === 1 ? 'handleSmsLogin' : 'handlePasswordLogin'}
     
     // 邮箱为企业招聘, 手机号为个人求职
     if (isEnterpriseLogin.value) {
@@ -164,7 +167,7 @@ const handleLogin = async () => {
     Confirm('系统提示',  `${text},去注册?`, {
       cancelCallback: true
     }).then(() => {
-      localStorage.setItem('loginAccount', tab.value === 1 ? phoneRef.value.loginData.phone : passRef.value.loginData.phone)
+      localStorage.setItem('loginAccount', tab.value === 1 ? phoneRef.value.loginData.phone : entPassRef.value.loginData.phone)
       router.push(err.code === 1100016002 ? '/register/person?type=noLoginToRegister' : '/register/company?type=noLoginToRegister')
     })
   } finally {