diff --git a/src/assets/images/houseQR/header_bg.png b/src/assets/images/houseQR/header_bg.png index 002bcb9..01e64b1 100644 Binary files a/src/assets/images/houseQR/header_bg.png and b/src/assets/images/houseQR/header_bg.png differ diff --git a/src/router/index.js b/src/router/index.js index e580d1a..a972170 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -79,7 +79,7 @@ router.beforeEach((to, from, next) => { } else { document.title = to.meta.title ? to.meta.title : title } - if (localStorage.getItem('token')) { + if (localStorage.getItem('token') && to.path != '/houseQR') { store.dispatch('getUserInfo').then((res) => { if (res.agencyId) { next() @@ -93,7 +93,7 @@ router.beforeEach((to, from, next) => { } }) } else { - if (getQueryStringByName('code')) { + if (getQueryStringByName('code') && to.path != '/houseQR') { login({ wxCode: getQueryStringByName('code'),appId:'wx1078fa1e99424de9'}).then(res => { localStorage.setItem('token', res.token) localStorage.setItem('userId', res.userH5DTO.id) diff --git a/src/views/houseQR/index.less b/src/views/houseQR/index.less index 2b02fa5..ee4e669 100644 --- a/src/views/houseQR/index.less +++ b/src/views/houseQR/index.less @@ -1,8 +1,8 @@ .header{ - background:url('@/assets/images/houseQR/header_bg.png'); + background:url('@/assets/images/houseQR/header_bg.png') no-repeat; background-size: 100%; width: 100%; - height: 180px; + height: 100px; z-index: 1; } .mask{ @@ -16,8 +16,8 @@ z-index: 2; } section{ - position: relative; - top: -40px; + position: absolute; + top: 90px; z-index: 3; .house_base{ position: relative; @@ -85,8 +85,9 @@ a{ border-radius: 7px; height: 38px; padding: 7px 16px; - position: relative; - bottom: 20px; + position: fixed; + bottom: 10px; + left: 10px; box-sizing: border-box; z-index: 10; } \ No newline at end of file diff --git a/src/views/houseQR/index.vue b/src/views/houseQR/index.vue index 16eda3b..b3064df 100644 --- a/src/views/houseQR/index.vue +++ b/src/views/houseQR/index.vue @@ -1,148 +1,168 @@ - \ No newline at end of file +