feat(admin-user): 增加所属站点展示与筛选
This commit is contained in:
@@ -4,6 +4,9 @@ import "time"
|
|||||||
|
|
||||||
type UserDTO struct {
|
type UserDTO struct {
|
||||||
ID uint64 `json:"id"`
|
ID uint64 `json:"id"`
|
||||||
|
TenantID uint64 `json:"tenant_id"`
|
||||||
|
TenantCode string `json:"tenant_code"`
|
||||||
|
TenantName string `json:"tenant_name"`
|
||||||
Phone string `json:"phone"`
|
Phone string `json:"phone"`
|
||||||
Nickname string `json:"nickname"`
|
Nickname string `json:"nickname"`
|
||||||
RealnameStatus string `json:"realname_status"`
|
RealnameStatus string `json:"realname_status"`
|
||||||
@@ -75,6 +78,7 @@ type WalletAdjustRequest struct {
|
|||||||
// ListQuery 用户列表筛选条件。Keyword 同时匹配手机号/昵称(模糊)与用户 ID(精确)。
|
// ListQuery 用户列表筛选条件。Keyword 同时匹配手机号/昵称(模糊)与用户 ID(精确)。
|
||||||
type ListQuery struct {
|
type ListQuery struct {
|
||||||
Keyword string
|
Keyword string
|
||||||
|
TenantID uint64
|
||||||
Status string
|
Status string
|
||||||
HasDepositFreeQuota bool
|
HasDepositFreeQuota bool
|
||||||
QualityOwnerOnly bool
|
QualityOwnerOnly bool
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ func (h *Handler) List(c *gin.Context) {
|
|||||||
page, pageSize := parsePagination(c)
|
page, pageSize := parsePagination(c)
|
||||||
query := ListQuery{
|
query := ListQuery{
|
||||||
Keyword: strings.TrimSpace(c.Query("keyword")),
|
Keyword: strings.TrimSpace(c.Query("keyword")),
|
||||||
|
TenantID: parseOptionalUint(c.Query("tenant_id")),
|
||||||
Status: strings.TrimSpace(c.Query("status")),
|
Status: strings.TrimSpace(c.Query("status")),
|
||||||
HasDepositFreeQuota: parseBoolQuery(c.Query("has_deposit_free_quota")),
|
HasDepositFreeQuota: parseBoolQuery(c.Query("has_deposit_free_quota")),
|
||||||
QualityOwnerOnly: parseBoolQuery(c.Query("quality_owner_only")),
|
QualityOwnerOnly: parseBoolQuery(c.Query("quality_owner_only")),
|
||||||
@@ -54,6 +55,14 @@ func (h *Handler) List(c *gin.Context) {
|
|||||||
response.OK(c, result)
|
response.OK(c, result)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func parseOptionalUint(value string) uint64 {
|
||||||
|
parsed, err := strconv.ParseUint(strings.TrimSpace(value), 10, 64)
|
||||||
|
if err != nil {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
return parsed
|
||||||
|
}
|
||||||
|
|
||||||
func parseBoolQuery(value string) bool {
|
func parseBoolQuery(value string) bool {
|
||||||
switch strings.ToLower(strings.TrimSpace(value)) {
|
switch strings.ToLower(strings.TrimSpace(value)) {
|
||||||
case "1", "true", "yes", "on":
|
case "1", "true", "yes", "on":
|
||||||
|
|||||||
@@ -60,13 +60,14 @@ func (r *Repository) List(ctx context.Context, page, pageSize int, query ListQue
|
|||||||
offset := (page - 1) * pageSize
|
offset := (page - 1) * pageSize
|
||||||
var rows []userRow
|
var rows []userRow
|
||||||
listTx := r.db.WithContext(ctx).Table("users AS u").
|
listTx := r.db.WithContext(ctx).Table("users AS u").
|
||||||
Select(`u.*,
|
Select(`u.*, COALESCE(t.code, '') AS tenant_code, COALESCE(t.name, '') AS tenant_name,
|
||||||
COALESCE(o.order_count, 0) AS order_count,
|
COALESCE(o.order_count, 0) AS order_count,
|
||||||
COALESCE(l.listing_count, 0) AS listing_count,
|
COALESCE(l.listing_count, 0) AS listing_count,
|
||||||
COALESCE(d.dispute_count, 0) AS dispute_count,
|
COALESCE(d.dispute_count, 0) AS dispute_count,
|
||||||
COALESCE(df.deposit_free_used_cent, 0) AS deposit_free_used_cent,
|
COALESCE(df.deposit_free_used_cent, 0) AS deposit_free_used_cent,
|
||||||
COALESCE(w.available_balance_cent, 0) AS available_balance_cent,
|
COALESCE(w.available_balance_cent, 0) AS available_balance_cent,
|
||||||
COALESCE(w.frozen_balance_cent, 0) AS frozen_balance_cent`).
|
COALESCE(w.frozen_balance_cent, 0) AS frozen_balance_cent`).
|
||||||
|
Joins("LEFT JOIN tenants AS t ON t.id = u.tenant_id").
|
||||||
Joins("LEFT JOIN (SELECT user_id, COUNT(*) AS order_count FROM (SELECT renter_id AS user_id FROM rental_orders UNION ALL SELECT owner_id AS user_id FROM rental_orders) AS order_users GROUP BY user_id) AS o ON o.user_id = u.id").
|
Joins("LEFT JOIN (SELECT user_id, COUNT(*) AS order_count FROM (SELECT renter_id AS user_id FROM rental_orders UNION ALL SELECT owner_id AS user_id FROM rental_orders) AS order_users GROUP BY user_id) AS o ON o.user_id = u.id").
|
||||||
Joins("LEFT JOIN (SELECT owner_id AS user_id, COUNT(*) AS listing_count FROM rental_listings GROUP BY owner_id) AS l ON l.user_id = u.id").
|
Joins("LEFT JOIN (SELECT owner_id AS user_id, COUNT(*) AS listing_count FROM rental_listings GROUP BY owner_id) AS l ON l.user_id = u.id").
|
||||||
Joins("LEFT JOIN (SELECT user_id, COUNT(*) AS dispute_count FROM (SELECT initiator_id AS user_id FROM disputes UNION ALL SELECT target_user_id AS user_id FROM disputes) AS dispute_users GROUP BY user_id) AS d ON d.user_id = u.id").
|
Joins("LEFT JOIN (SELECT user_id, COUNT(*) AS dispute_count FROM (SELECT initiator_id AS user_id FROM disputes UNION ALL SELECT target_user_id AS user_id FROM disputes) AS dispute_users GROUP BY user_id) AS d ON d.user_id = u.id").
|
||||||
@@ -86,7 +87,8 @@ func (r *Repository) List(ctx context.Context, page, pageSize int, query ListQue
|
|||||||
if page == 1 && len(rows) < pageSize {
|
if page == 1 && len(rows) < pageSize {
|
||||||
total = int64(len(rows))
|
total = int64(len(rows))
|
||||||
} else {
|
} else {
|
||||||
countTx := applyUserFilter(r.db.WithContext(ctx).Table("users AS u"), query, growthConfig)
|
countTx := applyUserFilter(r.db.WithContext(ctx).Table("users AS u").
|
||||||
|
Joins("LEFT JOIN tenants AS t ON t.id = u.tenant_id"), query, growthConfig)
|
||||||
if err := countTx.Count(&total).Error; err != nil {
|
if err := countTx.Count(&total).Error; err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -104,6 +106,9 @@ func applyUserFilter(tx *gorm.DB, query ListQuery, growthConfig rentergrowth.Con
|
|||||||
if query.Status != "" {
|
if query.Status != "" {
|
||||||
tx = tx.Where("u.status = ?", query.Status)
|
tx = tx.Where("u.status = ?", query.Status)
|
||||||
}
|
}
|
||||||
|
if query.TenantID > 0 {
|
||||||
|
tx = tx.Where("u.tenant_id = ?", query.TenantID)
|
||||||
|
}
|
||||||
depositFreeQuota := query.DepositFreeQuota
|
depositFreeQuota := query.DepositFreeQuota
|
||||||
if depositFreeQuota == "" && query.HasDepositFreeQuota {
|
if depositFreeQuota == "" && query.HasDepositFreeQuota {
|
||||||
depositFreeQuota = "has"
|
depositFreeQuota = "has"
|
||||||
@@ -136,10 +141,10 @@ func applyUserFilter(tx *gorm.DB, query ListQuery, growthConfig rentergrowth.Con
|
|||||||
} else if id, err := strconv.ParseUint(keyword, 10, 64); err == nil && id > 0 && keyword[0] != '0' && id < 100000000 {
|
} else if id, err := strconv.ParseUint(keyword, 10, 64); err == nil && id > 0 && keyword[0] != '0' && id < 100000000 {
|
||||||
// 纯数字 ID:一并按用户 ID 精确匹配
|
// 纯数字 ID:一并按用户 ID 精确匹配
|
||||||
like := "%" + keyword + "%"
|
like := "%" + keyword + "%"
|
||||||
tx = tx.Where("u.id = ? OR u.phone LIKE ? OR u.nickname LIKE ?", id, like, like)
|
tx = tx.Where("u.id = ? OR u.phone LIKE ? OR u.nickname LIKE ? OR t.name LIKE ? OR t.code LIKE ?", id, like, like, like, like)
|
||||||
} else {
|
} else {
|
||||||
like := "%" + keyword + "%"
|
like := "%" + keyword + "%"
|
||||||
tx = tx.Where("u.phone LIKE ? OR u.nickname LIKE ?", like, like)
|
tx = tx.Where("u.phone LIKE ? OR u.nickname LIKE ? OR t.name LIKE ? OR t.code LIKE ?", like, like, like, like)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return tx
|
return tx
|
||||||
@@ -529,13 +534,14 @@ func (r *Repository) Find(ctx context.Context, userID uint64) (*UserDTO, error)
|
|||||||
}
|
}
|
||||||
var row userRow
|
var row userRow
|
||||||
err = r.db.WithContext(ctx).Table("users AS u").
|
err = r.db.WithContext(ctx).Table("users AS u").
|
||||||
Select(`u.*,
|
Select(`u.*, COALESCE(t.code, '') AS tenant_code, COALESCE(t.name, '') AS tenant_name,
|
||||||
COALESCE(o.order_count, 0) AS order_count,
|
COALESCE(o.order_count, 0) AS order_count,
|
||||||
COALESCE(l.listing_count, 0) AS listing_count,
|
COALESCE(l.listing_count, 0) AS listing_count,
|
||||||
COALESCE(d.dispute_count, 0) AS dispute_count,
|
COALESCE(d.dispute_count, 0) AS dispute_count,
|
||||||
COALESCE(df.deposit_free_used_cent, 0) AS deposit_free_used_cent,
|
COALESCE(df.deposit_free_used_cent, 0) AS deposit_free_used_cent,
|
||||||
COALESCE(w.available_balance_cent, 0) AS available_balance_cent,
|
COALESCE(w.available_balance_cent, 0) AS available_balance_cent,
|
||||||
COALESCE(w.frozen_balance_cent, 0) AS frozen_balance_cent`).
|
COALESCE(w.frozen_balance_cent, 0) AS frozen_balance_cent`).
|
||||||
|
Joins("LEFT JOIN tenants AS t ON t.id = u.tenant_id").
|
||||||
Joins("LEFT JOIN (SELECT user_id, COUNT(*) AS order_count FROM (SELECT renter_id AS user_id FROM rental_orders UNION ALL SELECT owner_id AS user_id FROM rental_orders) AS order_users GROUP BY user_id) AS o ON o.user_id = u.id").
|
Joins("LEFT JOIN (SELECT user_id, COUNT(*) AS order_count FROM (SELECT renter_id AS user_id FROM rental_orders UNION ALL SELECT owner_id AS user_id FROM rental_orders) AS order_users GROUP BY user_id) AS o ON o.user_id = u.id").
|
||||||
Joins("LEFT JOIN (SELECT owner_id AS user_id, COUNT(*) AS listing_count FROM rental_listings GROUP BY owner_id) AS l ON l.user_id = u.id").
|
Joins("LEFT JOIN (SELECT owner_id AS user_id, COUNT(*) AS listing_count FROM rental_listings GROUP BY owner_id) AS l ON l.user_id = u.id").
|
||||||
Joins("LEFT JOIN (SELECT user_id, COUNT(*) AS dispute_count FROM (SELECT initiator_id AS user_id FROM disputes UNION ALL SELECT target_user_id AS user_id FROM disputes) AS dispute_users GROUP BY user_id) AS d ON d.user_id = u.id").
|
Joins("LEFT JOIN (SELECT user_id, COUNT(*) AS dispute_count FROM (SELECT initiator_id AS user_id FROM disputes UNION ALL SELECT target_user_id AS user_id FROM disputes) AS dispute_users GROUP BY user_id) AS d ON d.user_id = u.id").
|
||||||
@@ -634,6 +640,8 @@ func (r *Repository) AdjustWallet(ctx context.Context, adminID uint64, userID ui
|
|||||||
|
|
||||||
type userRow struct {
|
type userRow struct {
|
||||||
model.User
|
model.User
|
||||||
|
TenantCode string
|
||||||
|
TenantName string
|
||||||
OrderCount int64
|
OrderCount int64
|
||||||
ListingCount int64
|
ListingCount int64
|
||||||
DisputeCount int64
|
DisputeCount int64
|
||||||
@@ -660,6 +668,9 @@ func (row userRow) toDTO(growthConfig rentergrowth.Config) UserDTO {
|
|||||||
}
|
}
|
||||||
return UserDTO{
|
return UserDTO{
|
||||||
ID: row.ID,
|
ID: row.ID,
|
||||||
|
TenantID: row.TenantID,
|
||||||
|
TenantCode: row.TenantCode,
|
||||||
|
TenantName: row.TenantName,
|
||||||
Phone: row.Phone,
|
Phone: row.Phone,
|
||||||
Nickname: row.Nickname,
|
Nickname: row.Nickname,
|
||||||
RealnameStatus: row.RealnameStatus,
|
RealnameStatus: row.RealnameStatus,
|
||||||
|
|||||||
@@ -207,6 +207,51 @@ func TestListFiltersByDepositQuotaOwnerTypeAndGrowthLevel(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestListIncludesTenantAndSupportsTenantSearchAndFilter(t *testing.T) {
|
||||||
|
db := setupAdminUserTestDB(t)
|
||||||
|
tenants := []model.Tenant{
|
||||||
|
{Code: "dachui", Name: "大锤商行", Status: "active"},
|
||||||
|
{Code: "jieyou", Name: "解忧商行", Status: "active"},
|
||||||
|
}
|
||||||
|
if err := db.Create(&tenants).Error; err != nil {
|
||||||
|
t.Fatalf("创建租户失败:%v", err)
|
||||||
|
}
|
||||||
|
users := []model.User{
|
||||||
|
{TenantID: tenants[0].ID, Phone: "15614832213", Nickname: "大锤同号用户", Status: "active"},
|
||||||
|
{TenantID: tenants[1].ID, Phone: "15614832213", Nickname: "解忧同号用户", Status: "active"},
|
||||||
|
}
|
||||||
|
if err := db.Create(&users).Error; err != nil {
|
||||||
|
t.Fatalf("创建跨站同号用户失败:%v", err)
|
||||||
|
}
|
||||||
|
repo := NewRepository(db)
|
||||||
|
|
||||||
|
result, err := repo.List(t.Context(), 1, 20, ListQuery{Keyword: "解忧"})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("按站点名称搜索失败:%v", err)
|
||||||
|
}
|
||||||
|
if result.Total != 1 {
|
||||||
|
t.Fatalf("按站点名称搜索总数 = %d, want 1", result.Total)
|
||||||
|
}
|
||||||
|
items := result.Items.([]UserDTO)
|
||||||
|
if items[0].TenantID != tenants[1].ID ||
|
||||||
|
items[0].TenantCode != "jieyou" ||
|
||||||
|
items[0].TenantName != "解忧商行" {
|
||||||
|
t.Fatalf("用户站点信息不正确:%+v", items[0])
|
||||||
|
}
|
||||||
|
|
||||||
|
result, err = repo.List(t.Context(), 1, 20, ListQuery{TenantID: tenants[0].ID})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("按站点筛选失败:%v", err)
|
||||||
|
}
|
||||||
|
if result.Total != 1 {
|
||||||
|
t.Fatalf("按站点筛选总数 = %d, want 1", result.Total)
|
||||||
|
}
|
||||||
|
items = result.Items.([]UserDTO)
|
||||||
|
if items[0].TenantCode != "dachui" {
|
||||||
|
t.Fatalf("按站点筛选结果 = %+v, want dachui", items[0])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestAdjustGrowthPointsWritesRepeatableLedgers(t *testing.T) {
|
func TestAdjustGrowthPointsWritesRepeatableLedgers(t *testing.T) {
|
||||||
db := setupAdminUserTestDB(t)
|
db := setupAdminUserTestDB(t)
|
||||||
user := model.User{
|
user := model.User{
|
||||||
@@ -537,6 +582,7 @@ func setupAdminUserTestDB(t *testing.T) *gorm.DB {
|
|||||||
t.Helper()
|
t.Helper()
|
||||||
db := database.NewTestDB()
|
db := database.NewTestDB()
|
||||||
if err := database.AutoMigrateIfMissing(db,
|
if err := database.AutoMigrateIfMissing(db,
|
||||||
|
&model.Tenant{},
|
||||||
&model.User{},
|
&model.User{},
|
||||||
&model.UserRealname{},
|
&model.UserRealname{},
|
||||||
&model.AuditLog{},
|
&model.AuditLog{},
|
||||||
|
|||||||
@@ -5,6 +5,9 @@ import type { RealnameStatusValue, RiskStatus, UserStatus } from '@/shared/types
|
|||||||
|
|
||||||
export interface AdminUserItem {
|
export interface AdminUserItem {
|
||||||
id: number
|
id: number
|
||||||
|
tenant_id: number
|
||||||
|
tenant_code: string
|
||||||
|
tenant_name: string
|
||||||
phone: string
|
phone: string
|
||||||
nickname: string
|
nickname: string
|
||||||
realname_status: RealnameStatusValue
|
realname_status: RealnameStatusValue
|
||||||
@@ -56,6 +59,7 @@ export interface AdminGrowthLevelAdjustPayload {
|
|||||||
|
|
||||||
export interface AdminUserQuery {
|
export interface AdminUserQuery {
|
||||||
keyword?: string
|
keyword?: string
|
||||||
|
tenant_id?: number
|
||||||
status?: '' | UserStatus
|
status?: '' | UserStatus
|
||||||
/** has=有免押额度,none=无免押额度,空=全部 */
|
/** has=有免押额度,none=无免押额度,空=全部 */
|
||||||
deposit_free_quota?: '' | 'has' | 'none'
|
deposit_free_quota?: '' | 'has' | 'none'
|
||||||
@@ -68,6 +72,7 @@ export interface AdminUserQuery {
|
|||||||
export async function fetchAdminUsers(page = 1, pageSize = 20, query: AdminUserQuery = {}) {
|
export async function fetchAdminUsers(page = 1, pageSize = 20, query: AdminUserQuery = {}) {
|
||||||
const params: Record<string, unknown> = { page, page_size: pageSize }
|
const params: Record<string, unknown> = { page, page_size: pageSize }
|
||||||
if (query.keyword) params.keyword = query.keyword
|
if (query.keyword) params.keyword = query.keyword
|
||||||
|
if (query.tenant_id) params.tenant_id = query.tenant_id
|
||||||
if (query.status) params.status = query.status
|
if (query.status) params.status = query.status
|
||||||
if (query.deposit_free_quota) params.deposit_free_quota = query.deposit_free_quota
|
if (query.deposit_free_quota) params.deposit_free_quota = query.deposit_free_quota
|
||||||
if (query.owner_type) params.owner_type = query.owner_type
|
if (query.owner_type) params.owner_type = query.owner_type
|
||||||
|
|||||||
@@ -115,6 +115,14 @@ const paymentPageSize = ref(20)
|
|||||||
|
|
||||||
const userId = computed(() => props.user?.id || 0)
|
const userId = computed(() => props.user?.id || 0)
|
||||||
const userPhone = computed(() => props.user?.phone || '')
|
const userPhone = computed(() => props.user?.phone || '')
|
||||||
|
const userSiteLabel = computed(() => {
|
||||||
|
if (!props.user) return ''
|
||||||
|
return (
|
||||||
|
props.user.tenant_name ||
|
||||||
|
props.user.tenant_code ||
|
||||||
|
(props.user.tenant_id ? `站点 #${props.user.tenant_id}` : '未分配站点')
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
watch(
|
watch(
|
||||||
() => props.modelValue,
|
() => props.modelValue,
|
||||||
@@ -443,7 +451,9 @@ function goPayments() {
|
|||||||
:model-value="modelValue"
|
:model-value="modelValue"
|
||||||
size="78%"
|
size="78%"
|
||||||
destroy-on-close
|
destroy-on-close
|
||||||
:title="`用户明细 · ${user?.nickname || user?.phone || userId}`"
|
:title="`用户明细 · ${user?.nickname || user?.phone || userId}${
|
||||||
|
userSiteLabel ? ` · ${userSiteLabel}` : ''
|
||||||
|
}`"
|
||||||
@update:model-value="(val: boolean) => emit('update:modelValue', val)"
|
@update:model-value="(val: boolean) => emit('update:modelValue', val)"
|
||||||
>
|
>
|
||||||
<div v-if="user" class="user-detail">
|
<div v-if="user" class="user-detail">
|
||||||
@@ -451,7 +461,7 @@ function goPayments() {
|
|||||||
<div class="user-detail__identity">
|
<div class="user-detail__identity">
|
||||||
<strong>{{ user.nickname || '-' }}</strong>
|
<strong>{{ user.nickname || '-' }}</strong>
|
||||||
<span>{{ user.phone }}</span>
|
<span>{{ user.phone }}</span>
|
||||||
<small>UID: {{ user.id }}</small>
|
<small>{{ userSiteLabel }} · UID: {{ user.id }}</small>
|
||||||
</div>
|
</div>
|
||||||
<div class="user-detail__metrics">
|
<div class="user-detail__metrics">
|
||||||
<div>
|
<div>
|
||||||
|
|||||||
@@ -429,6 +429,12 @@ function selectUser(user: AdminUserItem) {
|
|||||||
selectedUser.value = user
|
selectedUser.value = user
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function userTenantLabel(user: AdminUserItem) {
|
||||||
|
return (
|
||||||
|
user.tenant_name || user.tenant_code || (user.tenant_id ? `站点 #${user.tenant_id}` : '未分配')
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
async function submitAction() {
|
async function submitAction() {
|
||||||
if (!listing.value || !actionType.value) return
|
if (!listing.value || !actionType.value) return
|
||||||
submitting.value = true
|
submitting.value = true
|
||||||
@@ -979,7 +985,8 @@ async function openScreenshot(url: string) {
|
|||||||
<strong v-if="selectedUser">{{ selectedUser.nickname || selectedUser.phone }}</strong>
|
<strong v-if="selectedUser">{{ selectedUser.nickname || selectedUser.phone }}</strong>
|
||||||
<strong v-else>请选择用户</strong>
|
<strong v-else>请选择用户</strong>
|
||||||
<small v-if="selectedUser"
|
<small v-if="selectedUser"
|
||||||
>ID:{{ selectedUser.id }} · {{ selectedUser.phone || '-' }}</small
|
>{{ userTenantLabel(selectedUser) }} · ID:{{ selectedUser.id }} ·
|
||||||
|
{{ selectedUser.phone || '-' }}</small
|
||||||
>
|
>
|
||||||
<small v-else>仅支持正常且已实名用户</small>
|
<small v-else>仅支持正常且已实名用户</small>
|
||||||
</div>
|
</div>
|
||||||
@@ -990,7 +997,7 @@ async function openScreenshot(url: string) {
|
|||||||
<el-input
|
<el-input
|
||||||
v-model="userKeyword"
|
v-model="userKeyword"
|
||||||
clearable
|
clearable
|
||||||
placeholder="输入手机号 / 昵称 / 用户ID 查询"
|
placeholder="输入手机号 / 昵称 / 用户ID / 站点 查询"
|
||||||
@keyup.enter="searchUsers"
|
@keyup.enter="searchUsers"
|
||||||
@clear="searchUsers"
|
@clear="searchUsers"
|
||||||
>
|
>
|
||||||
@@ -1013,7 +1020,9 @@ async function openScreenshot(url: string) {
|
|||||||
>
|
>
|
||||||
<span class="transfer-user-main">
|
<span class="transfer-user-main">
|
||||||
<strong>{{ user.nickname || user.phone || `用户${user.id}` }}</strong>
|
<strong>{{ user.nickname || user.phone || `用户${user.id}` }}</strong>
|
||||||
<small>{{ user.phone || '-' }} · ID {{ user.id }}</small>
|
<small
|
||||||
|
>{{ userTenantLabel(user) }} · {{ user.phone || '-' }} · ID {{ user.id }}</small
|
||||||
|
>
|
||||||
</span>
|
</span>
|
||||||
<span class="transfer-user-meta">
|
<span class="transfer-user-meta">
|
||||||
<el-tag size="small" type="success">{{ userStatusLabel(user.status) }}</el-tag>
|
<el-tag size="small" type="success">{{ userStatusLabel(user.status) }}</el-tag>
|
||||||
|
|||||||
@@ -29,6 +29,31 @@
|
|||||||
color: #94a3b8;
|
color: #94a3b8;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.tenant-cell {
|
||||||
|
display: grid;
|
||||||
|
justify-items: start;
|
||||||
|
gap: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tenant-cell :deep(.el-tag) {
|
||||||
|
max-width: 120px;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tenant-cell small {
|
||||||
|
color: #94a3b8;
|
||||||
|
font-size: 10px;
|
||||||
|
line-height: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tenant-option-code {
|
||||||
|
float: right;
|
||||||
|
margin-left: 16px;
|
||||||
|
color: #94a3b8;
|
||||||
|
font-size: 11px;
|
||||||
|
}
|
||||||
|
|
||||||
.balance-available {
|
.balance-available {
|
||||||
color: #0f172a;
|
color: #0f172a;
|
||||||
font-variant-numeric: tabular-nums;
|
font-variant-numeric: tabular-nums;
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
import { readError } from '@/shared/utils/error'
|
import { readError } from '@/shared/utils/error'
|
||||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||||
import { Search } from '@element-plus/icons-vue'
|
import { Search } from '@element-plus/icons-vue'
|
||||||
import { computed, reactive, ref } from 'vue'
|
import { computed, reactive, ref, watch } from 'vue'
|
||||||
|
|
||||||
import {
|
import {
|
||||||
adjustAdminUserGrowthLevel,
|
adjustAdminUserGrowthLevel,
|
||||||
@@ -74,6 +74,7 @@ const walletForm = reactive({
|
|||||||
|
|
||||||
const filters = reactive<AdminUserQuery>({
|
const filters = reactive<AdminUserQuery>({
|
||||||
keyword: '',
|
keyword: '',
|
||||||
|
tenant_id: undefined,
|
||||||
status: '',
|
status: '',
|
||||||
deposit_free_quota: '',
|
deposit_free_quota: '',
|
||||||
owner_type: '',
|
owner_type: '',
|
||||||
@@ -91,6 +92,30 @@ const {
|
|||||||
fetchFn: (page, pageSize) => fetchAdminUsers(page, pageSize, filters),
|
fetchFn: (page, pageSize) => fetchAdminUsers(page, pageSize, filters),
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const tenantOptions = ref<{ id: number; code: string; name: string }[]>([])
|
||||||
|
|
||||||
|
watch(
|
||||||
|
users,
|
||||||
|
rows => {
|
||||||
|
const byID = new Map(tenantOptions.value.map(item => [item.id, item]))
|
||||||
|
for (const row of rows) {
|
||||||
|
if (row.tenant_id > 0) {
|
||||||
|
byID.set(row.tenant_id, {
|
||||||
|
id: row.tenant_id,
|
||||||
|
code: row.tenant_code,
|
||||||
|
name: row.tenant_name || row.tenant_code || `站点 #${row.tenant_id}`,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
tenantOptions.value = [...byID.values()].sort((a, b) => a.name.localeCompare(b.name))
|
||||||
|
},
|
||||||
|
{ immediate: true }
|
||||||
|
)
|
||||||
|
|
||||||
|
function userSiteLabel(row: AdminUserItem) {
|
||||||
|
return row.tenant_name || row.tenant_code || (row.tenant_id ? `站点 #${row.tenant_id}` : '未分配')
|
||||||
|
}
|
||||||
|
|
||||||
function queryUsers() {
|
function queryUsers() {
|
||||||
currentPage.value = 1
|
currentPage.value = 1
|
||||||
void loadUsers()
|
void loadUsers()
|
||||||
@@ -98,6 +123,7 @@ function queryUsers() {
|
|||||||
|
|
||||||
function resetFilters() {
|
function resetFilters() {
|
||||||
filters.keyword = ''
|
filters.keyword = ''
|
||||||
|
filters.tenant_id = undefined
|
||||||
filters.status = ''
|
filters.status = ''
|
||||||
filters.deposit_free_quota = ''
|
filters.deposit_free_quota = ''
|
||||||
filters.owner_type = ''
|
filters.owner_type = ''
|
||||||
@@ -437,12 +463,31 @@ function moneyCent(value: number | string | undefined) {
|
|||||||
<el-input
|
<el-input
|
||||||
v-model="filters.keyword"
|
v-model="filters.keyword"
|
||||||
clearable
|
clearable
|
||||||
placeholder="手机号 / 昵称 / 用户ID"
|
placeholder="手机号 / 昵称 / 用户ID / 站点"
|
||||||
style="width: 220px"
|
style="width: 220px"
|
||||||
@keyup.enter="queryUsers"
|
@keyup.enter="queryUsers"
|
||||||
@clear="queryUsers"
|
@clear="queryUsers"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="所属站点">
|
||||||
|
<el-select
|
||||||
|
v-model="filters.tenant_id"
|
||||||
|
clearable
|
||||||
|
placeholder="全部站点"
|
||||||
|
style="width: 150px"
|
||||||
|
@change="queryUsers"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="site in tenantOptions"
|
||||||
|
:key="site.id"
|
||||||
|
:label="site.name"
|
||||||
|
:value="site.id"
|
||||||
|
>
|
||||||
|
<span>{{ site.name }}</span>
|
||||||
|
<span class="tenant-option-code">{{ site.code }}</span>
|
||||||
|
</el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
<el-form-item label="状态">
|
<el-form-item label="状态">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="filters.status"
|
v-model="filters.status"
|
||||||
@@ -514,6 +559,14 @@ function moneyCent(value: number | string | undefined) {
|
|||||||
|
|
||||||
<el-table v-loading="loading" class="table-panel" :data="users" empty-text="未找到匹配的用户">
|
<el-table v-loading="loading" class="table-panel" :data="users" empty-text="未找到匹配的用户">
|
||||||
<el-table-column prop="id" label="用户ID" width="80" />
|
<el-table-column prop="id" label="用户ID" width="80" />
|
||||||
|
<el-table-column label="所属站点" width="140" fixed="left">
|
||||||
|
<template #default="{ row }">
|
||||||
|
<div class="tenant-cell">
|
||||||
|
<el-tag effect="plain" size="small">{{ userSiteLabel(row) }}</el-tag>
|
||||||
|
<small v-if="row.tenant_code">{{ row.tenant_code }}</small>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column prop="nickname" label="昵称" min-width="120" />
|
<el-table-column prop="nickname" label="昵称" min-width="120" />
|
||||||
<el-table-column prop="phone" label="手机号" min-width="120" />
|
<el-table-column prop="phone" label="手机号" min-width="120" />
|
||||||
<el-table-column label="状态" width="90">
|
<el-table-column label="状态" width="90">
|
||||||
@@ -696,7 +749,8 @@ function moneyCent(value: number | string | undefined) {
|
|||||||
>
|
>
|
||||||
<div v-if="activeUser" class="dialog-body">
|
<div v-if="activeUser" class="dialog-body">
|
||||||
<p>
|
<p>
|
||||||
<strong>{{ activeUser.phone }}</strong> · {{ activeUser.nickname }}
|
<strong>{{ activeUser.phone }}</strong> · {{ activeUser.nickname }} ·
|
||||||
|
{{ userSiteLabel(activeUser) }}
|
||||||
</p>
|
</p>
|
||||||
<el-input
|
<el-input
|
||||||
v-model="freezeReason"
|
v-model="freezeReason"
|
||||||
@@ -719,7 +773,8 @@ function moneyCent(value: number | string | undefined) {
|
|||||||
>
|
>
|
||||||
<div v-if="manualRealnameUser" class="dialog-body">
|
<div v-if="manualRealnameUser" class="dialog-body">
|
||||||
<p>
|
<p>
|
||||||
<strong>{{ manualRealnameUser.phone }}</strong> · {{ manualRealnameUser.nickname }}
|
<strong>{{ manualRealnameUser.phone }}</strong> · {{ manualRealnameUser.nickname }} ·
|
||||||
|
{{ userSiteLabel(manualRealnameUser) }}
|
||||||
</p>
|
</p>
|
||||||
<el-alert
|
<el-alert
|
||||||
type="info"
|
type="info"
|
||||||
@@ -764,7 +819,8 @@ function moneyCent(value: number | string | undefined) {
|
|||||||
>
|
>
|
||||||
<div v-if="realnameUser" class="dialog-body">
|
<div v-if="realnameUser" class="dialog-body">
|
||||||
<p>
|
<p>
|
||||||
<strong>{{ realnameUser.phone }}</strong> · {{ realnameUser.nickname }}
|
<strong>{{ realnameUser.phone }}</strong> · {{ realnameUser.nickname }} ·
|
||||||
|
{{ userSiteLabel(realnameUser) }}
|
||||||
</p>
|
</p>
|
||||||
<el-alert
|
<el-alert
|
||||||
type="warning"
|
type="warning"
|
||||||
@@ -794,7 +850,8 @@ function moneyCent(value: number | string | undefined) {
|
|||||||
>
|
>
|
||||||
<div v-if="quotaUser" class="dialog-body">
|
<div v-if="quotaUser" class="dialog-body">
|
||||||
<p>
|
<p>
|
||||||
<strong>{{ quotaUser.phone }}</strong> · {{ quotaUser.nickname }}
|
<strong>{{ quotaUser.phone }}</strong> · {{ quotaUser.nickname }} ·
|
||||||
|
{{ userSiteLabel(quotaUser) }}
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
等级额度 ¥{{ moneyCent(quotaUser.deposit_free_level_quota_cent) }},人工额度 ¥{{
|
等级额度 ¥{{ moneyCent(quotaUser.deposit_free_level_quota_cent) }},人工额度 ¥{{
|
||||||
@@ -830,8 +887,8 @@ function moneyCent(value: number | string | undefined) {
|
|||||||
>
|
>
|
||||||
<div v-if="growthUser" class="dialog-body growth-dialog">
|
<div v-if="growthUser" class="dialog-body growth-dialog">
|
||||||
<p>
|
<p>
|
||||||
<strong>{{ growthUser.phone }}</strong> · {{ growthUser.nickname || '-' }} · 当前
|
<strong>{{ growthUser.phone }}</strong> · {{ growthUser.nickname || '-' }} ·
|
||||||
{{ growthUser.renter_growth_level_name }}
|
{{ userSiteLabel(growthUser) }} · 当前 {{ growthUser.renter_growth_level_name }}
|
||||||
</p>
|
</p>
|
||||||
<div class="growth-current">
|
<div class="growth-current">
|
||||||
<span>当前积分</span>
|
<span>当前积分</span>
|
||||||
@@ -877,7 +934,7 @@ function moneyCent(value: number | string | undefined) {
|
|||||||
<div v-if="growthLevelUser" class="dialog-body growth-dialog">
|
<div v-if="growthLevelUser" class="dialog-body growth-dialog">
|
||||||
<p>
|
<p>
|
||||||
<strong>{{ growthLevelUser.phone }}</strong> · {{ growthLevelUser.nickname || '-' }} ·
|
<strong>{{ growthLevelUser.phone }}</strong> · {{ growthLevelUser.nickname || '-' }} ·
|
||||||
当前
|
{{ userSiteLabel(growthLevelUser) }} · 当前
|
||||||
{{ growthLevelUser.renter_growth_level_name }}
|
{{ growthLevelUser.renter_growth_level_name }}
|
||||||
{{ growthLevelUser.renter_growth_level_manual ? '(手动锁定)' : '(自动计算)' }}
|
{{ growthLevelUser.renter_growth_level_manual ? '(手动锁定)' : '(自动计算)' }}
|
||||||
</p>
|
</p>
|
||||||
@@ -930,8 +987,8 @@ function moneyCent(value: number | string | undefined) {
|
|||||||
>
|
>
|
||||||
<div v-if="walletUser" class="dialog-body wallet-dialog">
|
<div v-if="walletUser" class="dialog-body wallet-dialog">
|
||||||
<p>
|
<p>
|
||||||
<strong>{{ walletUser.phone }}</strong> · {{ walletUser.nickname || '-' }} · ID
|
<strong>{{ walletUser.phone }}</strong> · {{ walletUser.nickname || '-' }} ·
|
||||||
{{ walletUser.id }}
|
{{ userSiteLabel(walletUser) }} · ID {{ walletUser.id }}
|
||||||
</p>
|
</p>
|
||||||
<div class="wallet-balance-cards">
|
<div class="wallet-balance-cards">
|
||||||
<div>
|
<div>
|
||||||
|
|||||||
Reference in New Issue
Block a user