From a20e8b80cc5fd04e0fe0da0d8de4670365dc8d28 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Sun, 24 Jul 2022 11:57:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E4=B8=AD?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AE=9E=E5=90=8D=E5=AE=A1=E6=A0=B8=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/web/actions/default/users/index.go | 32 +++++++++++++--------
 web/views/@default/users/index.html         |  7 +++--
 web/views/@default/users/user.html          |  2 +-
 3 files changed, 26 insertions(+), 15 deletions(-)

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 @@
                 <keyword :v-word="keyword">{{user.username}}</keyword>
             </a>
             <div v-if="!user.isVerified">
-                <grey-label color="red">未审核</grey-label>
+                <a :href="'/users/user?userId=' + user.id"><grey-label color="red"><i class="icon info circle"></i>信息未审核</grey-label></a>
             </div>
             <div v-if="user.isRejected">
-                <grey-label color="red">已拒绝</grey-label>
+                <grey-label color="red"><i class="icon info circle"></i>信息已拒绝</grey-label>
+            </div>
+            <div v-if="user.identityIsSubmitted">
+                <a :href="'/users/identity?userId=' + user.id"><grey-label color="red"><i class="icon address card"></i>实名未审核</grey-label></a>
             </div>
         </td>
         <td :class="{disabled:!user.isOn}">
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 @@
         <td>状态</td>
         <td>
             <span v-if="!user.isVerified" class="red">
-                未审核 &nbsp; <a href="" @click.prevent="verify">[审核]</a>
+                信息未审核 &nbsp; <a href="" @click.prevent="verify">[审核]</a>
             </span>
             <span v-else-if="user.isRejected" class="red">已拒绝
                  &nbsp; <a href="" @click.prevent="verify">[重新审核]</a>