diff --git a/.stylelintrc.json b/.stylelintrc.json
index 64a0abf..3cd2e82 100644
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@@ -5,6 +5,12 @@
"stylelint-config-recess-order",
"stylelint-config-html/vue"
],
+ "overrides": [
+ {
+ "files": ["**/*.(scss|css|vue|html)"],
+ "customSyntax": "postcss-scss"
+ }
+ ],
"rules": {
"no-descending-specificity": null,
"selector-class-pattern": null,
@@ -17,204 +23,6 @@
}
],
"color-hex-length": null,
- "order/properties-order": [
- true,
- {
- "properties": [
- "position",
- "top",
- "right",
- "bottom",
- "left",
- "z-index",
- "display",
- "float",
- "width",
- "height",
- "max-width",
- "max-height",
- "min-width",
- "min-height",
- "padding",
- "padding-top",
- "padding-right",
- "padding-bottom",
- "padding-left",
- "margin",
- "margin-top",
- "margin-right",
- "margin-bottom",
- "margin-left",
- "margin-collapse",
- "margin-top-collapse",
- "margin-right-collapse",
- "margin-bottom-collapse",
- "margin-left-collapse",
- "overflow",
- "overflow-x",
- "overflow-y",
- "clip",
- "clear",
- "font",
- "font-family",
- "font-size",
- "font-smoothing",
- "font-style",
- "font-weight",
- "hyphens",
- "src",
- "line-height",
- "letter-spacing",
- "word-spacing",
- "color",
- "text-align",
- "text-decoration",
- "text-indent",
- "text-overflow",
- "text-rendering",
- "text-size-adjust",
- "text-shadow",
- "text-transform",
- "word-break",
- "word-wrap",
- "white-space",
- "vertical-align",
- "list-style",
- "list-style-position",
- "list-style-type",
- "list-style-image",
- "pointer-events",
- "cursor",
- "background",
- "background-attachment",
- "background-color",
- "background-image",
- "background-position",
- "background-repeat",
- "background-size",
- "border",
- "border-collapse",
- "border-top",
- "border-right",
- "border-bottom",
- "border-left",
- "border-color",
- "border-image",
- "border-top-color",
- "border-right-color",
- "border-bottom-color",
- "border-left-color",
- "border-spacing",
- "border-style",
- "border-width",
- "border-top-width",
- "border-right-width",
- "border-bottom-width",
- "border-left-width",
- "border-radius",
- "border-top-right-radius",
- "border-bottom-right-radius",
- "border-bottom-left-radius",
- "border-top-left-radius",
- "border-radius-topright",
- "border-radius-bottomright",
- "border-radius-bottomleft",
- "border-radius-topleft",
- "box-shadow",
- "transform",
- "transform-origin",
- "backface-visibility",
- "backface-visibility",
- "perspective",
- "perspective-origin",
- "visibility",
- "opacity",
- "filter",
- "isolation",
- "object-fit",
- "object-position",
- "mask",
- "mask-image",
- "mask-mode",
- "mask-position",
- "mask-repeat",
- "mask-size",
- "mask-clip",
- "mask-origin",
- "mask-composite",
- "mask-type",
- "mask-border",
- "mask-border-source",
- "mask-border-slice",
- "mask-border-width",
- "mask-border-outset",
- "mask-border-repeat",
- "mask-border-mode",
- "mask-box-image",
- "mask-box-image-source",
- "mask-box-image-slice",
- "mask-box-image-width",
- "mask-box-image-outset",
- "mask-box-image-repeat",
- "mask-box-image-mode",
- "box-decoration-break",
- "background-clip",
- "background-origin",
- "background-size",
- "background-position",
- "background-attachment",
- "background-repeat",
- "background-image",
- "box-sizing",
- "content",
- "quotes",
- "counter-reset",
- "counter-increment",
- "resize",
- "user-select",
- "nav-index",
- "nav-up",
- "nav-right",
- "nav-down",
- "nav-left",
- "tab-size",
- "outline",
- "outline-width",
- "outline-style",
- "outline-color",
- "outline-offset",
- "table-layout",
- "empty-cells",
- "caption-side",
- "background-color",
- "border-spacing",
- "border-collapse",
- "speak",
- "volume",
- "pause",
- "pause-before",
- "pause-after",
- "page-break-before",
- "page-break-after",
- "page-break-inside",
- "orphans",
- "widows",
- "display",
- "flex-direction",
- "flex-order",
- "flex-grow",
- "flex-shrink",
- "flex-basis",
- "flex-flow",
- "flex-wrap",
- "flex",
- "justify-content",
- "align-self",
- "align-items",
- "align-content"
- ]
- }
- ],
"declaration-property-value-no-unknown": [
true,
{
diff --git a/components/SwitchLoading/SwitchLoading.vue b/components/SwitchLoading/SwitchLoading.vue
index ecaf6cc..88cd90f 100644
--- a/components/SwitchLoading/SwitchLoading.vue
+++ b/components/SwitchLoading/SwitchLoading.vue
@@ -17,7 +17,7 @@
:style="{ width: size * 0.75 - 2 + 'rpx', height: size * 0.75 - 2 + 'rpx' }"
>
diff --git a/constant/keyType.js b/constant/keyType.js
index b72e204..3a681ed 100644
--- a/constant/keyType.js
+++ b/constant/keyType.js
@@ -1,30 +1,30 @@
export const keysType = {
1: {
name: '电子钥匙',
- icon: '/static/images/icon_user.png'
+ icon: 'https://oss-lock.xhjcn.ltd/mp/icon_user.png'
},
2: {
name: '密码',
- icon: '/static/images/icon_password.png'
+ icon: 'https://oss-lock.xhjcn.ltd/mp/icon_password.png'
},
3: {
name: '指纹',
- icon: '/static/images/icon_fingerprint_white.png'
+ icon: 'https://oss-lock.xhjcn.ltd/mp/icon_fingerprint_white.png'
},
4: {
name: '卡',
- icon: '/static/images/icon_card_white.png'
+ icon: 'https://oss-lock.xhjcn.ltd/mp/icon_card_white.png'
},
5: {
name: '人脸',
- icon: '/static/images/icon_face_white.png'
+ icon: 'https://oss-lock.xhjcn.ltd/mp/icon_face_white.png'
},
6: {
name: '掌静脉',
- icon: '/static/images/icon_palm_vein_white.png'
+ icon: 'https://oss-lock.xhjcn.ltd/mp/icon_palm_vein_white.png'
},
7: {
name: '遥控',
- icon: '/static/images/icon_remote_white.png'
+ icon: 'https://oss-lock.xhjcn.ltd/mp/icon_remote_white.png'
}
}
diff --git a/manifest.json b/manifest.json
index bbf5df0..d612ddc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,28 +1,30 @@
{
- "name" : "wx-starlock",
- "appid" : "__UNI__933D519",
- "description" : "",
- "versionName" : "1.2.0",
- "versionCode" : "34",
- "transformPx" : false,
- /* 小程序特有相关 */
- "mp-weixin" : {
- "appid" : "wx9829a39e65550757",
- "setting" : {
- "urlCheck" : true,
- "minified" : true
- },
- "permission" : {
- "scope.bluetooth" : {
- "desc" : "蓝牙将用于控制和管理您的智能门锁"
- },
- "scope.userLocation" : {
- "desc" : "获取您的位置信息将用于智能门锁的位置服务"
- }
- },
- "requiredPrivateInfos" : [ "getLocation" ],
- "usingComponents" : true,
- "lazyCodeLoading" : "requiredComponents"
+ "name": "wx-starlock",
+ "appid": "__UNI__933D519",
+ "description": "",
+ "versionName": "1.2.0",
+ "versionCode": "34",
+ "transformPx": false,
+ "mp-weixin": {
+ "appid": "wx9829a39e65550757",
+ "setting": {
+ "urlCheck": true,
+ "minified": true
},
- "vueVersion" : "3"
+ "permission": {
+ "scope.bluetooth": {
+ "desc": "蓝牙将用于控制和管理您的智能门锁"
+ },
+ "scope.userLocation": {
+ "desc": "获取您的位置信息将用于智能门锁的位置服务"
+ }
+ },
+ "requiredPrivateInfos": ["getLocation"],
+ "usingComponents": true,
+ "lazyCodeLoading": "requiredComponents",
+ "optimization": {
+ "subPackages": true
+ }
+ },
+ "vueVersion": "3"
}
diff --git a/package.json b/package.json
index f6fb58f..136b775 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
"stylelint-config-standard": "^37.0.0",
"unocss": "^65.4.3",
"unocss-preset-weapp": "^65.4.1",
- "vite-plugin-eslint": "^1.8.1"
+ "vite-plugin-eslint": "^1.8.1",
+ "postcss-scss": "^4.0.9"
}
}
diff --git a/pages.json b/pages.json
index 6866495..608d6ac 100644
--- a/pages.json
+++ b/pages.json
@@ -7,520 +7,568 @@
"^u-([^-].*)": "uview-plus/components/u-$1/u-$1.vue"
}
},
+ "subPackages": [
+ {
+ "root": "pages/addDeviceForBluetooth",
+ "pages": [
+ {
+ "path": "addLockGuid",
+ "style": {
+ "navigationBarTitleText": "添加锁",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "bindLock",
+ "style": {
+ "navigationBarTitleText": "添加锁"
+ }
+ },
+ {
+ "path": "searchDevice",
+ "style": {
+ "disableScroll": true,
+ "navigationBarTitleText": "附近设备"
+ }
+ },
+ {
+ "path": "selectAddress",
+ "style": {
+ "navigationBarTitleText": "锁地址",
+ "disableScroll": true
+ }
+ }
+ ]
+ },
+ {
+ "root": "pages/user",
+ "pages": [
+ {
+ "path": "userInfo",
+ "style": {
+ "navigationBarTitleText": "个人信息"
+ }
+ },
+ {
+ "path": "updateName",
+ "style": {
+ "navigationBarTitleText": "修改昵称"
+ }
+ },
+ {
+ "path": "updatePassword",
+ "style": {
+ "navigationBarTitleText": "重置密码"
+ }
+ },
+ {
+ "path": "updateEmail",
+ "style": {
+ "navigationBarTitleText": "修改邮箱"
+ }
+ },
+ {
+ "path": "verifyEmail",
+ "style": {
+ "navigationBarTitleText": "验证邮箱"
+ }
+ }
+ ]
+ },
+ {
+ "root": "pages/others",
+ "pages": [
+ {
+ "path": "notificationDetail",
+ "style": {
+ "navigationBarTitleText": "消息详情"
+ }
+ },
+ {
+ "path": "temporaryDate",
+ "style": {
+ "navigationBarTitleText": "修改有效期",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "webview",
+ "style": {
+ "navigationBarTitleText": "介绍"
+ }
+ },
+ {
+ "path": "cycleDate",
+ "style": {
+ "navigationBarTitleText": "有效期",
+ "disableScroll": true
+ }
+ }
+ ]
+ },
+ {
+ "root": "pages/featureForBluetooth",
+ "pages": [
+ {
+ "path": "createPassword",
+ "style": {
+ "disableScroll": true,
+ "navigationBarTitleText": "获取密码"
+ }
+ },
+ {
+ "path": "createPalmVein",
+ "style": {
+ "navigationBarTitleText": "添加掌静脉",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "createFace",
+ "style": {
+ "navigationBarTitleText": "添加人脸",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "createRemote",
+ "style": {
+ "navigationBarTitleText": "添加遥控",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "createFingerprint",
+ "style": {
+ "navigationBarTitleText": "添加指纹",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "createCard",
+ "style": {
+ "navigationBarTitleText": "添加卡",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "typeRecordList",
+ "style": {
+ "navigationBarTitleText": "操作记录",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "recordList",
+ "style": {
+ "navigationBarTitleText": "操作记录",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "cardDetail",
+ "style": {
+ "navigationBarTitleText": "卡详情",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "passwordDetail",
+ "style": {
+ "disableScroll": true,
+ "navigationBarTitleText": "密码详情"
+ }
+ },
+ {
+ "path": "palmVeinDetail",
+ "style": {
+ "navigationBarTitleText": "掌静脉详情",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "faceDetail",
+ "style": {
+ "navigationBarTitleText": "人脸详情",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "remoteDetail",
+ "style": {
+ "navigationBarTitleText": "遥控详情",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "fingerprintDetail",
+ "style": {
+ "navigationBarTitleText": "指纹详情",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "palmVeinList",
+ "style": {
+ "navigationBarTitleText": "掌静脉",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "faceList",
+ "style": {
+ "navigationBarTitleText": "人脸",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "remoteList",
+ "style": {
+ "navigationBarTitleText": "遥控",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "fingerprintList",
+ "style": {
+ "navigationBarTitleText": "指纹",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "cardList",
+ "style": {
+ "navigationBarTitleText": "卡",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "bindFace",
+ "style": {
+ "navigationBarTitleText": "添加人脸",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "bindFingerprint",
+ "style": {
+ "navigationBarTitleText": "添加指纹",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "bindCard",
+ "style": {
+ "navigationBarTitleText": "添加卡",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "bindPalmVein",
+ "style": {
+ "navigationBarTitleText": "添加掌静脉",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "bindRemote",
+ "style": {
+ "navigationBarTitleText": "添加遥控",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "passwordList",
+ "style": {
+ "disableScroll": true,
+ "navigationBarTitleText": "密码"
+ }
+ },
+ {
+ "path": "recordDetail",
+ "style": {
+ "navigationBarTitleText": "操作记录详情",
+ "disableScroll": true
+ }
+ }
+ ]
+ },
+ {
+ "root": "pages/settingForBluetooth",
+ "pages": [
+ {
+ "path": "videoSlot",
+ "style": {
+ "navigationBarTitleText": "录像时段",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "setting",
+ "style": {
+ "navigationBarTitleText": "设置"
+ }
+ },
+ {
+ "path": "uploadLockData",
+ "style": {
+ "navigationBarTitleText": "上传数据",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "passageMode",
+ "style": {
+ "navigationBarTitleText": "常开模式",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "realTimePicture",
+ "style": {
+ "navigationBarTitleText": "实时画面",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "customCatEye",
+ "style": {
+ "navigationBarTitleText": "自定义模式",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "openDirection",
+ "style": {
+ "navigationBarTitleText": "开门方向设置",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "catEyeMode",
+ "style": {
+ "navigationBarTitleText": "猫眼工作模式",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "catEye",
+ "style": {
+ "navigationBarTitleText": "猫眼设置",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "noticeDetail",
+ "style": {
+ "navigationBarTitleText": "家人详情",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "noticeWay",
+ "style": {
+ "navigationBarTitleText": "提醒方式",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "autoLock",
+ "style": {
+ "navigationBarTitleText": "自动闭锁",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "lockUser",
+ "style": {
+ "navigationBarTitleText": "锁用户",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "lockDate",
+ "style": {
+ "navigationBarTitleText": "锁时间",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "faceSetting",
+ "style": {
+ "navigationBarTitleText": "面容开锁设置",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "lockSound",
+ "style": {
+ "navigationBarTitleText": "锁声音",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "lockInfo",
+ "style": {
+ "navigationBarTitleText": "基本信息",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "notOpenDoor",
+ "style": {
+ "navigationBarTitleText": "N天未开门",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "messageReminder",
+ "style": {
+ "navigationBarTitleText": "消息提醒",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "coercionFingerprint",
+ "style": {
+ "navigationBarTitleText": "指纹列表",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "coercionOpenDoor",
+ "style": {
+ "navigationBarTitleText": "胁迫开门",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "openDoorNotice",
+ "style": {
+ "navigationBarTitleText": "家人到家",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "lowElecNotice",
+ "style": {
+ "navigationBarTitleText": "低电量提醒",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "motorTorsion",
+ "style": {
+ "navigationBarTitleText": "电机功率设置",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "updateSetting",
+ "style": {
+ "navigationBarTitleText": "设置",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "syncElec",
+ "style": {
+ "navigationBarTitleText": "电量",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "selectGroup",
+ "style": {
+ "navigationBarTitleText": "选择分组",
+ "disableScroll": true
+ }
+ }
+ ]
+ },
+ {
+ "root": "pages/lockUserManage",
+ "pages": [
+ {
+ "path": "createAdmin",
+ "style": {
+ "navigationBarTitleText": "创建授权管理员",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "keyDetail",
+ "style": {
+ "disableScroll": true,
+ "navigationBarTitleText": "钥匙详情"
+ }
+ },
+ {
+ "path": "adminDetail",
+ "style": {
+ "navigationBarTitleText": "授权管理员详情",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "adminList",
+ "style": {
+ "navigationBarTitleText": "授权管理员",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "createKey",
+ "style": {
+ "navigationBarTitleText": "发送钥匙"
+ }
+ },
+ {
+ "path": "keyList",
+ "style": {
+ "disableScroll": true,
+ "navigationBarTitleText": "电子钥匙"
+ }
+ }
+ ]
+ }
+ ],
"pages": [
{
- "path": "pages/home/home"
+ "path": "pages/main/home"
},
{
- "path": "pages/selectAddress/selectAddress",
- "style": {
- "navigationBarTitleText": "锁地址",
- "disableScroll": true
- }
+ "path": "pages/main/mine"
},
{
- "path": "pages/mine/mine"
- },
- {
- "path": "pages/userInfo/userInfo",
- "style": {
- "navigationBarTitleText": "个人信息"
- }
- },
- {
- "path": "pages/updateName/updateName",
- "style": {
- "navigationBarTitleText": "修改昵称"
- }
- },
- {
- "path": "pages/updatePassword/updatePassword",
- "style": {
- "navigationBarTitleText": "重置密码"
- }
- },
- {
- "path": "pages/updateEmail/updateEmail",
- "style": {
- "navigationBarTitleText": "修改邮箱"
- }
- },
- {
- "path": "pages/verifyEmail/verifyEmail",
- "style": {
- "navigationBarTitleText": "验证邮箱"
- }
- },
- {
- "path": "pages/webview/webview",
- "style": {
- "navigationBarTitleText": "介绍"
- }
- },
- {
- "path": "pages/lockDetail/lockDetail",
- "style": {
- "navigationBarTitleText": "星星锁"
- }
- },
- {
- "path": "pages/bindLock/bindLock",
- "style": {
- "navigationBarTitleText": "添加锁"
- }
- },
- {
- "path": "pages/searchDevice/searchDevice",
- "style": {
- "disableScroll": true,
- "navigationBarTitleText": "附近设备"
- }
- },
- {
- "path": "pages/setting/setting",
- "style": {
- "navigationBarTitleText": "设置"
- }
- },
- {
- "path": "pages/keyList/keyList",
- "style": {
- "disableScroll": true,
- "navigationBarTitleText": "电子钥匙"
- }
- },
- {
- "path": "pages/createKey/createKey",
- "style": {
- "navigationBarTitleText": "发送钥匙"
- }
- },
- {
- "path": "pages/passwordList/passwordList",
- "style": {
- "disableScroll": true,
- "navigationBarTitleText": "密码"
- }
- },
- {
- "path": "pages/createPassword/createPassword",
- "style": {
- "disableScroll": true,
- "navigationBarTitleText": "获取密码"
- }
- },
- {
- "path": "pages/passwordDetail/passwordDetail",
- "style": {
- "disableScroll": true,
- "navigationBarTitleText": "密码详情"
- }
- },
- {
- "path": "pages/keyDetail/keyDetail",
- "style": {
- "disableScroll": true,
- "navigationBarTitleText": "钥匙详情"
- }
- },
- {
- "path": "pages/notificationList/notificationList",
+ "path": "pages/main/notificationList",
"style": {
"navigationBarTitleText": "通知列表"
}
},
{
- "path": "pages/notificationDetail/notificationDetail",
+ "path": "pages/main/lockDetail",
"style": {
- "navigationBarTitleText": "消息详情"
- }
- },
- {
- "path": "pages/addLockGuid/addLockGuid",
- "style": {
- "navigationBarTitleText": "添加锁",
- "disableScroll": true
- }
- },
- {
- "path": "pages/cardList/cardList",
- "style": {
- "navigationBarTitleText": "卡",
- "disableScroll": true
- }
- },
- {
- "path": "pages/createCard/createCard",
- "style": {
- "navigationBarTitleText": "添加卡",
- "disableScroll": true
- }
- },
- {
- "path": "pages/bindCard/bindCard",
- "style": {
- "navigationBarTitleText": "添加卡",
- "disableScroll": true
- }
- },
- {
- "path": "pages/cardDetail/cardDetail",
- "style": {
- "navigationBarTitleText": "卡详情",
- "disableScroll": true
- }
- },
- {
- "path": "pages/fingerprintList/fingerprintList",
- "style": {
- "navigationBarTitleText": "指纹",
- "disableScroll": true
- }
- },
- {
- "path": "pages/createFingerprint/createFingerprint",
- "style": {
- "navigationBarTitleText": "添加指纹",
- "disableScroll": true
- }
- },
- {
- "path": "pages/fingerprintDetail/fingerprintDetail",
- "style": {
- "navigationBarTitleText": "指纹详情",
- "disableScroll": true
- }
- },
- {
- "path": "pages/bindFingerprint/bindFingerprint",
- "style": {
- "navigationBarTitleText": "添加指纹",
- "disableScroll": true
- }
- },
- {
- "path": "pages/faceList/faceList",
- "style": {
- "navigationBarTitleText": "人脸",
- "disableScroll": true
- }
- },
- {
- "path": "pages/createFace/createFace",
- "style": {
- "navigationBarTitleText": "添加人脸",
- "disableScroll": true
- }
- },
- {
- "path": "pages/faceDetail/faceDetail",
- "style": {
- "navigationBarTitleText": "人脸详情",
- "disableScroll": true
- }
- },
- {
- "path": "pages/bindFace/bindFace",
- "style": {
- "navigationBarTitleText": "添加人脸",
- "disableScroll": true
- }
- },
- {
- "path": "pages/remoteList/remoteList",
- "style": {
- "navigationBarTitleText": "遥控",
- "disableScroll": true
- }
- },
- {
- "path": "pages/createRemote/createRemote",
- "style": {
- "navigationBarTitleText": "添加遥控",
- "disableScroll": true
- }
- },
- {
- "path": "pages/remoteDetail/remoteDetail",
- "style": {
- "navigationBarTitleText": "遥控详情",
- "disableScroll": true
- }
- },
- {
- "path": "pages/bindRemote/bindRemote",
- "style": {
- "navigationBarTitleText": "添加遥控",
- "disableScroll": true
- }
- },
- {
- "path": "pages/palmVeinList/palmVeinList",
- "style": {
- "navigationBarTitleText": "掌静脉",
- "disableScroll": true
- }
- },
- {
- "path": "pages/createPalmVein/createPalmVein",
- "style": {
- "navigationBarTitleText": "添加掌静脉",
- "disableScroll": true
- }
- },
- {
- "path": "pages/palmVeinDetail/palmVeinDetail",
- "style": {
- "navigationBarTitleText": "掌静脉详情",
- "disableScroll": true
- }
- },
- {
- "path": "pages/bindPalmVein/bindPalmVein",
- "style": {
- "navigationBarTitleText": "添加掌静脉",
- "disableScroll": true
- }
- },
- {
- "path": "pages/createAdmin/createAdmin",
- "style": {
- "navigationBarTitleText": "创建授权管理员",
- "disableScroll": true
- }
- },
- {
- "path": "pages/adminDetail/adminDetail",
- "style": {
- "navigationBarTitleText": "授权管理员详情",
- "disableScroll": true
- }
- },
- {
- "path": "pages/adminList/adminList",
- "style": {
- "navigationBarTitleText": "授权管理员",
- "disableScroll": true
- }
- },
- {
- "path": "pages/recordList/recordList",
- "style": {
- "navigationBarTitleText": "操作记录",
- "disableScroll": true
- }
- },
- {
- "path": "pages/recordDetail/recordDetail",
- "style": {
- "navigationBarTitleText": "操作记录详情",
- "disableScroll": true
- }
- },
- {
- "path": "pages/typeRecordList/typeRecordList",
- "style": {
- "navigationBarTitleText": "操作记录",
- "disableScroll": true
- }
- },
- {
- "path": "pages/cycleDate/cycleDate",
- "style": {
- "navigationBarTitleText": "有效期",
- "disableScroll": true
- }
- },
- {
- "path": "pages/temporaryDate/temporaryDate",
- "style": {
- "navigationBarTitleText": "修改有效期",
- "disableScroll": true
- }
- },
- {
- "path": "pages/lockInfo/lockInfo",
- "style": {
- "navigationBarTitleText": "基本信息",
- "disableScroll": true
- }
- },
- {
- "path": "pages/syncElec/syncElec",
- "style": {
- "navigationBarTitleText": "电量",
- "disableScroll": true
- }
- },
- {
- "path": "pages/selectGroup/selectGroup",
- "style": {
- "navigationBarTitleText": "选择分组",
- "disableScroll": true
- }
- },
- {
- "path": "pages/updateSetting/updateSetting",
- "style": {
- "navigationBarTitleText": "设置",
- "disableScroll": true
- }
- },
- {
- "path": "pages/lockSound/lockSound",
- "style": {
- "navigationBarTitleText": "锁声音",
- "disableScroll": true
- }
- },
- {
- "path": "pages/autoLock/autoLock",
- "style": {
- "navigationBarTitleText": "自动闭锁",
- "disableScroll": true
- }
- },
- {
- "path": "pages/faceSetting/faceSetting",
- "style": {
- "navigationBarTitleText": "面容开锁设置",
- "disableScroll": true
- }
- },
- {
- "path": "pages/lockDate/lockDate",
- "style": {
- "navigationBarTitleText": "锁时间",
- "disableScroll": true
- }
- },
- {
- "path": "pages/uploadLockData/uploadLockData",
- "style": {
- "navigationBarTitleText": "上传数据",
- "disableScroll": true
- }
- },
- {
- "path": "pages/openDirection/openDirection",
- "style": {
- "navigationBarTitleText": "开门方向设置",
- "disableScroll": true
- }
- },
- {
- "path": "pages/motorTorsion/motorTorsion",
- "style": {
- "navigationBarTitleText": "电机功率设置",
- "disableScroll": true
- }
- },
- {
- "path": "pages/catEye/catEye",
- "style": {
- "navigationBarTitleText": "猫眼设置",
- "disableScroll": true
- }
- },
- {
- "path": "pages/messageReminder/messageReminder",
- "style": {
- "navigationBarTitleText": "消息提醒",
- "disableScroll": true
- }
- },
- {
- "path": "pages/openDoorNotice/openDoorNotice",
- "style": {
- "navigationBarTitleText": "家人到家",
- "disableScroll": true
- }
- },
- {
- "path": "pages/noticeDetail/noticeDetail",
- "style": {
- "navigationBarTitleText": "家人详情",
- "disableScroll": true
- }
- },
- {
- "path": "pages/lockUser/lockUser",
- "style": {
- "navigationBarTitleText": "锁用户",
- "disableScroll": true
- }
- },
- {
- "path": "pages/noticeWay/noticeWay",
- "style": {
- "navigationBarTitleText": "提醒方式",
- "disableScroll": true
- }
- },
- {
- "path": "pages/notOpenDoor/notOpenDoor",
- "style": {
- "navigationBarTitleText": "N天未开门",
- "disableScroll": true
- }
- },
- {
- "path": "pages/lowElecNotice/lowElecNotice",
- "style": {
- "navigationBarTitleText": "低电量提醒",
- "disableScroll": true
- }
- },
- {
- "path": "pages/coercionOpenDoor/coercionOpenDoor",
- "style": {
- "navigationBarTitleText": "胁迫开门",
- "disableScroll": true
- }
- },
- {
- "path": "pages/coercionFingerprint/coercionFingerprint",
- "style": {
- "navigationBarTitleText": "指纹列表",
- "disableScroll": true
- }
- },
- {
- "path": "pages/catEyeMode/catEyeMode",
- "style": {
- "navigationBarTitleText": "猫眼工作模式",
- "disableScroll": true
- }
- },
- {
- "path": "pages/customCatEye/customCatEye",
- "style": {
- "navigationBarTitleText": "自定义模式",
- "disableScroll": true
- }
- },
- {
- "path": "pages/realTimePicture/realTimePicture",
- "style": {
- "navigationBarTitleText": "实时画面",
- "disableScroll": true
- }
- },
- {
- "path": "pages/videoSlot/videoSlot",
- "style": {
- "navigationBarTitleText": "录像时段",
- "disableScroll": true
- }
- },
- {
- "path": "pages/passageMode/passageMode",
- "style": {
- "navigationBarTitleText": "常开模式",
- "disableScroll": true
+ "navigationBarTitleText": "星星锁"
}
}
],
+ "preloadRule": {
+ "pages/main/home": {
+ "packages": ["pages/others"]
+ },
+ "pages/main/lockDetail": {
+ "packages": [
+ "pages/lockUserManage",
+ "pages/featureForBluetooth",
+ "pages/settingForBluetooth",
+ "pages/addDeviceForBluetooth"
+ ]
+ },
+ "pages/main/mine": {
+ "packages": ["pages/user"]
+ }
+ },
"globalStyle": {
"navigationBarTextStyle": "white",
"navigationBarTitleText": "星星锁",
@@ -536,19 +584,19 @@
"position": "bottom",
"list": [
{
- "pagePath": "pages/home/home",
+ "pagePath": "pages/main/home",
"iconPath": "static/images/tabbar_key_no_select.png",
"selectedIconPath": "static/images/tabbar_key_select.png",
"text": "设备"
},
{
- "pagePath": "pages/notificationList/notificationList",
+ "pagePath": "pages/main/notificationList",
"iconPath": "static/images/tabbar_notification_no_select.png",
"selectedIconPath": "static/images/tabbar_notification_select.png",
"text": "消息"
},
{
- "pagePath": "pages/mine/mine",
+ "pagePath": "pages/main/mine",
"iconPath": "static/images/tabbar_mine_no_select.png",
"selectedIconPath": "static/images/tabbar_mine_select.png",
"text": "我的"
diff --git a/pages/addLockGuid/addLockGuid.vue b/pages/addDeviceForBluetooth/addLockGuid.vue
similarity index 92%
rename from pages/addLockGuid/addLockGuid.vue
rename to pages/addDeviceForBluetooth/addLockGuid.vue
index 4e36266..42e3368 100644
--- a/pages/addLockGuid/addLockGuid.vue
+++ b/pages/addDeviceForBluetooth/addLockGuid.vue
@@ -1,7 +1,11 @@
摸亮触摸屏
-
+
摸亮触摸屏，锁进入可添加状态，点击下一步
下一步
diff --git a/pages/bindLock/bindLock.vue b/pages/addDeviceForBluetooth/bindLock.vue
similarity index 100%
rename from pages/bindLock/bindLock.vue
rename to pages/addDeviceForBluetooth/bindLock.vue
diff --git a/pages/searchDevice/searchDevice.vue b/pages/addDeviceForBluetooth/searchDevice.vue
similarity index 95%
rename from pages/searchDevice/searchDevice.vue
rename to pages/addDeviceForBluetooth/searchDevice.vue
index 881f5d5..f3a36cc 100644
--- a/pages/searchDevice/searchDevice.vue
+++ b/pages/addDeviceForBluetooth/searchDevice.vue
@@ -14,10 +14,13 @@
@click="connect(device)"
>
-
+
{{ device.name }}
-
+
diff --git a/pages/selectAddress/selectAddress.vue b/pages/addDeviceForBluetooth/selectAddress.vue
similarity index 98%
rename from pages/selectAddress/selectAddress.vue
rename to pages/addDeviceForBluetooth/selectAddress.vue
index 1ffd7ff..3f52fd5 100644
--- a/pages/selectAddress/selectAddress.vue
+++ b/pages/addDeviceForBluetooth/selectAddress.vue
@@ -120,7 +120,7 @@
id: 1,
latitude: res.latitude,
longitude: res.longitude,
- iconPath: '/static/images/icon_address.png',
+ iconPath: 'https://oss-lock.xhjcn.ltd/mp/icon_address.png',
width: '48rpx',
height: '48rpx'
}
diff --git a/pages/bindCard/bindCard.vue b/pages/featureForBluetooth/bindCard.vue
similarity index 98%
rename from pages/bindCard/bindCard.vue
rename to pages/featureForBluetooth/bindCard.vue
index ad9b4ef..78feb33 100644
--- a/pages/bindCard/bindCard.vue
+++ b/pages/featureForBluetooth/bindCard.vue
@@ -2,7 +2,7 @@
diff --git a/pages/bindFace/bindFace.vue b/pages/featureForBluetooth/bindFace.vue
similarity index 96%
rename from pages/bindFace/bindFace.vue
rename to pages/featureForBluetooth/bindFace.vue
index 6fa3055..761c25b 100644
--- a/pages/bindFace/bindFace.vue
+++ b/pages/featureForBluetooth/bindFace.vue
@@ -3,13 +3,13 @@
diff --git a/pages/bindFingerprint/bindFingerprint.vue b/pages/featureForBluetooth/bindFingerprint.vue
similarity index 97%
rename from pages/bindFingerprint/bindFingerprint.vue
rename to pages/featureForBluetooth/bindFingerprint.vue
index 567fe60..8406b07 100644
--- a/pages/bindFingerprint/bindFingerprint.vue
+++ b/pages/featureForBluetooth/bindFingerprint.vue
@@ -6,7 +6,7 @@
({{ process }}/{{ maxProcess }})
diff --git a/pages/bindPalmVein/bindPalmVein.vue b/pages/featureForBluetooth/bindPalmVein.vue
similarity index 97%
rename from pages/bindPalmVein/bindPalmVein.vue
rename to pages/featureForBluetooth/bindPalmVein.vue
index fe25956..446c713 100644
--- a/pages/bindPalmVein/bindPalmVein.vue
+++ b/pages/featureForBluetooth/bindPalmVein.vue
@@ -2,7 +2,7 @@
diff --git a/pages/bindRemote/bindRemote.vue b/pages/featureForBluetooth/bindRemote.vue
similarity index 98%
rename from pages/bindRemote/bindRemote.vue
rename to pages/featureForBluetooth/bindRemote.vue
index 77b740b..b9b3609 100644
--- a/pages/bindRemote/bindRemote.vue
+++ b/pages/featureForBluetooth/bindRemote.vue
@@ -2,7 +2,7 @@
diff --git a/pages/cardDetail/cardDetail.vue b/pages/featureForBluetooth/cardDetail.vue
similarity index 100%
rename from pages/cardDetail/cardDetail.vue
rename to pages/featureForBluetooth/cardDetail.vue
diff --git a/pages/cardList/cardList.vue b/pages/featureForBluetooth/cardList.vue
similarity index 98%
rename from pages/cardList/cardList.vue
rename to pages/featureForBluetooth/cardList.vue
index e83df99..09cee70 100644
--- a/pages/cardList/cardList.vue
+++ b/pages/featureForBluetooth/cardList.vue
@@ -29,7 +29,7 @@
暂无数据
@@ -47,7 +47,7 @@
diff --git a/pages/createCard/createCard.vue b/pages/featureForBluetooth/createCard.vue
similarity index 100%
rename from pages/createCard/createCard.vue
rename to pages/featureForBluetooth/createCard.vue
diff --git a/pages/createFace/createFace.vue b/pages/featureForBluetooth/createFace.vue
similarity index 100%
rename from pages/createFace/createFace.vue
rename to pages/featureForBluetooth/createFace.vue
diff --git a/pages/createFingerprint/createFingerprint.vue b/pages/featureForBluetooth/createFingerprint.vue
similarity index 100%
rename from pages/createFingerprint/createFingerprint.vue
rename to pages/featureForBluetooth/createFingerprint.vue
diff --git a/pages/createPalmVein/createPalmVein.vue b/pages/featureForBluetooth/createPalmVein.vue
similarity index 100%
rename from pages/createPalmVein/createPalmVein.vue
rename to pages/featureForBluetooth/createPalmVein.vue
diff --git a/pages/createPassword/createPassword.vue b/pages/featureForBluetooth/createPassword.vue
similarity index 100%
rename from pages/createPassword/createPassword.vue
rename to pages/featureForBluetooth/createPassword.vue
diff --git a/pages/createRemote/createRemote.vue b/pages/featureForBluetooth/createRemote.vue
similarity index 100%
rename from pages/createRemote/createRemote.vue
rename to pages/featureForBluetooth/createRemote.vue
diff --git a/pages/faceDetail/faceDetail.vue b/pages/featureForBluetooth/faceDetail.vue
similarity index 100%
rename from pages/faceDetail/faceDetail.vue
rename to pages/featureForBluetooth/faceDetail.vue
diff --git a/pages/faceList/faceList.vue b/pages/featureForBluetooth/faceList.vue
similarity index 98%
rename from pages/faceList/faceList.vue
rename to pages/featureForBluetooth/faceList.vue
index faaecb4..74152c4 100644
--- a/pages/faceList/faceList.vue
+++ b/pages/featureForBluetooth/faceList.vue
@@ -29,7 +29,7 @@
暂无数据
@@ -47,7 +47,7 @@
diff --git a/pages/fingerprintDetail/fingerprintDetail.vue b/pages/featureForBluetooth/fingerprintDetail.vue
similarity index 100%
rename from pages/fingerprintDetail/fingerprintDetail.vue
rename to pages/featureForBluetooth/fingerprintDetail.vue
diff --git a/pages/fingerprintList/fingerprintList.vue b/pages/featureForBluetooth/fingerprintList.vue
similarity index 98%
rename from pages/fingerprintList/fingerprintList.vue
rename to pages/featureForBluetooth/fingerprintList.vue
index 4b08c85..21d1fe6 100644
--- a/pages/fingerprintList/fingerprintList.vue
+++ b/pages/featureForBluetooth/fingerprintList.vue
@@ -29,7 +29,7 @@
暂无数据
@@ -47,7 +47,7 @@
diff --git a/pages/palmVeinDetail/palmVeinDetail.vue b/pages/featureForBluetooth/palmVeinDetail.vue
similarity index 100%
rename from pages/palmVeinDetail/palmVeinDetail.vue
rename to pages/featureForBluetooth/palmVeinDetail.vue
diff --git a/pages/palmVeinList/palmVeinList.vue b/pages/featureForBluetooth/palmVeinList.vue
similarity index 98%
rename from pages/palmVeinList/palmVeinList.vue
rename to pages/featureForBluetooth/palmVeinList.vue
index 1ebf087..51e8111 100644
--- a/pages/palmVeinList/palmVeinList.vue
+++ b/pages/featureForBluetooth/palmVeinList.vue
@@ -29,7 +29,7 @@
暂无数据
@@ -48,7 +48,7 @@
diff --git a/pages/passwordDetail/passwordDetail.vue b/pages/featureForBluetooth/passwordDetail.vue
similarity index 100%
rename from pages/passwordDetail/passwordDetail.vue
rename to pages/featureForBluetooth/passwordDetail.vue
diff --git a/pages/passwordList/passwordList.vue b/pages/featureForBluetooth/passwordList.vue
similarity index 98%
rename from pages/passwordList/passwordList.vue
rename to pages/featureForBluetooth/passwordList.vue
index 11a7448..09ce4af 100644
--- a/pages/passwordList/passwordList.vue
+++ b/pages/featureForBluetooth/passwordList.vue
@@ -29,7 +29,7 @@
暂无数据
@@ -47,7 +47,7 @@
diff --git a/pages/recordDetail/recordDetail.vue b/pages/featureForBluetooth/recordDetail.vue
similarity index 100%
rename from pages/recordDetail/recordDetail.vue
rename to pages/featureForBluetooth/recordDetail.vue
diff --git a/pages/recordList/recordList.vue b/pages/featureForBluetooth/recordList.vue
similarity index 99%
rename from pages/recordList/recordList.vue
rename to pages/featureForBluetooth/recordList.vue
index 8da5c28..4ffef70 100644
--- a/pages/recordList/recordList.vue
+++ b/pages/featureForBluetooth/recordList.vue
@@ -58,7 +58,7 @@
暂无数据
diff --git a/pages/remoteDetail/remoteDetail.vue b/pages/featureForBluetooth/remoteDetail.vue
similarity index 100%
rename from pages/remoteDetail/remoteDetail.vue
rename to pages/featureForBluetooth/remoteDetail.vue
diff --git a/pages/remoteList/remoteList.vue b/pages/featureForBluetooth/remoteList.vue
similarity index 98%
rename from pages/remoteList/remoteList.vue
rename to pages/featureForBluetooth/remoteList.vue
index b5b9860..86a9206 100644
--- a/pages/remoteList/remoteList.vue
+++ b/pages/featureForBluetooth/remoteList.vue
@@ -29,7 +29,7 @@
暂无数据
@@ -48,7 +48,7 @@
diff --git a/pages/typeRecordList/typeRecordList.vue b/pages/featureForBluetooth/typeRecordList.vue
similarity index 98%
rename from pages/typeRecordList/typeRecordList.vue
rename to pages/featureForBluetooth/typeRecordList.vue
index bda52ee..e6e4bd0 100644
--- a/pages/typeRecordList/typeRecordList.vue
+++ b/pages/featureForBluetooth/typeRecordList.vue
@@ -17,7 +17,7 @@
暂无数据
@@ -45,7 +45,7 @@
同步记录
diff --git a/pages/adminDetail/adminDetail.vue b/pages/lockUserManage/adminDetail.vue
similarity index 100%
rename from pages/adminDetail/adminDetail.vue
rename to pages/lockUserManage/adminDetail.vue
diff --git a/pages/adminList/adminList.vue b/pages/lockUserManage/adminList.vue
similarity index 97%
rename from pages/adminList/adminList.vue
rename to pages/lockUserManage/adminList.vue
index e3f795d..ccfa4e8 100644
--- a/pages/adminList/adminList.vue
+++ b/pages/lockUserManage/adminList.vue
@@ -29,7 +29,7 @@
暂无数据
@@ -47,7 +47,11 @@
diff --git a/pages/createAdmin/createAdmin.vue b/pages/lockUserManage/createAdmin.vue
similarity index 100%
rename from pages/createAdmin/createAdmin.vue
rename to pages/lockUserManage/createAdmin.vue
diff --git a/pages/createKey/createKey.vue b/pages/lockUserManage/createKey.vue
similarity index 100%
rename from pages/createKey/createKey.vue
rename to pages/lockUserManage/createKey.vue
diff --git a/pages/keyDetail/keyDetail.vue b/pages/lockUserManage/keyDetail.vue
similarity index 100%
rename from pages/keyDetail/keyDetail.vue
rename to pages/lockUserManage/keyDetail.vue
diff --git a/pages/keyList/keyList.vue b/pages/lockUserManage/keyList.vue
similarity index 97%
rename from pages/keyList/keyList.vue
rename to pages/lockUserManage/keyList.vue
index c178da9..37da67e 100644
--- a/pages/keyList/keyList.vue
+++ b/pages/lockUserManage/keyList.vue
@@ -29,7 +29,7 @@
暂无数据
@@ -47,7 +47,9 @@
@@ -57,13 +59,13 @@
class="key-admin"
mode="aspectFill"
v-if="key.remoteEnable === 1"
- src="/static/images/icon_remote_unlock.png"
+ src="https://oss-lock.xhjcn.ltd/mp/icon_remote_unlock.png"
>
-
+
@@ -26,7 +26,11 @@
mode="aspectFill"
>
{{ $bluetooth.currentLockInfo.electricQuantity }}%
-
+
@@ -35,7 +39,11 @@
点击开锁，长按闭锁
-
+
{{
$lock.getRole(
$bluetooth.currentLockInfo.userType,
@@ -48,8 +56,8 @@
class="bottom-icon"
:src="
$bluetooth.currentLockInfo.appUnlockOnline
- ? '/static/images/icon_cloud_active.png'
- : '/static/images/icon_cloud.png'
+ ? '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"
@@ -65,7 +73,7 @@
卡
@@ -113,7 +124,10 @@
class="menu-main-view"
@click="$basic.routeJump({ name: 'fingerprintList' })"
>
-
+
指纹
-
+
遥控
-
+
人脸
-
+
掌静脉
授权管理员
@@ -164,7 +187,10 @@
class="menu-main-view transform-scale-105"
@click="$basic.routeJump({ name: 'recordList' })"
>
-
+
操作记录
消息提醒
-
+
设置
-
+
diff --git a/pages/mine/mine.vue b/pages/main/mine.vue
similarity index 91%
rename from pages/mine/mine.vue
rename to pages/main/mine.vue
index 3f52956..6220686 100644
--- a/pages/mine/mine.vue
+++ b/pages/main/mine.vue
@@ -4,29 +4,49 @@
个人信息
-
+
公司介绍
-
+
用户协议
-
+
隐私政策
-
+
diff --git a/pages/notificationList/notificationList.vue b/pages/main/notificationList.vue
similarity index 96%
rename from pages/notificationList/notificationList.vue
rename to pages/main/notificationList.vue
index 62fb13b..17337d0 100644
--- a/pages/notificationList/notificationList.vue
+++ b/pages/main/notificationList.vue
@@ -15,7 +15,7 @@
暂无数据
@@ -36,7 +36,7 @@
@@ -44,7 +44,7 @@
@@ -76,7 +76,11 @@
@click="deleteAllNotification"
v-if="isLogin && requestFinished && notificationList.length !== 0"
>
-
+
diff --git a/pages/coercionOpenDoor/coercionOpenDoor.vue b/pages/settingForBluetooth/coercionOpenDoor.vue
similarity index 98%
rename from pages/coercionOpenDoor/coercionOpenDoor.vue
rename to pages/settingForBluetooth/coercionOpenDoor.vue
index 3eb76a6..d53f128 100644
--- a/pages/coercionOpenDoor/coercionOpenDoor.vue
+++ b/pages/settingForBluetooth/coercionOpenDoor.vue
@@ -22,7 +22,7 @@
暂无数据
diff --git a/pages/customCatEye/customCatEye.vue b/pages/settingForBluetooth/customCatEye.vue
similarity index 100%
rename from pages/customCatEye/customCatEye.vue
rename to pages/settingForBluetooth/customCatEye.vue
diff --git a/pages/faceSetting/faceSetting.vue b/pages/settingForBluetooth/faceSetting.vue
similarity index 100%
rename from pages/faceSetting/faceSetting.vue
rename to pages/settingForBluetooth/faceSetting.vue
diff --git a/pages/LockDate/LockDate.vue b/pages/settingForBluetooth/lockDate.vue
similarity index 100%
rename from pages/LockDate/LockDate.vue
rename to pages/settingForBluetooth/lockDate.vue
diff --git a/pages/lockInfo/lockInfo.vue b/pages/settingForBluetooth/lockInfo.vue
similarity index 100%
rename from pages/lockInfo/lockInfo.vue
rename to pages/settingForBluetooth/lockInfo.vue
diff --git a/pages/lockSound/lockSound.vue b/pages/settingForBluetooth/lockSound.vue
similarity index 100%
rename from pages/lockSound/lockSound.vue
rename to pages/settingForBluetooth/lockSound.vue
diff --git a/pages/lockUser/lockUser.vue b/pages/settingForBluetooth/lockUser.vue
similarity index 97%
rename from pages/lockUser/lockUser.vue
rename to pages/settingForBluetooth/lockUser.vue
index 6e3c7ed..9ad9c32 100644
--- a/pages/lockUser/lockUser.vue
+++ b/pages/settingForBluetooth/lockUser.vue
@@ -25,7 +25,7 @@
暂无数据
@@ -48,9 +48,13 @@
+
-
diff --git a/pages/lowElecNotice/lowElecNotice.vue b/pages/settingForBluetooth/lowElecNotice.vue
similarity index 100%
rename from pages/lowElecNotice/lowElecNotice.vue
rename to pages/settingForBluetooth/lowElecNotice.vue
diff --git a/pages/messageReminder/messageReminder.vue b/pages/settingForBluetooth/messageReminder.vue
similarity index 100%
rename from pages/messageReminder/messageReminder.vue
rename to pages/settingForBluetooth/messageReminder.vue
diff --git a/pages/motorTorsion/motorTorsion.vue b/pages/settingForBluetooth/motorTorsion.vue
similarity index 100%
rename from pages/motorTorsion/motorTorsion.vue
rename to pages/settingForBluetooth/motorTorsion.vue
diff --git a/pages/notOpenDoor/notOpenDoor.vue b/pages/settingForBluetooth/notOpenDoor.vue
similarity index 100%
rename from pages/notOpenDoor/notOpenDoor.vue
rename to pages/settingForBluetooth/notOpenDoor.vue
diff --git a/pages/noticeDetail/noticeDetail.vue b/pages/settingForBluetooth/noticeDetail.vue
similarity index 100%
rename from pages/noticeDetail/noticeDetail.vue
rename to pages/settingForBluetooth/noticeDetail.vue
diff --git a/pages/noticeWay/noticeWay.vue b/pages/settingForBluetooth/noticeWay.vue
similarity index 100%
rename from pages/noticeWay/noticeWay.vue
rename to pages/settingForBluetooth/noticeWay.vue
diff --git a/pages/openDirection/openDirection.vue b/pages/settingForBluetooth/openDirection.vue
similarity index 89%
rename from pages/openDirection/openDirection.vue
rename to pages/settingForBluetooth/openDirection.vue
index 34ffcf3..187be4a 100644
--- a/pages/openDirection/openDirection.vue
+++ b/pages/settingForBluetooth/openDirection.vue
@@ -2,19 +2,23 @@
请谨慎选择您家的开门方向(如果选择错误，将无法正常开关门)：
-
+
左开
@@ -23,13 +27,13 @@
右开
diff --git a/pages/openDoorNotice/openDoorNotice.vue b/pages/settingForBluetooth/openDoorNotice.vue
similarity index 98%
rename from pages/openDoorNotice/openDoorNotice.vue
rename to pages/settingForBluetooth/openDoorNotice.vue
index 52c6394..3cc4819 100644
--- a/pages/openDoorNotice/openDoorNotice.vue
+++ b/pages/settingForBluetooth/openDoorNotice.vue
@@ -22,7 +22,7 @@
暂无数据
diff --git a/pages/passageMode/passageMode.vue b/pages/settingForBluetooth/passageMode.vue
similarity index 96%
rename from pages/passageMode/passageMode.vue
rename to pages/settingForBluetooth/passageMode.vue
index 9960664..db04825 100644
--- a/pages/passageMode/passageMode.vue
+++ b/pages/settingForBluetooth/passageMode.vue
@@ -37,8 +37,16 @@
全天
-
-
+
+
diff --git a/pages/realTimePicture/realTimePicture.vue b/pages/settingForBluetooth/realTimePicture.vue
similarity index 100%
rename from pages/realTimePicture/realTimePicture.vue
rename to pages/settingForBluetooth/realTimePicture.vue
diff --git a/pages/selectGroup/selectGroup.vue b/pages/settingForBluetooth/selectGroup.vue
similarity index 100%
rename from pages/selectGroup/selectGroup.vue
rename to pages/settingForBluetooth/selectGroup.vue
diff --git a/pages/setting/setting.vue b/pages/settingForBluetooth/setting.vue
similarity index 100%
rename from pages/setting/setting.vue
rename to pages/settingForBluetooth/setting.vue
diff --git a/pages/syncElec/syncElec.vue b/pages/settingForBluetooth/syncElec.vue
similarity index 100%
rename from pages/syncElec/syncElec.vue
rename to pages/settingForBluetooth/syncElec.vue
diff --git a/pages/updateSetting/updateSetting.vue b/pages/settingForBluetooth/updateSetting.vue
similarity index 100%
rename from pages/updateSetting/updateSetting.vue
rename to pages/settingForBluetooth/updateSetting.vue
diff --git a/pages/uploadLockData/uploadLockData.vue b/pages/settingForBluetooth/uploadLockData.vue
similarity index 100%
rename from pages/uploadLockData/uploadLockData.vue
rename to pages/settingForBluetooth/uploadLockData.vue
diff --git a/pages/videoSlot/videoSlot.vue b/pages/settingForBluetooth/videoSlot.vue
similarity index 100%
rename from pages/videoSlot/videoSlot.vue
rename to pages/settingForBluetooth/videoSlot.vue
diff --git a/pages/updateEmail/updateEmail.vue b/pages/user/updateEmail.vue
similarity index 100%
rename from pages/updateEmail/updateEmail.vue
rename to pages/user/updateEmail.vue
diff --git a/pages/updateName/updateName.vue b/pages/user/updateName.vue
similarity index 100%
rename from pages/updateName/updateName.vue
rename to pages/user/updateName.vue
diff --git a/pages/updatePassword/updatePassword.vue b/pages/user/updatePassword.vue
similarity index 100%
rename from pages/updatePassword/updatePassword.vue
rename to pages/user/updatePassword.vue
diff --git a/pages/userInfo/userInfo.vue b/pages/user/userInfo.vue
similarity index 90%
rename from pages/userInfo/userInfo.vue
rename to pages/user/userInfo.vue
index 4cfeaf5..ac35d08 100644
--- a/pages/userInfo/userInfo.vue
+++ b/pages/user/userInfo.vue
@@ -6,7 +6,11 @@
头像
-
+
@@ -15,7 +19,11 @@
昵称
{{ userInfo.nickname }}
-
+
@@ -25,7 +33,11 @@
{{ userInfo.mobile }}
-
+
@@ -35,13 +47,21 @@
{{ userInfo.email }}
-
+
重置密码
-
+
diff --git a/pages/verifyEmail/verifyEmail.vue b/pages/user/verifyEmail.vue
similarity index 100%
rename from pages/verifyEmail/verifyEmail.vue
rename to pages/user/verifyEmail.vue
diff --git a/static/images/background_close_door.png b/static/images/background_close_door.png
deleted file mode 100755
index 1b3d33e..0000000
Binary files a/static/images/background_close_door.png and /dev/null differ
diff --git a/static/images/background_empty_list.png b/static/images/background_empty_list.png
deleted file mode 100644
index 339ed19..0000000
Binary files a/static/images/background_empty_list.png and /dev/null differ
diff --git a/static/images/background_main.jpg b/static/images/background_main.jpg
deleted file mode 100644
index e51efc0..0000000
Binary files a/static/images/background_main.jpg and /dev/null differ
diff --git a/static/images/background_open_door.png b/static/images/background_open_door.png
deleted file mode 100644
index 73313ab..0000000
Binary files a/static/images/background_open_door.png and /dev/null differ
diff --git a/static/images/icon_add.png b/static/images/icon_add.png
deleted file mode 100644
index 73524e6..0000000
Binary files a/static/images/icon_add.png and /dev/null differ
diff --git a/static/images/icon_add_blue.png b/static/images/icon_add_blue.png
deleted file mode 100644
index fd36391..0000000
Binary files a/static/images/icon_add_blue.png and /dev/null differ
diff --git a/static/images/icon_add_card.png b/static/images/icon_add_card.png
deleted file mode 100755
index dd3a520..0000000
Binary files a/static/images/icon_add_card.png and /dev/null differ
diff --git a/static/images/icon_add_face_1.png b/static/images/icon_add_face_1.png
deleted file mode 100755
index aeacd24..0000000
Binary files a/static/images/icon_add_face_1.png and /dev/null differ
diff --git a/static/images/icon_add_face_2.png b/static/images/icon_add_face_2.png
deleted file mode 100755
index 90e5f03..0000000
Binary files a/static/images/icon_add_face_2.png and /dev/null differ
diff --git a/static/images/icon_add_palm_vein.png b/static/images/icon_add_palm_vein.png
deleted file mode 100755
index d491e67..0000000
Binary files a/static/images/icon_add_palm_vein.png and /dev/null differ
diff --git a/static/images/icon_add_remote.png b/static/images/icon_add_remote.png
deleted file mode 100644
index b2e956f..0000000
Binary files a/static/images/icon_add_remote.png and /dev/null differ
diff --git a/static/images/icon_add_round.png b/static/images/icon_add_round.png
deleted file mode 100644
index 6f76848..0000000
Binary files a/static/images/icon_add_round.png and /dev/null differ
diff --git a/static/images/icon_address.png b/static/images/icon_address.png
deleted file mode 100644
index fd4022e..0000000
Binary files a/static/images/icon_address.png and /dev/null differ
diff --git a/static/images/icon_admin.png b/static/images/icon_admin.png
deleted file mode 100755
index c389a77..0000000
Binary files a/static/images/icon_admin.png and /dev/null differ
diff --git a/static/images/icon_admin_black.png b/static/images/icon_admin_black.png
deleted file mode 100644
index f1ce926..0000000
Binary files a/static/images/icon_admin_black.png and /dev/null differ
diff --git a/static/images/icon_arrow.png b/static/images/icon_arrow.png
deleted file mode 100644
index f0d9d84..0000000
Binary files a/static/images/icon_arrow.png and /dev/null differ
diff --git a/static/images/icon_card.png b/static/images/icon_card.png
deleted file mode 100644
index 283cb20..0000000
Binary files a/static/images/icon_card.png and /dev/null differ
diff --git a/static/images/icon_card_white.png b/static/images/icon_card_white.png
deleted file mode 100755
index 719ada5..0000000
Binary files a/static/images/icon_card_white.png and /dev/null differ
diff --git a/static/images/icon_cloud.png b/static/images/icon_cloud.png
deleted file mode 100644
index aa41ec5..0000000
Binary files a/static/images/icon_cloud.png and /dev/null differ
diff --git a/static/images/icon_cloud_active.png b/static/images/icon_cloud_active.png
deleted file mode 100644
index f15e39f..0000000
Binary files a/static/images/icon_cloud_active.png and /dev/null differ
diff --git a/static/images/icon_delete.png b/static/images/icon_delete.png
deleted file mode 100644
index 2559304..0000000
Binary files a/static/images/icon_delete.png and /dev/null differ
diff --git a/static/images/icon_door_lock.png b/static/images/icon_door_lock.png
deleted file mode 100755
index 5ee591d..0000000
Binary files a/static/images/icon_door_lock.png and /dev/null differ
diff --git a/static/images/icon_face.png b/static/images/icon_face.png
deleted file mode 100644
index 9895212..0000000
Binary files a/static/images/icon_face.png and /dev/null differ
diff --git a/static/images/icon_face_white.png b/static/images/icon_face_white.png
deleted file mode 100755
index 739bd42..0000000
Binary files a/static/images/icon_face_white.png and /dev/null differ
diff --git a/static/images/icon_fingerprint.png b/static/images/icon_fingerprint.png
deleted file mode 100644
index 40a986f..0000000
Binary files a/static/images/icon_fingerprint.png and /dev/null differ
diff --git a/static/images/icon_fingerprint_0.png b/static/images/icon_fingerprint_0.png
deleted file mode 100755
index 5ef3c50..0000000
Binary files a/static/images/icon_fingerprint_0.png and /dev/null differ
diff --git a/static/images/icon_fingerprint_1.png b/static/images/icon_fingerprint_1.png
deleted file mode 100755
index cded470..0000000
Binary files a/static/images/icon_fingerprint_1.png and /dev/null differ
diff --git a/static/images/icon_fingerprint_2.png b/static/images/icon_fingerprint_2.png
deleted file mode 100755
index 489de43..0000000
Binary files a/static/images/icon_fingerprint_2.png and /dev/null differ
diff --git a/static/images/icon_fingerprint_3.png b/static/images/icon_fingerprint_3.png
deleted file mode 100755
index b77d0fa..0000000
Binary files a/static/images/icon_fingerprint_3.png and /dev/null differ
diff --git a/static/images/icon_fingerprint_4.png b/static/images/icon_fingerprint_4.png
deleted file mode 100755
index ed7a18f..0000000
Binary files a/static/images/icon_fingerprint_4.png and /dev/null differ
diff --git a/static/images/icon_fingerprint_5.png b/static/images/icon_fingerprint_5.png
deleted file mode 100644
index 241b66f..0000000
Binary files a/static/images/icon_fingerprint_5.png and /dev/null differ
diff --git a/static/images/icon_fingerprint_white.png b/static/images/icon_fingerprint_white.png
deleted file mode 100755
index 5a328b7..0000000
Binary files a/static/images/icon_fingerprint_white.png and /dev/null differ
diff --git a/static/images/icon_key.png b/static/images/icon_key.png
deleted file mode 100644
index 32a80fb..0000000
Binary files a/static/images/icon_key.png and /dev/null differ
diff --git a/static/images/icon_lock.png b/static/images/icon_lock.png
deleted file mode 100644
index 7997525..0000000
Binary files a/static/images/icon_lock.png and /dev/null differ
diff --git a/static/images/icon_lock_touch_screen.png b/static/images/icon_lock_touch_screen.png
deleted file mode 100755
index c01adc9..0000000
Binary files a/static/images/icon_lock_touch_screen.png and /dev/null differ
diff --git a/static/images/icon_lock_transparent.png b/static/images/icon_lock_transparent.png
deleted file mode 100644
index 57bcb4e..0000000
Binary files a/static/images/icon_lock_transparent.png and /dev/null differ
diff --git a/static/images/icon_menu.png b/static/images/icon_menu.png
deleted file mode 100644
index 2311ee0..0000000
Binary files a/static/images/icon_menu.png and /dev/null differ
diff --git a/static/images/icon_not_select.png b/static/images/icon_not_select.png
deleted file mode 100644
index c797e6d..0000000
Binary files a/static/images/icon_not_select.png and /dev/null differ
diff --git a/static/images/icon_notification_read.png b/static/images/icon_notification_read.png
deleted file mode 100755
index a9cb140..0000000
Binary files a/static/images/icon_notification_read.png and /dev/null differ
diff --git a/static/images/icon_notification_unread.png b/static/images/icon_notification_unread.png
deleted file mode 100755
index 3a04613..0000000
Binary files a/static/images/icon_notification_unread.png and /dev/null differ
diff --git a/static/images/icon_open_direction.png b/static/images/icon_open_direction.png
deleted file mode 100755
index 3b9ae2f..0000000
Binary files a/static/images/icon_open_direction.png and /dev/null differ
diff --git a/static/images/icon_palm_vein.png b/static/images/icon_palm_vein.png
deleted file mode 100644
index 31ffd49..0000000
Binary files a/static/images/icon_palm_vein.png and /dev/null differ
diff --git a/static/images/icon_palm_vein_white.png b/static/images/icon_palm_vein_white.png
deleted file mode 100644
index 0b94f87..0000000
Binary files a/static/images/icon_palm_vein_white.png and /dev/null differ
diff --git a/static/images/icon_password.png b/static/images/icon_password.png
deleted file mode 100755
index e1c0f14..0000000
Binary files a/static/images/icon_password.png and /dev/null differ
diff --git a/static/images/icon_password_green.png b/static/images/icon_password_green.png
deleted file mode 100644
index 4584da7..0000000
Binary files a/static/images/icon_password_green.png and /dev/null differ
diff --git a/static/images/icon_power_1.png b/static/images/icon_power_1.png
deleted file mode 100755
index 54a9924..0000000
Binary files a/static/images/icon_power_1.png and /dev/null differ
diff --git a/static/images/icon_power_2.png b/static/images/icon_power_2.png
deleted file mode 100755
index e9eb362..0000000
Binary files a/static/images/icon_power_2.png and /dev/null differ
diff --git a/static/images/icon_power_3.png b/static/images/icon_power_3.png
deleted file mode 100755
index c105488..0000000
Binary files a/static/images/icon_power_3.png and /dev/null differ
diff --git a/static/images/icon_power_4.png b/static/images/icon_power_4.png
deleted file mode 100755
index f57b60a..0000000
Binary files a/static/images/icon_power_4.png and /dev/null differ
diff --git a/static/images/icon_power_5.png b/static/images/icon_power_5.png
deleted file mode 100755
index eef3c9c..0000000
Binary files a/static/images/icon_power_5.png and /dev/null differ
diff --git a/static/images/icon_record.png b/static/images/icon_record.png
deleted file mode 100644
index 86d37c2..0000000
Binary files a/static/images/icon_record.png and /dev/null differ
diff --git a/static/images/icon_remind.png b/static/images/icon_remind.png
deleted file mode 100644
index d693196..0000000
Binary files a/static/images/icon_remind.png and /dev/null differ
diff --git a/static/images/icon_remote.png b/static/images/icon_remote.png
deleted file mode 100644
index 7d75198..0000000
Binary files a/static/images/icon_remote.png and /dev/null differ
diff --git a/static/images/icon_remote_unlock.png b/static/images/icon_remote_unlock.png
deleted file mode 100755
index 87ac084..0000000
Binary files a/static/images/icon_remote_unlock.png and /dev/null differ
diff --git a/static/images/icon_remote_white.png b/static/images/icon_remote_white.png
deleted file mode 100644
index 8568eee..0000000
Binary files a/static/images/icon_remote_white.png and /dev/null differ
diff --git a/static/images/icon_role.png b/static/images/icon_role.png
deleted file mode 100644
index 33d916e..0000000
Binary files a/static/images/icon_role.png and /dev/null differ
diff --git a/static/images/icon_select.png b/static/images/icon_select.png
deleted file mode 100644
index d872f0f..0000000
Binary files a/static/images/icon_select.png and /dev/null differ
diff --git a/static/images/icon_setting.png b/static/images/icon_setting.png
deleted file mode 100644
index ffe97c6..0000000
Binary files a/static/images/icon_setting.png and /dev/null differ
diff --git a/static/images/icon_sync.png b/static/images/icon_sync.png
deleted file mode 100644
index 0473a40..0000000
Binary files a/static/images/icon_sync.png and /dev/null differ
diff --git a/static/images/icon_tips.png b/static/images/icon_tips.png
deleted file mode 100644
index 5dcd7a1..0000000
Binary files a/static/images/icon_tips.png and /dev/null differ
diff --git a/static/images/icon_user.png b/static/images/icon_user.png
deleted file mode 100755
index 4bb2c1c..0000000
Binary files a/static/images/icon_user.png and /dev/null differ
diff --git a/static/images/img.png b/static/images/img.png
deleted file mode 100644
index 1837e47..0000000
Binary files a/static/images/img.png and /dev/null differ
diff --git a/stores/basic.js b/stores/basic.js
index 36b52aa..0a3ab1f 100644
--- a/stores/basic.js
+++ b/stores/basic.js
@@ -4,382 +4,382 @@ import { defineStore } from 'pinia'
const pages = [
{
name: 'home',
- path: '/pages/home/home',
+ path: '/pages/main/home',
tabBar: true
},
{
name: 'mine',
- path: '/pages/mine/mine',
+ path: '/pages/main/mine',
tabBar: true
},
{
name: 'userInfo',
- path: '/pages/userInfo/userInfo',
+ path: '/pages/user/userInfo',
tabBar: false
},
{
name: 'updateName',
- path: '/pages/updateName/updateName',
+ path: '/pages/user/updateName',
tabBar: false
},
{
name: 'updatePassword',
- path: '/pages/updatePassword/updatePassword',
+ path: '/pages/user/updatePassword',
tabBar: false
},
{
name: 'updateEmail',
- path: '/pages/updateEmail/updateEmail',
+ path: '/pages/user/updateEmail',
tabBar: false
},
{
name: 'verifyEmail',
- path: '/pages/verifyEmail/verifyEmail',
+ path: '/pages/user/verifyEmail',
tabBar: false
},
{
name: 'webview',
- path: '/pages/webview/webview',
+ path: '/pages/others/webview',
tabBar: false
},
{
name: 'lockDetail',
- path: '/pages/lockDetail/lockDetail',
+ path: '/pages/main/lockDetail',
tabBar: false
},
{
name: 'searchDevice',
- path: '/pages/searchDevice/searchDevice',
+ path: '/pages/addDeviceForBluetooth/searchDevice',
tabBar: false
},
{
name: 'selectAddress',
- path: '/pages/selectAddress/selectAddress',
+ path: '/pages/addDeviceForBluetooth/selectAddress',
tabBar: false
},
{
name: 'bindLock',
- path: '/pages/bindLock/bindLock',
+ path: '/pages/addDeviceForBluetooth/bindLock',
tabBar: false
},
{
name: 'setting',
- path: '/pages/setting/setting',
+ path: '/pages/settingForBluetooth/setting',
tabBar: false
},
{
name: 'keyList',
- path: '/pages/keyList/keyList',
+ path: '/pages/lockUserManage/keyList',
tabBar: false
},
{
name: 'createKey',
- path: '/pages/createKey/createKey',
+ path: '/pages/lockUserManage/createKey',
tabBar: false
},
{
name: 'passwordList',
- path: '/pages/passwordList/passwordList',
+ path: '/pages/featureForBluetooth/passwordList',
tabBar: false
},
{
name: 'createPassword',
- path: '/pages/createPassword/createPassword',
+ path: '/pages/featureForBluetooth/createPassword',
tabBar: false
},
{
name: 'passwordDetail',
- path: '/pages/passwordDetail/passwordDetail',
+ path: '/pages/featureForBluetooth/passwordDetail',
tabBar: false
},
{
name: 'keyDetail',
- path: '/pages/keyDetail/keyDetail',
+ path: '/pages/lockUserManage/keyDetail',
tabBar: false
},
{
name: 'notificationList',
- path: '/pages/notificationList/notificationList',
+ path: '/pages/main/notificationList',
tabBar: true
},
{
name: 'notificationDetail',
- path: '/pages/notificationDetail/notificationDetail',
+ path: '/pages/others/notificationDetail',
tabBar: false
},
{
name: 'addLockGuid',
- path: '/pages/addLockGuid/addLockGuid',
+ path: '/pages/addDeviceForBluetooth/addLockGuid',
tabBar: false
},
{
name: 'cardList',
- path: '/pages/cardList/cardList',
+ path: '/pages/featureForBluetooth/cardList',
tabBar: false
},
{
name: 'createCard',
- path: '/pages/createCard/createCard',
+ path: '/pages/featureForBluetooth/createCard',
tabBar: false
},
{
name: 'cardDetail',
- path: '/pages/cardDetail/cardDetail',
+ path: '/pages/featureForBluetooth/cardDetail',
tabBar: false
},
{
name: 'bindCard',
- path: '/pages/bindCard/bindCard',
+ path: '/pages/featureForBluetooth/bindCard',
tabBar: false
},
{
name: 'fingerprintList',
- path: '/pages/fingerprintList/fingerprintList',
+ path: '/pages/featureForBluetooth/fingerprintList',
tabBar: false
},
{
name: 'createFingerprint',
- path: '/pages/createFingerprint/createFingerprint',
+ path: '/pages/featureForBluetooth/createFingerprint',
tabBar: false
},
{
name: 'fingerprintDetail',
- path: '/pages/fingerprintDetail/fingerprintDetail',
+ path: '/pages/featureForBluetooth/fingerprintDetail',
tabBar: false
},
{
name: 'bindFingerprint',
- path: '/pages/bindFingerprint/bindFingerprint',
+ path: '/pages/featureForBluetooth/bindFingerprint',
tabBar: false
},
{
name: 'faceList',
- path: '/pages/faceList/faceList',
+ path: '/pages/featureForBluetooth/faceList',
tabBar: false
},
{
name: 'createFace',
- path: '/pages/createFace/createFace',
+ path: '/pages/featureForBluetooth/createFace',
tabBar: false
},
{
name: 'faceDetail',
- path: '/pages/faceDetail/faceDetail',
+ path: '/pages/featureForBluetooth/faceDetail',
tabBar: false
},
{
name: 'bindFace',
- path: '/pages/bindFace/bindFace',
+ path: '/pages/featureForBluetooth/bindFace',
tabBar: false
},
{
name: 'remoteList',
- path: '/pages/remoteList/remoteList',
+ path: '/pages/featureForBluetooth/remoteList',
tabBar: false
},
{
name: 'createRemote',
- path: '/pages/createRemote/createRemote',
+ path: '/pages/featureForBluetooth/createRemote',
tabBar: false
},
{
name: 'remoteDetail',
- path: '/pages/remoteDetail/remoteDetail',
+ path: '/pages/featureForBluetooth/remoteDetail',
tabBar: false
},
{
name: 'bindRemote',
- path: '/pages/bindRemote/bindRemote',
+ path: '/pages/featureForBluetooth/bindRemote',
tabBar: false
},
{
name: 'palmVeinList',
- path: '/pages/palmVeinList/palmVeinList',
+ path: '/pages/featureForBluetooth/palmVeinList',
tabBar: false
},
{
name: 'createPalmVein',
- path: '/pages/createPalmVein/createPalmVein',
+ path: '/pages/featureForBluetooth/createPalmVein',
tabBar: false
},
{
name: 'palmVeinDetail',
- path: '/pages/palmVeinDetail/palmVeinDetail',
+ path: '/pages/featureForBluetooth/palmVeinDetail',
tabBar: false
},
{
name: 'bindPalmVein',
- path: '/pages/bindPalmVein/bindPalmVein',
+ path: '/pages/featureForBluetooth/bindPalmVein',
tabBar: false
},
{
name: 'createAdmin',
- path: '/pages/createAdmin/createAdmin',
+ path: '/pages/lockUserManage/createAdmin',
tabBar: false
},
{
name: 'adminDetail',
- path: '/pages/adminDetail/adminDetail',
+ path: '/pages/lockUserManage/adminDetail',
tabBar: false
},
{
name: 'adminList',
- path: '/pages/adminList/adminList',
+ path: '/pages/lockUserManage/adminList',
tabBar: false
},
{
name: 'recordList',
- path: '/pages/recordList/recordList',
+ path: '/pages/featureForBluetooth/recordList',
tabBar: false
},
{
name: 'recordDetail',
- path: '/pages/recordDetail/recordDetail',
+ path: '/pages/featureForBluetooth/recordDetail',
tabBar: false
},
{
name: 'typeRecordList',
- path: '/pages/typeRecordList/typeRecordList',
+ path: '/pages/featureForBluetooth/typeRecordList',
tabBar: false
},
{
name: 'cycleDate',
- path: '/pages/cycleDate/cycleDate',
+ path: '/pages/others/cycleDate',
tabBar: false
},
{
name: 'temporaryDate',
- path: '/pages/temporaryDate/temporaryDate',
+ path: '/pages/others/temporaryDate',
tabBar: false
},
{
name: 'lockInfo',
- path: '/pages/lockInfo/lockInfo',
+ path: '/pages/settingForBluetooth/lockInfo',
tabBar: false
},
{
name: 'syncElec',
- path: '/pages/syncElec/syncElec',
+ path: '/pages/settingForBluetooth/syncElec',
tabBar: false
},
{
name: 'selectGroup',
- path: '/pages/selectGroup/selectGroup',
+ path: '/pages/settingForBluetooth/selectGroup',
tabBar: false
},
{
name: 'updateSetting',
- path: '/pages/updateSetting/updateSetting',
+ path: '/pages/settingForBluetooth/updateSetting',
tabBar: false
},
{
name: 'lockSound',
- path: '/pages/lockSound/lockSound',
+ path: '/pages/settingForBluetooth/lockSound',
tabBar: false
},
{
name: 'autoLock',
- path: '/pages/autoLock/autoLock',
+ path: '/pages/settingForBluetooth/autoLock',
tabBar: false
},
{
name: 'faceSetting',
- path: '/pages/faceSetting/faceSetting',
+ path: '/pages/settingForBluetooth/faceSetting',
tabBar: false
},
{
name: 'lockDate',
- path: '/pages/lockDate/lockDate',
+ path: '/pages/settingForBluetooth/lockDate',
tabBar: false
},
{
name: 'uploadLockData',
- path: '/pages/uploadLockData/uploadLockData',
+ path: '/pages/settingForBluetooth/uploadLockData',
tabBar: false
},
{
name: 'openDirection',
- path: '/pages/openDirection/openDirection',
+ path: '/pages/settingForBluetooth/openDirection',
tabBar: false
},
{
name: 'motorTorsion',
- path: '/pages/motorTorsion/motorTorsion',
+ path: '/pages/settingForBluetooth/motorTorsion',
tabBar: false
},
{
name: 'catEye',
- path: '/pages/catEye/catEye',
+ path: '/pages/settingForBluetooth/catEye',
tabBar: false
},
{
name: 'messageReminder',
- path: '/pages/messageReminder/messageReminder',
+ path: '/pages/settingForBluetooth/messageReminder',
tabBar: false
},
{
name: 'openDoorNotice',
- path: '/pages/openDoorNotice/openDoorNotice',
+ path: '/pages/settingForBluetooth/openDoorNotice',
tabBar: false
},
{
name: 'noticeDetail',
- path: '/pages/noticeDetail/noticeDetail',
+ path: '/pages/settingForBluetooth/noticeDetail',
tabBar: false
},
{
name: 'lockUser',
- path: '/pages/lockUser/lockUser',
+ path: '/pages/settingForBluetooth/lockUser',
tabBar: false
},
{
name: 'noticeWay',
- path: '/pages/noticeWay/noticeWay',
+ path: '/pages/settingForBluetooth/noticeWay',
tabBar: false
},
{
name: 'notOpenDoor',
- path: '/pages/notOpenDoor/notOpenDoor',
+ path: '/pages/settingForBluetooth/notOpenDoor',
tabBar: false
},
{
name: 'lowElecNotice',
- path: '/pages/lowElecNotice/lowElecNotice',
+ path: '/pages/settingForBluetooth/lowElecNotice',
tabBar: false
},
{
name: 'coercionOpenDoor',
- path: '/pages/coercionOpenDoor/coercionOpenDoor',
+ path: '/pages/settingForBluetooth/coercionOpenDoor',
tabBar: false
},
{
name: 'coercionFingerprint',
- path: '/pages/coercionFingerprint/coercionFingerprint',
+ path: '/pages/settingForBluetooth/coercionFingerprint',
tabBar: false
},
{
name: 'catEyeMode',
- path: '/pages/catEyeMode/catEyeMode',
+ path: '/pages/settingForBluetooth/catEyeMode',
tabBar: false
},
{
name: 'customCatEye',
- path: '/pages/customCatEye/customCatEye',
+ path: '/pages/settingForBluetooth/customCatEye',
tabBar: false
},
{
name: 'realTimePicture',
- path: '/pages/realTimePicture/realTimePicture',
+ path: '/pages/settingForBluetooth/realTimePicture',
tabBar: false
},
{
name: 'videoSlot',
- path: '/pages/videoSlot/videoSlot',
+ path: '/pages/settingForBluetooth/videoSlot',
tabBar: false
},
{
name: 'passageMode',
- path: '/pages/passageMode/passageMode',
+ path: '/pages/settingForBluetooth/passageMode',
tabBar: false
}
]
diff --git a/stores/lock.js b/stores/lock.js
index b6c18da..87a1f21 100644
--- a/stores/lock.js
+++ b/stores/lock.js
@@ -63,18 +63,18 @@ export const useLockStore = defineStore('lock', {
// 获取电量icon
getPowerIcon(power) {
if (power >= 80) {
- return '/static/images/icon_power_5.png'
+ return 'https://oss-lock.xhjcn.ltd/mp/icon_power_5.png'
}
if (power >= 60) {
- return '/static/images/icon_power_4.png'
+ return 'https://oss-lock.xhjcn.ltd/mp/icon_power_4.png'
}
if (power >= 40) {
- return '/static/images/icon_power_3.png'
+ return 'https://oss-lock.xhjcn.ltd/mp/icon_power_3.png'
}
if (power >= 20) {
- return '/static/images/icon_power_2.png'
+ return 'https://oss-lock.xhjcn.ltd/mp/icon_power_2.png'
}
- return '/static/images/icon_power_1.png'
+ return 'https://oss-lock.xhjcn.ltd/mp/icon_power_1.png'
},
// 将星期转换为中文字符串
convertWeekDaysToChineseString(weekDays) {