From efa77abce9a7b4a964f1c409a5201af82285bfc4 Mon Sep 17 00:00:00 2001
From: XuqmGroup <noreply@xuqm.com>
Date: Fri, 26 Jun 2026 14:12:03 +0800
Subject: [PATCH] =?UTF-8?q?fix(push):=20=E4=BF=AE=E5=A4=8D=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E5=B9=B3=E5=8F=B0=E9=85=8D=E7=BD=AE=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=99=A8=E5=8F=8A=E5=9C=A8=E7=BA=BF=E6=97=B6=E9=97=B4=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- PushConfigView: 新增平台选择器（Android/iOS/HarmonyOS），加载时固定默认 ANDROID，
  避免因激活服务平台顺序不同而静默保存到错误平台
- PushManagementView: 最后在线为空时降级显示设备最后登录时间，并加注释区分 IM 在线 vs 设备登录

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../src/views/push/PushConfigView.vue         | 19 ++++++++++++++-----
 .../src/views/push/PushManagementView.vue     |  9 ++++++++-
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/tenant-platform/src/views/push/PushConfigView.vue b/tenant-platform/src/views/push/PushConfigView.vue
index 853c386..0854c1e 100644
--- a/tenant-platform/src/views/push/PushConfigView.vue
+++ b/tenant-platform/src/views/push/PushConfigView.vue
@@ -21,6 +21,18 @@
       style="margin-bottom:16px"
     />
 
+    <el-card style="margin-bottom:16px">
+      <template #header>目标平台</template>
+      <el-radio-group v-model="selectedPlatform" @change="applySelectedPlatformConfig">
+        <el-radio-button value="ANDROID">Android</el-radio-button>
+        <el-radio-button value="IOS">iOS</el-radio-button>
+        <el-radio-button value="HARMONY">HarmonyOS</el-radio-button>
+      </el-radio-group>
+      <el-text type="info" style="margin-left:16px;font-size:12px">
+        当前编辑：{{ selectedPlatform }} 平台的推送配置，保存时仅更新该平台
+      </el-text>
+    </el-card>
+
     <el-card style="margin-bottom:16px">
       <template #header>厂商凭据</template>
       <div class="vendor-grid">
@@ -496,11 +508,8 @@ async function loadData() {
     ])
     app.value = appRes.data.data
     services.value = svcRes.data.data
-    const activePushService = services.value.find(s => s.serviceType === 'PUSH' && s.enabled)
-      ?? services.value.find(s => s.serviceType === 'PUSH')
-    if (activePushService) {
-      selectedPlatform.value = activePushService.platform as 'ANDROID' | 'IOS' | 'HARMONY'
-    }
+    // Always default to ANDROID on load; user can switch via the platform selector
+    selectedPlatform.value = 'ANDROID'
     applySelectedPlatformConfig()
   } finally {
     loading.value = false
diff --git a/tenant-platform/src/views/push/PushManagementView.vue b/tenant-platform/src/views/push/PushManagementView.vue
index 8875832..47b78e6 100644
--- a/tenant-platform/src/views/push/PushManagementView.vue
+++ b/tenant-platform/src/views/push/PushManagementView.vue
@@ -52,7 +52,14 @@
             </el-tag>
           </el-descriptions-item>
           <el-descriptions-item label="最后在线">
-            {{ userStatus.lastSeenAt ? formatTime(userStatus.lastSeenAt) : '-' }}
+            <span v-if="userStatus.lastSeenAt">{{ formatTime(userStatus.lastSeenAt) }}</span>
+            <span v-else-if="userStatus.devices[0]?.lastLoginAt" style="color:#909399">
+              {{ formatTime(userStatus.devices[0].lastLoginAt) }}
+              <el-tooltip content="该用户未连接 IM，显示的是设备最后登录时间" placement="top">
+                <span style="font-size:11px;cursor:help">（设备登录）</span>
+              </el-tooltip>
+            </span>
+            <span v-else>-</span>
           </el-descriptions-item>
           <el-descriptions-item label="可推送设备数">
             {{ userStatus.deliverableDevices.length }}