From 69d8fa75a5a61cced567940621aeaaad0b4c5cfe Mon Sep 17 00:00:00 2001
From: 17792275749 <812100002@qq.com>
Date: Fri, 4 Sep 2026 17:36:48 +0800
Subject: [PATCH] =?UTF-8?q?feat(userManagement):=20=E9=95=BF=E6=8C=89?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E5=BC=B9=E7=AA=97=E7=A1=AE=E8=AE=A4=E5=90=8E?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E8=AE=BE=E5=A4=87=E7=94=A8=E6=88=B7=E5=B9=B6?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../pages/userManagement/userManagement.ts    | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/miniprogram/pages/userManagement/userManagement.ts b/miniprogram/pages/userManagement/userManagement.ts
index 55ee3bc..2486b70 100644
--- a/miniprogram/pages/userManagement/userManagement.ts
+++ b/miniprogram/pages/userManagement/userManagement.ts
@@ -344,15 +344,30 @@ Page({
             })
     },
 
-    /** 长按标题：清除设备用户信息并全部重新下发（不上报） */
+    /** 长按标题：弹窗确认后重置设备用户 */
     onLongPressSectionTitle() {
+        wx.showModal({
+            title: '重置设备用户',
+            content: '清除设备用户，重新下发',
+            cancelText: '取消',
+            confirmText: '确定',
+            success: (res) => {
+                if (!res.confirm) return
+                this._doReset()
+            },
+        })
+    },
+
+    /** 清空设备用户，重新下发全部正常用户，并按同数量上报用户 id */
+    _doReset() {
         if (!this._ensureConnected()) return
         const allUsers = this._buildAllUsers()
-        if (!allUsers.length) {
+        const normalUsers = allUsers.filter(u => u.delFlag !== 1)
+        if (!normalUsers.length) {
             wx.showToast({ title: '暂无用户可下发', icon: 'none' })
             return
         }
-        this._clearAndSync(allUsers, null)
+        this._clearAndSync(normalUsers, normalUsers)
     },
 
     /** 清除设备用户后重新下发；reportUsers 为 null 时不上报后台 */