From 1b5a269b7ff771d8d5d26547f2ddac7f5b8aa759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0?= <15071126431@163.com> Date: Wed, 28 Apr 2021 10:23:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/main.css | 6 +- src/components/page/Login.vue | 143 ++++++++++++++++++++-------------- 2 files changed, 86 insertions(+), 63 deletions(-) diff --git a/src/assets/css/main.css b/src/assets/css/main.css index e223972..a376d9d 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -224,7 +224,7 @@ li { opacity: 0; } .ms-login .el-tabs__item{ - padding: 0 90px; + padding: 0 20px; color: #999; } .ms-login .el-tabs__item:hover{ @@ -243,12 +243,12 @@ li { justify-content: center; } -.ms-login .el-input__inner{ +/* .ms-login .el-input__inner{ height: 80px; line-height: 80px; border:1px solid rgba(220,220,220,1); border-radius:2px; -} +} */ .header_tab .el-tabs__nav-wrap::after{ background-color: #fff; diff --git a/src/components/page/Login.vue b/src/components/page/Login.vue index c7ae14f..ae93a8e 100644 --- a/src/components/page/Login.vue +++ b/src/components/page/Login.vue @@ -27,40 +27,48 @@
-
-

账号登录

- - -

用户名

- - - -

密码

- - - - 登录 -
- 前往注册 - 忘记密码？ -
- - +
+ + + + + + + + + + + 登录 + + + + + + + + + + + + + 登录 + + + +
+ 前往注册 + 忘记密码？ +
@@ -74,7 +82,8 @@ 取 消 - 确 定 + 确 定 + 确 定 @@ -130,6 +139,7 @@ import register from './RegisterForm'; export default { data: function() { return { + activeName: '0', isReg: false, loginForm: { // username: '18818574533', @@ -140,6 +150,14 @@ export default { username: [{ required: true, message: '请输入用户名', trigger: 'blur' }], password: [{ required: true, message: '请输入密码', trigger: 'blur' }], }, + phoneParam: { + userphone: '', + phonePassword: '' + }, + phoneRules: { + userphone: [{ required: true, message: '请输入手机号/邮箱', trigger: 'blur' }], + phonePassword: [{ required: true, message: '请输入密码', trigger: 'blur' }], + }, roleDialog: false, userId: '', schoolId: '', @@ -174,13 +192,14 @@ export default { }) }, methods: { - getSchool() { - this.$refs.login.validate(valid => { + getSchool(form) { + this.$refs[form].validate(valid => { if (valid) { let data = { - account: this.loginForm.username, - password: this.loginForm.password, - schoolId: 2105 + account: this.activeName == '0' ? this.loginForm.username : this.phoneParam.userphone, + password: this.activeName == '0' ? this.loginForm.password : this.phoneParam.phonePassword, + schoolId: 2105, + source: this.activeName }; this.$get(this.api.loginSchool, data) .then(res => { @@ -194,7 +213,7 @@ export default { this.schoolId = this.schoolList[0].schoolId this.userId = this.schoolList[0].userId this.studentId = this.schoolList[0].studentId - this.getRole() + this.getRole(form) }else{ this.$message.error('账号不存在') } @@ -206,7 +225,7 @@ export default { } }); }, - getRole() { + getRole(form) { // this.userId = this.schoolList.find((n,k) => { // return n.schoolId == this.schoolId // }).userId @@ -236,10 +255,12 @@ export default { } }) if(this.roleList.length > 1) { + console.log('role:true') this.roleDialog = true }else{ + console.log('role:false') this.roleId = this.roleList[0].roleId - this.submitForm() + this.submitForm(form) } }) .catch(res => {}); @@ -248,15 +269,15 @@ export default { this.loginForm.username = data.username this.loginForm.password = data.password }, - roleSure(){ + roleSure(form){ if(this.roleId){ - this.submitForm() + this.submitForm(form) }else{ this.$message.error('请选择角色！'); } }, - submitForm() { - this.$refs.login.validate(valid => { + submitForm(form) { + this.$refs[form].validate(valid => { if (valid) { let data = { roleId: this.roleId, @@ -524,25 +545,14 @@ export default { .submit{ width: 100%; height: 48px; - margin-top: 60px; + margin-top: 40px; line-height: 48px; padding: 0; - font-size: 20px; + font-size: 18px; background-color: #9278ff; border-radius: 6px; border: 0; } - .links{ - margin: 20px 0 20px; - } - .ques{ - color: #9278ff; - font-size: 14px; - } - .forget{ - color: #ffa94e; - font-size: 14px; - } .login-tips{ margin-bottom: 20px; font-size: 16px; @@ -576,4 +586,17 @@ export default { color: #9076FF; } } + .links{ + width: 70%; + margin-left: 15%; + margin-top: 20px; + } + .ques{ + color: #9278ff; + font-size: 14px; + } + .forget{ + color: #ffa94e; + font-size: 14px; + } \ No newline at end of file