|
@@ -16,7 +16,7 @@
|
|
|
/>
|
|
/>
|
|
|
|
|
|
|
|
<van-field
|
|
<van-field
|
|
|
- v-model="form.captcha"
|
|
|
|
|
|
|
+ v-model="form.imgCode"
|
|
|
label="图片验证码"
|
|
label="图片验证码"
|
|
|
placeholder="请输入验证码"
|
|
placeholder="请输入验证码"
|
|
|
:rules="[{ required: true, message: '请填写验证码' }]"
|
|
:rules="[{ required: true, message: '请填写验证码' }]"
|
|
@@ -32,7 +32,7 @@
|
|
|
</van-field>
|
|
</van-field>
|
|
|
|
|
|
|
|
<van-field
|
|
<van-field
|
|
|
- v-model="form.smsCode"
|
|
|
|
|
|
|
+ v-model="form.code"
|
|
|
label="短信验证码"
|
|
label="短信验证码"
|
|
|
placeholder="请输入短信验证码"
|
|
placeholder="请输入短信验证码"
|
|
|
:rules="[{ required: true, message: '请填写短信验证码' }]"
|
|
:rules="[{ required: true, message: '请填写短信验证码' }]"
|
|
@@ -67,6 +67,7 @@ import { useAppStore } from "@/stores/app";
|
|
|
import { useUserStore } from "@/stores/user";
|
|
import { useUserStore } from "@/stores/user";
|
|
|
import { getCaptchaImage } from "@/api/login";
|
|
import { getCaptchaImage } from "@/api/login";
|
|
|
import { useRouter } from "vue-router";
|
|
import { useRouter } from "vue-router";
|
|
|
|
|
+import { sendMessage } from "@/api/login";
|
|
|
|
|
|
|
|
const appStore = useAppStore();
|
|
const appStore = useAppStore();
|
|
|
const userStore = useUserStore();
|
|
const userStore = useUserStore();
|
|
@@ -75,11 +76,11 @@ const router = useRouter();
|
|
|
// 表单数据
|
|
// 表单数据
|
|
|
const form = ref({
|
|
const form = ref({
|
|
|
// phone: "13960760931",
|
|
// phone: "13960760931",
|
|
|
- // captcha: "336699",
|
|
|
|
|
|
|
+ // imgCode: "336699",
|
|
|
// smsCode: "336699",
|
|
// smsCode: "336699",
|
|
|
phone: "13401079738",
|
|
phone: "13401079738",
|
|
|
- captcha: "170101",
|
|
|
|
|
- smsCode: "170101",
|
|
|
|
|
|
|
+ imgCode: "170101",
|
|
|
|
|
+ code: "170101",
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
// 图片验证码
|
|
// 图片验证码
|
|
@@ -126,7 +127,7 @@ function sendSmsCode() {
|
|
|
showToast("请输入手机号码");
|
|
showToast("请输入手机号码");
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
- if (!form.value.captcha) {
|
|
|
|
|
|
|
+ if (!form.value.imgCode) {
|
|
|
showToast("请输入图片验证码");
|
|
showToast("请输入图片验证码");
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
@@ -138,7 +139,7 @@ function sendSmsCode() {
|
|
|
clearInterval(countTimer);
|
|
clearInterval(countTimer);
|
|
|
}
|
|
}
|
|
|
}, 1000);
|
|
}, 1000);
|
|
|
- sendMessage(form.value.phone, imgcodeid.value, form.value.captcha).then(
|
|
|
|
|
|
|
+ sendMessage(form.value.phone, imgcodeid.value, form.value.imgCode).then(
|
|
|
(res) => {
|
|
(res) => {
|
|
|
if (!res.success) {
|
|
if (!res.success) {
|
|
|
showToast(res.message);
|
|
showToast(res.message);
|
|
@@ -149,12 +150,12 @@ function sendSmsCode() {
|
|
|
|
|
|
|
|
// 处理登录
|
|
// 处理登录
|
|
|
function handleLogin() {
|
|
function handleLogin() {
|
|
|
- if (!form.value.phone || !form.value.captcha || !form.value.smsCode) {
|
|
|
|
|
|
|
+ if (!form.value.phone || !form.value.imgCode || !form.value.code) {
|
|
|
showToast("请填写完整信息");
|
|
showToast("请填写完整信息");
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
userStore
|
|
userStore
|
|
|
- .Login(form.value.phone, form.value.captcha, form.value.smsCode)
|
|
|
|
|
|
|
+ .Login(form.value.phone, form.value.imgCode, form.value.code)
|
|
|
.then((res) => {
|
|
.then((res) => {
|
|
|
console.log(appStore.ownApp);
|
|
console.log(appStore.ownApp);
|
|
|
if (appStore.ownApp === "1") {
|
|
if (appStore.ownApp === "1") {
|