yuchunlei/bodyWeight
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: yuchunlei/bodyWeight:1ef5c5d83449b629f068f0571f70de8c763ebbf9
Branches Tags
yuchunlei/bodyWeight:master yuchunlei/bodyWeight:news-LiLong yuchunlei/bodyWeight:renkang
..
compare: yuchunlei/bodyWeight:4be971200008c41c2d0b4ccd33c9df43df025e1c
Branches Tags
yuchunlei/bodyWeight:news-LiLong yuchunlei/bodyWeight:master yuchunlei/bodyWeight:renkang
3 Commits
1ef5c5d834 .. 4be9712000
Author SHA1 Message Date
17792275749andClaude Sonnet 4.6 4be9712000 chore(selectMemberDrawer): 空态增加提示文案 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-09-01 17:24:10 +08:00
17792275749andClaude Sonnet 4.6 f7dba359d3 chore(equipment): 调整绑定设备文案与已配对区块显示 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-09-01 17:24:07 +08:00
17792275749andClaude Sonnet 4.6 6069367b90 feat(userManagement): 已删除成员禁止编辑删除并优化展示 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-09-01 17:24:03 +08:00
5 changed files with 30 additions and 24 deletions
Expand all files Collapse all files
miniprogram/components/selectMemberDrawer/selectMemberDrawer.wxml
+1 -1
View File
@@ -54,7 +54,7 @@
<!-- 无用户：占位 --> <!-- 无用户：占位 -->
<block wx:else> <block wx:else>
<empty-data /> <empty-data text="暂无用户" />
</block> </block>
</view> </view>
</view> </view>
miniprogram/pages/equipment/equipment.wxml
+12 -12
View File
@@ -13,17 +13,17 @@
</view> </view>
<!-- 已配对设备行 --> <!-- 已配对设备行 -->
<view class="section-bar"> <block wx:if="{{ operationsEngineer }}">
<view class="section-left"> <view class="section-bar">
<view class="bt-icon"> <view class="section-left">
<image src="/images/equipment/bluetooth.png"/> <view class="bt-icon">
</view> <image src="/images/equipment/bluetooth.png"/>
<view class="section-title">已配对设备</view> </view>
</view> <view class="section-title">已配对设备</view>
<block wx:if="{{ operationsEngineer }}"> </view>
<view class="ops-btn ops-btn--red" bind:tap="onUnpairAll">取消全部配对</view> <view class="ops-btn ops-btn--red" bind:tap="onUnpairAll">取消全部配对</view>
</block> </view>
</view> </block>
<!-- 设备列表 --> <!-- 设备列表 -->
<!-- <view class="device"> <!-- <view class="device">
@@ -101,7 +101,7 @@
</block> </block>
</block> </block>
<block wx:else> <block wx:else>
<empty-data containerStyle="margin: 100rpx 0 200rpx;" /> <empty-data text="暂未绑定可用设备，请绑定.." containerStyle="margin: 100rpx 0 200rpx;" />
</block> </block>
<!-- 添加设备按钮 --> <!-- 添加设备按钮 -->
@@ -109,7 +109,7 @@
<view class="add-icon"> <view class="add-icon">
<image src="/images/addBtn.png"/> <image src="/images/addBtn.png"/>
</view> </view>
<view class="add-text">添加设备</view> <view class="add-text">绑定设备</view>
</view> </view>
<equipment-dialog show="{{ loadingShow }}" title="{{ loadingTitle }}" content="{{ loadingContent }}" <equipment-dialog show="{{ loadingShow }}" title="{{ loadingTitle }}" content="{{ loadingContent }}"
miniprogram/pages/userManagement/userManagement.less
+1 -1
View File
@@ -188,7 +188,7 @@
margin-bottom: 24rpx; margin-bottom: 24rpx;
&.member-card--deleted { &.member-card--deleted {
opacity: 0.7; opacity: 0.5;
} }
.member-top { .member-top {
miniprogram/pages/userManagement/userManagement.ts
+3 -1
View File
@@ -151,7 +151,7 @@ Page({
gender: item.sex === 1 ? '男' : '女', gender: item.sex === 1 ? '男' : '女',
age: calcAge(item.birthday), age: calcAge(item.birthday),
height: item.height, 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'), syncClass: item.delFlag === 1 ? 'deleted' : (item.syncStatus === 1 ? 'done' : 'pending'),
relationType: item.relationType, relationType: item.relationType,
delFlag: item.delFlag, delFlag: item.delFlag,
@@ -396,6 +396,7 @@ Page({
/** 编辑成员：跳转 addUser 编辑模式 */ /** 编辑成员：跳转 addUser 编辑模式 */
onTapEdit(e: WechatMiniprogram.TouchEvent) { onTapEdit(e: WechatMiniprogram.TouchEvent) {
const item = e.currentTarget.dataset.item as MemberItem const item = e.currentTarget.dataset.item as MemberItem
if (item.delFlag === 1) return
const sn = targetDevice?.sn || '' const sn = targetDevice?.sn || ''
wx.navigateTo({ url: `/pages/addUser/addUser?sn=${encodeURIComponent(sn)}&id=${encodeURIComponent(item.id)}` }) wx.navigateTo({ url: `/pages/addUser/addUser?sn=${encodeURIComponent(sn)}&id=${encodeURIComponent(item.id)}` })
}, },
@@ -403,6 +404,7 @@ Page({
/** 删除成员 */ /** 删除成员 */
onTapDelete(e: WechatMiniprogram.TouchEvent) { onTapDelete(e: WechatMiniprogram.TouchEvent) {
const item = e.currentTarget.dataset.item as MemberItem const item = e.currentTarget.dataset.item as MemberItem
if (item.delFlag === 1) return
wx.showModal({ wx.showModal({
title: '删除用户', title: '删除用户',
content: `是否确认删除「${item.name}」？`, content: `是否确认删除「${item.name}」？`,
miniprogram/pages/userManagement/userManagement.wxml
+13 -9
View File
@@ -54,10 +54,12 @@
<view>{{ self.sync }}</view> <view>{{ self.sync }}</view>
</view> </view>
</view> </view>
<view class="member-divider"></view> <block wx:if="{{ self.delFlag !== 1 }}">
<view class="member-ops"> <view class="member-divider"></view>
<view class="op-delete" bind:tap="onTapDelete" data-item="{{ self }}">删除</view> <view class="member-ops">
</view> <view class="op-delete" bind:tap="onTapDelete" data-item="{{ self }}">删除</view>
</view>
</block>
</view> </view>
</block> </block>
@@ -79,11 +81,13 @@
<view>{{ member.sync }}</view> <view>{{ member.sync }}</view>
</view> </view>
</view> </view>
<view class="member-divider"></view> <block wx:if="{{ member.delFlag !== 1 }}">
<view class="member-ops"> <view class="member-divider"></view>
<view class="op-edit" bind:tap="onTapEdit" data-item="{{ member }}">编辑</view> <view class="member-ops">
<view class="op-delete" bind:tap="onTapDelete" data-item="{{ member }}">删除</view> <view class="op-edit" bind:tap="onTapEdit" data-item="{{ member }}">编辑</view>
</view> <view class="op-delete" bind:tap="onTapDelete" data-item="{{ member }}">删除</view>
</view>
</block>
</view> </view>
</block> </block>
</block> </block>