Commit 1ea9f6e5 authored by xingyuji's avatar xingyuji

Merge branch 'develop' into 'master'

Develop

See merge request !21
parents 2d0ca745 f04a64bb
...@@ -12,4 +12,4 @@ REGION = 'oss-cn-hangzhou' ...@@ -12,4 +12,4 @@ REGION = 'oss-cn-hangzhou'
BUCKET = 'staven-prod' BUCKET = 'staven-prod'
PREFIX = 'staven-blog' PREFIX = 'staven-blog'
outputDir = 'sit' outputDir = 'tenio-front-sit'
\ No newline at end of file
...@@ -12,4 +12,4 @@ REGION = 'oss-cn-hangzhou' ...@@ -12,4 +12,4 @@ REGION = 'oss-cn-hangzhou'
BUCKET = 'staven-prod' BUCKET = 'staven-prod'
PREFIX = 'staven-blog' PREFIX = 'staven-blog'
outputDir = 'prod' outputDir = 'tenio-front-uat'
<template> <template>
<section class="login"> <section class="login">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="left"> <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="left">
<h3 class="title">LOGIN</h3> <div align="center" style="margin-bottom: 40px">
<img :src="require('@assets/img/logo.png')" width="150" alt="">
</div>
<h4 class="title">户型查询系统</h4>
<el-form-item prop="username"> <el-form-item prop="username">
<span class="svg-container"> <span class="svg-container">
<svg-icon icon-class="user" /> <svg-icon icon-class="user" />
...@@ -25,7 +28,7 @@ ...@@ -25,7 +28,7 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button :loading="loading" type="primary" style="width:100%;" @click.native.prevent="toLogin"> <el-button :loading="loading" type="primary" style="width:100%;" @click.native.prevent="toLogin">
Sign in 登 录
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -145,7 +148,7 @@ export default { ...@@ -145,7 +148,7 @@ export default {
position: fixed; position: fixed;
height: 100%; height: 100%;
width: 100%; width: 100%;
background-color: bg; background: linear-gradient(90deg, #286690, #102244);
.login-form { .login-form {
position: absolute; position: absolute;
left: 0; left: 0;
...@@ -163,8 +166,7 @@ export default { ...@@ -163,8 +166,7 @@ export default {
display: inline-block; display: inline-block;
} }
.title { .title {
font-size: 26px; font-size: 22px;
font-weight: 400;
color: light_gray; color: light_gray;
margin: 0px auto 40px auto; margin: 0px auto 40px auto;
text-align: center; text-align: center;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment