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 = [] } }