purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整登录和注册的逻辑

Browse Source
This commit is contained in:
jishenghua
2024-05-29 01:11:30 +08:00
parent d3f0ff3777
commit 98e728cc55
3 changed files with 65 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jshERP-web/src/store/modules/user.js
View File

@@ -77,7 +77,9 @@ const user = {
}
commit('SET_INFO', userInfo)
resolve(response)
}else{
} else if(response.code == 500010 || response.code == 500011){
resolve(response)
} else{
reject(response)
}
}).catch(error => {

55
jshERP-web/src/views/user/Login.vue
View File

@@ -122,7 +122,7 @@
currentUsername:"",
validate_status:"",
currdatetime:'',
randCode:'',
uuid:'',
randCodeImage:'',
registerFlag:'',
requestCodeSuccess:false,
@@ -176,11 +176,10 @@
this.checked = e.target.checked
},
handleChangeCheckCode(){
this.currdatetime = new Date().getTime();
getAction(`/user/randomImage/${this.currdatetime}`).then(res=>{
getAction('/user/randomImage').then(res=>{
if(res.code == 200){
this.randCode = res.data.codeNum;
this.randCodeImage = res.data.base64;
this.uuid = res.data.uuid
this.randCodeImage = res.data.base64
this.requestCodeSuccess=true
}else{
this.$message.error(res.data)
@@ -198,31 +197,24 @@
if (that.customActiveKey === 'tab1') {
that.form.validateFields([ 'loginName', 'password', 'inputCode' ], { force: true }, (err, values) => {
if (!err) {
if(values.inputCode === this.randCode) {
loginParams.loginName = values.loginName
loginParams.password = md5(values.password)
if(that.checked) {
//勾选的时候进行缓存
Vue.ls.set('cache_loginName', values.loginName)
Vue.ls.set('cache_password', values.password)
} else {
//没勾选的时候清缓存
Vue.ls.remove('cache_loginName')
Vue.ls.remove('cache_password')
}
that.Login(loginParams).then((res) => {
this.departConfirm(res, loginParams.loginName)
}).catch((err) => {
that.requestFailed(err);
});
loginParams.loginName = values.loginName
loginParams.password = md5(values.password)
loginParams.code = values.inputCode
loginParams.uuid = that.uuid
if(that.checked) {
//勾选的时候进行缓存
Vue.ls.set('cache_loginName', values.loginName)
Vue.ls.set('cache_password', values.password)
} else {
this.$notification['error']({
message: "提示",
description: "验证码错误",
duration: 2
});
this.loginBtn = false
//没勾选的时候清缓存
Vue.ls.remove('cache_loginName')
Vue.ls.remove('cache_password')
}
that.Login(loginParams).then((res) => {
this.departConfirm(res, loginParams.loginName)
}).catch((err) => {
that.requestFailed(err);
})
}else {
that.loginBtn = false;
}
@@ -280,10 +272,13 @@
requestFailed (err) {
this.$notification[ 'error' ]({
message: '登录失败',
description: ((err.response || {}).data || {}).message || err.message || "请求出现错误，请稍后再试",
description: ((err.response || {}).data || {}).message || err.message || err.data.message || "请求出现错误，请稍后再试",
duration: 4,
});
this.loginBtn = false;
//验证码刷新
this.form.setFieldsValue({'inputCode':''})
this.handleChangeCheckCode()
},
generateCode(value){
this.verifiedCode = value.toLowerCase()
@@ -322,7 +317,7 @@
this.requestFailed(err)
this.Logout();
}
}else{
} else{
this.requestFailed(res)
this.Logout();
}

78
jshERP-web/src/views/user/Register.vue
View File

@@ -109,7 +109,7 @@
systemTitle: window.SYS_TITLE,
systemUrl: window.SYS_URL,
form: null,
randCode:'',
uuid:'',
randCodeImage:'',
requestCodeSuccess:false,
state: {
@@ -140,9 +140,9 @@
methods: {
handleChangeCheckCode(){
this.currdatetime = new Date().getTime();
getAction(`/user/randomImage/${this.currdatetime}`).then(res=>{
getAction('/user/randomImage').then(res=>{
if(res.code == 200){
this.randCode = res.data.codeNum;
this.uuid = res.data.uuid;
this.randCodeImage = res.data.base64;
this.requestCodeSuccess=true
}else{
@@ -219,44 +219,40 @@
that.registerBtn = true;
this.form.validateFields((err, values) => {
if (!err) {
if(values.inputCode === this.randCode) {
let register = {
loginName: values.username,
password: md5(values.password)
};
postAction("/user/registerUser", register).then((res) => {
if(res.code === 200){
this.$notification.success({
message: '提示',
description: "注册成功，请使用该租户登录！",
duration: 5
});
let that = this;
setTimeout(function () {
that.$router.push({ name: "login", params:{
loginName: register.loginName
}
})
},2000);
} else {
this.$notification['error']({
message: "提示",
description: res.data.message || "注册失败",
duration: 2
});
that.registerBtn = false
}
}).catch((err) => {
that.requestFailed(err);
})
} else {
this.$notification['error']({
message: "提示",
description: "验证码错误",
duration: 2
});
that.registerBtn = false
}
let register = {
loginName: values.username,
password: md5(values.password),
code: values.inputCode,
uuid: that.uuid
};
postAction("/user/registerUser", register).then((res) => {
if(res.code === 200){
this.$notification.success({
message: '提示',
description: "注册成功，请使用该租户登录！",
duration: 5
});
let that = this;
setTimeout(function () {
that.$router.push({ name: "login", params:{
loginName: register.loginName
}
})
},2000);
} else {
this.$notification['error']({
message: "提示",
description: res.data.message || "注册失败",
duration: 2
});
that.registerBtn = false
//验证码刷新
this.form.setFieldsValue({'inputCode':''})
this.handleChangeCheckCode()
}
}).catch((err) => {
that.requestFailed(err);
})
} else {
that.registerBtn = false
}