diff --git a/src/api/login.js b/src/api/login.js
index 3691abe..e216b67 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -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}
})
}
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 6c109a6..b154ead 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -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)
diff --git a/src/views/login.vue b/src/views/login.vue
index bdd86d9..c527e98 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -12,6 +12,16 @@
+
+
+
+
+