提交 69a4a7df 编写于 作者: JEECG低代码平台's avatar JEECG低代码平台

重构登录注册页面为a-form-model模式

上级 649f9966
<template>
<div class="main">
<a-form :form="form" class="user-layout-login" ref="formLogin" id="formLogin">
<a-tabs
:activeKey="customActiveKey"
:tabBarStyle="{ textAlign: 'center', borderBottom: 'unset' }"
@change="handleTabClick">
<a-form-model ref="form" :model="model" :rules="validatorRules" class="user-layout-login">
<a-tabs :activeKey="customActiveKey" :tabBarStyle="{ textAlign: 'center', borderBottom: 'unset' }" @change="handleTabClick">
<a-tab-pane key="tab1" tab="账号密码登录">
<a-form-item>
<a-input
size="large"
v-decorator="['username',validatorRules.username,{ validator: this.handleUsernameOrEmail }]"
type="text"
placeholder="请输入帐户名 / admin">
<a-form-model-item required prop="username">
<a-input v-model="model.username" size="large" placeholder="请输入帐户名 / admin">
<a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/>
</a-input>
</a-form-item>
<a-form-item>
<a-input
v-decorator="['password',validatorRules.password]"
size="large"
type="password"
autocomplete="false"
placeholder="密码 / 123456">
</a-form-model-item>
<a-form-model-item required prop="password">
<a-input v-model="model.password" size="large" type="password" autocomplete="false" placeholder="请输入密码 / 123456">
<a-icon slot="prefix" type="lock" :style="{ color: 'rgba(0,0,0,.25)' }"/>
</a-input>
</a-form-item>
</a-form-model-item>
<a-row :gutter="0">
<a-col :span="16">
<a-form-item>
<a-input
v-decorator="['inputCode',validatorRules.inputCode]"
size="large"
type="text"
@change="inputCodeChange"
placeholder="请输入验证码">
<a-form-model-item required prop="inputCode">
<a-input v-model="model.inputCode" size="large" type="text" placeholder="请输入验证码">
<a-icon slot="prefix" type="smile" :style="{ color: 'rgba(0,0,0,.25)' }"/>
</a-input>
</a-form-item>
</a-form-model-item>
</a-col>
<a-col :span="8" style="text-align: right">
<img v-if="requestCodeSuccess" style="margin-top: 2px;" :src="randCodeImage" @click="handleChangeCheckCode"/>
<img v-else style="margin-top: 2px;" src="../../assets/checkcode.png" @click="handleChangeCheckCode"/>
</a-col>
</a-row>
</a-tab-pane>
<a-tab-pane key="tab2" tab="手机号登录">
<a-form-item>
<a-input
v-decorator="['mobile',validatorRules.mobile]"
size="large"
type="text"
placeholder="手机号">
<a-form-model-item required prop="mobile">
<a-input v-model="model.mobile" size="large" type="text" placeholder="请输入手机号">
<a-icon slot="prefix" type="mobile" :style="{ color: 'rgba(0,0,0,.25)' }"/>
</a-input>
</a-form-item>
</a-form-model-item>
<a-row :gutter="16">
<a-col class="gutter-row" :span="16">
<a-form-item>
<a-input
v-decorator="['captcha',validatorRules.captcha]"
size="large"
type="text"
placeholder="请输入验证码">
<a-form-model-item required prop="captcha">
<a-input v-model="model.captcha" size="large" type="text" placeholder="请输入验证码">
<a-icon slot="prefix" type="mail" :style="{ color: 'rgba(0,0,0,.25)' }"/>
</a-input>
</a-form-item>
</a-form-model-item>
</a-col>
<a-col class="gutter-row" :span="8">
<a-button
......@@ -81,55 +53,42 @@
</a-col>
</a-row>
</a-tab-pane>
</a-tabs>
<a-form-item>
<a-checkbox v-decorator="['rememberMe', {initialValue: true, valuePropName: 'checked'}]" >自动登录</a-checkbox>
<a-form-model-item>
<a-checkbox @change="handleRememberMeChange" default-checked>自动登录</a-checkbox>
<router-link :to="{ name: 'alteration'}" class="forge-password" style="float: right;">
忘记密码
</router-link>
<router-link :to="{ name: 'register'}" class="forge-password" style="float: right;margin-right: 10px" >
<router-link :to="{ name: 'register'}" class="forge-password" style="float: right;margin-right: 10px" >
注册账户
</router-link>
</a-form-item>
</a-form-model-item>
<a-form-item style="margin-top:24px">
<a-button
size="large"
type="primary"
htmlType="submit"
class="login-button"
:loading="loginBtn"
@click.stop.prevent="handleSubmit"
:disabled="loginBtn">确定
</a-button>
<a-button size="large" type="primary" htmlType="submit" class="login-button" :loading="loginBtn" @click.stop.prevent="handleSubmit" :disabled="loginBtn">确定</a-button>
</a-form-item>
</a-form>
<two-step-captcha
v-if="requiredTwoStepCaptcha"
:visible="stepCaptchaVisible"
@success="stepCaptchaSuccess"
@cancel="stepCaptchaCancel"></two-step-captcha>
</a-form-model>
<two-step-captcha v-if="requiredTwoStepCaptcha" :visible="stepCaptchaVisible" @success="stepCaptchaSuccess" @cancel="stepCaptchaCancel"></two-step-captcha>
<login-select-tenant ref="loginSelect" @success="loginSelectOk"></login-select-tenant>
<third-login ref="thirdLogin"></third-login>
</div>
</template>
<script>
//import md5 from "md5"
import api from '@/api'
import TwoStepCaptcha from '@/components/tools/TwoStepCaptcha'
import { mapActions } from "vuex"
import { timeFix } from "@/utils/util"
import { postAction, getAction } from '@/api/manage'
import Vue from 'vue'
import { ACCESS_TOKEN ,ENCRYPTED_STRING} from "@/store/mutation-types"
import { putAction,postAction,getAction } from '@/api/manage'
import { encryption , getEncryptedString } from '@/utils/encryption/aesEncrypt'
import store from '@/store/'
import { USER_INFO } from "@/store/mutation-types"
import { mapActions } from "vuex"
import ThirdLogin from './third/ThirdLogin'
import LoginSelectTenant from "./LoginSelectTenant";
import LoginSelectTenant from "./LoginSelectTenant"
import TwoStepCaptcha from '@/components/tools/TwoStepCaptcha'
import { encryption , getEncryptedString } from '@/utils/encryption/aesEncrypt'
import { timeFix } from "@/utils/util"
export default {
components: {
LoginSelectTenant,
......@@ -138,49 +97,61 @@
},
data () {
return {
customActiveKey: "tab1",
loginBtn: false,
// login type: 0 email, 1 username, 2 telephone
model: {
username:'',
password:'',
inputCode: ''
},
loginType: 0,
validatorRules:{
username: [
{ required: true, message: '请输入用户名!' },
{ validator: this.handleUsernameOrEmail }
],
password: [{
required: true, message: '请输入密码!', validator: 'click'
}],
inputCode: [{
required: true, message: '请输入验证码!'
}],
mobile: [
{ required: true, message: '请输入手机号码!' },
{ validator: this.validateMobile }
],
captcha: [{
required: true, message: '请输入验证码!'
}]
},
customActiveKey: 'tab1',
requestCodeSuccess: false,
randCodeImage: '',
currdatetime: '',
loginBtn: false,
requiredTwoStepCaptcha: false,
stepCaptchaVisible: false,
form: this.$form.createForm(this),
encryptedString:{
key:"",
iv:"",
},
//手机号登录用
state: {
time: 60,
smsSendBtn: false,
},
validatorRules:{
username:{rules: [{ required: true, message: '请输入用户名!'},{validator: this.handleUsernameOrEmail}]},
password:{rules: [{ required: true, message: '请输入密码!',validator: 'click'}]},
mobile:{rules: [{validator:this.validateMobile}]},
captcha:{rule: [{ required: true, message: '请输入验证码!'}]},
inputCode:{rules: [{ required: true, message: '请输入验证码!'}]}
encryptedString:{
key:"",
iv:"",
},
verifiedCode:"",
inputCodeContent:"",
inputCodeNull:true,
currentUsername:"",
currdatetime:'',
randCodeImage:'',
requestCodeSuccess:false,
}
},
created () {
created() {
this.currdatetime = new Date().getTime();
this.model.rememberMe = true
Vue.ls.remove(ACCESS_TOKEN)
this.getRouterData();
this.handleChangeCheckCode();
// update-begin- --- author:scott ------ date:20190805 ---- for:密码加密逻辑暂时注释掉,有点问题
//this.getEncrypte();
// update-end- --- author:scott ------ date:20190805 ---- for:密码加密逻辑暂时注释掉,有点问题
},
methods: {
methods:{
...mapActions(['Login', 'Logout', 'PhoneLogin']),
// handler
handleTabClick(key){
this.customActiveKey = key
},
handleUsernameOrEmail (rule, value, callback) {
const regex = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+((\.[a-zA-Z0-9_-]{2,3}){1,2})$/;
if (regex.test(value)) {
......@@ -190,65 +161,155 @@
}
callback()
},
handleTabClick (key) {
this.customActiveKey = key
// this.form.resetFields()
/**刷新验证码*/
handleChangeCheckCode(){
this.currdatetime = new Date().getTime();
this.model.inputCode = ''
getAction(`/sys/randomImage/${this.currdatetime}`).then(res=>{
if(res.success){
this.randCodeImage = res.result
this.requestCodeSuccess=true
}else{
this.$message.error(res.message)
this.requestCodeSuccess=false
}
}).catch(()=>{
this.requestCodeSuccess=false
})
},
/**跳转到登录页面的参数-账号获取*/
getRouterData(){
this.$nextTick(() => {
let temp = this.$route.params.username || this.$route.query.username || ''
if (temp) {
this.model['username'] = temp
}
})
},
handleRememberMeChange(e){
this.model.rememberMe = e.target.checked
},
//登录
handleSubmit () {
let that = this
let loginParams = {};
that.loginBtn = true;
// 使用账户密码登录
if (that.customActiveKey === 'tab1') {
that.form.validateFields([ 'username', 'password','inputCode', 'rememberMe' ], { force: true }, (err, values) => {
if (!err) {
loginParams.username = values.username
// update-begin- --- author:scott ------ date:20190805 ---- for:密码加密逻辑暂时注释掉,有点问题
//loginParams.password = md5(values.password)
//loginParams.password = encryption(values.password,that.encryptedString.key,that.encryptedString.iv)
loginParams.password = values.password
loginParams.remember_me = values.rememberMe
// update-begin- --- author:scott ------ date:20190805 ---- for:密码加密逻辑暂时注释掉,有点问题
loginParams.captcha = that.inputCodeContent
loginParams.checkKey = that.currdatetime
console.log("登录参数",loginParams)
that.Login(loginParams).then((res) => {
this.$refs.loginSelect.show(res.result)
}).catch((err) => {
that.requestFailed(err);
});
}else {
that.loginBtn = false;
}
})
// 使用手机号登录
this.loginByUsername();
} else {
that.form.validateFields([ 'mobile', 'captcha', 'rememberMe' ], { force: true }, (err, values) => {
if (!err) {
loginParams.mobile = values.mobile
loginParams.captcha = values.captcha
loginParams.remember_me = values.rememberMe
that.PhoneLogin(loginParams).then((res) => {
console.log(res.result);
this.$refs.loginSelect.show(res.result)
}).catch((err) => {
that.requestFailed(err);
})
this.loginByPhone()
}
},
/**
* 验证字段
* @param arr
* @param callback
*/
validateFields(arr, callback){
let promiseArray = []
for(let item of arr){
let p = new Promise((resolve, reject) => {
this.$refs['form'].validateField(item, (err)=>{
if(!err){
resolve();
}else{
reject(err);
}
})
});
promiseArray.push(p)
}
Promise.all(promiseArray).then(()=>{
callback()
}).catch(err=>{
callback(err)
})
},
//账号密码登录
loginByUsername(){
this.validateFields([ 'username', 'password', 'inputCode' ], (err)=>{
if(!err){
let loginParams = {
username: this.model.username,
password: this.model.password,
remember_me: this.model.rememberMe,
captcha: this.model.inputCode,
checkKey: this.currdatetime
}
})
console.log("登录参数", loginParams)
this.Login(loginParams).then((res) => {
this.$refs.loginSelect.show(res.result)
}).catch((err) => {
this.requestFailed(err);
});
}else{
this.loginBtn = false;
}
})
},
//手机号码登录
loginByPhone(){
this.validateFields([ 'mobile', 'captcha' ], (err) => {
if (!err) {
let loginParams = {
mobile: this.model.mobile,
captcha: this.model.captcha,
remember_me: this.model.rememberMe
}
console.log("登录参数", loginParams)
this.PhoneLogin(loginParams).then((res) => {
console.log(res.result);
this.$refs.loginSelect.show(res.result)
}).catch((err) => {
this.requestFailed(err);
})
}else{
this.loginBtn = false;
}
})
},
//登录后台失败
requestFailed (err) {
let description = ((err.response || {}).data || {}).message || err.message || "请求出现错误,请稍后再试"
this.$notification[ 'error' ]({
message: '登录失败',
description: description,
duration: 4,
});
//密码错误后更新验证码
if(description.indexOf('密码错误')>0){
this.handleChangeCheckCode();
}
this.loginBtn = false;
},
loginSelectOk(){
this.loginSuccess()
},
//登录成功
loginSuccess () {
this.$router.push({ path: "/dashboard/analysis" }).catch(()=>{
console.log('登录跳转首页出错,这个错误从哪里来的')
})
this.$notification.success({
message: '欢迎',
description: `${timeFix()},欢迎回来`,
});
},
validateMobile(rule,value,callback){
if (!value || new RegExp(/^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/).test(value)){
callback();
}else{
callback("您的手机号码格式不正确!");
}
},
//获取验证码
getCaptcha (e) {
e.preventDefault();
let that = this;
this.form.validateFields([ 'mobile' ], { force: true },(err,values) => {
if(!values.mobile){
that.cmsFailed("请输入手机号");
}else if (!err) {
this.state.smsSendBtn = true;
that.validateFields([ 'mobile' ], (err) => {
if (!err) {
that.state.smsSendBtn = true;
let interval = window.setInterval(() => {
if (that.state.time-- <= 0) {
that.state.time = 60;
......@@ -257,15 +318,15 @@
}
}, 1000);
const hide = this.$message.loading('验证码发送中..', 0);
const hide = that.$message.loading('验证码发送中..', 0);
let smsParams = {};
smsParams.mobile=values.mobile;
smsParams.smsmode="0";
smsParams.mobile=that.model.mobile;
smsParams.smsmode="0";
postAction("/sys/sms",smsParams)
.then(res => {
if(!res.success){
setTimeout(hide, 0);
this.cmsFailed(res.message);
that.cmsFailed(res.message);
}
console.log(res);
setTimeout(hide, 500);
......@@ -275,12 +336,19 @@
clearInterval(interval);
that.state.time = 60;
that.state.smsSendBtn = false;
this.requestFailed(err);
that.requestFailed(err);
});
}
}
);
},
cmsFailed(err){
this.$notification[ 'error' ]({
message: '登录失败',
description:err,
duration: 4,
});
},
stepCaptchaSuccess () {
this.loginSuccess()
},
......@@ -290,112 +358,34 @@
this.stepCaptchaVisible = false
})
},
handleChangeCheckCode(){
this.form.setFieldsValue({inputCode: ''});
this.currdatetime = new Date().getTime();
getAction(`/sys/randomImage/${this.currdatetime}`).then(res=>{
if(res.success){
this.randCodeImage = res.result
this.requestCodeSuccess=true
}else{
this.$message.error(res.message)
this.requestCodeSuccess=false
}
}).catch(()=>{
this.requestCodeSuccess=false
})
},
loginSuccess () {
this.$router.push({ path: "/dashboard/analysis" }).catch(()=>{
console.log('登录跳转首页出错,这个错误从哪里来的')
})
this.$notification.success({
message: '欢迎',
description: `${timeFix()},欢迎回来`,
});
},
cmsFailed(err){
this.$notification[ 'error' ]({
message: "登录失败",
description:err,
duration: 4,
});
},
requestFailed (err) {
let errMsg=((err.response || {}).data || {}).message || err.message || "请求出现错误,请稍后再试";
this.$notification[ 'error' ]({
message: '登录失败',
description: errMsg,
duration: 4,
});
//密码错误后更新验证码
if(errMsg.indexOf('密码错误')>0){
this.handleChangeCheckCode();
}
this.loginBtn = false;
},
validateMobile(rule,value,callback){
if (!value || new RegExp(/^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/).test(value)){
callback();
}else{
callback("您的手机号码格式不正确!");
}
},
validateInputCode(rule,value,callback){
if(!value || this.verifiedCode==this.inputCodeContent){
callback();
}else{
callback("您输入的验证码不正确!");
}
},
generateCode(value){
this.verifiedCode = value.toLowerCase()
},
inputCodeChange(e){
this.inputCodeContent = e.target.value
},
loginSelectOk(){
this.loginSuccess()
},
getRouterData(){
this.$nextTick(() => {
if (this.$route.params.username) {
this.form.setFieldsValue({
'username': this.$route.params.username
//获取密码加密规则
getEncrypte(){
var encryptedString = Vue.ls.get(ENCRYPTED_STRING);
if(encryptedString == null){
getEncryptedString().then((data) => {
this.encryptedString = data
});
}else{
this.encryptedString = encryptedString;
}
})
},
//获取密码加密规则
getEncrypte(){
var encryptedString = Vue.ls.get(ENCRYPTED_STRING);
if(encryptedString == null){
getEncryptedString().then((data) => {
this.encryptedString = data
});
}else{
this.encryptedString = encryptedString;
}
},
}
}
</script>
<style lang="less" scoped>
.user-layout-login {
label {
font-size: 14px;
}
.getCaptcha {
.getCaptcha {
display: block;
width: 100%;
height: 40px;
}
.forge-password {
.forge-password {
font-size: 14px;
}
......@@ -406,12 +396,12 @@
width: 100%;
}
.user-login-other {
.user-login-other {
text-align: left;
margin-top: 24px;
line-height: 22px;
.item-icon {
.item-icon {
font-size: 24px;
color: rgba(0,0,0,.2);
margin-left: 16px;
......@@ -419,17 +409,16 @@
cursor: pointer;
transition: color .3s;
&:hover {
&:hover {
color: #1890ff;
}
}
.register {
.register {
float: right;
}
}
}
</style>
<style>
.valid-error .ant-select-selection__placeholder{
......
......@@ -10,8 +10,8 @@
<a-button type="primary" @click="selectOk">确认</a-button>
</template>
<a-form>
<a-form-item v-if="isMultiTenant" :labelCol="{span:4}" :wrapperCol="{span:20}" style="margin-bottom:10px" :validate-status="validate_status1">
<a-form-model>
<a-form-model-item v-if="isMultiTenant" :labelCol="{span:4}" :wrapperCol="{span:20}" style="margin-bottom:10px" :validate-status="validate_status1">
<a-tooltip placement="topLeft" >
<template slot="title">
<span>您有多个租户,请选择登录租户</span>
......@@ -25,10 +25,10 @@
{{ d.name }}
</a-select-option>
</a-select>
</a-form-item>
</a-form-model-item>
<a-form-item v-if="isMultiDepart" :labelCol="{span:4}" :wrapperCol="{span:20}" style="margin-bottom:10px" :validate-status="validate_status2">
<a-form-model-item v-if="isMultiDepart" :labelCol="{span:4}" :wrapperCol="{span:20}" style="margin-bottom:10px" :validate-status="validate_status2">
<a-tooltip placement="topLeft" >
<template slot="title">
<span>您有多个部门,请选择登录部门</span>
......@@ -42,9 +42,9 @@
{{ d.departName }}
</a-select-option>
</a-select>
</a-form-item>
</a-form-model-item>
</a-form>
</a-form-model>
</a-modal>
</template>
......
......@@ -2,7 +2,7 @@
<a-card :bordered="false" style="width: 130%;text-align: center;margin-left:-10%">
<a-steps class="steps" :current="currentTab">
<a-step title="手机验证"/>
<a-step title="密码"/>
<a-step title="更改密码"/>
<a-step title="完成"/>
</a-steps>
<div class="content">
......@@ -14,7 +14,6 @@
</template>
<script>
import Step1 from './Step1'
import Step2 from './Step2'
import Step3 from './Step3'
import Step4 from './Step4'
......@@ -22,7 +21,6 @@
export default {
name: "Alteration",
components: {
Step1,
Step2,
Step3,
Step4
......@@ -63,4 +61,12 @@
max-width: 750px;
margin: 16px auto;
}
</style>
\ No newline at end of file
/deep/ .password-retrieval-form{
max-width: 500px;
margin: 40px auto 0;
.ant-form-explain{
text-align: left;
}
}
</style>
<template>
<div>
<a-form :form="form" style="max-width: 500px; margin: 40px auto 0;" @keyup.enter.native="nextStep">
<a-form-item
label="手机"
:labelCol="{span: 5}"
:wrapperCol="{span: 19}"
>
<a-input
type="text"
autocomplete="false"
style="width:310px;margin-left:-10px"
v-decorator="['phone',{ rules: validatorRules.phone.rule}]"
placeholder="请输入手机号">
<a-icon slot="prefix" type="phone" :style="{ color: 'rgba(0,0,0,.25)'}"/>
</a-input>
</a-form-item>
<a-form-item
label="验证码"
:labelCol="{span: 5}"
:wrapperCol="{span: 19}"
v-if="show">
<a-row :gutter="16" style="margin-left: 2px">
<a-form-model ref="form" :model="model" :rules="validatorRules" class="password-retrieval-form" @keyup.enter.native="nextStep">
<a-form-model-item label="手机" required prop="phone" :labelCol="{span: 5}" :wrapperCol="{span: 19}">
<a-row :gutter="16">
<a-col class="gutter-row" :span="20">
<a-input v-model="model.phone" type="text" autocomplete="false" placeholder="请输入手机号">
<a-icon slot="prefix" type="phone" :style="{ color: 'rgba(0,0,0,.25)'}"/>
</a-input>
</a-col>
</a-row>
</a-form-model-item>
<a-form-model-item v-if="show" required prop="captcha" label="验证码" :labelCol="{span: 5}" :wrapperCol="{span: 19}">
<a-row :gutter="16">
<a-col class="gutter-row" :span="12">
<a-input
v-decorator="['captcha',validatorRules.captcha]"
type="text"
placeholder="手机短信验证码">
<a-input v-model="model.captcha" type="text" placeholder="手机短信验证码">
<a-icon slot="prefix" type="code" :style="{ color: 'rgba(0,0,0,.25)'}"/>
</a-input>
</a-col>
<a-col class="gutter-row" :span="8">
......@@ -37,12 +26,12 @@
v-text="!state.smsSendBtn && '获取验证码' || (state.time+' s')"></a-button>
</a-col>
</a-row>
</a-form-item>
<a-form-item :wrapperCol="{span: 19, offset: 5}">
</a-form-model-item>
<a-form-model-item :wrapperCol="{span: 19, offset: 5}">
<router-link style="float: left;line-height: 40px;" :to="{ name: 'login' }">使用已有账户登录</router-link>
<a-button type="primary" @click="nextStep" style="margin-left: 20px">下一步</a-button>
</a-form-item>
</a-form>
</a-form-model-item>
</a-form-model>
</div>
</template>
......@@ -54,7 +43,7 @@
props: ['userList'],
data() {
return {
form: this.$form.createForm(this),
model: {},
loading: false,
// accountName: this.userList.username,
dropList: "0",
......@@ -69,8 +58,13 @@
mobile: "",
},
validatorRules: {
captcha: {rule: [{required: true, message: '请输入短信验证码!'}, {validator: this.validateCaptcha}]},
phone: {rule: [{required: true, message: '请输入手机号码!'}, {validator: this.validatePhone}]},
phone: [
{ required: true, message: '请输入手机号码!' },
{ validator: this.validatePhone }
],
captcha: [
{ required: true, message: '请输入短信验证码!' }
]
},
}
},
......@@ -80,67 +74,59 @@
nextStep() {
let that = this
that.loading = true
this.form.validateFields((err, values) => {
console.log(values);
if (!err) {
if (that.dropList == "0") {
if (values.captcha == undefined) {
this.cmsFailed("请输入短信验证码!");
this.$refs['form'].validate((success) => {
if(success==true){
let params = {
phone: this.model.phone,
smscode: this.model.captcha
}
postAction("/sys/user/phoneVerification", params).then((res) => {
if (res.success) {
console.log(res);
let userList = {
username: res.result.username,
phone: params.phone,
smscode: res.result.smscode
};
setTimeout(function () {
that.$emit('nextStep', userList)
}, 0)
} else {
var params = {}
params.phone = values.phone;
params.smscode = values.captcha;
postAction("/sys/user/phoneVerification", params).then((res) => {
if (res.success) {
console.log(res);
var userList = {
username: res.result.username,
phone: values.phone,
smscode: res.result.smscode
};
setTimeout(function () {
that.$emit('nextStep', userList)
}, 0)
} else {
this.cmsFailed(res.message);
}
})
this.cmsFailed(res.message);
}
}
});
}
})
},
getCaptcha(e) {
e.preventDefault();
let that = this;
let phone=that.form.getFieldValue("phone")
if(!phone){
this.cmsFailed("手机号不能为空!");
return;
}
this.state.smsSendBtn = true;
let interval = window.setInterval(() => {
if (that.state.time-- <= 0) {
that.state.time = 60;
that.state.smsSendBtn = false;
window.clearInterval(interval);
}
}, 1000);
const hide = this.$message.loading('验证码发送中..', 0);
let smsParams = {
mobile: phone,
smsmode: "2"
};
postAction("/sys/sms", smsParams).then(res => {
if (!res.success) {
setTimeout(hide, 1);
this.cmsFailed(res.message);
const that = this
that.$refs['form'].validateField('phone', err=>{
if(!err){
that.state.smsSendBtn = true;
let interval = window.setInterval(() => {
if (that.state.time-- <= 0) {
that.state.time = 60;
that.state.smsSendBtn = false;
window.clearInterval(interval);
}
}, 1000);
const hide = that.$message.loading('验证码发送中..', 0);
let smsParams = {
mobile: that.model.phone,
smsmode: "2"
};
postAction("/sys/sms", smsParams).then(res => {
if (!res.success) {
setTimeout(hide, 1);
that.cmsFailed(res.message);
}
setTimeout(hide, 500);
})
}else{
that.cmsFailed(err);
}
setTimeout(hide, 500);
})
},
cmsFailed(err) {
......@@ -193,4 +179,4 @@
width: 100%;
height: 40px;
}
</style>
\ No newline at end of file
</style>
<template>
<div>
<a-form :form="form" style="max-width: 500px; margin: 40px auto 0;">
<a-form-item
label="账号名"
:labelCol="{span: 5}"
:wrapperCol="{span: 19}"
>
<a-input
type="text"
autocomplete="false" :value="accountName" disabled>
</a-input>
</a-form-item>
<a-form-item
label="新密码"
:labelCol="{span: 5}"
:wrapperCol="{span: 19}"
class="stepFormText">
<a-input
v-decorator="['password',validatorRules.password]"
type="password"
autocomplete="false">
</a-input>
</a-form-item>
<a-form-item
label="确认密码"
:labelCol="{span: 5}"
:wrapperCol="{span: 19}"
class="stepFormText">
<a-input
v-decorator="['confirmPassword',validatorRules.confirmPassword]"
type="password"
autocomplete="false">
</a-input>
</a-form-item>
<a-form-item :wrapperCol="{span: 19, offset: 5}">
<a-form-model ref="form" :model="model" :rules="validatorRules" class="password-retrieval-form">
<a-form-model-item label="账号名" v-bind="layout">
<a-input type="text" :value="accountName" disabled/>
</a-form-model-item>
<a-form-model-item prop="password" label="新密码" v-bind="layout" class="stepFormText">
<a-input v-model="model.password" type="password" autocomplete="false"/>
</a-form-model-item>
<a-form-model-item prop="confirmPassword" label="确认密码" v-bind="layout" class="stepFormText">
<a-input v-model="model.confirmPassword" type="password" autocomplete="false"/>
</a-form-model-item>
<a-form-model-item :wrapperCol="{span: 19, offset: 5}">
<a-button style="margin-left: 8px" @click="prevStep">上一步</a-button>
<a-button :loading="loading" type="primary" @click="nextStep" style="margin-left:20px">提交</a-button>
</a-form-item>
</a-form>
</a-form-model-item>
</a-form-model>
</div>
</template>
<script>
import { putAction,getAction } from '@/api/manage'
import { getAction } from '@/api/manage'
export default {
name: "Step3",
// components: {
......@@ -51,59 +32,61 @@
props: ['userList'],
data () {
return {
model:{},
layout: {
labelCol: { span: 5 },
wrapperCol: { span: 19 },
},
loading: false,
form: this.$form.createForm(this),
accountName: this.userList.username,
validatorRules: {
username: {rules: [{required: true, message: '用户名不能为空!'}]},
password: {
rules: [{
required: true,
pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,.\/]).{8,}$/,
message: '密码由8位数字、大小写字母和特殊符号组成!!'
}, {validator: this.handlePasswordLevel}]
},
confirmPassword: {rules: [{required: true, message: '密码不能为空!'}, {validator: this.handlePasswordCheck}]},
},
password: [{
required: true, pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,.\/]).{8,}$/, message: '密码由8位数字、大小写字母和特殊符号组成!!'
}],
confirmPassword: [
{ required: true, message: '密码不能为空!'},
{ validator: this.handlePasswordCheck}
]
}
}
},
methods: {
nextStep () {
let that = this
that.loading = true
this.form.validateFields((err, values) => {
if ( !err ){
var params={}
params.username=this.userList.username;
params.password=values.password;
params.smscode=this.userList.smscode;
params.phone= this.userList.phone;
getAction("/sys/user/passwordChange", params).then((res) => {
if(res.success){
var userList = {
username: this.userList.username
that.$refs['form'].validate(success => {
if (success === true) {
let params = {
username: that.userList.username,
password: that.model.password,
smscode: that.userList.smscode,
phone: that.userList.phone,
}
console.log(userList);
setTimeout(function () {
that.$emit('nextStep', userList)
}, 1500)
}else{
this.passwordFailed(res.message);
getAction("/sys/user/passwordChange", params).then((res) => {
if (res.success) {
let userList = {
username: that.userList.username
}
console.log(userList);
setTimeout(function() {
that.$emit('nextStep', userList)
}, 1500)
} else {
that.passwordFailed(res.message);
that.loading = false
}
})
} else {
that.loading = false
}
})
} else{
that.loading = false
}
})
},
prevStep () {
this.$emit('prevStep', this.userList)
},
handlePasswordCheck (rule, value, callback) {
let password = this.form.getFieldValue('password')
let password = this.model['password']
if (value && password && value.trim() !== password.trim()) {
callback(new Error('两次密码不一致'))
}
......
<template>
<div class="main user-layout-register">
<h3><span>注册</span></h3>
<a-form ref="formRegister" :autoFormCreate="(form)=>{this.form = form}" id="formRegister">
<a-form-item
fieldDecoratorId="username"
:fieldDecoratorOptions="{rules: [{ required: false}, { validator: this.checkUsername }]}">
<a-input size="large" type="text" autocomplete="false" placeholder="请输入用户名"></a-input>
</a-form-item>
<a-form-model ref="form" :model="model" :rules="validatorRules">
<a-form-model-item prop="username">
<a-input v-model="model.username" size="large" type="text" autocomplete="false" placeholder="请输入用户名"/>
</a-form-model-item>
<a-popover placement="rightTop" trigger="click" :visible="state.passwordLevelChecked">
<template slot="content">
......@@ -18,33 +16,30 @@
</div>
</div>
</template>
<a-form-item
fieldDecoratorId="password"
:fieldDecoratorOptions="{rules: [{ required: false}, { validator: this.handlePasswordLevel }]}">
<a-input size="large" type="password" @click="handlePasswordInputClick" autocomplete="false" placeholder="至少8位密码,区分大小写"></a-input>
</a-form-item>
<a-form-model-item prop="password">
<a-input
v-model="model.password"
size="large"
type="password"
@click="handlePasswordInputClick"
autocomplete="false"
placeholder="至少8位密码,区分大小写">
</a-input>
</a-form-model-item>
</a-popover>
<a-form-item
fieldDecoratorId="password2"
:fieldDecoratorOptions="{rules: [{ required: false}, { validator: this.handlePasswordCheck }]}">
<a-form-model-item prop="password2">
<a-input v-model="model.password2" size="large" type="password" autocomplete="false" placeholder="确认密码"></a-input>
</a-form-model-item>
<a-input size="large" type="password" autocomplete="false" placeholder="确认密码"></a-input>
</a-form-item>
<!-- <a-form-item-->
<!-- fieldDecoratorId="email">-->
<!-- <a-input size="large" type="text" placeholder="邮箱"></a-input>-->
<!-- </a-form-item>-->
<a-form-item
fieldDecoratorId="mobile"
:fieldDecoratorOptions="{rules: [{ required: false}, { validator: this.handlePhoneCheck }]}">
<a-input size="large" placeholder="11 位手机号">
<a-form-model-item prop="mobile">
<a-input v-model="model.mobile" size="large" placeholder="11 位手机号">
<a-select slot="addonBefore" size="large" defaultValue="+86">
<a-select-option value="+86">+86</a-select-option>
<a-select-option value="+87">+87</a-select-option>
</a-select>
</a-input>
</a-form-item>
</a-form-model-item>
<!--<a-input-group size="large" compact>
<a-select style="width: 20%" size="large" defaultValue="+86">
<a-select-option value="+86">+86</a-select-option>
......@@ -55,13 +50,11 @@
<a-row :gutter="16">
<a-col class="gutter-row" :span="16">
<a-form-item
fieldDecoratorId="captcha"
:fieldDecoratorOptions="{rules: [{ required: false}, { validator: this.handleCaptchaCheck }]}">
<a-input size="large" type="text" placeholder="验证码">
<a-form-model-item prop="captcha">
<a-input v-model="model.captcha" size="large" type="text" placeholder="验证码">
<a-icon slot="prefix" type="mail" :style="{ color: 'rgba(0,0,0,.25)' }"/>
</a-input>
</a-form-item>
</a-form-model-item>
</a-col>
<a-col class="gutter-row" :span="8">
<a-button
......@@ -73,7 +66,7 @@
</a-col>
</a-row>
<a-form-item>
<a-form-model-item>
<a-button
size="large"
type="primary"
......@@ -84,9 +77,9 @@
:disabled="registerBtn">注册
</a-button>
<router-link class="login" :to="{ name: 'login' }">使用已有账户登录</router-link>
</a-form-item>
</a-form-model-item>
</a-form>
</a-form-model>
</div>
</template>
......@@ -120,8 +113,29 @@
mixins: [mixinDevice],
data() {
return {
form: null,
model: {},
validatorRules: {
username: [
{ required: false },
{ validator: this.checkUsername }
],
password: [
{ required: false},
{ validator: this.handlePasswordLevel }
],
password2: [
{ required: false },
{ validator: this.handlePasswordCheck }
],
mobile: [
{ required: false },
{ validator: this.handlePhoneCheck }
],
captcha: [
{ required: false },
{ validator: this.handleCaptchaCheck }
]
},
state: {
time: 60,
smsSendBtn: false,
......@@ -162,7 +176,7 @@
}
},
handleEmailCheck(rule, value, callback) {
var params = {
let params = {
email: value,
};
checkOnlyUser(params).then((res) => {
......@@ -174,7 +188,6 @@
})
},
handlePasswordLevel(rule, value, callback) {
let level = 0
let reg = /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/;
if (!reg.test(value)) {
......@@ -208,7 +221,7 @@
},
handlePasswordCheck(rule, value, callback) {
let password = this.form.getFieldValue('password')
let password = this.model['password']
//console.log('value', value)
if (value === undefined) {
callback(new Error('请输入密码'))
......@@ -252,9 +265,10 @@
},
handleSubmit() {
this.form.validateFields((err, values) => {
if (!err) {
var register = {
this.$refs['form'].validate((success) => {
if (success==true) {
let values = this.model
let register = {
username: values.username,
password: values.password,
phone: values.mobile,
......@@ -274,7 +288,7 @@
getCaptcha(e) {
e.preventDefault()
let that = this
this.form.validateFields(['mobile'], {force: true}, (err, values) => {
this.$refs['form'].validateField(['mobile'], (err) => {
if (!err) {
this.state.smsSendBtn = true;
let interval = window.setInterval(() => {
......@@ -284,9 +298,9 @@
window.clearInterval(interval);
}
}, 1000);
const hide = this.$message.loading('验证码发送中..', 0);
const hide = this.$message.loading('验证码发送中..', 3);
const params = {
mobile: values.mobile,
mobile: this.model.mobile,
smsmode: "1"
};
postAction("/sys/sms", params).then((res) => {
......
......@@ -21,25 +21,25 @@
},
data () {
return {
form: {},
model: {},
}
},
computed: {
email () {
let v = this.form ? this.form.username || this.form.mobile : ' XXX '
let v = this.model ? this.model.username || this.model.mobile : ' XXX '
let title = `你的账户:${v} 注册成功`
this.username = v;
return title
}
},
created () {
this.form = this.$route.params
this.model = this.$route.params
},
methods: {
goHomeHandle () {
let params={};
params.username=this.form.username;
params.password=this.form.password;
params.username=this.model.username;
params.password=this.model.password;
console.log(params);
this.$router.push({name:'login',params})
},
......
......@@ -37,10 +37,10 @@
</a-button>
</template>
<div class="ant-modal-confirm-body-wrapper">
<a-form-item>
<a-form-model-item>
<span>绑定手机号</span>
</a-form-item>
<a-form-item>
</a-form-model-item>
<a-form-model-item>
<a-input
size="large"
type="text"
......@@ -48,11 +48,11 @@
v-model="thirdPhone">
<a-icon slot="prefix" type="mobile" :style="{ color: 'rgba(0,0,0,.25)' }"/>
</a-input>
</a-form-item>
</a-form-model-item>
<a-row :gutter="16">
<a-col class="gutter-row" :span="16">
<a-form-item>
<a-form-model-item>
<a-input
size="large"
type="text"
......@@ -60,7 +60,7 @@
v-model="thirdCaptcha">
<a-icon slot="prefix" type="mail" :style="{ color: 'rgba(0,0,0,.25)' }"/>
</a-input>
</a-form-item>
</a-form-model-item>
</a-col>
<a-col class="gutter-row" :span="8">
<a-button
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册