diff --git a/src/api/login.js b/src/api/login.js index 2625395..4a3d0d1 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -1,14 +1,16 @@ import request from '@/utils/request' // 登录方法 -export function login(encrypt, code, uuid) { +export function login(username, password, code, uuid) { +// export function login(encrypt, code, uuid) { return request({ url: '/auth/login', headers: { isToken: false }, method: 'post', - data: { encrypt, code, uuid } + // data: { encrypt, code, uuid } + data: { username, password, code, uuid } }) } diff --git a/src/store/modules/user.js b/src/store/modules/user.js index b173c36..3f7fba2 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -43,10 +43,10 @@ const user = { username: username, password: password, }; - const encryptData = encrypt(JSON.stringify(data)); + // const encryptData = encrypt(JSON.stringify(data)); return new Promise((resolve, reject) => { - // login(username, password, code, uuid).then(res => { - login(encryptData, code, uuid).then(res => { + login(username, password, code, uuid).then(res => { + // login(encryptData, code, uuid).then(res => { let data = res.data setToken(data.access_token) commit('SET_TOKEN', data.access_token) diff --git a/src/views/visCarryStuff/record/index.vue b/src/views/visCarryStuff/record/index.vue new file mode 100644 index 0000000..46fa074 --- /dev/null +++ b/src/views/visCarryStuff/record/index.vue @@ -0,0 +1,458 @@ + + + diff --git a/src/views/visCarryStuff/visCarryStuff/index.vue b/src/views/visCarryStuff/visCarryStuff/index.vue new file mode 100644 index 0000000..58443b8 --- /dev/null +++ b/src/views/visCarryStuff/visCarryStuff/index.vue @@ -0,0 +1,1283 @@ + + + +