diff --git a/nkebao/src/pages/mobile/mine/devices/DeviceDetail.tsx b/nkebao/src/pages/mobile/mine/devices/DeviceDetail.tsx
index de47bf14..9a70464c 100644
--- a/nkebao/src/pages/mobile/mine/devices/DeviceDetail.tsx
+++ b/nkebao/src/pages/mobile/mine/devices/DeviceDetail.tsx
@@ -8,9 +8,9 @@ import {
   fetchDeviceRelatedAccounts,
   fetchDeviceHandleLogs,
   updateDeviceTaskConfig,
-} from "@/api/devices";
+} from "./api";
 import type { Device, WechatAccount, HandleLog } from "@/types/device";
-
+import NavCommon from "@/components/NavCommon";
 const DeviceDetail: React.FC = () => {
   const { id } = useParams<{ id: string }>();
   const navigate = useNavigate();
@@ -118,19 +118,50 @@ const DeviceDetail: React.FC = () => {
   return (
     <Layout
       header={
-        <NavBar
-          onBack={() => navigate(-1)}
-          style={{ background: "#fff" }}
-          right={
-            <Button size="small" color="primary">
-              <SettingOutlined />
-            </Button>
-          }
-        >
-          <span style={{ color: "var(--primary-color)", fontWeight: 600 }}>
-            设备详情
-          </span>
-        </NavBar>
+        <>
+          <NavCommon title="设备详情" />
+
+          {/* 基本信息卡片 */}
+          {device && (
+            <div
+              style={{
+                background: "#fff",
+                borderRadius: 12,
+                padding: 16,
+                marginBottom: 16,
+                boxShadow: "0 1px 4px #eee",
+                margin: "0 12px",
+              }}
+            >
+              <div style={{ fontWeight: 600, fontSize: 18 }}>
+                {device.memo || "未命名设备"}
+              </div>
+              <div style={{ fontSize: 13, color: "#888", marginTop: 4 }}>
+                IMEI: {device.imei}
+              </div>
+              <div style={{ fontSize: 13, color: "#888", marginTop: 4 }}>
+                微信号: {device.wechatId || "未绑定"}
+              </div>
+              <div style={{ fontSize: 13, color: "#888", marginTop: 4 }}>
+                好友数: {device.totalFriend ?? "-"}
+              </div>
+              <div
+                style={{
+                  fontSize: 13,
+                  color:
+                    device.status === "online" || device.alive === 1
+                      ? "#52c41a"
+                      : "#aaa",
+                  marginTop: 4,
+                }}
+              >
+                {device.status === "online" || device.alive === 1
+                  ? "在线"
+                  : "离线"}
+              </div>
+            </div>
+          )}
+        </>
       }
       loading={loading}
     >
@@ -141,43 +172,6 @@ const DeviceDetail: React.FC = () => {
         </div>
       ) : (
         <div style={{ padding: 12 }}>
-          {/* 基本信息卡片 */}
-          <div
-            style={{
-              background: "#fff",
-              borderRadius: 12,
-              padding: 16,
-              marginBottom: 16,
-              boxShadow: "0 1px 4px #eee",
-            }}
-          >
-            <div style={{ fontWeight: 600, fontSize: 18 }}>
-              {device.memo || "未命名设备"}
-            </div>
-            <div style={{ fontSize: 13, color: "#888", marginTop: 4 }}>
-              IMEI: {device.imei}
-            </div>
-            <div style={{ fontSize: 13, color: "#888", marginTop: 4 }}>
-              微信号: {device.wechatId || "未绑定"}
-            </div>
-            <div style={{ fontSize: 13, color: "#888", marginTop: 4 }}>
-              好友数: {device.totalFriend ?? "-"}
-            </div>
-            <div
-              style={{
-                fontSize: 13,
-                color:
-                  device.status === "online" || device.alive === 1
-                    ? "#52c41a"
-                    : "#aaa",
-                marginTop: 4,
-              }}
-            >
-              {device.status === "online" || device.alive === 1
-                ? "在线"
-                : "离线"}
-            </div>
-          </div>
           {/* 标签页 */}
           <Tabs activeKey={tab} onChange={setTab} style={{ marginBottom: 12 }}>
             <Tabs.Tab title="功能开关" key="info" />