Quellcode durchsuchen

同步验证码配置

shmily1213 vor 1 Monat
Ursprung
Commit
5d6fbd0924

+ 7 - 1
src/pagesSystem/pages/login/login.vue

@@ -60,12 +60,14 @@ import ieCaptcha from '@/components/ie-sms/ie-captcha.vue';
 import { useUserStore } from '@/store/userStore';
 import { useTransferPage } from '@/hooks/useTransferPage';
 import { validatePhone } from '@/hooks/useValidation';
+import { useAppConfig } from '@/hooks/useAppConfig';
 import { verifyCard } from '@/api/modules/user';
 import { EnumBindScene, EnumSmsApiType } from '@/common/enum';
 import { login } from '@/api/modules/login';
 import { LoginRequestDTO, MobileLoginResponseDTO } from '@/types/user';
 const { transferBack, transferTo } = useTransferPage();
 const userStore = useUserStore();
+const { isSmsCaptchaEnable } = useAppConfig();
 
 const loginType = ref('phone');
 const phone = ref('');
@@ -146,7 +148,11 @@ const handleLogin = async () => {
   if (loginType.value === 'phone') {
     submitLogin();
   } else if (loginType.value === 'card') {
-    captchaRef.value.open();
+    if (isSmsCaptchaEnable.value) {
+      captchaRef.value.open();
+    } else {
+      submitLogin();
+    }
     userStore.rememberLoginInfo(!!rememberPassword.value[0], cardNo.value, cardPassword.value);
     // submitLogin();
   }

+ 10 - 4
src/pagesSystem/pages/phone-verify/phone-verify.vue

@@ -22,9 +22,12 @@ import { useTransferPage } from '@/hooks/useTransferPage';
 import { EnumBindScene, EnumSmsApiType } from '@/common/enum';
 import { validateSms } from '@/api/modules/system';
 import { validatePhone } from '@/hooks/useValidation';
+import { useAppConfig } from '@/hooks/useAppConfig';
 import { getUserInfo, getUserInfoWithToken, login } from '@/api/modules/login';
 import { useUserStore } from '@/store/userStore';
 const { prevData, transferTo } = useTransferPage();
+const { isSmsCaptchaEnable } = useAppConfig();
+
 const form = ref({
   phone: '',
   password: '',
@@ -120,11 +123,14 @@ const handleSubmit = async () => {
     uni.$ie.showToast('请输入正确的手机号');
     return;
   }
-  if (!uuid && password) {
-    uni.$ie.showToast('请输入正确的验证码');
-    return;
+  // 开启了图形验证
+  if (isSmsCaptchaEnable.value) {
+    if (!uuid) {
+      uni.$ie.showToast('请输入正确的验证码');
+      return;
+    }
   }
-  if (!uuid || !password || password.trim() === '') {
+  if (!password || password.trim() === '') {
     uni.$ie.showToast('请输入验证码');
     return;
   }