From af1b3b6988bb0f94b93a480dd85ccb6de44d4325 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=B3=E6=B8=85=E7=88=BD?= <eison.icu@gmail.com>
Date: Wed, 30 Apr 2025 15:19:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=98=E5=AE=A2=E5=AE=9D=20-=20=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E5=AD=98=E5=82=A8=E7=99=BB=E5=BD=95=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=A2=9D=E5=A4=96=E8=BF=94=E5=9B=9E=E7=9A=84=20s2=5FaccountId?=
 =?UTF-8?q?=20=E5=AD=97=E6=AE=B5=E5=8F=82=E6=95=B0=EF=BC=8C=E7=94=A8?=
 =?UTF-8?q?=E4=BA=8E=E6=93=8D=E7=9B=98=E6=89=8B=E6=B7=BB=E5=8A=A0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Cunkebao/app/devices/page.tsx | 52 +++++++++++++++++++++++++++--------
 Cunkebao/app/login/page.tsx   | 17 +++++-------
 2 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/Cunkebao/app/devices/page.tsx b/Cunkebao/app/devices/page.tsx
index dacaae01..81acd216 100644
--- a/Cunkebao/app/devices/page.tsx
+++ b/Cunkebao/app/devices/page.tsx
@@ -171,8 +171,6 @@ export default function DevicesPage() {
       setIsLoadingQRCode(true)
       setQrCodeImage("") // 清空当前二维码
       
-      console.log("正在请求二维码...");
-      
       // 发起请求获取二维码 - 直接使用fetch避免api工具添加基础URL
       const response = await fetch('http://yi.54word.com/v1/api/device/add', {
         method: 'POST',
@@ -183,8 +181,6 @@ export default function DevicesPage() {
         body: JSON.stringify({})
       })
       
-      console.log("二维码请求响应状态:", response.status);
-      
       // 保存原始响应文本以便调试
       const responseText = await response.text();
       console.log("原始响应内容:", responseText);
@@ -499,6 +495,43 @@ export default function DevicesPage() {
     router.push(`/devices/${deviceId}`);
   }
 
+  // 处理添加设备
+  const handleAddDevice = async () => {
+    try {
+      const s2_accountId = localStorage.getItem('s2_accountId');
+      if (!s2_accountId) {
+        toast.error('未获取到用户信息，请重新登录');
+        return;
+      }
+
+      const response = await fetch('/api/devices', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': `Bearer ${localStorage.getItem('token')}`,
+        },
+        body: JSON.stringify({
+          imei: deviceImei,
+          memo: deviceName,
+          s2_accountId: s2_accountId,
+        }),
+      });
+
+      const data = await response.json();
+      if (data.code === 200) {
+        toast.success('添加设备成功');
+        setIsAddDeviceOpen(false);
+        // 刷新设备列表
+        loadDevices(1, true);
+      } else {
+        toast.error(data.msg || '添加设备失败');
+      }
+    } catch (error) {
+      console.error('添加设备失败:', error);
+      toast.error('添加设备失败，请稍后重试');
+    }
+  };
+
   return (
     <div className="flex-1 bg-gray-50 min-h-screen">
       <header className="sticky top-0 z-10 bg-white border-b">
@@ -748,15 +781,10 @@ export default function DevicesPage() {
                 取消
               </Button>
                   <Button 
-                    onClick={handleAddDeviceByImei} 
-                    disabled={isSubmittingImei || !deviceImei.trim()}
+                    onClick={handleAddDevice} 
+                    disabled={!deviceImei.trim() || !deviceName.trim()}
                   >
-                    {isSubmittingImei ? (
-                      <>
-                        <div className="w-4 h-4 mr-2 rounded-full border-2 border-white border-t-transparent animate-spin"></div>
-                        提交中...
-                      </>
-                    ) : "添加"}
+                    添加
                   </Button>
             </div>
           </div>
diff --git a/Cunkebao/app/login/page.tsx b/Cunkebao/app/login/page.tsx
index ba7f1e16..41410b7e 100644
--- a/Cunkebao/app/login/page.tsx
+++ b/Cunkebao/app/login/page.tsx
@@ -98,17 +98,14 @@ export default function LoginPage() {
         const response = await loginApi.login(form.phone, form.password)
 
         if (response.code === 200 && response.data) {
-          // 获取用户信息和token
-          const { token, token_expired, member } = response.data
+          // 保存登录信息
+          localStorage.setItem('token', response.data.token)
+          localStorage.setItem('token_expired', response.data.token_expired)
+          localStorage.setItem('s2_accountId', response.data.member.s2_accountId)
+          
+          // 保存用户信息
+          localStorage.setItem('userInfo', JSON.stringify(response.data.member))
           
-          // 保存token和用户信息
-          login(token, {
-            id: member.id,
-            username: member.username || member.account || '',
-            account: member.account,
-            avatar: member.avatar
-          })
-
           // 显示成功提示
           toast({
             title: "登录成功",