|
@@ -31,7 +31,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<el-form class="panel login" :model="form" @submit.stop>
|
|
|
- <h2>登录</h2>
|
|
|
+ <h2>欢迎登录</h2>
|
|
|
<el-form-item class="panel-form-item">
|
|
|
<p class="err-info">{{ verification.phone }}</p>
|
|
|
<el-input
|
|
@@ -126,20 +126,32 @@ const form = reactive({
|
|
|
psw: import.meta.env.DEV ? "Junpeng123" : "",
|
|
|
});
|
|
|
const verification = reactive({ phone: "", psw: "" });
|
|
|
-// 验证
|
|
|
+
|
|
|
+const fromVerification = (verification: { phone: string; psw: string }) => {
|
|
|
+ if (!form.phone) {
|
|
|
+ verification.phone = "请输入手机号";
|
|
|
+ } else if (["88888888888", "99999999999"].includes(form.phone)) {
|
|
|
+ verification.phone = "";
|
|
|
+ } else {
|
|
|
+ verification.phone = PHONE.REG.test(form.phone) ? "" : PHONE.tip;
|
|
|
+ }
|
|
|
+ if (!form.psw) {
|
|
|
+ verification.psw = "请输入密码";
|
|
|
+ } else {
|
|
|
+ verification.psw = "";
|
|
|
+ }
|
|
|
+};
|
|
|
+
|
|
|
watch(
|
|
|
form,
|
|
|
() => {
|
|
|
- if (!form.phone) {
|
|
|
- verification.phone = "请输入手机号";
|
|
|
- } else if (["88888888888", "99999999999"].includes(form.phone)) {
|
|
|
+ const currentVerification = { phone: "", psw: "" };
|
|
|
+ fromVerification(currentVerification);
|
|
|
+
|
|
|
+ if (!currentVerification.phone) {
|
|
|
verification.phone = "";
|
|
|
- } else {
|
|
|
- verification.phone = PHONE.REG.test(form.phone) ? "" : PHONE.tip;
|
|
|
}
|
|
|
- if (!form.psw) {
|
|
|
- verification.psw = "请输入密码";
|
|
|
- } else {
|
|
|
+ if (!currentVerification.psw) {
|
|
|
verification.psw = "";
|
|
|
}
|
|
|
},
|
|
@@ -157,15 +169,15 @@ qrCode.toString(
|
|
|
|
|
|
// 表单提交
|
|
|
const submitClick = async () => {
|
|
|
- console.log(verify.value, verify.value.reset);
|
|
|
- if (!isPassing2.value) {
|
|
|
- return ElMessage.error("登录需要拖拽验证");
|
|
|
- }
|
|
|
+ fromVerification(verification);
|
|
|
if (verification.phone && verification.phone !== "88888888888") {
|
|
|
return ElMessage.error(verification.phone);
|
|
|
}
|
|
|
if (verification.psw) return ElMessage.error(verification.psw);
|
|
|
|
|
|
+ if (!isPassing2.value) {
|
|
|
+ return ElMessage.error("登录需要拖拽验证");
|
|
|
+ }
|
|
|
try {
|
|
|
await login({ phoneNum: form.phone, password: form.psw });
|
|
|
router.replace("scene");
|