diff --git a/src/components/OpenTypeFun.js b/src/components/OpenTypeFun.js index 264668d..ab0a025 100644 --- a/src/components/OpenTypeFun.js +++ b/src/components/OpenTypeFun.js @@ -17,6 +17,7 @@ const OpenTypeFun = async (options) => { break; } case 3: { // 微信连接 + window.open(url); break; } case 4: { // 外部连接 diff --git a/src/pages/forgotPassword/index.vue b/src/pages/forgotPassword/index.vue index 9d59eff..32002cf 100644 --- a/src/pages/forgotPassword/index.vue +++ b/src/pages/forgotPassword/index.vue @@ -4,7 +4,7 @@ import XNav from "../../components/XNav.vue"; import XLink from "../../components/XLink.vue"; import XInput from "../../components/XInput.vue"; import Api from "../../api/index.js"; -import {backPage, showToast} from "../../utils/uils.js"; +import {backPage, showToast, verifyForm} from "../../utils/uils.js"; import SendMsg from "../../components/SendMsg.vue"; const form = reactive({ @@ -12,8 +12,28 @@ const form = reactive({ captcha: null, password: null, }); +const rules = { + mobile: { + reg: /^1[3-9]\d{9}$/, + title: '手机号', + msg: '手机号错误', + required: true, + }, + captcha: { + reg: /^\d{6}$/, + title: '验证码', + msg: '验证码错误', + required: true, + }, + password: { + title: '密码', + msg: '密码错误', + required: true, + } +} const success = async () => { + verifyForm(form, rules); const {msg} = await Api.system.editPassword(form); showToast(msg); backPage(); diff --git a/src/pages/login/AccountLogin.vue b/src/pages/login/AccountLogin.vue index 3adaf7d..1ec76d4 100644 --- a/src/pages/login/AccountLogin.vue +++ b/src/pages/login/AccountLogin.vue @@ -2,7 +2,7 @@ import {reactive} from "vue"; import XInput from "../../components/XInput.vue"; import XLink from "../../components/XLink.vue"; -import {showToast, toPage} from "../../utils/uils.js"; +import {showToast, toPage, verifyForm} from "../../utils/uils.js"; import Api from "../../api/index.js"; import {useUserStore} from "../../pinia/UserStore/index.js"; @@ -12,8 +12,22 @@ const form = reactive({ mobile: '17502997128', password: '123456', }); +const rules = { + mobile: { + reg: /^1[3-9]\d{9}$/, + title: '手机号', + msg: '手机号错误', + required: true, + }, + password: { + title: '密码', + msg: '密码错误', + required: true, + } +}; const success = async () => { + verifyForm(form, rules); const {msg, data} = await Api.system.accountLogin(form); showToast(msg); UserStore.isLogin = true; diff --git a/src/pages/login/PhoneLogin.vue b/src/pages/login/PhoneLogin.vue index 6646625..d826f18 100644 --- a/src/pages/login/PhoneLogin.vue +++ b/src/pages/login/PhoneLogin.vue @@ -1,7 +1,7 @@