From 2a24dc0d4d526a175cf2e24f2a0295996db118b9 Mon Sep 17 00:00:00 2001
From: 17792275749 <812100002@qq.com>
Date: Thu, 16 Apr 2026 11:21:33 +0800
Subject: [PATCH] =?UTF-8?q?[AI=20Generated]:=20fix(Comp):=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9EcodeClearDeviceData=2015=E7=A7=92=E8=B6=85=E6=97=B6?=
 =?UTF-8?q?=E4=BF=9D=E6=8A=A4=E9=98=B2=E6=AD=A2loading=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/configureDevice_2/configureDevice_2.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/components/configureDevice_2/configureDevice_2.js b/components/configureDevice_2/configureDevice_2.js
index dea5b08..d2dacf7 100644
--- a/components/configureDevice_2/configureDevice_2.js
+++ b/components/configureDevice_2/configureDevice_2.js
@@ -207,8 +207,14 @@ Component({
 
             wx.showLoading({ title: "正在同步用户数据...", mask: true });
 
-            // 第一步：清除秤上所有用户信息
+            // 第一步：清除秤上所有用户信息（15秒超时保护）
+            let clearTimer = setTimeout(() => {
+                wx.hideLoading();
+                wx.showToast({ title: "清除设备数据超时，请重试", icon: "none" });
+            }, 15000);
+
             app.globalData.ppScale.activeProtocol.codeClearDeviceData("01", (clearRes) => {
+                clearTimeout(clearTimer);
                 console.log("codeClearDeviceData res", clearRes);
                 if (clearRes !== 0x00) {
                     wx.hideLoading();