diff --git a/miniprogram/components/equipmentDialog/equipmentDialog.less b/miniprogram/components/equipmentDialog/equipmentDialog.less index aae644b..4691572 100644 --- a/miniprogram/components/equipmentDialog/equipmentDialog.less +++ b/miniprogram/components/equipmentDialog/equipmentDialog.less @@ -21,7 +21,16 @@ display: flex; flex-direction: column; align-items: center; - padding: 100rpx 40rpx; + padding: 64rpx 40rpx 56rpx; + + .equipment-spinner { + width: 96rpx; + height: 96rpx; + border: 8rpx solid rgba(19, 133, 250, 0.2); + border-top-color: #1385FA; + border-radius: 50%; + animation: equipment-spin 1s linear infinite; + } .equipment-title { color: #252535; @@ -29,6 +38,7 @@ font-size: 32rpx; line-height: 32rpx; text-align: center; + margin-top: 40rpx; } .equipment-content { @@ -40,3 +50,13 @@ white-space: pre-line; } } + +@keyframes equipment-spin { + from { + transform: rotate(0deg); + } + + to { + transform: rotate(360deg); + } +} diff --git a/miniprogram/components/equipmentDialog/equipmentDialog.wxml b/miniprogram/components/equipmentDialog/equipmentDialog.wxml index 7362989..92f65ce 100644 --- a/miniprogram/components/equipmentDialog/equipmentDialog.wxml +++ b/miniprogram/components/equipmentDialog/equipmentDialog.wxml @@ -1,6 +1,7 @@ + {{ title }} {{ content }} diff --git a/miniprogram/pages/equipment/equipment.ts b/miniprogram/pages/equipment/equipment.ts index a8a939d..be822ce 100644 --- a/miniprogram/pages/equipment/equipment.ts +++ b/miniprogram/pages/equipment/equipment.ts @@ -20,8 +20,8 @@ Page({ } ], loadingShow: true, - loadingTitle: '', - loadingContent: '' + loadingTitle: '正在连接设备', + loadingContent: '请确保设备处于开启状态\n请勿离开...' }, /** 取消配对:使用小程序自带 showModal */