diff --git a/web/src/assets/login.jpg b/web/src/assets/login.jpg new file mode 100644 index 0000000..b4ae11b Binary files /dev/null and b/web/src/assets/login.jpg differ diff --git a/web/src/assets/login.svg b/web/src/assets/login.svg deleted file mode 100644 index 81394e6..0000000 --- a/web/src/assets/login.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - bg - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file diff --git a/web/src/views/user/login/main.vue b/web/src/views/user/login/main.vue index 3ee3ea4..e69a3b8 100644 --- a/web/src/views/user/login/main.vue +++ b/web/src/views/user/login/main.vue @@ -220,17 +220,17 @@ export default { .login { width: 100%; height: 100%; - min-height: 624px; - position: relative; background-repeat: no-repeat; background-position: 50%; - background-size: 100%; - background-image: url(~@/assets/login.svg); + background-size: cover; + background-image: url(~@/assets/login.jpg); + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; &-form { width: 300px; - margin: auto; - padding-top: 90px; .logo { display: flex; diff --git a/web/src/views/user/login/wechat.vue b/web/src/views/user/login/wechat.vue index 2bff7d7..776283d 100644 --- a/web/src/views/user/login/wechat.vue +++ b/web/src/views/user/login/wechat.vue @@ -74,6 +74,10 @@ export default { mounted() { const { code, state } = this.$route.query; + if (!code || !state) { + return this.$router.replace('/user/login'); + } + utils.request .post('/user/wechat_login', { code, state }) .then(res => { @@ -96,13 +100,16 @@ export default { height: 100%; background-repeat: no-repeat; background-position: 50%; - background-size: 100%; - background-image: url(~@/assets/login.svg); + background-size: cover; + background-image: url(~@/assets/login.jpg); + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; &-body { width: 320px; margin: auto; - padding-top: 90px; .hands { line-height: 88px;