|
@@ -43,16 +43,16 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
|
|
|
- <el-form-item class="dynamic_verification_code" prop="dynamic_verification_code">
|
|
|
+ <!-- <el-form-item class="dynamic_verification_code" prop="dynamic_verification_code">
|
|
|
<el-input v-model="loginForm.dynamic_verification_code" placeholder="邮箱验证码" />
|
|
|
<div
|
|
|
class="verificationCode-btn"
|
|
|
- :class="VerificationCodeShow ? 'waitTime' : 'getVerification'"
|
|
|
+ :class="verificationCodeShow ? 'waitTime' : 'getVerification'"
|
|
|
@click="getVerificationCode"
|
|
|
>
|
|
|
- {{ VerificationCodeShow ? time + 's' : '获取' }}
|
|
|
+ {{ verificationCodeShow ? time + 's' : '获取' }}
|
|
|
</div>
|
|
|
- </el-form-item>
|
|
|
+ </el-form-item> -->
|
|
|
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
@@ -117,8 +117,8 @@ const validatePassword = (rule, value, callback) => {
|
|
|
let loginRules = ref({
|
|
|
user_name: [{ trigger: 'blur', validator: validateUsername }],
|
|
|
password: [{ trigger: 'blur', validator: validatePassword }],
|
|
|
- verification_code_image_text: [{ required: true, trigger: 'blur', message: '验证码不能为空' }],
|
|
|
- dynamic_verification_code: [{ required: true, trigger: 'blur', message: '邮箱验证码不能为空' }]
|
|
|
+ verification_code_image_text: [{ required: true, trigger: 'blur', message: '验证码不能为空' }]
|
|
|
+ // dynamic_verification_code: [{ required: true, trigger: 'blur', message: '邮箱验证码不能为空' }]
|
|
|
});
|
|
|
|
|
|
async function getConfig() {
|
|
@@ -137,36 +137,36 @@ function updateVerificationCode() {
|
|
|
updateVerificationCode();
|
|
|
|
|
|
// 邮箱验证码
|
|
|
-let VerificationCodeShow = ref(false);
|
|
|
-let time = ref(60);
|
|
|
-function getVerificationCode() {
|
|
|
- if (time.value !== 60) return;
|
|
|
+// let verificationCodeShow = ref(false);
|
|
|
+// let time = ref(60);
|
|
|
+// function getVerificationCode() {
|
|
|
+// if (time.value !== 60) return;
|
|
|
|
|
|
- if (!loginForm.value.user_name) {
|
|
|
- Message.warning('请先输入邮箱或手机号码');
|
|
|
- return;
|
|
|
- }
|
|
|
- VerificationCodeShow.value = true;
|
|
|
- let timer = null;
|
|
|
- timer = setInterval(() => {
|
|
|
- time.value -= 1;
|
|
|
- if (time.value === 0) {
|
|
|
- VerificationCodeShow.value = false;
|
|
|
- clearInterval(timer);
|
|
|
- timer = null;
|
|
|
- time.value = 60;
|
|
|
- }
|
|
|
- }, 1000);
|
|
|
- SendVerificationCode({
|
|
|
- verification_type: 'EMAIL',
|
|
|
- phone_or_email: loginForm.value.user_name
|
|
|
- }).catch(() => {
|
|
|
- VerificationCodeShow.value = false;
|
|
|
- clearInterval(timer);
|
|
|
- timer = null;
|
|
|
- time.value = 60;
|
|
|
- });
|
|
|
-}
|
|
|
+// if (!loginForm.value.user_name) {
|
|
|
+// Message.warning('请先输入邮箱或手机号码');
|
|
|
+// return;
|
|
|
+// }
|
|
|
+// verificationCodeShow.value = true;
|
|
|
+// let timer = null;
|
|
|
+// timer = setInterval(() => {
|
|
|
+// time.value -= 1;
|
|
|
+// if (time.value === 0) {
|
|
|
+// verificationCodeShow.value = false;
|
|
|
+// clearInterval(timer);
|
|
|
+// timer = null;
|
|
|
+// time.value = 60;
|
|
|
+// }
|
|
|
+// }, 1000);
|
|
|
+// SendVerificationCode({
|
|
|
+// verification_type: 'EMAIL',
|
|
|
+// phone_or_email: loginForm.value.user_name
|
|
|
+// }).catch(() => {
|
|
|
+// verificationCodeShow.value = false;
|
|
|
+// clearInterval(timer);
|
|
|
+// timer = null;
|
|
|
+// time.value = 60;
|
|
|
+// });
|
|
|
+// }
|
|
|
|
|
|
// 登录
|
|
|
const router = useRouter();
|
|
@@ -180,8 +180,8 @@ let loginForm = ref({
|
|
|
verification_code_image_id: '',
|
|
|
verification_code_image_text: '',
|
|
|
dynamic_verification_type: 'EMAIL',
|
|
|
- phone_or_email: '',
|
|
|
- dynamic_verification_code: ''
|
|
|
+ phone_or_email: ''
|
|
|
+ // dynamic_verification_code: ''
|
|
|
});
|
|
|
function handleLogin(user_type) {
|
|
|
curForm.value.validate((valid) => {
|