diff --git a/src/components/ScreenHint.vue b/src/components/ScreenHint.vue index c3d3988..598837d 100644 --- a/src/components/ScreenHint.vue +++ b/src/components/ScreenHint.vue @@ -14,8 +14,13 @@ const props = defineProps({ type: String, default: "normal", }, + contentHeight: { + type: String, + default: "", + }, }); const getContentHeight = () => { + if (props.contentHeight) return props.contentHeight; if (props.mode === "tall") return "50vw"; if (props.mode === "square") return "74vw"; return "36vw"; @@ -82,8 +87,7 @@ const getContentHeight = () => { position: absolute; width: 80vw; left: -7%; - bottom: -18vw; + bottom: -8rpx; z-index: -1; - transform: translateY(-75px); } diff --git a/src/pages/device/my-device.vue b/src/pages/device/my-device.vue index fec6024..596acd0 100644 --- a/src/pages/device/my-device.vue +++ b/src/pages/device/my-device.vue @@ -655,7 +655,11 @@ onShow(async () => { - + 智能弓箭和系统账号需一一对应,你确定要将当前登录用户账号绑定这把弓箭吗?绑定后不可随意更换。 @@ -1319,6 +1323,10 @@ onShow(async () => { } .confirm-bind { + width: 100%; + box-sizing: border-box; + padding-top: 100rpx; + transform: translateY(24rpx); color: rgba(255, 255, 255, 0.7); font-size: 26rpx; line-height: 42rpx; diff --git a/src/pages/index.vue b/src/pages/index.vue index 5506d35..244ef62 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -69,6 +69,11 @@ const deviceCardAssets = { const deviceCardAsset = computed(() => deviceCardAssets[deviceCardState.value]); +// 二代设备支持充电时保持开机,仅在设备在线且状态明确为充电中时展示充电标识。 +const isDeviceCharging = computed( + () => deviceCardState.value === "online" && deviceStatus.value?.charging === true +); + // OTA 相关 const otaVisible = ref(false); const wifiRequiredVisible = ref(false); @@ -525,6 +530,7 @@ onShareTimeline(() => { { /> {{ deviceBattery === null ? "--" : deviceBattery }} + { margin-left: 12rpx; } +.device-status-badge--charging .device-status-icon--online { + margin-left: 8rpx; +} + .device-status-icon { width: 36rpx; height: 36rpx; @@ -837,11 +853,18 @@ onShareTimeline(() => { height: 36rpx; } +.device-charging-icon { + flex-shrink: 0; + width: 15rpx; + height: 20rpx; + margin-left: 4rpx; +} + /* 文字容器只覆盖电池主体(60rpx),避开右侧凸起,使数字在框内水平垂直居中。 */ .device-battery-text { position: absolute; top: 9rpx; - left: 0x; + left: 0; display: flex; align-items: center; justify-content: center; diff --git a/src/static/device-charging.png b/src/static/device-charging.png new file mode 100644 index 0000000..791b7d9 Binary files /dev/null and b/src/static/device-charging.png differ