Commit 422092f9737e675187e4cc57ba62c1db0fe9c6ea
Merge branch 'f_local_dev' into 'main'
pref：优化设备基础信息，定位图标样式 See merge request huang/thingskit-app!77
Showing
1 changed file
with
1 additions
and
1 deletions
| ... | ... | @@ -4,6 +4,7 @@ |
| 4 | 4 | <public-module /> |
| 5 | 5 | <view class="basic-title"> |
| 6 | 6 | <view class="u-flex"> |
| 7 | + <view style="padding-left: 32rpx;"><u-icon v-if="deviceDetail.deviceInfo.longitude !== ''" @click="handleClick" name="map-fill"></u-icon></view> | |
| 7 | 8 | <view style="margin-left: 20rpx;">{{ deviceDetail.name }}</view> |
| 8 | 9 | <view |
| 9 | 10 | style="margin-left: 20rpx; font-size: 14px;" |
| ... | ... | @@ -12,7 +13,6 @@ |
| 12 | 13 | {{ deviceDetail.deviceState === 'INACTIVE' ? '待激活' : deviceDetail.deviceState === 'ONLINE' ? '在线' : '离线' }} |
| 13 | 14 | </view> |
| 14 | 15 | </view> |
| 15 | - <view style="margin-right: 20rpx;"><u-icon v-if="deviceDetail.deviceInfo.longitude !== ''" @click="handleClick" name="map-fill"></u-icon></view> | |
| 16 | 16 | <view style="margin-right: 20rpx;" v-if="deviceDetail.deviceState === 'ONLINE' && deviceDetail.deviceType !== 'SENSOR'"> |
| 17 | 17 | <u-button type="primary" shape="circle" size="mini" text="下发命令" @click="showModal" /> |
| 18 | 18 | </view> | ... | ... |