From 19a4631df3d79915d540c6a2302b4d754409e49b Mon Sep 17 00:00:00 2001
From: zhangyibo95 <690096405@qq.com>
Date: Wed, 23 Sep 2026 14:16:00 +0800
Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ScreenHint.vue  |   8 ++++++--
 src/pages/device/my-device.vue |  10 +++++++++-
 src/pages/index.vue            |  25 ++++++++++++++++++++++++-
 src/static/device-charging.png | Bin 0 -> 411 bytes
 4 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 src/static/device-charging.png

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);
 }
 </style>
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 () => {
       </view>
     </ModalDialog>
 
-    <ScreenHint :show="confirmBindTip" :onClose="closeConfirmBindTip">
+    <ScreenHint
+      :show="confirmBindTip"
+      :onClose="closeConfirmBindTip"
+      contentHeight="360rpx"
+    >
       <view class="confirm-bind">
         <text>智能弓箭和系统账号需一一对应，你确定要将当前登录用户账号绑定这把弓箭吗？绑定后不可随意更换。</text>
         <view class="confirm-actions">
@@ -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(() => {
               <view
                   v-if="user.id && deviceCardState === 'online'"
                   class="device-status-badge device-status-badge--online"
+                  :class="{ 'device-status-badge--charging': isDeviceCharging }"
                   @click.stop="$clickSound(() => toPage('/pages/device/my-device'))"
               >
                     <image
@@ -541,6 +547,12 @@ onShareTimeline(() => {
                   />
                   <text class="device-battery-text">{{ deviceBattery === null ? "--" : deviceBattery }}</text>
                 </view>
+                <image
+                    v-if="isDeviceCharging"
+                    class="device-charging-icon"
+                    src="/static/device-charging.png"
+                    mode="aspectFit"
+                />
                 <image
                     class="device-status-icon device-status-icon--online"
                     src="https://static.shelingxingqiu.com/shootmini/static/home-device/device-state-dot--online.png"
@@ -806,6 +818,10 @@ onShareTimeline(() => {
   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 0000000000000000000000000000000000000000..791b7d93f8bb30912ae4a909058d7ba705a89aee
GIT binary patch
literal 411
zcmV;M0c8G(P)<h;3K|Lk000e1NJLTq000*N0015c1^@s6$0dbm0004ENkl<ZNQu?e
zze^lJ6ae6FjoR3#AXr(5y@i#K!Vs{sv9u6D{{SsSK@d{}f?D|pq=<-EigqH{h@FMK
zAc%#exTMfVE?(HM!m_M)Gq<MjHTz@Ue*2i6H|u{!@?tj{_o1)Z#u65=Tb7U{ga3{l
zk%doV8J+mlDmexp!uNcEZ-u9o9-uFxm|*-X#$(`6d=e|Ma0s4$_Pvn#jm0}Mc%U7)
z6~2bg?ZVCQkN8prmMyVj^k>WNLyKqACYr$S!u@MJC~5!n`Uq1M3cg8_!C@uSvRDyL
zqyBP|$H%Z)5q`o<8NQG1iufun%kZv>@G*AsH}W5}2P1`U?8T34M{E{%7)4EPKhH14
zM_iQvXP9dO|H<aLRvd`^S(L>F&dUa>;-~ob+F%v@CuZ^d)_5a>oBq|?#nWaxX_eFt
zeu4Fn#8~`Sw(RNwxzYGMZbOqp@U)52O1E$rS<HJ3`~@6fH(atIRHXm_002ovPDHLk
FV1no`#7_VK

literal 0
HcmV?d00001