From 855068a3f901aea7b31f2d409479801dd5aa6826 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Thu, 5 Sep 2024 17:52:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A0=E7=BD=91=E7=BB=9C?=
 =?UTF-8?q?=E6=97=B6=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/home.vue             |  2 +-
 pages/lockDetail/lockDetail.vue | 12 +++++++++++-
 stores/basic.js                 | 17 +++++++++++++++++
 utils/request.js                |  4 ++--
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index e8d25cb..426f241 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -207,7 +207,7 @@
                       icon: 'none'
                     })
                   }
-                } else if(code === -1) {
+                } else if(resetDeviceCode === -1) {
                   uni.hideLoading()
                   uni.showToast({
                     title: '删除失败，请保持在锁附近',
diff --git a/pages/lockDetail/lockDetail.vue b/pages/lockDetail/lockDetail.vue
index df39cc7..c8b24a7 100644
--- a/pages/lockDetail/lockDetail.vue
+++ b/pages/lockDetail/lockDetail.vue
@@ -101,7 +101,7 @@ export default {
     timeFormat,
     ...mapActions(useLockStore, ['getRole', 'updateLockSearch', 'getLockList', 'getPowerIcon']),
     ...mapActions(useBluetoothStore, ['openDoor', 'updateServerTimestamp', 'closeBluetoothConnection']),
-    ...mapActions(useBasicStore, ['routeJump', 'backAndToast']),
+    ...mapActions(useBasicStore, ['routeJump', 'backAndToast', 'getNetworkType']),
     closePopup() {
       this.show = false
     },
@@ -140,6 +140,16 @@ export default {
       if(this.pending) {
         return
       }
+      if(this.currentLockInfo.lockSetting.appUnlockOnline) {
+        const netWork = await this.getNetworkType()
+        if(!netWork) {
+          uni.showToast({
+            title: '网络访问失败，请检查网络是否正常',
+            icon: 'none'
+          })
+          return
+        }
+      }
       uni.vibrateLong()
       this.pending = true
       this.$refs.loading.open()
diff --git a/stores/basic.js b/stores/basic.js
index 628309e..09e440a 100644
--- a/stores/basic.js
+++ b/stores/basic.js
@@ -134,6 +134,23 @@ export const useBasicStore = defineStore('basic', {
         })
       }
     },
+    // 获取当前网络状态
+    getNetworkType() {
+      return new Promise((resolve) => {
+        uni.getNetworkType({
+          success: function (res) {
+            if(res.networkType === 'none') {
+              resolve(false)
+              return
+            }
+            resolve(true)
+          },
+          fail: function () {
+            resolve(false)
+          }
+        })
+      })
+    },
     // 获取设备信息
     getDeviceInfo() {
       const that = this
diff --git a/utils/request.js b/utils/request.js
index eec9fee..2e3539a 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -58,11 +58,11 @@ const request = (config) => {
             })
           }
         } else {
-          resolve({ code: -1, data, message: '网络不太好哦，请稍后再试' })
+          resolve({ code: -1, data, message: '网络访问失败，请检查网络是否正常' })
         }
       },
       async fail() {
-        resolve({ code: -1, data, message: '网络不太好哦，请稍后再试' })
+        resolve({ code: -1, data, message: '网络访问失败，请检查网络是否正常' })
       },
       async complete(res) {
         console.log(URL.substring(baseConfig.baseUrl.length + 1), {