feat: 新增sky分支

Fanpeng

See merge request StarlockTeam/wx-starlock!53

App.vue

@@ -25,13 +25,13 @@
         }
         // #ifdef MP-WEIXIN
         if (this.envVersion === 'develop') {
-          return 'XHJ'
+          return 'SKY'
         }
         if (this.envVersion === 'trial') {
-          return 'XHJ'
+          return 'SKY'
         }
         // #endif
-        return 'XHJ'
+        return 'SKY'
       }
     },
     computed: {

components/SwitchLoading/SwitchLoading.vue

@@ -17,7 +17,7 @@
         :style="{ width: size * 0.75 - 2 + 'rpx', height: size * 0.75 - 2 + 'rpx' }"
       >
         <image
-          src="https://oss-lock.xhjcn.ltd/mp/icon_lock_transparent.png"
+          src="https://cos-lock.skychip.top/mp/icon_lock.png"
           mode="aspectFill"
           :style="{ width: size * 0.35 + 'rpx', height: size * 0.35 + 'rpx' }"
         ></image>
@@ -74,8 +74,8 @@
     align-items: center;
     justify-content: center;
     padding: 3upx;
-    background: rgb(99, 184, 175);
+    background: #4777ee;
-    background: linear-gradient(0deg, rgba(99, 184, 175, 0.1) 33%, rgba(99, 184, 175, 1) 100%);
+    background: linear-gradient(0deg, rgba(99, 184, 175, 0.1) 33%, rgba(71, 119, 238, 1) 100%);
     border-radius: 50%;
     animation: spin 0.8s linear 0s infinite;
   }
@@ -87,7 +87,7 @@
     align-items: center;
     justify-content: center;
     padding: 3upx;
-    background: rgb(99, 184, 175);
+    background: #4777ee;
     border-radius: 50%;
   }
 

config/env.js

@@ -12,6 +12,8 @@ const DEV = {
 	appName: '星星锁Lite',
 	baseUrl: 'https://lock.dev.star-lock.cn/api',
 	webviewBaseUrl: 'https://lock.dev.star-lock.cn',
+	officialEmail: '',
+	officialWebsite: '',
 	version,
 	buildNumber
 }
@@ -21,6 +23,8 @@ const PRE = {
 	appName: '星星锁Lite',
 	baseUrl: 'https://lock.pre.star-lock.cn/api',
 	webviewBaseUrl: 'https://lock.xhjcn.ltd',
+	officialEmail: '',
+	officialWebsite: '',
 	version,
 	buildNumber
 }
@@ -30,15 +34,19 @@ const XHJ = {
 	appName: '星星锁Lite',
 	baseUrl: 'https://lock.xhjcn.ltd/api',
 	webviewBaseUrl: 'https://lock.xhjcn.ltd',
+	officialEmail: '',
+	officialWebsite: '',
 	version,
 	buildNumber
 }
 
 const SKY = {
 	name: 'sky',
-  appName: '星星锁Lite',
+	appName: '锁通通',
 	baseUrl: 'https://lock.skychip.top/api',
 	webviewBaseUrl: 'https://lock.skychip.top',
+	officialEmail: 'contact@skychip.top',
+	officialWebsite: 'www.skychip.top',
 	version,
 	buildNumber
 }
@@ -48,9 +56,17 @@ const GE = {
 	appName: '星星锁Lite',
 	baseUrl: 'http://lock.ge.star-lock.cn/api',
 	webviewBaseUrl: 'http://lock.ge.star-lock.cn',
+	officialEmail: '',
+	officialWebsite: '',
 	version,
 	buildNumber
 }
 
 // 更换环境的时候 切换导出就行
-export default { DEV, PRE, XHJ, SKY, GE }
+export default {
+	DEV,
+	PRE,
+	XHJ,
+	SKY,
+	GE
+}

manifest.json

@@ -1,86 +1,74 @@
 {
-  "name": "星星锁Lite",
+    "name" : "锁通通",
-  "appid": "__UNI__933D519",
+    "appid" : "__UNI__933D519",
-  "description": "",
+    "description" : "",
-  "versionName": "1.3.2",
+    "versionName" : "1.3.5",
-  "versionCode": "40",
+    "versionCode" : "42",
-  "mp-weixin": {
+    "mp-weixin" : {
-    "appid": "wx9829a39e65550757",
+        "appid" : "wx7991ace56366dd9a",
-    "setting": {
+        "setting" : {
-      "urlCheck": true,
+            "urlCheck" : true,
-      "minified": true
+            "minified" : true
         },
-    "permission": {
+        "permission" : {
-      "scope.bluetooth": {
+            "scope.bluetooth" : {
-        "desc": "蓝牙将用于控制和管理您的智能门锁"
+                "desc" : "蓝牙将用于控制和管理您的智能门锁"
             }
         },
-    "usingComponents": true,
+        "usingComponents" : true,
-    "lazyCodeLoading": "requiredComponents",
+        "lazyCodeLoading" : "requiredComponents",
-    "optimization": {
+        "optimization" : {
-      "subPackages": true
+            "subPackages" : true
         },
-    "plugins": {
+        "plugins" : {}
-      "wmpf-voip": {
+    },
-        "version": "latest",
+    "vueVersion" : "3",
-        "provider": "wxf830863afde621eb",
+    "app-plus" : {
-        "genericsImplementation": {
+        "optimization" : {
-          "call-page-plugin": {
+            "subPackages" : true
-            "custombox": "pages/main/customBox"
+        },
-          }
+        "runmode" : "liberate",
-        }
+        "distribute" : {
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
                     }
                 }
             },
-  "vueVersion": "3",
+            "android" : {
-  "app-plus": {
+                "permissions" : [
-    "distribute": {
-      "icons": {
-        "android": {
-          "hdpi": "unpackage/res/icons/72x72.png",
-          "xhdpi": "unpackage/res/icons/96x96.png",
-          "xxhdpi": "unpackage/res/icons/144x144.png",
-          "xxxhdpi": "unpackage/res/icons/192x192.png"
-        },
-        "ios": {
-          "appstore": "unpackage/res/icons/1024x1024.png",
-          "ipad": {
-            "app": "unpackage/res/icons/76x76.png",
-            "app@2x": "unpackage/res/icons/152x152.png",
-            "notification": "unpackage/res/icons/20x20.png",
-            "notification@2x": "unpackage/res/icons/40x40.png",
-            "proapp@2x": "unpackage/res/icons/167x167.png",
-            "settings": "unpackage/res/icons/29x29.png",
-            "settings@2x": "unpackage/res/icons/58x58.png",
-            "spotlight": "unpackage/res/icons/40x40.png",
-            "spotlight@2x": "unpackage/res/icons/80x80.png"
-          },
-          "iphone": {
-            "app@2x": "unpackage/res/icons/120x120.png",
-            "app@3x": "unpackage/res/icons/180x180.png",
-            "notification@2x": "unpackage/res/icons/40x40.png",
-            "notification@3x": "unpackage/res/icons/60x60.png",
-            "settings@2x": "unpackage/res/icons/58x58.png",
-            "settings@3x": "unpackage/res/icons/87x87.png",
-            "spotlight@2x": "unpackage/res/icons/80x80.png",
-            "spotlight@3x": "unpackage/res/icons/120x120.png"
-          }
-        }
-      },
-      "android": {
-        "permissions": [
-          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
@@ -92,27 +80,37 @@
                     "<uses-permission android:name=\"android.permission.BLUETOOTH_CONNECT\" />",
                     "<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-          "<uses-permission android:name=\"android.permission.MANAGE_EXTERNAL_STORAGE\"/>"
+                    "<uses-permission android:name=\"android.permission.READ_MEDIA_IMAGES\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_MEDIA_VIDEO\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_MEDIA_AUDIO\"/>"
                 ],
-        "packagename": "com.xhs.lock",
+                "packagename" : "com.xhs.lock",
-        "password": "xhs2025",
+                "password" : "xhs2025",
-        "aliasname": "xhs2025",
+                "aliasname" : "xhs2025",
-        "keystore": "./android.jks",
+                "keystore" : "./android.jks",
-        "targetSdkVersion": 34,
+                "targetSdkVersion" : 35,
-        "abiFilters": ["armeabi-v7a", "arm64-v8a"]
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
             },
-      "ios": {
+            "ios" : {
-        "dSYMs": false
+                "dSYMs" : false
             }
         },
-    "modules": {
+        "modules" : {
-      "Bluetooth": {},
+            "Bluetooth" : {
-      "VideoPlayer": {},
+                "description" : "低功耗蓝牙"
-      "Camera": {},
-      "Record": {}
             },
-    "splashscreen": {
+            "VideoPlayer" : {
-      "waiting": false
+                "description" : "视频播放"
+            },
+            "Camera" : {
+                "description" : "相机和相册"
+            },
+            "Record" : {
+                "description" : "录音"
+            }
+        },
+        "splashscreen" : {
+            "waiting" : false
         }
     }
 }

pages.json

@@ -7,22 +7,14 @@
 			"^u-([^-].*)": "uview-plus/components/u-$1/u-$1.vue"
 		}
 	},
-  "subPackages": [
+	"subPackages": [{
-    {
 			"root": "pages/p2p",
-      "pages": [
+			"pages": [{
-        {
 					"path": "p2pPlayer",
 					"style": {
 						"navigationStyle": "custom",
 						"navigationBarTitleText": "监控",
-            "disableScroll": true,
+						"disableScroll": true
-            "mp-weixin": {
-              "usingComponents": {
-                "iot-p2p-player-with-mjpg": "plugin://xp2p/iot-p2p-player-with-mjpg",
-                "iot-p2p-voice": "plugin://xp2p/iot-p2p-voice"
-              }
-            }
 					}
 				},
 				{
@@ -41,22 +33,12 @@
 				}
 			],
 			"plugins": {
-        "xp2p": {
+
-          "version": "latest",
-          "provider": "wx1319af22356934bf",
-          "export": "exportForXp2pPlugin.js"
-        },
-        "wechat-p2p-player": {
-          "version": "latest",
-          "provider": "wx9e8fbc98ceac2628",
-          "export": "exportForPlayerPlugin.js"
-        }
 			}
 		},
 		{
 			"root": "pages/addDevice",
-      "pages": [
+			"pages": [{
-        {
 					"path": "addLockGuid",
 					"style": {
 						"navigationBarTitleText": "添加锁",
@@ -87,8 +69,7 @@
 		},
 		{
 			"root": "pages/user",
-      "pages": [
+			"pages": [{
-        {
 					"path": "userInfo",
 					"style": {
 						"navigationBarTitleText": "个人信息"
@@ -162,8 +143,7 @@
 		},
 		{
 			"root": "pages/others",
-      "pages": [
+			"pages": [{
-        {
 					"path": "notificationDetail",
 					"style": {
 						"navigationBarTitleText": "消息详情"
@@ -193,8 +173,7 @@
 		},
 		{
 			"root": "pages/feature",
-      "pages": [
+			"pages": [{
-        {
 					"path": "createPassword",
 					"style": {
 						"disableScroll": true,
@@ -421,8 +400,7 @@
 		},
 		{
 			"root": "pages/setting",
-      "pages": [
+			"pages": [{
-        {
 					"path": "videoSlot",
 					"style": {
 						"navigationBarTitleText": "录像时段",
@@ -613,7 +591,12 @@
 			]
 		}
 	],
-  "pages": [
+	"pages": [{
+			"path": "pages/main/lockDetail",
+			"style": {
+				"navigationBarTitleText": "锁通通"
+			}
+		},
 		{
 			"path": "pages/main/home"
 		},
@@ -628,13 +611,8 @@
 			"style": {
 				"navigationBarTitleText": "通知列表"
 			}
-    },
-    {
-      "path": "pages/main/lockDetail",
-      "style": {
-        "navigationBarTitleText": "星星锁"
-      }
 		}
+
 	],
 	"preloadRule": {
 		"pages/main/home": {
@@ -649,20 +627,19 @@
 	},
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
-    "navigationBarTitleText": "星星锁",
+		"navigationBarTitleText": "锁通通",
-    "navigationBarBackgroundColor": "#63b8af",
+		"navigationBarBackgroundColor": "#4777ee",
 		"backgroundColor": "#F3F3F3",
 		"navigationStyle": "default"
 	},
 	"tabBar": {
 		"color": "#a3a3a3",
-    "selectedColor": "#63b8af",
+		"selectedColor": "#4777ee",
 		"borderStyle": "white",
 		"backgroundColor": "#FFFFFF",
 		"position": "bottom",
-    "list": [
+		"list": [{
-      {
+				"pagePath": "pages/main/lockDetail",
-        "pagePath": "pages/main/home",
 				"iconPath": "static/images/tabbar_key_no_select.png",
 				"selectedIconPath": "static/images/tabbar_key_select.png",
 				"text": "设备"

pages/addDevice/addLockGuid.vue

@@ -19,14 +19,14 @@
   const basicStore = useBasicStore()
 
   const toSearchDevice = async () => {
-    if (bluetoothStore.bluetoothStatus !== 0) {
+    // if (bluetoothStore.bluetoothStatus !== 0) {
-      bluetoothStore.getBluetoothStatus()
+    //   bluetoothStore.getBluetoothStatus()
-      return
+    //   return
-    }
+    // }
     let result = true
-    if (!bluetoothStore.isInitBluetooth) {
+    // if (!bluetoothStore.isInitBluetooth) {
       result = await bluetoothStore.initAndListenBluetooth()
-    }
+    // }
     if (result) {
       basicStore.routeJump({
         type: 'redirectTo',
@@ -68,7 +68,7 @@
     line-height: 100rpx;
     color: #fff;
     text-align: center;
-    background-color: #63b8af;
+    background-color: #4777ee;
     border-radius: 50rpx;
   }
 </style>

pages/addDevice/bindLock.vue

@@ -142,11 +142,11 @@
         const { code, message } = await bindLockAdmin(params)
         console.log('添加锁返回', code, message)
         if (code === 0) {
-          this.updateLockSearch({
+          await this.updateLockSearch({
             ...this.lockSearch,
             pageNo: 1
           })
-          this.getLockList(this.lockSearch)
+          await this.getLockList(this.lockSearch)
           setTimeout(() => {
             uni.hideLoading()
             this.backAndToast('添加成功', 2)
@@ -204,7 +204,7 @@
     line-height: 96rpx;
     color: #ffffff;
     text-align: center;
-    background: #63b8af;
+    background: #4777ee;
     border-radius: 16rpx;
   }
 </style>

pages/addDevice/searchDevice.vue

@@ -20,7 +20,7 @@
             ></image>
             <view class="device-name">{{ device.name }}</view>
           </view>
-          <image class="device-add" src="https://oss-lock.xhjcn.ltd/mp/icon_add.png"></image>
+          <image class="device-add" src="https://cos-lock.skychip.top/mp/icon_add.png"></image>
         </view>
       </view>
     </scroll-view>

pages/feature/adminDetail.vue

@@ -50,10 +50,10 @@
         <up-icon name="arrow-right"></up-icon>
       </view>
       <view class="m-4 flex items-center justify-between text-base">
-        <view :class="[info.keyStatus === 110405 ? 'text-#63b8af' : 'text-red']" @click="freeze">{{
+        <view :class="[info.keyStatus === 110405 ? 'text-#4777ee' : 'text-red']" @click="freeze">{{
           info.keyStatus === 110405 ? '解冻' : '冻结'
         }}</view>
-        <view :class="[info.keyRight === 1 ? 'text-red' : 'text-#63b8af']" @click="authorize">{{
+        <view :class="[info.keyRight === 1 ? 'text-red' : 'text-#4777ee']" @click="authorize">{{
           info.keyRight === 1 ? '取消授权管理员' : '授权管理员'
         }}</view>
       </view>

pages/feature/adminList.vue

@@ -336,7 +336,7 @@
       line-height: 88rpx;
       color: white;
       text-align: center;
-      background-color: #63b8af;
+      background-color: #4777ee;
       border-radius: 44rpx;
     }
   }

pages/feature/bindFace.vue

@@ -124,7 +124,7 @@
     line-height: 100rpx;
     color: #fff;
     text-align: center;
-    background-color: #63b8af;
+    background-color: #4777ee;
     border-radius: 64rpx;
   }
 </style>

pages/feature/cardList.vue

@@ -402,7 +402,7 @@
       line-height: 88rpx;
       color: white;
       text-align: center;
-      background-color: #63b8af;
+      background-color: #4777ee;
       border-radius: 44rpx;
     }
   }

pages/feature/createAdmin.vue

@@ -6,10 +6,10 @@
         lineWidth="40rpx"
         lineHeight="5rpx"
         :current="currentIndex"
-        lineColor="#63b8af"
+        lineColor="#4777ee"
         @click="clickTab"
         :inactiveStyle="{ color: '#a3a3a3', fontSize: '32rpx', fontWeight: 'bold' }"
-        :activeStyle="{ color: '#63b8af', fontSize: '32rpx', fontWeight: 'bold' }"
+        :activeStyle="{ color: '#4777ee', fontSize: '32rpx', fontWeight: 'bold' }"
       >
       </up-tabs>
     </view>
@@ -363,7 +363,7 @@
     line-height: 100rpx;
     color: #fff;
     text-align: center;
-    background-color: #63b8af;
+    background-color: #4777ee;
     border-radius: 64rpx;
   }
 </style>

pages/feature/createCard.vue

@@ -6,10 +6,10 @@
         lineWidth="40rpx"
         lineHeight="5rpx"
         :current="currentIndex"
-        lineColor="#63b8af"
+        lineColor="#4777ee"
         @click="clickTab"
         :inactiveStyle="{ color: '#a3a3a3', fontSize: '32rpx', fontWeight: 'bold' }"
-        :activeStyle="{ color: '#63b8af', fontSize: '32rpx', fontWeight: 'bold' }"
+        :activeStyle="{ color: '#4777ee', fontSize: '32rpx', fontWeight: 'bold' }"
       >
       </up-tabs>
     </view>
@@ -414,7 +414,7 @@
     line-height: 100rpx;
     color: #fff;
     text-align: center;
-    background-color: #63b8af;
+    background-color: #4777ee;
     border-radius: 64rpx;
   }
 </style>

pages/feature/createFace.vue

@@ -6,10 +6,10 @@
         lineWidth="40rpx"
         lineHeight="5rpx"
         :current="currentIndex"
-        lineColor="#63b8af"
+        lineColor="#4777ee"
         @click="clickTab"
         :inactiveStyle="{ color: '#a3a3a3', fontSize: '32rpx', fontWeight: 'bold' }"
-        :activeStyle="{ color: '#63b8af', fontSize: '32rpx', fontWeight: 'bold' }"
+        :activeStyle="{ color: '#4777ee', fontSize: '32rpx', fontWeight: 'bold' }"
       >
       </up-tabs>
     </view>
@@ -373,7 +373,7 @@
     line-height: 100rpx;
     color: #fff;
     text-align: center;
-    background-color: #63b8af;
+    background-color: #4777ee;
     border-radius: 64rpx;
   }
 </style>

pages/feature/createFingerprint.vue

@@ -6,10 +6,10 @@
         lineWidth="40rpx"
         lineHeight="5rpx"
         :current="currentIndex"
-        lineColor="#63b8af"
+        lineColor="#4777ee"
         @click="clickTab"
         :inactiveStyle="{ color: '#a3a3a3', fontSize: '32rpx', fontWeight: 'bold' }"
-        :activeStyle="{ color: '#63b8af', fontSize: '32rpx', fontWeight: 'bold' }"
+        :activeStyle="{ color: '#4777ee', fontSize: '32rpx', fontWeight: 'bold' }"
       >
       </up-tabs>
     </view>
@@ -414,7 +414,7 @@
     line-height: 100rpx;
     color: #fff;
     text-align: center;
-    background-color: #63b8af;
+    background-color: #4777ee;
     border-radius: 64rpx;
   }
 </style>

pages/feature/createKey.vue

@@ -6,10 +6,10 @@
         lineWidth="40rpx"
         lineHeight="5rpx"
         :current="current"
-        lineColor="#63b8af"
+        lineColor="#4777ee"
         @click="clickTab"
         :inactiveStyle="{ color: '#a3a3a3', fontSize: '32rpx', fontWeight: 'bold' }"
-        :activeStyle="{ color: '#63b8af', fontSize: '32rpx', fontWeight: 'bold' }"
+        :activeStyle="{ color: '#4777ee', fontSize: '32rpx', fontWeight: 'bold' }"
       >
       </up-tabs>
     </view>
@@ -389,7 +389,7 @@
     line-height: 100rpx;
     color: #fff;
     text-align: center;
-    background-color: #63b8af;
+    background-color: #4777ee;
     border-radius: 64rpx;
   }
 </style>

pages/feature/createPalmVein.vue

@@ -6,10 +6,10 @@
         lineWidth="40rpx"
         lineHeight="5rpx"
         :current="currentIndex"
-        lineColor="#63b8af"
+        lineColor="#4777ee"
         @click="clickTab"
         :inactiveStyle="{ color: '#a3a3a3', fontSize: '32rpx', fontWeight: 'bold' }"
-        :activeStyle="{ color: '#63b8af', fontSize: '32rpx', fontWeight: 'bold' }"
+        :activeStyle="{ color: '#4777ee', fontSize: '32rpx', fontWeight: 'bold' }"
       >
       </up-tabs>
     </view>
@@ -415,7 +415,7 @@
     line-height: 100rpx;
     color: #fff;
     text-align: center;
-    background-color: #63b8af;
+    background-color: #4777ee;
     border-radius: 64rpx;
   }
 </style>

pages/feature/createPassword.vue

@@ -6,10 +6,10 @@
         lineWidth="40rpx"
         lineHeight="5rpx"
         :current="currentIndex"
-        lineColor="#63b8af"
+        lineColor="#4777ee"
         @click="clickTab"
         :inactiveStyle="{ color: '#a3a3a3', fontSize: '32rpx', fontWeight: 'bold' }"
-        :activeStyle="{ color: '#63b8af', fontSize: '32rpx', fontWeight: 'bold' }"
+        :activeStyle="{ color: '#4777ee', fontSize: '32rpx', fontWeight: 'bold' }"
       >
       </up-tabs>
     </view>
@@ -659,7 +659,7 @@
     line-height: 100rpx;
     color: #fff;
     text-align: center;
-    background-color: #63b8af;
+    background-color: #4777ee;
     border-radius: 64rpx;
   }
 </style>

pages/feature/createRemote.vue

@@ -6,10 +6,10 @@
         lineWidth="40rpx"
         lineHeight="5rpx"
         :current="currentIndex"
-        lineColor="#63b8af"
+        lineColor="#4777ee"
         @click="clickTab"
         :inactiveStyle="{ color: '#a3a3a3', fontSize: '32rpx', fontWeight: 'bold' }"
-        :activeStyle="{ color: '#63b8af', fontSize: '32rpx', fontWeight: 'bold' }"
+        :activeStyle="{ color: '#4777ee', fontSize: '32rpx', fontWeight: 'bold' }"
       >
       </up-tabs>
     </view>
@@ -336,7 +336,7 @@
     line-height: 100rpx;
     color: #fff;
     text-align: center;
-    background-color: #63b8af;
+    background-color: #4777ee;
     border-radius: 64rpx;
   }
 </style>

pages/feature/faceList.vue

@@ -403,7 +403,7 @@
       line-height: 88rpx;
       color: white;
       text-align: center;
-      background-color: #63b8af;
+      background-color: #4777ee;
       border-radius: 44rpx;
     }
   }

pages/feature/fingerprintList.vue

@@ -402,7 +402,7 @@
       line-height: 88rpx;
       color: white;
       text-align: center;
-      background-color: #63b8af;
+      background-color: #4777ee;
       border-radius: 44rpx;
     }
   }

pages/feature/keyDetail.vue

@@ -94,7 +94,7 @@
     <view class="m-4 flex items-center justify-between text-base">
       <view
         v-if="$lock.currentKeyInfo.keyType !== 3"
-        :class="[$lock.currentKeyInfo.keyStatus === 110405 ? 'text-#63b8af' : 'text-red']"
+        :class="[$lock.currentKeyInfo.keyStatus === 110405 ? 'text-#4777ee' : 'text-red']"
         @click="freeze"
         >{{ $lock.currentKeyInfo.keyStatus === 110405 ? '解冻' : '冻结' }}</view
       >
@@ -104,7 +104,7 @@
           $lock.currentKeyInfo.keyType !== 3 &&
           $lock.currentKeyInfo.keyType !== 4
         "
-        :class="[$lock.currentKeyInfo.keyRight === 1 ? 'text-red' : 'text-#63b8af']"
+        :class="[$lock.currentKeyInfo.keyRight === 1 ? 'text-red' : 'text-#4777ee']"
         @click="authorize"
         >{{ $lock.currentKeyInfo.keyRight === 1 ? '取消授权管理员' : '授权管理员' }}</view
       >

pages/feature/keyList.vue

@@ -69,7 +69,7 @@
                     ></image>
                     <view
                       class="key-status"
-                      :style="{ color: key.keyStatus === 110401 ? '#63b8af' : '#df282d' }"
+                      :style="{ color: key.keyStatus === 110401 ? '#4777ee' : '#df282d' }"
                     >
                       {{ getKeyStatus(key.keyStatus) }}
                     </view>
@@ -396,7 +396,7 @@
       line-height: 88rpx;
       color: white;
       text-align: center;
-      background-color: #63b8af;
+      background-color: #4777ee;
       border-radius: 44rpx;
     }
   }

pages/feature/palmVeinList.vue

@@ -407,7 +407,7 @@
       line-height: 88rpx;
       color: white;
       text-align: center;
-      background-color: #63b8af;
+      background-color: #4777ee;
       border-radius: 44rpx;
     }
   }

pages/feature/passwordList.vue

@@ -371,7 +371,7 @@
       line-height: 88rpx;
       color: white;
       text-align: center;
-      background-color: #63b8af;
+      background-color: #4777ee;
       border-radius: 44rpx;
     }
   }

pages/feature/recordList.vue

@@ -413,7 +413,7 @@
       line-height: 88rpx;
       color: white;
       text-align: center;
-      background-color: #63b8af;
+      background-color: #4777ee;
       border-radius: 44rpx;
     }
   }

pages/feature/remoteList.vue

@@ -405,7 +405,7 @@
       line-height: 88rpx;
       color: white;
       text-align: center;
-      background-color: #63b8af;
+      background-color: #4777ee;
       border-radius: 44rpx;
     }
   }

pages/main/home.vue

@@ -34,7 +34,7 @@
           <view class="lock-list" v-if="!pending">
             <view v-if="lockList.length === 0 && lockSearch.searchStr === '' && !focus">
               <image
-                src="https://oss-lock.xhjcn.ltd/mp/icon_add_round.png"
+                src="https://cos-lock.skychip.top/mp/icon_add_round.png"
                 mode="aspectFill"
                 class="button-add-big"
                 @click="toSearchDevice"
@@ -61,7 +61,7 @@
                       <view class="lock-top">
                         <image
                           class="lock-image-lock"
-                          src="https://oss-lock.xhjcn.ltd/mp/icon_lock.png"
+                          src="https://cos-lock.skychip.top/mp/icon_lock.png"
                         ></image>
                         <view class="lock-top-right">
                           <view class="lock-top-right-power">
@@ -134,7 +134,7 @@
         </scroll-view>
         <image
           v-if="lockList.length !== 0"
-          src="https://oss-lock.xhjcn.ltd/mp/icon_add_round.png"
+          src="https://cos-lock.skychip.top/mp/icon_add_round.png"
           mode="aspectFill"
           class="button-add"
           @click="toSearchDevice"
@@ -651,7 +651,7 @@
     line-height: 120rpx;
     color: #ffffff;
     text-align: center;
-    background: #63b8af;
+        background: #4777ee;
     border-radius: 46rpx;
   }
 

pages/main/lockDetail.vue

@@ -3,22 +3,35 @@
     <scroll-view
       v-if="deviceInfo"
       scroll-y="true"
-      :style="{ height: deviceInfo.windowHeight - deviceInfo.safeArea.top + 'px' }"
+      :style="{
+        height: deviceInfo.windowHeight - deviceInfo.safeArea.top + 'px'
+      }"
       @refresherrefresh="refresher"
       :refresher-enabled="true"
       :refresher-triggered="refresherTriggered"
     >
-      <view class="days" v-if="$bluetooth.currentLockInfo.days"
+      <view class="select-lock-row">
-        >钥匙将在{{ $bluetooth.currentLockInfo.days }}天后失效</view
-      >
-      <view class="lock-name">{{ $bluetooth.currentLockInfo.lockAlias }}</view>
-      <view class="top">
         <image
-          class="top-background"
+          src="https://cos-lock.skychip.top/mp/icon_add_round.png"
-          src="https://oss-lock.xhjcn.ltd/mp/background_main.jpg"
           mode="aspectFill"
+          style="width: 48rpx; height: 48rpx"
+          @click="toSearchDevice"
         ></image>
-        <view style="width: 100%; height: 50rpx">
+        <!-- 普通 picker -->
+        <picker :range="pickerOptions" @change="onPickerChange">
+          <view class="lock-name">
+            <text>
+              {{ $bluetooth.currentLockInfo.lockAlias }}
+            </text>
+            <image
+              class="icon-down"
+              src="https://cos-lock.skychip.top/mp/icon_down.png"
+              mode="aspectFill"
+            >
+            </image>
+          </view>
+        </picker>
+
         <view class="power" @click="powerTip">
           <image
             class="power-icon"
@@ -28,27 +41,44 @@
           <view class="power-text">{{ $bluetooth.currentLockInfo.electricQuantity }}%</view>
           <image
             class="power-tips"
-              src="https://oss-lock.xhjcn.ltd/mp/icon_tips.png"
+            src="https://cos-lock.skychip.top/mp/icon_tips.png"
             mode="aspectFill"
+          >
+          </image>
+        </view>
+      </view>
+      <view
+        class="open-lock-btn"
+        @click="openDoorOperate('open')"
+        @longpress="openDoorOperate('close')"
+      >
+        <image
+          class="open-lock-btn-image-1"
+          ref="sLoading"
+          src="https://cos-lock.skychip.top/mp/icon_main_openLockBtn_center.png"
+        ></image>
+        <image
+          class="open-lock-btn-image-2"
+          :class="{ rotate: isRotating }"
+          src="https://cos-lock.skychip.top/mp/icon_main_openLockBtn_circle.png"
         ></image>
       </view>
+
+      <view class="days" v-if="$bluetooth.currentLockInfo.days"
+        >钥匙将在{{ $bluetooth.currentLockInfo.days }}天后失效
       </view>
-        <view class="switch" @click="openDoorOperate('open')" @longpress="openDoorOperate('close')">
+
-          <SwitchLoading :size="220" ref="sLoading"></SwitchLoading>
-        </view>
       <view class="switch-text">点击开锁，长按闭锁</view>
-        <view class="bottom">
+      <view class="other-text">
         <view class="bottom-side">
           <image
             class="bottom-icon"
-              src="https://oss-lock.xhjcn.ltd/mp/icon_role.png"
+            style="width: 32rpx; height: 32rpx"
+            src="https://cos-lock.skychip.top/mp/icon_role.png"
             mode="aspectFill"
           ></image>
           <view>{{
-              $lock.getRole(
+            $lock.getRole($bluetooth.currentLockInfo.userType, $bluetooth.currentLockInfo.keyRight)
-                $bluetooth.currentLockInfo.userType,
-                $bluetooth.currentLockInfo.keyRight
-              )
           }}</view>
         </view>
         <view class="bottom-side">
@@ -56,26 +86,21 @@
             class="bottom-icon"
             :src="
               $bluetooth.currentLockInfo.appUnlockOnline
-                  ? 'https://oss-lock.xhjcn.ltd/mp/icon_cloud_active.png'
+                ? 'https://cos-lock.skychip.top/mp/icon_cloud_active.png'
-                  : 'https://oss-lock.xhjcn.ltd/mp/icon_cloud.png'
+                : 'https://cos-lock.skychip.top/mp/icon_cloud.png'
             "
             mode="aspectFill"
             style="width: 40rpx; height: 40rpx"
           ></image>
           <view
             :style="{
-                color: $bluetooth.currentLockInfo.appUnlockOnline ? '#63b8af' : '#a3a3a3'
+              color: $bluetooth.currentLockInfo.appUnlockOnline ? '#4777ee' : '#a3a3a3'
             }"
             >手机需联网</view
           >
         </view>
       </view>
-      </view>
       <view class="menu">
-        <view class="menu-title">
-          <image class="menu-image" src="https://oss-lock.xhjcn.ltd/mp/icon_menu.png"></image>
-          <view>功能</view>
-        </view>
         <view class="menu-main">
           <view
             v-if="
@@ -86,8 +111,8 @@
             @click="$basic.routeJump({ name: 'keyList' })"
           >
             <image
-              class="menu-main-image transform-scale-90"
+              class="menu-main-image"
-              src="https://oss-lock.xhjcn.ltd/mp/icon_key.png"
+              src="https://cos-lock.skychip.top/mp/icon_main_electronicKey.png"
             ></image>
             <view>电子钥匙</view>
           </view>
@@ -102,8 +127,9 @@
           >
             <image
               class="menu-main-image"
-              src="https://oss-lock.xhjcn.ltd/mp/icon_password_green.png"
+              src="https://cos-lock.skychip.top/mp/icon_main_password.png"
-            ></image>
+            >
+            </image>
             <view>密码</view>
           </view>
           <view
@@ -117,7 +143,7 @@
           >
             <image
               class="menu-main-image transform-scale-110"
-              src="https://oss-lock.xhjcn.ltd/mp/icon_card.png"
+              src="https://cos-lock.skychip.top/mp/icon_main_icCard.png"
             ></image>
             <view>卡</view>
           </view>
@@ -132,8 +158,9 @@
           >
             <image
               class="menu-main-image"
-              src="https://oss-lock.xhjcn.ltd/mp/icon_fingerprint.png"
+              src="https://cos-lock.skychip.top/mp/icon_main_fingerprint.png"
-            ></image>
+            >
+            </image>
             <view>指纹</view>
           </view>
           <view
@@ -147,7 +174,7 @@
           >
             <image
               class="menu-main-image"
-              src="https://oss-lock.xhjcn.ltd/mp/icon_remote.png"
+              src="https://cos-lock.skychip.top/mp/icon_main_remoteControl.png"
             ></image>
             <view>遥控</view>
           </view>
@@ -162,7 +189,7 @@
           >
             <image
               class="menu-main-image"
-              src="https://oss-lock.xhjcn.ltd/mp/icon_face.png"
+              src="https://cos-lock.skychip.top/mp/icon_face.png"
             ></image>
             <view>人脸</view>
           </view>
@@ -177,7 +204,7 @@
           >
             <image
               class="menu-main-image"
-              src="https://oss-lock.xhjcn.ltd/mp/icon_palm_vein.png"
+              src="https://cos-lock.skychip.top/mp/icon_palm.png"
             ></image>
             <view>掌静脉</view>
           </view>
@@ -188,7 +215,7 @@
           >
             <image
               class="menu-main-image transform-scale-140"
-              src="https://oss-lock.xhjcn.ltd/mp/icon_control.png"
+              src="https://oss-lock.xhjcn.ltd/mp/icon_catEyes.png"
             ></image>
             <view>监控</view>
           </view>
@@ -202,7 +229,7 @@
           >
             <image
               class="menu-main-image transform-scale-140"
-              src="https://oss-lock.xhjcn.ltd/mp/icon_admin_black.png"
+              src="https://cos-lock.skychip.top/mp/icon_main_authorizedAdmin.png"
             ></image>
             <view>授权管理员</view>
           </view>
@@ -213,7 +240,7 @@
           >
             <image
               class="menu-main-image"
-              src="https://oss-lock.xhjcn.ltd/mp/icon_record.png"
+              src="https://cos-lock.skychip.top/mp/icon_main_operatingRecord.png"
             ></image>
             <view>操作记录</view>
           </view>
@@ -224,57 +251,31 @@
           >
             <image
               class="menu-main-image"
-              src="https://oss-lock.xhjcn.ltd/mp/icon_record.png"
+              src="https://cos-lock.skychip.top/mp/icon_main_operatingRecord.png"
             ></image>
             <view>门锁记录</view>
           </view>
-          <view
+          <view class="menu-main-view" @click="$basic.routeJump({ name: 'setting' })">
-            v-if="
-              $bluetooth.currentLockInfo.keyRight === 1 &&
-              $bluetooth.currentLockInfo.transportType !== transportType.TRANSPORT_TENCENT_YUN
-            "
-            class="menu-main-view"
-            @click="$basic.routeJump({ name: 'messageReminder' })"
-          >
             <image
               class="menu-main-image transform-scale-110"
-              src="https://oss-lock.xhjcn.ltd/mp/icon_remind.png"
+              src="https://cos-lock.skychip.top/mp/icon_main_set.png"
             ></image>
-            <view>消息提醒</view>
+            <view>设置</view>
-          </view>
-          <view
-            class="menu-main-view transform-scale-105"
-            v-if="$bluetooth.currentLockInfo.transportType === transportType.TRANSPORT_TENCENT_YUN"
-            @click="$basic.routeJump({ name: 'authorizeWechat' })"
-          >
-            <image
-              class="menu-main-image"
-              src="https://oss-lock.xhjcn.ltd/mp/icon_wechat_call.png"
-            ></image>
-            <view>微信呼叫</view>
           </view>
         </view>
       </view>
-      <view
-        class="setting"
-        @click="$basic.routeJump({ name: 'setting' })"
-        v-if="$bluetooth.currentLockInfo.transportType !== transportType.TRANSPORT_TENCENT_YUN"
-      >
-        <image class="setting-image" src="https://oss-lock.xhjcn.ltd/mp/icon_setting.png"></image>
-        <view class="setting-text">设置</view>
-        <image
-          class="setting-arrow"
-          mode="aspectFill"
-          src="https://oss-lock.xhjcn.ltd/mp/icon_arrow.png"
-        ></image>
-      </view>
-      <view
-        v-if="$bluetooth.currentLockInfo.transportType === transportType.TRANSPORT_TENCENT_YUN"
-        class="fixed bottom-[calc(env(safe-area-inset-bottom)+120rpx)] mt-4 rounded-3xl w-686 h-80 line-height-80rpx text-center mx-32rpx bg-#ec433c text-white text-xl font-bold"
-        @click="deleteLock"
-        >删除
-      </view>
     </scroll-view>
+    <view v-else class="not-devices-box">
+      <image class="menu-main-image" src="https://cos-lock.skychip.top/mp/icon_noData.png"></image>
+      <text>暂无智能锁</text>
+      <image
+        src="https://cos-lock.skychip.top/mp/icon_add_round.png"
+        mode="aspectFill"
+        class="button-add-big"
+        @click="toSearchDevice"
+      ></image>
+    </view>
+
     <up-popup
       :show="show"
       @close="closePopup"
@@ -303,7 +304,7 @@
 
 <script setup>
   import { timeFormat } from 'uview-plus'
-  import { onMounted, ref } from 'vue'
+  import { onMounted, onUnmounted, ref } from 'vue'
   import { useBluetoothStore } from '@/stores/bluetooth'
   import { useBasicStore } from '@/stores/basic'
   import SwitchLoading from '@/components/SwitchLoading/SwitchLoading.vue'
@@ -312,6 +313,9 @@
   import { getLockDetailRequest, getLockNetTokenRequest, deleteLockRequest } from '@/api/lock'
   import { deleteKeyRequest } from '@/api/key'
   import { transportType } from '@/constant/transportType'
+  import { loginRequest } from '@/api/user'
+  import { setStorage, getStorage } from '@/utils/storage'
+  import { onLoad, onShow } from '@dcloudio/uni-app' // 注意：这里需要正确导入 UniApp 的生命周期钩子！
 
   // #ifdef APP-PLUS
   import { requestPermission } from '@/uni_modules/xhj-record'
@@ -322,7 +326,7 @@
   const $lock = useLockStore()
   const $user = useUserStore()
 
-  const sLoading = ref(null)
+  // const sLoading = ref(null)
 
   const time = ref(0)
   const onlineToken = ref('0')
@@ -333,9 +337,133 @@
 
   const deviceInfo = ref(null)
 
+  // 控制是否应用旋转动画
+  const isRotating = ref(false)
+
+  // 选择器数据源（比如一个字符串数组）
+  const pickerOptions = ref([])
+
+  // 当前选中项的索引（picker 内部使用）
+  const selectedIndex = ref(0)
+
+  // 选中后展示的文本
+  const selectedText = ref(pickerOptions.value[0])
+
   onMounted(async () => {
+    try {
+      // #ifdef MP-WEIXIN
+      const accountInfo = uni.getAccountInfoSync()
+      getApp().globalData.appid = accountInfo.miniProgram.appId
+      getApp().globalData.envVersion = accountInfo.miniProgram.envVersion
+      // #endif
+      uni.showLoading({
+        title: '加载中',
+        mask: true
+      })
+      const token = getStorage('token')
+      const list = getStorage('lockList')
+      const userInfo = getStorage('userInfo')
+
+      if (token) {
+        await Promise.all([$lock.getLockList($lock.lockSearch), $user.getUserInfo()]).then(res => {
+          pending.value = false
+          uni.hideLoading()
+          if (res[0].code === -1 && res[1] === -1 && list && userInfo) {
+            uni.showToast({
+              title: '网络访问失败，请检查网络是否正常',
+              icon: 'none'
+            })
+
+            $lock.updateLockList(list)
+            $user.updateUserInfo(userInfo)
+            $user.updateLoginStatus(true)
+          }
+        })
+      } else {
+        // 封装 uni.login() 为 Promise
+        await new Promise((resolve, reject) => {
+          uni.login({
+            provider: 'weixin',
+            success: async loginRes => {
+              try {
+                const { code, data } = await loginRequest({
+                  js_code: loginRes.code
+                })
+                if (code === 0) {
+                  await setStorage('openid', data.openid)
+                  if (data.accessToken) {
+                    setStorage('token', data.accessToken)
+                    const list = getStorage('lockList')
+                    const userInfo = getStorage('userInfo')
+                    if (!list && !userInfo) {
+                      await $lock.getLockList($lock.lockSearch)
+                      await $user.getUserInfo()
+                      await $user.updateLoginStatus(true)
+                    }
+                  } else {
+                    $user.updateLoginStatus(false)
+                  }
+                  resolve() // 登录成功，resolve Promise
+                } else {
+                  throw new Error('登录请求失败')
+                }
+              } catch (err) {
+                console.error('登录过程出错:', err)
+                reject(err) // 登录过程出错，reject Promise
+              }
+            },
+            fail: err => {
+              console.error('微信登录失败:', err)
+              reject(err) // 微信登录失败，reject Promise
+            }
+          })
+        })
+      }
+      // 取第一个锁的信息作为首页的展示
+      const lock = list.flatMap(item => item.lockList)
+      console.log('lock', lock)
+      if (lock) {
+        const defaultShowLockIndex = 0
+        const data = {
+          ...lock[defaultShowLockIndex],
+          name: lock[defaultShowLockIndex].bluetooth.bluetoothDeviceName,
+          deviceId: lock[defaultShowLockIndex].bluetooth.bluetoothDeviceId,
+          commKey: lock[defaultShowLockIndex].bluetooth.privateKey,
+          signKey: lock[defaultShowLockIndex].bluetooth.signKey,
+          publicKey: lock[defaultShowLockIndex].bluetooth.publicKey
+        }
+        await $bluetooth.updateKeyId(lock[defaultShowLockIndex].keyId.toString())
+        await $bluetooth.updateCurrentLockInfo(data)
+        pickerOptions.value = lock.map(item => item.lockAlias)
+      }
+
+      if (Object.keys($bluetooth.currentLockInfo).length !== 0) {
+        if (!($bluetooth.bluetoothStatus === 0 || $bluetooth.bluetoothStatus === -1)) {
+          $bluetooth.getBluetoothStatus()
+          return
+        }
+
+        let result = true
+        if (!$bluetooth.isInitBluetooth) {
+          result = await $bluetooth.initAndListenBluetooth()
+        }
+        if (!result) {
+          $bluetooth.checkSetting()
+        }
+      }
+
+      // 确保登录完成后再执行后续操作
       deviceInfo.value = await $basic.getDeviceInfo()
       await getServeTime()
+    } catch (err) {
+      console.error('初始化过程出错:', err)
+      uni.showToast({
+        title: '登录失败，请重试',
+        icon: 'none'
+      })
+    } finally {
+      uni.hideLoading() // 无论成功失败，最后都隐藏 loading
+    }
   })
 
   const jumpToPlayer = async () => {
@@ -350,10 +478,27 @@
       return
     }
     // #endif
-    $basic.routeJump({ name: 'p2pPlayer' })
+    $basic.routeJump({
+      name: 'p2pPlayer'
+    })
   }
 
   const openDoorOperate = async type => {
+    if (!($bluetooth.bluetoothStatus === 0 || $bluetooth.bluetoothStatus === -1)) {
+      $bluetooth.getBluetoothStatus()
+      return
+    }
+
+    let result = true
+    if (!$bluetooth.isInitBluetooth) {
+      result = await $bluetooth.initAndListenBluetooth()
+    }
+    if (!result) {
+      $bluetooth.checkSetting()
+    }
+
+    isRotating.value = true
+
     const timestamp = new Date().getTime()
     if (
       $bluetooth.currentLockInfo.faceAuthentication === 1 &&
@@ -365,31 +510,37 @@
         content: '开门前需进行实名认证，小程序暂不支持，请使用APP认证开门',
         showCancel: false
       })
+      isRotating.value = false
       return
     }
     if (pending.value) {
+      isRotating.value = false
       return
     }
     if ($bluetooth.currentLockInfo.appUnlockOnline && type !== 'close') {
       const netWork = await $basic.getNetworkType()
       if (!netWork) {
+        isRotating.value = false
         return
       }
     }
     uni.vibrateLong()
     pending.value = true
-    sLoading.value.open()
+
     if (type === 'close') {
       uni.showToast({
         title: `正在尝试闭锁……`,
         icon: 'none'
       })
     }
-    if ($bluetooth.currentLockInfo.appUnlockOnline && type !== 'close') {
+    // if ($bluetooth.currentLockInfo.appUnlockOnline && type !== 'close') {
+    if ($bluetooth.currentLockInfo.appUnlockOnline) {
       const result = await getNetToken()
+
       if (!result) {
-        sLoading.value.close()
+        // sLoading.value.close()
         pending.value = false
+        isRotating.value = false
         return
       }
     }
@@ -399,6 +550,7 @@
     } else {
       openMode = $bluetooth.currentLockInfo.appUnlockOnline ? 1 : 0
     }
+
     const { code } = await $bluetooth.openDoor({
       name: $bluetooth.currentLockInfo.name,
       uid: $user.userInfo.uid.toString(),
@@ -464,8 +616,9 @@
         icon: 'none'
       })
     }
-    sLoading.value.close()
+
     pending.value = false
+    isRotating.value = false
   }
 
   const closePopup = () => {
@@ -509,7 +662,10 @@
       lockId: $bluetooth.currentLockInfo.lockId
     })
     if (code === 0) {
-      $bluetooth.updateCurrentLockInfo({ ...$bluetooth.currentLockInfo, ...data })
+      $bluetooth.updateCurrentLockInfo({
+        ...$bluetooth.currentLockInfo,
+        ...data
+      })
       uni.showToast({
         title: '刷新成功',
         icon: 'none'
@@ -523,6 +679,12 @@
     refresherTriggered.value = false
   }
 
+  const toSearchDevice = async () => {
+    $basic.routeJump({
+      name: 'addLockGuid'
+    })
+  }
+
   const deleteLock = async () => {
     const netWork = await $basic.getNetworkType()
     if (!netWork) {
@@ -574,6 +736,27 @@
       }
     })
   }
+
+  // picker 数据变化时触发
+  const onPickerChange = async e => {
+    const list = getStorage('lockList')
+    // 取第一个锁的信息作为首页的展示
+    const lock = list.flatMap(item => item.lockList)
+    if (lock) {
+      const defaultShowLockIndex = e.detail.value
+      const data = {
+        ...lock[defaultShowLockIndex],
+        name: lock[defaultShowLockIndex].bluetooth.bluetoothDeviceName,
+        deviceId: lock[defaultShowLockIndex].bluetooth.bluetoothDeviceId,
+        commKey: lock[defaultShowLockIndex].bluetooth.privateKey,
+        signKey: lock[defaultShowLockIndex].bluetooth.signKey,
+        publicKey: lock[defaultShowLockIndex].bluetooth.publicKey
+      }
+      await $bluetooth.updateKeyId(lock[defaultShowLockIndex].keyId.toString())
+      await $bluetooth.updateCurrentLockInfo(data)
+      pickerOptions.value = lock.map(item => item.lockAlias)
+    }
+  }
 </script>
 
 <style lang="scss" scoped>
@@ -625,14 +808,6 @@
     background: #faecc9;
   }
 
-  .lock-name {
-    padding: 32rpx 32rpx 0 32rpx;
-    font-size: 32rpx;
-    font-weight: bold;
-    text-align: center;
-    word-break: break-all;
-  }
-
   .top {
     position: relative;
     width: 686rpx;
@@ -669,32 +844,21 @@
       align-items: center;
       justify-content: flex-end;
       height: 50rpx;
-      padding-top: 18rpx;
 
       .power-icon {
         width: 50rpx;
         height: 30rpx;
-        margin-right: 10rpx;
       }
 
       .power-text {
-        margin-right: 10rpx;
         font-size: 32rpx;
-        font-weight: bold;
-        line-height: 50rpx;
       }
 
       .power-tips {
         width: 40rpx;
         height: 40rpx;
-        margin-right: 32rpx;
       }
     }
-
-    .switch-text {
-      margin-top: 10rpx;
-      text-align: center;
-    }
   }
 
   .bottom {
@@ -707,7 +871,7 @@
     height: 48rpx;
     font-size: 32rpx;
     line-height: 48rpx;
-    color: #63b8af;
+    color: #4777ee;
     background-color: rgba(0, 0, 0, 0.1);
     border-radius: 0 0 32rpx 32rpx;
 
@@ -758,8 +922,8 @@
         margin-bottom: 48rpx;
 
         .menu-main-image {
-          width: 40rpx;
+          width: 48rpx;
-          height: 40rpx;
+          height: 48rpx;
           margin-bottom: 10rpx;
         }
       }
@@ -795,4 +959,138 @@
       margin-left: 32rpx;
     }
   }
+
+  .not-devices-box {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    color: gray;
+    font-size: 24rpx;
+    width: 100%;
+    height: 100vh;
+    gap: 20rpx;
+    position: relative;
+
+    image {
+      width: 320rpx;
+      height: 240rpx;
+    }
+
+    .add-new-lock {
+      background-color: #4777ee;
+      color: white;
+    }
+
+    .button-add-big {
+      position: absolute;
+      width: 88rpx;
+      height: 88rpx;
+      right: 55rpx;
+      bottom: 55rpx;
+    }
+  }
+
+  .select-lock-row {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    border-radius: 15rpx;
+    padding: 8rpx 24rpx;
+
+    .lock-name {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      gap: 18rpx;
+      border-radius: 50rpx;
+      margin-top: 24rpx;
+      margin-bottom: 32rpx;
+      font-size: 32rpx;
+      background-color: #4777ee;
+      color: white;
+      padding: 12rpx 32rpx;
+      .icon-down {
+        width: 32rpx;
+        height: 32rpx;
+      }
+    }
+
+    .power {
+      display: flex;
+      align-items: center;
+      gap: 12rpx;
+
+      .power-icon {
+        width: 50rpx;
+        height: 30rpx;
+      }
+
+      .power-text {
+        font-size: 32rpx;
+      }
+
+      .power-tips {
+        width: 40rpx;
+        height: 40rpx;
+      }
+    }
+  }
+  .open-lock-btn {
+    display: flex;
+    justify-content: center;
+    position: relative;
+    height: 480rpx;
+    margin-top: 18rpx;
+    margin-bottom: 18rpx;
+    .open-lock-btn-image-1 {
+      width: 480rpx;
+      height: 480rpx;
+      position: absolute;
+    }
+    .open-lock-btn-image-2 {
+      width: 480rpx;
+      height: 480rpx;
+      position: absolute;
+      transition: transform 0.6s ease-in-out;
+    }
+  }
+  /* 旋转动画 class */
+  .rotate {
+    animation: rotate 2s linear infinite; /* 无限旋转动画 */
+  }
+  @keyframes rotate {
+    from {
+      transform: rotate(0deg);
+    }
+    to {
+      transform: rotate(360deg);
+    }
+  }
+  .switch-text {
+    margin-top: 35rpx;
+    font-size: 32rpx;
+    color: #414141;
+    text-align: center;
+  }
+  .other-text {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 15rpx;
+    margin-top: 35rpx;
+
+    .bottom-side {
+      display: flex;
+      align-items: center;
+      font-size: 32rpx;
+      gap: 10rpx;
+    }
+
+    .bottom-icon {
+      width: 48rpx;
+      height: 48rpx;
+    }
+  }
 </style>

pages/main/mine.vue

@@ -1,74 +1,75 @@
 <template>
 	<view v-if="buttonInfo">
 		<view v-if="isLogin">
-      <view class="view">
+			<view class="account-info" @click="toUsereInfo">
-        <view class="view-button" @click="toUsereInfo">
+				<image class="avatar" :src="userInfo.headUrl" mode="aspectFill"></image>
-          <view>个人信息</view>
+				<view class="account-nickname">
-          <image
+					<text class="nickname">{{ userInfo.nickname }}</text>
-            class="icon-arrow"
+					<text class="account">{{ userInfo.mobile }}</text>
-            src="https://oss-lock.xhjcn.ltd/mp/icon_arrow.png"
-            mode="aspectFill"
-          ></image>
 				</view>
-        <view class="view-line"></view>
+			</view>
+			<view class="follow-official-account">
+				<text>关注公众号，接收更多消息提醒</text>
 				<!-- #ifdef MP-WEIXIN -->
+				<official-account><view class="follow-btn">关注公众号</view></official-account>
+				<!-- #endif -->
+				<view class="follow-btn" @click="jumpToWeChatfficialAccount">关注公众号</view>
+			</view>
 			<label for="contact">
-          <view class="view-button">
+				<view class="option-item">
-            <view>客服</view>
+					<view class="icon-label">
-            <image
+						<image class="left-icon" src="https://cos-lock.skychip.top/mp/icon_customer_service.png">
-              class="icon-arrow"
+						</image>
-              src="https://oss-lock.xhjcn.ltd/mp/icon_arrow.png"
+						<text>人工客服</text>
-              mode="aspectFill"
+					</view>
-            ></image>
+					<image class="icon-arrow" src="https://cos-lock.skychip.top/mp/icon_arrow.png" mode="aspectFill">
+					</image>
 				</view>
 			</label>
-        <!-- #endif -->
+			<view class="view">
 				<!-- #ifdef APP-PLUS -->
 				<view @click="toContact">
 					<view class="view-button">
 						<view>客服</view>
-            <image
+						<image class="icon-arrow" src="https://cos-lock.skychip.top/mp/icon_arrow.png"
-              class="icon-arrow"
+							mode="aspectFill">
-              src="https://oss-lock.xhjcn.ltd/mp/icon_arrow.png"
+						</image>
-              mode="aspectFill"
-            ></image>
 					</view>
 				</view>
 				<!-- #endif -->
+				<view class="view-button">
+					<view>邮箱 / 商务合作</view>
+					<text class="right-text">{{env.officialEmail}}</text>
+				</view>
+				<view class="view-line"></view>
+				<view class="view-button">
+					<view>官网</view>
+					<text class="right-text">{{env.officialWebsite}}</text>
+				</view>
 				<view class="view-line"></view>
 				<view class="view-button" @click="toWebview()">
 					<view>公司介绍</view>
-          <image
+					<image class="icon-arrow" src="https://cos-lock.skychip.top/mp/icon_arrow.png" mode="aspectFill">
-            class="icon-arrow"
+					</image>
-            src="https://oss-lock.xhjcn.ltd/mp/icon_arrow.png"
-            mode="aspectFill"
-          ></image>
 				</view>
 				<view class="view-line"></view>
 				<view class="view-button" @click="toWebview('userAgreement')">
 					<view>用户协议</view>
-          <image
+					<image class="icon-arrow" src="https://cos-lock.skychip.top/mp/icon_arrow.png" mode="aspectFill">
-            class="icon-arrow"
+					</image>
-            src="https://oss-lock.xhjcn.ltd/mp/icon_arrow.png"
-            mode="aspectFill"
-          ></image>
 				</view>
 				<view class="view-line"></view>
 				<view class="view-button" @click="toWebview('privacy')">
 					<view>隐私政策</view>
-          <image
+					<image class="icon-arrow" src="https://cos-lock.skychip.top/mp/icon_arrow.png" mode="aspectFill">
-            class="icon-arrow"
+					</image>
-            src="https://oss-lock.xhjcn.ltd/mp/icon_arrow.png"
-            mode="aspectFill"
-          ></image>
 				</view>
 			</view>
 			<view class="env" v-if="env">
 				<view class="env-text">{{ env.name }} {{ env.version }}+{{ env.buildNumber }}</view>
 				<view>{{ env.baseUrl.split('/').slice(0, 3).join('/') }}</view>
-        <view v-if="envVersion !== 'release' && env" class="env-button" @click="show = true"
+				<view v-if="!(envVersion === 'release' || nodeEnv === 'production') && env" class="env-button"
-          >切换环境</view
+					@click="show = true">切换环境</view>
-        >
 			</view>
 			<!-- #ifdef MP-WEIXIN -->
 			<label for="changePhone">
@@ -88,53 +89,54 @@
 			<view class="env" v-if="env">
 				<view class="env-text">{{ env.name }} {{ env.version }}+{{ env.buildNumber }}</view>
 				<view>{{ env.baseUrl.split('/').slice(0, 3).join('/') }}</view>
-        <view
+				<view v-if="!(envVersion === 'release' || nodeEnv === 'production') && env" class="env-button"
-          v-if="(envVersion !== 'release' || nodeEnv === 'development') && env"
+					@click="show = true">
-          class="env-button"
-          @click="show = true"
-        >
 					切换环境
 				</view>
 			</view>
 		</view>
 	</view>
 	<button open-type="contact" style="display: none" id="contact"></button>
-  <button
+	<button open-type="getPhoneNumber" style="display: none" id="phone" @getphonenumber="getphonenumber"></button>
-    open-type="getPhoneNumber"
+	<button open-type="getPhoneNumber" style="display: none" id="changePhone" @getphonenumber="changePhone"></button>
-    style="display: none"
+	<up-action-sheet :actions="envList" :closeOnClickOverlay="true" title="切换环境" cancelText="取消"
-    id="phone"
+		:closeOnClickAction="true" :show="show" :safeAreaInsetBottom="true" @close="show = false"
-    @getphonenumber="getphonenumber"
+		@select="selectEnv"></up-action-sheet>
-  ></button>
-  <button
-    open-type="getPhoneNumber"
-    style="display: none"
-    id="changePhone"
-    @getphonenumber="changePhone"
-  ></button>
-  <up-action-sheet
-    :actions="envList"
-    :closeOnClickOverlay="true"
-    title="切换环境"
-    cancelText="取消"
-    :closeOnClickAction="true"
-    :show="show"
-    :safeAreaInsetBottom="true"
-    @close="show = false"
-    @select="selectEnv"
-  ></up-action-sheet>
 </template>
 
 <script>
-  import { mapState, mapActions } from 'pinia'
+	import {
-  import { useBasicStore } from '@/stores/basic'
+		mapState,
-  import { useUserStore } from '@/stores/user'
+		mapActions
-  import { useLockStore } from '@/stores/lock'
+	} from 'pinia'
-  import { phoneLoginRequest, logoutRequest } from '@/api/user'
+	import {
+		useBasicStore
+	} from '@/stores/basic'
+	import {
+		useUserStore
+	} from '@/stores/user'
+	import {
+		useLockStore
+	} from '@/stores/lock'
+	import {
+		phoneLoginRequest,
+		logoutRequest
+	} from '@/api/user'
 	import env from '@/config/env'
-  import { setStorage, getStorage, removeStorage } from '@/utils/storage'
+	import {
-  import { useNotificationStore } from '@/stores/notification'
+		setStorage,
-  import { getAppInfoRequest } from '@/api/system'
+		getStorage,
-
+		removeStorage
+	} from '@/utils/storage'
+	import {
+		useNotificationStore
+	} from '@/stores/notification'
+	import {
+		getAppInfoRequest
+	} from '@/api/system'
+	import {
+		loginRequest
+	} from '@/api/user'
 	export default {
 		data() {
 			return {
@@ -147,7 +149,7 @@
 			}
 		},
 		computed: {
-      ...mapState(useUserStore, ['isLogin']),
+			...mapState(useUserStore, ['isLogin', 'userInfo']),
 			...mapState(useLockStore, ['lockSearch']),
 			...mapState(useNotificationStore, ['notificationSearch'])
 		},
@@ -219,7 +221,11 @@
 					provider: 'weixin',
 					async success(loginRes) {
 						const openid = getStorage('openid')
-            const { code, data, message } = await phoneLoginRequest({
+						const {
+							code,
+							data,
+							message
+						} = await phoneLoginRequest({
 							encryptedData: res.detail.encryptedData,
 							iv: res.detail.iv,
 							rebind: true,
@@ -266,7 +272,6 @@
 				if (data.detail.errMsg === 'getPhoneNumber:fail user deny') {
 					return
 				}
-
 				const that = this
 				uni.showLoading({
 					title: '登录中'
@@ -307,6 +312,9 @@
 						type
 					}
 				})
+			},
+			jumpToWeChatfficialAccount(){
+				
 			},
 			logout() {
 				uni.showModal({
@@ -347,22 +355,90 @@
 	}
 
 	.view {
-    width: 710rpx;
-    margin-top: 32rpx;
-    margin-left: 20rpx;
 		background: #ffffff;
-    border-radius: 32rpx;
+		border-radius: 16rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		margin: 20rpx 20rpx;
+		padding: 20rpx 20rpx;
+		gap: 20rpx;
 	}
 
-  .view-button {
+	.follow-official-account {
+		margin: 20rpx 20rpx;
+		background-image: url('https://cos-lock.skychip.top/mp/follow_official_account_bg.png');
+		background-size: cover;
+		background-position: center;
+		background-repeat: no-repeat;
+		height: 88rpx;
+		border-radius: 16rpx;
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-    padding: 0 20rpx 0 40rpx;
+		color: white;
+		font-weight: 400;
+		font-size: 28rpx;
+		padding-left: 20rpx;
+		padding-right: 20rpx;
+
+		.follow-btn {
+			display: flex;
+			align-items: center;
+			padding: 12rpx 20rpx;
+			background-color: white;
+			border-radius: 16rpx;
+			color: #4777ee;
+		}
+	}
+
+	.account-info {
+		margin: 20rpx 20rpx;
+		padding-left: 20rpx;
+		padding-top: 20rpx;
+		padding-bottom: 20rpx;
+		padding-right: 20rpx;
+		display: flex;
+		gap: 18rpx;
+		align-items: center;
+		border-radius: 16rpx;
+		background-color: white;
+
+		.avatar {
+			width: 120rpx;
+			height: 120rpx;
+		}
+
+		.account-nickname {
+			display: flex;
+			flex-direction: column;
+			gap: 12rpx;
+
+			.nickname {
 				font-size: 32rpx;
-    font-weight: bold;
+				font-weight: 600;
-    line-height: 80rpx;
+			}
-    color: #292826;
+
+			.account {
+				font-size: 24rpx;
+				color: gray;
+				font-weight: 500;
+			}
+		}
+	}
+
+	.view-button {
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		border-radius: 16rpx;
+		font-size: 28rpx;
+
+		.right-text {
+			font-size: 28rpx;
+			color: gray;
+		}
 	}
 
 	.icon-arrow {
@@ -387,7 +463,7 @@
 		line-height: 80rpx;
 		color: #ffffff;
 		text-align: center;
-    background: #63b8af;
+		background: #4777ee;
 		border-radius: 46rpx;
 	}
 
@@ -431,7 +507,7 @@
 		line-height: 120rpx;
 		color: #ffffff;
 		text-align: center;
-    background: #63b8af;
+		background: #4777ee;
 		border-radius: 46rpx;
 	}
 
@@ -442,4 +518,26 @@
 		color: #999999;
 		text-align: center;
 	}
+
+	.option-item {
+		background-color: white;
+		display: flex;
+		padding: 20rpx 20rpx;
+		margin-left: 20rpx;
+		margin-right: 20rpx;
+		border-radius: 16rpx;
+		align-items: center;
+		justify-content: space-between;
+
+		.left-icon {
+			width: 52rpx;
+			height: 52rpx;
+		}
+
+		.icon-label {
+			display: flex;
+			align-items: center;
+			gap: 12rpx;
+		}
+	}
 </style>

pages/main/notificationList.vue

@@ -78,7 +78,7 @@
   >
     <image
       class="delete-image"
-      src="https://oss-lock.xhjcn.ltd/mp/icon_delete.png"
+      src="https://cos-lock.skychip.top/mp/icon_delete.png"
       mode="aspectFill"
     />
   </view>
@@ -409,7 +409,7 @@
     justify-content: center;
     width: 100rpx;
     height: 100rpx;
-    background-color: #5db5aa;
+    background-color: #4777ee;
     border-radius: 50%;
 
     .delete-image {
@@ -448,7 +448,7 @@
     line-height: 120rpx;
     color: #ffffff;
     text-align: center;
-    background: #63b8af;
+    background: #4777ee;
     border-radius: 46rpx;
   }
 </style>

pages/others/cycleDate.vue

@@ -32,7 +32,7 @@
             <view
               v-for="(item, index) in list"
               :key="index"
-              :class="[weekDays.includes(index + 1) ? 'bg-#5eb7ac text-white' : '']"
+              :class="[weekDays.includes(index + 1) ? 'bg-#4777ee text-white' : '']"
               @click="
                 weekDays.includes(index + 1)
                   ? weekDays.splice(weekDays.indexOf(index + 1), 1)
@@ -71,7 +71,7 @@
     </view>
     <view
       :class="[
-        canSubmit ? 'bg-[#5eb7ac]' : 'bg-[#9d9da3]',
+        canSubmit ? 'bg-[#4777ee]' : 'bg-[#9d9da3]',
         'mx-4',
         'h-100',
         'text-white',

pages/others/temporaryDate.vue

@@ -26,7 +26,7 @@
     </view>
     <view
       :class="[
-        canSubmit ? 'bg-[#5eb7ac]' : 'bg-[#9d9da3]',
+        canSubmit ? 'bg-[#4777ee]' : 'bg-[#9d9da3]',
         'mx-4',
         'h-100',
         'text-white',

pages/p2p/videoLog.vue

@@ -54,7 +54,7 @@
             >
               <view class="mx-2">
                 <view class="flex items-start">
-                  <view class="bg-#63b8af size-15 rounded-full mr-2 mt-1.5"></view>
+                  <view class="bg-#4777ee size-15 rounded-full mr-2 mt-1.5"></view>
                   <view class="w-full">
                     <view class="font-bold flex justify-between w-full">
                       <view>{{ item.event_type_name }}</view>
@@ -303,7 +303,7 @@
 
   const color = computed(() => {
     if (info.value?.status === 1) {
-      return '#63b8af'
+      return '#4777ee'
     }
     if (info.value?.status === 2) {
       return 'red'

pages/setting/autoLock.vue

@@ -39,7 +39,7 @@
     </view>
     <view
       v-if="$bluetooth.currentLockSetting.lockBasicInfo.keyRight === 1"
-      :class="[canUpdate ? 'bg-#63b8af' : 'bg-#a3a3a3']"
+      :class="[canUpdate ? 'bg-#4777ee' : 'bg-#a3a3a3']"
       class="mt-4 rounded-3xl w-600 h-80 line-height-80rpx text-center mx-75rpx text-white text-xl font-bold"
       @click="update"
     >

pages/setting/catEyeMode.vue

@@ -238,7 +238,7 @@
         </view>
         <view
           @click="show = false"
-          class="w-686 mx-4 text-center h-88 line-height-88rpx mt-5 text-white bg-#63b8af rounded-44rpx"
+          class="w-686 mx-4 text-center h-88 line-height-88rpx mt-5 text-white bg-#4777ee rounded-44rpx"
           >我知道了</view
         >
       </view>

pages/setting/coercionFingerprint.vue

@@ -69,7 +69,7 @@
     <view
       v-if="list.length > 0"
       @click="confirm"
-      class="pos-fixed bottom-[calc(env(safe-area-inset-bottom)+48rpx)] w-686 mx-4 h-88 line-height-88rpx text-center bg-#63b8af text-white rounded-3xl"
+      class="pos-fixed bottom-[calc(env(safe-area-inset-bottom)+48rpx)] w-686 mx-4 h-88 line-height-88rpx text-center bg-#4777ee text-white rounded-3xl"
       >确定
     </view>
   </view>
@@ -266,7 +266,7 @@
       line-height: 88rpx;
       color: white;
       text-align: center;
-      background-color: #63b8af;
+      background-color: #4777ee;
       border-radius: 44rpx;
     }
   }

pages/setting/lockDate.vue

@@ -6,7 +6,7 @@
       }}</view>
     </view>
     <view
-      class="bg-#63b8af mt-4 rounded-3xl w-600 h-80 line-height-80rpx text-center mx-75rpx text-white text-xl font-bold"
+      class="bg-#4777ee mt-4 rounded-3xl w-600 h-80 line-height-80rpx text-center mx-75rpx text-white text-xl font-bold"
       @click="update"
     >
       校准时间

pages/setting/lockSound.vue

@@ -31,7 +31,7 @@
       </view>
     </view>
     <view
-      :class="[canUpdate ? 'bg-#63b8af' : 'bg-#a3a3a3']"
+      :class="[canUpdate ? 'bg-#4777ee' : 'bg-#a3a3a3']"
       class="mt-4 rounded-3xl w-600 h-80 line-height-80rpx text-center mx-75rpx text-white text-xl font-bold"
       @click="update"
     >

pages/setting/lockUser.vue

@@ -65,7 +65,7 @@
     <view
       v-if="list.length > 0"
       @click="confirm"
-      class="pos-fixed bottom-[calc(env(safe-area-inset-bottom)+48rpx)] w-686 mx-4 h-88 line-height-88rpx text-center bg-#63b8af text-white rounded-3xl"
+      class="pos-fixed bottom-[calc(env(safe-area-inset-bottom)+48rpx)] w-686 mx-4 h-88 line-height-88rpx text-center bg-#4777ee text-white rounded-3xl"
       >确定
     </view>
   </view>
@@ -376,7 +376,7 @@
       line-height: 88rpx;
       color: white;
       text-align: center;
-      background-color: #63b8af;
+      background-color: #4777ee;
       border-radius: 44rpx;
     }
   }

pages/setting/lowElecNotice.vue

@@ -46,7 +46,7 @@
     </view>
     <view
       @click="update"
-      class="pos-fixed bg-#63b8af bottom-[calc(env(safe-area-inset-bottom)+48rpx)] w-686 mx-4 h-88 line-height-88rpx text-center text-white rounded-3xl"
+      class="pos-fixed bg-#4777ee bottom-[calc(env(safe-area-inset-bottom)+48rpx)] w-686 mx-4 h-88 line-height-88rpx text-center text-white rounded-3xl"
       >保存
     </view>
   </view>

pages/setting/notOpenDoor.vue

@@ -55,7 +55,7 @@
     </view>
     <view
       @click="update"
-      class="pos-fixed bg-#63b8af bottom-[calc(env(safe-area-inset-bottom)+48rpx)] w-686 mx-4 h-88 line-height-88rpx text-center text-white rounded-3xl"
+      class="pos-fixed bg-#4777ee bottom-[calc(env(safe-area-inset-bottom)+48rpx)] w-686 mx-4 h-88 line-height-88rpx text-center text-white rounded-3xl"
       >保存
     </view>
     <up-picker

pages/setting/noticeDetail.vue

@@ -89,7 +89,7 @@
       v-else
       @click="create"
       class="pos-fixed bottom-[calc(env(safe-area-inset-bottom)+48rpx)] w-686 mx-4 h-88 line-height-88rpx text-center text-white rounded-3xl"
-      :class="[canCreate ? 'bg-#63b8af' : 'bg-#9d9ca1']"
+      :class="[canCreate ? 'bg-#4777ee' : 'bg-#9d9ca1']"
       >保存
     </view>
     <ModalInput

pages/setting/noticeWay.vue

@@ -86,7 +86,7 @@
 
     <view
       @click="confirm"
-      class="mt-10 w-686 mx-4 h-88 line-height-88rpx text-center bg-#63b8af text-white rounded-3xl"
+      class="mt-10 w-686 mx-4 h-88 line-height-88rpx text-center bg-#4777ee text-white rounded-3xl"
       >确定
     </view>
   </view>

pages/setting/passageMode.vue

@@ -21,7 +21,7 @@
             <view
               v-for="(item, index) in list"
               :key="index"
-              :class="[weekDays.includes(index + 1) ? 'bg-#5eb7ac text-white' : '']"
+              :class="[weekDays.includes(index + 1) ? 'bg-#4777ee text-white' : '']"
               @click="changeSelect(index)"
               class="rounded-50% border-solid border-3 border-gray-400 flex items-center justify-center w-70 h-70"
               >{{ item }}
@@ -76,7 +76,7 @@
     </view>
     <view
       @click="confirm"
-      :class="[canUpdate ? 'bg-#63b8af' : 'bg-#a3a3a3']"
+      :class="[canUpdate ? 'bg-#4777ee' : 'bg-#a3a3a3']"
       class="pos-fixed bottom-[calc(env(safe-area-inset-bottom)+48rpx)] w-686 mx-4 h-88 line-height-88rpx text-center text-white rounded-3xl"
       >保存
     </view>

pages/setting/selectGroup.vue

@@ -25,7 +25,7 @@
     </scroll-view>
     <view
       @click="() => $refs.modalInput.open()"
-      class="bg-#63b8af text-white pos-fixed bottom-[calc(env(safe-area-inset-bottom)+48rpx)] rounded-44rpx w-686 ml-4 h-88 line-height-88rpx text-lg font-bold text-center"
+      class="bg-#4777ee text-white pos-fixed bottom-[calc(env(safe-area-inset-bottom)+48rpx)] rounded-44rpx w-686 ml-4 h-88 line-height-88rpx text-lg font-bold text-center"
       >创建新分组</view
     >
     <ModalInput

pages/setting/setting.vue

@@ -321,7 +321,9 @@
         icon: 'none'
       })
     }
+    // #ifdef MP
     await asyncSetting()
+    // #endif
   })
 
   const upgrade = () => {
@@ -568,6 +570,7 @@
               authUid: $user.userInfo.uid.toString(),
               keyId: $bluetooth.keyId.toString()
             })
+            console.log('resetDeviceCode', resetDeviceCode)
             if (resetDeviceCode === 0 || resetDeviceCode === -2) {
               const { code, message } = await deleteLockRequest({
                 lockId: $bluetooth.currentLockInfo.lockId
@@ -600,11 +603,12 @@
             })
             if (code === 0) {
               uni.hideLoading()
-              $lock.updateLockSearch({
+              await $lock.updateLockSearch({
                 ...$lock.lockSearch,
                 pageNo: 1
               })
-              $lock.getLockList($lock.lockSearch)
+              await $lock.getLockList($lock.lockSearch)
+              await $bluetooth.updateCurrentLockInfo({})
               $basic.backAndToast('删除成功', 2)
             } else {
               uni.hideLoading()

pages/setting/syncElec.vue

@@ -18,7 +18,7 @@
       </view>
       <view
         @click="updateElectricQuantity"
-        class="w-full bg-#63b8af text-white line-height-80rpx h-80 rounded-40rpx text-center mt-4 text-lg font-bold"
+        class="w-full bg-#4777ee text-white line-height-80rpx h-80 rounded-40rpx text-center mt-4 text-lg font-bold"
         >更新</view
       >
     </view>

pages/setting/updateSetting.vue

@@ -20,7 +20,7 @@
       </view>
       <view
         @click="update"
-        class="w-full bg-#63b8af text-white line-height-80rpx h-80 rounded-40rpx text-center mt-4 text-lg font-bold"
+        class="w-full bg-#4777ee text-white line-height-80rpx h-80 rounded-40rpx text-center mt-4 text-lg font-bold"
         >{{ $bluetooth.currentLockSetting.lockSettingInfo[type] === 1 ? '关闭' : '开启' }}</view
       >
     </view></view

pages/setting/uploadLockData.vue

@@ -6,7 +6,7 @@
       </view>
       <view
         @click="asyncData"
-        class="w-full bg-#63b8af text-white line-height-80rpx h-80 rounded-40rpx text-center mt-4 text-lg font-bold"
+        class="w-full bg-#4777ee text-white line-height-80rpx h-80 rounded-40rpx text-center mt-4 text-lg font-bold"
       >
         开始
       </view>

pages/setting/videoSlot.vue

@@ -76,7 +76,7 @@
     ></up-picker>
     <view
       @click="confirm"
-      class="mt-10 w-686 mx-4 h-88 line-height-88rpx text-center bg-#63b8af text-white rounded-3xl"
+      class="mt-10 w-686 mx-4 h-88 line-height-88rpx text-center bg-#4777ee text-white rounded-3xl"
       >确定
     </view>
   </view>

pages/user/deleteAccount.vue

@@ -141,7 +141,7 @@
     line-height: 108rpx;
     color: #ffffff;
     text-align: center;
-    background: #63b8af;
+        background: #4777ee;
     border-radius: 16rpx;
   }
 
@@ -177,7 +177,7 @@
     line-height: 96rpx;
     color: #ffffff;
     text-align: center;
-    background: #63b8af;
+        background: #4777ee;
     border-radius: 16rpx;
   }
 </style>

pages/user/forgotPassword.vue

@@ -105,7 +105,7 @@
       </view>
       <view
         class="w-full rounded-full h-88 text-center leading-[88rpx] text-white mt-6"
-        :class="[canResetPassword ? 'bg-#63b8af' : 'bg-#9d9da1']"
+        :class="[canResetPassword ? 'bg-#4777ee' : 'bg-#9d9da1']"
         @click="register"
       >
         重置密码

pages/user/login.vue

@@ -64,7 +64,7 @@
       </view>
       <view
         class="mt-4 w-full rounded-full h-88 text-center leading-[88rpx] text-white"
-        :class="[canLogin ? 'bg-#63b8af' : 'bg-#9d9da1']"
+        :class="[canLogin ? 'bg-#4777ee' : 'bg-#9d9da1']"
         @click="login"
       >
         登录

pages/user/register.vue

@@ -5,9 +5,9 @@
       @click="click"
       class="mx-4"
       lineWidth="300rpx"
-      lineColor="#63b8af"
+      lineColor="#4777ee"
       :activeStyle="{
-        color: '#63b8af',
+        color: '#4777ee',
         fontWeight: 'bold',
         transform: 'scale(1.05)'
       }"
@@ -136,7 +136,7 @@
       </view>
       <view
         class="w-full rounded-full h-88 text-center leading-[88rpx] text-white"
-        :class="[canRegister ? 'bg-#63b8af' : 'bg-#9d9da1']"
+        :class="[canRegister ? 'bg-#4777ee' : 'bg-#9d9da1']"
         @click="register"
       >
         注册

pages/user/updateAccount.vue

@@ -260,7 +260,7 @@
     line-height: 108rpx;
     color: #ffffff;
     text-align: center;
-    background: #63b8af;
+        background: #4777ee;
     border-radius: 16rpx;
   }
 
@@ -296,7 +296,7 @@
     line-height: 96rpx;
     color: #ffffff;
     text-align: center;
-    background: #63b8af;
+        background: #4777ee;
     border-radius: 16rpx;
   }
 </style>

pages/user/updateName.vue

@@ -110,7 +110,7 @@
     line-height: 96rpx;
     color: #ffffff;
     text-align: center;
-    background: #63b8af;
+        background: #4777ee;
     border-radius: 16rpx;
   }
 </style>

pages/user/updatePassword.vue

@@ -171,7 +171,7 @@
     line-height: 96rpx;
     color: #ffffff;
     text-align: center;
-    background: #63b8af;
+        background: #4777ee;
     border-radius: 16rpx;
   }
 
@@ -207,7 +207,7 @@
     line-height: 108rpx;
     color: #ffffff;
     text-align: center;
-    background: #63b8af;
+        background: #4777ee;
     border-radius: 16rpx;
   }
 </style>

pages/user/verifyAccount.vue

@@ -139,7 +139,7 @@
     line-height: 108rpx;
     color: #ffffff;
     text-align: center;
-    background: #63b8af;
+        background: #4777ee;
     border-radius: 16rpx;
   }
 
@@ -175,7 +175,7 @@
     line-height: 96rpx;
     color: #ffffff;
     text-align: center;
-    background: #63b8af;
+        background: #4777ee;
     border-radius: 16rpx;
   }
 </style>

stores/bluetooth.js

@@ -299,12 +299,14 @@ export const useBluetoothStore = defineStore('ble', {
     },
     // 监听蓝牙设备连接状态
     onBluetoothConnectStatus() {
-      const that = this
+      // 使用箭头函数，直接继承外层的 this（组件实例）
-      uni.onBLEConnectionStateChange(function (res) {
+      uni.onBLEConnectionStateChange(res => {
-        if (res.deviceId === that.currentLockInfo.deviceId) {
+        // 直接访问 this.currentLockInfo（最新值）
+        if (res.deviceId === this.currentLockInfo?.deviceId) {
           console.log('设备连接状态改变', res)
-          that.updateCurrentLockInfo({
+          // 更新 currentLockInfo（确保是响应式更新）
-            ...that.currentLockInfo,
+          this.updateCurrentLockInfo({
+            ...this.currentLockInfo,
             connected: res.connected
           })
         }
@@ -900,20 +902,24 @@ export const useBluetoothStore = defineStore('ble', {
           })
           // #endif
           // #ifdef APP-PLUS
-          const systemInfo = uni.getSystemInfoSync()
-          if (systemInfo.platform === 'android') {
-            const main = plus.android.runtimeMainActivity()
-            const Intent = plus.android.importClass('android.content.Intent')
-            const BluetoothAdapter = plus.android.importClass('android.bluetooth.BluetoothAdapter')
-            const intent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE)
-            main.startActivity(intent)
-          } else if (systemInfo.platform === 'ios') {
           uni.showModal({
             title: '提示',
             content: '蓝牙尚未打开，请先打开蓝牙',
-              showCancel: false
+            showCancel: false,
-            })
+            success(res) {
+              if (res.confirm) {
+                // #ifdef APP-ANDROID
+                const main = plus.android.runtimeMainActivity()
+                const Intent = plus.android.importClass('android.content.Intent')
+                const BluetoothAdapter = plus.android.importClass(
+                  'android.bluetooth.BluetoothAdapter'
+                )
+                const intent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE)
+                main.startActivity(intent)
+                // #endif
               }
+            }
+          })
           // #endif
         }
       } else if (this.bluetoothStatus === 2 || this.bluetoothStatus === 3) {
@@ -1023,7 +1029,7 @@ export const useBluetoothStore = defineStore('ble', {
                     fail(res) {
                       if (res.errCode === 10006) {
                         uni.showToast({
-                          title: '连接失败，请靠近设备并保持设备处于唤醒状态',
+                          title: '连接失败，请靠近设备并保持设备处于唤醒状态1',
                           icon: 'none'
                         })
                       }
@@ -1035,7 +1041,7 @@ export const useBluetoothStore = defineStore('ble', {
                 fail(res) {
                   if (res.errCode === 10006) {
                     uni.showToast({
-                      title: '连接失败，请靠近设备并保持设备处于唤醒状态',
+                      title: '连接失败，请靠近设备并保持设备处于唤醒状态2',
                       icon: 'none'
                     })
                   }
@@ -1187,6 +1193,7 @@ export const useBluetoothStore = defineStore('ble', {
                         uuid &&
                         uuid.slice(2, 8) === '758824' &&
                         (uuid.slice(30, 32) === '01' ||
+                          uuid.slice(30, 32) === '03' ||
                           that.bindedDeviceNameList.includes(that.currentLockInfo.name))
                       ) {
                         uni.stopBluetoothDevicesDiscovery()
@@ -1454,8 +1461,7 @@ export const useBluetoothStore = defineStore('ble', {
           )
 
           // #ifdef APP-PLUS
-          setTimeout(
+          setTimeout(() => {
-            () => {
             uni.writeBLECharacteristicValue({
               deviceId: that.currentLockInfo.deviceId,
               serviceId: that.currentLockInfo.serviceId,
@@ -1465,9 +1471,7 @@ export const useBluetoothStore = defineStore('ble', {
                 console.log('写入失败', res)
               }
             })
-            },
+          }, (i + 1) * 250)
-            (i + 1) * 250
-          )
           // #endif
 
           // #ifdef MP
@@ -2316,6 +2320,7 @@ export const useBluetoothStore = defineStore('ble', {
           this.currentLockInfo.transportType !== transportType.TRANSPORT_TENCENT_YUN
         ) {
           const searchResult = await this.searchAndConnectDevice()
+          console.log('searchResult', searchResult)
           if (searchResult.code === 0) {
             log.info({
               code: searchResult.code,