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 @@
{{ self.sync }}
-
-
- 删除
-
+
+
+
+ 删除
+
+
@@ -79,11 +81,13 @@
{{ member.sync }}
-
-
- 编辑
- 删除
-
+
+
+
+ 编辑
+ 删除
+
+