Commit f9605c2b authored by 张伯涛's avatar 张伯涛

登录加参数

parent cbba6095
...@@ -3,12 +3,13 @@ import { encrypt } from '@/utils/jsencrypt' ...@@ -3,12 +3,13 @@ import { encrypt } from '@/utils/jsencrypt'
import Qs from 'qs' import Qs from 'qs'
// 登录方法 // 登录方法
export function login(username, password, code, uuid) { export function login(username, password, code, uuid,type) {
const data = { const data = {
username, username,
password, password,
code, code,
uuid uuid,
type
} }
console.log('加密前数据', data) console.log('加密前数据', data)
return request({ return request({
......
...@@ -38,12 +38,14 @@ const user = { ...@@ -38,12 +38,14 @@ const user = {
actions: { actions: {
// 登录 // 登录
Login({ commit }, userInfo) { Login({ commit }, userInfo) {
console.log('userInfo', userInfo)
const username = userInfo.username.trim() const username = userInfo.username.trim()
const password = userInfo.password const password = userInfo.password
const code = userInfo.code const code = userInfo.code
const uuid = userInfo.uuid const uuid = userInfo.uuid
const type = userInfo.type
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
login(username, password, code, uuid).then(res => { login(username, password, code, uuid, type).then(res => {
setToken(res.data) setToken(res.data)
commit('SET_TOKEN', res.data) commit('SET_TOKEN', res.data)
resolve() resolve()
......
...@@ -128,6 +128,7 @@ export default { ...@@ -128,6 +128,7 @@ export default {
codeUrl: '', codeUrl: '',
cookiePassword: '', cookiePassword: '',
loginForm: { loginForm: {
type: '1',
username: '', username: '',
password: '', password: '',
rememberMe: false, rememberMe: false,
...@@ -197,9 +198,11 @@ export default { ...@@ -197,9 +198,11 @@ export default {
getCookie() { getCookie() {
const username = Cookies.get('username') const username = Cookies.get('username')
const password = Cookies.get('password') const password = Cookies.get('password')
const type = Cookies.get('type')
const rememberMe = Cookies.get('rememberMe') const rememberMe = Cookies.get('rememberMe')
this.loginForm = { this.loginForm = {
username: username === undefined ? this.loginForm.username : username, username: username === undefined ? this.loginForm.username : username,
type: type === undefined ? this.loginForm.type : type,
password: password === undefined ? this.loginForm.password : passwordDecrypt(password), password: password === undefined ? this.loginForm.password : passwordDecrypt(password),
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe) rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
} }
...@@ -231,10 +234,12 @@ export default { ...@@ -231,10 +234,12 @@ export default {
rememberMe() { rememberMe() {
if (this.loginForm.rememberMe) { if (this.loginForm.rememberMe) {
Cookies.set('username', this.loginForm.username, { expires: 30 }) Cookies.set('username', this.loginForm.username, { expires: 30 })
Cookies.set('type', this.loginForm.type, { expires: 30 })
Cookies.set('password', passwordEncrypt(this.loginForm.password), { expires: 30 }) Cookies.set('password', passwordEncrypt(this.loginForm.password), { expires: 30 })
Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 }) Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 })
} else { } else {
Cookies.remove('username') Cookies.remove('username')
Cookies.remove('type')
Cookies.remove('password') Cookies.remove('password')
Cookies.remove('rememberMe') Cookies.remove('rememberMe')
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment