diff --git a/src/api/user.js b/src/api/user.js index f1a06c7..b90a0e7 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -47,6 +47,14 @@ export function testLdapConfig(data) { } export function getInfo(params) { + return request({ + url: 'user/info', + method: 'get', + params + }) +} + +export function getUserInfo(params) { return request({ url: 'user/userInfo', method: 'get', diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 3254d40..e17c59f 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -141,10 +141,7 @@ const actions = { // get user info getInfo({ commit, state }) { return new Promise((resolve, reject) => { - getInfo({ - id: state.userId, - token: state.token - }).then(response => { + getInfo().then(response => { const { data } = response if (!data) { // reject('Verification failed, please Login again.') diff --git a/src/views/setting/sys/cusomerInfo.vue b/src/views/setting/sys/cusomerInfo.vue index 9162548..06877ae 100644 --- a/src/views/setting/sys/cusomerInfo.vue +++ b/src/views/setting/sys/cusomerInfo.vue @@ -172,10 +172,7 @@ } }, getInfo(){ - getInfo({ - id: this.$store.state.user.userId, - takeUpSpace: true, - }).then(async res => { + getInfo().then(async res => { this.userInfo = res.data if (this.userInfo.roles && this.userInfo.roles.includes('admin')) { this.$emit('isAdmin', true) diff --git a/src/views/setting/sys/cusomerManager.vue b/src/views/setting/sys/cusomerManager.vue index 19bf836..f27fe6f 100644 --- a/src/views/setting/sys/cusomerManager.vue +++ b/src/views/setting/sys/cusomerManager.vue @@ -82,7 +82,7 @@