fix

controller/auth.go

@@ -39,17 +39,17 @@ func (a *AuthController) Login(c *gin.Context) {
 	if req.Type == 1 {
 		userEmail, err = emailItem.GetByEmail(req.Account)
 		if err != nil || userEmail.IsDeleted == 1 {
-			if err == utils.ErrNoRow {
+			if err == utils.ErrNoRow || userEmail.IsDeleted == 1 {
 				resp.Unregistered("账号未注册", c)
 				return
 			}
-			resp.Unregistered("账号未注册.", c)
+			resp.FailData("获取客户邮箱信息失败 ", "Err:"+err.Error(), c)
 			return
 		}
 	} else {
 		userEmail, err := emailItem.GetByMobile(req.Account, req.CountryCode)
 		if err != nil || userEmail.IsDeleted == 1 {
-			if err == utils.ErrNoRow {
+			if err == utils.ErrNoRow || userEmail.IsDeleted == 1 {
 				resp.Unbound("手机号未绑定", c)
 				return
 			}
@@ -216,12 +216,12 @@ func (a *AuthController) ModifyPwd(c *gin.Context) {
 	userinfo := services.GetInfoByClaims(c)
 
 	if req.NewPwd == "" {
-		resp.Fail("新密码不能为空", c)
+		resp.Fail("Please enter a new password", c)
 		return
 	}
 
 	if req.OldPwd == "" {
-		resp.Fail("旧密码不能为空", c)
+		resp.Fail("Please enter the original password", c)
 		return
 	}
 
@@ -412,7 +412,7 @@ func (a *AuthController) ForgetPwd(c *gin.Context) {
 	}
 
 	if req.Password == "" {
-		resp.Fail("新密码不能为空", c)
+		resp.Fail("Please enter a new password", c)
 		return
 	}
 
@@ -421,7 +421,7 @@ func (a *AuthController) ForgetPwd(c *gin.Context) {
 	if req.Type == 1 {
 		userEmail, err = emailItem.GetByEmail(req.Account)
 		if err != nil || userEmail.IsDeleted == 1 {
-			if err == utils.ErrNoRow {
+			if err == utils.ErrNoRow || userEmail.IsDeleted == 1 {
 				resp.Unregistered("账号未注册", c)
 				return
 			}
@@ -431,7 +431,7 @@ func (a *AuthController) ForgetPwd(c *gin.Context) {
 	} else {
 		userEmail, err = emailItem.GetByMobile(req.Account, req.CountryCode)
 		if err != nil || userEmail.IsDeleted == 1 {
-			if err == utils.ErrNoRow {
+			if err == utils.ErrNoRow || userEmail.IsDeleted == 1 {
 				resp.Unbound("手机号未绑定", c)
 				return
 			}
@@ -481,12 +481,12 @@ func (a *AuthController) ModifyMobile(c *gin.Context) {
 	userinfo := services.GetInfoByClaims(c)
 
 	if req.NewMobile == "" {
-		resp.Fail("新密码不能为空", c)
+		resp.Fail("Please enter a new password", c)
 		return
 	}
 
 	if req.OldMobile == "" {
-		resp.Fail("旧密码不能为空", c)
+		resp.Fail("Please enter the original password", c)
 		return
 	}