Quellcode durchsuchen

feat: enhance order payment details with voucher display and manual registration support

jerry vor 1 Monat
Ursprung
Commit
988887bd51

+ 222 - 24
src/app/admin/orders/new/page.tsx

@@ -2,13 +2,14 @@
 
 import { useState, useEffect } from 'react';
 import { useRouter } from 'next/navigation';
-import { ArrowLeft, Users, Building2, Globe, DollarSign } from 'lucide-react';
+import { ArrowLeft, Users, Building2, Globe, DollarSign, Clock, CheckCircle2, ShieldCheck, Smartphone, Banknote } from 'lucide-react';
 import { productService, orderService, settlementService } from '@/lib/services';
 import { getCurrentUser } from '@/lib/auth';
 import ProductSearchSelector from '@/components/admin/orders/ProductSearchSelector';
 import AiDataParserPanel from '@/components/admin/orders/AiDataParserPanel';
 import DynamicOrderSchemaForm from '@/components/admin/orders/DynamicOrderSchemaForm';
 import AdminUserSelect from '@/components/common/AdminUserSelect';
+import { ImageUploadField } from '@/components/common/ImageUploadField';
 import { SchemaProperty, VasAgency } from '@/types';
 import { toast } from 'react-hot-toast';
 
@@ -26,6 +27,13 @@ export default function AdminCreateOrderPage() {
   const [handlerId, setHandlerId] = useState<string>('');
   const [customPrice, setCustomPrice] = useState<string>(''); // 单位: 元
 
+  // 2.5 收款时机与收款登记状态
+  const [paymentTiming, setPaymentTiming] = useState<'pay_later' | 'paid_now'>('pay_later');
+  const [paymentMethod, setPaymentMethod] = useState<string>('wechat');
+  const [externalTradeNo, setExternalTradeNo] = useState<string>('');
+  const [voucherUrl, setVoucherUrl] = useState<string>('');
+  const [paymentNote, setPaymentNote] = useState<string>('');
+
   // 3. 表单与 Schema 状态
   const [formSchema, setFormSchema] = useState<any>(null);
   const [formValues, setFormValues] = useState<Record<string, any>>({});
@@ -61,22 +69,32 @@ export default function AdminCreateOrderPage() {
 
   const selectedAgency = agencies.find((a) => a.id === selectedAgencyId);
 
-  // 加载 Schema
+  // 加载商品默认价与 Schema
   useEffect(() => {
+    if (!selectedProduct) {
+      setFormSchema(null);
+      setSortedFields([]);
+      setFormValues({});
+      setCustomPrice('');
+      return;
+    }
+
+    // 默认价格填充 (分转元): 优先取 price_amount,兼顾 base_price
+    if (selectedProduct.price_amount !== undefined) {
+      setCustomPrice((selectedProduct.price_amount / 100).toFixed(2));
+    } else if (selectedProduct.base_price !== undefined) {
+      setCustomPrice((selectedProduct.base_price / 100).toFixed(2));
+    }
+
+    if (!selectedProduct.schema_id) {
+      setFormSchema(null);
+      setSortedFields([]);
+      setFormValues({});
+      return;
+    }
+
     async function loadSchema() {
-      if (!selectedProduct?.schema_id) {
-        setFormSchema(null);
-        setSortedFields([]);
-        setFormValues({});
-        setCustomPrice('');
-        return;
-      }
       try {
-        // 默认价格填充 (分转元)
-        if (selectedProduct.base_price !== undefined) {
-          setCustomPrice((selectedProduct.base_price / 100).toFixed(2));
-        }
-
         const res = await productService.getSchemaDetail(selectedProduct.schema_id);
         const data = res?.data || res;
         const schemaJson =
@@ -127,12 +145,16 @@ export default function AdminCreateOrderPage() {
     e.preventDefault();
     if (!selectedProduct) return toast.error('请先搜索并选择商品');
 
-    // 中介底价校验
+    // 价格校验
     let finalAmountCents: number | undefined = undefined;
     if (customPrice && !isNaN(Number(customPrice))) {
       finalAmountCents = Math.round(Number(customPrice) * 100);
     }
 
+    if (finalAmountCents === undefined || finalAmountCents <= 0) {
+      return toast.error('请输入有效的金额 (必须大于 0)');
+    }
+
     if (channelType === 'agency') {
       if (!selectedAgencyId) {
         return toast.error('请选择合作中介机构');
@@ -157,12 +179,21 @@ export default function AdminCreateOrderPage() {
         agency_id: channelType === 'agency' ? selectedAgencyId : undefined,
         handler_id: channelType === 'website' ? undefined : handlerId.trim(),
         final_amount: finalAmountCents,
+        payment_timing: paymentTiming,
+        payment_method: paymentTiming === 'paid_now' ? paymentMethod : undefined,
+        external_trade_no: paymentTiming === 'paid_now' ? (externalTradeNo.trim() || undefined) : undefined,
+        voucher_url: paymentTiming === 'paid_now' ? (voucherUrl.trim() || undefined) : undefined,
+        payment_note: paymentTiming === 'paid_now' ? (paymentNote.trim() || undefined) : undefined,
       };
 
       const res = await orderService.createByAdmin(payload);
       const orderId = res?.data?.id || res?.id || res?.data?.order_id || res?.order_id;
 
-      toast.success(`代下单成功!订单号: ${orderId}`);
+      if (paymentTiming === 'pay_later') {
+        toast.success(`代客下单成功!任务已入队调度 [待出签/收款] 订单号: ${orderId}`);
+      } else {
+        toast.success(`代下单并收款核销成功!订单号: ${orderId}`);
+      }
       router.push('/admin/orders');
     } catch (error: any) {
       console.error(error);
@@ -351,29 +382,196 @@ export default function AdminCreateOrderPage() {
                   </div>
                 )}
 
-                {/* 自定义结算价格 */}
+              </div>
+            </div>
+          </div>
+        )}
+
+        {/* Step 1.6: 收款时机与金额登记 */}
+        {selectedProduct && (
+          <div className="bg-white border-2 border-black shadow-[4px_4px_0px_#000] overflow-hidden">
+            <div className="px-5 py-3 border-b-2 border-black bg-neutral-200 text-black flex items-center justify-between">
+              <div className="flex items-center gap-2">
+                <span className="w-5 h-5 bg-amber-300 border border-black flex items-center justify-center text-black text-[10px] font-black">
+                  1.6
+                </span>
+                <label className="text-xs font-black uppercase tracking-wider text-black">
+                  [ PAYMENT & PRICING // 收款模式、结算金额与入账登记 ]
+                </label>
+              </div>
+              <span className="text-[10px] text-neutral-500 font-bold uppercase">
+                先办后付 vs 现结核销
+              </span>
+            </div>
+
+            <div className="p-5 space-y-4">
+              {/* 收款时机选择 */}
+              <div>
+                <label className="text-xs font-black text-black uppercase block mb-2">
+                  [ 1. 选择收款与业务节奏模式 ]
+                </label>
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-3">
+                  {/* Pay later */}
+                  <div
+                    onClick={() => setPaymentTiming('pay_later')}
+                    className={`p-3.5 border-2 cursor-pointer transition ${
+                      paymentTiming === 'pay_later'
+                        ? 'border-black bg-amber-100 shadow-[3px_3px_0px_#000]'
+                        : 'border-neutral-300 bg-neutral-50 hover:border-black'
+                    }`}
+                  >
+                    <div className="flex items-center justify-between mb-1">
+                      <div className="flex items-center gap-2">
+                        <Clock size={16} className="text-amber-800" />
+                        <span className="text-xs font-black text-black uppercase">[ 先办后付 // 稍后收款 ]</span>
+                      </div>
+                      <span className="px-1.5 py-0.5 bg-amber-300 border border-black text-[9px] font-black">
+                        业务推荐
+                      </span>
+                    </div>
+                    <p className="text-[11px] text-neutral-600 font-sans leading-relaxed">
+                      先替客户下单,<strong>任务立即下发队列调度</strong>。待出签办妥或客户打款后,在后台随时一键<strong>[ 登记收款 ]</strong>生成流水。
+                    </p>
+                  </div>
+
+                  {/* Paid now */}
+                  <div
+                    onClick={() => setPaymentTiming('paid_now')}
+                    className={`p-3.5 border-2 cursor-pointer transition ${
+                      paymentTiming === 'paid_now'
+                        ? 'border-black bg-emerald-100 shadow-[3px_3px_0px_#000]'
+                        : 'border-neutral-300 bg-neutral-50 hover:border-black'
+                    }`}
+                  >
+                    <div className="flex items-center gap-2 mb-1">
+                      <CheckCircle2 size={16} className="text-emerald-800" />
+                      <span className="text-xs font-black text-black uppercase">[ 当场全款已收 // 现结录入 ]</span>
+                    </div>
+                    <p className="text-[11px] text-neutral-600 font-sans leading-relaxed">
+                      客户已通过微信/支付宝/公户全款转账,现场直接核销入账,立即在数据库生成<strong>已支付流水凭据</strong>。
+                    </p>
+                  </div>
+                </div>
+              </div>
+
+              {/* 金额输入及差额提示 */}
+              <div className="pt-3 border-t-2 border-dashed border-neutral-300 grid grid-cols-1 md:grid-cols-2 gap-4">
                 <div>
                   <label className="text-xs font-black text-black uppercase block mb-1">
-                    [ 实收结算价格 (元) ]
+                    [ {paymentTiming === 'pay_later' ? '约定应收金额 (元)' : '实际到账金额 (元)'} ] <span className="text-rose-600">*</span>
                   </label>
                   <div className="relative">
-                    <span className="absolute left-3 top-2 text-xs font-bold text-black pointer-events-none">
+                    <span className="absolute left-3 top-2.5 text-xs font-bold text-black pointer-events-none">
                       ¥
                     </span>
                     <input
                       type="number"
                       step="0.01"
+                      required
                       value={customPrice}
                       onChange={(e) => setCustomPrice(e.target.value)}
-                      placeholder="默认商品指导价"
-                      className="w-full pl-7 pr-3 py-2 border-2 border-black bg-neutral-50 text-xs font-mono font-bold focus:bg-white outline-none shadow-[2px_2px_0px_#000] text-black"
+                      placeholder="商品指导价"
+                      className="w-full pl-7 pr-3 py-2 border-2 border-black bg-neutral-50 text-xs font-mono font-black focus:bg-white outline-none shadow-[2px_2px_0px_#000] text-black"
                     />
                   </div>
-                  <span className="text-[10px] text-neutral-500 font-mono mt-1 block">
-                    留空则使用商品默认标价。若填写将覆盖商品基础价。
-                  </span>
+                  <div className="text-[10px] text-neutral-500 font-mono mt-1 flex items-center justify-between">
+                    <span>
+                      商品指导标价: ¥{((selectedProduct.price_amount || selectedProduct.base_price || 0) / 100).toFixed(2)}
+                    </span>
+                    {customPrice && !isNaN(Number(customPrice)) && (
+                      <span className={`font-bold ${
+                        Number(customPrice) * 100 < (selectedProduct.price_amount || 0)
+                          ? 'text-rose-600'
+                          : Number(customPrice) * 100 > (selectedProduct.price_amount || 0)
+                          ? 'text-emerald-700'
+                          : 'text-neutral-500'
+                      }`}>
+                        差额: ¥{((Number(customPrice) * 100 - (selectedProduct.price_amount || 0)) / 100).toFixed(2)}
+                      </span>
+                    )}
+                  </div>
                 </div>
+
+                {paymentTiming === 'pay_later' ? (
+                  <div className="p-3 bg-amber-50 border border-black text-xs font-mono flex items-start gap-2">
+                    <Clock size={16} className="text-amber-800 shrink-0 mt-0.5" />
+                    <div>
+                      <span className="text-black font-black block mb-0.5">先办后付调度保障:</span>
+                      <p className="text-[11px] text-neutral-700 font-sans leading-relaxed">
+                        订单创建后将自动标记为 <strong>[ 待收款 (先办后付) ]</strong>,抢单机器人将以最高优先级即刻开始抓取办理。后续款项到手后,在订单列表点击 <strong>[ 💰 登记收款 ]</strong> 即可补录流水。
+                      </p>
+                    </div>
+                  </div>
+                ) : (
+                  <div>
+                    <label className="text-xs font-black text-black uppercase block mb-1">
+                      [ 收款渠道方式 ] <span className="text-rose-600">*</span>
+                    </label>
+                    <div className="grid grid-cols-2 gap-2">
+                      {[
+                        { id: 'wechat', label: '微信私域转账' },
+                        { id: 'alipay', label: '支付宝转账' },
+                        { id: 'bank_transfer', label: '银行公户/私户' },
+                        { id: 'cash', label: '现金收款' },
+                      ].map((m) => (
+                        <button
+                          type="button"
+                          key={m.id}
+                          onClick={() => setPaymentMethod(m.id)}
+                          className={`px-2.5 py-1.5 border-2 text-xs font-bold text-left transition ${
+                            paymentMethod === m.id
+                              ? 'border-black bg-amber-300 text-black shadow-[2px_2px_0px_#000]'
+                              : 'border-neutral-300 bg-neutral-50 hover:border-black text-neutral-700'
+                          }`}
+                        >
+                          {m.label}
+                        </button>
+                      ))}
+                    </div>
+                  </div>
+                )}
               </div>
+
+              {/* 当场结清时的补充凭据 */}
+              {paymentTiming === 'paid_now' && (
+                <div className="grid grid-cols-1 md:grid-cols-3 gap-3 pt-3 border-t border-dashed border-neutral-300">
+                  <div>
+                    <label className="text-[11px] font-bold text-black uppercase block mb-1">
+                      外部转账单号 (选填)
+                    </label>
+                    <input
+                      type="text"
+                      value={externalTradeNo}
+                      onChange={(e) => setExternalTradeNo(e.target.value)}
+                      placeholder="微信单号 / 银行流水号"
+                      className="w-full px-2.5 py-1.5 border-2 border-black bg-neutral-50 text-xs font-mono font-bold focus:bg-white outline-none shadow-[2px_2px_0px_#000] text-black"
+                    />
+                  </div>
+                  <div>
+                    <ImageUploadField
+                      label="转账水单/截图 (上传至 R2)"
+                      value={voucherUrl}
+                      onChange={setVoucherUrl}
+                      prefix="vouchers"
+                      maxSizeMB={5}
+                      helperText="点击选择水单截图,自动上传至 R2 对象存储"
+                      compact={true}
+                    />
+                  </div>
+                  <div>
+                    <label className="text-[11px] font-bold text-black uppercase block mb-1">
+                      入账备注说明 (选填)
+                    </label>
+                    <input
+                      type="text"
+                      value={paymentNote}
+                      onChange={(e) => setPaymentNote(e.target.value)}
+                      placeholder="例如: 客户微信当面付清"
+                      className="w-full px-2.5 py-1.5 border-2 border-black bg-neutral-50 text-xs font-mono font-bold focus:bg-white outline-none shadow-[2px_2px_0px_#000] text-black"
+                    />
+                  </div>
+                </div>
+              )}
             </div>
           </div>
         )}

+ 27 - 0
src/app/admin/orders/page.tsx

@@ -10,6 +10,7 @@ import OrderDetailDrawer from '@/components/admin/orders/OrderDetailDrawer';
 import OrderEditModal from '@/components/admin/orders/OrderEditModal';
 import OrderPaymentModal from '@/components/admin/orders/OrderPaymentModal';
 import OrderPriceAdjustModal from '@/components/admin/orders/OrderPriceAdjustModal';
+import RegisterPaymentModal from '@/components/admin/orders/RegisterPaymentModal';
 import Pagination from '@/components/common/Pagination';
 import { toast } from 'react-hot-toast';
 import { retroConfirm } from '@/lib/dialog';
@@ -36,6 +37,8 @@ export default function AdminOrdersPage() {
   const [isEditOpen, setIsEditOpen] = useState(false);
   const [isPaymentModalOpen, setIsPaymentModalOpen] = useState(false);
   const [isPriceModalOpen, setIsPriceModalOpen] = useState(false);
+  const [isRegisterPaymentModalOpen, setIsRegisterPaymentModalOpen] = useState(false);
+  const [registeringOrder, setRegisteringOrder] = useState<OrderDetail | null>(null);
   const [editingOrder, setEditingOrder] = useState<OrderDetail | null>(null);
 
   const fetchOrders = useCallback(async (
@@ -252,6 +255,20 @@ export default function AdminOrdersPage() {
     }
   };
 
+  const handleRegisterPayment = (order: OrderDetail) => {
+    setRegisteringOrder(order);
+    setIsRegisterPaymentModalOpen(true);
+  };
+
+  const handleRegisterPaymentSuccess = () => {
+    fetchOrders(page, statusFilter, keyword, channelFilter, settlementFilter);
+    if (selectedOrder && registeringOrder && selectedOrder.id === registeringOrder.id) {
+      orderService.getDetail(selectedOrder.id).then((res) => {
+        if (res?.data) setSelectedOrder(res.data);
+      }).catch(() => {});
+    }
+  };
+
   return (
     <div className="space-y-6 font-mono">
       {/* 顶部标头 */}
@@ -296,6 +313,7 @@ export default function AdminOrdersPage() {
         onCheckPayments={handleCheckPayments}
         onAdjustPrice={handleAdjustPrice}
         onMarkCompleted={handleMarkCompleted}
+        onRegisterPayment={handleRegisterPayment}
       />
 
       {/* 4. 分页器 */}
@@ -318,6 +336,7 @@ export default function AdminOrdersPage() {
         onEdit={handleEditOrder}
         onCancel={handleCancelOrder}
         onMarkCompleted={handleMarkCompleted}
+        onRegisterPayment={handleRegisterPayment}
       />
 
       {/* 6. 编辑用户输入弹窗 */}
@@ -343,6 +362,14 @@ export default function AdminOrdersPage() {
         order={selectedOrder}
         onSuccess={() => fetchOrders(page, statusFilter, keyword)}
       />
+
+      {/* 9. 登记实收金额与收款流水弹窗 */}
+      <RegisterPaymentModal
+        isOpen={isRegisterPaymentModalOpen}
+        onClose={() => setIsRegisterPaymentModalOpen(false)}
+        order={registeringOrder}
+        onSuccess={handleRegisterPaymentSuccess}
+      />
     </div>
   );
 }

+ 20 - 2
src/components/admin/node-configurations/ClusterNodeTable.tsx

@@ -15,6 +15,7 @@ import {
   Activity,
   Wifi,
   WifiOff,
+  Terminal,
 } from 'lucide-react';
 import { toast } from 'react-hot-toast';
 import { retroConfirm } from '@/lib/dialog';
@@ -46,6 +47,12 @@ export default function ClusterNodeTable({
   const [telemetryFilter, setTelemetryFilter] = useState<'all' | 'online' | 'offline' | 'nosignal'>('all');
   const [togglingNodeId, setTogglingNodeId] = useState<string | null>(null);
   const [selectedTelemetryNode, setSelectedTelemetryNode] = useState<ClusterNode | null>(null);
+  const [telemetryInitialTab, setTelemetryInitialTab] = useState<'telemetry' | 'logs'>('telemetry');
+
+  const handleOpenTelemetry = (node: ClusterNode, tab: 'telemetry' | 'logs' = 'telemetry') => {
+    setSelectedTelemetryNode(node);
+    setTelemetryInitialTab(tab);
+  };
 
   // 聚合计算单个节点的遥测数据
   const getNodeTelemetrySummary = (nodeId: string) => {
@@ -428,7 +435,7 @@ export default function ClusterNodeTable({
                       <div className="flex items-center justify-end gap-1.5">
                         <button
                           type="button"
-                          onClick={() => setSelectedTelemetryNode(node)}
+                          onClick={() => handleOpenTelemetry(node, 'telemetry')}
                           className="px-2 py-1 bg-amber-100 hover:bg-amber-200 text-black border border-black text-[11px] font-black shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5 flex items-center gap-1 uppercase"
                           title="查看实时遥测与健康体征"
                         >
@@ -436,6 +443,16 @@ export default function ClusterNodeTable({
                           <span>遥测</span>
                         </button>
 
+                        <button
+                          type="button"
+                          onClick={() => handleOpenTelemetry(node, 'logs')}
+                          className="px-2 py-1 bg-cyan-100 hover:bg-cyan-200 text-cyan-950 border border-black text-[11px] font-black shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5 flex items-center gap-1 uppercase"
+                          title="查看节点实时控制台运行日志"
+                        >
+                          <Terminal size={11} className="text-black" />
+                          <span>日志</span>
+                        </button>
+
                         <button
                           type="button"
                           onClick={() => onOpenEdit(node)}
@@ -465,13 +482,14 @@ export default function ClusterNodeTable({
         </table>
       </div>
 
-      {/* 节点实时遥测详情弹窗 */}
+      {/* 节点实时遥测与控制台详情弹窗 */}
       <NodeTelemetryModal
         isOpen={Boolean(selectedTelemetryNode)}
         onClose={() => setSelectedTelemetryNode(null)}
         node={selectedTelemetryNode}
         runtimeNodes={runtimeNodes}
         onRefreshAll={onRefresh}
+        initialTab={telemetryInitialTab}
       />
     </div>
   );

+ 480 - 0
src/components/admin/node-configurations/NodeLogTerminal.tsx

@@ -0,0 +1,480 @@
+// src/components/admin/node-configurations/NodeLogTerminal.tsx
+'use client';
+
+import React, { useState, useEffect, useRef, useMemo, useCallback } from 'react';
+import {
+  Terminal,
+  Play,
+  Pause,
+  Trash2,
+  Copy,
+  Check,
+  Search,
+  ArrowDown,
+  Filter,
+  RefreshCw,
+  AlertCircle,
+  Wifi,
+  WifiOff,
+} from 'lucide-react';
+import { toast } from 'react-hot-toast';
+import { nodeConfigService } from '@/lib/services/nodeConfigService';
+import { NodeLogItem } from '@/types';
+
+interface NodeLogTerminalProps {
+  nodeId: string;
+  initialRole?: string;
+  availableRoles?: string[];
+  availableGroups?: string[];
+}
+
+export default function NodeLogTerminal({
+  nodeId,
+  initialRole = 'sentinel',
+  availableRoles = ['sentinel', 'booker', 'standalone'],
+  availableGroups = [],
+}: NodeLogTerminalProps) {
+  // 选中的过滤角色
+  const [selectedRole, setSelectedRole] = useState<string>(initialRole);
+  // 选中的 Group 过滤
+  const [selectedGroup, setSelectedGroup] = useState<string>('');
+  // 级别过滤: ALL | INFO | WARN | ERROR
+  const [levelFilter, setLevelFilter] = useState<'ALL' | 'INFO' | 'WARN' | 'ERROR'>('ALL');
+  // 搜索关键字
+  const [searchKeyword, setSearchKeyword] = useState<string>('');
+
+  // 日志列表状态(最大缓冲 1500 条)
+  const [logs, setLogs] = useState<NodeLogItem[]>([]);
+  // 连接状态
+  const [isConnected, setIsConnected] = useState<boolean>(false);
+  const [isPaused, setIsPaused] = useState<boolean>(false);
+  const [errorMsg, setErrorMsg] = useState<string | null>(null);
+
+  // 自动置底滚屏
+  const [autoScroll, setAutoScroll] = useState<boolean>(true);
+  const [hasNewUnread, setHasNewUnread] = useState<boolean>(false);
+  const [copied, setCopied] = useState<boolean>(false);
+
+  const terminalBodyRef = useRef<HTMLDivElement>(null);
+  const abortCleanupRef = useRef<(() => void) | null>(null);
+  const isPausedRef = useRef<boolean>(false);
+  isPausedRef.current = isPaused;
+
+  // 建立 SSE 实时监听流
+  const startStream = useCallback(() => {
+    if (abortCleanupRef.current) {
+      abortCleanupRef.current();
+      abortCleanupRef.current = null;
+    }
+    setErrorMsg(null);
+    setIsConnected(false);
+
+    const cleanup = nodeConfigService.streamNodeLogs(
+      {
+        node_id: nodeId,
+        role: selectedRole,
+        history_limit: 300,
+      },
+      {
+        onLog: (newLog) => {
+          setIsConnected(true);
+          if (isPausedRef.current) return;
+
+          setLogs((prev) => {
+            const next = [...prev, newLog];
+            if (next.length > 1500) {
+              return next.slice(next.length - 1500);
+            }
+            return next;
+          });
+        },
+        onError: (err) => {
+          console.error('SSE log stream error:', err);
+          setIsConnected(false);
+          setErrorMsg(err.message || '实时日志流连接中断');
+        },
+      }
+    );
+
+    abortCleanupRef.current = cleanup;
+    setIsConnected(true);
+  }, [nodeId, selectedRole]);
+
+  // 当 nodeId 或 selectedRole 切换时重连
+  useEffect(() => {
+    setLogs([]);
+    startStream();
+
+    return () => {
+      if (abortCleanupRef.current) {
+        abortCleanupRef.current();
+        abortCleanupRef.current = null;
+      }
+    };
+  }, [nodeId, selectedRole, startStream]);
+
+  // 监听滚动事件:如果用户主动往上滚,则暂停自动置底
+  const handleScroll = () => {
+    const el = terminalBodyRef.current;
+    if (!el) return;
+    const isAtBottom = el.scrollHeight - el.scrollTop - el.clientHeight <= 40;
+    if (isAtBottom) {
+      setAutoScroll(true);
+      setHasNewUnread(false);
+    } else {
+      setAutoScroll(false);
+    }
+  };
+
+  // 日志增加时的滚动逻辑
+  useEffect(() => {
+    if (autoScroll && terminalBodyRef.current) {
+      terminalBodyRef.current.scrollTop = terminalBodyRef.current.scrollHeight;
+    } else if (!autoScroll) {
+      setHasNewUnread(true);
+    }
+  }, [logs, autoScroll]);
+
+  const scrollToBottom = () => {
+    if (terminalBodyRef.current) {
+      terminalBodyRef.current.scrollTop = terminalBodyRef.current.scrollHeight;
+      setAutoScroll(true);
+      setHasNewUnread(false);
+    }
+  };
+
+  // 过滤后的日志
+  const filteredLogs = useMemo(() => {
+    return logs.filter((item) => {
+      // 级别过滤
+      if (levelFilter !== 'ALL') {
+        const lvl = (item.level || 'INFO').toUpperCase();
+        if (levelFilter === 'ERROR' && lvl !== 'ERROR') return false;
+        if (levelFilter === 'WARN' && lvl !== 'WARN' && lvl !== 'WARNING') return false;
+        if (levelFilter === 'INFO' && lvl !== 'INFO') return false;
+      }
+
+      // Group 过滤
+      if (selectedGroup && item.group_id && item.group_id !== selectedGroup) {
+        return false;
+      }
+
+      // 关键词搜索
+      if (searchKeyword.trim()) {
+        const q = searchKeyword.toLowerCase();
+        const inMsg = (item.message || '').toLowerCase().includes(q);
+        const inGrp = (item.group_id || '').toLowerCase().includes(q);
+        if (!inMsg && !inGrp) return false;
+      }
+
+      return true;
+    });
+  }, [logs, levelFilter, selectedGroup, searchKeyword]);
+
+  // 复制可见日志
+  const handleCopyLogs = () => {
+    const text = filteredLogs
+      .map((l) => `[${l.timestamp}] [${l.level}] [${l.group_id || '-'}] ${l.message}`)
+      .join('\n');
+    navigator.clipboard.writeText(text);
+    setCopied(true);
+    toast.success(`已复制 ${filteredLogs.length} 条日志到剪贴板`);
+    setTimeout(() => setCopied(false), 2000);
+  };
+
+  // 清屏
+  const handleClearLogs = () => {
+    setLogs([]);
+    toast.success('控制台屏幕已清空');
+  };
+
+  // 高亮搜索词
+  const renderMessageWithHighlight = (msg: string) => {
+    if (!searchKeyword.trim()) return msg;
+    const parts = msg.split(new RegExp(`(${searchKeyword.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')})`, 'gi'));
+    return parts.map((part, i) =>
+      part.toLowerCase() === searchKeyword.toLowerCase() ? (
+        <span key={i} className="bg-amber-300 text-black font-black px-0.5 rounded-2xs">
+          {part}
+        </span>
+      ) : (
+        part
+      )
+    );
+  };
+
+  return (
+    <div className="flex flex-col h-full bg-neutral-900 border-2 border-black text-xs font-mono select-text">
+      {/* 1. 顶部控制工具栏 */}
+      <div className="bg-neutral-800 border-b-2 border-black p-2.5 flex flex-wrap items-center justify-between gap-2 text-white">
+        {/* 左侧:角色切换 & 状态指示 */}
+        <div className="flex items-center gap-2 flex-wrap">
+          <div className="flex items-center gap-1.5 px-2 py-1 bg-black border border-neutral-700">
+            <span
+              className={`w-2 h-2 rounded-full ${
+                isConnected
+                  ? isPaused
+                    ? 'bg-amber-400'
+                    : 'bg-emerald-400 animate-pulse'
+                  : 'bg-rose-500'
+              }`}
+            />
+            <span className="text-[11px] font-bold">
+              {isConnected
+                ? isPaused
+                  ? '已暂停接收'
+                  : '实时流已连接'
+                : errorMsg
+                ? '连接断开'
+                : '连接中...'}
+            </span>
+          </div>
+
+          {/* 角色选择器 */}
+          <div className="flex items-center bg-black border border-neutral-700">
+            <span className="px-2 text-[10px] text-neutral-400 font-bold uppercase">角色:</span>
+            <select
+              value={selectedRole}
+              onChange={(e) => setSelectedRole(e.target.value)}
+              className="bg-neutral-900 text-white text-xs px-2 py-1 border-0 focus:outline-hidden font-bold cursor-pointer"
+            >
+              {availableRoles.map((r) => (
+                <option key={r} value={r}>
+                  {r.toUpperCase()}
+                </option>
+              ))}
+            </select>
+          </div>
+
+          {/* 分组筛选器 */}
+          {availableGroups.length > 0 && (
+            <div className="flex items-center bg-black border border-neutral-700">
+              <span className="px-2 text-[10px] text-neutral-400 font-bold uppercase">分组:</span>
+              <select
+                value={selectedGroup}
+                onChange={(e) => setSelectedGroup(e.target.value)}
+                className="bg-neutral-900 text-white text-xs px-2 py-1 border-0 focus:outline-hidden font-bold cursor-pointer"
+              >
+                <option value="">所有分组 (全部)</option>
+                {availableGroups.map((g) => (
+                  <option key={g} value={g}>
+                    {g}
+                  </option>
+                ))}
+              </select>
+            </div>
+          )}
+
+          {/* 级别过滤器 */}
+          <div className="flex items-center bg-black border border-neutral-700 overflow-hidden">
+            {(['ALL', 'INFO', 'WARN', 'ERROR'] as const).map((lvl) => (
+              <button
+                key={lvl}
+                type="button"
+                onClick={() => setLevelFilter(lvl)}
+                className={`px-2 py-1 text-[10px] font-black transition ${
+                  levelFilter === lvl
+                    ? lvl === 'ERROR'
+                      ? 'bg-rose-600 text-white'
+                      : lvl === 'WARN'
+                      ? 'bg-amber-500 text-black'
+                      : 'bg-emerald-600 text-white'
+                    : 'text-neutral-400 hover:text-white hover:bg-neutral-800'
+                }`}
+              >
+                {lvl}
+              </button>
+            ))}
+          </div>
+        </div>
+
+        {/* 右侧:搜索与操作按钮 */}
+        <div className="flex items-center gap-2 flex-wrap">
+          {/* 搜索框 */}
+          <div className="relative flex items-center bg-black border border-neutral-700 px-2 py-0.5">
+            <Search size={12} className="text-neutral-400 mr-1.5 shrink-0" />
+            <input
+              type="text"
+              value={searchKeyword}
+              onChange={(e) => setSearchKeyword(e.target.value)}
+              placeholder="搜索日志关键字..."
+              className="bg-transparent text-white text-xs placeholder-neutral-500 focus:outline-hidden w-28 md:w-40"
+            />
+            {searchKeyword && (
+              <button
+                type="button"
+                onClick={() => setSearchKeyword('')}
+                className="text-neutral-400 hover:text-white ml-1 text-xs"
+              >
+                ×
+              </button>
+            )}
+          </div>
+
+          {/* 暂停/继续 */}
+          <button
+            type="button"
+            onClick={() => setIsPaused(!isPaused)}
+            className={`px-2 py-1 border border-black flex items-center gap-1 text-[11px] font-bold shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5 transition ${
+              isPaused
+                ? 'bg-emerald-400 text-black hover:bg-emerald-300'
+                : 'bg-amber-400 text-black hover:bg-amber-300'
+            }`}
+            title={isPaused ? '恢复接收' : '暂停接收'}
+          >
+            {isPaused ? <Play size={11} /> : <Pause size={11} />}
+            <span>{isPaused ? '继续' : '暂停'}</span>
+          </button>
+
+          {/* 自动滚屏开关 */}
+          <button
+            type="button"
+            onClick={() => setAutoScroll(!autoScroll)}
+            className={`px-2 py-1 border border-black text-[11px] font-bold shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5 transition ${
+              autoScroll
+                ? 'bg-cyan-400 text-black font-black'
+                : 'bg-neutral-700 text-neutral-300'
+            }`}
+            title="锁定自动滚动到底部"
+          >
+            滚屏: {autoScroll ? '锁定' : '自由'}
+          </button>
+
+          {/* 清屏 */}
+          <button
+            type="button"
+            onClick={handleClearLogs}
+            className="p-1 border border-black bg-neutral-700 hover:bg-neutral-600 text-neutral-200 shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5 transition"
+            title="清空当前屏幕"
+          >
+            <Trash2 size={13} />
+          </button>
+
+          {/* 复制 */}
+          <button
+            type="button"
+            onClick={handleCopyLogs}
+            className="p-1 border border-black bg-neutral-700 hover:bg-neutral-600 text-neutral-200 shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5 transition"
+            title="复制全部可见日志"
+          >
+            {copied ? <Check size={13} className="text-emerald-400" /> : <Copy size={13} />}
+          </button>
+
+          {/* 重连 */}
+          <button
+            type="button"
+            onClick={startStream}
+            className="p-1 border border-black bg-neutral-700 hover:bg-neutral-600 text-neutral-200 shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5 transition"
+            title="刷新/重新连接日志流"
+          >
+            <RefreshCw size={13} />
+          </button>
+        </div>
+      </div>
+
+      {/* 2. 终端主体输出区 */}
+      <div
+        ref={terminalBodyRef}
+        onScroll={handleScroll}
+        className="flex-1 overflow-y-auto p-3.5 space-y-1 bg-[#0d1117] text-neutral-200 font-mono text-[11px] leading-relaxed relative min-h-[360px] max-h-[560px]"
+      >
+        {filteredLogs.length === 0 ? (
+          <div className="h-full flex flex-col items-center justify-center text-neutral-500 py-16">
+            <Terminal size={36} className="text-neutral-600 mb-2 animate-pulse" />
+            <p className="font-bold text-xs uppercase tracking-wider text-neutral-400">
+              [ 暂无匹配运行日志 // NO LOGS AVAILABLE ]
+            </p>
+            <p className="text-[10px] text-neutral-600 mt-1">
+              管道监听中: <code>vs:stream:logs:{nodeId}:{selectedRole}</code>
+            </p>
+            {errorMsg && (
+              <p className="text-rose-400 text-xs mt-3 flex items-center gap-1">
+                <AlertCircle size={13} />
+                <span>{errorMsg}</span>
+              </p>
+            )}
+          </div>
+        ) : (
+          filteredLogs.map((log, idx) => {
+            const lvl = (log.level || 'INFO').toUpperCase();
+            const isError = lvl === 'ERROR';
+            const isWarn = lvl === 'WARN' || lvl === 'WARNING';
+
+            return (
+              <div
+                key={log.id ? `${log.id}-${idx}` : idx}
+                className={`flex items-start gap-2 py-0.5 hover:bg-neutral-800/60 rounded-xs px-1.5 transition ${
+                  isError
+                    ? 'text-rose-300 bg-rose-950/20'
+                    : isWarn
+                    ? 'text-amber-200 bg-amber-950/20'
+                    : 'text-neutral-300'
+                }`}
+              >
+                {/* 时间戳 */}
+                <span className="text-neutral-500 shrink-0 select-none">
+                  {log.timestamp ? log.timestamp.split(' ')[1] || log.timestamp : '--:--:--'}
+                </span>
+
+                {/* 级别 Badge */}
+                <span
+                  className={`px-1 py-0.2 rounded-2xs text-[9px] font-black uppercase shrink-0 ${
+                    isError
+                      ? 'bg-rose-700 text-white'
+                      : isWarn
+                      ? 'bg-amber-500 text-black'
+                      : 'bg-neutral-800 text-emerald-400 border border-emerald-900/60'
+                  }`}
+                >
+                  {lvl}
+                </span>
+
+                {/* Group 标识 (若有) */}
+                {log.group_id && (
+                  <span className="px-1 py-0.2 rounded-2xs text-[9px] font-mono font-bold bg-cyan-950 text-cyan-300 border border-cyan-800 shrink-0">
+                    {log.group_id}
+                  </span>
+                )}
+
+                {/* 日志内容 */}
+                <span className="break-all whitespace-pre-wrap flex-1">
+                  {renderMessageWithHighlight(log.message)}
+                </span>
+              </div>
+            );
+          })
+        )}
+
+        {/* 浮动置底按钮 */}
+        {hasNewUnread && (
+          <button
+            type="button"
+            onClick={scrollToBottom}
+            className="sticky bottom-2 left-1/2 -translate-x-1/2 bg-cyan-400 text-black border border-black font-black text-xs px-3 py-1.5 rounded-full shadow-[2px_2px_0px_#000] flex items-center gap-1.5 animate-bounce z-10"
+          >
+            <ArrowDown size={12} />
+            <span>有最新日志 · 点击置底</span>
+          </button>
+        )}
+      </div>
+
+      {/* 3. 底部状态指示栏 */}
+      <div className="bg-neutral-950 border-t border-neutral-800 px-3 py-1 flex items-center justify-between text-[10px] text-neutral-400">
+        <div className="flex items-center gap-3">
+          <span>
+            通道: <code>vs:stream:logs:{nodeId}:{selectedRole}</code>
+          </span>
+          <span>总缓冲: {logs.length} 条</span>
+          {searchKeyword && (
+            <span className="text-amber-400 font-bold">
+              筛选匹配: {filteredLogs.length} 条
+            </span>
+          )}
+        </div>
+        <div className="flex items-center gap-2">
+          <span>自动置底: {autoScroll ? '已启用' : '暂停'}</span>
+        </div>
+      </div>
+    </div>
+  );
+}

+ 107 - 24
src/components/admin/node-configurations/NodeTelemetryModal.tsx

@@ -1,7 +1,7 @@
 // src/components/admin/node-configurations/NodeTelemetryModal.tsx
 'use client';
 
-import React, { useState, useEffect, useCallback } from 'react';
+import React, { useState, useEffect, useCallback, useMemo } from 'react';
 import {
   Activity,
   Radio,
@@ -18,11 +18,13 @@ import {
   Globe,
   ShieldAlert,
   Info,
+  Terminal,
 } from 'lucide-react';
 import { toast } from 'react-hot-toast';
 import { nodeConfigService } from '@/lib/services/nodeConfigService';
 import { ClusterNode, NodeRuntimeStatus } from '@/types';
 import LocalTime from '@/components/common/LocalTime';
+import NodeLogTerminal from './NodeLogTerminal';
 
 interface NodeTelemetryModalProps {
   isOpen: boolean;
@@ -30,6 +32,7 @@ interface NodeTelemetryModalProps {
   node: ClusterNode | null;
   runtimeNodes?: NodeRuntimeStatus[];
   onRefreshAll?: () => void;
+  initialTab?: 'telemetry' | 'logs';
 }
 
 export default function NodeTelemetryModal({
@@ -38,11 +41,13 @@ export default function NodeTelemetryModal({
   node,
   runtimeNodes = [],
   onRefreshAll,
+  initialTab = 'telemetry',
 }: NodeTelemetryModalProps) {
   const [localReports, setLocalReports] = useState<NodeRuntimeStatus[]>([]);
   const [loading, setLoading] = useState(false);
   const [lastRefreshedAt, setLastRefreshedAt] = useState<string>('');
   const [autoRefresh, setAutoRefresh] = useState(true);
+  const [activeTab, setActiveTab] = useState<'telemetry' | 'logs'>(initialTab);
 
   // 根据当前 node.node_id 筛选运行时上报
   const nodeId = node?.node_id;
@@ -65,6 +70,13 @@ export default function NodeTelemetryModal({
     }
   }, [nodeId]);
 
+  // 同步 initialTab 变化
+  useEffect(() => {
+    if (isOpen) {
+      setActiveTab(initialTab);
+    }
+  }, [isOpen, initialTab]);
+
   // 当外部 runtimeNodes 变化或打开弹窗时同步
   useEffect(() => {
     if (!isOpen || !nodeId) return;
@@ -82,6 +94,23 @@ export default function NodeTelemetryModal({
     return () => clearInterval(interval);
   }, [isOpen, autoRefresh, fetchNodeTelemetry]);
 
+  // 聚合所有角色运行的组与任务
+  const allGroups = useMemo(() => {
+    return localReports.flatMap((r) =>
+      (r.groups || []).map((g) => ({ ...g, role: r.role }))
+    );
+  }, [localReports]);
+
+  const availableRoles = useMemo(() => {
+    const roles = Array.from(new Set(localReports.map((r) => r.role).filter(Boolean)));
+    return roles.length > 0 ? roles : ['sentinel', 'booker', 'standalone'];
+  }, [localReports]);
+
+  const availableGroups = useMemo(() => {
+    return Array.from(new Set(allGroups.map((g) => g.group_id).filter(Boolean)));
+  }, [allGroups]);
+
+  // 必须在所有 Hooks 执行完后再进行条件拦截
   if (!isOpen || !node) return null;
 
   // 遥测计算
@@ -94,10 +123,6 @@ export default function NodeTelemetryModal({
     ? localReports.reduce((prev, cur) => ((cur.age_sec ?? 999999) < (prev.age_sec ?? 999999) ? cur : prev))
     : null;
 
-  // 聚合所有角色运行的组与任务
-  const allGroups = localReports.flatMap((r) =>
-    (r.groups || []).map((g) => ({ ...g, role: r.role }))
-  );
   const totalTasks = allGroups.reduce((acc, g) => acc + (g.total_tasks || 0), 0);
   const healthyTasks = allGroups.reduce((acc, g) => acc + (g.healthy_tasks || 0), 0);
 
@@ -126,7 +151,7 @@ export default function NodeTelemetryModal({
 
   return (
     <div className="fixed inset-0 z-50 flex items-center justify-center p-4 bg-black/60 backdrop-blur-xs font-mono">
-      <div className="bg-white border-4 border-black w-full max-w-4xl max-h-[92vh] flex flex-col shadow-[8px_8px_0px_#000] overflow-hidden">
+      <div className="bg-white border-4 border-black w-full max-w-5xl max-h-[92vh] flex flex-col shadow-[8px_8px_0px_#000] overflow-hidden">
         {/* Modal Header */}
         <div className="bg-neutral-200 border-b-2 border-black p-4 flex items-center justify-between select-none">
           <div className="flex items-center gap-2.5">
@@ -134,7 +159,7 @@ export default function NodeTelemetryModal({
             <div>
               <div className="flex items-center gap-2">
                 <span className="font-black text-sm uppercase tracking-wider text-black">
-                  [ 节点实时遥测监控 // NODE TELEMETRY DIAGNOSTIC ]
+                  [ 节点实时遥测与日志 // NODE TELEMETRY & LOGS ]
                 </span>
                 <span className="px-2 py-0.5 border border-black bg-white text-xs font-black">
                   {node.node_id}
@@ -149,39 +174,92 @@ export default function NodeTelemetryModal({
           </div>
 
           <div className="flex items-center gap-2">
+            {activeTab === 'telemetry' && (
+              <>
+                <button
+                  type="button"
+                  onClick={() => setAutoRefresh(!autoRefresh)}
+                  className={`px-2.5 py-1 text-[11px] font-bold border border-black uppercase shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5 transition ${
+                    autoRefresh ? 'bg-emerald-300 text-emerald-950 font-black' : 'bg-neutral-100 text-neutral-600'
+                  }`}
+                >
+                  [ 自动轮询: {autoRefresh ? '开启 (5s)' : '暂停'} ]
+                </button>
+
+                <button
+                  type="button"
+                  onClick={handleManualRefresh}
+                  disabled={loading}
+                  className="p-1.5 border border-black bg-white hover:bg-neutral-100 shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5 transition"
+                  title="立即拉取最新心跳"
+                >
+                  <RefreshCw size={14} className={loading ? 'animate-spin' : ''} />
+                </button>
+              </>
+            )}
+
             <button
               type="button"
-              onClick={() => setAutoRefresh(!autoRefresh)}
-              className={`px-2.5 py-1 text-[11px] font-bold border border-black uppercase shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5 transition ${
-                autoRefresh ? 'bg-emerald-300 text-emerald-950 font-black' : 'bg-neutral-100 text-neutral-600'
-              }`}
+              onClick={onClose}
+              className="p-1.5 border border-black bg-white hover:bg-neutral-100 shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5 transition"
+              title="关闭窗口"
             >
-              [ 自动轮询: {autoRefresh ? '开启 (5s)' : '暂停'} ]
+              <X size={14} />
             </button>
+          </div>
+        </div>
 
+        {/* Modal Tab Bar */}
+        <div className="bg-neutral-100 border-b-2 border-black px-4 py-2 flex items-center justify-between select-none">
+          <div className="flex items-center gap-2">
             <button
               type="button"
-              onClick={handleManualRefresh}
-              disabled={loading}
-              className="p-1.5 border border-black bg-white hover:bg-neutral-100 shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5 transition"
-              title="立即拉取最新心跳"
+              onClick={() => setActiveTab('telemetry')}
+              className={`px-3 py-1 text-xs font-black border border-black uppercase shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5 transition flex items-center gap-1.5 ${
+                activeTab === 'telemetry'
+                  ? 'bg-black text-white'
+                  : 'bg-white text-neutral-700 hover:bg-neutral-50'
+              }`}
             >
-              <RefreshCw size={14} className={loading ? 'animate-spin' : ''} />
+              <Activity size={13} />
+              <span>[ 📊 遥测概览 // TELEMETRY ]</span>
             </button>
 
             <button
               type="button"
-              onClick={onClose}
-              className="p-1.5 border border-black bg-white hover:bg-neutral-100 shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5 transition"
-              title="关闭窗口"
+              onClick={() => setActiveTab('logs')}
+              className={`px-3 py-1 text-xs font-black border border-black uppercase shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5 transition flex items-center gap-1.5 ${
+                activeTab === 'logs'
+                  ? 'bg-cyan-400 text-black font-black'
+                  : 'bg-white text-neutral-700 hover:bg-neutral-50'
+              }`}
             >
-              <X size={14} />
+              <Terminal size={13} />
+              <span>[ 💻 实时控制台日志 // LIVE LOGS ]</span>
             </button>
           </div>
+
+          <div className="text-[11px] text-neutral-600 font-bold hidden sm:block">
+            {activeTab === 'logs' ? (
+              <span className="text-cyan-800">管道监听: vs:stream:logs:{node.node_id}:*</span>
+            ) : (
+              <span>心跳: {lastRefreshedAt || '刚才'}</span>
+            )}
+          </div>
         </div>
 
-        {/* Modal Scrollable Body */}
-        <div className="p-5 overflow-y-auto space-y-5 text-xs flex-1">
+        {activeTab === 'logs' ? (
+          <div className="flex-1 p-3 overflow-hidden flex flex-col bg-neutral-900 min-h-[480px]">
+            <NodeLogTerminal
+              nodeId={node.node_id}
+              initialRole={availableRoles[0] || 'sentinel'}
+              availableRoles={availableRoles}
+              availableGroups={availableGroups}
+            />
+          </div>
+        ) : (
+          /* Modal Scrollable Body */
+          <div className="p-5 overflow-y-auto space-y-5 text-xs flex-1">
           {/* 1. 核心遥测生命体征看板 (Vitality Status Banner) */}
           {isOnline ? (
             <div className="p-4 bg-emerald-50 border-2 border-black shadow-[3px_3px_0px_#000] flex flex-col md:flex-row md:items-center justify-between gap-4">
@@ -502,11 +580,16 @@ export default function NodeTelemetryModal({
             </p>
           </div>
         </div>
+      )}
 
         {/* Modal Footer */}
         <div className="bg-neutral-200 border-t-2 border-black p-3 px-5 flex items-center justify-between">
           <div className="text-[10px] text-neutral-500 font-bold">
-            遥测键: <code>vs:status:*:{node.node_id}</code> | 心跳间隔: 60s
+            {activeTab === 'logs' ? (
+              <span>控制台状态: <code className="text-black font-black">ACTIVE (SSE STREAM)</code> | 缓冲上限: 1500 条</span>
+            ) : (
+              <span>遥测键: <code>vs:status:*:{node.node_id}</code> | 心跳间隔: 60s</span>
+            )}
           </div>
 
           <div className="flex items-center gap-2">

+ 91 - 7
src/components/admin/orders/OrderDetailDrawer.tsx

@@ -21,6 +21,7 @@ import {
   Loader2,
   Coins,
   CheckCircle2,
+  Eye,
 } from 'lucide-react';
 import LocalTime from '@/components/common/LocalTime';
 import { getPaymentProviderIcon } from '@/components/admin/payments/paymentIcons';
@@ -66,6 +67,7 @@ interface OrderDetailDrawerProps {
   onAdjustPrice?: (order: any) => void;
   onCheckPayments?: (order: any) => void;
   onMarkCompleted?: (orderId: string) => void;
+  onRegisterPayment?: (order: any) => void;
 }
 
 export default function OrderDetailDrawer({
@@ -78,6 +80,7 @@ export default function OrderDetailDrawer({
   onAdjustPrice,
   onCheckPayments,
   onMarkCompleted,
+  onRegisterPayment,
 }: OrderDetailDrawerProps) {
   const handleCancelClick = (orderId: string) => {
     if (onCancel) onCancel(orderId);
@@ -534,13 +537,35 @@ export default function OrderDetailDrawer({
                 <CreditCard size={14} />
                 <span>[ 03 // 支付流水核销明细 ({paymentList.length}) ]</span>
               </div>
-              {loadingPayments && <Loader2 size={12} className="animate-spin" />}
+              <div className="flex items-center gap-2">
+                {onRegisterPayment && (
+                  <button
+                    type="button"
+                    onClick={() => onRegisterPayment(order)}
+                    className="flex items-center gap-1 px-2 py-0.5 bg-amber-300 hover:bg-amber-400 text-black border border-black text-[10px] font-black uppercase shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5"
+                  >
+                    <DollarSign size={11} />
+                    <span>[ 登记实收收款 ]</span>
+                  </button>
+                )}
+                {loadingPayments && <Loader2 size={12} className="animate-spin" />}
+              </div>
             </div>
 
             <div className="p-4">
               {paymentList.length === 0 ? (
-                <div className="text-center py-4 text-neutral-400 text-xs">
-                  [ 暂无该订单相关的支付流水 ]
+                <div className="text-center py-5 text-neutral-500 text-xs font-mono space-y-2">
+                  <div>[ 暂无该订单相关的支付流水 ]</div>
+                  {onRegisterPayment && (
+                    <button
+                      type="button"
+                      onClick={() => onRegisterPayment(order)}
+                      className="inline-flex items-center gap-1.5 px-3 py-1.5 bg-amber-300 hover:bg-amber-400 text-black border border-black text-xs font-black uppercase shadow-[2px_2px_0px_#000] active:translate-x-0.5 active:translate-y-0.5"
+                    >
+                      <DollarSign size={13} />
+                      <span>[ 💰 登记实收金额与收款渠道 ]</span>
+                    </button>
+                  )}
                 </div>
               ) : (
                 <div className="space-y-3">
@@ -549,10 +574,25 @@ export default function OrderDetailDrawer({
                     const isPaySucceeded = ['succeeded', 'paid'].includes((pay.status || '').toLowerCase());
                     const qrDesc = pay.qr_id ? qrDetails[pay.qr_id]?.description : undefined;
 
+                    // 解析 provider_payload 详情 (存储凭证截图及备注)
+                    let payloadObj: Record<string, any> = {};
+                    if (typeof pay.provider_payload === 'string') {
+                      try {
+                        payloadObj = JSON.parse(pay.provider_payload);
+                      } catch {}
+                    } else if (pay.provider_payload && typeof pay.provider_payload === 'object') {
+                      payloadObj = pay.provider_payload;
+                    }
+
+                    const voucherUrl = payloadObj.voucher_url || (pay as any).voucher_url;
+                    const paymentNote = payloadObj.note || (pay as any).note;
+                    const registeredBy = payloadObj.registered_by_name || payloadObj.registered_by;
+                    const externalTradeNo = pay.external_trade_no;
+
                     return (
                       <div
                         key={pay.id}
-                        className="p-3 bg-neutral-50 border border-black shadow-[2px_2px_0px_#000] space-y-1.5 text-xs"
+                        className="p-3.5 bg-neutral-50 border-2 border-black shadow-[2px_2px_0px_#000] space-y-2 text-xs"
                       >
                         <div className="flex items-center justify-between">
                           <span className="font-black text-black uppercase">
@@ -560,7 +600,7 @@ export default function OrderDetailDrawer({
                           </span>
 
                           <div className="flex items-center gap-1.5">
-                            <span className="font-bold text-black">
+                            <span className="font-bold text-black font-mono">
                               {formatMoney(pay.amount, pay.currency)}
                             </span>
                             <span
@@ -572,9 +612,53 @@ export default function OrderDetailDrawer({
                           </div>
                         </div>
 
-                        <div className="text-[11px] text-neutral-500 pt-1 border-t border-dashed border-neutral-300 flex flex-wrap justify-between gap-1">
-                          <span>ID: #{pay.id}</span>
+                        {/* 外部单号与交易流水号 */}
+                        {externalTradeNo && (
+                          <div className="flex items-center justify-between bg-white p-2 border border-black text-[11px] font-mono">
+                            <span className="font-bold text-neutral-500">外部转账单号:</span>
+                            <span className="font-black text-black select-all">{externalTradeNo}</span>
+                          </div>
+                        )}
+
+                        {/* 入账备注说明 */}
+                        {paymentNote && (
+                          <div className="bg-amber-50 p-2 border border-black/30 text-[11px] text-amber-950 font-sans">
+                            <span className="font-bold">入账备注: </span>
+                            <span>{paymentNote}</span>
+                          </div>
+                        )}
+
+                        {/* 转账水单/截图凭证 (R2 图片) */}
+                        {voucherUrl && (
+                          <div className="space-y-1 pt-1">
+                            <span className="text-[10px] font-bold text-neutral-500 uppercase block">
+                              [ 收款凭证 / 转账水单截图 ]
+                            </span>
+                            <a
+                              href={voucherUrl}
+                              target="_blank"
+                              rel="noreferrer"
+                              className="inline-block border-2 border-black bg-white p-1.5 shadow-[2px_2px_0px_#000] hover:bg-amber-100 transition group max-w-full"
+                            >
+                              <img
+                                src={voucherUrl}
+                                alt="转账水单凭据"
+                                className="max-h-48 max-w-full object-contain border border-black/20 bg-neutral-100"
+                              />
+                              <div className="text-[10px] text-black font-bold flex items-center justify-between gap-2 mt-1.5 px-0.5">
+                                <span className="group-hover:underline flex items-center gap-1">
+                                  <Eye size={12} /> 点击查看原图
+                                </span>
+                                <ExternalLink size={11} />
+                              </div>
+                            </a>
+                          </div>
+                        )}
+
+                        <div className="text-[11px] text-neutral-500 pt-1.5 border-t border-dashed border-neutral-300 flex flex-wrap justify-between gap-1 font-mono">
+                          <span>流水记录: #{pay.id}</span>
                           <LocalTime date={pay.created_at} />
+                          {registeredBy && <span className="w-full text-[10px]">经办登记人: {registeredBy}</span>}
                           {qrDesc && <span className="w-full">QR: {qrDesc}</span>}
                           {stripeUrl && (
                             <a

+ 82 - 13
src/components/admin/orders/OrderDetailModal.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { useState, useEffect, useMemo } from 'react';
-import { X, CreditCard, User, FileText, Package, Loader2, Phone, Mail } from 'lucide-react';
+import { X, CreditCard, User, FileText, Package, Loader2, Phone, Mail, ExternalLink, Eye, Image as ImageIcon } from 'lucide-react';
 import LocalTime from '@/components/common/LocalTime';
 import { OrderDetail, PaymentRecord, PaymentQrDetail, UserDetail, OrderEvent } from '@/types';
 import { paymentService, userService, orderService } from '@/lib/services';
@@ -270,20 +270,89 @@ export default function OrderDetailModal({ isOpen, onClose, order }: OrderDetail
             </span>
 
             {paymentList.length > 0 ? (
-              <div className="space-y-2">
-                {paymentList.map((pay) => (
-                  <div key={pay.id} className="p-2.5 bg-white border border-black shadow-[1px_1px_0px_#000] flex items-center justify-between text-xs">
-                    <div className="space-y-0.5">
-                      <div className="flex items-center gap-2">
-                        <span className="font-mono font-bold text-black">#{pay.id}</span>
-                        <span className="px-1 bg-neutral-100 border border-black font-bold uppercase text-[10px]">{pay.provider}</span>
-                        <span className="font-mono font-bold text-black">{formatMoney(pay.amount, pay.currency)}</span>
+              <div className="space-y-3">
+                {paymentList.map((pay) => {
+                  let payloadObj: Record<string, any> = {};
+                  if (typeof pay.provider_payload === 'string') {
+                    try {
+                      payloadObj = JSON.parse(pay.provider_payload);
+                    } catch {}
+                  } else if (pay.provider_payload && typeof pay.provider_payload === 'object') {
+                    payloadObj = pay.provider_payload;
+                  }
+
+                  const voucherUrl = payloadObj.voucher_url || (pay as any).voucher_url;
+                  const paymentNote = payloadObj.note || (pay as any).note;
+                  const registeredBy = payloadObj.registered_by_name || payloadObj.registered_by;
+                  const externalTradeNo = pay.external_trade_no || payloadObj.external_trade_no;
+
+                  return (
+                    <div key={pay.id} className="p-3 bg-white border-2 border-black shadow-[2px_2px_0px_#000] space-y-2 text-xs">
+                      <div className="flex items-center justify-between">
+                        <div className="flex items-center gap-2">
+                          <span className="font-mono font-black text-black">#{pay.id}</span>
+                          <span className="px-1.5 py-0.5 bg-neutral-100 border border-black font-bold uppercase text-[10px]">{pay.provider} // {pay.channel}</span>
+                          <span className="font-mono font-bold text-black">{formatMoney(pay.amount, pay.currency)}</span>
+                        </div>
+                        {getStatusBadge(pay.status)}
                       </div>
-                      <div className="text-[10px] text-neutral-500 font-mono">流水号: {pay.external_trade_no || '-'}</div>
+
+                      {externalTradeNo && (
+                        <div className="flex items-center justify-between bg-neutral-50 p-2 border border-black/40 text-[11px] font-mono">
+                          <span className="font-bold text-neutral-500">外部转账单号:</span>
+                          <span className="font-black text-black select-all bg-amber-100/60 px-1 py-0.5 border border-black/20">{externalTradeNo}</span>
+                        </div>
+                      )}
+
+                      {(paymentNote || registeredBy) && (
+                        <div className="bg-amber-50/80 p-2 border border-black/30 text-[11px] text-amber-950 font-sans space-y-0.5">
+                          {registeredBy && (
+                            <div className="font-mono text-[10px] text-amber-800 font-bold uppercase">
+                              经办人: {registeredBy}
+                            </div>
+                          )}
+                          {paymentNote && (
+                            <div>
+                              <span className="font-bold">入账备注: </span>
+                              <span>{paymentNote}</span>
+                            </div>
+                          )}
+                        </div>
+                      )}
+
+                      {voucherUrl && (
+                        <div className="space-y-1 pt-1">
+                          <div className="flex items-center justify-between text-[10px] font-bold text-neutral-600 uppercase">
+                            <span className="flex items-center gap-1">
+                              <ImageIcon size={12} className="text-black" />
+                              收款凭证截图
+                            </span>
+                            <a
+                              href={voucherUrl}
+                              target="_blank"
+                              rel="noreferrer"
+                              className="text-blue-700 hover:underline flex items-center gap-0.5"
+                            >
+                              <ExternalLink size={10} /> 查看原图
+                            </a>
+                          </div>
+                          <a
+                            href={voucherUrl}
+                            target="_blank"
+                            rel="noreferrer"
+                            className="block border border-black bg-neutral-50 p-1 hover:bg-amber-50/50 transition max-w-xs"
+                          >
+                            <img
+                              src={voucherUrl}
+                              alt="转账凭证水单"
+                              className="max-h-40 object-contain mx-auto border border-black/10"
+                            />
+                          </a>
+                        </div>
+                      )}
                     </div>
-                    {getStatusBadge(pay.status)}
-                  </div>
-                ))}
+                  );
+                })}
               </div>
             ) : (
               <div className="p-4 bg-white border border-dashed border-neutral-300 text-center text-neutral-400">

+ 174 - 12
src/components/admin/orders/OrderPaymentModal.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { useState, useEffect } from 'react';
-import { X, CreditCard, CheckCircle, AlertCircle, Loader2, Ban, ShieldAlert, Check } from 'lucide-react';
+import { X, CreditCard, CheckCircle, AlertCircle, Loader2, Ban, ShieldAlert, Check, ExternalLink, Eye, Image as ImageIcon } from 'lucide-react';
 import { toast } from 'react-hot-toast';
 import { retroConfirm } from '@/lib/dialog';
 import { paymentService } from '@/lib/services';
@@ -25,6 +25,7 @@ export default function OrderPaymentModal({
   const [payments, setPayments] = useState<PaymentRecord[]>([]);
   const [loading, setLoading] = useState(false);
   const [processingId, setProcessingId] = useState<number | null>(null);
+  const [previewImage, setPreviewImage] = useState<string | null>(null);
 
   useEffect(() => {
     if (isOpen && order) {
@@ -94,14 +95,29 @@ export default function OrderPaymentModal({
 
   if (!isOpen || !order) return null;
 
+  // 尝试从订单 inputs 查找历史备份凭证信息
+  let orderInputs: Record<string, any> = {};
+  if (order.user_inputs) {
+    if (typeof order.user_inputs === 'string') {
+      try {
+        orderInputs = JSON.parse(order.user_inputs);
+      } catch {}
+    } else if (typeof order.user_inputs === 'object') {
+      orderInputs = order.user_inputs;
+    }
+  }
+  const paymentHistoryList: any[] = Array.isArray(orderInputs._payments_history)
+    ? orderInputs._payments_history
+    : [];
+
   return (
     <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-grayscale p-4 font-mono">
-      <div className="bg-neutral-50 border-2 border-black shadow-[8px_8px_0px_#000] w-full max-w-xl overflow-hidden flex flex-col max-h-[85vh] animate-in zoom-in-95 duration-200">
+      <div className="bg-neutral-50 border-2 border-black shadow-[8px_8px_0px_#000] w-full max-w-xl overflow-hidden flex flex-col max-h-[90vh] animate-in zoom-in-95 duration-200">
         {/* Header */}
         <div className="px-5 py-3.5 border-b-2 border-black flex justify-between items-center bg-neutral-200 text-black select-none">
           <div className="flex items-center gap-2 text-xs font-bold uppercase tracking-wider">
             <span className="w-2.5 h-2.5 bg-amber-300 border border-black inline-block" />
-            <span>[ PAYMENT AUDIT // #{order.id} ]</span>
+            <span>[ PAYMENT AUDIT // #{order.id} 支付核销流水 ]</span>
           </div>
           <button onClick={onClose} className="w-6 h-6 bg-white hover:bg-amber-300 border border-black flex items-center justify-center font-bold text-xs transition">
             ✕
@@ -133,40 +149,137 @@ export default function OrderPaymentModal({
               [ 暂无生成的支付结算单 ]
             </div>
           ) : (
-            <div className="space-y-3">
+            <div className="space-y-4">
               {payments.map((p) => {
                 const isSucceeded = ['succeeded', 'paid'].includes((p.status || '').toLowerCase());
                 const isFailed = p.status === 'failed';
                 const isOperating = processingId === p.id;
 
+                // 解析 provider_payload 详情 (存储凭据截图及备注)
+                let payloadObj: Record<string, any> = {};
+                if (typeof p.provider_payload === 'string') {
+                  try {
+                    payloadObj = JSON.parse(p.provider_payload);
+                  } catch {}
+                } else if (p.provider_payload && typeof p.provider_payload === 'object') {
+                  payloadObj = p.provider_payload;
+                }
+
+                // 兜底查找历史中匹配的凭证信息
+                const matchedHistory = paymentHistoryList.find(
+                  (h) => (h.external_trade_no && h.external_trade_no === p.external_trade_no) || (h.amount && h.amount === p.amount)
+                );
+
+                const voucherUrl = payloadObj.voucher_url || (p as any).voucher_url || matchedHistory?.voucher_url;
+                const paymentNote = payloadObj.note || (p as any).note || matchedHistory?.note;
+                const registeredBy = payloadObj.registered_by_name || payloadObj.registered_by || matchedHistory?.by;
+                const externalTradeNo = p.external_trade_no || payloadObj.external_trade_no || matchedHistory?.external_trade_no;
+
                 return (
                   <div
                     key={p.id}
-                    className="p-3.5 border-2 border-black bg-neutral-50 shadow-[3px_3px_0px_#000] space-y-2 text-xs"
+                    className="p-4 border-2 border-black bg-neutral-50 shadow-[3px_3px_0px_#000] space-y-3 text-xs"
                   >
+                    {/* 支付方式与金额头 */}
                     <div className="flex items-center justify-between">
-                      <div className="font-black text-black uppercase">
-                        {p.provider} // {p.channel}
+                      <div className="font-black text-black uppercase flex items-center gap-1.5 text-xs">
+                        <span className="w-2 h-2 bg-black inline-block" />
+                        <span>{p.provider} // {p.channel}</span>
                       </div>
                       <div className="flex items-center gap-2">
-                        <span className="font-mono font-bold text-sm text-black">
+                        <span className="font-mono font-black text-base text-black">
                           {p.currency === 'CNY' ? '¥' : p.currency} {(p.amount / 100).toFixed(2)}
                         </span>
                         <span
-                          className={`px-1.5 py-0.2 text-[10px] font-black uppercase border border-black ${isSucceeded
+                          className={`px-2 py-0.5 text-[10px] font-black uppercase border border-black ${
+                            isSucceeded
                               ? 'bg-amber-300 text-black'
                               : isFailed
                                 ? 'bg-neutral-200 text-neutral-500'
                                 : 'bg-white text-black'
-                            }`}
+                          }`}
                         >
                           {p.status}
                         </span>
                       </div>
                     </div>
 
-                    <div className="text-[11px] text-neutral-500 flex justify-between pt-1 border-t border-dashed border-neutral-300">
-                      <span>流水号: #{p.id}</span>
+                    {/* 外部转账单号 / 外部流水号 */}
+                    {externalTradeNo ? (
+                      <div className="flex items-center justify-between bg-white p-2.5 border-2 border-black shadow-[2px_2px_0px_#000] text-xs font-mono">
+                        <span className="font-bold text-neutral-600 flex items-center gap-1">
+                          [ 外部转账单号 ]
+                        </span>
+                        <span className="font-black text-black select-all bg-amber-100/60 px-2 py-0.5 border border-black/30">
+                          {externalTradeNo}
+                        </span>
+                      </div>
+                    ) : (
+                      <div className="text-[10px] text-neutral-400 font-mono italic px-1">
+                        [ 无外部转账单号记录 ]
+                      </div>
+                    )}
+
+                    {/* 入账备注与经办人 */}
+                    {(paymentNote || registeredBy) && (
+                      <div className="bg-amber-50/90 p-2.5 border border-black/40 text-xs text-amber-950 font-sans space-y-1">
+                        {registeredBy && (
+                          <div className="font-mono text-[10px] text-amber-900 font-bold uppercase flex items-center gap-1">
+                            <span className="w-1.5 h-1.5 bg-amber-700 inline-block" />
+                            <span>经办登记人: {registeredBy}</span>
+                          </div>
+                        )}
+                        {paymentNote && (
+                          <div className="text-xs leading-relaxed">
+                            <span className="font-bold">入账备注: </span>
+                            <span>{paymentNote}</span>
+                          </div>
+                        )}
+                      </div>
+                    )}
+
+                    {/* 收款凭证 / 转账水单截图预览 */}
+                    {voucherUrl ? (
+                      <div className="space-y-1.5 pt-1">
+                        <div className="flex items-center justify-between">
+                          <span className="text-[10px] font-bold text-neutral-700 uppercase flex items-center gap-1">
+                            <ImageIcon size={13} className="text-black" />
+                            <span>[ 收款凭证 / 转账水单截图 ]</span>
+                          </span>
+                          <a
+                            href={voucherUrl}
+                            target="_blank"
+                            rel="noreferrer"
+                            className="text-[10px] text-blue-700 hover:text-blue-900 hover:underline font-bold flex items-center gap-1"
+                          >
+                            <ExternalLink size={10} />
+                            在新窗口打开
+                          </a>
+                        </div>
+                        <div
+                          onClick={() => setPreviewImage(voucherUrl)}
+                          className="cursor-pointer border-2 border-black bg-white p-2 shadow-[2px_2px_0px_#000] hover:bg-neutral-100 transition group max-w-full text-center"
+                          title="点击放大查看大图"
+                        >
+                          <img
+                            src={voucherUrl}
+                            alt="收款凭证水单"
+                            className="max-h-60 max-w-full mx-auto object-contain border border-black/20 bg-neutral-100"
+                          />
+                          <div className="text-[10px] text-neutral-500 font-mono text-center mt-1.5 flex items-center justify-center gap-1 group-hover:text-black font-bold">
+                            <Eye size={12} /> 点击放大预览凭证截图
+                          </div>
+                        </div>
+                      </div>
+                    ) : (
+                      <div className="text-[10px] text-neutral-400 font-mono italic px-1">
+                        [ 未上传收款水单/截图凭证 ]
+                      </div>
+                    )}
+
+                    {/* 数据库流水号与时间 */}
+                    <div className="text-[11px] text-neutral-500 flex justify-between pt-1 border-t border-dashed border-neutral-300 font-mono">
+                      <span>系统流水记录: #{p.id}</span>
                       <LocalTime date={p.created_at} />
                     </div>
 
@@ -207,6 +320,55 @@ export default function OrderPaymentModal({
           </button>
         </div>
       </div>
+
+      {/* Lightbox Modal for Full Resolution Screenshot */}
+      {previewImage && (
+        <div
+          className="fixed inset-0 z-[100] flex items-center justify-center bg-black/80 backdrop-blur-sm p-4 animate-in fade-in duration-150"
+          onClick={() => setPreviewImage(null)}
+        >
+          <div
+            className="relative max-w-4xl max-h-[90vh] bg-white border-4 border-black shadow-[12px_12px_0px_#000] p-2 flex flex-col"
+            onClick={(e) => e.stopPropagation()}
+          >
+            <div className="flex items-center justify-between p-2.5 border-b-2 border-black bg-neutral-100 font-mono text-xs font-bold mb-2">
+              <span className="flex items-center gap-1.5">
+                <ImageIcon size={14} />
+                <span>[ VOUCHER PREVIEW // 水单截图放大查看 ]</span>
+              </span>
+              <button
+                onClick={() => setPreviewImage(null)}
+                className="w-6 h-6 bg-white hover:bg-rose-500 hover:text-white border border-black font-bold flex items-center justify-center transition"
+              >
+                ✕
+              </button>
+            </div>
+            <div className="overflow-auto flex-1 flex items-center justify-center bg-neutral-900 p-2 border border-black/20">
+              <img
+                src={previewImage}
+                alt="转账水单原图"
+                className="max-h-[75vh] max-w-full object-contain"
+              />
+            </div>
+            <div className="p-2 border-t-2 border-black bg-neutral-50 flex justify-between items-center text-xs font-mono mt-2">
+              <a
+                href={previewImage}
+                target="_blank"
+                rel="noreferrer"
+                className="text-blue-700 underline font-bold flex items-center gap-1 hover:text-blue-900"
+              >
+                <ExternalLink size={12} /> 在新标签页打开原始文件
+              </a>
+              <button
+                onClick={() => setPreviewImage(null)}
+                className="px-4 py-1.5 bg-amber-300 hover:bg-amber-400 border-2 border-black font-bold shadow-[2px_2px_0px_#000] active:translate-x-0.5 active:translate-y-0.5 uppercase"
+              >
+                [ 关闭预览 ]
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
     </div>
   );
 }

+ 21 - 4
src/components/admin/orders/OrderTable.tsx

@@ -29,6 +29,7 @@ interface OrderTableProps {
   onCheckPayments: (order: OrderDetail) => void;
   onAdjustPrice: (order: OrderDetail) => void;
   onMarkCompleted?: (orderId: string) => void;
+  onRegisterPayment?: (order: OrderDetail) => void;
 }
 
 export default function OrderTable({
@@ -40,6 +41,7 @@ export default function OrderTable({
   onCheckPayments,
   onAdjustPrice,
   onMarkCompleted,
+  onRegisterPayment,
 }: OrderTableProps) {
   const [copiedId, setCopiedId] = useState<string | null>(null);
 
@@ -71,8 +73,9 @@ export default function OrderTable({
     );
   }
 
-  const getStatusBadge = (status: string) => {
+  const getStatusBadge = (status: string, order?: ExtendedOrderDetail) => {
     const s = (status || '').toLowerCase();
+    const isPayLater = order?.user_inputs?._admin_bypass?.payment_timing === 'pay_later';
     switch (s) {
       case 'paid':
       case 'succeeded':
@@ -89,8 +92,11 @@ export default function OrderTable({
         );
       case 'pending':
         return (
-          <span className="px-2 py-0.5 bg-neutral-100 text-black border border-black font-mono font-bold text-[10px] uppercase">
-            ⏳ 待支付 // PENDING
+          <span className={`px-2 py-0.5 border border-black font-mono font-black text-[10px] uppercase shadow-[1px_1px_0px_#000] flex items-center gap-1 ${
+            isPayLater ? 'bg-amber-100 text-amber-950 border-amber-900' : 'bg-neutral-100 text-black'
+          }`}>
+            <Clock size={10} />
+            {isPayLater ? '⏳ 待收款 (先办后付)' : '⏳ 待支付 // PENDING'}
           </span>
         );
       case 'cancelled':
@@ -320,7 +326,7 @@ export default function OrderTable({
                   {/* Column 6: Status & Settlement */}
                   <td className="px-4 py-3.5 whitespace-nowrap">
                     <div className="flex flex-col gap-1 items-start">
-                      {getStatusBadge(order.status)}
+                      {getStatusBadge(order.status, order)}
                       {getSettlementBadge(order.settlement_status)}
                     </div>
                   </td>
@@ -328,6 +334,17 @@ export default function OrderTable({
                   {/* Column 7: Actions */}
                   <td className="px-4 py-3.5 text-right whitespace-nowrap">
                     <div className="flex items-center justify-end gap-1.5" onClick={(e) => e.stopPropagation()}>
+                      {onRegisterPayment && (
+                        <button
+                          onClick={() => onRegisterPayment(order)}
+                          className="px-2 py-1 bg-amber-300 hover:bg-amber-400 text-black border border-black text-[11px] font-black shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5 flex items-center gap-1"
+                          title="登记客户实收金额并生成入账流水"
+                        >
+                          <DollarSign size={11} />
+                          <span>收款</span>
+                        </button>
+                      )}
+
                       {canMarkDone && (
                         <button
                           onClick={() => onMarkCompleted?.(order.id)}

+ 260 - 0
src/components/admin/orders/RegisterPaymentModal.tsx

@@ -0,0 +1,260 @@
+'use client';
+
+import { useState, useEffect } from 'react';
+import { X, DollarSign, Loader2, CheckCircle2, AlertCircle, Building2, Smartphone, Banknote, ShieldCheck } from 'lucide-react';
+import { toast } from 'react-hot-toast';
+import { orderService } from '@/lib/services';
+import { OrderDetail } from '@/types';
+import { ImageUploadField } from '@/components/common/ImageUploadField';
+
+interface RegisterPaymentModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+  order: OrderDetail | null;
+  onSuccess: () => void;
+}
+
+export default function RegisterPaymentModal({
+  isOpen,
+  onClose,
+  order,
+  onSuccess,
+}: RegisterPaymentModalProps) {
+  const [loading, setLoading] = useState(false);
+  const [amount, setAmount] = useState<string>('');
+  const [paymentMethod, setPaymentMethod] = useState<string>('wechat');
+  const [externalTradeNo, setExternalTradeNo] = useState<string>('');
+  const [voucherUrl, setVoucherUrl] = useState<string>('');
+  const [note, setNote] = useState<string>('办妥出签后客户转账结清');
+
+  useEffect(() => {
+    if (isOpen && order) {
+      const defaultAmount = order.final_amount !== undefined 
+        ? (order.final_amount / 100).toFixed(2)
+        : order.base_amount !== undefined
+        ? (order.base_amount / 100).toFixed(2)
+        : '';
+      setAmount(defaultAmount);
+      setPaymentMethod('wechat');
+      setExternalTradeNo('');
+      setVoucherUrl('');
+      setNote(order.status === 'completed' ? '出签履约完成,客户结清尾款' : '客户转账付款');
+    }
+  }, [isOpen, order]);
+
+  if (!isOpen || !order) return null;
+
+  const handleSubmit = async (e: React.FormEvent) => {
+    e.preventDefault();
+    const numAmount = parseFloat(amount);
+    if (isNaN(numAmount) || numAmount <= 0) {
+      return toast.error('请输入有效的实收金额 (必须大于 0)');
+    }
+
+    const amountCents = Math.round(numAmount * 100);
+
+    setLoading(true);
+    try {
+      await orderService.registerPayment({
+        order_id: order.id,
+        amount: amountCents,
+        payment_method: paymentMethod,
+        external_trade_no: externalTradeNo.trim() || undefined,
+        voucher_url: voucherUrl.trim() || undefined,
+        note: note.trim() || undefined,
+      });
+
+      toast.success(`实收金额 ¥${numAmount.toFixed(2)} 登记成功!已生成核销入账流水。`);
+      onSuccess();
+      onClose();
+    } catch (err: any) {
+      console.error(err);
+      toast.error('登记失败: ' + (err.response?.data?.message || err.message));
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const paymentOptions = [
+    { id: 'wechat', label: '微信私域转账', icon: Smartphone, color: 'bg-emerald-100 text-emerald-900 border-emerald-900' },
+    { id: 'alipay', label: '支付宝转账', icon: Smartphone, color: 'bg-blue-100 text-blue-900 border-blue-900' },
+    { id: 'bank_transfer', label: '对公/对私银行汇款', icon: Building2, color: 'bg-amber-100 text-amber-900 border-amber-900' },
+    { id: 'cash', label: '现金实收', icon: Banknote, color: 'bg-neutral-100 text-neutral-900 border-neutral-900' },
+    { id: 'offline', label: '其他线下挂账', icon: DollarSign, color: 'bg-purple-100 text-purple-900 border-purple-900' },
+  ];
+
+  return (
+    <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-grayscale p-4 font-mono">
+      <div className="bg-white border-2 border-black shadow-[8px_8px_0px_#000] w-full max-w-lg overflow-hidden flex flex-col max-h-[90vh] animate-in zoom-in-95 duration-150">
+        {/* Header */}
+        <div className="bg-amber-300 border-b-2 border-black p-4 flex items-center justify-between">
+          <div className="flex items-center gap-2">
+            <div className="w-7 h-7 bg-black text-amber-300 flex items-center justify-center border border-black shadow-[2px_2px_0px_#000]">
+              <DollarSign size={18} />
+            </div>
+            <div>
+              <h2 className="font-black text-sm uppercase text-black">
+                [ REGISTER PAYMENT // 实收金额与流水登记 ]
+              </h2>
+              <p className="text-[10px] text-black/80 font-mono">
+                登记先办后付尾款或线下收款,即刻生成财务入账核销流水
+              </p>
+            </div>
+          </div>
+          <button
+            onClick={onClose}
+            className="p-1 bg-white border border-black hover:bg-neutral-100 shadow-[1px_1px_0px_#000] text-black"
+          >
+            <X size={16} />
+          </button>
+        </div>
+
+        {/* Order Info Banner */}
+        <div className="bg-neutral-100 p-3.5 border-b-2 border-black text-xs font-mono grid grid-cols-2 gap-2">
+          <div>
+            <span className="text-[10px] text-neutral-500 font-bold uppercase block">关联订单号</span>
+            <span className="font-black text-black break-all">{order.id}</span>
+          </div>
+          <div>
+            <span className="text-[10px] text-neutral-500 font-bold uppercase block">服务商品标的</span>
+            <span className="font-bold text-black truncate block">{order.product_name || `商品 #${order.product_id}`}</span>
+          </div>
+          <div>
+            <span className="text-[10px] text-neutral-500 font-bold uppercase block">客户/申请人</span>
+            <span className="font-bold text-black">{order.applicant_name || order.user_name || order.user_id || '未知'}</span>
+          </div>
+          <div>
+            <span className="text-[10px] text-neutral-500 font-bold uppercase block">当前账面应付</span>
+            <span className="font-black text-amber-900">
+              ¥{order.final_amount !== undefined ? (order.final_amount / 100).toFixed(2) : '-'}
+            </span>
+          </div>
+        </div>
+
+        {/* Form Body */}
+        <form onSubmit={handleSubmit} className="p-5 overflow-y-auto space-y-4 text-xs font-mono">
+          {/* 实收金额 */}
+          <div>
+            <label className="block text-xs font-black uppercase text-black mb-1">
+              [ 1. 实际到账金额 (元) ] <span className="text-rose-600">*</span>
+            </label>
+            <div className="relative">
+              <span className="absolute left-3 top-2.5 text-sm font-bold text-black pointer-events-none">
+                ¥
+              </span>
+              <input
+                type="number"
+                step="0.01"
+                min="0.01"
+                required
+                value={amount}
+                onChange={(e) => setAmount(e.target.value)}
+                placeholder="请输入实际收到的金额"
+                className="w-full pl-8 pr-3 py-2 border-2 border-black bg-neutral-50 text-sm font-mono font-black focus:bg-white outline-none shadow-[2px_2px_0px_#000] text-black"
+              />
+            </div>
+            <p className="text-[10px] text-neutral-500 mt-1">
+              可根据实际收款修改(如发生优惠折扣、抹零或追加加急费),提交后将同步更新订单最终应收结算价。
+            </p>
+          </div>
+
+          {/* 收款渠道方式 */}
+          <div>
+            <label className="block text-xs font-black uppercase text-black mb-2">
+              [ 2. 选择实际收款渠道 ] <span className="text-rose-600">*</span>
+            </label>
+            <div className="grid grid-cols-2 sm:grid-cols-3 gap-2">
+              {paymentOptions.map((opt) => {
+                const Icon = opt.icon;
+                const selected = paymentMethod === opt.id;
+                return (
+                  <button
+                    type="button"
+                    key={opt.id}
+                    onClick={() => setPaymentMethod(opt.id)}
+                    className={`p-2 border-2 text-left transition flex items-center gap-2 ${
+                      selected
+                        ? 'border-black bg-amber-200 shadow-[2px_2px_0px_#000] font-black text-black'
+                        : 'border-neutral-300 bg-neutral-50 hover:border-black text-neutral-700'
+                    }`}
+                  >
+                    <Icon size={14} className="shrink-0" />
+                    <span className="text-[11px] truncate">{opt.label}</span>
+                  </button>
+                );
+              })}
+            </div>
+          </div>
+
+          {/* 外部交易流水号 */}
+          <div>
+            <label className="block text-xs font-black uppercase text-black mb-1">
+              [ 3. 外部交易单号 / 转账流水号 (选填) ]
+            </label>
+            <input
+              type="text"
+              value={externalTradeNo}
+              onChange={(e) => setExternalTradeNo(e.target.value)}
+              placeholder="例如: 微信转账单号、支付宝订单号、银行回单号"
+              className="w-full px-3 py-2 border-2 border-black bg-neutral-50 text-xs font-mono font-bold focus:bg-white outline-none shadow-[2px_2px_0px_#000] text-black"
+            />
+          </div>
+
+          {/* 收款水单/截图 (调用 Cloudflare R2 对象存储上传) */}
+          <div>
+            <ImageUploadField
+              label="[ 4. 收款水单 / 转账截图 (上传至 Cloudflare R2) ]"
+              value={voucherUrl}
+              onChange={setVoucherUrl}
+              prefix="vouchers"
+              maxSizeMB={5}
+              helperText="点击选择微信/支付宝转账截图或银行电子回单,自动上传至 R2 对象存储"
+              compact={true}
+            />
+          </div>
+
+          {/* 备注 */}
+          <div>
+            <label className="block text-xs font-black uppercase text-black mb-1">
+              [ 5. 收款备注说明 ]
+            </label>
+            <input
+              type="text"
+              value={note}
+              onChange={(e) => setNote(e.target.value)}
+              placeholder="例如: 出签后微信全款到账、先办后付结清"
+              className="w-full px-3 py-2 border-2 border-black bg-neutral-50 text-xs font-mono font-bold focus:bg-white outline-none shadow-[2px_2px_0px_#000] text-black"
+            />
+          </div>
+
+          {/* 底部确认栏 */}
+          <div className="pt-4 border-t-2 border-black flex items-center justify-between">
+            <div className="text-[11px] text-neutral-500 flex items-center gap-1 font-sans">
+              <ShieldCheck size={14} className="text-emerald-700 shrink-0" />
+              <span>确认后将自动写入支付交易表,进入分润结算候选池</span>
+            </div>
+
+            <div className="flex gap-2">
+              <button
+                type="button"
+                onClick={onClose}
+                disabled={loading}
+                className="px-3 py-1.5 bg-white hover:bg-neutral-100 border-2 border-black text-xs font-bold shadow-[2px_2px_0px_#000]"
+              >
+                取消
+              </button>
+              <button
+                type="submit"
+                disabled={loading}
+                className="px-4 py-1.5 bg-amber-300 hover:bg-amber-400 text-black border-2 border-black text-xs font-black shadow-[3px_3px_0px_#000] active:translate-x-0.5 active:translate-y-0.5 flex items-center gap-1.5 disabled:opacity-50"
+              >
+                {loading ? <Loader2 size={14} className="animate-spin" /> : <CheckCircle2 size={14} />}
+                <span>[ 确认入账核销 ]</span>
+              </button>
+            </div>
+          </div>
+        </form>
+      </div>
+    </div>
+  );
+}

+ 116 - 0
src/lib/services/nodeConfigService.ts

@@ -221,5 +221,121 @@ export const nodeConfigService = {
     });
     return res.data;
   },
+
+  /**
+   * 查询 Worker 节点历史日志快照
+   */
+  async getNodeLogsHistory(params: {
+    node_id: string;
+    role: string;
+    group_id?: string;
+    limit?: number;
+  }): Promise<{
+    code: number;
+    message: string;
+    data: import('@/types').NodeLogItem[];
+  }> {
+    const res = await api.get('/api/node-configurations/logs/history', { params });
+    return res.data;
+  },
+
+  /**
+   * 建立 Worker 节点实时日志 SSE 流
+   */
+  streamNodeLogs(
+    params: {
+      node_id: string;
+      role: string;
+      group_id?: string;
+      level?: string;
+      history_limit?: number;
+    },
+    callbacks: {
+      onLog: (log: import('@/types').NodeLogItem) => void;
+      onError?: (err: Error) => void;
+    },
+    signal?: AbortSignal
+  ): () => void {
+    const baseUrl = process.env.NEXT_PUBLIC_API_URL || 'https://api.text.skin';
+    const query = new URLSearchParams({
+      node_id: params.node_id,
+      role: params.role,
+      history_limit: String(params.history_limit ?? 200),
+    });
+    if (params.group_id) query.append('group_id', params.group_id);
+    if (params.level) query.append('level', params.level);
+
+    const endpoint = `${baseUrl.replace(/\/$/, '')}/api/node-configurations/logs/stream?${query.toString()}`;
+    const token = typeof window !== 'undefined' ? localStorage.getItem('rsid') : null;
+
+    let aborted = false;
+    const controller = new AbortController();
+
+    const handleAbort = () => {
+      aborted = true;
+      controller.abort();
+    };
+
+    if (signal) {
+      signal.addEventListener('abort', handleAbort);
+    }
+
+    (async () => {
+      try {
+        const response = await fetch(endpoint, {
+          method: 'GET',
+          headers: {
+            Accept: 'text/event-stream',
+            ...(token ? { Authorization: `Bearer ${token}` } : {}),
+          },
+          signal: controller.signal,
+        });
+
+        if (!response.ok || !response.body) {
+          throw new Error(`HTTP Error ${response.status}: ${response.statusText}`);
+        }
+
+        const reader = response.body.getReader();
+        const decoder = new TextDecoder('utf-8');
+        let buffer = '';
+
+        while (!aborted) {
+          const { done, value } = await reader.read();
+          if (done) break;
+
+          buffer += decoder.decode(value, { stream: true });
+          const blocks = buffer.split('\n\n');
+          buffer = blocks.pop() || '';
+
+          for (const block of blocks) {
+            if (!block.trim() || block.startsWith(':')) continue;
+            for (const line of block.split('\n')) {
+              if (line.startsWith('data: ')) {
+                try {
+                  const logObj = JSON.parse(line.slice(6));
+                  callbacks.onLog(logObj);
+                } catch (e) {
+                  // ignore invalid json
+                }
+              }
+            }
+          }
+        }
+      } catch (err: any) {
+        if (err.name === 'AbortError' || aborted) {
+          return;
+        }
+        callbacks.onError?.(err);
+      }
+    })();
+
+    return () => {
+      aborted = true;
+      controller.abort();
+      if (signal) {
+        signal.removeEventListener('abort', handleAbort);
+      }
+    };
+  },
 };
 

+ 21 - 1
src/lib/services/orderService.ts

@@ -50,7 +50,7 @@ export const orderService = {
   },
 
   /**
-   * 管理员后台直接创建订单 (支持渠道/中介/对接人/自定义价格)
+   * 管理员后台直接创建订单 (支持先办后付/当场现结、渠道/中介/对接人/自定义价格)
    */
   async createByAdmin(payload: {
     product_id: number;
@@ -59,11 +59,31 @@ export const orderService = {
     agency_id?: string | null;
     handler_id?: string | null;
     final_amount?: number | null;
+    payment_timing?: 'pay_later' | 'paid_now';
+    payment_method?: string;
+    external_trade_no?: string;
+    voucher_url?: string;
+    payment_note?: string;
   }) {
     const res = await api.post('/api/vas/order/create_by_admin', payload);
     return res.data;
   },
 
+  /**
+   * 管理员/客服登记实收金额与收款记录
+   */
+  async registerPayment(payload: {
+    order_id: string;
+    amount: number; // 分
+    payment_method: string;
+    external_trade_no?: string;
+    voucher_url?: string;
+    note?: string;
+  }) {
+    const res = await api.post('/api/vas/order/register_payment', payload);
+    return res.data;
+  },
+
   /**
    * 标记订单履约出签完成,开启退款风险期(如T+7)
    */

+ 7 - 3
src/lib/services/paymentService.ts

@@ -105,7 +105,9 @@ export const paymentService = {
    * 更新支付服务提供商
    */
   async updateProvider(payload: Record<string, any>) {
-    const res = await api.post('/api/vas/payment_provider/update', payload);
+    const res = await api.post('/api/vas/payment_provider/update', payload, {
+      params: payload?.id ? { id: payload.id } : undefined,
+    });
     return res.data;
   },
 
@@ -122,8 +124,10 @@ export const paymentService = {
   /**
    * 获取支付二维码信息
    */
-  async getPaymentQrCode(params: { payment_id?: number; qr_id?: number }) {
-    const res = await api.get('/api/vas/payment_qr/qrcode', { params });
+  async getPaymentQrCode(params: { qr_id: number; payment_id?: number }) {
+    const res = await api.get('/api/vas/payment_qr/qrcode', {
+      params: { qr_id: params.qr_id },
+    });
     return res.data;
   },
 

+ 0 - 8
src/lib/services/statsService.ts

@@ -3,14 +3,6 @@
 import api from '@/lib/api';
 
 export const statsService = {
-  /**
-   * 获取控制台运营统计数据概览 (总订单、总收入、成功率等)
-   */
-  async getOverview() {
-    const res = await api.get('/api/vas/statistics/overview');
-    return res.data;
-  },
-
   /**
    * 获取预约放号槽位监控概览
    */

+ 10 - 0
src/types/node_config.ts

@@ -149,6 +149,16 @@ export interface RuntimeStatusResponse {
   timestamp: string;
 }
 
+export interface NodeLogItem {
+  id: string;
+  timestamp: string;
+  level: string;
+  role: string;
+  node_id: string;
+  group_id?: string;
+  message: string;
+}
+
 export interface NodeConfigurationItem {
   id: number;
   node_id: string;

+ 4 - 0
src/types/order.ts

@@ -15,6 +15,9 @@ export interface PaymentRecord {
   description?: string;
   qr_id?: number;
   payment_intent_id?: string;
+  provider_payload?: Record<string, any> | string;
+  voucher_url?: string;
+  note?: string;
 }
 
 /**
@@ -59,6 +62,7 @@ export interface OrderEvent {
 export interface Order {
   id: string;
   user_id?: string;
+  product_id?: number;
   created_at: string;
   status: string;
   base_amount: number;

+ 1 - 0
src/types/payment.ts

@@ -69,6 +69,7 @@ export interface Provider {
   channel: string;
   currency: string;
   enabled: number | boolean;
+  config?: Record<string, any>;
 }
 
 export type PaymentProviderConfig = Provider;