diff --git a/src/components/input/UploadImageInput.vue b/src/components/input/UploadImageInput.vue index 7b97caa..dbe078d 100644 --- a/src/components/input/UploadImageInput.vue +++ b/src/components/input/UploadImageInput.vue @@ -197,7 +197,6 @@ export default { fileName, { type: response.type } ); - console.log(file) let data = new FormData() data.append("files", file) data.append("username", that.$store.state.user.name) diff --git a/src/permission.js b/src/permission.js index 0fe50f6..f46e006 100644 --- a/src/permission.js +++ b/src/permission.js @@ -21,12 +21,12 @@ router.beforeEach(async(to, from, next) => { if (hasToken) { // 已登录的情况 if (to.path === '/login') { - // 登陆页面 + // 登录页面 // 如果已登录,则重定向到主页 setMenuList(next, { path: '/' }) NProgress.done() } else { - // 非登陆页面 + // 非登录页面 const hasGetUserInfo = store.getters.name if (hasGetUserInfo) { // 存在用户信息 @@ -46,7 +46,7 @@ router.beforeEach(async(to, from, next) => { } } } else { - // 没有登陆的情况 + // 没有登录的情况 if (whiteList.indexOf(to.path) !== -1) { // 没有token但是在白名单中,直接进入 next() diff --git a/src/utils/request.js b/src/utils/request.js index 6088494..7b80099 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -54,7 +54,7 @@ service.interceptors.response.use( setTimeout(function () { const hasToken = getToken() if(hasToken){ - MessageBox.confirm('登录已失效,可以取消停留在此页面上,或者再次登录', '确认登出', { + MessageBox.confirm('登录已失效,请重新登录', '确认登出', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' diff --git a/src/views/setting/cloudManager.vue b/src/views/setting/cloudManager.vue index 22dedd2..bda6296 100644 --- a/src/views/setting/cloudManager.vue +++ b/src/views/setting/cloudManager.vue @@ -44,7 +44,7 @@ export default { return { title: '网盘管理', syncLoading: false, - webpEnabled: true + webpEnabled: false } }, mounted() { diff --git a/src/views/setting/sys/logList.vue b/src/views/setting/sys/logList.vue index 38f8f8e..68b8186 100644 --- a/src/views/setting/sys/logList.vue +++ b/src/views/setting/sys/logList.vue @@ -101,6 +101,9 @@ export default { options: [{ value: 'LOGIN', label: '登录' + }, { + value: 'BROWSE', + label: '足迹👣' }, { value: 'OPERATION', label: '操作' diff --git a/src/views/setting/sys/logLogin.vue b/src/views/setting/sys/logLogin.vue index 9f5eade..47119b8 100644 --- a/src/views/setting/sys/logLogin.vue +++ b/src/views/setting/sys/logLogin.vue @@ -23,9 +23,9 @@ export default { {prop: 'status', minWidth: 80, label: '状态', tag: true, formatData: (status)=> { if(status === 0) { - return [{name: '登陆成功', type: 'success'}] + return [{name: '登录成功', type: 'success'}] } else { - return [{name: '登陆失败', type: 'danger'}] + return [{name: '登录失败', type: 'danger'}] } } },