diff --git a/internal/web/actions/default/users/index.go b/internal/web/actions/default/users/index.go index ce1bdcb1..f2981d90 100644 --- a/internal/web/actions/default/users/index.go +++ b/internal/web/actions/default/users/index.go @@ -16,9 +16,16 @@ func (this *IndexAction) Init() { } func (this *IndexAction) RunGet(params struct { - Keyword string + Keyword string + Verifying bool }) { - countResp, err := this.RPC().UserRPC().CountAllEnabledUsers(this.AdminContext(), &pb.CountAllEnabledUsersRequest{Keyword: params.Keyword}) + this.Data["keyword"] = params.Keyword + this.Data["isVerifying"] = params.Verifying + + countResp, err := this.RPC().UserRPC().CountAllEnabledUsers(this.AdminContext(), &pb.CountAllEnabledUsersRequest{ + Keyword: params.Keyword, + IsVerifying: params.Verifying, + }) if err != nil { this.ErrorPage(err) return @@ -28,9 +35,10 @@ func (this *IndexAction) RunGet(params struct { this.Data["page"] = page.AsHTML() usersResp, err := this.RPC().UserRPC().ListEnabledUsers(this.AdminContext(), &pb.ListEnabledUsersRequest{ - Keyword: params.Keyword, - Offset: page.Offset, - Size: page.Size, + Keyword: params.Keyword, + IsVerifying: params.Verifying, + Offset: page.Offset, + Size: page.Size, }) if err != nil { this.ErrorPage(err) diff --git a/web/views/@default/users/index.html b/web/views/@default/users/index.html index e6620e1e..7dc2a14a 100644 --- a/web/views/@default/users/index.html +++ b/web/views/@default/users/index.html @@ -1,9 +1,27 @@ {$layout} - 创建 + 全部用户 + 待审核 + | + [创建用户] +
+
+ +
+
+ +
+
+ +   + [清除条件] +
+
+
+

暂时还没有用户。

@@ -19,7 +37,9 @@ - +
- {{user.username}} + + {{user.username}} +
未审核
@@ -27,13 +47,15 @@ 已拒绝
{{user.fullname}} + {{user.fullname}} + {{user.cluster.name}} - - {{user.mobile}} + {{user.mobile}} - {{user.createdTime}}