xiugai

src/github.com/baiy/Cadmin-server-go/system/index/index.go

@@ -30,7 +30,6 @@ func Login(context *admin.Context) (interface{}, error) {
 		Username  string `form:"username"     validate:"required"`
 		Password  string `form:"password"     validate:"required"`
 		Code      string `form:"code"`
-		Phone     string `form:"phone"`
 		PhoneCode string `form:"phoneCode"`
 		LoginType string `form:"loginType"`
 	})
@@ -95,20 +94,16 @@ func Login(context *admin.Context) (interface{}, error) {
 	}
 
 	if param.LoginType == "2" { //点击发送手机验证码
-		_, err := user.GetByPhone(param.Phone)
-		if err != nil {
-			return nil, err
-		}
-		if SendPhoneIdentCode(context, param.Phone) {
-			return map[string]interface{}{"status": 3}, nil
+		if u.Phone != "" {
+			if SendPhoneIdentCode(context, u.Phone) {
+				return map[string]interface{}{"status": 3}, nil
+			} else {
+				return nil, errors.New("手机验证码发送失败")
+			}
 		} else {
-			return nil, errors.New("手机验证码发送失败")
+			return nil, errors.New("未获取到手机号")
 		}
 	} else if param.LoginType == "3" { //验证手机验证码
-		_, err := user.GetByPhone(param.Phone)
-		if err != nil {
-			return nil, err
-		}
 		session, err := store.Get(context.HttpRequest, "qmx_phone_code")
 		if err != nil {
 			log.Println("phone-session2获取失败")