From 2e23eaadd70548e583e9d4cc22651d4376908fd0 Mon Sep 17 00:00:00 2001
From: fanpeng <438123081@qq.com>
Date: Tue, 8 Jul 2025 10:24:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dpicker=E7=9A=84UI=20bu?=
 =?UTF-8?q?g=20=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/setting/autoLock.vue       |  1 -
 pages/setting/customCatEye.vue   |  2 --
 pages/setting/faceSetting.vue    |  2 --
 pages/setting/notOpenDoor.vue    |  1 -
 pages/setting/uploadLockData.vue | 11 +++++++++--
 pages/setting/videoSlot.vue      |  2 --
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pages/setting/autoLock.vue b/pages/setting/autoLock.vue
index e3f958c..936354c 100644
--- a/pages/setting/autoLock.vue
+++ b/pages/setting/autoLock.vue
@@ -51,7 +51,6 @@
       :defaultIndex="picker"
       title="选择时间"
       keyName="name"
-      :itemHeight="70"
       :visibleItemCount="5"
       @close="show = false"
       @cancel="show = false"
diff --git a/pages/setting/customCatEye.vue b/pages/setting/customCatEye.vue
index e90cc89..550581e 100644
--- a/pages/setting/customCatEye.vue
+++ b/pages/setting/customCatEye.vue
@@ -68,7 +68,6 @@
       :show="showRecordingTime"
       :columns="recordingTimeList"
       keyName="name"
-      :itemHeight="70"
       title="有人出现时录像"
       :visibleItemCount="5"
       :defaultIndex="[recordingTimeIndex]"
@@ -80,7 +79,6 @@
       :show="showDetectionDistance"
       :columns="detectionDistanceList"
       title="人体侦测距离"
-      :itemHeight="70"
       :visibleItemCount="5"
       keyName="name"
       :defaultIndex="[detectionDistanceIndex]"
diff --git a/pages/setting/faceSetting.vue b/pages/setting/faceSetting.vue
index e404eb4..c5bde89 100644
--- a/pages/setting/faceSetting.vue
+++ b/pages/setting/faceSetting.vue
@@ -61,7 +61,6 @@
       :defaultIndex="[distanceIndex]"
       title="感应距离"
       keyName="name"
-      :itemHeight="70"
       :visibleItemCount="5"
       @close="showDistance = false"
       @cancel="showDistance = false"
@@ -73,7 +72,6 @@
       :defaultIndex="[enErrUnlock]"
       title="防误开"
       keyName="name"
-      :itemHeight="70"
       :visibleItemCount="5"
       @close="showEnErrUnlock = false"
       @cancel="showEnErrUnlock = false"
diff --git a/pages/setting/notOpenDoor.vue b/pages/setting/notOpenDoor.vue
index c0c9dee..235ac35 100644
--- a/pages/setting/notOpenDoor.vue
+++ b/pages/setting/notOpenDoor.vue
@@ -61,7 +61,6 @@
     <up-picker
       :show="show"
       :columns="columns"
-      :itemHeight="70"
       :visibleItemCount="5"
       :defaultIndex="[value - 1]"
       @close="show = false"
diff --git a/pages/setting/uploadLockData.vue b/pages/setting/uploadLockData.vue
index 15506db..7c9b42e 100644
--- a/pages/setting/uploadLockData.vue
+++ b/pages/setting/uploadLockData.vue
@@ -51,7 +51,6 @@
       uid: $user.userInfo.uid.toString(),
       countReq: 10
     })
-    console.log('code value :', code)
     if (code === 0) {
       if (typeList[progress.value] === 'setting') {
         const { code: resultCode } = await lockDataUploadRequest({
@@ -59,7 +58,7 @@
           uploadType: 1,
           records: data.list
         })
-        uni.hideLoading()
+
         pending.value = false
         $bluetooth.closeBluetoothConnection()
         if (resultCode === 0) {
@@ -77,11 +76,13 @@
             }
             $bluetooth.updateCurrentLockSetting(data)
           }
+          uni.hideLoading()
           uni.showToast({
             title: '上传成功',
             icon: 'none'
           })
         } else {
+          uni.hideLoading()
           uni.showToast({
             title: '上传失败，请重试',
             icon: 'none'
@@ -90,6 +91,12 @@
         return
       }
       list.value = list.value.concat(data.list)
+      if (list.value.length === 0) {
+        page.value = 0
+        list.value = []
+        progress.value++
+        return await asyncData(true)
+      }
       if (data.size === 10) {
         page.value++
       } else {
diff --git a/pages/setting/videoSlot.vue b/pages/setting/videoSlot.vue
index 23025aa..c82abc8 100644
--- a/pages/setting/videoSlot.vue
+++ b/pages/setting/videoSlot.vue
@@ -58,7 +58,6 @@
       title="开始时间"
       mode="time"
       :defaultIndex="startIndex"
-      :itemHeight="70"
       :visibleItemCount="5"
       @close="showStartTime = false"
       @cancel="showStartTime = false"
@@ -70,7 +69,6 @@
       title="结束时间"
       mode="time"
       :defaultIndex="endIndex"
-      :itemHeight="70"
       :visibleItemCount="5"
       @close="showEndTime = false"
       @cancel="showEndTime = false"