diff --git a/uni_modules/uni-login-page/common/loginPage.mixin.js b/uni_modules/uni-login-page/common/loginPage.mixin.js index 20ad828ea71e46ef727559d32d6292771d2fdd5f..3e143f02a3f77ae99a9c8272db29d74e3444c3d3 100644 --- a/uni_modules/uni-login-page/common/loginPage.mixin.js +++ b/uni_modules/uni-login-page/common/loginPage.mixin.js @@ -62,6 +62,23 @@ let mixin = { } } }, + computed: { + isPhone(){ + let reg_phone = /^1\d{10}$/; + let isPhone = reg_phone.test(this.formData.phone); + return isPhone; + }, + isPwd(){ + let reg_pwd = /^.{6,20}$/; + let isPwd = reg_pwd.test(this.formData.pwd); + return isPwd; + }, + isCode(){ + let reg_code = /^\d{6}$/; + let isCode = reg_code.test(this.formData.code); + return isCode; + } + }, methods:{ ...mapMutations({ setUserInfo: 'user/login' diff --git a/uni_modules/uni-login-page/pages/index/index.vue b/uni_modules/uni-login-page/pages/index/index.vue index 42e2b93b8d0a86e3ccb64441a17df818afc44e0b..facf935f70a97649f47143055aabb162366567df 100644 --- a/uni_modules/uni-login-page/pages/index/index.vue +++ b/uni_modules/uni-login-page/pages/index/index.vue @@ -70,19 +70,10 @@ }, computed: { canGetShortMsg() { - let reg = /^1\d{10}$/; - return reg.test(this.formData.phone); + return this.isPhone; } }, methods: { - // 触发提交表单 - submit() { - this.$refs.form.submit().then(res => { - console.log('表单数据信息:', res); - }).catch(err => { - console.log('表单错误信息:', err); - }) - }, selectPhoneArea(event) { uni.showToast({ title: '当前仅支持中国大陆手机号', @@ -91,7 +82,6 @@ // this.currenPhoneArea = this.phoneArea[event.detail.value]; }, sendShortMsg() { - if (!this.canGetShortMsg) return; /** * 发送验证吗 */ diff --git a/uni_modules/uni-login-page/pages/index/phone-code.vue b/uni_modules/uni-login-page/pages/index/phone-code.vue index 60988933ac4a3b183a271ed4c2d59bf9a4775443..e9f5c436c4586b289ffe409c64dc8429dc6c6cde 100644 --- a/uni_modules/uni-login-page/pages/index/phone-code.vue +++ b/uni_modules/uni-login-page/pages/index/phone-code.vue @@ -38,11 +38,7 @@ return `验证码已通过短信发送至${this.currenPhoneArea} ${this.formData.phone}。`; }, canSubmit() { - let reg_phone = /^1\d{10}$/; - let reg_code = /^\d{6}$/; - let isPhone = reg_phone.test(this.formData.phone); - let isCode = reg_code.test(this.formData.code); - return isPhone && isCode; + return this.isPhone && this.isCode; } }, onLoad({phoneNumber,phoneArea}) { diff --git a/uni_modules/uni-login-page/pages/index/pwd-login.vue b/uni_modules/uni-login-page/pages/index/pwd-login.vue index fceadb93a295058e2cd84c1287effc8ecb6b42be..4d236a0e0152b8ce549760880756cdddedfcca02 100644 --- a/uni_modules/uni-login-page/pages/index/pwd-login.vue +++ b/uni_modules/uni-login-page/pages/index/pwd-login.vue @@ -46,12 +46,7 @@ }, computed: { canLogin() { - let reg_phone = /^1\d{10}$/; - let reg_pwd = /^.{6,20}$/; - let isPhone = reg_phone.test(this.formData.phone); - - let isPwd = reg_pwd.test(this.formData.pwd); - return isPhone && isPwd; + return this.isPhone && this.isPwd; } }, methods: { @@ -59,9 +54,7 @@ * 页面跳转,找回密码 */ toRetrievePwd() { - let reg_phone = /^1\d{10}$/; - let isPhone = reg_phone.test(this.formData.phone); - if (!isPhone) return uni.showToast({ + if (!this.isPhone) return uni.showToast({ title: '请输入正确的手机号', icon: 'none' }); @@ -74,7 +67,6 @@ * 密码登录 */ pwdLogin() { - if (!this.canLogin) return; // 下边是可以登录 uniCloud.callFunction({ name:"user-center", diff --git a/uni_modules/uni-login-page/pages/index/pwd-retrieve.vue b/uni_modules/uni-login-page/pages/index/pwd-retrieve.vue index 66823f0a3905dff446e96153b4615b97bf99034f..7594f968ea43dbbbf86e25c39ef0ee69aebd5149 100644 --- a/uni_modules/uni-login-page/pages/index/pwd-retrieve.vue +++ b/uni_modules/uni-login-page/pages/index/pwd-retrieve.vue @@ -41,13 +41,7 @@ import mixin from '../../common/loginPage.mixin.js'; return `验证码已通过短信发送至${this.currenPhoneArea} ${this.formData.phone}。密码为6 - 20位` }, canSubmit() { - let reg_phone = /^1\d{10}$/; - let reg_pwd = /^.{6,20}$/; - let reg_code = /^\d{6}$/; - let isPhone = reg_phone.test(this.formData.phone); - let isPwd = reg_pwd.test(this.formData.pwd); - let isCode = reg_code.test(this.formData.code); - return isPhone && isPwd && isCode; + return this.isPhone && this.isPwd && this.isCode; } }, onLoad(event) {