短信验证调试成功

apps/admin-web/src/App.tsx

@@ -21,6 +21,7 @@ import ResourcesPage from './pages/ResourcesPage';
 import StorePayoutsPage from './pages/StorePayoutsPage';
 import PartnerBillsPage from './pages/PartnerBillsPage';
 import TicketsPage from './pages/TicketsPage';
+import UserLogsPage from './pages/UserLogsPage';
 import ThirdPartyLogsPage from './pages/ThirdPartyLogsPage';
 
 function RequireAuth({ children }: { children: React.ReactNode }) {
@@ -56,7 +57,8 @@ export default function App() {
         <Route path="/store-payouts" element={<StorePayoutsPage />} />
         <Route path="/partner-bills" element={<PartnerBillsPage />} />
         <Route path="/tickets" element={<TicketsPage />} />
-        <Route path="/third-party-logs" element={<ThirdPartyLogsPage />} />
+        <Route path="/logs/users" element={<UserLogsPage />} />
+        <Route path="/logs/third-party" element={<ThirdPartyLogsPage />} />
         <Route path="/deliveries" element={<DeliveriesPage />} />
         <Route path="/hq-accounts" element={<HqAccountsPage />} />
       </Route>

apps/admin-web/src/layouts/AdminLayout.tsx

@@ -13,6 +13,7 @@ import {
   SafetyOutlined,
   LogoutOutlined,
   CloudUploadOutlined,
+  FileTextOutlined,
 } from '@ant-design/icons';
 import { clearAuth, request, type HqProfile } from '../lib/api';
 
@@ -57,7 +58,15 @@ const MENU_ITEMS: MenuProps['items'] = [
   },
   { key: '/partner-bills', icon: <TeamOutlined />, label: '合伙人结算' },
   { key: '/tickets', icon: <CarOutlined />, label: '工单中心' },
-  { key: '/third-party-logs', icon: <CloudUploadOutlined />, label: '第三方日志' },
+  {
+    key: 'logs-group',
+    icon: <FileTextOutlined />,
+    label: '日志',
+    children: [
+      { key: '/logs/users', label: '用户日志' },
+      { key: '/logs/third-party', label: '第三方日志' },
+    ],
+  },
   { key: '/deliveries', icon: <CarOutlined />, label: '配送单' },
   { key: '/hq-accounts', icon: <SafetyOutlined />, label: 'HQ账户' },
 ];
@@ -86,7 +95,7 @@ export default function AdminLayout() {
           theme="dark"
           mode="inline"
           selectedKeys={[selectedKey]}
-          defaultOpenKeys={['stores-group', 'partners-group', 'benefit-group']}
+          defaultOpenKeys={['stores-group', 'partners-group', 'benefit-group', 'logs-group']}
           items={MENU_ITEMS}
           onClick={({ key }) => {
             if (key.startsWith('/')) navigate(key);

apps/admin-web/src/lib/user-log.ts

@@ -0,0 +1,45 @@
+export type UserLogCategory =
+  | 'login'
+  | 'browse_product'
+  | 'order'
+  | 'pay'
+  | 'wechat_auth'
+  | 'browse_store'
+  | 'redeem'
+  | 'profile';
+
+const USER_LOG_EVENT_CATEGORIES: Record<UserLogCategory, readonly string[]> = {
+  login: ['login_success', 'sms_login'],
+  browse_product: ['home_view', 'product_click', 'product_detail_view'],
+  order: ['order_confirm_view', 'order_submit'],
+  pay: ['pay_success', 'pay_fail'],
+  wechat_auth: ['wechat_login', 'wechat_phone', 'wechat_location', 'wechat_album'],
+  browse_store: ['store_list_view', 'store_detail_view'],
+  redeem: ['benefit_redeem_start', 'benefit_redeem_success'],
+  profile: ['profile_update'],
+};
+
+export const USER_LOG_CATEGORY_OPTIONS: Array<{ value: UserLogCategory | ''; label: string }> = [
+  { value: '', label: '全部' },
+  { value: 'login', label: '登录' },
+  { value: 'browse_product', label: '浏览商品' },
+  { value: 'order', label: '下单' },
+  { value: 'pay', label: '支付' },
+  { value: 'wechat_auth', label: '微信授权' },
+  { value: 'browse_store', label: '浏览门店' },
+  { value: 'redeem', label: '核销' },
+  { value: 'profile', label: '信息修改' },
+];
+
+export function resolveUserLogCategory(eventName: string): UserLogCategory | null {
+  for (const [category, events] of Object.entries(USER_LOG_EVENT_CATEGORIES) as Array<
+    [UserLogCategory, readonly string[]]
+  >) {
+    if (events.includes(eventName)) return category;
+  }
+  return null;
+}
+
+export const USER_LOG_CATEGORY_LABELS = Object.fromEntries(
+  USER_LOG_CATEGORY_OPTIONS.filter((o) => o.value).map((o) => [o.value, o.label]),
+) as Record<string, string>;

apps/admin-web/src/pages/ProductsPage.tsx

@@ -1,13 +1,21 @@
 import { useState } from 'react';
 import {
-  Button, Descriptions, Drawer, Form, Input, InputNumber, Modal, Select, Space, Table, Tag, Typography, message,
+  Button, Descriptions, Divider, Drawer, Form, Input, InputNumber, Modal, Select, Space,
+  Table, Tabs, Tag, Typography, message,
 } from 'antd';
+import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
 import type { ColumnsType } from 'antd/es/table';
-import { request, type Paginated } from '../lib/api';
+import { request } from '../lib/api';
 import { AROMA_TYPE_LABELS, PRODUCT_STATUS_LABELS, fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import OssUpload from '../components/OssUpload';
 
+type ProductDetailContentDto = {
+  storyTitle?: string;
+  storyText?: string;
+  features?: Array<{ icon: string; title: string; desc: string }>;
+};
+
 type Row = {
   id: string;
   skuCode: string;
@@ -21,9 +29,196 @@ type Row = {
   status: string;
   sortOrder: number;
   mainImageUrl?: string | null;
+  carouselUrls?: string[];
+  detailImageUrls?: string[];
+  detailContent?: ProductDetailContentDto | null;
   createdAt: string;
 };
 
+type ProductFormValues = {
+  skuCode?: string;
+  barcode69?: string;
+  name: string;
+  subtitle?: string;
+  aromaType?: string;
+  spec: string;
+  price: number;
+  benefitAmount?: number;
+  status?: string;
+  sortOrder?: number;
+  coverUrl?: string;
+  carouselUrls?: string[];
+  detailImageUrls?: string[];
+  storyTitle?: string;
+  storyText?: string;
+  features?: Array<{ icon?: string; title?: string; desc?: string }>;
+};
+
+function mapDetailToForm(d: Record<string, unknown>) {
+  const detail = (d.detailContent ?? {}) as ProductDetailContentDto;
+  return {
+    ...d,
+    coverUrl: (d as { mainImageUrl?: string }).mainImageUrl,
+    carouselUrls: ((d as Row).carouselUrls?.length ? (d as Row).carouselUrls : ['']) as string[],
+    detailImageUrls: ((d as Row).detailImageUrls?.length ? (d as Row).detailImageUrls : ['']) as string[],
+    storyTitle: detail.storyTitle ?? '',
+    storyText: detail.storyText ?? '',
+    features: detail.features?.length
+      ? detail.features
+      : [{ icon: 'water_drop', title: '', desc: '' }],
+  };
+}
+
+function buildProductPayload(v: ProductFormValues) {
+  const carouselUrls = (v.carouselUrls ?? []).map((u) => u?.trim()).filter(Boolean);
+  const detailImageUrls = (v.detailImageUrls ?? []).map((u) => u?.trim()).filter(Boolean);
+  const features = (v.features ?? [])
+    .filter((f) => f?.title?.trim() || f?.desc?.trim())
+    .map((f) => ({
+      icon: f.icon?.trim() || 'star',
+      title: f.title?.trim() || '',
+      desc: f.desc?.trim() || '',
+    }));
+
+  const detailContent: ProductDetailContentDto = {
+    storyTitle: v.storyTitle?.trim() || undefined,
+    storyText: v.storyText?.trim() || undefined,
+    features: features.length ? features : undefined,
+  };
+
+  return {
+    skuCode: v.skuCode,
+    barcode69: v.barcode69,
+    name: v.name,
+    subtitle: v.subtitle,
+    aromaType: v.aromaType,
+    spec: v.spec,
+    price: v.price,
+    benefitAmount: v.benefitAmount,
+    status: v.status,
+    sortOrder: v.sortOrder,
+    coverUrl: v.coverUrl,
+    carouselUrls,
+    detailImageUrls,
+    detailContent,
+  };
+}
+
+function ImageUrlList({ name, label, bizType }: { name: string; label: string; bizType: string }) {
+  return (
+    <Form.List name={name}>
+      {(fields, { add, remove }) => (
+        <>
+          {fields.map((field) => (
+            <Space key={field.key} align="start" style={{ display: 'flex', marginBottom: 8 }}>
+              <Form.Item {...field} style={{ flex: 1, marginBottom: 0 }}>
+                <OssUpload bizType={bizType} mediaType="IMAGE" />
+              </Form.Item>
+              {fields.length > 1 && (
+                <MinusCircleOutlined onClick={() => remove(field.name)} style={{ marginTop: 8 }} />
+              )}
+            </Space>
+          ))}
+          <Button type="dashed" onClick={() => add('')} block icon={<PlusOutlined />}>
+            添加{label}
+          </Button>
+        </>
+      )}
+    </Form.List>
+  );
+}
+
+function ProductDetailFields() {
+  return (
+    <>
+      <Typography.Text type="secondary">详情页轮播（CAROUSEL）</Typography.Text>
+      <ImageUrlList name="carouselUrls" label="轮播图" bizType="CAROUSEL" />
+      <Divider />
+      <Typography.Text type="secondary">详情长图（DETAIL）</Typography.Text>
+      <ImageUrlList name="detailImageUrls" label="详情图" bizType="DETAIL" />
+      <Divider />
+      <Form.Item name="storyTitle" label="故事标题">
+        <Input placeholder="如：千年杜康 · 唯有此处" />
+      </Form.Item>
+      <Form.Item name="storyText" label="故事正文">
+        <Input.TextArea rows={4} placeholder="商品故事描述" />
+      </Form.Item>
+      <Typography.Text type="secondary">卖点特色</Typography.Text>
+      <Form.List name="features">
+        {(fields, { add, remove }) => (
+          <>
+            {fields.map((field) => (
+              <Space key={field.key} direction="vertical" style={{ display: 'flex', marginBottom: 12, width: '100%' }}>
+                <Space align="start">
+                  <Form.Item {...field} name={[field.name, 'icon']} label="图标" style={{ marginBottom: 0 }}>
+                    <Input placeholder="material icon 名" style={{ width: 140 }} />
+                  </Form.Item>
+                  <Form.Item {...field} name={[field.name, 'title']} label="标题" style={{ marginBottom: 0, flex: 1 }}>
+                    <Input placeholder="标题" />
+                  </Form.Item>
+                  {fields.length > 1 && (
+                    <MinusCircleOutlined onClick={() => remove(field.name)} style={{ marginTop: 30 }} />
+                  )}
+                </Space>
+                <Form.Item {...field} name={[field.name, 'desc']} label="描述" style={{ marginBottom: 0 }}>
+                  <Input placeholder="简短描述" />
+                </Form.Item>
+              </Space>
+            ))}
+            <Button type="dashed" onClick={() => add({ icon: 'star', title: '', desc: '' })} block icon={<PlusOutlined />}>
+              添加卖点
+            </Button>
+          </>
+        )}
+      </Form.List>
+    </>
+  );
+}
+
+function BaseInfoFields({ mode }: { mode: 'create' | 'edit' }) {
+  return (
+    <>
+      {mode === 'create' && (
+        <>
+          <Form.Item name="skuCode" label="SKU" rules={[{ required: true }]}>
+            <Input />
+          </Form.Item>
+          <Form.Item name="barcode69" label="69码" rules={[{ required: true }]}>
+            <Input />
+          </Form.Item>
+          <Form.Item name="aromaType" label="香型" rules={[{ required: true }]}>
+            <Select options={Object.entries(AROMA_TYPE_LABELS).map(([value, label]) => ({ value, label }))} />
+          </Form.Item>
+        </>
+      )}
+      <Form.Item name="name" label="商品名" rules={[{ required: true }]}>
+        <Input />
+      </Form.Item>
+      <Form.Item name="subtitle" label="副标题">
+        <Input />
+      </Form.Item>
+      <Form.Item name="spec" label="规格" rules={[{ required: true }]}>
+        <Input placeholder="500ml | 52度" />
+      </Form.Item>
+      <Form.Item name="price" label="售价" rules={[{ required: true }]}>
+        <InputNumber min={0} style={{ width: '100%' }} />
+      </Form.Item>
+      <Form.Item name="benefitAmount" label="权益额">
+        <InputNumber min={0} style={{ width: '100%' }} />
+      </Form.Item>
+      <Form.Item name="status" label="状态">
+        <Select options={Object.entries(PRODUCT_STATUS_LABELS).map(([value, label]) => ({ value, label }))} />
+      </Form.Item>
+      <Form.Item name="sortOrder" label="排序">
+        <InputNumber min={0} style={{ width: '100%' }} />
+      </Form.Item>
+      <Form.Item name="coverUrl" label="封面">
+        <OssUpload bizType="COVER" mediaType="IMAGE" />
+      </Form.Item>
+    </>
+  );
+}
+
 export default function ProductsPage() {
   const [form] = Form.useForm();
   const [editForm] = Form.useForm();
@@ -60,10 +255,7 @@ export default function ProductsPage() {
         <Button type="link" size="small" onClick={async () => {
           const d = await request<Record<string, unknown>>(`/admin/products/${row.id}`);
           setDetail(d);
-          editForm.setFieldsValue({
-            ...d,
-            coverUrl: (d as { mainImageUrl?: string }).mainImageUrl,
-          });
+          editForm.setFieldsValue(mapDetailToForm(d));
           setDrawerOpen(true);
         }}>编辑</Button>
       ),
@@ -88,11 +280,12 @@ export default function ProductsPage() {
       </Form>
       <Table rowKey="id" className="admin-table-nowrap" loading={loading} columns={columns} dataSource={data?.items ?? []} scroll={{ x: 1100 }}
         pagination={{ current: page, pageSize, total: data?.total ?? 0, showSizeChanger: true, onChange: (p, ps) => { setPage(p); setPageSize(ps); } }} />
-      <Drawer title="编辑商品" width={520} open={drawerOpen} onClose={() => setDrawerOpen(false)}
+      <Drawer title="编辑商品" width={720} open={drawerOpen} onClose={() => setDrawerOpen(false)}
         extra={detail && (
           <Button type="primary" onClick={async () => {
             const v = await editForm.validateFields();
-            await request(`/admin/products/${detail.id}`, { method: 'PUT', body: JSON.stringify(v) });
+            const payload = buildProductPayload(v);
+            await request(`/admin/products/${detail.id}`, { method: 'PUT', body: JSON.stringify(payload) });
             message.success('已保存');
             setDrawerOpen(false);
             void reload();
@@ -106,48 +299,32 @@ export default function ProductsPage() {
               <Descriptions.Item label="香型">{AROMA_TYPE_LABELS[String(detail.aromaType)] || String(detail.aromaType)}</Descriptions.Item>
             </Descriptions>
             <Form form={editForm} layout="vertical">
-              <Form.Item name="name" label="商品名" rules={[{ required: true }]}><Input /></Form.Item>
-              <Form.Item name="subtitle" label="副标题"><Input /></Form.Item>
-              <Form.Item name="spec" label="规格" rules={[{ required: true }]}><Input /></Form.Item>
-              <Form.Item name="price" label="售价" rules={[{ required: true }]}><InputNumber min={0} style={{ width: '100%' }} /></Form.Item>
-              <Form.Item name="benefitAmount" label="权益额"><InputNumber min={0} style={{ width: '100%' }} /></Form.Item>
-              <Form.Item name="status" label="状态">
-                <Select options={Object.entries(PRODUCT_STATUS_LABELS).map(([value, label]) => ({ value, label }))} />
-              </Form.Item>
-              <Form.Item name="sortOrder" label="排序"><InputNumber min={0} style={{ width: '100%' }} /></Form.Item>
-              <Form.Item name="coverUrl" label="封面">
-                <OssUpload bizType="COVER" mediaType="IMAGE" />
-              </Form.Item>
+              <Tabs items={[
+                { key: 'base', label: '基础信息', children: <BaseInfoFields mode="edit" /> },
+                { key: 'detail', label: '详情页', children: <ProductDetailFields /> },
+              ]} />
             </Form>
           </>
         )}
       </Drawer>
       <Modal title="新建商品" open={createOpen} onCancel={() => setCreateOpen(false)} onOk={async () => {
         const v = await createForm.validateFields();
-        await request('/admin/products', { method: 'POST', body: JSON.stringify(v) });
+        const payload = buildProductPayload(v);
+        await request('/admin/products', { method: 'POST', body: JSON.stringify(payload) });
         message.success('已创建');
         setCreateOpen(false);
         createForm.resetFields();
         void reload();
-      }} width={520}>
-        <Form form={createForm} layout="vertical" initialValues={{ aromaType: 'QINGXIANG', status: 'DRAFT', sortOrder: 0 }}>
-          <Form.Item name="skuCode" label="SKU" rules={[{ required: true }]}><Input /></Form.Item>
-          <Form.Item name="barcode69" label="69码" rules={[{ required: true }]}><Input /></Form.Item>
-          <Form.Item name="name" label="商品名" rules={[{ required: true }]}><Input /></Form.Item>
-          <Form.Item name="subtitle" label="副标题"><Input /></Form.Item>
-          <Form.Item name="aromaType" label="香型" rules={[{ required: true }]}>
-            <Select options={Object.entries(AROMA_TYPE_LABELS).map(([value, label]) => ({ value, label }))} />
-          </Form.Item>
-          <Form.Item name="spec" label="规格" rules={[{ required: true }]}><Input placeholder="500ml | 52度" /></Form.Item>
-          <Form.Item name="price" label="售价" rules={[{ required: true }]}><InputNumber min={0} style={{ width: '100%' }} /></Form.Item>
-          <Form.Item name="benefitAmount" label="权益额"><InputNumber min={0} style={{ width: '100%' }} /></Form.Item>
-          <Form.Item name="status" label="状态">
-            <Select options={Object.entries(PRODUCT_STATUS_LABELS).map(([value, label]) => ({ value, label }))} />
-          </Form.Item>
-          <Form.Item name="sortOrder" label="排序"><InputNumber min={0} style={{ width: '100%' }} /></Form.Item>
-          <Form.Item name="coverUrl" label="封面">
-            <OssUpload bizType="COVER" mediaType="IMAGE" />
-          </Form.Item>
+      }} width={720}>
+        <Form form={createForm} layout="vertical" initialValues={{
+          aromaType: 'QINGXIANG', status: 'DRAFT', sortOrder: 0,
+          carouselUrls: [''], detailImageUrls: [''],
+          features: [{ icon: 'water_drop', title: '', desc: '' }],
+        }}>
+          <Tabs items={[
+            { key: 'base', label: '基础信息', children: <BaseInfoFields mode="create" /> },
+            { key: 'detail', label: '详情页', children: <ProductDetailFields /> },
+          ]} />
         </Form>
       </Modal>
     </div>

apps/admin-web/src/pages/UserLogsPage.tsx

@@ -0,0 +1,156 @@
+import { useEffect, useState } from 'react';
+import { Button, Descriptions, Drawer, Form, Input, Segmented, Space, Table, Tag, Typography } from 'antd';
+import type { ColumnsType } from 'antd/es/table';
+import { USER_LOG_CATEGORY_OPTIONS, resolveUserLogCategory, USER_LOG_CATEGORY_LABELS, type UserLogCategory } from '../lib/user-log';
+import { useSearchParams } from 'react-router-dom';
+import { request } from '../lib/api';
+import { fmtTime } from '../lib/constants';
+import { useAdminList } from '../lib/useAdminList';
+
+type Row = {
+  id: string;
+  userId: string | null;
+  userNo: string | null;
+  phone: string | null;
+  nickname: string | null;
+  category: UserLogCategory | null;
+  eventName: string;
+  clientApp: string | null;
+  refType: string | null;
+  refId: string | null;
+  extraJson: Record<string, unknown> | null;
+  createdAt: string;
+};
+
+const CATEGORY_LABELS = USER_LOG_CATEGORY_LABELS;
+
+function summarizeExtra(json: Record<string, unknown> | null) {
+  if (!json) return '—';
+  const text = JSON.stringify(json);
+  return text.length > 80 ? `${text.slice(0, 80)}…` : text;
+}
+
+export default function UserLogsPage() {
+  const [searchParams, setSearchParams] = useSearchParams();
+  const [form] = Form.useForm();
+  const [category, setCategory] = useState(searchParams.get('category') ?? '');
+  const [filters, setFilters] = useState<Record<string, string>>(() => ({
+    userId: searchParams.get('userId') ?? '',
+    phone: searchParams.get('phone') ?? '',
+    userNo: searchParams.get('userNo') ?? '',
+    eventName: searchParams.get('eventName') ?? '',
+  }));
+  const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<Row>(
+    '/admin/logs/users',
+    () => {
+      const qs = new URLSearchParams();
+      if (filters.userId) qs.set('userId', filters.userId);
+      if (filters.phone) qs.set('phone', filters.phone);
+      if (filters.userNo) qs.set('userNo', filters.userNo);
+      if (filters.eventName) qs.set('eventName', filters.eventName);
+      if (category) qs.set('category', category);
+      return qs;
+    },
+    [filters, category],
+  );
+  const [detail, setDetail] = useState<Record<string, unknown> | null>(null);
+  const [drawerOpen, setDrawerOpen] = useState(false);
+
+  useEffect(() => {
+    form.setFieldsValue(filters);
+  }, [form, filters]);
+
+  const columns: ColumnsType<Row> = [
+    { title: '时间', dataIndex: 'createdAt', width: 160, render: fmtTime },
+    {
+      title: '用户', width: 160,
+      render: (_, r) => (
+        <div>
+          <div>{r.nickname || r.userNo || '—'}</div>
+          <div style={{ color: '#999', fontSize: 12 }}>{r.phone || r.userId || '—'}</div>
+        </div>
+      ),
+    },
+    {
+      title: '分类', dataIndex: 'category', width: 100,
+      render: (v: UserLogCategory | null, r) => (
+        <Tag>{CATEGORY_LABELS[v ?? ''] || resolveUserLogCategory(r.eventName) || '其他'}</Tag>
+      ),
+    },
+    { title: '事件', dataIndex: 'eventName', width: 160 },
+    {
+      title: '关联', width: 120,
+      render: (_, r) => (r.refType && r.refId ? `${r.refType}#${r.refId}` : '—'),
+    },
+    {
+      title: '摘要', ellipsis: true,
+      render: (_, r) => summarizeExtra(r.extraJson),
+    },
+    {
+      title: '操作', width: 80,
+      render: (_, row) => (
+        <Button type="link" size="small" onClick={async () => {
+          setDetail(await request(`/admin/logs/users/${row.id}`));
+          setDrawerOpen(true);
+        }}>详情</Button>
+      ),
+    },
+  ];
+
+  return (
+    <div>
+      <Typography.Title level={4}>用户日志</Typography.Title>
+      <Segmented
+        style={{ marginBottom: 16 }}
+        options={USER_LOG_CATEGORY_OPTIONS.map((o) => ({ value: o.value, label: o.label }))}
+        value={category}
+        onChange={(v) => {
+          setCategory(String(v));
+          setPage(1);
+          const next = new URLSearchParams(searchParams);
+          if (v) next.set('category', String(v));
+          else next.delete('category');
+          setSearchParams(next);
+        }}
+      />
+      <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => {
+        setFilters(v);
+        setPage(1);
+        const next = new URLSearchParams(searchParams);
+        for (const key of ['userId', 'phone', 'userNo', 'eventName'] as const) {
+          if (v[key]) next.set(key, v[key]);
+          else next.delete(key);
+        }
+        setSearchParams(next);
+      }}>
+        <Form.Item name="userId" label="用户ID"><Input allowClear style={{ width: 120 }} /></Form.Item>
+        <Form.Item name="phone" label="手机号"><Input allowClear style={{ width: 130 }} /></Form.Item>
+        <Form.Item name="userNo" label="用户编号"><Input allowClear style={{ width: 120 }} /></Form.Item>
+        <Form.Item name="eventName" label="事件名"><Input allowClear style={{ width: 160 }} placeholder="pay_success" /></Form.Item>
+        <Form.Item><Button type="primary" htmlType="submit">筛选</Button></Form.Item>
+        <Form.Item><Button onClick={() => { form.resetFields(); setFilters({}); setCategory(''); setSearchParams({}); setPage(1); }}>重置</Button></Form.Item>
+      </Form>
+      <Table rowKey="id" loading={loading} columns={columns} dataSource={data?.items ?? []} scroll={{ x: 1000 }}
+        pagination={{ current: page, pageSize, total: data?.total ?? 0, showSizeChanger: true, onChange: (p, ps) => { setPage(p); setPageSize(ps); } }} />
+      <Drawer title="日志详情" width={520} open={drawerOpen} onClose={() => setDrawerOpen(false)}>
+        {detail && (
+          <Descriptions column={1} bordered size="small">
+            <Descriptions.Item label="ID">{String(detail.id)}</Descriptions.Item>
+            <Descriptions.Item label="用户">{String(detail.nickname || detail.userNo || detail.userId || '—')}</Descriptions.Item>
+            <Descriptions.Item label="手机">{String(detail.phone || '—')}</Descriptions.Item>
+            <Descriptions.Item label="分类">{CATEGORY_LABELS[String(detail.category ?? '')] || String(detail.category || '—')}</Descriptions.Item>
+            <Descriptions.Item label="事件">{String(detail.eventName)}</Descriptions.Item>
+            <Descriptions.Item label="客户端">{String(detail.clientApp || '—')}</Descriptions.Item>
+            <Descriptions.Item label="关联">{detail.refType ? `${String(detail.refType)}#${String(detail.refId)}` : '—'}</Descriptions.Item>
+            <Descriptions.Item label="时间">{fmtTime(String(detail.createdAt))}</Descriptions.Item>
+            <Descriptions.Item label="参数">
+              <pre style={{ margin: 0, whiteSpace: 'pre-wrap', wordBreak: 'break-all' }}>
+                {JSON.stringify(detail.extraJson ?? {}, null, 2)}
+              </pre>
+            </Descriptions.Item>
+          </Descriptions>
+        )}
+      </Drawer>
+    </div>
+  );
+}

apps/admin-web/src/pages/UsersPage.tsx

@@ -1,4 +1,5 @@
 import { useCallback, useEffect, useState } from 'react';
+import { useNavigate } from 'react-router-dom';
 import {
   Button,
   Descriptions,
@@ -24,6 +25,7 @@ type UserDetail = AdminUserRow & {
 };
 
 export default function UsersPage() {
+  const navigate = useNavigate();
   const [form] = Form.useForm();
   const [data, setData] = useState<Paginated<AdminUserRow> | null>(null);
   const [loading, setLoading] = useState(false);
@@ -99,11 +101,16 @@ export default function UsersPage() {
     },
     {
       title: '操作',
-      width: 80,
+      width: 140,
       render: (_, row) => (
-        <Button type="link" size="small" onClick={() => openDetail(row.id)}>
-          详情
-        </Button>
+        <Space size="small">
+          <Button type="link" size="small" onClick={() => openDetail(row.id)}>
+            详情
+          </Button>
+          <Button type="link" size="small" onClick={() => navigate(`/logs/users?userId=${row.id}`)}>
+            查看日志
+          </Button>
+        </Space>
       ),
     },
   ];
@@ -198,6 +205,13 @@ export default function UsersPage() {
                 />
               </>
             )}
+            <Button
+              type="primary"
+              style={{ marginTop: 16 }}
+              onClick={() => navigate(`/logs/users?userId=${detail.id}`)}
+            >
+              查看用户日志
+            </Button>
           </>
         )}
       </Drawer>