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 时不上报后台 */