Merge branch 'master' of gitee.com:wjl2008_admin/tougao_web
This commit is contained in:
@@ -11,16 +11,16 @@
|
|||||||
<el-tab-pane label="Binding" name="first">
|
<el-tab-pane label="Binding" name="first">
|
||||||
<div class="ms_link">
|
<div class="ms_link">
|
||||||
<div class="ms-title">User Login</div>
|
<div class="ms-title">User Login</div>
|
||||||
<el-form class="ms-content" :rules="registerRules" ref="registerForm" :model="registerForm" label-width="0">
|
<el-form class="ms-content" :rules="registerRules" ref="loginForm" :model="loginForm" label-width="0">
|
||||||
<!-- 用户名 -->
|
<!-- 用户名 -->
|
||||||
<el-form-item prop="username">
|
<el-form-item prop="username">
|
||||||
<el-input size="small" v-model="registerForm.username" auto-complete="off" placeholder="username">
|
<el-input size="small" v-model="loginForm.username" auto-complete="off" placeholder="username">
|
||||||
<i slot="prefix" class="el-icon-user"></i>
|
<i slot="prefix" class="el-icon-user"></i>
|
||||||
</el-input>
|
</el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!-- 密码 -->
|
<!-- 密码 -->
|
||||||
<el-form-item prop="password">
|
<el-form-item prop="password">
|
||||||
<el-input size="small" v-model="registerForm.password" auto-complete="off" placeholder="password" show-password>
|
<el-input size="small" v-model="loginForm.password" auto-complete="off" placeholder="password" show-password>
|
||||||
<i slot="prefix" class="el-icon-lock"></i>
|
<i slot="prefix" class="el-icon-lock"></i>
|
||||||
</el-input>
|
</el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@@ -51,6 +51,12 @@
|
|||||||
<i slot="prefix" class="el-icon-lock"></i>
|
<i slot="prefix" class="el-icon-lock"></i>
|
||||||
</el-input>
|
</el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<!-- 确认密码 -->
|
||||||
|
<el-form-item prop="passwordd">
|
||||||
|
<el-input size="small" v-model="registerForm.passwordd" auto-complete="off" placeholder="password" show-password>
|
||||||
|
<i slot="prefix" class="el-icon-lock"></i>
|
||||||
|
</el-input>
|
||||||
|
</el-form-item>
|
||||||
<!-- 姓名 -->
|
<!-- 姓名 -->
|
||||||
<el-form-item prop="name">
|
<el-form-item prop="name">
|
||||||
<el-input size="small" v-model="registerForm.name" auto-complete="off" placeholder="realname">
|
<el-input size="small" v-model="registerForm.name" auto-complete="off" placeholder="realname">
|
||||||
@@ -94,6 +100,7 @@
|
|||||||
account: localStorage.getItem('ms_username'),
|
account: localStorage.getItem('ms_username'),
|
||||||
code: this.$route.query.code
|
code: this.$route.query.code
|
||||||
},
|
},
|
||||||
|
loginForm: {},
|
||||||
registerForm: {},
|
registerForm: {},
|
||||||
activeName: 'first',
|
activeName: 'first',
|
||||||
registerRules: {
|
registerRules: {
|
||||||
@@ -107,6 +114,11 @@
|
|||||||
message: 'Please enter your password.',
|
message: 'Please enter your password.',
|
||||||
trigger: 'blur'
|
trigger: 'blur'
|
||||||
}],
|
}],
|
||||||
|
passwordd: [{
|
||||||
|
required: true,
|
||||||
|
message: 'Please enter your password.',
|
||||||
|
trigger: 'blur'
|
||||||
|
}],
|
||||||
name: [{
|
name: [{
|
||||||
required: true,
|
required: true,
|
||||||
message: '请输入姓名',
|
message: '请输入姓名',
|
||||||
|
|||||||
Reference in New Issue
Block a user