后端功能1修改
parent
20966b2a8d
commit
7abd744fdd
|
@ -1,7 +1,7 @@
|
|||
import request from '@/utils/request'
|
||||
|
||||
// 登录方法
|
||||
export function login(username, password, code, uuid) {
|
||||
export function login(username, email, password, code, uuid) {
|
||||
return request({
|
||||
url: '/auth/login',
|
||||
headers: {
|
||||
|
@ -9,7 +9,7 @@ export function login(username, password, code, uuid) {
|
|||
repeatSubmit: false
|
||||
},
|
||||
method: 'post',
|
||||
data: {username, password, code, uuid}
|
||||
data: {username, email, password, code, uuid}
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
@ -39,11 +39,12 @@ const user = {
|
|||
// 登录
|
||||
Login({commit}, userInfo) {
|
||||
const username = userInfo.username.trim()
|
||||
const email = userInfo.email
|
||||
const password = userInfo.password
|
||||
const code = userInfo.code
|
||||
const uuid = userInfo.uuid
|
||||
return new Promise((resolve, reject) => {
|
||||
login(username, password, code, uuid).then(res => {
|
||||
login(username, email, password, code, uuid).then(res => {
|
||||
let data = res.data
|
||||
setToken(data.access_token)
|
||||
commit('SET_TOKEN', data.access_token)
|
||||
|
|
|
@ -12,6 +12,16 @@
|
|||
<svg-icon slot="prefix" class="el-input__icon input-icon" icon-class="user"/>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item prop="email">
|
||||
<el-input
|
||||
v-model="loginForm.email"
|
||||
auto-complete="off"
|
||||
placeholder="邮箱"
|
||||
type="text"
|
||||
>
|
||||
<svg-icon slot="prefix" class="el-input__icon input-icon" icon-class="user"/>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item prop="password">
|
||||
<el-input
|
||||
v-model="loginForm.password"
|
||||
|
@ -73,6 +83,7 @@ export default {
|
|||
codeUrl: "",
|
||||
loginForm: {
|
||||
username: "admin",
|
||||
email: "ry@163.com",
|
||||
password: "admin123",
|
||||
rememberMe: false,
|
||||
code: "",
|
||||
|
@ -119,10 +130,12 @@ export default {
|
|||
},
|
||||
getCookie() {
|
||||
const username = Cookies.get("username");
|
||||
const email = Cookies.get("email");
|
||||
const password = Cookies.get("password");
|
||||
const rememberMe = Cookies.get('rememberMe')
|
||||
this.loginForm = {
|
||||
username: username === undefined ? this.loginForm.username : username,
|
||||
email: email === undefined ? this.loginForm.email : email,
|
||||
password: password === undefined ? this.loginForm.password : decrypt(password),
|
||||
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
|
||||
};
|
||||
|
@ -133,10 +146,12 @@ export default {
|
|||
this.loading = true;
|
||||
if (this.loginForm.rememberMe) {
|
||||
Cookies.set("username", this.loginForm.username, {expires: 30});
|
||||
Cookies.set("email", this.loginForm.email, {expires: 30});
|
||||
Cookies.set("password", encrypt(this.loginForm.password), {expires: 30});
|
||||
Cookies.set('rememberMe', this.loginForm.rememberMe, {expires: 30});
|
||||
} else {
|
||||
Cookies.remove("username");
|
||||
Cookies.remove("email");
|
||||
Cookies.remove("password");
|
||||
Cookies.remove('rememberMe');
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue