feat(equipmentMember): 删除确认改为自定义弹窗,他人添加用户红色加粗警示
- 删除确认弹窗替代原生 wx.showModal,仿原生风格 - 他人添加成员删除时显示红色加粗警示文案 - 成员列表操作区统一展示编辑/删除按钮 - 名字旁补充「本人」「他人添加」标签 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 4.7
parent
d44e0a9e76
commit
97c135786c
@@ -25,7 +25,7 @@
|
||||
|
||||
<scroll-view class="scrollView" scroll-y>
|
||||
<view class="scrollViewContent page-container">
|
||||
<!-- 成员卡(容量 + 列表) -->
|
||||
<!-- 用户卡(容量 + 列表) -->
|
||||
<view class="member-card">
|
||||
<!-- 设备容量(仅已连接态) -->
|
||||
<block wx:if="{{ connected }}">
|
||||
@@ -37,7 +37,7 @@
|
||||
</view>
|
||||
</block>
|
||||
|
||||
<!-- 成员列表 -->
|
||||
<!-- 用户列表 -->
|
||||
<block wx:for="{{ memberList }}" wx:key="id">
|
||||
<view class="member-item">
|
||||
<!-- 头像:取名字第一个字 -->
|
||||
@@ -47,10 +47,15 @@
|
||||
<view class="member-info">
|
||||
<view class="member-name-row">
|
||||
<view class="member-name">{{ item.realname }}</view>
|
||||
<!-- 本人 badge -->
|
||||
<block wx:if="{{ item.relationType == 1 }}">
|
||||
<view class="badge badge-self">本人</view>
|
||||
</block>
|
||||
<block wx:elif="{{ item.relationType == 2 }}">
|
||||
<!-- <view class="badge badge-my">自己添加</view>-->
|
||||
</block>
|
||||
<block wx:elif="{{ item.relationType == 3 }}">
|
||||
<view class="badge badge-other">他人添加</view>
|
||||
</block>
|
||||
</view>
|
||||
<view class="member-meta">
|
||||
<text class="meta-text">{{ item.sex_dictText }}</text>
|
||||
@@ -61,15 +66,9 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 右侧:他人添加 badge 或 编辑/删除按钮 -->
|
||||
<view class="member-actions">
|
||||
<!-- 他人添加:仅展示 badge -->
|
||||
<block wx:if="{{ item.relationType == 3 }}">
|
||||
<view class="badge badge-other">他人添加</view>
|
||||
</block>
|
||||
<!-- 自己添加(relationType == 2):显示编辑/删除 -->
|
||||
<block wx:elif="{{ item.relationType != 1 }}">
|
||||
<view class="action-text" data-id="{{ item.id }}" bind:tap="onTapEdit">编辑</view>
|
||||
<view class="action-text" data-id="{{ item.id }}" bind:tap="onTapEdit">编辑</view>
|
||||
<block wx:if="{{ item.relationType != 1 }}">
|
||||
<view class="action-text action-text-danger" data-id="{{ item.id }}" bind:tap="onTapDelete">删除</view>
|
||||
</block>
|
||||
</view>
|
||||
@@ -80,11 +79,30 @@
|
||||
</scroll-view>
|
||||
</view>
|
||||
|
||||
<!-- 底部添加成员按钮 -->
|
||||
<!-- 底部添加用户按钮 -->
|
||||
<view class="btn">
|
||||
<view class="add-member {{ connected ? '' : 'add-member-disabled' }}" bind:tap="onTapAddMember">
|
||||
<view class="add-member-icon">+</view>
|
||||
<view class="add-member-text">添加成员<text>(最多10位)</text></view>
|
||||
<view class="add-member-text">添加用户<text>(最多10位)</text></view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 删除确认弹窗 -->
|
||||
<view class="delete-modal-mask" wx:if="{{ showDeleteModal }}" bind:tap="onHideDeleteModal">
|
||||
<view class="delete-modal" catch:tap="noop">
|
||||
<view class="delete-modal-title">确认删除</view>
|
||||
<view class="delete-modal-content">
|
||||
<block wx:if="{{ deleteTarget.relationType == 3 }}">
|
||||
<text class="delete-modal-warning">'{{ deleteTarget.realname }}'用户为他人添加,请确认是否删除</text>
|
||||
</block>
|
||||
<block wx:else>
|
||||
确定要删除用户「{{ deleteTarget.realname }}」吗?删除后将同步更新设备数据。
|
||||
</block>
|
||||
</view>
|
||||
<view class="delete-modal-footer">
|
||||
<view class="delete-modal-btn delete-modal-btn-cancel" bind:tap="onHideDeleteModal">取消</view>
|
||||
<view class="delete-modal-btn delete-modal-btn-confirm" bind:tap="onConfirmDelete">确定删除</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
Reference in New Issue
Block a user