diff --git a/README.md b/README.md index b53f086..90b924a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

- Downloads + Downloads Build Status Build Status Coverage Status @@ -65,7 +65,7 @@ SpringBlade * Archer-全能代码生成系统:[https://archer.bladex.vip](https://archer.bladex.vip) ## 技术文档 -* [开发手册一览](https://gitee.com/smallc/SpringBlade/wikis/SpringBlade开发手册) +* [SpringBlade开发手册一览](https://gitee.com/smallc/SpringBlade/wikis/SpringBlade开发手册) * [常见问题集锦](https://sns.bladex.vip/article-14966.html) ## 项目地址 diff --git a/package.json b/package.json index afe4bd6..cfc825f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "saber-admin", - "version": "2.5.1", + "version": "2.5.2", "private": true, "scripts": { "serve": "vue-cli-service serve", diff --git a/src/api/system/user.js b/src/api/system/user.js index c60928c..d85e3e8 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,33 @@ 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..82f4e1f 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: 'blade', + 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 @@