修改登录
This commit is contained in:
parent
ee5443f0e7
commit
9320426b04
|
|
@ -18,7 +18,23 @@ export function login(username, password, code, uuid) {
|
|||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 登录方法
|
||||
export function defaultLogin(username,token) {
|
||||
const data = {
|
||||
username
|
||||
}
|
||||
return request({
|
||||
url: '/publicLogin/defaultLogin',
|
||||
headers: {
|
||||
//Authorization: localStorage.getItem("public_token"),
|
||||
Authorization:token,
|
||||
isToken: false,
|
||||
repeatSubmit: false
|
||||
},
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
// 注册方法
|
||||
export function register(data) {
|
||||
return request({
|
||||
|
|
@ -57,4 +73,4 @@ export function getCodeImg() {
|
|||
method: 'get',
|
||||
timeout: 20000
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import { isRelogin } from '@/utils/request'
|
|||
|
||||
NProgress.configure({ showSpinner: false })
|
||||
|
||||
const whiteList = ['/login', '/register']
|
||||
const whiteList = ['/login', '/register','/ywgllogin']
|
||||
|
||||
router.beforeEach((to, from, next) => {
|
||||
NProgress.start()
|
||||
|
|
|
|||
|
|
@ -46,6 +46,11 @@ export const constantRoutes = [
|
|||
component: () => import('@/views/login'),
|
||||
hidden: true
|
||||
},
|
||||
{
|
||||
path: '/ywgllogin',
|
||||
component: () => import('@/views/ywgllogin'),
|
||||
hidden: true
|
||||
},
|
||||
{
|
||||
path: '/register',
|
||||
component: () => import('@/views/register'),
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import { login, logout, getInfo } from '@/api/login'
|
||||
import { login, logout, getInfo,defaultLogin } from '@/api/login'
|
||||
import { getToken, setToken, removeToken } from '@/utils/auth'
|
||||
|
||||
const user = {
|
||||
|
|
@ -49,6 +49,19 @@ const user = {
|
|||
})
|
||||
})
|
||||
},
|
||||
//默认跳转
|
||||
DefaultLogin({ commit }, userInfo) {
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
defaultLogin(userInfo.username,userInfo.token).then(res => {
|
||||
setToken(res.token)
|
||||
commit('SET_TOKEN', res.token)
|
||||
resolve()
|
||||
}).catch(error => {
|
||||
reject(error)
|
||||
})
|
||||
})
|
||||
},
|
||||
|
||||
// 获取用户信息
|
||||
GetInfo({ commit, state }) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue