diff --git a/src/assets/bg.png b/src/assets/bg.png new file mode 100644 index 0000000..a229d49 Binary files /dev/null and b/src/assets/bg.png differ diff --git a/src/assets/loginlogo.png b/src/assets/loginlogo.png new file mode 100644 index 0000000..f1ee850 Binary files /dev/null and b/src/assets/loginlogo.png differ diff --git a/src/assets/password.png b/src/assets/password.png new file mode 100644 index 0000000..d91bfdc Binary files /dev/null and b/src/assets/password.png differ diff --git a/src/assets/username.png b/src/assets/username.png new file mode 100644 index 0000000..cee99c6 Binary files /dev/null and b/src/assets/username.png differ diff --git a/src/views/guide/component/addGuide.vue b/src/views/guide/component/addGuide.vue index cd416ed..42601db 100644 --- a/src/views/guide/component/addGuide.vue +++ b/src/views/guide/component/addGuide.vue @@ -35,7 +35,7 @@ store, show, save - } from "@/api/relic" + } from "@/api/guide" import { Message } from 'element-ui' diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 8904c83..2a62802 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1,44 +1,46 @@ @@ -66,6 +68,7 @@ } return { windowHeight: document.documentElement.clientHeight, //实时屏幕高度 + windowWidth: document.documentElement.clientWidth, loginForm: { username: '', password: '' @@ -99,6 +102,10 @@ windowHeight(val) { let that = this; console.log("实时屏幕高度:", val, that.windowHeight); + }, + windowWidth(val) { + let that = this; + console.log("实时屏幕宽度:", val, that.windowHeight); } }, @@ -113,12 +120,20 @@ var that = this; let height = this.$refs.formBox.offsetHeight; //100 that.formHeight = height; - that.marginTop = (that.windowHeight - height * 1.5) / 2; + that.marginTop = (that.windowHeight - height * 1.5) / 3; + window.fullHeight = document.documentElement.clientHeight; + that.windowHeight = window.fullHeight; // 高 + window.fullWidth = document.documentElement.clientWidth; + that.windowWidth = window.fullWidth; // 宽 + console.log(that.windowWidth, that.windowHeight) // window.onresize = () => { return (() => { window.fullHeight = document.documentElement.clientHeight; that.windowHeight = window.fullHeight; // 高 + window.fullWidth = document.documentElement.clientWidth; + that.windowWidth = window.fullWidth; // 宽 + console.log(that.windowWidth, that.windowHeight) })() }; }, @@ -161,9 +176,9 @@ /* 修复input 背景不协调 和光标变色 */ /* Detail see https://github.com/PanJiaChen/vue-element-admin/pull/927 */ - $bg:#ffffff; - $light_gray:#55320f; - $cursor: #55320f; + $bg: #ffffff; + $light_gray: #cf995a; + $cursor: #cf995a; @supports (-webkit-mask: none) and (not (cater-color: $cursor)) { .login-container .el-input input { @@ -186,10 +201,11 @@ } .box_middle { - background: url("../../assets/imgs/bg_box_line.png") repeat-y; - background-size: 100% 100%; - padding: 20px 60px; + // background: url("../../assets/imgs/bg_box_line.png") repeat-y; + // background-size: 100% 100%; + padding: 20px 30px; margin-top: -10px; + text-align: center; } @@ -221,18 +237,18 @@ } .el-form-item { - border: 1px solid rgba(255, 255, 255, 0.1); - background: rgba(0, 0, 0, 0.1); - border-radius: 5px; + // border: 1px solid rgba(255, 255, 255, 0.1); + // background: rgba(0, 0, 0, 0.1); + // border-radius: 5px; color: #454545; } }