diff --git a/src/App.vue b/src/App.vue index a83bee3..b90d312 100644 --- a/src/App.vue +++ b/src/App.vue @@ -20,7 +20,7 @@ // } watch: { '$route'(to, from) {//监听路由改变 - let user = JSON.parse(localStorage.getItem('user')); + let user = JSON.parse(sessionStorage.getItem('user')); if (!user) { this.$router.replace('/login') } diff --git a/src/main.js b/src/main.js index 0616740..ba5fbd7 100644 --- a/src/main.js +++ b/src/main.js @@ -86,10 +86,8 @@ const router = new VueRouter({ router.beforeEach((to, from, next) => { NProgress.start(); - let user = JSON.parse(localStorage.getItem('user')); - console.log(user); console.log(to); + let user = JSON.parse(sessionStorage.getItem('user')); if (!user && to.path != '/login') { - console.log('lgout'); next({ path: '/login' }) } next() diff --git a/src/mockdata/user.js b/src/mockdata/user.js index 6ef85fb..f9c511d 100644 --- a/src/mockdata/user.js +++ b/src/mockdata/user.js @@ -4,7 +4,7 @@ const LoginUsers = [ id: 1, username: 'admin', password: '123456', - avatar: '', + avatar: 'https://raw.githubusercontent.com/taylorchen709/markdown-images/master/vueadmin/user.png', name: '张某某' } ]; diff --git a/src/pages/Home.vue b/src/pages/Home.vue index ad6ae4a..d161826 100644 --- a/src/pages/Home.vue +++ b/src/pages/Home.vue @@ -7,7 +7,7 @@ - 张某某 + {{sysUserName}} 我的消息 @@ -82,6 +82,8 @@ currentPath: '/table', currentPathName: 'Table', currentPathNameParent: '导航一', + sysUserName: '', + sysUserAvatar: '', form: { name: '', region: '', @@ -94,13 +96,13 @@ } } }, - // watch: { - // '$route'(to, from) {//监听路由改变 - // this.currentPath = to.path; - // this.currentPathName = to.name; - // this.currentPathNameParent = to.matched[0].name; - // } - // }, + watch: { + '$route'(to, from) {//监听路由改变 + this.currentPath = to.path; + this.currentPathName = to.name; + this.currentPathNameParent = to.matched[0].name; + } + }, methods: { onSubmit() { console.log('submit!'); @@ -119,7 +121,7 @@ this.$confirm('确认退出吗?', '提示', { //type: 'warning' }).then(() => { - localStorage.removeItem('user'); + sessionStorage.removeItem('user'); _this.$router.replace('/login'); }).catch(() => { @@ -132,6 +134,13 @@ this.currentPath = this.$route.path; this.currentPathName = this.$route.name; this.currentPathNameParent = this.$route.matched[0].name; + + var user = sessionStorage.getItem('user'); + if (user) { + user = JSON.parse(user); + this.sysUserName = user.name || ''; + this.sysUserAvatar = user.avatar || ''; + } } } diff --git a/src/pages/Login.vue b/src/pages/Login.vue index 8ade801..2e288ed 100644 --- a/src/pages/Login.vue +++ b/src/pages/Login.vue @@ -62,12 +62,8 @@ type: 'error' }); } else { - localStorage.setItem('user', JSON.stringify(user)); - if (this.$route.query.redirect) { - this.$router.push({ path: this.$route.query.redirect }); - } else { - this.$router.push({ path: '/table' }); - } + sessionStorage.setItem('user', JSON.stringify(user)); + this.$router.push({ path: '/table' }); } }); } else {