From 8ef6ea2ab2903755f98484c5919b66069282c5cd Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Sat, 10 Aug 2019 20:08:00 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E5=A2=9E=E5=8A=A0=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9=E3=80=81=E5=A4=B4=E5=83=8F?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E3=80=81=E5=AF=86=E7=A0=81=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/user.js  |  38 ++++++++---
 src/const/user/info.js  | 144 ++++++++++++++++++++--------------------
 src/views/user/info.vue |  58 +++++++++++-----
 3 files changed, 142 insertions(+), 98 deletions(-)

diff --git a/src/api/system/user.js b/src/api/system/user.js
index c60928c..da6a09b 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -1,14 +1,5 @@
 import request from '@/router/axios';
 
-export const resetPassword = (userIds) => {
-  return request({
-    url: '/api/blade-user/reset-password',
-    method: 'post',
-    params: {
-      userIds,
-    }
-  })
-}
 export const getList = (current, size, params) => {
   return request({
     url: '/api/blade-user/list',
@@ -55,3 +46,32 @@ export const getUser = (id) => {
     }
   })
 }
+
+export const getUserInfo = () => {
+  return request({
+    url: '/api/blade-user/info',
+    method: 'get',
+  })
+}
+
+export const resetPassword = (userIds) => {
+  return request({
+    url: '/api/blade-user/reset-password',
+    method: 'post',
+    params: {
+      userIds,
+    }
+  })
+}
+
+export const updatePassword = (oldPassword, newPassword, newPassword1) => {
+  return request({
+    url: '/api/blade-user/update-password',
+    method: 'post',
+    params: {
+      oldPassword,
+      newPassword,
+      newPassword1,
+    }
+  })
+}
diff --git a/src/const/user/info.js b/src/const/user/info.js
index dcb66be..db39685 100644
--- a/src/const/user/info.js
+++ b/src/const/user/info.js
@@ -1,74 +1,72 @@
 export default {
-    column: [{
-        label: '个人信息',
-        prop: 'info',
-        option: {
-            submitText: '修改',
-            column: [{
-                label: '头像',
-                type: 'upload',
-                listType: 'picture-img',
-                propsHttp: {
-                    res: 'data.0'
-                },
-                canvasOption: {
-                    text: 'avue',
-                    ratio: 0.1
-                },
-                action: 'https://avueupload.91eic.com/upload/list',
-                tip: '只能上传jpg/png用户头像，且不超过500kb',
-                span: 12,
-                row: true,
-                prop: 'img'
-            }, {
-                label: '姓名',
-                span: 6,
-                row: true,
-                prop: 'name'
-            }, {
-                label: '用户名',
-                span: 12,
-                row: true,
-                prop: 'username'
-            }, {
-                label: '手机号',
-                span: 12,
-                row: true,
-                prop: 'phone'
-            }, {
-                label: '个性签名',
-                prop: 'detail',
-                span: 24,
-                row: true,
-                type: 'textarea',
-                minRows: 5,
-                maxRows: 8,
-            }]
-        }
-    }, {
-        label: '修改密码',
-        prop: 'password',
-        option: {
-            submitText: '修改',
-            column: [{
-                label: '原密码',
-                span: 12,
-                row: true,
-                type: 'password',
-                prop: 'oldpassword'
-            }, {
-                label: '新密码',
-                span: 12,
-                row: true,
-                type: 'password',
-                prop: 'newpassword'
-            }, {
-                label: '确认密码',
-                span: 12,
-                row: true,
-                type: 'password',
-                prop: 'newpasswords'
-            }]
-        }
-    }]
-}
\ No newline at end of file
+  column: [{
+    label: '个人信息',
+    prop: 'info',
+    option: {
+      submitText: '修改',
+      column: [{
+        label: '头像',
+        type: 'upload',
+        listType: 'picture-img',
+        propsHttp: {
+          res: 'data',
+          url: 'link',
+        },
+        canvasOption: {
+          text: 'bladex',
+          ratio: 0.1
+        },
+        action: '/api/blade-resource/oss/endpoint/put-file',
+        tip: '只能上传jpg/png用户头像，且不超过500kb',
+        span: 12,
+        row: true,
+        prop: 'avatar'
+      }, {
+        label: '姓名',
+        span: 12,
+        row: true,
+        prop: 'name'
+      }, {
+        label: '用户名',
+        span: 12,
+        row: true,
+        prop: 'realName'
+      }, {
+        label: '手机号',
+        span: 12,
+        row: true,
+        prop: 'phone'
+      }, {
+        label: '邮箱',
+        prop: 'email',
+        span: 12,
+        row: true,
+      }]
+    }
+  }, {
+    label: '修改密码',
+    prop: 'password',
+    option: {
+      submitText: '修改',
+      column: [{
+        label: '原密码',
+        span: 12,
+        row: true,
+        type: 'password',
+        prop: 'oldPassword'
+      }, {
+        label: '新密码',
+        span: 12,
+        row: true,
+        type: 'password',
+        prop: 'newPassword'
+      }, {
+        label: '确认密码',
+        span: 12,
+        row: true,
+        type: 'password',
+        prop: 'newPassword1'
+      }]
+    }
+  }]
+}
diff --git a/src/views/user/info.vue b/src/views/user/info.vue
index 1f181f0..e1bde7c 100644
--- a/src/views/user/info.vue
+++ b/src/views/user/info.vue
@@ -11,6 +11,8 @@
 
 <script>
   import option from "@/const/user/info";
+  import {getUserInfo, update, updatePassword} from "@/api/system/user";
+
 
   export default {
     data() {
@@ -25,25 +27,49 @@
     },
     methods: {
       handleSubmit() {
-        this.$message({
-          message: this.form,
-          type: "success"
-        });
+        if (this.type === "info") {
+          update(this.form).then(res => {
+            if (res.data.success) {
+              this.$message({
+                type: "success",
+                message: "修改信息成功!"
+              });
+            } else {
+              this.$message({
+                type: "error",
+                message: res.data.msg
+              });
+            }
+          })
+        } else {
+          updatePassword(this.form.oldPassword, this.form.newPassword, this.form.newPassword1).then(res => {
+            if (res.data.success) {
+              this.$message({
+                type: "success",
+                message: "修改密码成功!"
+              });
+            } else {
+              this.$message({
+                type: "error",
+                message: res.data.msg
+              });
+            }
+          })
+        }
       },
       handleWitch() {
         if (this.type === "info") {
-          this.form = {
-            username: "smallwei",
-            name: "smallwei",
-            phone: "1888888888888",
-            detail: "这是一个个性签名"
-          };
-        } else if (this.type === "password") {
-          this.form = {
-            oldpassword: 11111111,
-            newpassword: 22222222,
-            newpasswords: 22222222
-          };
+          getUserInfo().then(res => {
+            const user = res.data.data;
+            this.form = {
+              id: user.id,
+              avatar: user.avatar,
+              name: user.name,
+              realName: user.realName,
+              phone: user.phone,
+              email: user.email,
+            }
+          });
         }
       },
       handleChange(item) {