|
@@ -47,45 +47,12 @@
|
|
|
</a-col>
|
|
</a-col>
|
|
|
</a-row>
|
|
</a-row>
|
|
|
</a-tab-pane>
|
|
</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-icon slot="prefix" type="mobile" :style="{ color: 'rgba(0,0,0,.25)' }"/>-->
|
|
|
|
|
- <!--</a-input>-->
|
|
|
|
|
- <!--</a-form-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-icon slot="prefix" type="mail" :style="{ color: 'rgba(0,0,0,.25)' }"/>-->
|
|
|
|
|
- <!--</a-input>-->
|
|
|
|
|
- <!--</a-form-item>-->
|
|
|
|
|
- <!--</a-col>-->
|
|
|
|
|
- <!--<a-col class="gutter-row" :span="8">-->
|
|
|
|
|
- <!--<a-button-->
|
|
|
|
|
- <!--class="getCaptcha"-->
|
|
|
|
|
- <!--tabindex="-1"-->
|
|
|
|
|
- <!--:disabled="state.smsSendBtn"-->
|
|
|
|
|
- <!--@click.stop.prevent="getCaptcha"-->
|
|
|
|
|
- <!--v-text="!state.smsSendBtn && '获取验证码' || (state.time+' s')"></a-button>-->
|
|
|
|
|
- <!--</a-col>-->
|
|
|
|
|
- <!--</a-row>-->
|
|
|
|
|
- <!--</a-tab-pane>-->
|
|
|
|
|
</a-tabs>
|
|
</a-tabs>
|
|
|
|
|
|
|
|
<a-form-item>
|
|
<a-form-item>
|
|
|
<!--<a-checkbox v-model="formLogin.rememberMe">自动登录</a-checkbox>-->
|
|
<!--<a-checkbox v-model="formLogin.rememberMe">自动登录</a-checkbox>-->
|
|
|
<!--<router-link :to="{ name: 'recover', params: { user: 'aaa'} }" class="forge-password" style="float: right;">-->
|
|
<!--<router-link :to="{ name: 'recover', params: { user: 'aaa'} }" class="forge-password" style="float: right;">-->
|
|
|
- <!--忘记密码-->
|
|
|
|
|
|
|
+ <!--忘记密码-->
|
|
|
<!--</router-link>-->
|
|
<!--</router-link>-->
|
|
|
</a-form-item>
|
|
</a-form-item>
|
|
|
|
|
|
|
@@ -95,7 +62,7 @@
|
|
|
type="primary"
|
|
type="primary"
|
|
|
htmlType="submit"
|
|
htmlType="submit"
|
|
|
class="login-button"
|
|
class="login-button"
|
|
|
- :loading="loginBtn"
|
|
|
|
|
|
|
+ :loading="loading"
|
|
|
@click.stop.prevent="handleSubmit"
|
|
@click.stop.prevent="handleSubmit"
|
|
|
:disabled="loginBtn">登录
|
|
:disabled="loginBtn">登录
|
|
|
</a-button>
|
|
</a-button>
|
|
@@ -154,7 +121,6 @@
|
|
|
</a-form-item>
|
|
</a-form-item>
|
|
|
</a-form>
|
|
</a-form>
|
|
|
|
|
|
|
|
-
|
|
|
|
|
</a-modal>
|
|
</a-modal>
|
|
|
|
|
|
|
|
</div>
|
|
</div>
|
|
@@ -179,6 +145,7 @@
|
|
|
data() {
|
|
data() {
|
|
|
return {
|
|
return {
|
|
|
customActiveKey: 'tab1',
|
|
customActiveKey: 'tab1',
|
|
|
|
|
+ loading: false,
|
|
|
loginBtn: false,
|
|
loginBtn: false,
|
|
|
// login type: 0 email, 1 username, 2 telephone
|
|
// login type: 0 email, 1 username, 2 telephone
|
|
|
loginType: 0,
|
|
loginType: 0,
|
|
@@ -248,7 +215,7 @@
|
|
|
let loginParams = {
|
|
let loginParams = {
|
|
|
remember_me: that.formLogin.rememberMe
|
|
remember_me: that.formLogin.rememberMe
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+ that.loading = true
|
|
|
// 使用账户密码登陆
|
|
// 使用账户密码登陆
|
|
|
if (that.customActiveKey === 'tab1') {
|
|
if (that.customActiveKey === 'tab1') {
|
|
|
that.form.validateFields(['username', 'password', 'inputCode'], { force: true }, (err, values) => {
|
|
that.form.validateFields(['username', 'password', 'inputCode'], { force: true }, (err, values) => {
|