From 2a55f76d6aa5951c1b4f47f3eff5294f704ad514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Fri, 30 Aug 2024 10:48:30 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E6=B7=BB=E5=8A=A0=E8=AF=B4=E6=98=8E?=
 =?UTF-8?q?=E6=80=A7=E6=96=87=E6=A1=88=202.=20=E4=BF=AE=E5=A4=8D=E5=BC=80?=
 =?UTF-8?q?=E5=85=B3=E9=97=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/home.vue               | 10 +++++++++-
 pages/mine/mine.vue               | 10 +++++++++-
 pages/verifyEmail/verifyEmail.vue |  7 +++++++
 stores/bluetooth.js               | 22 ++++------------------
 4 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index f086431..85217a7 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -50,6 +50,7 @@
                class="button-add" @click="toSearchDevice"></image>
       </view>
       <view v-else>
+        <view class="tips">因智能门锁与账号绑定，登录为手机号登录</view>
         <label for="phone">
           <view class="button-login">登录</view>
         </label>
@@ -263,7 +264,6 @@ page {
 }
 
 .button-login {
-  margin-top: 40vh;
   border-radius: 46rpx;
   width: 650rpx;
   height: 120rpx;
@@ -388,4 +388,12 @@ page {
   margin-top: 32rpx;
   font-weight: bold;
 }
+
+.tips {
+  margin-top: 40vh;
+  padding: 32rpx 0;
+  text-align: center;
+  font-size: 28rpx;
+  color: #999999;
+}
 </style>
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index a1fbc73..0a09a9d 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -37,6 +37,7 @@
       <view class="button-logout" @click="logout">退出</view>
     </view>
     <view v-else>
+      <view class="tips">因智能门锁与账号绑定，登录为手机号登录</view>
       <label for="phone">
         <view class="button-login">登录</view>
       </label>
@@ -232,7 +233,6 @@ page {
 }
 
 .button-login {
-  margin-top: 40vh;
   border-radius: 46rpx;
   width: 650rpx;
   height: 120rpx;
@@ -244,4 +244,12 @@ page {
   font-size: 48rpx;
   font-weight: bold;
 }
+
+.tips {
+  margin-top: 35vh;
+  padding: 32rpx 0;
+  text-align: center;
+  font-size: 28rpx;
+  color: #999999;
+}
 </style>
diff --git a/pages/verifyEmail/verifyEmail.vue b/pages/verifyEmail/verifyEmail.vue
index 4a86fb4..a0740ef 100644
--- a/pages/verifyEmail/verifyEmail.vue
+++ b/pages/verifyEmail/verifyEmail.vue
@@ -1,5 +1,6 @@
 <template>
   <view>
+    <view class="tips">为了你的账号安全，修改账号前请先使用验证码验证</view>
     <view class="view-top">
       <input type="number" class="input" :value="verificationCode" maxlength="20" placeholder="请输入验证码"
              placeholder-class="input-placeholder" @input="updateInput"></input>
@@ -99,6 +100,12 @@ page {
 </style>
 
 <style scoped lang="scss">
+.tips {
+  padding: 24rpx 32rpx 0 32rpx;
+  font-size: 28rpx;
+  color: #999999;
+}
+
 .button-verify {
   margin-top: 48rpx;
   height: 108rpx;
diff --git a/stores/bluetooth.js b/stores/bluetooth.js
index e257ad1..168dd09 100644
--- a/stores/bluetooth.js
+++ b/stores/bluetooth.js
@@ -644,37 +644,24 @@ export const useBluetoothStore = defineStore('ble', {
       const that = this
       let timer1
       let timer2
-      const flag = true
       return new Promise((resolve) => {
         uni.startBluetoothDevicesDiscovery({
           success: function (res) {
             timer2 = setTimeout(() => {
-              setTimeout(() => {
-                if(flag) {
-                  uni.showModal({
-                    title: '提示',
-                    content: '长时间未搜索到任何设备，请确认微信的附近设备权限开启后再试',
-                    showCancel: false,
-                    confirmText: '确定',
-                  })
-                }
                 uni.stopBluetoothDevicesDiscovery()
                 clearInterval(timer1)
-              }, 10000)
-              timer1 = setInterval(() => {
+              }, 10500)
+            timer1 = setInterval(() => {
                 uni.getBluetoothDevices({
                   success(res) {
                     const deviceList = res.devices
-                    if(deviceList.length !== 0) {
-                      flag = false
-                    }
                     for(let i = 0; i < deviceList.length; i++) {
                       if(deviceList[i]?.name === that.currentLockInfo.name) {
                         const uuid = deviceList[i]?.advertisServiceUUIDs[0]
                         if(uuid && uuid.slice(2,8)==='758824' && uuid.slice(30,32)==='01') {
-                          clearInterval(timer1)
-                          clearInterval(timer2)
                           uni.stopBluetoothDevicesDiscovery()
+                          clearTimeout(timer2)
+                          clearInterval(timer1)
                           resolve(deviceList[i].deviceId)
                           break
                         }
@@ -690,7 +677,6 @@ export const useBluetoothStore = defineStore('ble', {
                   }
                 })
               }, 1000)
-            }, 300)
           },
           fail: async function (res) {
             console.log('开始搜索失败', res)