Skip to content

G
gdtel-gztel-school-center-ui
Commit a7cada7f by 邝钲钞
Options

模糊登陆错误信息，对用户名错误及密码错误均提示”用户名或密码错误，请重新入“

parent 8dd1b0e7
Showing with 265 additions and 240 deletions
src/views/user/Login.vue
...@@ -9,27 +9,37 @@ ...@@ -9,27 +9,37 @@
<a-form-item> <a-form-item>
<a-input <a-input
size="large" size="large"
v-decorator="['username',validatorRules.username,{ validator: this.handleUsernameOrEmail }]" v-decorator="['username',validatorRules.username,{ validator: this.handleUsernameOrEmail }]"
type="text" type="text"
placeholder="请输入帐户名"> placeholder="请输入帐户名">
<a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/> <a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/>
</a-input> </a-input>
</a-form-item> </a-form-item>
<a-form-item>
<a-input
v-decorator="['password',validatorRules.password]"
size="large"
type="password"
autocomplete="false"
placeholder="密码">
<a-icon slot="prefix" type="lock" :style="{ color: 'rgba(0,0,0,.25)' }"/>
</a-input>
</a-form-item>
<a-row :gutter="0"> <a-row :gutter="0">
<a-col :span="14"> <a-col :span="14">
<a-form-item> <a-form-item>
<a-input <a-input
v-decorator="['inputCode',validatorRules.inputCode]" v-decorator="['inputCode',validatorRules.inputCode]"
size="large" size="large"
type="text" type="text"
@change="inputCodeChange" @change="inputCodeChange"
placeholder="请输入验证码"> placeholder="请输入验证码">
<a-icon <a-icon
slot="prefix" slot="prefix"
v-if=" inputCodeContent==verifiedCode " v-if=" inputCodeContent==verifiedCode "
type="smile" type="smile"
:style="{ color: 'rgba(0,0,0,.25)' }"/> :style="{ color: 'rgba(0,0,0,.25)' }"/>
<a-icon slot="prefix" v-else type="frown" :style="{ color: 'rgba(0,0,0,.25)' }"/> <a-icon slot="prefix" v-else type="frown" :style="{ color: 'rgba(0,0,0,.25)' }"/>
</a-input> </a-input>
</a-form-item> </a-form-item>
...@@ -39,82 +49,74 @@ ...@@ -39,82 +49,74 @@
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="0"> <a-row :gutter="0">
<a-col :span="14"> <a-col :span="14">
<a-form-item> <a-form-item>
<a-input <a-input
:disabled="!loginBtn" :disabled="!loginBtn"
v-decorator="['phonecode',validatorRules.phoneCode]" v-decorator="['phonecode',validatorRules.phoneCode]"
size="large" size="large"
type="text" type="text"
placeholder="请输入手机验证码"> placeholder="请输入手机验证码">
<a-icon slot="prefix" type="message" :style="{ color: 'rgba(0,0,0,.25)' }"/> <a-icon slot="prefix" type="message" :style="{ color: 'rgba(0,0,0,.25)' }"/>
</a-input> </a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="10"> <a-col :span="10">
<a-button <a-button
size="small" size="small"
type="primary" type="primary"
htmlType="submit" htmlType="submit"
class="code-button" class="code-button"
@click.stop.prevent="getCode" @click.stop.prevent="getCode"
:disabled="!loginBtn">{{codeMsg}} :disabled="!loginBtn">{{ codeMsg }}
</a-button> </a-button>
<!-- <j-graphic-code @success="generateCode" style="float: right"></j-graphic-code>--> <!-- <j-graphic-code @success="generateCode" style="float: right"></j-graphic-code>-->
</a-col> </a-col>
</a-row> </a-row>
<a-form-item> <div style="top:10px;float: left;font-size: 12px;color: #8b8b8b">
<a-input <a-checkbox v-model="single" disabled></a-checkbox>&nbsp;
:disabled="!loginBtn" 我已阅读<a @click="commitmentSubmit">《用户个人信息保护承诺书》</a>
v-decorator="['password',validatorRules.password]" </div>
size="large" <br/>
type="password" <div class="register">
autocomplete="false" <router-link :to="{path: '/user/register'}">找回密码</router-link>
placeholder="密码"> </div>
<a-icon slot="prefix" type="lock" :style="{ color: 'rgba(0,0,0,.25)' }"/>
</a-input>
</a-form-item>
<div style="top:10px;float: left;font-size: 12px;color: #8b8b8b">
<a-checkbox v-model="single" disabled></a-checkbox>&nbsp;
我已阅读<a @click="commitmentSubmit">《用户个人信息保护承诺书》</a>
</div><br/>
<div class="register"><router-link :to="{path: '/user/register'}">找回密码</router-link></div>
<a-form-item style="margin-top:24vw/@vw"> <a-form-item style="margin-top:24vw/@vw">
<a-button <a-button
size="large" size="large"
type="primary" type="primary"
htmlType="submit" htmlType="submit"
class="login-button" class="login-button"
@click.stop.prevent="handleSubmit" @click.stop.prevent="handleSubmit"
:disabled="!loginBtn">{{buttondata}} :disabled="!loginBtn">{{ buttondata }}
</a-button> </a-button>
</a-form-item> </a-form-item>
</a-form> </a-form>
<two-step-captcha <two-step-captcha
v-if="requiredTwoStepCaptcha" v-if="requiredTwoStepCaptcha"
:visible="stepCaptchaVisible" :visible="stepCaptchaVisible"
@success="stepCaptchaSuccess" @success="stepCaptchaSuccess"
@cancel="stepCaptchaCancel"> @cancel="stepCaptchaCancel">
</two-step-captcha> </two-step-captcha>
<LeakProofModel :v-model="LeakProofModel"></LeakProofModel> <LeakProofModel :v-model="LeakProofModel"></LeakProofModel>
<commitment ref="commitment" :countNum="countNum" @appendData="appendData" v-show="commitment"></commitment> <commitment ref="commitment" :countNum="countNum" @appendData="appendData" v-show="commitment"></commitment>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import TwoStepCaptcha from '@/components/tools/TwoStepCaptcha' import TwoStepCaptcha from '@/components/tools/TwoStepCaptcha'
import {mapActions} from "vuex" import {mapActions} from "vuex"
import { getPhoneCode } from "@/api/login" import {getPhoneCode} from "@/api/login"
import {timeFix} from "@/utils/util" import {timeFix} from "@/utils/util"
import Vue from 'vue' import Vue from 'vue'
import {ACCESS_TOKEN} from "@/store/mutation-types" import {ACCESS_TOKEN} from "@/store/mutation-types"
import JGraphicCode from '@/components/jeecg/JGraphicCode' import JGraphicCode from '@/components/jeecg/JGraphicCode'
import LeakProofModel from '@/views/user/protocol/Leak-proof-model' import LeakProofModel from '@/views/user/protocol/Leak-proof-model'
import commitment from '@/views/user/protocol/commitment' import commitment from '@/views/user/protocol/commitment'
import {setMaxDigits , RSAKeyPair , encryptedString} from '@/utils/RSA' import {setMaxDigits, RSAKeyPair, encryptedString} from '@/utils/RSA'
export default { export default {
...@@ -126,12 +128,12 @@ export default { ...@@ -126,12 +128,12 @@ export default {
}, },
data() { data() {
return { return {
flag:false, flag: false,
LeakProofModel:true, LeakProofModel: true,
commitment:false, commitment: false,
countNum:0, countNum: 0,
single:false, single: false,
buttondata:"登录", buttondata: "登录",
customActiveKey: "tab1", customActiveKey: "tab1",
loginBtn: false, loginBtn: false,
// login type: 0 email, 1 username, 2 telephone // login type: 0 email, 1 username, 2 telephone
...@@ -139,7 +141,7 @@ export default { ...@@ -139,7 +141,7 @@ export default {
requiredTwoStepCaptcha: false, requiredTwoStepCaptcha: false,
stepCaptchaVisible: false, stepCaptchaVisible: false,
form: this.$form.createForm(this), form: this.$form.createForm(this),
updateTime:'', updateTime: '',
formLogin: { formLogin: {
username: "", username: "",
password: "", password: "",
...@@ -186,22 +188,24 @@ export default { ...@@ -186,22 +188,24 @@ export default {
// 验证码60秒倒计时 // 验证码60秒倒计时
if (!this.timer) { if (!this.timer) {
let username = encodeURIComponent(this.getPass(this.formLogin.username)); let username = encodeURIComponent(this.getPass(this.formLogin.username));
let password = encodeURIComponent(this.getPass(this.formLogin.password));
let data = { let data = {
username: username, username: username,
password: password
} }
getPhoneCode(data).then(res => { getPhoneCode(data).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.$notification.success({ this.$notification.success({
message: res.message ? res.message :"发送成功", message: res.message ? res.message : "发送成功",
}); });
return null; return null;
} }
this.$notification.error({ this.$notification.error({
message: res.message ? res.message :"发送错误", message: res.message ? res.message : "发送错误",
}); });
}) })
//初始化倒计时 //初始化倒计时
this.countdown=60; this.countdown = 60;
this.timer = setInterval(() => { this.timer = setInterval(() => {
if (this.countdown > 0 && this.countdown <= 60) { if (this.countdown > 0 && this.countdown <= 60) {
this.countdown--; this.countdown--;
...@@ -222,8 +226,8 @@ export default { ...@@ -222,8 +226,8 @@ export default {
this.single = data.single; this.single = data.single;
this.commitment = data.commitment; this.commitment = data.commitment;
}, },
commitmentSubmit(){ commitmentSubmit() {
if(!this.flag){ if (!this.flag) {
this.countNum = 0; this.countNum = 0;
} }
this.commitment = true; this.commitment = true;
...@@ -231,7 +235,7 @@ export default { ...@@ -231,7 +235,7 @@ export default {
this.$refs.commitment.setTimer(); this.$refs.commitment.setTimer();
}, },
handleSubmit() { handleSubmit() {
if(!this.flag){ if (!this.flag) {
this.commitmentSubmit(); this.commitmentSubmit();
return; return;
} }
...@@ -240,12 +244,12 @@ export default { ...@@ -240,12 +244,12 @@ export default {
smsCode: "xxxx" smsCode: "xxxx"
}; };
// 使用账户密码登陆 // 使用账户密码登陆
that.form.validateFields(['username', 'password', 'inputCode',"phonecode"], {force: true}, (err, values) => { that.form.validateFields(['username', 'password', 'inputCode', "phonecode"], {force: true}, (err, values) => {
if (!err) { if (!err) {
loginParams.username = values.username; loginParams.username = values.username;
loginParams.password = encodeURIComponent(this.getPass(values.password)); loginParams.password = encodeURIComponent(this.getPass(values.password));
loginParams.remember = that.formLogin.remember; loginParams.remember = that.formLogin.remember;
loginParams.phonecode=encodeURIComponent(this.getPass(values.phonecode)); loginParams.phonecode = encodeURIComponent(this.getPass(values.phonecode));
//console.log(loginParams); //console.log(loginParams);
that.Login(loginParams).then((res) => { that.Login(loginParams).then((res) => {
this.updateTime = res.updateTime this.updateTime = res.updateTime
...@@ -258,7 +262,7 @@ export default { ...@@ -258,7 +262,7 @@ export default {
}) })
}, },
//密码加密 //密码加密
getPass(text){ getPass(text) {
/*let keyss = setMaxDigits(130); /*let keyss = setMaxDigits(130);
keyss = new RSAKeyPair("10001","","a5d210338760bdbe2baabef73c410582e812dad8d9669d8c6ebfe026450e5cc10005290f17a0474c7351031edbff81bd8217a518bdf1a02855f53105ead0370e8a9e30b8560feab1d333a0b055b29419476b0eea1ea54315662ddfc46ec066f076e9490ec34c825afad9e44cf38e5ab600f3136acfe3a0ac0e672e2cb8e50371"); keyss = new RSAKeyPair("10001","","a5d210338760bdbe2baabef73c410582e812dad8d9669d8c6ebfe026450e5cc10005290f17a0474c7351031edbff81bd8217a518bdf1a02855f53105ead0370e8a9e30b8560feab1d333a0b055b29419476b0eea1ea54315662ddfc46ec066f076e9490ec34c825afad9e44cf38e5ab600f3136acfe3a0ac0e672e2cb8e50371");
let password = encryptedString(keyss,text);*/ let password = encryptedString(keyss,text);*/
...@@ -313,15 +317,15 @@ export default { ...@@ -313,15 +317,15 @@ export default {
if (!value || this.verifiedCode == this.inputCodeContent) { if (!value || this.verifiedCode == this.inputCodeContent) {
callback(); callback();
} else { } else {
this.loginBtn=false this.loginBtn = false
callback("您输入的验证码不正确!"); callback("您输入的验证码不正确!");
} }
}, },
validatephoneCode(rule, value, callback){ validatephoneCode(rule, value, callback) {
callback(); callback();
}, },
generateCode(value) { generateCode(value) {
this.loginBtn=false; this.loginBtn = false;
this.verifiedCode = value.toLowerCase() this.verifiedCode = value.toLowerCase()
}, },
inputCodeChange(e) { inputCodeChange(e) {
...@@ -335,15 +339,15 @@ export default { ...@@ -335,15 +339,15 @@ export default {
if (this.verifiedCode == this.inputCodeContent) { if (this.verifiedCode == this.inputCodeContent) {
this.form.validateFields(['username'], {force: true}, (err, values) => { this.form.validateFields(['username'], {force: true}, (err, values) => {
if (!err&&this.countdown==0) { if (!err && this.countdown == 0) {
clearInterval(this.timer); clearInterval(this.timer);
this.codeMsg = "获取验证码"; this.codeMsg = "获取验证码";
this.countdown = 60; this.countdown = 60;
this.timer = null; this.timer = null;
this.formLogin.username=values.username this.formLogin.username = values.username
this.getCode() this.getCode()
} }
this.loginBtn=true this.loginBtn = true
}) })
} }
}, },
...@@ -363,168 +367,189 @@ export default { ...@@ -363,168 +367,189 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/less/style'; @import '~@/assets/less/style';
.main{
.code-button{ .main {
width:calc(100% - 10vw/@vw);
height:68vw/@vw; .code-button {
margin-left: 10vw/@vw; width: calc(100% - 10vw / @vw);
background:#e6e6e6; height: 68vw / @vw;
/*border-radius:40vw/@vw;*/ margin-left: 10vw / @vw;
font-size:24vw/@vw; background: #e6e6e6;
font-family:PingFang SC; /*border-radius:40vw/@vw;*/
font-weight:bold; font-size: 24vw / @vw;
color:#adadad; font-family: PingFang SC;
} font-weight: bold;
.caption{ color: #adadad;
width: 666vw/@vw; }
height: 792vw/@vw;
background: url("~@/assets/bg_content_new.jpg") no-repeat center; .caption {
background-size: cover; width: 666vw / @vw;
float: left; height: 792vw / @vw;
} background: url("~@/assets/bg_content_new.jpg") no-repeat center;
.register{ background-size: cover;
margin-bottom: 10vw/@vw; float: left;
font-size: 12px; }
width: 50px;
} .register {
.form{ margin-bottom: 10vw / @vw;
width: calc(100% - 666vw/@vw); font-size: 12px;
height: 792vw/@vw; width: 50px;
padding:80vw/@vw 80vw/@vw 0 60vw/@vw; }
box-sizing: border-box;
float:left; .form {
.form_title{ width: calc(100% - 666vw / @vw);
font-size:40vw/@vw; height: 792vw / @vw;
font-family:PingFang SC; padding: 80vw / @vw 80vw / @vw 0 60vw / @vw;
font-weight:500; box-sizing: border-box;
color:rgba(51,51,51,1); float: left;
display: inline-block;
height: 55vw/@vw; .form_title {
margin: 25vw/@vw 0vw/@vw 50vw/@vw 0; font-size: 40vw / @vw;
border-bottom: 6vw/@vw solid #57bbff; font-family: PingFang SC;
} font-weight: 500;
/deep/ .ant-form-item{ color: rgba(51, 51, 51, 1);
margin-bottom: 24vw/@vw; display: inline-block;
} height: 55vw / @vw;
@media (min-width: 1920px) { margin: 25vw / @vw 0vw / @vw 50vw / @vw 0;
/deep/.ant-input-affix-wrapper .ant-input-prefix{ border-bottom: 6vw / @vw solid #57bbff;
font-size: 22vw/@vw; }
top: 38% !important;
} /deep/ .ant-form-item {
} margin-bottom: 24vw / @vw;
@media (min-width: 1400px) { }
/deep/.ant-input-affix-wrapper .ant-input-prefix{
font-size: 22vw/@vw; @media (min-width: 1920px) {
top: 40.5% !important; /deep/ .ant-input-affix-wrapper .ant-input-prefix {
} font-size: 22vw / @vw;
} top: 38% !important;
/deep/.ant-input-affix-wrapper .ant-input-prefix{
font-size: 22vw/@vw;
top: 39%;
}
/deep/ .user-layout-login div .ant-input{
width:100%;
height:68vw/@vw;
margin-bottom: 15vw/@vw;
padding-left: 44vw/@vw;
background:rgba(245,245,245,1);
border:1vw/@vw solid rgba(221,221,221,1);
opacity:0.5;
border-radius:4vw/@vw;
&::-webkit-input-placeholder {
font-size:24vw/@vw;
font-family:PingFang SC;
font-weight:500;
color:#333;
line-height:88vw/@vw;
}
&::-moz-placeholder {
font-size:24vw/@vw;
font-family:PingFang SC;
font-weight:500;
color:#333;
line-height:88vw/@vw;
}
&:-ms-input-placeholder {
font-size:24vw/@vw;
font-family:PingFang SC;
font-weight:500;
color:#333;
line-height:88vw/@vw;
}
}
/deep/ #gc-canvas{
height: 67vw/@vw;
}
/deep/ .user-layout-login button.login-button{
width:595vw/@vw;
height:80vw/@vw;
background:rgba(87,148,255,1);
border-radius:40vw/@vw;
font-size:36vw/@vw;
font-family:PingFang SC;
font-weight:bold;
color:rgba(255,255,255,1);
}
}
} }
}
/*.user-layout-login { @media (min-width: 1400px) {
margin-top: 20px; /deep/ .ant-input-affix-wrapper .ant-input-prefix {
font-size: 22vw / @vw;
top: 40.5% !important;
}
}
label { /deep/ .ant-input-affix-wrapper .ant-input-prefix {
font-size: 14px; font-size: 22vw / @vw;
} top: 39%;
}
.getCaptcha { /deep/ .user-layout-login div .ant-input {
display: block; width: 100%;
width: 100%; height: 68vw / @vw;
height: 40px; margin-bottom: 15vw / @vw;
} padding-left: 44vw / @vw;
background: rgba(245, 245, 245, 1);
border: 1vw / @vw solid rgba(221, 221, 221, 1);
opacity: 0.5;
border-radius: 4vw / @vw;
.forge-password { &
font-size: 14px; ::-webkit-input-placeholder {
} font-size: 24vw / @vw;
font-family: PingFang SC;
font-weight: 500;
color: #333;
line-height: 88vw / @vw;
}
button.login-button { &
padding: 0 15px; ::-moz-placeholder {
font-size: 16px; font-size: 24vw / @vw;
height: 40px; font-family: PingFang SC;
width: 100%; font-weight: 500;
} color: #333;
line-height: 88vw / @vw;
}
.user-login-other { &
text-align: left; :-ms-input-placeholder {
margin-top: 24px; font-size: 24vw / @vw;
line-height: 22px; font-family: PingFang SC;
font-weight: 500;
.item-icon { color: #333;
font-size: 24px; line-height: 88vw / @vw;
color: rgba(0, 0, 0, .2); }
margin-left: 16px;
vertical-align: middle; }
cursor: pointer; /deep/ #gc-canvas {
transition: color .3s; height: 67vw / @vw;
}
&:hover {
color: #1890ff;
}
}
.register { /deep/ .user-layout-login button.login-button {
float: right; width: 595vw / @vw;
height: 80vw / @vw;
background: rgba(87, 148, 255, 1);
border-radius: 40vw / @vw;
font-size: 36vw / @vw;
font-family: PingFang SC;
font-weight: bold;
color: rgba(255, 255, 255, 1);
}
}
}
/*.user-layout-login {
margin-top: 20px;
label {
font-size: 14px;
}
.getCaptcha {
display: block;
width: 100%;
height: 40px;
}
.forge-password {
font-size: 14px;
}
button.login-button {
padding: 0 15px;
font-size: 16px;
height: 40px;
width: 100%;
}
.user-login-other {
text-align: left;
margin-top: 24px;
line-height: 22px;
.item-icon {
font-size: 24px;
color: rgba(0, 0, 0, .2);
margin-left: 16px;
vertical-align: middle;
cursor: pointer;
transition: color .3s;
&:hover {
color: #1890ff;
} }
} }
}*/
.register {
float: right;
}
}
}*/
</style> </style>
<style> <style>
.valid-error .ant-select-selection__placeholder { .valid-error .ant-select-selection__placeholder {
color: #f5222d; color: #f5222d;
} }
.ant-modal-wrap{
top:10% .ant-modal-wrap {
} top: 10%
}
</style> </style>
yarn.lock
This source diff could not be displayed because it is too large. You can view the blob instead.
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