|
@@ -21,7 +21,7 @@
|
|
|
:placeholder="$t('user.login.username.placeholder')"
|
|
|
v-decorator="[
|
|
|
'username',
|
|
|
- {rules: [{ required: true, message: $t('user.userName.required') }, { validator: handleUsernameOrEmail }], validateTrigger: 'change'}
|
|
|
+ {rules: [{ required: true, message: $t('user.userName.required') }], validateTrigger: 'change'}
|
|
|
]"
|
|
|
>
|
|
|
<a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/>
|
|
@@ -41,7 +41,7 @@
|
|
|
</a-input-password>
|
|
|
</a-form-item>
|
|
|
</a-tab-pane>
|
|
|
- <a-tab-pane key="tab2" :tab="$t('user.login.tab-login-mobile')">
|
|
|
+ <!-- <a-tab-pane key="tab2" :tab="$t('user.login.tab-login-mobile')">
|
|
|
<a-form-item>
|
|
|
<a-input size="large" type="text" :placeholder="$t('user.login.mobile.placeholder')" v-decorator="['mobile', {rules: [{ required: true, pattern: /^1[34578]\d{9}$/, message: $t('user.login.mobile.placeholder') }], validateTrigger: 'change'}]">
|
|
|
<a-icon slot="prefix" type="mobile" :style="{ color: 'rgba(0,0,0,.25)' }"/>
|
|
@@ -66,7 +66,7 @@
|
|
|
></a-button>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
|
- </a-tab-pane>
|
|
|
+ </a-tab-pane> -->
|
|
|
</a-tabs>
|
|
|
|
|
|
<a-form-item>
|
|
@@ -89,7 +89,7 @@
|
|
|
>{{ $t('user.login.login') }}</a-button>
|
|
|
</a-form-item>
|
|
|
|
|
|
- <div class="user-login-other">
|
|
|
+ <!-- <div class="user-login-other">
|
|
|
<span>{{ $t('user.login.sign-in-with') }}</span>
|
|
|
<a>
|
|
|
<a-icon class="item-icon" type="alipay-circle"></a-icon>
|
|
@@ -101,7 +101,7 @@
|
|
|
<a-icon class="item-icon" type="weibo-circle"></a-icon>
|
|
|
</a>
|
|
|
<router-link class="register" :to="{ name: 'register' }">{{ $t('user.login.signup') }}</router-link>
|
|
|
- </div>
|
|
|
+ </div> -->
|
|
|
</a-form>
|
|
|
|
|
|
<two-step-captcha
|
|
@@ -188,8 +188,8 @@ export default {
|
|
|
console.log('login form', values)
|
|
|
const loginParams = { ...values }
|
|
|
delete loginParams.username
|
|
|
- loginParams[!state.loginType ? 'email' : 'username'] = values.username
|
|
|
- loginParams.password = md5(values.password)
|
|
|
+ loginParams['username'] = values.username
|
|
|
+ loginParams.password = values.password
|
|
|
Login(loginParams)
|
|
|
.then((res) => this.loginSuccess(res))
|
|
|
.catch(err => this.requestFailed(err))
|