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 @@ - 编辑 + + 编辑 + 删除