From 10a26b9b670efef0a2adba675c794c539846aa3c Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 06 九月 2024 10:18:10 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/RegisterView.vue | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/RegisterView.vue b/north-glass-erp/northglass-erp/src/views/RegisterView.vue
index db9cd2d..30e0d48 100644
--- a/north-glass-erp/northglass-erp/src/views/RegisterView.vue
+++ b/north-glass-erp/northglass-erp/src/views/RegisterView.vue
@@ -15,7 +15,7 @@
const register = reactive({
userName: '',
// loginName: '',
- passWord: '',
+ password: '',
confirmPassword:''
})
@@ -43,7 +43,7 @@
const checkConfirmPassword = (rule: any, value: any, callback: any) => {
if (value.trim() === '') {
callback(new Error('纭瀵嗙爜涓嶈兘涓虹┖'))
- }else if(value !== register.passWord){
+ }else if(value !== register.password){
callback(new Error('涓ゆ瀵嗙爜涓嶇浉鍚�'))
}else if(value.length>16 || value.length<6){
callback(new Error('瀵嗙爜闀垮害涓嶈兘浣庝簬6鎴栬秴杩�16'))
@@ -55,7 +55,7 @@
const ruleFormRef = ref<FormInstance>()
const rules = reactive<FormRules<typeof register>>({
userName: [{ validator: checkName, trigger: 'blur' }],
- passWord:[{ validator: checkPassword, trigger: 'blur' }],
+ password:[{ validator: checkPassword, trigger: 'blur' }],
confirmPassword:[{ validator: checkConfirmPassword, trigger: 'blur' }],
// loginName: [{ validator: validateString, trigger: 'blur' }]
})
@@ -65,11 +65,10 @@
formEl.validate((valid) => {
if (valid) {
loginLoadings.value=true
- register.passWord = btoa(register.passWord)
+ register.password = btoa(register.password)
request.post('/user/register',
register).then((res) => {
if(res['code']==200){
- console.log(res.data)
ElMessageBox.alert(
`<strong>鐢ㄦ埛:<i style="color: #1890FF;">'${res.data.userName}</i>'
<br>璐﹀彿ID:<i style="color: #1890FF;">${res.data.loginName}</i> </strong>`,
@@ -98,6 +97,8 @@
ElMessage.error("鏈嶅姟鍣ㄨ繛鎺ュけ璐�")
loginLoadings.value=false
return false
+ }).then(() => {
+ register.password = atob(register.password)
})
}
})
@@ -132,8 +133,8 @@
<!-- <el-form-item label="鐧婚檰鍚嶏細" prop="loginName">-->
<!-- <el-input v-model="register.loginName" />-->
<!-- </el-form-item>-->
- <el-form-item label="瀵嗙爜锛�" prop="passWord">
- <el-input type="password" v-model="register.passWord" />
+ <el-form-item label="瀵嗙爜锛�" prop="password">
+ <el-input type="password" v-model="register.password" />
</el-form-item>
<el-form-item label="纭瀵嗙爜锛�" prop="confirmPassword">
<el-input type="password" v-model="register.confirmPassword" />
--
Gitblit v1.8.0