From bb6389d102f428846e358afd81d36a51f6b58cb3 Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Sun, 1 Dec 2019 20:34:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/user.js                       | 13 +++++++++----
 src/views/system/user/center/updateEmail.vue |  3 +--
 src/views/system/user/index.vue              |  7 +++++++
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/api/system/user.js b/src/api/system/user.js
index 45b2f1d..1e4bf6f 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -1,4 +1,5 @@
 import request from '@/utils/request'
+import { encrypt } from '@/utils/rsaEncrypt'
 
 export function add(data) {
   return request({
@@ -33,8 +34,8 @@ export function editUser(data) {
 
 export function updatePass(user) {
   const data = {
-    oldPass: user.oldPass,
-    newPass: user.newPass
+    oldPass: encrypt(user.oldPass),
+    newPass: encrypt(user.newPass)
   }
   return request({
     url: 'api/users/updatePass/',
@@ -43,9 +44,13 @@ export function updatePass(user) {
   })
 }
 
-export function updateEmail(code, data) {
+export function updateEmail(form) {
+  const data = {
+    password: encrypt(form.pass),
+    email: form.email
+  }
   return request({
-    url: 'api/users/updateEmail/' + code,
+    url: 'api/users/updateEmail/' + form.code,
     method: 'post',
     data
   })
diff --git a/src/views/system/user/center/updateEmail.vue b/src/views/system/user/center/updateEmail.vue
index 2e0478f..76b80ee 100644
--- a/src/views/system/user/center/updateEmail.vue
+++ b/src/views/system/user/center/updateEmail.vue
@@ -103,8 +103,7 @@ export default {
       this.$refs['form'].validate((valid) => {
         if (valid) {
           this.loading = true
-          this.user = { email: this.form.email, password: this.form.pass }
-          updateEmail(this.form.code, this.user).then(res => {
+          updateEmail(this.form).then(res => {
             this.loading = false
             this.resetForm()
             this.$notify({
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index d928a8b..691b652 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -347,6 +347,13 @@ export default {
       getLevel().then(res => {
         this.level = res.level
       }).catch(() => {})
+    },
+    addSuccessNotify() {
+      this.$notify({
+        title: '新增成功，默认密码：123456',
+        type: 'success',
+        duration: 2500
+      })
     }
   }
 }