|
|
@@ -23,15 +23,14 @@
|
|
|
@change="handleTabClick"
|
|
|
>
|
|
|
<a-tab-pane key="tab1" tab="账号密码登录">
|
|
|
- <!-- <a-alert v-if="isLoginError" type="error" showIcon style="margin-bottom: 24px;" message="账户或密码错误" /> -->
|
|
|
<a-form-item>
|
|
|
<a-input
|
|
|
size="large"
|
|
|
type="text"
|
|
|
- placeholder="邮箱/用户名"
|
|
|
+ placeholder="邮箱"
|
|
|
v-decorator="[
|
|
|
'username',
|
|
|
- {rules: [{ required: true, message: '请输入帐户名或邮箱地址' }], validateTrigger: 'blur'}
|
|
|
+ {rules: [{ required: true, message: '请输入邮箱地址' }], validateTrigger: 'blur'}
|
|
|
]"
|
|
|
>
|
|
|
<a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/>
|
|
|
@@ -75,7 +74,26 @@
|
|
|
<a-icon slot="prefix" type="mail" :style="{ color: 'rgba(0,0,0,.25)' }"/>
|
|
|
</a-input>
|
|
|
</a-form-item>
|
|
|
-
|
|
|
+ <a-form-item>
|
|
|
+ <a-input
|
|
|
+ size="large"
|
|
|
+ placeholder="用户名"
|
|
|
+ v-decorator="[
|
|
|
+ 'registerUsername',
|
|
|
+ {rules: [{ required: true, message: '请输入用户名' }], validateTrigger: 'blur'}]">
|
|
|
+ <a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/>
|
|
|
+ </a-input>
|
|
|
+ </a-form-item>
|
|
|
+ <a-form-item>
|
|
|
+ <a-input
|
|
|
+ size="large"
|
|
|
+ placeholder="手机号"
|
|
|
+ v-decorator="[
|
|
|
+ 'registerPhoneNumber',
|
|
|
+ {rules: [{ required: true, message: '请输入手机号' }], validateTrigger: 'blur'}]">
|
|
|
+ <a-icon slot="prefix" type="book" :style="{ color: 'rgba(0,0,0,.25)' }"/>
|
|
|
+ </a-input>
|
|
|
+ </a-form-item>
|
|
|
<a-form-item>
|
|
|
<a-input
|
|
|
size="large"
|
|
|
@@ -211,13 +229,17 @@ export default {
|
|
|
|
|
|
handleRegister() {
|
|
|
const { form: { validateFields } } = this
|
|
|
- const validateFieldsKey = this.customActiveKey === 'tab1' ? ['username', 'password'] : ['registerUserMail','registerPassword','registerPasswordconfirm']
|
|
|
+ const validateFieldsKey = this.customActiveKey === 'tab1' ? ['username', 'password'] : ['registerUsername','registerPhoneNumber','registerUserMail','registerPassword','registerPasswordconfirm']
|
|
|
validateFields(validateFieldsKey, { force: true }, async (err, values) => {
|
|
|
if (!err) {
|
|
|
this.registerLoading = true
|
|
|
const data = {
|
|
|
email: this.form.getFieldValue('registerUserMail'),
|
|
|
password: this.form.getFieldValue('registerPassword'),
|
|
|
+ phoneNumber: this.form.getFieldValue('registerPhoneNumber'),
|
|
|
+ username: this.form.getFieldValue('registerUsername'),
|
|
|
+ credit: 100,
|
|
|
+ userType: 1
|
|
|
}
|
|
|
await this.register(data).then(() => {
|
|
|
this.customActiveKey = 'tab1'
|