From 68a56a3575f60ddd367873730a22ed9a90b65711 Mon Sep 17 00:00:00 2001
From: XuqmGroup <noreply@xuqm.com>
Date: Fri, 26 Jun 2026 13:21:36 +0800
Subject: [PATCH] =?UTF-8?q?feat(push):=20=E6=B5=8B=E8=AF=95=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=EF=BC=8C=E9=BB=98=E8=AE=A4=E6=9C=80=E8=BF=91?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 设备选择器显示全部设备，预选最近登录项
- sent=false && targetCount>0 时显示厂商拒绝提示
- testOffline API 新增 deviceId 参数

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 tenant-platform/src/api/push.ts               |  3 ++-
 .../src/views/push/PushManagementView.vue     | 24 ++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/tenant-platform/src/api/push.ts b/tenant-platform/src/api/push.ts
index 5518cd7..627e8f7 100644
--- a/tenant-platform/src/api/push.ts
+++ b/tenant-platform/src/api/push.ts
@@ -81,10 +81,11 @@ export const pushAdminApi = {
     })
   },
 
-  testOffline(appKey: string, userId: string, title: string, body: string, payload?: string) {
+  testOffline(appKey: string, userId: string, title: string, body: string, payload?: string, deviceId?: string | null) {
     return client.post<{ data: TestPushResult }>('/push/admin/test-offline', {
       appKey,
       userId,
+      deviceId: deviceId ?? null,
       title,
       body,
       payload: payload ?? null,
diff --git a/tenant-platform/src/views/push/PushManagementView.vue b/tenant-platform/src/views/push/PushManagementView.vue
index 783e1b5..8875832 100644
--- a/tenant-platform/src/views/push/PushManagementView.vue
+++ b/tenant-platform/src/views/push/PushManagementView.vue
@@ -106,6 +106,17 @@
         <el-card shadow="never" style="margin-bottom:0">
           <template #header>发送测试离线推送</template>
           <el-form :model="testForm" label-width="90px" style="max-width:560px">
+            <el-form-item label="目标设备">
+              <el-select v-model="testForm.deviceId" style="width:100%" placeholder="按策略自动选择">
+                <el-option :value="null" label="按策略自动推送（平台按登录模式选取）" />
+                <el-option
+                  v-for="dev in userStatus?.devices"
+                  :key="dev.id"
+                  :value="dev.id"
+                  :label="`${dev.vendor}${dev.brand ? ' · ' + dev.brand : ''}${dev.model ? ' ' + dev.model : ''}${dev.lastLoginAt ? ' · 登录 ' + formatTime(dev.lastLoginAt) : ''}${!dev.receivePush ? ' [已关闭推送]' : ''}`"
+                />
+              </el-select>
+            </el-form-item>
             <el-form-item label="标题">
               <el-input v-model="testForm.title" placeholder="推送标题" />
             </el-form-item>
@@ -126,8 +137,12 @@
           </el-form>
           <template v-if="testResult">
             <el-alert
-              :title="testResult.sent ? `推送已发出，目标设备 ${testResult.targetCount} 台` : '无可用推送目标，未发送'"
-              :type="testResult.sent ? 'success' : 'warning'"
+              :title="testResult.sent
+                ? `推送已发出，目标设备 ${testResult.targetCount} 台`
+                : testResult.targetCount > 0
+                  ? '设备已找到但推送失败，请检查厂商凭据配置（小米 AppSecret / VIVO AppKey 等）'
+                  : '无可用推送目标，未发送'"
+              :type="testResult.sent ? 'success' : testResult.targetCount > 0 ? 'error' : 'warning'"
               :closable="false"
               show-icon
               style="margin-top:12px"
@@ -246,7 +261,7 @@ const queryUserId = ref('')
 const querying = ref(false)
 const userStatus = ref<UserPushStatus | null>(null)
 
-const testForm = reactive({ title: '', body: '', payload: '' })
+const testForm = reactive({ title: '', body: '', payload: '', deviceId: null as string | null })
 const sending = ref(false)
 const testResult = ref<TestPushResult | null>(null)
 
@@ -274,6 +289,8 @@ async function queryUser() {
   try {
     const res = await pushAdminApi.getUserStatus(appKey.value, uid)
     userStatus.value = res.data.data
+    // default to last-login device (devices are ordered by lastLoginAt DESC)
+    testForm.deviceId = res.data.data.devices[0]?.id ?? null
     logsUserId.value = uid
     logsPage.value = 1
     await loadLogs()
@@ -295,6 +312,7 @@ async function sendTestPush() {
       testForm.title,
       testForm.body,
       testForm.payload || undefined,
+      testForm.deviceId,
     )
     testResult.value = res.data.data
   } catch {