- 重构 configureDevice 步骤0:新增双条件控制(deviceInfo + codeSyncTime),确保连接完成且 mac 就绪后才进入下一步 - 重构 configureDevice_2:移除 userInfo 缓存读取,改为接口获取用户列表,支持动态渲染、删除用户 - 新增 configureDevice_2_addUser 组件:支持工号查询用户信息并添加到设备 - 优化用户下发逻辑:先通过 dataFetchUserID 获取设备端已有用户,仅下发新增用户 - 删除废弃页面 deviceInfo、userInfo Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
27 lines
1.4 KiB
Plaintext
27 lines
1.4 KiB
Plaintext
<view class="configureDevice">
|
|
<view class="progress">
|
|
<block wx:for="{{progress.data}}" wx:key="index">
|
|
<view class="progressList">
|
|
<view style="background-color: {{progress.index >= index ? '#BFDEFD' : '#C1DFFE'}};">
|
|
<view style="height: {{progress.index >= index ? '24rpx' : '40rpx'}};width: {{progress.index >= index ? '24rpx' : '40rpx'}};background-color: {{progress.index >= index ? '#3194FB' : '#77849E'}};">{{progress.index >= index ? '' : index + 1}}</view>
|
|
</view>
|
|
<view class="{{progress.index >= index ? 'active' : ''}}">{{item}}</view>
|
|
</view>
|
|
</block>
|
|
</view>
|
|
|
|
<view class="content">
|
|
<block wx:if="{{progress.index === 0}}">
|
|
<configureDevice1 bind:deviceEvent="deviceChange"></configureDevice1>
|
|
</block>
|
|
<block wx:if="{{progress.index === 1}}">
|
|
<configureDevice2 bind:deviceEvent="setDeviceUserList" bind:connectedDeviceEvent="connectedDevice"></configureDevice2>
|
|
</block>
|
|
<block wx:if="{{progress.index === 2}}">
|
|
<configureDevice3 id="configureDevice3" bind:deviceEvent="setDeviceConfig"></configureDevice3>
|
|
</block>
|
|
<block wx:if="{{progress.index === 3}}">
|
|
<configureDevice4 bind:deviceEvent="setConfigSuccessful"></configureDevice4>
|
|
</block>
|
|
</view>
|
|
</view> |