张恒

直接去除easymock,粗暴使用赋值的形式进行登录,请自行修改vuex中的user.js

1 module.exports = { 1 module.exports = {
2 NODE_ENV: '"development"', 2 NODE_ENV: '"development"',
3 - BASE_API: '"https://easy-mock.com/mock/5950a2419adc231f356a6636/vue-admin"' 3 + BASE_API: '""'
4 } 4 }
......
1 module.exports = { 1 module.exports = {
2 NODE_ENV: '"production"', 2 NODE_ENV: '"production"',
3 - BASE_API: '"https://easy-mock.com/mock/5950a2419adc231f356a6636/vue-admin"' 3 + BASE_API: '""'
4 } 4 }
......
...@@ -28,54 +28,54 @@ const user = { ...@@ -28,54 +28,54 @@ const user = {
28 actions: { 28 actions: {
29 // 登录 29 // 登录
30 Login ({ commit }, userInfo) { 30 Login ({ commit }, userInfo) {
31 - console.log(userInfo)
32 - const username = userInfo.username.trim()
33 return new Promise((resolve, reject) => { 31 return new Promise((resolve, reject) => {
34 - const data = { 32 + // login(data).then(response => {
35 - username: username, 33 + // const data = response.data
36 - password: userInfo.password 34 + // setToken(data.token)
37 - } 35 + // commit('SET_TOKEN', data.token)
38 - login(data).then(response => { 36 + // resolve()
39 - const data = response.data.data 37 + // }).catch(error => {
40 - setToken(data.token) 38 + // reject(error)
41 - commit('SET_TOKEN', data.token) 39 + // })
42 - resolve() 40 + commit('SET_TOKEN', 'admin')
43 - }).catch(error => { 41 + resolve()
44 - reject(error)
45 - })
46 }) 42 })
47 }, 43 },
48 44
49 // 获取用户信息 45 // 获取用户信息
50 GetInfo ({ commit, state }) { 46 GetInfo ({ commit, state }) {
51 return new Promise((resolve, reject) => { 47 return new Promise((resolve, reject) => {
52 - getInfo(state.token).then(response => { 48 + // getInfo(state.token).then(response => {
53 - const data = response.data.data 49 + // const data = response.data
54 - if (data.roles && data.roles.length > 0) { // 验证返回的roles是否是一个非空数组 50 + // if (data.roles && data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
55 - commit('SET_ROLES', data.roles) 51 + // commit('SET_ROLES', data.roles)
56 - } else { 52 + // } else {
57 - reject('getInfo: roles must be a non-null array !') 53 + // reject('getInfo: roles must be a non-null array !')
58 - } 54 + // }
59 - commit('SET_NAME', data.name) 55 + // commit('SET_NAME', data.name)
60 - commit('SET_AVATAR', data.avatar) 56 + // commit('SET_AVATAR', data.avatar)
61 - resolve(response) 57 + // resolve(response)
62 - }).catch(error => { 58 + // }).catch(error => {
63 - reject(error) 59 + // reject(error)
64 - }) 60 + // })
61 + commit('SET_ROLES', ['admin'])
62 + commit('SET_NAME', 'Super Admin')
63 + commit('SET_AVATAR', 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif')
64 + resolve()
65 }) 65 })
66 }, 66 },
67 67
68 // 登出 68 // 登出
69 LogOut ({ commit, state }) { 69 LogOut ({ commit, state }) {
70 return new Promise((resolve, reject) => { 70 return new Promise((resolve, reject) => {
71 - logout(state.token).then(() => { 71 + // logout(state.token).then(() => {
72 - commit('SET_TOKEN', '') 72 + commit('SET_TOKEN', '')
73 - commit('SET_ROLES', []) 73 + commit('SET_ROLES', [])
74 - removeToken() 74 + removeToken()
75 - resolve() 75 + resolve()
76 - }).catch(error => { 76 + // }).catch(error => {
77 - reject(error) 77 + // reject(error)
78 - }) 78 + // })
79 }) 79 })
80 }, 80 },
81 81
......