diff --git a/internal/web/actions/default/users/index.go b/internal/web/actions/default/users/index.go index 2153cd11..513a6998 100644 --- a/internal/web/actions/default/users/index.go +++ b/internal/web/actions/default/users/index.go @@ -65,19 +65,27 @@ func (this *IndexAction) RunGet(params struct { } } + isSubmittedResp, err := this.RPC().UserIdentityRPC().CheckUserIdentityIsSubmitted(this.AdminContext(), &pb.CheckUserIdentityIsSubmittedRequest{UserId: user.Id}) + if err != nil { + this.ErrorPage(err) + return + } + var identityIsSubmitted = isSubmittedResp.IsSubmitted + userMaps = append(userMaps, maps.Map{ - "id": user.Id, - "username": user.Username, - "isOn": user.IsOn, - "fullname": user.Fullname, - "email": user.Email, - "mobile": user.Mobile, - "tel": user.Tel, - "createdTime": timeutil.FormatTime("Y-m-d H:i:s", user.CreatedAt), - "cluster": clusterMap, - "registeredIP": user.RegisteredIP, - "isVerified": user.IsVerified, - "isRejected": user.IsRejected, + "id": user.Id, + "username": user.Username, + "isOn": user.IsOn, + "fullname": user.Fullname, + "email": user.Email, + "mobile": user.Mobile, + "tel": user.Tel, + "createdTime": timeutil.FormatTime("Y-m-d H:i:s", user.CreatedAt), + "cluster": clusterMap, + "registeredIP": user.RegisteredIP, + "isVerified": user.IsVerified, + "isRejected": user.IsRejected, + "identityIsSubmitted": identityIsSubmitted, }) } this.Data["users"] = userMaps diff --git a/web/views/@default/users/index.html b/web/views/@default/users/index.html index 6a28b2e8..55a98153 100644 --- a/web/views/@default/users/index.html +++ b/web/views/@default/users/index.html @@ -41,10 +41,13 @@ {{user.username}}
- 未审核 + 信息未审核
- 已拒绝 + 信息已拒绝 +
+
+ 实名未审核
diff --git a/web/views/@default/users/user.html b/web/views/@default/users/user.html index 8acdac18..f09a1d60 100644 --- a/web/views/@default/users/user.html +++ b/web/views/@default/users/user.html @@ -6,7 +6,7 @@ 状态 - 未审核   [审核] + 信息未审核   [审核] 已拒绝   [重新审核]