|
@@ -184,36 +184,36 @@ export default {
|
|
|
},
|
|
|
handleSubmit (e) {
|
|
|
e.preventDefault()
|
|
|
- this.$router.push({ name: 'AvailableCoupon' })
|
|
|
- // const {
|
|
|
- // form: { validateFields },
|
|
|
- // state,
|
|
|
- // customActiveKey,
|
|
|
- // Login
|
|
|
- // } = this
|
|
|
+ // this.$router.push({ name: 'AvailableCoupon' })
|
|
|
+ const {
|
|
|
+ form: { validateFields },
|
|
|
+ state,
|
|
|
+ customActiveKey,
|
|
|
+ Login
|
|
|
+ } = this
|
|
|
|
|
|
- // state.loginBtn = true
|
|
|
- // const validateFieldsKey = customActiveKey === 'tab1' ? ['username', 'password', 'rememberMe'] : ['mobile', 'captcha']
|
|
|
+ state.loginBtn = true
|
|
|
+ const validateFieldsKey = customActiveKey === 'tab1' ? ['username', 'password', 'rememberMe'] : ['mobile', 'captcha']
|
|
|
|
|
|
- // validateFields(validateFieldsKey, { force: true }, (err, values) => {
|
|
|
- // if (!err) {
|
|
|
- // const loginParams = { ...values }
|
|
|
- // delete loginParams.username
|
|
|
- // loginParams[!state.loginType ? 'email' : 'username'] = values.username
|
|
|
- // loginParams.password = values.password
|
|
|
- // console.log(loginParams, 'loginParams')
|
|
|
- // Login(loginParams)
|
|
|
- // .then((res) => this.loginSuccess(res))
|
|
|
- // .catch(err => this.requestFailed(err))
|
|
|
- // .finally(() => {
|
|
|
- // state.loginBtn = false
|
|
|
- // })
|
|
|
- // } else {
|
|
|
- // setTimeout(() => {
|
|
|
- // state.loginBtn = false
|
|
|
- // }, 600)
|
|
|
- // }
|
|
|
- // })
|
|
|
+ validateFields(validateFieldsKey, { force: true }, (err, values) => {
|
|
|
+ if (!err) {
|
|
|
+ const loginParams = { ...values }
|
|
|
+ delete loginParams.username
|
|
|
+ loginParams[!state.loginType ? 'email' : 'username'] = values.username
|
|
|
+ loginParams.password = values.password
|
|
|
+ console.log(loginParams, 'loginParams')
|
|
|
+ Login(loginParams)
|
|
|
+ .then((res) => this.loginSuccess(res))
|
|
|
+ .catch(err => this.requestFailed(err))
|
|
|
+ .finally(() => {
|
|
|
+ state.loginBtn = false
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ setTimeout(() => {
|
|
|
+ state.loginBtn = false
|
|
|
+ }, 600)
|
|
|
+ }
|
|
|
+ })
|
|
|
},
|
|
|
getCaptcha (e) {
|
|
|
e.preventDefault()
|