From 8e3da13d52240e4ed055cfbc2e75e3953b7765d1 Mon Sep 17 00:00:00 2001
From: 17792275749 <812100002@qq.com>
Date: Wed, 2 Sep 2026 16:51:03 +0800
Subject: [PATCH] =?UTF-8?q?feat(userManagement):=20=E5=91=98=E5=B7=A5?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE?=
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>
---
 miniprogram/pages/userManagement/userManagement.ts   | 10 +++++++++-
 miniprogram/pages/userManagement/userManagement.wxml |  4 +++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/miniprogram/pages/userManagement/userManagement.ts b/miniprogram/pages/userManagement/userManagement.ts
index 462b571..e3cb2ee 100644
--- a/miniprogram/pages/userManagement/userManagement.ts
+++ b/miniprogram/pages/userManagement/userManagement.ts
@@ -46,6 +46,8 @@ interface MemberItem {
     syncClass: string
     /** 1=本人 2=自己添加 3=他人添加 */
     relationType: number | null
+    /** 0=员工 1=家庭用户 */
+    dataType?: number
     delFlag?: number
 }
 
@@ -154,6 +156,7 @@ Page({
                     sync: item.delFlag === 1 ? '已删除未同步' : (item.syncStatus === 1 ? '已同步' : '未同步'),
                     syncClass: item.delFlag === 1 ? 'deleted' : (item.syncStatus === 1 ? 'done' : 'pending'),
                     relationType: item.relationType,
+                    dataType: item.dataType,
                     delFlag: item.delFlag,
                 })
                 const self = list.find(m => m.relationType === 1)
@@ -465,6 +468,11 @@ Page({
 
     /** 添加新用户 */
     onTapAddNew() {
-        wx.navigateTo({ url: '/pages/addUser/addUser' })
+        if (this.data.memberCount >= 10) {
+            wx.showToast({ title: '最多添加10位用户', icon: 'none' })
+            return
+        }
+        const sn = targetDevice?.sn || ''
+        wx.navigateTo({ url: `/pages/addUser/addUser?sn=${encodeURIComponent(sn)}` })
     }
 })
diff --git a/miniprogram/pages/userManagement/userManagement.wxml b/miniprogram/pages/userManagement/userManagement.wxml
index 738f76e..6d37da5 100644
--- a/miniprogram/pages/userManagement/userManagement.wxml
+++ b/miniprogram/pages/userManagement/userManagement.wxml
@@ -84,7 +84,9 @@
                             <block wx:if="{{ member.delFlag !== 1 }}">
                                 <view class="member-divider"></view>
                                 <view class="member-ops">
-                                    <view class="op-edit" bind:tap="onTapEdit" data-item="{{ member }}">编辑</view>
+                                    <block wx:if="{{ member.dataType !== 0 }}">
+                                        <view class="op-edit" bind:tap="onTapEdit" data-item="{{ member }}">编辑</view>
+                                    </block>
                                     <view class="op-delete" bind:tap="onTapDelete" data-item="{{ member }}">删除</view>
                                 </view>
                             </block>