From 090422083a844cdc8c505a490b9cf79c9d5dfbb2 Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Thu, 3 Nov 2022 15:01:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E5=BC=B9=E5=8A=BE=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_msgdistrib.json       |  6 ++++++
 cmd/v2/ui/views/sociaty_mine.go     | 21 ++++++++++++++++-----
 modules/sociaty/api.go              |  1 +
 modules/sociaty/api_cross_accuse.go |  8 ++++----
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/bin/json/game_msgdistrib.json b/bin/json/game_msgdistrib.json
index 8964c17b0..6cdb1276c 100644
--- a/bin/json/game_msgdistrib.json
+++ b/bin/json/game_msgdistrib.json
@@ -310,5 +310,11 @@
     "open": true,
     "routrules": "~/worker",
     "describe": "公会日志列表"
+  },
+  {
+    "msgid": "sociaty.accuse",
+    "open": true,
+    "routrules": "~/worker",
+    "describe": "弹劾"
   }
 ]
\ No newline at end of file
diff --git a/cmd/v2/ui/views/sociaty_mine.go b/cmd/v2/ui/views/sociaty_mine.go
index a9bdbe83f..f46914e46 100644
--- a/cmd/v2/ui/views/sociaty_mine.go
+++ b/cmd/v2/ui/views/sociaty_mine.go
@@ -430,10 +430,22 @@ func (this *SociatyMineView) showSociatyMemberWin() {
 	})
 
 	//弹劾
-	tanheBtn := widget.NewButton("弹劾", nil)
+	tanheBtn := widget.NewButton("弹劾", func() {
+		dialog.ShowConfirm("提示", "确定弹劾会长?", func(b bool) {
+			if !b {
+				return
+			}
+			if err := service.GetPttService().SendToClient(
+				string(comm.ModuleSociaty),
+				sociaty.SociatySubTypeAccuse,
+				&pb.SociatyAccuseReq{},
+			); err != nil {
+				logrus.Error(err)
+				return
+			}
 
-	// 退出
-	quitBtn := widget.NewButton("退出", nil)
+		}, this.w)
+	})
 
 	// 转让
 	zhuanrangBtn := widget.NewButton("转让", func() {
@@ -526,11 +538,10 @@ func (this *SociatyMineView) showSociatyMemberWin() {
 		this.job == pb.SociatyJob_ADMIN {
 		btns.Add(tirenBtn)
 		btns.Add(tanheBtn)
-		btns.Add(quitBtn)
 	}
 	// 成员
 	if this.job == pb.SociatyJob_MEMBER {
-		btns.Add(quitBtn)
+		btns.Add(tanheBtn)
 	}
 
 	c := container.NewBorder(btns, nil, nil, nil, this.memberList.ItemList)
diff --git a/modules/sociaty/api.go b/modules/sociaty/api.go
index a976181e5..142429373 100644
--- a/modules/sociaty/api.go
+++ b/modules/sociaty/api.go
@@ -17,6 +17,7 @@ const (
 	SociatySubTypeCancel          = "cancel"
 	SociatySubTypeDismiss         = "dismiss"
 	SociatySubTypeQuit            = "quit"
+	SociatySubTypeAccuse          = "accuse"
 	SociatySubTypeAgree           = "agree"
 	SociatySubTypeRefuse          = "refuse"
 	SociatySubTypeSetting         = "setting"
diff --git a/modules/sociaty/api_cross_accuse.go b/modules/sociaty/api_cross_accuse.go
index de0522578..c39bc73fc 100644
--- a/modules/sociaty/api_cross_accuse.go
+++ b/modules/sociaty/api_cross_accuse.go
@@ -9,12 +9,12 @@ import (
 
 // 弹劾会长
 
-func (this *apiComp) AsscuseCheck(session comm.IUserSession, req *pb.SociatyAccuseReq) (code pb.ErrorCode) {
+func (this *apiComp) AccuseCheck(session comm.IUserSession, req *pb.SociatyAccuseReq) (code pb.ErrorCode) {
 	return
 }
 
-func (this *apiComp) Asscuse(session comm.IUserSession, req *pb.SociatyAccuseReq) (code pb.ErrorCode, data proto.Message) {
-	if code = this.AsscuseCheck(session, req); code != pb.ErrorCode_Success {
+func (this *apiComp) Accuse(session comm.IUserSession, req *pb.SociatyAccuseReq) (code pb.ErrorCode, data proto.Message) {
+	if code = this.AccuseCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}
 	uid := session.GetUserId()
@@ -43,7 +43,7 @@ func (this *apiComp) Asscuse(session comm.IUserSession, req *pb.SociatyAccuseReq
 		SociatyId: sociaty.Id,
 	}
 
-	if err := session.SendMsg(string(this.module.GetType()), SociatySubTypeAgree, rsp); err != nil {
+	if err := session.SendMsg(string(this.module.GetType()), SociatySubTypeAccuse, rsp); err != nil {
 		code = pb.ErrorCode_SystemError
 	}
 	return