fix

controllers/admin.go

@@ -47,6 +47,7 @@ func (c *AdminCommon) Login() {
 	}
 	if adminWx.Enabled != 1 {
 		c.FailWithMessage("账户信息异常！", "账户状态异常，不允许登录")
+		return
 	}
 	err = h5_admin_session.UpdateSession(c.Session.SessionId, adminWx.AdminId, time.Now().AddDate(0, 0, 90))
 	if err != nil {

controllers/wechat.go

@@ -54,9 +54,9 @@ func (c *WeChatCommon) WeChatLogin() {
 		return
 	}
 
-	token, adminWx, err := services.WxLogin(utils.WxPlatform, item, wxUserInfo)
+	token, adminWx, err, errMsg := services.WxLogin(utils.WxPlatform, item, wxUserInfo)
 	if err != nil {
-		c.FailWithMessage("微信登录失败", "微信登录失败，err:"+err.Error())
+		c.FailWithMessage(errMsg, "微信登录失败，err:"+err.Error())
 		return
 	}
 
@@ -148,9 +148,9 @@ func (c *WeChatCommon) WxAppLogin() {
 	fmt.Println("openId", wxInfo.OpenID)
 	fmt.Println("unionId", wxInfo.UnionID)
 
-	token, adminWx, err := services.WxLogin(utils.WxPlatform2, item, wxUserInfo)
+	token, adminWx, err, errMsg := services.WxLogin(utils.WxPlatform2, item, wxUserInfo)
 	if err != nil {
-		c.FailWithMessage("微信登录失败", "微信登录失败，err:"+err.Error())
+		c.FailWithMessage(errMsg, "微信登录失败，err:"+err.Error())
 		return
 	}
 

services/admin.go

@@ -198,7 +198,8 @@ func UnbindWxUser(openid string) (err error) {
 }
 
 //微信登录
-func WxLogin(wxPlatform int, wxAccessToken *WxAccessToken, wxUserInfo *WxUserInfo) (token string, adminWx *custom.AdminWx, err error) {
+func WxLogin(wxPlatform int, wxAccessToken *WxAccessToken, wxUserInfo *WxUserInfo) (token string, adminWx *custom.AdminWx, err error, errMsg string) {
+	errMsg = `微信登录失败`
 	openId := wxAccessToken.Openid
 	unionId := wxAccessToken.Unionid
 	if unionId == "" {
@@ -226,6 +227,11 @@ QUERY_WX_USER:
 	}
 
 	adminId := adminWx.AdminId
+	if adminWx.Enabled != 1 {
+		err = errors.New("账户状态异常，不允许登录")
+		errMsg = `账户信息异常！`
+		return
+	}
 
 	//获取登录token
 	tokenItem, tokenErr := h5_admin_session.GetTokenByOpenId(openId)