|
@@ -1,4 +1,4 @@
|
|
|
-// import { login } from '@/api/user'
|
|
|
+import { login } from '@/api/user'
|
|
|
import router from '@/router'
|
|
|
import { setToken, deleteToken } from '@/utils/auth'
|
|
|
// import Base from '@/utils/base64ToPassword'
|
|
@@ -7,15 +7,15 @@ import { setToken, deleteToken } from '@/utils/auth'
|
|
|
// const defaultSingleSignOn = localStorage.getItem('SET_SINGLE_SIGN_ON') !== '0' // 默认单点登录
|
|
|
|
|
|
const state = {
|
|
|
- singleSignOn: localStorage.getItem('SET_SINGLE_SIGN_ON') !== '0', // 单点登录
|
|
|
+ // singleSignOn: localStorage.getItem('SET_SINGLE_SIGN_ON') !== '0', // 单点登录
|
|
|
userInfo: {}
|
|
|
}
|
|
|
|
|
|
const mutations = {
|
|
|
- SET_SINGLE_SIGN_ON (state, loginType) {
|
|
|
- state.singleSignOn = loginType === 1
|
|
|
- localStorage.setItem('SET_SINGLE_SIGN_ON', loginType)
|
|
|
- },
|
|
|
+ // SET_SINGLE_SIGN_ON (state, loginType) {
|
|
|
+ // state.singleSignOn = loginType === 1
|
|
|
+ // localStorage.setItem('SET_SINGLE_SIGN_ON', loginType)
|
|
|
+ // },
|
|
|
SET_USERINFO: (state, userInfo) => {
|
|
|
state.userInfo = userInfo
|
|
|
localStorage.setItem('userInfo', JSON.stringify(userInfo))
|
|
@@ -24,26 +24,26 @@ const mutations = {
|
|
|
|
|
|
const actions = {
|
|
|
login ({ commit, dispatch }, params) {
|
|
|
- // const { username, password } = params
|
|
|
- // // const newBase = new Base()
|
|
|
- // const newParams = {
|
|
|
- // username: username.trim(),
|
|
|
- // password: password
|
|
|
- // // password: newBase.encode(password + (Math.random()).toString().slice(2, 8))
|
|
|
- // }
|
|
|
+ const { username, password } = params
|
|
|
+ // const newBase = new Base()
|
|
|
+ const newParams = {
|
|
|
+ username: username.trim(),
|
|
|
+ password: password
|
|
|
+ // password: newBase.encode(password + (Math.random()).toString().slice(2, 8))
|
|
|
+ }
|
|
|
// // 账号密码处理
|
|
|
return new Promise((resolve, reject) => {
|
|
|
- setToken(params.username)
|
|
|
- resolve()
|
|
|
- // login(newParams).then(res => {
|
|
|
- // // 登录成功返回对应的信息 包括token 用户信息 权限等等
|
|
|
- // const { data } = res
|
|
|
- // commit('SET_SINGLE_SIGN_ON', 0)
|
|
|
- // setToken(data.token)
|
|
|
- // // const { username, name, id, employeeCode } = data.user
|
|
|
- // commit('SET_USERINFO', data.user)
|
|
|
- // resolve()
|
|
|
- // }).catch(err => { reject(err) })
|
|
|
+ // setToken(params.username)
|
|
|
+ // resolve()
|
|
|
+ login(newParams).then(res => {
|
|
|
+ // 登录成功返回对应的信息 包括token 用户信息 权限等等
|
|
|
+ const { data } = res
|
|
|
+ // commit('SET_SINGLE_SIGN_ON', 0)
|
|
|
+ setToken(data.token)
|
|
|
+ // const { username, name, id, employeeCode } = data.user
|
|
|
+ commit('SET_USERINFO', data.user)
|
|
|
+ resolve()
|
|
|
+ }).catch(err => { reject(err) })
|
|
|
})
|
|
|
},
|
|
|
// 退出登录
|
|
@@ -57,7 +57,7 @@ const actions = {
|
|
|
// deleteRoles()
|
|
|
// 清空token
|
|
|
deleteToken()
|
|
|
- router.push({ path: '/login' })
|
|
|
+ // router.push({ path: '/login' })
|
|
|
// 清除路由
|
|
|
// resetRouter()
|
|
|
// // 清除问卷uuid
|
|
@@ -68,7 +68,7 @@ const actions = {
|
|
|
|
|
|
// if (!state.singleSignOn) {
|
|
|
// // 普通退出
|
|
|
- // router.push({ path: '/login' })
|
|
|
+ router.push({ path: '/login' })
|
|
|
// commit('SET_SINGLE_SIGN_ON', 1) // 重置为单点登录
|
|
|
// // window.location.href = '/login'
|
|
|
// return
|