From c8959124321f87a3ba949d3a97d65aed20403229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Fri, 21 Feb 2025 14:01:36 +0800
Subject: [PATCH] =?UTF-8?q?1.=20bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/bindCard/bindCard.vue                   |  2 +-
 pages/bindPalmVein/bindPalmVein.vue           |  2 +-
 pages/cardDetail/cardDetail.vue               |  4 ++++
 pages/createAdmin/createAdmin.vue             |  8 +++-----
 pages/createCard/createCard.vue               |  6 +++---
 pages/createFace/createFace.vue               |  6 +++---
 pages/createFingerprint/createFingerprint.vue |  6 +++---
 pages/createPalmVein/createPalmVein.vue       |  6 +++---
 pages/createPassword/createPassword.vue       |  2 +-
 pages/fingerprintDetail/fingerprintDetail.vue |  4 ++++
 pages/home/home.vue                           |  7 +++++++
 pages/lockDetail/lockDetail.vue               |  6 +++---
 pages/palmVeinDetail/palmVeinDetail.vue       |  4 ++++
 pages/recordList/recordList.vue               | 17 ++++++++++++++---
 14 files changed, 54 insertions(+), 26 deletions(-)

diff --git a/pages/bindCard/bindCard.vue b/pages/bindCard/bindCard.vue
index cace36a..13ee45b 100644
--- a/pages/bindCard/bindCard.vue
+++ b/pages/bindCard/bindCard.vue
@@ -67,7 +67,7 @@
           })
           if (code === 0) {
             eventChannel.emit('refresherList', {})
-            $basic.backAndToast('绑卡成功', 2)
+            $basic.backAndToast('添加成功', 2)
           } else {
             $basic.backAndToast(message)
           }
diff --git a/pages/bindPalmVein/bindPalmVein.vue b/pages/bindPalmVein/bindPalmVein.vue
index d272254..0fe8f95 100644
--- a/pages/bindPalmVein/bindPalmVein.vue
+++ b/pages/bindPalmVein/bindPalmVein.vue
@@ -64,7 +64,7 @@
           })
           if (code === 0) {
             eventChannel.emit('refresherList', {})
-            $basic.backAndToast('绑卡成功', 2)
+            $basic.backAndToast('添加成功', 2)
           } else {
             $basic.backAndToast(message)
           }
diff --git a/pages/cardDetail/cardDetail.vue b/pages/cardDetail/cardDetail.vue
index e45fe34..e85af47 100644
--- a/pages/cardDetail/cardDetail.vue
+++ b/pages/cardDetail/cardDetail.vue
@@ -192,6 +192,10 @@
   }
 
   const changeCoerced = async () => {
+    const netWork = await $basic.getNetworkType()
+    if (!netWork) {
+      return
+    }
     if (pending.value) return
     pending.value = true
     uni.showLoading({
diff --git a/pages/createAdmin/createAdmin.vue b/pages/createAdmin/createAdmin.vue
index ba08013..4dce58a 100644
--- a/pages/createAdmin/createAdmin.vue
+++ b/pages/createAdmin/createAdmin.vue
@@ -50,13 +50,13 @@
           :value="temporaryAccount"
           title="接收者"
           placeholder="请输入手机号或者邮箱"
-          @change-input="changeAccount('permanent', $event)"
+          @change-input="changeAccount('temporary', $event)"
         ></LockInput>
         <LockInput
           :value="temporaryName"
           title="姓名"
           placeholder="请输入"
-          @change-input="changeName('permanent', $event)"
+          @change-input="changeName('temporary', $event)"
         ></LockInput>
         <view class="mt-3">
           <LockDatetimePicker
@@ -64,7 +64,6 @@
             :value="temporaryStartTime"
             :minDate="minDate"
             :maxDate="maxDate"
-            type="datehour"
             @change-time="changeDate('temporaryStartTime', $event)"
           ></LockDatetimePicker>
         </view>
@@ -74,7 +73,6 @@
             :value="temporaryEndTime"
             :minDate="minDate"
             :maxDate="maxDate"
-            type="datehour"
             @change-time="changeDate('temporaryEndTime', $event)"
           ></LockDatetimePicker>
         </view>
@@ -83,7 +81,7 @@
             :value="temporaryManageSelf"
             title="仅管理自己创建的用户"
             :tip="tip"
-            @change="changeAdmin('permanent', $event)"
+            @change="changeAdmin('temporary', $event)"
           ></LockSwitch>
         </view>
         <view class="button mt-5" @click="create('temporary')">发送</view>
diff --git a/pages/createCard/createCard.vue b/pages/createCard/createCard.vue
index 8bef323..043c19c 100644
--- a/pages/createCard/createCard.vue
+++ b/pages/createCard/createCard.vue
@@ -29,7 +29,7 @@
           placeholder="请输入"
           @change-input="changeName('permanent', $event)"
         ></LockInput>
-        <view class="mt-3">
+        <view class="mt-3" v-if="$bluetooth.currentLockInfo.userType === 110301">
           <LockSwitch
             :value="permanentAdmin"
             title="是否为管理员"
@@ -71,7 +71,7 @@
             @change-time="changeDate('temporaryEndTime', $event)"
           ></LockDatetimePicker>
         </view>
-        <view class="mt-3">
+        <view class="mt-3" v-if="$bluetooth.currentLockInfo.userType === 110301">
           <LockSwitch
             :value="temporaryAdmin"
             title="是否为管理员"
@@ -98,7 +98,7 @@
         <view class="mt-3">
           <LockCycle @change="changeCycle"></LockCycle>
         </view>
-        <view class="mt-3">
+        <view class="mt-3" v-if="$bluetooth.currentLockInfo.userType === 110301">
           <LockSwitch
             :value="cycleAdmin"
             title="是否为管理员"
diff --git a/pages/createFace/createFace.vue b/pages/createFace/createFace.vue
index 91b57b5..cdb902e 100644
--- a/pages/createFace/createFace.vue
+++ b/pages/createFace/createFace.vue
@@ -29,7 +29,7 @@
           placeholder="请输入"
           @change-input="changeName('permanent', $event)"
         ></LockInput>
-        <view class="mt-3">
+        <view class="mt-3" v-if="$bluetooth.currentLockInfo.userType === 110301">
           <LockSwitch
             :value="permanentAdmin"
             title="是否为管理员"
@@ -63,7 +63,7 @@
             @change-time="changeDate('temporaryEndTime', $event)"
           ></LockDatetimePicker>
         </view>
-        <view class="mt-3">
+        <view class="mt-3" v-if="$bluetooth.currentLockInfo.userType === 110301">
           <LockSwitch
             :value="temporaryAdmin"
             title="是否为管理员"
@@ -83,7 +83,7 @@
         <view class="mt-3">
           <LockCycle @change="changeCycle"></LockCycle>
         </view>
-        <view class="mt-3">
+        <view class="mt-3" v-if="$bluetooth.currentLockInfo.userType === 110301">
           <LockSwitch
             :value="cycleAdmin"
             title="是否为管理员"
diff --git a/pages/createFingerprint/createFingerprint.vue b/pages/createFingerprint/createFingerprint.vue
index d96abe0..bf771dc 100644
--- a/pages/createFingerprint/createFingerprint.vue
+++ b/pages/createFingerprint/createFingerprint.vue
@@ -29,7 +29,7 @@
           placeholder="请输入"
           @change-input="changeName('permanent', $event)"
         ></LockInput>
-        <view class="mt-3">
+        <view class="mt-3" v-if="$bluetooth.currentLockInfo.userType === 110301">
           <LockSwitch
             :value="permanentAdmin"
             title="是否为管理员"
@@ -71,7 +71,7 @@
             @change-time="changeDate('temporaryEndTime', $event)"
           ></LockDatetimePicker>
         </view>
-        <view class="mt-3">
+        <view class="mt-3" v-if="$bluetooth.currentLockInfo.userType === 110301">
           <LockSwitch
             :value="temporaryAdmin"
             title="是否为管理员"
@@ -98,7 +98,7 @@
         <view class="mt-3">
           <LockCycle @change="changeCycle"></LockCycle>
         </view>
-        <view class="mt-3">
+        <view class="mt-3" v-if="$bluetooth.currentLockInfo.userType === 110301">
           <LockSwitch
             :value="cycleAdmin"
             title="是否为管理员"
diff --git a/pages/createPalmVein/createPalmVein.vue b/pages/createPalmVein/createPalmVein.vue
index 8358dc5..134e4be 100644
--- a/pages/createPalmVein/createPalmVein.vue
+++ b/pages/createPalmVein/createPalmVein.vue
@@ -29,7 +29,7 @@
           placeholder="请输入"
           @change-input="changeName('permanent', $event)"
         ></LockInput>
-        <view class="mt-3">
+        <view class="mt-3" v-if="$bluetooth.currentLockInfo.userType === 110301">
           <LockSwitch
             :value="permanentAdmin"
             title="是否为管理员"
@@ -71,7 +71,7 @@
             @change-time="changeDate('temporaryEndTime', $event)"
           ></LockDatetimePicker>
         </view>
-        <view class="mt-3">
+        <view class="mt-3" v-if="$bluetooth.currentLockInfo.userType === 110301">
           <LockSwitch
             :value="temporaryAdmin"
             title="是否为管理员"
@@ -99,7 +99,7 @@
         <view class="mt-3">
           <LockCycle @change="changeCycle"></LockCycle>
         </view>
-        <view class="mt-3">
+        <view class="mt-3" v-if="$bluetooth.currentLockInfo.userType === 110301">
           <LockSwitch
             :value="cycleAdmin"
             title="是否为管理员"
diff --git a/pages/createPassword/createPassword.vue b/pages/createPassword/createPassword.vue
index 121dceb..77be4d1 100644
--- a/pages/createPassword/createPassword.vue
+++ b/pages/createPassword/createPassword.vue
@@ -98,7 +98,7 @@
             @change-time="changeDate('customEndTime', $event)"
           ></LockDatetimePicker>
         </view>
-        <view class="mt-3">
+        <view class="mt-3" v-if="$bluetooth.currentLockInfo.userType === 110301">
           <LockSwitch
             :value="customAdmin"
             title="是否为管理员"
diff --git a/pages/fingerprintDetail/fingerprintDetail.vue b/pages/fingerprintDetail/fingerprintDetail.vue
index dd98602..3ea94ef 100644
--- a/pages/fingerprintDetail/fingerprintDetail.vue
+++ b/pages/fingerprintDetail/fingerprintDetail.vue
@@ -134,6 +134,10 @@
   }
 
   const changeCoerced = async () => {
+    const netWork = await $basic.getNetworkType()
+    if (!netWork) {
+      return
+    }
     if (pending.value) return
     pending.value = true
     uni.showLoading({
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 5135757..6e35b2c 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -518,6 +518,13 @@
           this.getBluetoothStatus()
           return
         }
+        if (lock.keyStatus === 110403) {
+          uni.showToast({
+            title: '您的钥匙未生效',
+            icon: 'none'
+          })
+          return
+        }
         if (lock.keyStatus === 110412) {
           uni.showToast({
             title: '钥匙已过期',
diff --git a/pages/lockDetail/lockDetail.vue b/pages/lockDetail/lockDetail.vue
index 8d0db96..9a9b145 100644
--- a/pages/lockDetail/lockDetail.vue
+++ b/pages/lockDetail/lockDetail.vue
@@ -46,7 +46,7 @@
         </view>
       </view>
     </view>
-    <view class="menu" v-if="currentLockInfo.keyRight === 1">
+    <view class="menu">
       <view class="menu-title">
         <image class="menu-image" src="/static/images/icon_menu.png"></image>
         <view>功能</view>
@@ -250,7 +250,7 @@
         if (this.pending) {
           return
         }
-        if (this.currentLockInfo.lockSetting.appUnlockOnline) {
+        if (this.currentLockInfo.lockSetting.appUnlockOnline && type !== 'close') {
           const netWork = await this.getNetworkType()
           if (!netWork) {
             return
@@ -265,7 +265,7 @@
             icon: 'none'
           })
         }
-        if (this.currentLockInfo.lockSetting.appUnlockOnline) {
+        if (this.currentLockInfo.lockSetting.appUnlockOnline && type !== 'close') {
           const result = await this.getNetToken()
           if (!result) {
             this.$refs.loading.close()
diff --git a/pages/palmVeinDetail/palmVeinDetail.vue b/pages/palmVeinDetail/palmVeinDetail.vue
index e3f3332..a7a94a6 100644
--- a/pages/palmVeinDetail/palmVeinDetail.vue
+++ b/pages/palmVeinDetail/palmVeinDetail.vue
@@ -126,6 +126,10 @@
   const pending = ref(false)
 
   const changeCoerced = async () => {
+    const netWork = await $basic.getNetworkType()
+    if (!netWork) {
+      return
+    }
     if (pending.value) return
     pending.value = true
     uni.showLoading({
diff --git a/pages/recordList/recordList.vue b/pages/recordList/recordList.vue
index 2ecd987..3b37f6e 100644
--- a/pages/recordList/recordList.vue
+++ b/pages/recordList/recordList.vue
@@ -91,9 +91,20 @@
         </view>
       </view>
     </scroll-view>
-    <view class="button">
-      <view class="button-reset" @click="reset">清空记录</view>
-      <view class="button-create" @click="syncRecord">同步记录</view>
+    <view class="button" v-if="$bluetooth.currentLockInfo.keyRight === 1">
+      <view
+        class="button-reset"
+        @click="reset"
+        v-if="$bluetooth.currentLockInfo.userType === 110301"
+        >清空记录</view
+      >
+      <view
+        class="button-create"
+        :style="{ width: $bluetooth.currentLockInfo.userType === 110301 ? '300rpx' : '650rpx' }"
+        @click="syncRecord"
+      >
+        同步记录</view
+      >
     </view>
   </view>
 </template>