diff --git a/property-uniapp-project/pageSubPack/loginSub/change-pwd.vue b/property-uniapp-project/pageSubPack/loginSub/change-pwd.vue index 86b1f32..1cc644d 100644 --- a/property-uniapp-project/pageSubPack/loginSub/change-pwd.vue +++ b/property-uniapp-project/pageSubPack/loginSub/change-pwd.vue @@ -51,7 +51,7 @@ const smsCode = ref(''); // ========== 计算属性 ========== // 是否可点击确定按钮(密码格式正确 + 两次输入一致) const canConfirm = computed(() => { - // 密码格式规则:6-16位任意字符(可根据需求调整) + // 密码格式规则:6-16位任意字符 const pwdReg = /^(?=.*[a-zA-Z])(?=.*\d).{6,16}$/; // 校验条件:新密码符合格式 + 确认密码和新密码一致 + 均不为空 return pwdReg.test(newPassword.value) @@ -100,28 +100,12 @@ const handleConfirm = () => { } }).catch(err =>{ uni.showToast({ - title: '网络异常', + title: err.msg, icon: 'error' }); }) - // 模拟修改密码请求 - // uni.showLoading({ - // title: '修改中...' - // }); - - // setTimeout(() => { - // uni.hideLoading(); - // uni.showToast({ - // title: '密码修改成功', - // icon: 'success' - // }); - - // // 密码修改成功后返回上一页(或跳转到登录页) - // uni.navigateTo({ - // url:"/pages/login/pwd-login" - // }); - // }, 1500); + }; diff --git a/property-uniapp-project/pageSubPack/loginSub/forget-pwd.vue b/property-uniapp-project/pageSubPack/loginSub/forget-pwd.vue index 246fee7..78cfe3f 100644 --- a/property-uniapp-project/pageSubPack/loginSub/forget-pwd.vue +++ b/property-uniapp-project/pageSubPack/loginSub/forget-pwd.vue @@ -90,6 +90,11 @@ const getVerifyCode = () => { icon: 'error' }); } + }).catch(err =>{ + uni.showToast({ + title: err.msg, + icon: 'error' + }); }) diff --git a/property-uniapp-project/pageSubPack/loginSub/login.vue b/property-uniapp-project/pageSubPack/loginSub/login.vue index 78a2540..479db17 100644 --- a/property-uniapp-project/pageSubPack/loginSub/login.vue +++ b/property-uniapp-project/pageSubPack/loginSub/login.vue @@ -31,14 +31,6 @@ -