From e4b1cf4a1568df72f0eae3a8f600bca787ea4764 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Tue, 29 Jul 2025 19:49:09 +0800
Subject: [PATCH] =?UTF-8?q?FEAT=20=3D>=20=E6=9C=AC=E6=AC=A1=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=A1=B9=E7=9B=AE=E4=B8=BA=EF=BC=9A=20-=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=89=AB=E6=8F=8F=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E4=BC=98=E5=8C=96=E2=9C=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/mobile/mine/devices/index.tsx   | 27 ++++++++++---------
 nkebao/src/pages/mobile/mine/main/index.tsx   | 25 -----------------
 2 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/nkebao/src/pages/mobile/mine/devices/index.tsx b/nkebao/src/pages/mobile/mine/devices/index.tsx
index 84464d2f..467b65d5 100644
--- a/nkebao/src/pages/mobile/mine/devices/index.tsx
+++ b/nkebao/src/pages/mobile/mine/devices/index.tsx
@@ -10,7 +10,6 @@ import {
   ArrowLeftOutlined,
 } from "@ant-design/icons";
 import Layout from "@/components/Layout/Layout";
-import MeauMobile from "@/components/MeauMobile/MeauMoible";
 import {
   fetchDeviceList,
   fetchDeviceQRCode,
@@ -19,6 +18,7 @@ import {
 } from "@/api/devices";
 import type { Device } from "@/types/device";
 import { comfirm } from "@/utils/common";
+import { useUserStore } from "@/store/module/user";
 
 const Devices: React.FC = () => {
   // 设备列表相关
@@ -47,6 +47,7 @@ const Devices: React.FC = () => {
   const [delLoading, setDelLoading] = useState(false);
 
   const navigate = useNavigate();
+  const { user } = useUserStore();
   // 加载设备列表
   const loadDevices = useCallback(
     async (reset = false) => {
@@ -68,7 +69,7 @@ const Devices: React.FC = () => {
         setLoading(false);
       }
     },
-    [loading, search, page]
+    [loading, search, page],
   );
 
   // 首次加载和搜索
@@ -86,7 +87,7 @@ const Devices: React.FC = () => {
           setPage(p => p + 1);
         }
       },
-      { threshold: 0.5 }
+      { threshold: 0.5 },
     );
     if (observerRef.current) observer.observe(observerRef.current);
     return () => observer.disconnect();
@@ -112,7 +113,7 @@ const Devices: React.FC = () => {
     setQrLoading(true);
     setQrCode(null);
     try {
-      const accountId = localStorage.getItem("s2_accountId") || "";
+      const accountId = user.s2_accountId;
       if (!accountId) throw new Error("未获取到用户信息");
       const res = await fetchDeviceQRCode(accountId);
       setQrCode(res.qrCode);
@@ -123,6 +124,11 @@ const Devices: React.FC = () => {
     }
   };
 
+  const addDevice = async () => {
+    await handleGetQr();
+    setAddVisible(true);
+  };
+
   // 手动添加设备
   const handleAddDevice = async () => {
     if (!imei.trim() || !name.trim()) {
@@ -166,7 +172,7 @@ const Devices: React.FC = () => {
     try {
       await comfirm(
         `将删除${selected.length}个设备，删除后本设备配置的计划任务操作也将失效。确认删除？`,
-        { title: "确认删除", confirmText: "确认删除", cancelText: "取消" }
+        { title: "确认删除", confirmText: "确认删除", cancelText: "取消" },
       );
       handleDelete();
     } catch {
@@ -201,11 +207,7 @@ const Devices: React.FC = () => {
             }
             style={{ background: "#fff" }}
             right={
-              <Button
-                size="small"
-                type="primary"
-                onClick={() => setAddVisible(true)}
-              >
+              <Button size="small" type="primary" onClick={() => addDevice()}>
                 <AddOutline />
                 添加设备
               </Button>
@@ -301,7 +303,7 @@ const Devices: React.FC = () => {
                   setSelected(prev =>
                     e.target.checked
                       ? [...prev, device.id!]
-                      : prev.filter(id => id !== device.id)
+                      : prev.filter(id => id !== device.id),
                   );
                 }}
                 onClick={e => e.stopPropagation()}
@@ -373,7 +375,7 @@ const Devices: React.FC = () => {
           {addTab === "scan" && (
             <div style={{ textAlign: "center", minHeight: 200 }}>
               <Button
-                type="error"
+                type="primary"
                 onClick={handleGetQr}
                 loading={qrLoading}
                 icon={<QrcodeOutlined />}
@@ -390,6 +392,7 @@ const Devices: React.FC = () => {
                       height: 180,
                       background: "#f5f5f5",
                       borderRadius: 8,
+                      margin: "0 auto",
                     }}
                   />
                   <div style={{ color: "#888", fontSize: 12, marginTop: 8 }}>
diff --git a/nkebao/src/pages/mobile/mine/main/index.tsx b/nkebao/src/pages/mobile/mine/main/index.tsx
index 1e2f8060..605dc1ec 100644
--- a/nkebao/src/pages/mobile/mine/main/index.tsx
+++ b/nkebao/src/pages/mobile/mine/main/index.tsx
@@ -106,7 +106,6 @@ const Mine: React.FC = () => {
     // 清除本地存储的用户信息
     localStorage.removeItem("token");
     localStorage.removeItem("token_expired");
-    localStorage.removeItem("s2_accountId");
     localStorage.removeItem("userInfo");
     setShowLogoutDialog(false);
     navigate("/login");
@@ -120,30 +119,6 @@ const Mine: React.FC = () => {
     navigate(path);
   };
 
-  // 渲染用户头像
-  const renderUserAvatar = () => {
-    if (currentUserInfo.avatar) {
-      return <img src={currentUserInfo.avatar} alt="头像" />;
-    }
-    return (
-      <div
-        style={{
-          width: "100%",
-          height: "100%",
-          backgroundColor: "#1890ff",
-          display: "flex",
-          alignItems: "center",
-          justifyContent: "center",
-          color: "white",
-          fontSize: "24px",
-          fontWeight: "bold",
-        }}
-      >
-        售
-      </div>
-    );
-  };
-
   // 渲染功能模块图标
   const renderModuleIcon = (module: any) => (
     <div