fix:用户登录

services/user.go

@@ -27,11 +27,11 @@ func BindUser(unionId, openId, phone, email, areaCode string) (userItem *models.
 	curTime := time.Now()
 	if userItem != nil {
 		userId = userItem.UserId
-		if userItem.Phone != "" && userItem.Phone != phone {
+		if userItem.Phone != "" && userItem.Phone != phone && phone != "" {
 			errMsg = "该手机号已绑定其他微信号"
 			return
 		}
-		if userItem.Email != "" && userItem.Email != email {
+		if userItem.Email != "" && userItem.Email != email && email != "" {
 			errMsg = "该邮箱已绑定其他微信号"
 			return
 		}
@@ -136,13 +136,13 @@ func BindUser(unionId, openId, phone, email, areaCode string) (userItem *models.
 	}
 	if !userItem.IsSubscribed {
 		userRecord, er := models.GetBindUserRecordByUnionId(userItem.UnionId)
-		if er != nil && err.Error() != utils.ErrNoRow() {
+		if er != nil && er.Error() != utils.ErrNoRow() {
 			err = errors.New("获取用户关注记录失败")
 			return
 		}
 		userRecord.UserId = userId
-		err = userRecord.Update([]string{"user_id"})
-		if err != nil {
+		er = userRecord.Update([]string{"user_id"})
+		if er != nil {
 			return
 		}
 	}