From d3a848d75a893d40907e18a0f55f00f3413b283f Mon Sep 17 00:00:00 2001
From: fanpeng <438123081@qq.com>
Date: Tue, 8 Jul 2025 16:19:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E9=94=81=E6=95=B0=E6=8D=AE=E9=80=BB=E8=BE=91=EF=BC=8C=E7=A1=AE?=
 =?UTF-8?q?=E4=BF=9D=E4=B8=8A=E4=BC=A0=E5=A4=B1=E8=B4=A5=E6=97=B6=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=BF=9B=E5=BA=A6=E5=92=8C=E5=88=97=E8=A1=A8=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/setting/uploadLockData.vue | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pages/setting/uploadLockData.vue b/pages/setting/uploadLockData.vue
index 7c9b42e..bd2b7b8 100644
--- a/pages/setting/uploadLockData.vue
+++ b/pages/setting/uploadLockData.vue
@@ -58,13 +58,12 @@
           uploadType: 1,
           records: data.list
         })
-
-        pending.value = false
         $bluetooth.closeBluetoothConnection()
         if (resultCode === 0) {
           const { code, data } = await getLockSettingRequest({
             lockId: $bluetooth.currentLockInfo.lockId
           })
+          pending.value = false
           if (code === 0) {
             if (data.lockSettingInfo.catEyeConfig[0]) {
               data.lockSettingInfo.catEyeConfig[0].catEyeModeConfig.recordTime = Number(
@@ -82,12 +81,16 @@
             icon: 'none'
           })
         } else {
+          pending.value = false
           uni.hideLoading()
           uni.showToast({
             title: '上传失败，请重试',
             icon: 'none'
           })
         }
+        progress.value = 0
+        page.value = 0
+        list.value = []
         return
       }
       list.value = list.value.concat(data.list)
@@ -114,6 +117,9 @@
             title: '上传失败，请重试',
             icon: 'none'
           })
+          progress.value = 0
+          page.value = 0
+          list.value = []
           return
         }
         page.value = 0
@@ -125,6 +131,9 @@
       pending.value = false
       $bluetooth.closeBluetoothConnection()
       uni.hideLoading()
+      progress.value = 0
+      page.value = 0
+      list.value = []
     } else {
       pending.value = false
       $bluetooth.closeBluetoothConnection()
@@ -133,6 +142,9 @@
         title: '上传失败，请保持在锁附近',
         icon: 'none'
       })
+      progress.value = 0
+      page.value = 0
+      list.value = []
     }
   }
 </script>