From 92bda2cc1502c36b4c72545b5a456d2122685f76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Tue, 3 Sep 2024 09:42:53 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E9=82=AE=E7=AE=B1?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E6=A1=88=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/env.js                     | 2 +-
 pages/updateEmail/updateEmail.vue | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/config/env.js b/config/env.js
index ac08042..6bfcb16 100644
--- a/config/env.js
+++ b/config/env.js
@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 const version = '1.0.0'
-const buildNumber = 0
+const buildNumber = 2
 
 const DEV = {
   name: '开发',
diff --git a/pages/updateEmail/updateEmail.vue b/pages/updateEmail/updateEmail.vue
index 59136d1..66242ce 100644
--- a/pages/updateEmail/updateEmail.vue
+++ b/pages/updateEmail/updateEmail.vue
@@ -1,5 +1,6 @@
 <template>
   <view>
+    <view class="tips">找回密码和登录新设备时，可通过绑定的邮箱验证</view>
     <input class="input-email" :value="email" placeholder="请输入邮箱"
            placeholder-class="input-placeholder" :focus="true" @input="updateInputEmail"></input>
     <view class="view-top">
@@ -139,6 +140,12 @@ page {
 </style>
 
 <style scoped lang="scss">
+.tips {
+  padding: 24rpx 32rpx 0 32rpx;
+  font-size: 28rpx;
+  color: #999999;
+}
+
 .input-email {
   border-radius: 16rpx;
   background: #FFFFFF;

From 70a477a56ffbfa72ae01ff6d2064a31a2969d969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Tue, 3 Sep 2024 10:45:20 +0800
Subject: [PATCH 2/7] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8Dwebview=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BAbug=202.=20=E4=BF=AE=E6=94=B9=E6=98=B5=E7=A7=B0?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E9=95=BF=E5=BA=A6=E4=B8=BA50=E5=B9=B6?=
 =?UTF-8?q?=E5=AE=8C=E6=95=B4=E6=98=BE=E7=A4=BA=203.=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=88=A0=E9=99=A4=E9=94=81=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E7=9A=84=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/env.js                   |  2 +-
 pages/setting/setting.vue       |  2 +-
 pages/updateName/updateName.vue |  2 +-
 pages/userInfo/userInfo.vue     | 14 ++++++++++++--
 pages/webview/webview.vue       |  9 +++++----
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/config/env.js b/config/env.js
index 6bfcb16..5492c2f 100644
--- a/config/env.js
+++ b/config/env.js
@@ -13,7 +13,7 @@ const DEV = {
 const PRE = {
   name: '预发',
   baseUrl: 'https://pre.lock.star-lock.cn/api',
-  webviewBaseUrl: 'https://pre.lock.star-lock.cn',
+  webviewBaseUrl: 'https://lock.xhjcn.ltd',
   version,
   buildNumber
 }
diff --git a/pages/setting/setting.vue b/pages/setting/setting.vue
index 550fc5f..9c87fad 100644
--- a/pages/setting/setting.vue
+++ b/pages/setting/setting.vue
@@ -136,7 +136,7 @@ export default {
               } else {
                 uni.hideLoading()
                 uni.showToast({
-                  title: '删除失败',
+                  title: '删除失败，请保持在锁附近',
                   icon: 'none'
                 })
               }
diff --git a/pages/updateName/updateName.vue b/pages/updateName/updateName.vue
index 572c12b..23f0ffd 100644
--- a/pages/updateName/updateName.vue
+++ b/pages/updateName/updateName.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <input class="input" :value="nickname" maxlength="20" placeholder="请输入昵称"
+    <input class="input" :value="nickname" maxlength="50" placeholder="请输入昵称"
            placeholder-class="input-placeholder" :focus="true" @input="updateInput"></input>
     <view class="button" @click="updateName">保存</view>
   </view>
diff --git a/pages/userInfo/userInfo.vue b/pages/userInfo/userInfo.vue
index 2d9e32b..5eaa6a5 100644
--- a/pages/userInfo/userInfo.vue
+++ b/pages/userInfo/userInfo.vue
@@ -13,8 +13,8 @@
       <view class="view-line"></view>
       <view class="view-button" @click="toUpdateName">
         <view>昵称</view>
-        <view class="view-button" style="padding: 0">
-          <view class="info">{{userInfo.nickname}}</view>
+        <view class="view-button" style="padding: 20rpx 0">
+          <view class="name-info">{{userInfo.nickname}}</view>
           <image class="icon-arrow" src="/static/images/icon_arrow.png" mode="aspectFill"></image>
         </view>
       </view>
@@ -257,6 +257,16 @@ page {
   margin-right: 20rpx;
 }
 
+.name-info {
+  line-height: 40rpx;
+  font-size: 30rpx;
+  text-align: right;
+  width: 500rpx;
+  overflow: hidden;
+  word-break: break-all;
+  margin-right: 20rpx;
+}
+
 .red-dot {
   margin-right: 20rpx;
   background: #ec433c;
diff --git a/pages/webview/webview.vue b/pages/webview/webview.vue
index 29ca69c..264e9e3 100644
--- a/pages/webview/webview.vue
+++ b/pages/webview/webview.vue
@@ -5,16 +5,17 @@
 </template>
 
 <script>
-import baseConfig from '@/config/env'
+import env from '@/config/env'
 
 export default {
   data() {
     return {
-      url: ''
+      url: '',
+      env: null
     }
   },
   onLoad: function (options) {
-    console.log(baseConfig.webviewBaseUrl)
+    this.env = env[getApp().globalData.getEnvConfig()]
     const officialAccounts = {
       default: {
         url: '/app/introduce',
@@ -30,7 +31,7 @@ export default {
       }
     }
     const item = officialAccounts[options?.type] || officialAccounts['default']
-    this.url = baseConfig.webviewBaseUrl + item['url']
+    this.url = this.env.webviewBaseUrl + item['url']
     console.log(this.url)
     uni.setNavigationBarTitle({
       title: item['name']

From 6264172c663d89be905d0252cf393fced5f89ad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Tue, 3 Sep 2024 10:54:41 +0800
Subject: [PATCH 3/7] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E6=80=A7=E9=92=A5=E5=8C=99=E5=88=A0=E9=99=A4=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/lockDetail/lockDetail.vue | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pages/lockDetail/lockDetail.vue b/pages/lockDetail/lockDetail.vue
index 4f5d080..a1d5db4 100644
--- a/pages/lockDetail/lockDetail.vue
+++ b/pages/lockDetail/lockDetail.vue
@@ -153,6 +153,19 @@ export default {
           title: `${type === 'close' ? '关' : '开'}锁成功`,
           icon: 'none'
         })
+        if(this.currentLockInfo.keyType === 3) {
+          const { code: deleteKeyCode } = await deleteKeyRequest({
+            keyId: this.keyId
+          })
+          if(deleteKeyCode === 0) {
+            this.updateLockSearch({
+              ...this.lockSearch,
+              pageNo: 1
+            })
+            this.getLockList(this.lockSearch)
+            this.backAndToast('单次钥匙已在被使用后删除', 1)
+          }
+        }
       } else if(code === 13) {
         uni.showToast({
           title: `只能在循环时间内操作门锁`,
@@ -164,19 +177,6 @@ export default {
           icon: 'none'
         })
       }
-      if(this.currentLockInfo.keyType === 3) {
-        const { code: deleteKeyCode } = await deleteKeyRequest({
-          keyId: this.keyId
-        })
-        if(deleteKeyCode === 0) {
-          this.updateLockSearch({
-            ...this.lockSearch,
-            pageNo: 1
-          })
-          this.getLockList(this.lockSearch)
-          this.backAndToast('单次钥匙已在被使用后删除', 1)
-        }
-      }
       this.$refs.loading.close()
       this.pending = false
     }

From 1b51d4c78014b954d6f0aac608ce629eb4ec8c4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Tue, 3 Sep 2024 11:40:00 +0800
Subject: [PATCH 4/7] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B5MAC/ID=E5=80=BC=202.=20=E4=BF=AE=E6=94=B9=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E8=AE=BE=E5=A4=87=E6=88=96=E7=94=B5=E5=AD=90=E9=92=A5?=
 =?UTF-8?q?=E5=8C=99=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/setting/setting.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pages/setting/setting.vue b/pages/setting/setting.vue
index 9c87fad..ef1f186 100644
--- a/pages/setting/setting.vue
+++ b/pages/setting/setting.vue
@@ -17,7 +17,7 @@
       <view class="view-button">
         <view>MAC/ID</view>
         <view class="view-button" style="padding: 0">
-          <view class="info">{{currentLockInfo.mac}}</view>
+          <view class="info">{{currentLockInfo.mac}}/{{currentLockInfo.lockId}}</view>
         </view>
       </view>
       <view class="view-line"></view>
@@ -98,9 +98,10 @@ export default {
     },
     deleteLock() {
       const that = this
+      const message = that.currentLockInfo.userType === 110301 ? '删除锁后，所有信息都会一起删除，确定删除锁吗？' : '确定删除该钥匙吗？'
       uni.showModal({
         title: '提示',
-        content: '确定删除该门锁吗？',
+        content: message,
         success: async function (res) {
           if (res.confirm) {
             uni.showLoading({

From 6de8d33322637e1834b9472c7ed4427a6204c810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Tue, 3 Sep 2024 11:49:44 +0800
Subject: [PATCH 5/7] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E4=B8=8E=E6=9B=B4=E6=8D=A2=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E9=80=89=E6=8B=A9=E4=B8=8E=E4=B9=8B?=
 =?UTF-8?q?=E5=89=8D=E7=9B=B8=E5=90=8C=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=9A=84?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mine/mine.vue         | 2 ++
 pages/userInfo/userInfo.vue | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index f848844..93dd7e3 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -135,6 +135,8 @@
             title: '账号切换成功',
             icon: 'none'
           })
+        } else if(code === 438) {
+
         } else {
           uni.showToast({
             title: message,
diff --git a/pages/userInfo/userInfo.vue b/pages/userInfo/userInfo.vue
index 5eaa6a5..8d3d8c7 100644
--- a/pages/userInfo/userInfo.vue
+++ b/pages/userInfo/userInfo.vue
@@ -107,6 +107,13 @@ export default {
             title: '更换成功',
             icon: 'none'
           })
+        } else if(code === 421) {
+          uni.showToast({
+            title: '手机号已被其他账号绑定',
+            icon: 'none'
+          })
+        } else if(code === 438) {
+
         } else {
           uni.showToast({
             title: message,

From a686dfad84e8023d9e40b1e0a25fea974b00259a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Tue, 3 Sep 2024 11:56:15 +0800
Subject: [PATCH 6/7] =?UTF-8?q?1.=20=E6=93=8D=E4=BD=9C=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=97=B6=E6=B7=BB=E5=8A=A0=E5=AE=9A=E4=BD=8D=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 stores/bluetooth.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/stores/bluetooth.js b/stores/bluetooth.js
index d611fc5..89ae20d 100644
--- a/stores/bluetooth.js
+++ b/stores/bluetooth.js
@@ -772,6 +772,22 @@ export const useBluetoothStore = defineStore('ble', {
               // 重新初始化蓝牙适配器
               await that.initBluetooth()
               that.searchAndConnectDevice()
+            } else if(res.errno === 1509008) {
+              uni.showModal({
+                title: '提示',
+                content: '安卓手机蓝牙功能需要定位权限，请前往设置开启微信的定位权限后再试',
+                showCancel: false,
+                success(res) {
+                  if (res.confirm) {
+                    uni.openAppAuthorizeSetting({
+                      success (res) {
+                        console.log(res)
+                      }
+                    })
+                  }
+                }
+              })
+              resolve(false)
             } else {
               resolve(false)
             }

From 3fd9995e05f93e0366b3eca6ca5038e9087870a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Tue, 3 Sep 2024 14:21:40 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=88=A0=E9=99=A4=E9=92=A5=E5=8C=99?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/setting/setting.vue | 67 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 66 insertions(+), 1 deletion(-)

diff --git a/pages/setting/setting.vue b/pages/setting/setting.vue
index ef1f186..bcf9222 100644
--- a/pages/setting/setting.vue
+++ b/pages/setting/setting.vue
@@ -38,6 +38,15 @@
       </view>
     </view>
     <view class="button-logout" @click="deleteLock">删除</view>
+    <up-modal :show="showModal"  title="是否删除授权管理员钥匙？" :showCancelButton="true" width="600rpx" @cancel="cancelModal"
+              @confirm="confirmModal">
+      <view class="slot-content" @click="changeRadio">
+        <view style="display: flex;align-items: center;">
+          <radio :checked="checked"></radio>
+          <view>同时删除其发送的所有钥匙，钥匙删除后不能恢复</view>
+        </view>
+      </view>
+    </up-modal>
   </view>
 </template>
 
@@ -54,7 +63,9 @@ import { useBasicStore } from '@/stores/basic'
 export default {
   data () {
     return {
-      unlockApp: 0
+      unlockApp: 0,
+      showModal: false,
+      checked: false
     }
   },
   computed: {
@@ -69,6 +80,39 @@ export default {
     ...mapActions(useBluetoothStore, ['resetDevice', 'updateCurrentLockInfo']),
     ...mapActions(useLockStore, ['getLockList', 'updateLockSearch']),
     ...mapActions(useBasicStore, ['backAndToast']),
+    changeRadio() {
+      this.checked = !this.checked
+    },
+    cancelModal() {
+      this.showModal = false
+      this.checked = false
+    },
+    async confirmModal() {
+      uni.showLoading({
+        title: '删除中',
+        mask: true
+      })
+      const that = this
+      const { code } = await deleteKeyRequest({
+        keyId: that.keyId,
+        includeUnderlings: that.checked ? 1 : 0
+      })
+      if(code === 0) {
+        uni.hideLoading()
+        that.updateLockSearch({
+          ...that.lockSearch,
+          pageNo: 1
+        })
+        that.getLockList(that.lockSearch)
+        that.backAndToast('删除成功', 2)
+      } else {
+        uni.hideLoading()
+        uni.showToast({
+          title: 'message',
+          icon: 'none'
+        })
+      }
+    },
     async changeUnlockApp(value) {
       uni.showLoading({
         title: '更新中',
@@ -98,6 +142,10 @@ export default {
     },
     deleteLock() {
       const that = this
+      if(this.currentLockInfo.userType !== 110301 && this.currentLockInfo.keyRight === 1) {
+        this.showModal = true
+        return
+      }
       const message = that.currentLockInfo.userType === 110301 ? '删除锁后，所有信息都会一起删除，确定删除锁吗？' : '确定删除该钥匙吗？'
       uni.showModal({
         title: '提示',
@@ -215,4 +263,21 @@ page {
   height: 3rpx;
   background: #EBEBEB;
 }
+
+
+radio .wx-radio-input.wx-radio-input-checked {
+  border: none;
+  background: #c1885a;
+}
+radio .wx-radio-input.wx-radio-input-checked::before {
+  border-radius: 50%; /* 圆角 */
+  width: 28rpx; /* 选中后对勾大小，不要超过背景的尺寸 */
+  height: 28rpx; /* 选中后对勾大小，不要超过背景的尺寸 */
+  line-height: 28rpx;
+  text-align: center;
+  font-size: 20rpx; /* 对勾大小 30rpx */
+  color: #fff; /* 对勾颜色 白色 */
+  background: #c1885a;
+  transform: translate(-50%, -50%) scale(1);
+}
 </style>