|
@@ -50,14 +50,33 @@ func (this *UserController) Login() {
|
|
|
return
|
|
|
}
|
|
|
newUserId := 0
|
|
|
- if req.LoginType == 1 {
|
|
|
- if req.Mobile=="" {
|
|
|
+ if req.LoginType == 1 || req.LoginType == 3 {
|
|
|
+ if req.Mobile == "" {
|
|
|
br.Msg = "参数错误"
|
|
|
br.ErrMsg = "参数错误,手机号为空 为空"
|
|
|
return
|
|
|
}
|
|
|
+ if req.LoginType == 3 {
|
|
|
+ item, err := models.GetMsgCode(req.Mobile, req.VCode)
|
|
|
+ if err != nil {
|
|
|
+ if err.Error() == utils.ErrNoRow() {
|
|
|
+ br.Msg = "验证码错误,请重新输入"
|
|
|
+ br.ErrMsg = "校验验证码失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ } else {
|
|
|
+ br.Msg = "验证码错误,请重新输入"
|
|
|
+ br.ErrMsg = "校验验证码失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if item == nil {
|
|
|
+ br.Msg = "验证码错误,请重新输入"
|
|
|
+ return
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
req.Mobile = strings.Trim(req.Mobile, " ")
|
|
|
+ req.LoginType = 1
|
|
|
newUserId, err = models.PcBindMobile(unionId, req.Mobile, userId, req.LoginType)
|
|
|
} else if req.LoginType == 2 {
|
|
|
if req.Email == "" {
|
|
@@ -70,6 +89,22 @@ func (this *UserController) Login() {
|
|
|
br.Msg = "邮箱格式错误,请重新输入"
|
|
|
return
|
|
|
}
|
|
|
+ item, err := models.GetMsgCode(req.Mobile, req.VCode)
|
|
|
+ if err != nil {
|
|
|
+ if err.Error() == utils.ErrNoRow() {
|
|
|
+ br.Msg = "验证码错误,请重新输入"
|
|
|
+ br.ErrMsg = "校验验证码失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ } else {
|
|
|
+ br.Msg = "验证码错误,请重新输入"
|
|
|
+ br.ErrMsg = "校验验证码失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if item == nil {
|
|
|
+ br.Msg = "验证码错误,请重新输入"
|
|
|
+ return
|
|
|
+ }
|
|
|
newUserId, err = models.PcBindMobile(unionId, req.Email, userId, req.LoginType)
|
|
|
} else {
|
|
|
br.Msg = "无效的登录方式"
|