diff --git a/src/assets/images/login/bg-dl.png b/src/assets/images/login/bg-dl.png new file mode 100644 index 0000000..557d0a8 Binary files /dev/null and b/src/assets/images/login/bg-dl.png differ diff --git a/src/assets/images/login/logo.png b/src/assets/images/login/logo.png new file mode 100644 index 0000000..3e7dacb Binary files /dev/null and b/src/assets/images/login/logo.png differ diff --git a/src/assets/styles/element-variables.scss b/src/assets/styles/element-variables.scss index 7bf3006..fa18a7e 100644 --- a/src/assets/styles/element-variables.scss +++ b/src/assets/styles/element-variables.scss @@ -1,7 +1,8 @@ -$--color-primary: #1890ff; +// $--color-primary: #1890ff; +$--color-primary: #33a1fa; $--color-success: #13ce66; $--color-warning: #FFBA00; $--color-danger: #ff4949; diff --git a/src/assets/styles/login.scss b/src/assets/styles/login.scss new file mode 100644 index 0000000..2370862 --- /dev/null +++ b/src/assets/styles/login.scss @@ -0,0 +1,80 @@ + .login { + display: flex; + justify-content: space-between; + align-items: center; + height: 100%; + background-size: cover; + } + .login_bg{ + width: 1287px; + height: 100%; + background: url(../assets/images/login/bg-dl.png) no-repeat left top; + background-size: cover; + } + // .title { + // margin: 0 auto 30px auto; + // text-align: center; + // color: #707070; + // } + .login_cont{ + display: flex; + flex: 1; + justify-content: center; + align-items: center; + } + .login_logo{ + display: block; + width: 173px; + height: 33px; + margin: 0 auto 34px auto; + } + .login_form { + background: #ffffff; + width: 340px; + padding: 0 25px; + .el-input { + font-size: 14px; + height: 40px; + input { + height: 40px; + } + } + // .input-icon{ + // height: 39px;width: 14px;margin-left: 2px; + // } + } + .auth_code{ + position: relative; + .login-code { + position: absolute; + right: 0; + top: 0; + width: 33%; + display: inline-block; + height: 40px; + img{ + cursor: pointer; + vertical-align:middle + } + span{ + position: relative; + display: block; + width: 100%; + font-size: 12px; + text-align: center; + line-height: 40px; + color: #33a1fa; + cursor: pointer; + &:before { + content: ""; + position: absolute; + left: 2px; + top: 50%; + width: 1px; + height: 18px; + margin-top: -9px; + background-color: #e2e6ee; + } + } + } + } diff --git a/src/views/forgetPassword.vue b/src/views/forgetPassword.vue index 5a8e7c8..7ff2af6 100644 --- a/src/views/forgetPassword.vue +++ b/src/views/forgetPassword.vue @@ -1,51 +1,30 @@ @@ -79,7 +58,7 @@ export default { } const validatePass2 = (rule, value, callback) => { if (value === '') { - callback(new Error('请再次输入密码')) + callback(new Error('请确认新密码')) } else if (value !== this.modifyForm.password) { callback(new Error('两次输入密码不一致!')) } else { @@ -116,11 +95,9 @@ export default { immediate: true } }, - created() { - }, + created() {}, methods: { - getAuthCode() { - }, + getAuthCode() {}, countdown() { if (this.disabledSendCode) { return @@ -160,13 +137,16 @@ export default { // } if (valid) { this.loading = true - this.$store.dispatch('Login', params).then(() => { - this.loading = false - this.$router.push({ path: this.redirect || '/' }) - }).catch(() => { - this.loading = false - this.getCode() - }) + this.$store + .dispatch('Login', params) + .then(() => { + this.loading = false + this.$router.push({ path: this.redirect || '/' }) + }) + .catch(() => { + this.loading = false + this.getCode() + }) } else { console.log('error submit!!') return false @@ -176,48 +156,51 @@ export default { } } - + diff --git a/src/views/login.vue b/src/views/login.vue index 787389d..8eeb4bf 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -1,55 +1,40 @@ - - +