From 6069367b90575efca153c91f16b5d7c697546d99 Mon Sep 17 00:00:00 2001
From: 17792275749 <812100002@qq.com>
Date: Tue, 1 Sep 2026 17:24:03 +0800
Subject: [PATCH] =?UTF-8?q?feat(userManagement):=20=E5=B7=B2=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=88=90=E5=91=98=E7=A6=81=E6=AD=A2=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=B9=B6=E4=BC=98=E5=8C=96=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../pages/userManagement/userManagement.less  |  2 +-
 .../pages/userManagement/userManagement.ts    |  4 +++-
 .../pages/userManagement/userManagement.wxml  | 22 +++++++++++--------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/miniprogram/pages/userManagement/userManagement.less b/miniprogram/pages/userManagement/userManagement.less
index 9750b6f..0d3e88a 100644
--- a/miniprogram/pages/userManagement/userManagement.less
+++ b/miniprogram/pages/userManagement/userManagement.less
@@ -188,7 +188,7 @@
                 margin-bottom: 24rpx;
 
                 &.member-card--deleted {
-                    opacity: 0.7;
+                    opacity: 0.5;
                 }
 
                 .member-top {
diff --git a/miniprogram/pages/userManagement/userManagement.ts b/miniprogram/pages/userManagement/userManagement.ts
index c18466b..462b571 100644
--- a/miniprogram/pages/userManagement/userManagement.ts
+++ b/miniprogram/pages/userManagement/userManagement.ts
@@ -151,7 +151,7 @@ Page({
                     gender: item.sex === 1 ? '男' : '女',
                     age: calcAge(item.birthday),
                     height: item.height,
-                    sync: item.delFlag === 1 ? '已删除' : (item.syncStatus === 1 ? '已同步' : '未同步'),
+                    sync: item.delFlag === 1 ? '已删除未同步' : (item.syncStatus === 1 ? '已同步' : '未同步'),
                     syncClass: item.delFlag === 1 ? 'deleted' : (item.syncStatus === 1 ? 'done' : 'pending'),
                     relationType: item.relationType,
                     delFlag: item.delFlag,
@@ -396,6 +396,7 @@ Page({
     /** 编辑成员：跳转 addUser 编辑模式 */
     onTapEdit(e: WechatMiniprogram.TouchEvent) {
         const item = e.currentTarget.dataset.item as MemberItem
+        if (item.delFlag === 1) return
         const sn = targetDevice?.sn || ''
         wx.navigateTo({ url: `/pages/addUser/addUser?sn=${encodeURIComponent(sn)}&id=${encodeURIComponent(item.id)}` })
     },
@@ -403,6 +404,7 @@ Page({
     /** 删除成员 */
     onTapDelete(e: WechatMiniprogram.TouchEvent) {
         const item = e.currentTarget.dataset.item as MemberItem
+        if (item.delFlag === 1) return
         wx.showModal({
             title: '删除用户',
             content: `是否确认删除「${item.name}」？`,
diff --git a/miniprogram/pages/userManagement/userManagement.wxml b/miniprogram/pages/userManagement/userManagement.wxml
index 6b2214d..738f76e 100644
--- a/miniprogram/pages/userManagement/userManagement.wxml
+++ b/miniprogram/pages/userManagement/userManagement.wxml
@@ -54,10 +54,12 @@
                             <view>{{ self.sync }}</view>
                         </view>
                     </view>
-                    <view class="member-divider"></view>
-                    <view class="member-ops">
-                        <view class="op-delete" bind:tap="onTapDelete" data-item="{{ self }}">删除</view>
-                    </view>
+                    <block wx:if="{{ self.delFlag !== 1 }}">
+                        <view class="member-divider"></view>
+                        <view class="member-ops">
+                            <view class="op-delete" bind:tap="onTapDelete" data-item="{{ self }}">删除</view>
+                        </view>
+                    </block>
                 </view>
                 </block>
 
@@ -79,11 +81,13 @@
                                     <view>{{ member.sync }}</view>
                                 </view>
                             </view>
-                            <view class="member-divider"></view>
-                            <view class="member-ops">
-                                <view class="op-edit" bind:tap="onTapEdit" data-item="{{ member }}">编辑</view>
-                                <view class="op-delete" bind:tap="onTapDelete" data-item="{{ member }}">删除</view>
-                            </view>
+                            <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>
+                                    <view class="op-delete" bind:tap="onTapDelete" data-item="{{ member }}">删除</view>
+                                </view>
+                            </block>
                         </view>
                     </block>
                 </block>