diff --git a/src/api/login.js b/src/api/login.js index cfcff27d46a02b0554600c754df276ea0b6bfe5f..4674d1c8e24d16a49f765dc9606675ceb634cf05 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -1,22 +1,22 @@ -import fetch from 'utils/fetch'; +import fetch from 'utils/fetch' export function loginByUsername(username, password) { const data = { username, password - }; + } return fetch({ url: '/login/login', method: 'post', data - }); + }) } export function logout() { return fetch({ url: '/login/logout', method: 'post' - }); + }) } export function getInfo(token) { @@ -24,6 +24,6 @@ export function getInfo(token) { url: '/user/info', method: 'get', params: { token } - }); + }) } diff --git a/src/mock/login.js b/src/mock/login.js index 9baab9a12b7734dc0850aed42bed6a703ea5f778..010ad036aa27a52b2d2c603d343e51253a874f84 100644 --- a/src/mock/login.js +++ b/src/mock/login.js @@ -34,7 +34,7 @@ export default { if (userMap[token]) { return userMap[token]; } else { - return Promise.reject('a'); + return Promise.reject('error'); } }, logout: () => 'success' diff --git a/src/permission.js b/src/permission.js index 43c1cc598be7356e0185776308e589559348017a..61dc5e1c582d0e43848fc6148c908d16582e84c5 100644 --- a/src/permission.js +++ b/src/permission.js @@ -12,7 +12,7 @@ function hasPermission(roles, permissionRoles) { } // register global progress. -const whiteList = ['/login', '/authredirect', '/reset', '/sendpwd']// ä¸é‡å®šå‘白åå• +const whiteList = ['/login', '/authredirect']// ä¸é‡å®šå‘白åå• router.beforeEach((to, from, next) => { NProgress.start() // å¼€å¯Progress if (getToken()) { // 判æ–是å¦æœ‰token diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 7582434b66169ac7591de1d811e10b0a7781e770..7a0eec44907a01850a9b7410d6477e85bb4b2a4a 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -40,12 +40,6 @@ const user = { }, SET_ROLES: (state, roles) => { state.roles = roles; - }, - LOGIN_SUCCESS: () => { - console.log('login success') - }, - LOGOUT_USER: state => { - state.user = ''; } }, diff --git a/src/views/excel/selectExcel.vue b/src/views/excel/selectExcel.vue index 08a49d4436f84637e67eae59413c3d580b58b676..83064592f25c21e6dc402c0c832746e53fcfea8e 100644 --- a/src/views/excel/selectExcel.vue +++ b/src/views/excel/selectExcel.vue @@ -78,8 +78,8 @@ }) } else { this.$message({ - message: '请选择一æ¡æˆ–多æ¡è®°å½•å¯¼å‡º', - type: 'warning' + message: '请选择一æ¡æˆ–多æ¡è®°å½•å¯¼å‡º', + type: 'warning' }); } }, diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 5557a5f7c1d48cd7c4e5d9e6bfc5b3d15262b177..1021ba04c6ab89733464b856dab4b8afc416c5a2 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -24,7 +24,7 @@ <div class='tips'>è´¦å·:admin 密ç éšä¾¿å¡«</div> <div class='tips'>è´¦å·:editor 密ç éšä¾¿å¡«</div> - <el-button class='thirdPart-button' type="primary" @click='showDialog=true'>打开第三方登录</el-button> + <el-button class='thirdparty-button' type="primary" @click='showDialog=true'>打开第三方登录</el-button> </el-form> <el-dialog title="第三方验è¯" :visible.sync="showDialog"> @@ -198,7 +198,7 @@ color: $dark_gray; cursor: pointer; } - .thirdPart-button{ + .thirdparty-button{ position: absolute; right: 35px; bottom: 28px;