liyi/wx-starlock
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: liyi:08b0121560328bd63318b59c82f429690baa4bb7
Branches Tags
liyi:develop_sky_liyi
...
compare: liyi:5b66f6f9cb1e9aa971ed846ff4e8a8d5b035a949
Branches Tags
liyi:develop_sky_liyi

11 Commits
08b0121560 ... 5b66f6f9cb

Author SHA1 Message Date
liyi
5b66f6f9cb feat: 新增sky分支 2025-10-27 09:58:13 +08:00
liyi
ada5dfdff5 feat:新增sky分支 2025-07-29 11:07:43 +08:00
liuyanfeng
d5fee10abe android权限梳理 2025-07-17 15:46:09 +08:00
范鹏
457816b1a3 Merge branch 'fanpeng' into 'develop' 
Fanpeng

See merge request StarlockTeam/wx-starlock!53
 2025-07-17 03:57:49 +00:00
fanpeng
2d14058c01 feat: 更新manifest.json，将版本号提升至1.3.4，优化环境判断逻辑以提升代码可读性 2025-07-17 11:45:38 +08:00
fanpeng
ceedea7fb0 feat: 更新manifest.json，将targetSdkVersion提升至35，以支持最新Android特性 2025-07-17 10:34:13 +08:00
fanpeng
0bb5137eb4 feat: 更新manifest.json，优化配置格式，调整环境判断逻辑以提升代码可读性 2025-07-17 10:26:21 +08:00
fanpeng
b3f15396cb feat: 更新manifest.json，提升版本号至1.3.2+41，优化Android和iOS的图标配置及权限设置 2025-07-16 17:32:42 +08:00
fanpeng
bf5930e319 feat: 优化锁详情和设置页面的逻辑，调整蓝牙解锁条件，增加平台判断 2025-07-16 16:30:06 +08:00
fanpeng
406466d792 feat: 更新manifest.json和蓝牙逻辑，优化蓝牙未开启提示，增强用户交互体验 2025-07-16 15:38:47 +08:00
范鹏
bc155e6b48 Merge branch 'fanpeng' into 'develop' 
Fanpeng

See merge request StarlockTeam/wx-starlock!52
 2025-07-15 06:49:47 +00:00
67 changed files with 1933 additions and 1537 deletions
Show Stats Expand all files Collapse all files

6
App.vue
View File

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

8
components/SwitchLoading/SwitchLoading.vue
View File

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

86
config/env.js
View File

@ -1,56 +1,72 @@
let version = '-' let version = '-'
let buildNumber = '-' let buildNumber = '-'
uni.getSystemInfo({ uni.getSystemInfo({
success(res) { success(res) {
version = res.appVersion version = res.appVersion
buildNumber = res.appVersionCode buildNumber = res.appVersionCode
} }
}) })
const DEV = { const DEV = {
name: 'dev', name: 'dev',
appName: '星星锁Lite', appName: '星星锁Lite',
baseUrl: 'https://lock.dev.star-lock.cn/api', baseUrl: 'https://lock.dev.star-lock.cn/api',
webviewBaseUrl: 'https://lock.dev.star-lock.cn', webviewBaseUrl: 'https://lock.dev.star-lock.cn',
version, officialEmail: '',
buildNumber officialWebsite: '',
version,
buildNumber
} }
const PRE = { const PRE = {
name: 'pre', name: 'pre',
appName: '星星锁Lite', appName: '星星锁Lite',
baseUrl: 'https://lock.pre.star-lock.cn/api', baseUrl: 'https://lock.pre.star-lock.cn/api',
webviewBaseUrl: 'https://lock.xhjcn.ltd', webviewBaseUrl: 'https://lock.xhjcn.ltd',
version, officialEmail: '',
buildNumber officialWebsite: '',
version,
buildNumber
} }
const XHJ = { const XHJ = {
name: 'xhj', name: 'xhj',
appName: '星星锁Lite', appName: '星星锁Lite',
baseUrl: 'https://lock.xhjcn.ltd/api', baseUrl: 'https://lock.xhjcn.ltd/api',
webviewBaseUrl: 'https://lock.xhjcn.ltd', webviewBaseUrl: 'https://lock.xhjcn.ltd',
version, officialEmail: '',
buildNumber officialWebsite: '',
version,
buildNumber
} }
const SKY = { const SKY = {
name: 'sky', name: 'sky',
appName: '星星锁Lite', appName: '锁通通',
baseUrl: 'https://lock.skychip.top/api', baseUrl: 'https://lock.skychip.top/api',
webviewBaseUrl: 'https://lock.skychip.top', webviewBaseUrl: 'https://lock.skychip.top',
version, officialEmail: 'contact@skychip.top',
buildNumber officialWebsite: 'www.skychip.top',
version,
buildNumber
} }
const GE = { const GE = {
name: 'ge', name: 'ge',
appName: '星星锁Lite', appName: '星星锁Lite',
baseUrl: 'http://lock.ge.star-lock.cn/api', baseUrl: 'http://lock.ge.star-lock.cn/api',
webviewBaseUrl: 'http://lock.ge.star-lock.cn', webviewBaseUrl: 'http://lock.ge.star-lock.cn',
version, officialEmail: '',
buildNumber officialWebsite: '',
version,
buildNumber
} }
// 更换环境的时候 切换导出就行 // 更换环境的时候 切换导出就行
export default { DEV, PRE, XHJ, SKY, GE } export default {
DEV,
PRE,
XHJ,
SKY,
GE
}

224
manifest.json
View File

@ -1,118 +1,116 @@
{ {
"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": {
"scope.bluetooth": {
"desc": "蓝牙将用于控制和管理您的智能门锁"
}
},
"usingComponents": true,
"lazyCodeLoading": "requiredComponents",
"optimization": {
"subPackages": true
},
"plugins": {
"wmpf-voip": {
"version": "latest",
"provider": "wxf830863afde621eb",
"genericsImplementation": {
"call-page-plugin": {
"custombox": "pages/main/customBox"
}
}
}
}
},
"vueVersion": "3",
"app-plus": {
"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": { "permission" : {
"appstore": "unpackage/res/icons/1024x1024.png", "scope.bluetooth" : {
"ipad": { "desc" : "蓝牙将用于控制和管理您的智能门锁"
"app": "unpackage/res/icons/76x76.png", }
"app@2x": "unpackage/res/icons/152x152.png", },
"notification": "unpackage/res/icons/20x20.png", "usingComponents" : true,
"notification@2x": "unpackage/res/icons/40x40.png", "lazyCodeLoading" : "requiredComponents",
"proapp@2x": "unpackage/res/icons/167x167.png", "optimization" : {
"settings": "unpackage/res/icons/29x29.png", "subPackages" : true
"settings@2x": "unpackage/res/icons/58x58.png", },
"spotlight": "unpackage/res/icons/40x40.png", "plugins" : {}
"spotlight@2x": "unpackage/res/icons/80x80.png" },
}, "vueVersion" : "3",
"iphone": { "app-plus" : {
"app@2x": "unpackage/res/icons/120x120.png", "optimization" : {
"app@3x": "unpackage/res/icons/180x180.png", "subPackages" : true
"notification@2x": "unpackage/res/icons/40x40.png", },
"notification@3x": "unpackage/res/icons/60x60.png", "runmode" : "liberate",
"settings@2x": "unpackage/res/icons/58x58.png", "distribute" : {
"settings@3x": "unpackage/res/icons/87x87.png", "icons" : {
"spotlight@2x": "unpackage/res/icons/80x80.png", "android" : {
"spotlight@3x": "unpackage/res/icons/120x120.png" "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.VIBRATE\"/>",
"<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.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\" />",
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\" />",
"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\" />",
"<uses-permission android:name=\"android.permission.BLUETOOTH\" />",
"<uses-permission android:name=\"android.permission.BLUETOOTH_SCAN\" />",
"<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.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",
"password" : "xhs2025",
"aliasname" : "xhs2025",
"keystore" : "./android.jks",
"targetSdkVersion" : 35,
"abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
},
"ios" : {
"dSYMs" : false
}
},
"modules" : {
"Bluetooth" : {
"description" : "低功耗蓝牙"
},
"VideoPlayer" : {
"description" : "视频播放"
},
"Camera" : {
"description" : "相机和相册"
},
"Record" : {
"description" : "录音"
}
},
"splashscreen" : {
"waiting" : false
} }
},
"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\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\" />",
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\" />",
"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\" />",
"<uses-permission android:name=\"android.permission.BLUETOOTH\" />",
"<uses-permission android:name=\"android.permission.BLUETOOTH_SCAN\" />",
"<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\"/>"
],
"packagename": "com.xhs.lock",
"password": "xhs2025",
"aliasname": "xhs2025",
"keystore": "./android.jks",
"targetSdkVersion": 34,
"abiFilters": ["armeabi-v7a", "arm64-v8a"]
},
"ios": {
"dSYMs": false
}
},
"modules": {
"Bluetooth": {},
"VideoPlayer": {},
"Camera": {},
"Record": {}
},
"splashscreen": {
"waiting": false
} }
}
} }

1343
pages.json
View File

File diff suppressed because it is too large Load Diff

14
pages/addDevice/addLockGuid.vue
View File

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

6
pages/addDevice/bindLock.vue
View File

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

2
pages/addDevice/searchDevice.vue
View File

@ -20,7 +20,7 @@
></image> ></image>
<view class="device-name">{{ device.name }}</view> <view class="device-name">{{ device.name }}</view>
</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>
</view> </view>
</scroll-view> </scroll-view>

4
pages/feature/adminDetail.vue
View File

@ -50,10 +50,10 @@
<up-icon name="arrow-right"></up-icon> <up-icon name="arrow-right"></up-icon>
</view> </view>
<view class="m-4 flex items-center justify-between text-base"> <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 ? '解冻' : '冻结' info.keyStatus === 110405 ? '解冻' : '冻结'
}}</view> }}</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 ? '取消授权管理员' : '授权管理员' info.keyRight === 1 ? '取消授权管理员' : '授权管理员'
}}</view> }}</view>
</view> </view>

2
pages/feature/adminList.vue
View File

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

2
pages/feature/bindFace.vue
View File

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

2
pages/feature/cardList.vue
View File

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

6
pages/feature/createAdmin.vue
View File

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

6
pages/feature/createCard.vue
View File

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

6
pages/feature/createFace.vue
View File

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

6
pages/feature/createFingerprint.vue
View File

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

6
pages/feature/createKey.vue
View File

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

6
pages/feature/createPalmVein.vue
View File

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

6
pages/feature/createPassword.vue
View File

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

6
pages/feature/createRemote.vue
View File

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

2
pages/feature/faceList.vue
View File

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

2
pages/feature/fingerprintList.vue
View File

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

4
pages/feature/keyDetail.vue
View File

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

4
pages/feature/keyList.vue
View File

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

2
pages/feature/palmVeinList.vue
View File

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

2
pages/feature/passwordList.vue
View File

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

2
pages/feature/recordList.vue
View File

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

2
pages/feature/remoteList.vue
View File

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

8
pages/main/home.vue
View File

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

588
pages/main/lockDetail.vue
View File

@ -3,79 +3,104 @@
<scroll-view <scroll-view
v-if="deviceInfo" v-if="deviceInfo"
scroll-y="true" scroll-y="true"
:style="{ height: deviceInfo.windowHeight - deviceInfo.safeArea.top + 'px' }" :style="{
height: deviceInfo.windowHeight - deviceInfo.safeArea.top + 'px'
}"
@refresherrefresh="refresher" @refresherrefresh="refresher"
:refresher-enabled="true" :refresher-enabled="true"
:refresher-triggered="refresherTriggered" :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 <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" mode="aspectFill"
style="width: 48rpx; height: 48rpx"
@click="toSearchDevice"
></image> ></image>
<view style="width: 100%; height: 50rpx"> <!-- 普通 picker -->
<view class="power" @click="powerTip"> <picker :range="pickerOptions" @change="onPickerChange">
<view class="lock-name">
<text>
{{ $bluetooth.currentLockInfo.lockAlias }}
</text>
<image <image
class="power-icon" class="icon-down"
:src="$lock.getPowerIcon($bluetooth.currentLockInfo.electricQuantity)" src="https://cos-lock.skychip.top/mp/icon_down.png"
mode="aspectFill" mode="aspectFill"
></image>
<view class="power-text">{{ $bluetooth.currentLockInfo.electricQuantity }}%</view>
<image
class="power-tips"
src="https://oss-lock.xhjcn.ltd/mp/icon_tips.png"
mode="aspectFill"
></image>
</view>
</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="bottom-side">
<image
class="bottom-icon"
src="https://oss-lock.xhjcn.ltd/mp/icon_role.png"
mode="aspectFill"
></image>
<view>{{
$lock.getRole(
$bluetooth.currentLockInfo.userType,
$bluetooth.currentLockInfo.keyRight
)
}}</view>
</view>
<view class="bottom-side">
<image
class="bottom-icon"
:src="
$bluetooth.currentLockInfo.appUnlockOnline
? 'https://oss-lock.xhjcn.ltd/mp/icon_cloud_active.png'
: 'https://oss-lock.xhjcn.ltd/mp/icon_cloud.png'
"
mode="aspectFill"
style="width: 40rpx; height: 40rpx"
></image>
<view
:style="{
color: $bluetooth.currentLockInfo.appUnlockOnline ? '#63b8af' : '#a3a3a3'
}"
>手机需联网</view
> >
</image>
</view> </view>
</picker>
<view class="power" @click="powerTip">
<image
class="power-icon"
:src="$lock.getPowerIcon($bluetooth.currentLockInfo.electricQuantity)"
mode="aspectFill"
></image>
<view class="power-text">{{ $bluetooth.currentLockInfo.electricQuantity }}%</view>
<image
class="power-tips"
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-text">点击开锁，长按闭锁</view>
<view class="other-text">
<view class="bottom-side">
<image
class="bottom-icon"
style="width: 32rpx; height: 32rpx"
src="https://cos-lock.skychip.top/mp/icon_role.png"
mode="aspectFill"
></image>
<view>{{
$lock.getRole($bluetooth.currentLockInfo.userType, $bluetooth.currentLockInfo.keyRight)
}}</view>
</view>
<view class="bottom-side">
<image
class="bottom-icon"
:src="
$bluetooth.currentLockInfo.appUnlockOnline
? 'https://cos-lock.skychip.top/mp/icon_cloud_active.png'
: 'https://cos-lock.skychip.top/mp/icon_cloud.png'
"
mode="aspectFill"
style="width: 40rpx; height: 40rpx"
></image>
<view
:style="{
color: $bluetooth.currentLockInfo.appUnlockOnline ? '#4777ee' : '#a3a3a3'
}"
>手机需联网</view
>
</view> </view>
</view> </view>
<view class="menu"> <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 class="menu-main">
<view <view
v-if=" v-if="
@ -86,8 +111,8 @@
@click="$basic.routeJump({ name: 'keyList' })" @click="$basic.routeJump({ name: 'keyList' })"
> >
<image <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> ></image>
<view>电子钥匙</view> <view>电子钥匙</view>
</view> </view>
@ -102,8 +127,9 @@
> >
<image <image
class="menu-main-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>
</view> </view>
<view <view
@ -117,7 +143,7 @@
> >
<image <image
class="menu-main-image transform-scale-110" 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> ></image>
<view>卡</view> <view>卡</view>
</view> </view>
@ -132,8 +158,9 @@
> >
<image <image
class="menu-main-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>
</view> </view>
<view <view
@ -147,7 +174,7 @@
> >
<image <image
class="menu-main-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> ></image>
<view>遥控</view> <view>遥控</view>
</view> </view>
@ -162,7 +189,7 @@
> >
<image <image
class="menu-main-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> ></image>
<view>人脸</view> <view>人脸</view>
</view> </view>
@ -177,7 +204,7 @@
> >
<image <image
class="menu-main-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> ></image>
<view>掌静脉</view> <view>掌静脉</view>
</view> </view>
@ -188,7 +215,7 @@
> >
<image <image
class="menu-main-image transform-scale-140" 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> ></image>
<view>监控</view> <view>监控</view>
</view> </view>
@ -202,7 +229,7 @@
> >
<image <image
class="menu-main-image transform-scale-140" 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> ></image>
<view>授权管理员</view> <view>授权管理员</view>
</view> </view>
@ -213,7 +240,7 @@
> >
<image <image
class="menu-main-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> ></image>
<view>操作记录</view> <view>操作记录</view>
</view> </view>
@ -224,57 +251,31 @@
> >
<image <image
class="menu-main-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> ></image>
<view>门锁记录</view> <view>门锁记录</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 <image
class="menu-main-image transform-scale-110" 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> ></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>
</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> </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 <up-popup
:show="show" :show="show"
@close="closePopup" @close="closePopup"
@ -303,7 +304,7 @@
<script setup> <script setup>
import { timeFormat } from 'uview-plus' import { timeFormat } from 'uview-plus'
import { onMounted, ref } from 'vue' import { onMounted, onUnmounted, ref } from 'vue'
import { useBluetoothStore } from '@/stores/bluetooth' import { useBluetoothStore } from '@/stores/bluetooth'
import { useBasicStore } from '@/stores/basic' import { useBasicStore } from '@/stores/basic'
import SwitchLoading from '@/components/SwitchLoading/SwitchLoading.vue' import SwitchLoading from '@/components/SwitchLoading/SwitchLoading.vue'
@ -312,6 +313,9 @@
import { getLockDetailRequest, getLockNetTokenRequest, deleteLockRequest } from '@/api/lock' import { getLockDetailRequest, getLockNetTokenRequest, deleteLockRequest } from '@/api/lock'
import { deleteKeyRequest } from '@/api/key' import { deleteKeyRequest } from '@/api/key'
import { transportType } from '@/constant/transportType' 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 // #ifdef APP-PLUS
import { requestPermission } from '@/uni_modules/xhj-record' import { requestPermission } from '@/uni_modules/xhj-record'
@ -322,7 +326,7 @@
const $lock = useLockStore() const $lock = useLockStore()
const $user = useUserStore() const $user = useUserStore()
const sLoading = ref(null) // const sLoading = ref(null)
const time = ref(0) const time = ref(0)
const onlineToken = ref('0') const onlineToken = ref('0')
@ -333,9 +337,133 @@
const deviceInfo = ref(null) const deviceInfo = ref(null)
// 控制是否应用旋转动画
const isRotating = ref(false)
// 选择器数据源（比如一个字符串数组）
const pickerOptions = ref([])
// 当前选中项的索引（picker 内部使用）
const selectedIndex = ref(0)
// 选中后展示的文本
const selectedText = ref(pickerOptions.value[0])
onMounted(async () => { onMounted(async () => {
deviceInfo.value = await $basic.getDeviceInfo() try {
await getServeTime() // #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 () => { const jumpToPlayer = async () => {
@ -350,10 +478,27 @@
return return
} }
// #endif // #endif
$basic.routeJump({ name: 'p2pPlayer' }) $basic.routeJump({
name: 'p2pPlayer'
})
} }
const openDoorOperate = async type => { 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() const timestamp = new Date().getTime()
if ( if (
$bluetooth.currentLockInfo.faceAuthentication === 1 && $bluetooth.currentLockInfo.faceAuthentication === 1 &&
@ -365,31 +510,37 @@
content: '开门前需进行实名认证，小程序暂不支持，请使用APP认证开门', content: '开门前需进行实名认证，小程序暂不支持，请使用APP认证开门',
showCancel: false showCancel: false
}) })
isRotating.value = false
return return
} }
if (pending.value) { if (pending.value) {
isRotating.value = false
return return
} }
if ($bluetooth.currentLockInfo.appUnlockOnline && type !== 'close') { if ($bluetooth.currentLockInfo.appUnlockOnline && type !== 'close') {
const netWork = await $basic.getNetworkType() const netWork = await $basic.getNetworkType()
if (!netWork) { if (!netWork) {
isRotating.value = false
return return
} }
} }
uni.vibrateLong() uni.vibrateLong()
pending.value = true pending.value = true
sLoading.value.open()
if (type === 'close') { if (type === 'close') {
uni.showToast({ uni.showToast({
title: `正在尝试闭锁……`, title: `正在尝试闭锁……`,
icon: 'none' icon: 'none'
}) })
} }
if ($bluetooth.currentLockInfo.appUnlockOnline && type !== 'close') { // if ($bluetooth.currentLockInfo.appUnlockOnline && type !== 'close') {
if ($bluetooth.currentLockInfo.appUnlockOnline) {
const result = await getNetToken() const result = await getNetToken()
if (!result) { if (!result) {
sLoading.value.close() // sLoading.value.close()
pending.value = false pending.value = false
isRotating.value = false
return return
} }
} }
@ -399,6 +550,7 @@
} else { } else {
openMode = $bluetooth.currentLockInfo.appUnlockOnline ? 1 : 0 openMode = $bluetooth.currentLockInfo.appUnlockOnline ? 1 : 0
} }
const { code } = await $bluetooth.openDoor({ const { code } = await $bluetooth.openDoor({
name: $bluetooth.currentLockInfo.name, name: $bluetooth.currentLockInfo.name,
uid: $user.userInfo.uid.toString(), uid: $user.userInfo.uid.toString(),
@ -464,8 +616,9 @@
icon: 'none' icon: 'none'
}) })
} }
sLoading.value.close()
pending.value = false pending.value = false
isRotating.value = false
} }
const closePopup = () => { const closePopup = () => {
@ -509,7 +662,10 @@
lockId: $bluetooth.currentLockInfo.lockId lockId: $bluetooth.currentLockInfo.lockId
}) })
if (code === 0) { if (code === 0) {
$bluetooth.updateCurrentLockInfo({ ...$bluetooth.currentLockInfo, ...data }) $bluetooth.updateCurrentLockInfo({
...$bluetooth.currentLockInfo,
...data
})
uni.showToast({ uni.showToast({
title: '刷新成功', title: '刷新成功',
icon: 'none' icon: 'none'
@ -523,6 +679,12 @@
refresherTriggered.value = false refresherTriggered.value = false
} }
const toSearchDevice = async () => {
$basic.routeJump({
name: 'addLockGuid'
})
}
const deleteLock = async () => { const deleteLock = async () => {
const netWork = await $basic.getNetworkType() const netWork = await $basic.getNetworkType()
if (!netWork) { 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> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -625,14 +808,6 @@
background: #faecc9; background: #faecc9;
} }
.lock-name {
padding: 32rpx 32rpx 0 32rpx;
font-size: 32rpx;
font-weight: bold;
text-align: center;
word-break: break-all;
}
.top { .top {
position: relative; position: relative;
width: 686rpx; width: 686rpx;
@ -669,32 +844,21 @@
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
height: 50rpx; height: 50rpx;
padding-top: 18rpx;
.power-icon { .power-icon {
width: 50rpx; width: 50rpx;
height: 30rpx; height: 30rpx;
margin-right: 10rpx;
} }
.power-text { .power-text {
margin-right: 10rpx;
font-size: 32rpx; font-size: 32rpx;
font-weight: bold;
line-height: 50rpx;
} }
.power-tips { .power-tips {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
margin-right: 32rpx;
} }
} }
.switch-text {
margin-top: 10rpx;
text-align: center;
}
} }
.bottom { .bottom {
@ -707,7 +871,7 @@
height: 48rpx; height: 48rpx;
font-size: 32rpx; font-size: 32rpx;
line-height: 48rpx; line-height: 48rpx;
color: #63b8af; color: #4777ee;
background-color: rgba(0, 0, 0, 0.1); background-color: rgba(0, 0, 0, 0.1);
border-radius: 0 0 32rpx 32rpx; border-radius: 0 0 32rpx 32rpx;
@ -758,8 +922,8 @@
margin-bottom: 48rpx; margin-bottom: 48rpx;
.menu-main-image { .menu-main-image {
width: 40rpx; width: 48rpx;
height: 40rpx; height: 48rpx;
margin-bottom: 10rpx; margin-bottom: 10rpx;
} }
} }
@ -795,4 +959,138 @@
margin-left: 32rpx; 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> </style>

942
pages/main/mine.vue
View File

@ -1,445 +1,543 @@
<template> <template>
<view v-if="buttonInfo"> <view v-if="buttonInfo">
<view v-if="isLogin"> <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" </view>
mode="aspectFill" </view>
></image> <view class="follow-official-account">
</view> <text>关注公众号，接收更多消息提醒</text>
<view class="view-line"></view> <!-- #ifdef MP-WEIXIN -->
<!-- #ifdef MP-WEIXIN --> <official-account><view class="follow-btn">关注公众号</view></official-account>
<label for="contact"> <!-- #endif -->
<view class="view-button"> <view class="follow-btn" @click="jumpToWeChatfficialAccount">关注公众号</view>
<view>客服</view> </view>
<image <label for="contact">
class="icon-arrow" <view class="option-item">
src="https://oss-lock.xhjcn.ltd/mp/icon_arrow.png" <view class="icon-label">
mode="aspectFill" <image class="left-icon" src="https://cos-lock.skychip.top/mp/icon_customer_service.png">
></image> </image>
</view> <text>人工客服</text>
</label> </view>
<!-- #endif --> <image class="icon-arrow" src="https://cos-lock.skychip.top/mp/icon_arrow.png" mode="aspectFill">
<!-- #ifdef APP-PLUS --> </image>
<view @click="toContact"> </view>
<view class="view-button"> </label>
<view>客服</view> <view class="view">
<image <!-- #ifdef APP-PLUS -->
class="icon-arrow" <view @click="toContact">
src="https://oss-lock.xhjcn.ltd/mp/icon_arrow.png" <view class="view-button">
mode="aspectFill" <view>客服</view>
></image> <image class="icon-arrow" src="https://cos-lock.skychip.top/mp/icon_arrow.png"
</view> mode="aspectFill">
</view> </image>
<!-- #endif --> </view>
<view class="view-line"></view> </view>
<view class="view-button" @click="toWebview()"> <!-- #endif -->
<view>公司介绍</view> <view class="view-button">
<image <view>邮箱 / 商务合作</view>
class="icon-arrow" <text class="right-text">{{env.officialEmail}}</text>
src="https://oss-lock.xhjcn.ltd/mp/icon_arrow.png" </view>
mode="aspectFill" <view class="view-line"></view>
></image> <view class="view-button">
</view> <view>官网</view>
<view class="view-line"></view> <text class="right-text">{{env.officialWebsite}}</text>
<view class="view-button" @click="toWebview('userAgreement')"> </view>
<view>用户协议</view> <view class="view-line"></view>
<image <view class="view-button" @click="toWebview()">
class="icon-arrow" <view>公司介绍</view>
src="https://oss-lock.xhjcn.ltd/mp/icon_arrow.png" <image class="icon-arrow" src="https://cos-lock.skychip.top/mp/icon_arrow.png" mode="aspectFill">
mode="aspectFill" </image>
></image> </view>
</view> <view class="view-line"></view>
<view class="view-line"></view> <view class="view-button" @click="toWebview('userAgreement')">
<view class="view-button" @click="toWebview('privacy')"> <view>用户协议</view>
<view>隐私政策</view> <image class="icon-arrow" src="https://cos-lock.skychip.top/mp/icon_arrow.png" mode="aspectFill">
<image </image>
class="icon-arrow" </view>
src="https://oss-lock.xhjcn.ltd/mp/icon_arrow.png" <view class="view-line"></view>
mode="aspectFill" <view class="view-button" @click="toWebview('privacy')">
></image> <view>隐私政策</view>
</view> <image class="icon-arrow" src="https://cos-lock.skychip.top/mp/icon_arrow.png" mode="aspectFill">
</view> </image>
<view class="env" v-if="env"> </view>
<view class="env-text">{{ env.name }} {{ env.version }}+{{ env.buildNumber }}</view> </view>
<view>{{ env.baseUrl.split('/').slice(0, 3).join('/') }}</view> <view class="env" v-if="env">
<view v-if="envVersion !== 'release' && env" class="env-button" @click="show = true" <view class="env-text">{{ env.name }} {{ env.version }}+{{ env.buildNumber }}</view>
>切换环境</view <view>{{ env.baseUrl.split('/').slice(0, 3).join('/') }}</view>
> <view v-if="!(envVersion === 'release' || nodeEnv === 'production') && env" class="env-button"
</view> @click="show = true">切换环境</view>
<!-- #ifdef MP-WEIXIN --> </view>
<label for="changePhone"> <!-- #ifdef MP-WEIXIN -->
<view class="switch-account">切换账号</view> <label for="changePhone">
</label> <view class="switch-account">切换账号</view>
<!-- #endif --> </label>
<!-- #ifdef APP-PLUS --> <!-- #endif -->
<view class="switch-account !bg-red-500" @click="logout">退出</view> <!-- #ifdef APP-PLUS -->
<view class="delete-account" @click="deleteAccount">删除账号</view> <view class="switch-account !bg-red-500" @click="logout">退出</view>
<!-- #endif --> <view class="delete-account" @click="deleteAccount">删除账号</view>
</view> <!-- #endif -->
<view v-else> </view>
<view class="tips">因智能门锁与账号绑定，登录为手机号登录</view> <view v-else>
<label for="phone"> <view class="tips">因智能门锁与账号绑定，登录为手机号登录</view>
<view class="button-login">登录</view> <label for="phone">
</label> <view class="button-login">登录</view>
<view class="env" v-if="env"> </label>
<view class="env-text">{{ env.name }} {{ env.version }}+{{ env.buildNumber }}</view> <view class="env" v-if="env">
<view>{{ env.baseUrl.split('/').slice(0, 3).join('/') }}</view> <view class="env-text">{{ env.name }} {{ env.version }}+{{ env.buildNumber }}</view>
<view <view>{{ env.baseUrl.split('/').slice(0, 3).join('/') }}</view>
v-if="(envVersion !== 'release' || nodeEnv === 'development') && env" <view v-if="!(envVersion === 'release' || nodeEnv === 'production') && env" class="env-button"
class="env-button" @click="show = true">
@click="show = true" 切换环境
> </view>
切换环境 </view>
</view> </view>
</view> </view>
</view> <button open-type="contact" style="display: none" id="contact"></button>
</view> <button open-type="getPhoneNumber" style="display: none" id="phone" @getphonenumber="getphonenumber"></button>
<button open-type="contact" style="display: none" id="contact"></button> <button open-type="getPhoneNumber" style="display: none" id="changePhone" @getphonenumber="changePhone"></button>
<button <up-action-sheet :actions="envList" :closeOnClickOverlay="true" title="切换环境" cancelText="取消"
open-type="getPhoneNumber" :closeOnClickAction="true" :show="show" :safeAreaInsetBottom="true" @close="show = false"
style="display: none" @select="selectEnv"></up-action-sheet>
id="phone"
@getphonenumber="getphonenumber"
></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> </template>
<script> <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 {
import env from '@/config/env' useBasicStore
import { setStorage, getStorage, removeStorage } from '@/utils/storage' } from '@/stores/basic'
import { useNotificationStore } from '@/stores/notification' import {
import { getAppInfoRequest } from '@/api/system' 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 {
useNotificationStore
} from '@/stores/notification'
import {
getAppInfoRequest
} from '@/api/system'
import {
loginRequest
} from '@/api/user'
export default {
data() {
return {
buttonInfo: null,
env: null,
envVersion: '',
envList: [],
show: false,
nodeEnv: ''
}
},
computed: {
...mapState(useUserStore, ['isLogin', 'userInfo']),
...mapState(useLockStore, ['lockSearch']),
...mapState(useNotificationStore, ['notificationSearch'])
},
async onLoad() {
this.buttonInfo = await this.getButtonInfo()
this.env = await env[await getApp().globalData.getEnvConfig()]
this.envVersion = getApp().globalData.envVersion
this.nodeEnv = process.env.NODE_ENV
export default { // eslint-disable-next-line guard-for-in,no-restricted-syntax
data() { for (let key in env) {
return { this.envList.push({
buttonInfo: null, ...env[key],
env: null, key
envVersion: '', })
envList: [], }
show: false, },
nodeEnv: '' methods: {
} ...mapActions(useBasicStore, ['getButtonInfo', 'routeJump']),
}, ...mapActions(useLockStore, ['getLockList', 'updateLockSearch']),
computed: { ...mapActions(useNotificationStore, ['getNotificationList', 'updateNotificationSearch']),
...mapState(useUserStore, ['isLogin']), ...mapActions(useUserStore, [
...mapState(useLockStore, ['lockSearch']), 'updateLoginStatus',
...mapState(useNotificationStore, ['notificationSearch']) 'phoneLogin',
}, 'updateUserInfo',
async onLoad() { 'getUserInfo',
this.buttonInfo = await this.getButtonInfo() 'checkSession'
this.env = await env[await getApp().globalData.getEnvConfig()] ]),
this.envVersion = getApp().globalData.envVersion deleteAccount() {
this.nodeEnv = process.env.NODE_ENV uni.showModal({
title: '提示',
content: '删除账号后，你的所有信息及相关记录都会从平台彻底删除，且不可恢复，是否删除？',
success: res => {
if (res.confirm) {
this.routeJump({
name: 'deleteAccount'
})
}
}
})
},
selectEnv(env) {
setStorage('envVersion', env.key)
removeStorage('token')
removeStorage('openid')
removeStorage('userInfo')
removeStorage('lockList')
uni.reLaunch({
url: '/pages/main/home'
})
},
toContact() {
getAppInfoRequest().then(res => {
if (res.code === 0) {
plus.runtime.openURL(res.data.wechat_service_url)
}
})
},
async changePhone(res) {
if (res.detail.errMsg === 'getPhoneNumber:fail user deny') {
return
}
// eslint-disable-next-line guard-for-in,no-restricted-syntax const that = this
for (let key in env) { uni.showLoading({
this.envList.push({ title: '登录中'
...env[key], })
key uni.login({
}) provider: 'weixin',
} async success(loginRes) {
}, const openid = getStorage('openid')
methods: { const {
...mapActions(useBasicStore, ['getButtonInfo', 'routeJump']), code,
...mapActions(useLockStore, ['getLockList', 'updateLockSearch']), data,
...mapActions(useNotificationStore, ['getNotificationList', 'updateNotificationSearch']), message
...mapActions(useUserStore, [ } = await phoneLoginRequest({
'updateLoginStatus', encryptedData: res.detail.encryptedData,
'phoneLogin', iv: res.detail.iv,
'updateUserInfo', rebind: true,
'getUserInfo', openid,
'checkSession' js_code: loginRes.code
]), })
deleteAccount() { uni.hideLoading()
uni.showModal({ if (code === 0) {
title: '提示', removeStorage('userInfo')
content: '删除账号后，你的所有信息及相关记录都会从平台彻底删除，且不可恢复，是否删除？', removeStorage('lockList')
success: res => { setStorage('token', data.accessToken)
if (res.confirm) { that.updateLockSearch({
this.routeJump({ ...that.lockSearch,
name: 'deleteAccount' pageNo: 1
}) })
} that.getUserInfo()
} that.getLockList(that.lockSearch)
}) that.updateNotificationSearch({
}, pageNo: 1
selectEnv(env) { })
setStorage('envVersion', env.key) that.getNotificationList(that.notificationSearch)
removeStorage('token') uni.showToast({
removeStorage('openid') title: '账号切换成功',
removeStorage('userInfo') icon: 'none'
removeStorage('lockList') })
uni.reLaunch({ } else if (code === 438) {
url: '/pages/main/home' /* empty */
}) } else {
}, uni.showToast({
toContact() { title: message,
getAppInfoRequest().then(res => { icon: 'none'
if (res.code === 0) { })
plus.runtime.openURL(res.data.wechat_service_url) }
} },
}) fail() {
}, uni.hideLoading()
async changePhone(res) { uni.showToast({
if (res.detail.errMsg === 'getPhoneNumber:fail user deny') { title: '登录失败，请重试'
return })
} }
})
const that = this },
uni.showLoading({ async getphonenumber(data) {
title: '登录中' if (data.detail.errMsg === 'getPhoneNumber:fail user deny') {
}) return
uni.login({ }
provider: 'weixin', const that = this
async success(loginRes) { uni.showLoading({
const openid = getStorage('openid') title: '登录中'
const { code, data, message } = await phoneLoginRequest({ })
encryptedData: res.detail.encryptedData, uni.login({
iv: res.detail.iv, provider: 'weixin',
rebind: true, async success(loginRes) {
openid, const result = await that.phoneLogin({
js_code: loginRes.code encryptedData: data.detail.encryptedData,
}) iv: data.detail.iv,
uni.hideLoading() code: loginRes.code
if (code === 0) { })
removeStorage('userInfo') uni.hideLoading()
removeStorage('lockList') if (!result) {
setStorage('token', data.accessToken) uni.showToast({
that.updateLockSearch({ title: result.message,
...that.lockSearch, icon: 'none'
pageNo: 1 })
}) }
that.getUserInfo() },
that.getLockList(that.lockSearch) fail() {
that.updateNotificationSearch({ uni.hideLoading()
pageNo: 1 uni.showToast({
}) title: '登录失败，请重试'
that.getNotificationList(that.notificationSearch) })
uni.showToast({ }
title: '账号切换成功', })
icon: 'none' },
}) toUsereInfo() {
} else if (code === 438) { this.routeJump({
/* empty */ name: 'userInfo'
} else { })
uni.showToast({ },
title: message, toWebview(type) {
icon: 'none' this.routeJump({
}) name: 'webview',
} params: {
}, type
fail() { }
uni.hideLoading() })
uni.showToast({ },
title: '登录失败，请重试' jumpToWeChatfficialAccount(){
})
} },
}) logout() {
}, uni.showModal({
async getphonenumber(data) { title: '提示',
if (data.detail.errMsg === 'getPhoneNumber:fail user deny') { content: '确定退出登录吗？',
return success: async res => {
} if (res.confirm) {
await logoutRequest()
const that = this removeStorage('token')
uni.showLoading({ removeStorage('openid')
title: '登录中' removeStorage('userInfo')
}) removeStorage('lockList')
uni.login({ this.routeJump({
provider: 'weixin', name: 'login',
async success(loginRes) { type: 'reLaunch'
const result = await that.phoneLogin({ })
encryptedData: data.detail.encryptedData, }
iv: data.detail.iv, }
code: loginRes.code })
}) }
uni.hideLoading() }
if (!result) { }
uni.showToast({
title: result.message,
icon: 'none'
})
}
},
fail() {
uni.hideLoading()
uni.showToast({
title: '登录失败，请重试'
})
}
})
},
toUsereInfo() {
this.routeJump({
name: 'userInfo'
})
},
toWebview(type) {
this.routeJump({
name: 'webview',
params: {
type
}
})
},
logout() {
uni.showModal({
title: '提示',
content: '确定退出登录吗？',
success: async res => {
if (res.confirm) {
await logoutRequest()
removeStorage('token')
removeStorage('openid')
removeStorage('userInfo')
removeStorage('lockList')
this.routeJump({
name: 'login',
type: 'reLaunch'
})
}
}
})
}
}
}
</script> </script>
<style lang="scss"> <style lang="scss">
page { page {
background-color: $uni-bg-color-grey; background-color: $uni-bg-color-grey;
} }
</style> </style>
<style scoped lang="scss"> <style scoped lang="scss">
.background-image { .background-image {
width: 710rpx; width: 710rpx;
height: 156rpx; height: 156rpx;
margin-top: 32rpx; margin-top: 32rpx;
margin-left: 20rpx; margin-left: 20rpx;
border-radius: 32rpx; border-radius: 32rpx;
} }
.view { .view {
width: 710rpx; background: #ffffff;
margin-top: 32rpx; border-radius: 16rpx;
margin-left: 20rpx; display: flex;
background: #ffffff; flex-direction: column;
border-radius: 32rpx; align-items: center;
} margin: 20rpx 20rpx;
padding: 20rpx 20rpx;
gap: 20rpx;
}
.view-button { .follow-official-account {
display: flex; margin: 20rpx 20rpx;
align-items: center; background-image: url('https://cos-lock.skychip.top/mp/follow_official_account_bg.png');
justify-content: space-between; background-size: cover;
padding: 0 20rpx 0 40rpx; background-position: center;
font-size: 32rpx; background-repeat: no-repeat;
font-weight: bold; height: 88rpx;
line-height: 80rpx; border-radius: 16rpx;
color: #292826; display: flex;
} align-items: center;
justify-content: space-between;
color: white;
font-weight: 400;
font-size: 28rpx;
padding-left: 20rpx;
padding-right: 20rpx;
.icon-arrow { .follow-btn {
width: 40rpx; display: flex;
height: 40rpx; align-items: center;
} padding: 12rpx 20rpx;
background-color: white;
border-radius: 16rpx;
color: #4777ee;
}
}
.view-line { .account-info {
width: 100%; margin: 20rpx 20rpx;
height: 3rpx; padding-left: 20rpx;
background: #ebebeb; padding-top: 20rpx;
} padding-bottom: 20rpx;
padding-right: 20rpx;
display: flex;
gap: 18rpx;
align-items: center;
border-radius: 16rpx;
background-color: white;
.switch-account { .avatar {
position: absolute; width: 120rpx;
bottom: 120rpx; height: 120rpx;
width: 600rpx; }
height: 80rpx;
margin-left: 75rpx;
font-size: 40rpx;
font-weight: bold;
line-height: 80rpx;
color: #ffffff;
text-align: center;
background: #63b8af;
border-radius: 46rpx;
}
.delete-account { .account-nickname {
position: absolute; display: flex;
right: 75rpx; flex-direction: column;
bottom: 60rpx; gap: 12rpx;
font-size: 28rpx;
color: #666;
}
.env { .nickname {
position: absolute; font-size: 32rpx;
bottom: 240rpx; font-weight: 600;
width: 600rpx; }
margin-left: 75rpx;
line-height: 80rpx;
text-align: center;
.env-text { .account {
font-size: 30rpx; font-size: 24rpx;
font-weight: bold; color: gray;
color: #999999; font-weight: 500;
} }
}
}
.env-button { .view-button {
font-size: 0.8rem; width: 100%;
color: #022b7c; display: flex;
text-align: right; align-items: center;
text-decoration: underline; justify-content: space-between;
background: inherit; border-radius: 16rpx;
} font-size: 28rpx;
}
.button-login { .right-text {
width: 650rpx; font-size: 28rpx;
height: 120rpx; color: gray;
margin-left: 50rpx; }
font-size: 48rpx; }
font-weight: bold;
line-height: 120rpx;
color: #ffffff;
text-align: center;
background: #63b8af;
border-radius: 46rpx;
}
.tips { .icon-arrow {
padding: 32rpx 0; width: 40rpx;
margin-top: 25vh; height: 40rpx;
font-size: 28rpx; }
color: #999999;
text-align: center; .view-line {
} width: 100%;
</style> height: 3rpx;
background: #ebebeb;
}
.switch-account {
position: absolute;
bottom: 120rpx;
width: 600rpx;
height: 80rpx;
margin-left: 75rpx;
font-size: 40rpx;
font-weight: bold;
line-height: 80rpx;
color: #ffffff;
text-align: center;
background: #4777ee;
border-radius: 46rpx;
}
.delete-account {
position: absolute;
right: 75rpx;
bottom: 60rpx;
font-size: 28rpx;
color: #666;
}
.env {
position: absolute;
bottom: 240rpx;
width: 600rpx;
margin-left: 75rpx;
line-height: 80rpx;
text-align: center;
.env-text {
font-size: 30rpx;
font-weight: bold;
color: #999999;
}
.env-button {
font-size: 0.8rem;
color: #022b7c;
text-align: right;
text-decoration: underline;
background: inherit;
}
}
.button-login {
width: 650rpx;
height: 120rpx;
margin-left: 50rpx;
font-size: 48rpx;
font-weight: bold;
line-height: 120rpx;
color: #ffffff;
text-align: center;
background: #4777ee;
border-radius: 46rpx;
}
.tips {
padding: 32rpx 0;
margin-top: 25vh;
font-size: 28rpx;
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>

6
pages/main/notificationList.vue
View File

@ -78,7 +78,7 @@
> >
<image <image
class="delete-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" mode="aspectFill"
/> />
</view> </view>
@ -409,7 +409,7 @@
justify-content: center; justify-content: center;
width: 100rpx; width: 100rpx;
height: 100rpx; height: 100rpx;
background-color: #5db5aa; background-color: #4777ee;
border-radius: 50%; border-radius: 50%;
.delete-image { .delete-image {
@ -448,7 +448,7 @@
line-height: 120rpx; line-height: 120rpx;
color: #ffffff; color: #ffffff;
text-align: center; text-align: center;
background: #63b8af; background: #4777ee;
border-radius: 46rpx; border-radius: 46rpx;
} }
</style> </style>

4
pages/others/cycleDate.vue
View File

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

2
pages/others/temporaryDate.vue
View File

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

4
pages/p2p/videoLog.vue
View File

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

2
pages/setting/autoLock.vue
View File

@ -39,7 +39,7 @@
</view> </view>
<view <view
v-if="$bluetooth.currentLockSetting.lockBasicInfo.keyRight === 1" 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" class="mt-4 rounded-3xl w-600 h-80 line-height-80rpx text-center mx-75rpx text-white text-xl font-bold"
@click="update" @click="update"
> >

2
pages/setting/catEyeMode.vue
View File

@ -238,7 +238,7 @@
</view> </view>
<view <view
@click="show = false" @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
> >
</view> </view>

4
pages/setting/coercionFingerprint.vue
View File

@ -69,7 +69,7 @@
<view <view
v-if="list.length > 0" v-if="list.length > 0"
@click="confirm" @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>
</view> </view>
@ -266,7 +266,7 @@
line-height: 88rpx; line-height: 88rpx;
color: white; color: white;
text-align: center; text-align: center;
background-color: #63b8af; background-color: #4777ee;
border-radius: 44rpx; border-radius: 44rpx;
} }
} }

2
pages/setting/lockDate.vue
View File

@ -6,7 +6,7 @@
}}</view> }}</view>
</view> </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" @click="update"
> >
校准时间 校准时间

2
pages/setting/lockSound.vue
View File

@ -31,7 +31,7 @@
</view> </view>
</view> </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" class="mt-4 rounded-3xl w-600 h-80 line-height-80rpx text-center mx-75rpx text-white text-xl font-bold"
@click="update" @click="update"
> >

4
pages/setting/lockUser.vue
View File

@ -65,7 +65,7 @@
<view <view
v-if="list.length > 0" v-if="list.length > 0"
@click="confirm" @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>
</view> </view>
@ -376,7 +376,7 @@
line-height: 88rpx; line-height: 88rpx;
color: white; color: white;
text-align: center; text-align: center;
background-color: #63b8af; background-color: #4777ee;
border-radius: 44rpx; border-radius: 44rpx;
} }
} }

2
pages/setting/lowElecNotice.vue
View File

@ -46,7 +46,7 @@
</view> </view>
<view <view
@click="update" @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>
</view> </view>

2
pages/setting/notOpenDoor.vue
View File

@ -55,7 +55,7 @@
</view> </view>
<view <view
@click="update" @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>
<up-picker <up-picker

2
pages/setting/noticeDetail.vue
View File

@ -89,7 +89,7 @@
v-else v-else
@click="create" @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="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> </view>
<ModalInput <ModalInput

2
pages/setting/noticeWay.vue
View File

@ -86,7 +86,7 @@
<view <view
@click="confirm" @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>
</view> </view>

4
pages/setting/passageMode.vue
View File

@ -21,7 +21,7 @@
<view <view
v-for="(item, index) in list" v-for="(item, index) in list"
:key="index" :key="index"
:class="[weekDays.includes(index + 1) ? 'bg-#5eb7ac text-white' : '']" :class="[weekDays.includes(index + 1) ? 'bg-#4777ee text-white' : '']"
@click="changeSelect(index)" @click="changeSelect(index)"
class="rounded-50% border-solid border-3 border-gray-400 flex items-center justify-center w-70 h-70" class="rounded-50% border-solid border-3 border-gray-400 flex items-center justify-center w-70 h-70"
>{{ item }} >{{ item }}
@ -76,7 +76,7 @@
</view> </view>
<view <view
@click="confirm" @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" 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> </view>

2
pages/setting/selectGroup.vue
View File

@ -25,7 +25,7 @@
</scroll-view> </scroll-view>
<view <view
@click="() => $refs.modalInput.open()" @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 >创建新分组</view
> >
<ModalInput <ModalInput

8
pages/setting/setting.vue
View File

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

2
pages/setting/syncElec.vue
View File

@ -18,7 +18,7 @@
</view> </view>
<view <view
@click="updateElectricQuantity" @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
> >
</view> </view>

2
pages/setting/updateSetting.vue
View File

@ -20,7 +20,7 @@
</view> </view>
<view <view
@click="update" @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 >{{ $bluetooth.currentLockSetting.lockSettingInfo[type] === 1 ? '关闭' : '开启' }}</view
> >
</view></view </view></view

2
pages/setting/uploadLockData.vue
View File

@ -6,7 +6,7 @@
</view> </view>
<view <view
@click="asyncData" @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> </view>

2
pages/setting/videoSlot.vue
View File

@ -76,7 +76,7 @@
></up-picker> ></up-picker>
<view <view
@click="confirm" @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>
</view> </view>

4
pages/user/deleteAccount.vue
View File

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

2
pages/user/forgotPassword.vue
View File

@ -105,7 +105,7 @@
</view> </view>
<view <view
class="w-full rounded-full h-88 text-center leading-[88rpx] text-white mt-6" 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" @click="register"
> >
重置密码 重置密码

2
pages/user/login.vue
View File

@ -64,7 +64,7 @@
</view> </view>
<view <view
class="mt-4 w-full rounded-full h-88 text-center leading-[88rpx] text-white" 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" @click="login"
> >
登录 登录

6
pages/user/register.vue
View File

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

4
pages/user/updateAccount.vue
View File

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

2
pages/user/updateName.vue
View File

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

4
pages/user/updatePassword.vue
View File

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

4
pages/user/verifyAccount.vue
View File

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

BIN
static/images/tabbar_key_no_select.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
static/images/tabbar_key_select.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
static/images/tabbar_mine_no_select.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
static/images/tabbar_mine_select.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
static/images/tabbar_notification_no_select.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 816 B

BIN
static/images/tabbar_notification_select.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 816 B

75
stores/bluetooth.js
View File

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