From e4ad5c0aa7bd574c36be97eea4dd124dad9479ca Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 06 十二月 2023 16:13:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/system/userinfo.vue | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/system/userinfo.vue b/Source/UBCS-WEB/src/views/system/userinfo.vue
index 6c985b5..1a87d09 100644
--- a/Source/UBCS-WEB/src/views/system/userinfo.vue
+++ b/Source/UBCS-WEB/src/views/system/userinfo.vue
@@ -29,13 +29,32 @@
},
methods: {
handleSubmit(form, done) {
- if (this.index === 0) {
updateInfo(form).then(res => {
if (res.data.success) {
- this.$message({
- type: "success",
- message: "淇敼淇℃伅鎴愬姛!"
- });
+ if( form.oldPassword != undefined || form.newPassword1 != undefined || form.newPassword != undefined){
+ updatePassword(form.oldPassword, form.newPassword, form.newPassword1).then(res => {
+ if (res.data.success) {
+ this.$message({
+ type: "success",
+ message: "淇敼鎴愬姛!"
+ });
+ } else {
+ this.$message({
+ type: "error",
+ message: res.data.msg
+ });
+ }
+ done();
+ }, error => {
+ window.console.log(error);
+ done();
+ })
+ }else{
+ this.$message({
+ type: "success",
+ message: "淇敼淇℃伅鎴愬姛!"
+ });
+ };
} else {
this.$message({
type: "error",
@@ -47,25 +66,6 @@
window.console.log(error);
done();
})
- } else {
- updatePassword(md5(form.oldPassword), md5(form.newPassword), md5(form.newPassword1)).then(res => {
- if (res.data.success) {
- this.$message({
- type: "success",
- message: "淇敼瀵嗙爜鎴愬姛!"
- });
- } else {
- this.$message({
- type: "error",
- message: res.data.msg
- });
- }
- done();
- }, error => {
- window.console.log(error);
- done();
- })
- }
},
handleWitch() {
if (this.index === 0) {
--
Gitblit v1.9.3