@@ -1258,11 +1251,11 @@ function LogisticsTracking() {
-
+ {/*
-
+ */}
))
)}
@@ -1342,11 +1335,11 @@ function LogisticsTracking() {
-
- */}
))
diff --git a/src/components/pages/MerchantsPage.tsx b/src/components/pages/MerchantsPage.tsx
index 803a4b7..f3a1c4f 100644
--- a/src/components/pages/MerchantsPage.tsx
+++ b/src/components/pages/MerchantsPage.tsx
@@ -376,8 +376,8 @@ export default function MerchantsPage() {
if (isEditMerchantOpen && editMerchant.mall && malls.length > 0 && !loadingMalls) {
// 如果 mallUserId 为空,尝试根据 mallId 找到对应的 mallUser
if (!editMerchant.mallUserId) {
- const foundMall = malls.find(m =>
- m.mallId === editMerchant.mall ||
+ const foundMall = malls.find(m =>
+ m.mallId === editMerchant.mall ||
m.id === editMerchant.mall ||
(m.mallId && editMerchant.mall && m.mallId.toString() === editMerchant.mall.toString())
)
@@ -586,7 +586,7 @@ export default function MerchantsPage() {
// 调用导出接口
await apiExportFile('/back/merchants/export', exportParams, `商户列表_${new Date().toISOString().split('T')[0]}.xlsx`)
-
+
console.log('导出商户数据成功')
} catch (error) {
console.error('导出商户数据失败:', error)
@@ -665,7 +665,7 @@ export default function MerchantsPage() {
if (statusFilter === "all") {
return merchants
}
-
+
return merchants.filter((merchant) => {
switch (statusFilter) {
case "normal":
@@ -744,7 +744,7 @@ export default function MerchantsPage() {
- */}
-
- {/* 1. 所有地区设备总数 */}
+ { /* 1. 所有地区设备总数 */}
所有地区设备总数
diff --git a/src/components/pages/UsersPage.tsx b/src/components/pages/UsersPage.tsx
index 8b4c9fd..d0c8b67 100644
--- a/src/components/pages/UsersPage.tsx
+++ b/src/components/pages/UsersPage.tsx
@@ -43,24 +43,24 @@ export default function UsersPage() {
try {
setIsLoading(true)
const result = await apiGet("/back/user/list?loginRole=normal")
-
+
console.log("用户列表API返回结果:", result)
if (result && result.code === 200) {
// 处理不同的响应格式
const userList = result.rows || result.data || []
-
+
// 调试:打印第一条用户数据,查看实际字段名
if (userList.length > 0) {
console.log("API 返回的用户数据示例:", userList[0])
}
-
+
// 将 API 返回的用户数据映射到显示格式
const mappedUsers: DisplayUser[] = userList.map((user: any) => {
// 尝试多种可能的字段名(处理大小写和命名差异)
const nickName = user.nickName || user.nickname || user.nick_name || ""
const userName = user.userName || user.username || user.user_name || ""
-
+
return {
id: user.userId || `CU${user.userId?.slice(-3) || '000'}`,
name: nickName || userName || "未知用户",
@@ -75,7 +75,7 @@ export default function UsersPage() {
totalSpent: 0, // API 可能不包含此字段,需要后续补充
}
})
-
+
setUsers(mappedUsers)
} else {
console.error("获取用户列表失败:", result?.msg || "未知错误")
@@ -184,10 +184,10 @@ export default function UsersPage() {
-
+ {/*
导出
-
+ */}
{/* Loading State */}
@@ -284,7 +284,7 @@ export default function UsersPage() {
{getStatusBadge(user.status)}
-
+
联系方式
@@ -293,7 +293,7 @@ export default function UsersPage() {
{formatPhone(user.phone)}
-
+
地址
@@ -301,7 +301,7 @@ export default function UsersPage() {
{user.address}
-
+
注册时间
@@ -312,7 +312,7 @@ export default function UsersPage() {
{user.lastActive}
-
+
订单/消费
@@ -320,7 +320,7 @@ export default function UsersPage() {
¥{user.totalSpent}
-
+
diff --git a/src/components/pages/WorkOrdersPage.tsx b/src/components/pages/WorkOrdersPage.tsx
index 5bf066e..17a66bd 100644
--- a/src/components/pages/WorkOrdersPage.tsx
+++ b/src/components/pages/WorkOrdersPage.tsx
@@ -422,15 +422,15 @@ export default function WorkOrdersPage() {
-
+ {/*
导出
-
+ */}
{/* Desktop Table View */}
-
-
+
+
工单信息
diff --git a/src/components/pages/salePage.tsx b/src/components/pages/salePage.tsx
index 599983b..17498da 100644
--- a/src/components/pages/salePage.tsx
+++ b/src/components/pages/salePage.tsx
@@ -42,7 +42,7 @@ export default function SalePage() {
const [total, setTotal] = useState(0)
const [currentPage, setCurrentPage] = useState(1)
const [pageSize, setPageSize] = useState(10)
-
+
// 新增业务员对话框状态
const [isAddDialogOpen, setIsAddDialogOpen] = useState(false)
const [isEditDialogOpen, setIsEditDialogOpen] = useState(false)
@@ -386,10 +386,10 @@ export default function SalePage() {
-
+ {/*
导出
-
+ */}
{/* Desktop Table View */}
@@ -506,23 +506,23 @@ export default function SalePage() {
-
+
-
+
-
+
-
+
创建时间
{user.createTime}
@@ -669,8 +669,8 @@ export default function SalePage() {
>
取消
-
@@ -761,8 +761,8 @@ export default function SalePage() {
>
取消
-
diff --git a/src/components/ui/table.tsx b/src/components/ui/table.tsx
index 37bd40e..db77a17 100644
--- a/src/components/ui/table.tsx
+++ b/src/components/ui/table.tsx
@@ -4,11 +4,11 @@ import * as React from "react"
import { cn } from "@/utils"
-function Table({ className, ...props }: React.ComponentProps<"table">) {
+function Table({ className, containerClassName, ...props }: React.ComponentProps<"table"> & { containerClassName?: string }) {
return (