diff --git a/src/config/getData2.js b/src/config/getData2.js index 17fb84c..224df80 100644 --- a/src/config/getData2.js +++ b/src/config/getData2.js @@ -5,6 +5,50 @@ export const loginApi = (user, password) => post('api/pda/login', { username: user, password: password }) +// export const loginApi = (user, password) => { +// let res = { +// 'result': { +// 'user': { +// 'user': { +// 'createBy': null, +// 'updatedBy': 'System', +// 'createTime': 1534986716000, +// 'updateTime': 1683368236000, +// 'id': '1', +// 'roles': [ +// { +// 'id': 1, +// 'name': '超级管理员', +// 'level': 1, +// 'dataScope': '全部' +// } +// ], +// 'dept': { +// 'id': 18, +// 'code': null, +// 'name': '系统' +// }, +// 'deptId': null, +// 'username': 'admin', +// 'nickName': '管理员', +// 'email': '', +// 'phone': '', +// 'gender': '男', +// 'avatarName': 'avatar-20200806032259161.png', +// 'avatarPath': '/Users/jie/Documents/work/me/admin/eladmin/~/avatar/avatar-20200806032259161.png', +// 'extId': null, +// 'extuserId': null, +// 'enabled': true, +// 'pwdResetTime': 1588495111000 +// } +// }, +// 'token': 'Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOjEsInJuU3RyIjoiMWoyOXdreHUyVkQzcnlNb2lZaWFDaDNCYUM5TU5pOXQiLCJsb2dpbkluZm8iOnsiaWQiOjEsInVzZXJuYW1lIjoiYWRtaW4iLCJuaWNrTmFtZSI6IueuoeeQhuWRmCIsInVzZXIiOnsiaWQiOjEsInJvbGVzIjpbeyJpZCI6MSwibmFtZSI6Iui2hee6p-euoeeQhuWRmCIsImxldmVsIjoxLCJkYXRhU2NvcGUiOiLlhajpg6gifV0sImRlcHQiOnsiaWQiOjE4LCJuYW1lIjoi57O757ufIn0sInVzZXJuYW1lIjoiYWRtaW4iLCJuaWNrTmFtZSI6IueuoeeQhuWRmCIsImVtYWlsIjoiIiwicGhvbmUiOiIiLCJnZW5kZXIiOiLnlLciLCJhdmF0YXJOYW1lIjoiYXZhdGFyLTIwMjAwODA2MDMyMjU5MTYxLnBuZyIsImF2YXRhclBhdGgiOiIvVXNlcnMvamllL0RvY3VtZW50cy93b3JrL21lL2FkbWluL2VsYWRtaW4vfi9hdmF0YXIvYXZhdGFyLTIwMjAwODA2MDMyMjU5MTYxLnBuZyIsInBhc3N3b3JkIjoiZjUyMDIwZGNhNzY1ZmQzOTQzZWQ0MGE2MTVkYzJjNWMiLCJlbmFibGVkIjp0cnVlLCJpc0FkbWluIjp0cnVlLCJwd2RSZXNldFRpbWUiOjE1ODg0OTUxMTEsInVwZGF0ZWRCeSI6IlN5c3RlbSIsImNyZWF0ZVRpbWUiOjE1MzQ5ODY3MTYsInVwZGF0ZVRpbWUiOjE2ODMzNjgyMzZ9LCJwZXJtaXNzaW9ucyI6WyJhZG1pbiIsInVzZXI6bGlzdCIsInJvbGVzOmxpc3QiLCJtZW51Omxpc3QiLCJ0aW1pbmc6bGlzdCIsImRlcHQ6bGlzdCIsImRpY3Q6bGlzdCIsInVzZXI6YWRkIiwidXNlcjplZGl0IiwidXNlcjpkZWwiLCJyb2xlczphZGQiLCJyb2xlczplZGl0Iiwicm9sZXM6ZGVsIiwibWVudTphZGQiLCJtZW51OmVkaXQiLCJtZW51OmRlbCIsImRlcHQ6YWRkIiwiZGVwdDplZGl0IiwiZGVwdDpkZWwiLCJkaWN0OmFkZCIsImRpY3Q6ZWRpdCIsImRpY3Q6ZGVsIiwidGltaW5nOmFkZCIsInRpbWluZzplZGl0IiwidGltaW5nOmRlbCIsIm1vbml0b3I6bGlzdCIsImdlbkNvZGU6bGlzdCIsImdlbkNvZGU6YWRkIiwiZ2VuQ29kZTpkZWwiLCJnZW5Db2RlOmVkaXQiLCI5OTkiLCJzdG9yYWdlOmxpc3QiLCJzdG9yYWdlOmFkZCIsInN0b3JhZ2U6ZWRpdCIsInN0b3JhZ2U6ZGVsIl19fQ.q7PzhQbg_3FY-4TkL4S6Iy_Qx05YBGz2BI5mSkRl2AU' +// }, +// 'code': '1', +// 'desc': '操作成功!' +// } +// return res +// } // 手持登陆查询菜单权限 export const authority = (id) => post('api/pda/authority', { diff --git a/src/pages/login/Login.vue b/src/pages/login/Login.vue index a12cd47..7d8a10b 100644 --- a/src/pages/login/Login.vue +++ b/src/pages/login/Login.vue @@ -56,7 +56,7 @@ export default { if (res.code === '1') { let obj = {} if (this.memberName) { - obj = Object.assign({}, res.result.user.user, {token: res.token, loginname: this.loginname}) + obj = Object.assign({}, res.result.user.user, {token: res.result.token, loginname: this.loginname}) } else { obj = Object.assign({}, res.result.user.user, {token: res.result.token, loginname: ''}) }