diff --git a/CHANGELOG.md b/CHANGELOG.md index 21ace4e..c913aa4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - | 时间轴页面 | [e926b75](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e926b75) - | 时间轴展示 | [8b1b380](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8b1b380) - | 使用uview完成api请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8) + - | 手机号登录 | [8f455da](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f455da) - | 手机号登录 | [565585b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/565585b) - | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b) - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e) diff --git a/hooks/user/userMixin.js b/hooks/user/userMixin.js index 0691e14..30e9b56 100644 --- a/hooks/user/userMixin.js +++ b/hooks/user/userMixin.js @@ -94,7 +94,7 @@ export default function userMixin() { //有图片验证码的值 function hasvalue(form) { - if(form.smsCode || dataObj.showPaste) return + if(form.smsCode || form.showPaste) return if (!verifyPhone(form.phone)) { uni.$ui.showToast('请输入正确的手机号'); return; @@ -122,6 +122,7 @@ export default function userMixin() { getCodeInterval(); dataObj.showPaste = true; } catch (err) { + getImageCode(); throw err; } } diff --git a/pages/user/login.vue b/pages/user/login.vue index 1b2541a..2c904c5 100644 --- a/pages/user/login.vue +++ b/pages/user/login.vue @@ -64,8 +64,10 @@ loginForm.value.setRules(mixinInit.rules); }); - const submit = () => { + function submit() { + console.log('111111') loginForm.value.validate(valid => { + console.log('22222', valid) if (valid) { login() } diff --git a/store/user/actions.js b/store/user/actions.js index 789e60c..520ada6 100644 --- a/store/user/actions.js +++ b/store/user/actions.js @@ -24,9 +24,9 @@ const actions = { * @param {object} params 要提交的数据 * @param {string} params.phone 手机号 */ - sendCode({ commit }, params) { + async sendCode({ commit }, params) { try{ - uni.$u.api.getSmsCode(params); + const res = await uni.$u.api.getSmsCode(params); uni.$ui.showToast('验证码发送成功'); } catch (error) { uni.$ui.showToast(error.msg || '发送失败');