diff --git a/src/components/Header.vue b/src/components/Header.vue index 2ebf747..edeb954 100644 --- a/src/components/Header.vue +++ b/src/components/Header.vue @@ -28,13 +28,16 @@ export default { methods: { getUserInfo(){ this.$get(this.api.queryUserInfoDetails).then(res => { + console.log(res,'头像处理'); let userInfo = res.result.hrUserInfo if(userInfo.userAvatars) this.$store.commit('userAvatar',{avatar: userInfo.userAvatars}) this.userName = userInfo.userName }).catch(err => {}) }, toPerson(){ - this.$router.push('/person') + if(this.$route.path.split('/').pop()!=='person'){ + this.$router.push('/person') + } }, loginout() { localStorage.removeItem('ms_username'); diff --git a/src/views/Login.vue b/src/views/Login.vue index ff5f95e..8aa1acc 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -318,7 +318,7 @@ export default { .ms-login { position: relative; width: 1200px; - height: 82%; + height: calc(92vh - 60px); margin: 60px auto 20px; background-image: url(../assets/img/login-input.png); box-shadow:0px 0px 79px 0px rgba(11,15,65,0.36);