修改错误提示不弹出的问题
This commit is contained in:
@ -2,41 +2,39 @@
|
||||
<view class="register absolute">
|
||||
<view class="whiteBg" v-if="formItem === 1">
|
||||
<view class="title acea-row">
|
||||
<view class="item" :class="current === index ? 'on' : ''" v-for="(item, index) in navList"
|
||||
@click="navTap(index)" :key="index">{{ item }}</view>
|
||||
<view class="item" :class="current === index ? 'on' : ''" v-for="(item, index) in navList" @click="navTap(index)" :key="index">{{ item }}</view>
|
||||
</view>
|
||||
<!-- 手机号登录 -->
|
||||
<!-- 手机号登录 -->
|
||||
<view class="list" :hidden="current !== 0">
|
||||
<form @submit.prevent="submit">
|
||||
<view class="item getPhoneCode">
|
||||
<view class="phoneInput acea-row row-between-wrapper">
|
||||
<input type="text" placeholder="输入手机号码"
|
||||
v-model="account" required/>
|
||||
<input type="text" placeholder="输入手机号码" v-model="account" required />
|
||||
</view>
|
||||
<view class="phoneCode" @click="sendCode">
|
||||
{{ clockText }}
|
||||
</view>
|
||||
<view class="phoneCode" @click="sendCode">
|
||||
{{ clockText }}
|
||||
</view>
|
||||
</view>
|
||||
<view class="item">
|
||||
<view class="acea-row row-between-wrapper">
|
||||
<input type="text" placeholder="请输入验证码" v-model="captcha" required />
|
||||
<!-- <input type="password" placeholder="填写登录密码" v-model="password" required /> -->
|
||||
<!-- <input type="password" placeholder="填写登录密码" v-model="password" required /> -->
|
||||
</view>
|
||||
</view>
|
||||
</form>
|
||||
</view>
|
||||
<!-- 账号密码登录 -->
|
||||
<!-- 账号密码登录 -->
|
||||
<view class="list" :hidden="current !== 1">
|
||||
<view class="item">
|
||||
<view class="acea-row row-between-wrapper">
|
||||
<input type="text" placeholder="输入手机号码" v-model="account" />
|
||||
</view>
|
||||
</view>
|
||||
<view class="item">
|
||||
<view class="acea-row row-between-wrapper">
|
||||
<input type="password" placeholder="输入密码" v-model="password" />
|
||||
</view>
|
||||
</view>
|
||||
<view class="item">
|
||||
<view class="acea-row row-between-wrapper">
|
||||
<input type="password" placeholder="输入密码" v-model="password" />
|
||||
</view>
|
||||
</view>
|
||||
<!-- <view class="item">
|
||||
<view class="align-left">
|
||||
<input type="text" placeholder="填写验证码" class="codeIput" v-model="captcha" />
|
||||
@ -52,7 +50,7 @@
|
||||
<text @click="formItem = 2" class="font-color-red">立即注册</text>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 注册 -->
|
||||
<!-- 注册 -->
|
||||
<view class="whiteBg" v-else>
|
||||
<view class="title acea-row row-between-wrapper">
|
||||
<view class="item on">注册账号</view>
|
||||
@ -72,8 +70,7 @@
|
||||
<use xlink:href="#icon-code_1" />
|
||||
</svg>-->
|
||||
<input name="verifyCode" type="text" placeholder="填写验证码" class="codeIput" v-model="captcha" />
|
||||
<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
|
||||
@click="code">{{ text }}</button>
|
||||
<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="code">{{ text }}</button>
|
||||
</view>
|
||||
</view>
|
||||
<view class="item">
|
||||
@ -94,7 +91,6 @@
|
||||
</view>
|
||||
</view>
|
||||
<!-- #endif -->
|
||||
|
||||
</view>
|
||||
<view class="logon" @click="register">注册</view>
|
||||
<view class="tip">
|
||||
@ -105,307 +101,250 @@
|
||||
</view>
|
||||
</template>
|
||||
<script>
|
||||
import sendVerifyCode from "@/mixins/SendVerifyCode";
|
||||
import {
|
||||
login,
|
||||
loginMobile,
|
||||
registerVerify,
|
||||
register
|
||||
} from "@/api/user";
|
||||
import attrs, {
|
||||
required,
|
||||
alpha_num,
|
||||
chs_phone
|
||||
} from "@/utils/validate";
|
||||
import {
|
||||
validatorDefaultCatch
|
||||
} from "@/utils/dialog";
|
||||
import dayjs from "dayjs";
|
||||
import cookie from "@/utils/store/cookie";
|
||||
import sendVerifyCode from '@/mixins/SendVerifyCode'
|
||||
import { login, loginMobile, registerVerify, register } from '@/api/user'
|
||||
import attrs, { required, alpha_num, chs_phone } from '@/utils/validate'
|
||||
import { validatorDefaultCatch } from '@/utils/dialog'
|
||||
import dayjs from 'dayjs'
|
||||
import cookie from '@/utils/store/cookie'
|
||||
|
||||
import {
|
||||
handleGetUserInfo
|
||||
} from "@/utils";
|
||||
import { handleGetUserInfo } from '@/utils'
|
||||
|
||||
const BACK_URL = "login_back_url";
|
||||
const BACK_URL = 'login_back_url'
|
||||
|
||||
export default {
|
||||
name: "Login",
|
||||
mixins: [sendVerifyCode],
|
||||
data: function () {
|
||||
return {
|
||||
navList: ["手机号登录", "密码登录"],
|
||||
// navList: ["手机号登录",],
|
||||
current: 0,
|
||||
account: "",
|
||||
password: "",
|
||||
captcha: "",
|
||||
inviteCode: "",
|
||||
formItem: 1,
|
||||
type: "login",
|
||||
timer: null,
|
||||
clock: 60,
|
||||
clockText: '验证码'
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
async loginMobile() {
|
||||
var that = this;
|
||||
const {
|
||||
account,
|
||||
captcha
|
||||
} = that;
|
||||
try {
|
||||
await that
|
||||
.$validator({
|
||||
account: [
|
||||
required(required.message("手机号码")),
|
||||
chs_phone(chs_phone.message())
|
||||
],
|
||||
captcha: [
|
||||
required(required.message("验证码")),
|
||||
alpha_num(alpha_num.message("验证码"))
|
||||
]
|
||||
})
|
||||
.validate({
|
||||
account,
|
||||
captcha
|
||||
});
|
||||
} catch (e) {
|
||||
return validatorDefaultCatch(e);
|
||||
}
|
||||
const res = await loginMobile({
|
||||
account: that.account,
|
||||
captcha: that.captcha,
|
||||
spread: cookie.get("spread")
|
||||
})
|
||||
if (res.status === 200) {
|
||||
this.$store.commit("login", res.data.token, dayjs(res.data.expires_time));
|
||||
handleGetUserInfo();
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: res.msg || res.response.data.msg || err.response.data.message,
|
||||
icon: "none",
|
||||
duration: 2000
|
||||
});
|
||||
}
|
||||
// .then(res => {
|
||||
// that.$store.commit("login", res.data.token, dayjs(res.data.expires_time));
|
||||
// handleGetUserInfo();
|
||||
// })
|
||||
// .catch(err => {
|
||||
// console.log(err)
|
||||
// uni.showToast({
|
||||
// title: err.msg || err.response.data.msg || err.response.data.message,
|
||||
// icon: "none",
|
||||
// duration: 2000
|
||||
// });
|
||||
// });
|
||||
},
|
||||
async register() {
|
||||
var that = this;
|
||||
const {
|
||||
account,
|
||||
captcha,
|
||||
password
|
||||
} = that;
|
||||
try {
|
||||
await that
|
||||
.$validator({
|
||||
account: [
|
||||
required(required.message("手机号码")),
|
||||
chs_phone(chs_phone.message())
|
||||
],
|
||||
captcha: [
|
||||
required(required.message("验证码")),
|
||||
alpha_num(alpha_num.message("验证码"))
|
||||
],
|
||||
password: [
|
||||
required(required.message("密码")),
|
||||
attrs.range([6, 16], attrs.range.message("密码")),
|
||||
alpha_num(alpha_num.message("密码"))
|
||||
]
|
||||
})
|
||||
.validate({
|
||||
account,
|
||||
captcha,
|
||||
password
|
||||
});
|
||||
} catch (e) {
|
||||
return validatorDefaultCatch(e);
|
||||
}
|
||||
register({
|
||||
account: that.account,
|
||||
captcha: that.captcha,
|
||||
password: that.password,
|
||||
inviteCode: that.inviteCode,
|
||||
spread: cookie.get("spread")
|
||||
})
|
||||
.then(res => {
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
icon: "success",
|
||||
duration: 2000
|
||||
});
|
||||
that.formItem = 1;
|
||||
})
|
||||
.catch(err => {
|
||||
uni.showToast({
|
||||
title: err.msg || err.response.data.msg || err.response.data.message,
|
||||
icon: "none",
|
||||
duration: 2000
|
||||
});
|
||||
});
|
||||
},
|
||||
// 获取验证码
|
||||
async code() {
|
||||
const {
|
||||
account
|
||||
} = this;
|
||||
try {
|
||||
await this
|
||||
.$validator({
|
||||
account: [
|
||||
required(required.message("手机号码")),
|
||||
chs_phone(chs_phone.message())
|
||||
]
|
||||
})
|
||||
.validate({
|
||||
account
|
||||
});
|
||||
} catch (e) {
|
||||
return validatorDefaultCatch(e);
|
||||
}
|
||||
if (this.formItem == 2) this.type = "register";
|
||||
this.showCode()
|
||||
},
|
||||
// 手机号登录获取验证码
|
||||
async sendCode () {
|
||||
const {
|
||||
account
|
||||
} = this;
|
||||
try {
|
||||
await this
|
||||
.$validator({
|
||||
account: [
|
||||
required(required.message("手机号码")),
|
||||
chs_phone(chs_phone.message())
|
||||
]
|
||||
})
|
||||
.validate({
|
||||
account
|
||||
});
|
||||
} catch (e) {
|
||||
return validatorDefaultCatch(e);
|
||||
}
|
||||
// 倒计时
|
||||
if (this.clock !== 60) {
|
||||
return
|
||||
}
|
||||
this.clock--
|
||||
this.clockText = `${this.clock} 秒`
|
||||
this.timer = setInterval(() => {
|
||||
if (parseInt(this.clock) === 1) {
|
||||
clearTimeout(this.timer)
|
||||
this.clock = 60
|
||||
this.clockText = '获取验证码'
|
||||
return
|
||||
}
|
||||
this.clock--
|
||||
if (this.clock < 10) this.clock = `0${this.clock}`
|
||||
this.clockText = `${this.clock} 秒`
|
||||
}, 1000)
|
||||
this.showCode()
|
||||
},
|
||||
// 验证码请求
|
||||
showCode() {
|
||||
return registerVerify({
|
||||
phone: this.account,
|
||||
type: this.type
|
||||
})
|
||||
.then(res => {
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
icon: "success",
|
||||
duration: 2000
|
||||
});
|
||||
this.sendCode();
|
||||
})
|
||||
.catch(err => {
|
||||
uni.showToast({
|
||||
title: err.msg || err.response.data.msg || err.response.data.message,
|
||||
icon: "none",
|
||||
duration: 2000
|
||||
});
|
||||
});
|
||||
},
|
||||
navTap(index) { this.current = index; },
|
||||
async submit() {
|
||||
const {
|
||||
account,
|
||||
password
|
||||
} = this;
|
||||
try {
|
||||
await this.$validator({
|
||||
account: [
|
||||
required(required.message("账号")),
|
||||
attrs.range([5, 16], attrs.range.message("账号")),
|
||||
alpha_num(alpha_num.message("账号"))
|
||||
],
|
||||
password: [
|
||||
required(required.message("密码")),
|
||||
attrs.range([6, 16], attrs.range.message("密码")),
|
||||
alpha_num(alpha_num.message("密码"))
|
||||
]
|
||||
}).validate({
|
||||
account,
|
||||
password
|
||||
});
|
||||
} catch (e) {
|
||||
return validatorDefaultCatch(e);
|
||||
}
|
||||
// 账号密码登录
|
||||
const res = await login({
|
||||
username: account,
|
||||
password,
|
||||
spread: cookie.get("spread")
|
||||
})
|
||||
if (res.status === 200) {
|
||||
this.$store.commit("login", res.data.token, dayjs(res.data.expires_time));
|
||||
handleGetUserInfo();
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: res.msg || res.response.data.msg || err.response.data.message,
|
||||
icon: "none",
|
||||
duration: 2000
|
||||
});
|
||||
}
|
||||
}
|
||||
export default {
|
||||
name: 'Login',
|
||||
mixins: [sendVerifyCode],
|
||||
data: function() {
|
||||
return {
|
||||
navList: ['手机号登录', '密码登录'],
|
||||
// navList: ["手机号登录",],
|
||||
current: 0,
|
||||
account: '',
|
||||
password: '',
|
||||
captcha: '',
|
||||
inviteCode: '',
|
||||
formItem: 1,
|
||||
type: 'login',
|
||||
timer: null,
|
||||
clock: 60,
|
||||
clockText: '验证码',
|
||||
}
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
async loginMobile() {
|
||||
var that = this
|
||||
const { account, captcha } = that
|
||||
try {
|
||||
await that
|
||||
.$validator({
|
||||
account: [required(required.message('手机号码')), chs_phone(chs_phone.message())],
|
||||
captcha: [required(required.message('验证码')), alpha_num(alpha_num.message('验证码'))],
|
||||
})
|
||||
.validate({
|
||||
account,
|
||||
captcha,
|
||||
})
|
||||
} catch (e) {
|
||||
return validatorDefaultCatch(e)
|
||||
}
|
||||
loginMobile({
|
||||
account: that.account,
|
||||
captcha: that.captcha,
|
||||
spread: cookie.get('spread'),
|
||||
})
|
||||
.then(res => {
|
||||
this.$store.commit('login', res.data.token, dayjs(res.data.expires_time))
|
||||
handleGetUserInfo()
|
||||
})
|
||||
.catch(err => {
|
||||
uni.showToast({
|
||||
title: res.msg || res.response.data.msg || err.response.data.message,
|
||||
icon: 'none',
|
||||
duration: 2000,
|
||||
})
|
||||
})
|
||||
// .then(res => {
|
||||
// that.$store.commit("login", res.data.token, dayjs(res.data.expires_time));
|
||||
// handleGetUserInfo();
|
||||
// })
|
||||
// .catch(err => {
|
||||
// console.log(err)
|
||||
// uni.showToast({
|
||||
// title: err.msg || err.response.data.msg || err.response.data.message,
|
||||
// icon: "none",
|
||||
// duration: 2000
|
||||
// });
|
||||
// });
|
||||
},
|
||||
async register() {
|
||||
var that = this
|
||||
const { account, captcha, password } = that
|
||||
try {
|
||||
await that
|
||||
.$validator({
|
||||
account: [required(required.message('手机号码')), chs_phone(chs_phone.message())],
|
||||
captcha: [required(required.message('验证码')), alpha_num(alpha_num.message('验证码'))],
|
||||
password: [required(required.message('密码')), attrs.range([6, 16], attrs.range.message('密码')), alpha_num(alpha_num.message('密码'))],
|
||||
})
|
||||
.validate({
|
||||
account,
|
||||
captcha,
|
||||
password,
|
||||
})
|
||||
} catch (e) {
|
||||
return validatorDefaultCatch(e)
|
||||
}
|
||||
register({
|
||||
account: that.account,
|
||||
captcha: that.captcha,
|
||||
password: that.password,
|
||||
inviteCode: that.inviteCode,
|
||||
spread: cookie.get('spread'),
|
||||
})
|
||||
.then(res => {
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
icon: 'success',
|
||||
duration: 2000,
|
||||
})
|
||||
that.formItem = 1
|
||||
})
|
||||
.catch(err => {
|
||||
uni.showToast({
|
||||
title: err.msg || err.response.data.msg || err.response.data.message,
|
||||
icon: 'none',
|
||||
duration: 2000,
|
||||
})
|
||||
})
|
||||
},
|
||||
// 获取验证码
|
||||
async code() {
|
||||
const { account } = this
|
||||
try {
|
||||
await this.$validator({
|
||||
account: [required(required.message('手机号码')), chs_phone(chs_phone.message())],
|
||||
}).validate({
|
||||
account,
|
||||
})
|
||||
} catch (e) {
|
||||
return validatorDefaultCatch(e)
|
||||
}
|
||||
if (this.formItem == 2) this.type = 'register'
|
||||
this.showCode()
|
||||
},
|
||||
// 手机号登录获取验证码
|
||||
async sendCode() {
|
||||
const { account } = this
|
||||
try {
|
||||
await this.$validator({
|
||||
account: [required(required.message('手机号码')), chs_phone(chs_phone.message())],
|
||||
}).validate({
|
||||
account,
|
||||
})
|
||||
} catch (e) {
|
||||
return validatorDefaultCatch(e)
|
||||
}
|
||||
// 倒计时
|
||||
if (this.clock !== 60) {
|
||||
return
|
||||
}
|
||||
this.clock--
|
||||
this.clockText = `${this.clock} 秒`
|
||||
this.timer = setInterval(() => {
|
||||
if (parseInt(this.clock) === 1) {
|
||||
clearTimeout(this.timer)
|
||||
this.clock = 60
|
||||
this.clockText = '获取验证码'
|
||||
return
|
||||
}
|
||||
this.clock--
|
||||
if (this.clock < 10) this.clock = `0${this.clock}`
|
||||
this.clockText = `${this.clock} 秒`
|
||||
}, 1000)
|
||||
this.showCode()
|
||||
},
|
||||
// 验证码请求
|
||||
showCode() {
|
||||
return registerVerify({
|
||||
phone: this.account,
|
||||
type: this.type,
|
||||
})
|
||||
.then(res => {
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
icon: 'success',
|
||||
duration: 2000,
|
||||
})
|
||||
this.sendCode()
|
||||
})
|
||||
.catch(err => {
|
||||
uni.showToast({
|
||||
title: err.msg || err.response.data.msg || err.response.data.message,
|
||||
icon: 'none',
|
||||
duration: 2000,
|
||||
})
|
||||
})
|
||||
},
|
||||
navTap(index) {
|
||||
this.current = index
|
||||
},
|
||||
async submit() {
|
||||
const { account, password } = this
|
||||
try {
|
||||
await this.$validator({
|
||||
account: [required(required.message('账号')), attrs.range([5, 16], attrs.range.message('账号')), alpha_num(alpha_num.message('账号'))],
|
||||
password: [required(required.message('密码')), attrs.range([6, 16], attrs.range.message('密码')), alpha_num(alpha_num.message('密码'))],
|
||||
}).validate({
|
||||
account,
|
||||
password,
|
||||
})
|
||||
} catch (e) {
|
||||
return validatorDefaultCatch(e)
|
||||
}
|
||||
|
||||
login({
|
||||
username: account,
|
||||
password,
|
||||
spread: cookie.get('spread'),
|
||||
})
|
||||
.then(res => {
|
||||
this.$store.commit('login', res.data.token, dayjs(res.data.expires_time))
|
||||
handleGetUserInfo()
|
||||
})
|
||||
.catch(err => {
|
||||
uni.showToast({
|
||||
title: err.msg || err.response.data.msg || err.response.data.message,
|
||||
icon: 'none',
|
||||
duration: 2000,
|
||||
})
|
||||
})
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
.register .whiteBg .title .item{
|
||||
border-bottom: 2px solid;
|
||||
.register .whiteBg .title .item {
|
||||
border-bottom: 2px solid;
|
||||
}
|
||||
.register .whiteBg .title .item.on{
|
||||
border-bottom-color: #f35749;
|
||||
.register .whiteBg .title .item.on {
|
||||
border-bottom-color: #f35749;
|
||||
}
|
||||
.getPhoneCode{
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
.phoneInput{
|
||||
width: 70%;
|
||||
}
|
||||
.phoneCode{
|
||||
width: 30%;
|
||||
text-align: center;
|
||||
color: #FFFFFF;
|
||||
background-color: #f35749;
|
||||
padding: 12rpx;
|
||||
font-size: 28rpx;
|
||||
border-radius: 30rpx;
|
||||
}
|
||||
.getPhoneCode {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
.phoneInput {
|
||||
width: 70%;
|
||||
}
|
||||
.phoneCode {
|
||||
width: 30%;
|
||||
text-align: center;
|
||||
color: #ffffff;
|
||||
background-color: #f35749;
|
||||
padding: 12rpx;
|
||||
font-size: 28rpx;
|
||||
border-radius: 30rpx;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user