From e350ecd95883d5f7a8833cdb83e20995a4ad5753 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= Date: Thu, 27 Mar 2025 13:31:34 +0800 Subject: [PATCH 01/10] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E9=A1=B9=E5=B9=B6=E6=B7=BB=E5=8A=A0.vscode=E5=88=B0.g?= =?UTF-8?q?itignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .stylelintrc.json | 246 ++++++++++++++++++++++++++++++++++++++++++++++ package-lock.json | 161 ++++++++++++++++++++++++++++-- package.json | 7 +- 4 files changed, 406 insertions(+), 9 deletions(-) create mode 100644 .stylelintrc.json diff --git a/.gitignore b/.gitignore index f5e1955..10fcc93 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ .DS_Store unpackage node_modules +.vscode diff --git a/.stylelintrc.json b/.stylelintrc.json new file mode 100644 index 0000000..64a0abf --- /dev/null +++ b/.stylelintrc.json @@ -0,0 +1,246 @@ +{ + "extends": [ + "stylelint-config-standard", + "stylelint-config-recommended-scss", + "stylelint-config-recess-order", + "stylelint-config-html/vue" + ], + "rules": { + "no-descending-specificity": null, + "selector-class-pattern": null, + "keyframes-name-pattern": null, + "unit-no-unknown": null, + "selector-type-no-unknown": [ + true, + { + "ignoreTypes": ["page"] + } + ], + "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, + { + "ignoreProperties": [ + "font-size", + "width", + "height", + "margin", + "padding", + "border-radius", + "line-height", + "box-shadow" + ] + } + ], + "shorthand-property-no-redundant-values": null, + "alpha-value-notation": null, + "color-function-notation": null, + "declaration-property-value-allowed-list": { + "font-size": ["/rpx$/"], + "width": ["/rpx$/"], + "height": ["/rpx$/"], + "margin": ["/rpx$/"], + "padding": ["/rpx$/"], + "border-radius": ["/rpx$/"], + "line-height": ["/rpx$/"] + } + } +} diff --git a/package-lock.json b/package-lock.json index 5b5f008..0fbefef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,17 +5,15 @@ "packages": { "": { "dependencies": { - "crc": "^4.3.2", - "js-md5": "^0.8.3", "pinia": "^2.2.0", "pinia-plugin-unistorage": "^0.1.2", - "sm-crypto": "^0.3.13", "uview-plus": "^3.3.12" }, "devDependencies": { "@commitlint/cli": "^19.7.1", "@commitlint/config-conventional": "^19.7.1", "commitizen": "^4.3.1", + "crc": "^4.3.2", "cz-git": "^1.11.0", "eslint": "^8.57.0", "eslint-config-airbnb-base": "^15.0.0", @@ -24,9 +22,12 @@ "eslint-plugin-prettier": "^5.2.3", "eslint-plugin-vue": "^9.32.0", "husky": "^9.1.7", + "js-md5": "^0.8.3", "lint-staged": "^15.4.3", "prettier": "^3.4.2", + "sm-crypto": "^0.3.13", "stylelint": "^16.14.1", + "stylelint-config-html": "^1.1.0", "stylelint-config-recess-order": "^6.0.0", "stylelint-config-recommended-scss": "^14.1.0", "stylelint-config-standard": "^37.0.0", @@ -2553,7 +2554,7 @@ "version": "1.5.1", "resolved": "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "devOptional": true, + "dev": true, "funding": [ { "type": "github", @@ -2655,7 +2656,7 @@ "version": "6.0.3", "resolved": "https://registry.npmmirror.com/buffer/-/buffer-6.0.3.tgz", "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", - "devOptional": true, + "dev": true, "funding": [ { "type": "github", @@ -3313,6 +3314,7 @@ "version": "4.3.2", "resolved": "https://registry.npmmirror.com/crc/-/crc-4.3.2.tgz", "integrity": "sha512-uGDHf4KLLh2zsHa8D8hIQ1H/HtFQhyHrc0uhHBcoKGol/Xnb+MPYfUMw7cvON6ze/GUESTudKayDcJC5HnJv1A==", + "dev": true, "license": "MIT", "engines": { "node": ">=12" @@ -3714,6 +3716,69 @@ "node": ">=6.0.0" } }, + "node_modules/dom-serializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", + "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "domelementtype": "^2.3.0", + "domhandler": "^5.0.2", + "entities": "^4.2.0" + }, + "funding": { + "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" + } + }, + "node_modules/domelementtype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", + "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "license": "BSD-2-Clause", + "peer": true + }, + "node_modules/domhandler": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", + "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", + "dev": true, + "license": "BSD-2-Clause", + "peer": true, + "dependencies": { + "domelementtype": "^2.3.0" + }, + "engines": { + "node": ">= 4" + }, + "funding": { + "url": "https://github.com/fb55/domhandler?sponsor=1" + } + }, + "node_modules/domutils": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz", + "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==", + "dev": true, + "license": "BSD-2-Clause", + "peer": true, + "dependencies": { + "dom-serializer": "^2.0.0", + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3" + }, + "funding": { + "url": "https://github.com/fb55/domutils?sponsor=1" + } + }, "node_modules/dot-prop": { "version": "5.3.0", "resolved": "https://registry.npmmirror.com/dot-prop/-/dot-prop-5.3.0.tgz", @@ -5226,6 +5291,27 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/htmlparser2": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz", + "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==", + "dev": true, + "funding": [ + "https://github.com/fb55/htmlparser2?sponsor=1", + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "license": "MIT", + "peer": true, + "dependencies": { + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3", + "domutils": "^3.0.1", + "entities": "^4.4.0" + } + }, "node_modules/human-signals": { "version": "5.0.0", "resolved": "https://registry.npmmirror.com/human-signals/-/human-signals-5.0.0.tgz", @@ -5269,7 +5355,7 @@ "version": "1.2.1", "resolved": "https://registry.npmmirror.com/ieee754/-/ieee754-1.2.1.tgz", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "devOptional": true, + "dev": true, "funding": [ { "type": "github", @@ -6066,6 +6152,7 @@ "version": "0.8.3", "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.8.3.tgz", "integrity": "sha512-qR0HB5uP6wCuRMrWPTrkMaev7MJZwJuuw4fnwAzRgP4J4/F8RwtodOKpGp4XpqsLBFzzgqIO42efFAyz2Et6KQ==", + "dev": true, "license": "MIT" }, "node_modules/js-tokens": { @@ -6092,6 +6179,7 @@ "version": "1.1.0", "resolved": "https://registry.npmmirror.com/jsbn/-/jsbn-1.1.0.tgz", "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==", + "dev": true, "license": "MIT" }, "node_modules/json-buffer": { @@ -7345,6 +7433,49 @@ "node": "^10 || ^12 || >=14" } }, + "node_modules/postcss-html": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-1.8.0.tgz", + "integrity": "sha512-5mMeb1TgLWoRKxZ0Xh9RZDfwUUIqRrcxO2uXO+Ezl1N5lqpCiSU5Gk6+1kZediBfBHFtPCdopr2UZ2SgUsKcgQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "htmlparser2": "^8.0.0", + "js-tokens": "^9.0.0", + "postcss": "^8.5.0", + "postcss-safe-parser": "^6.0.0" + }, + "engines": { + "node": "^12 || >=14" + } + }, + "node_modules/postcss-html/node_modules/js-tokens": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.1.tgz", + "integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/postcss-html/node_modules/postcss-safe-parser": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz", + "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=12.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + "peerDependencies": { + "postcss": "^8.3.3" + } + }, "node_modules/postcss-media-query-parser": { "version": "0.2.3", "resolved": "https://registry.npmmirror.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz", @@ -8165,6 +8296,7 @@ "version": "0.3.13", "resolved": "https://registry.npmmirror.com/sm-crypto/-/sm-crypto-0.3.13.tgz", "integrity": "sha512-ztNF+pZq6viCPMA1A6KKu3bgpkmYti5avykRHbcFIdSipFdkVmfUw2CnpM2kBJyppIalqvczLNM3wR8OQ0pT5w==", + "dev": true, "license": "MIT", "dependencies": { "jsbn": "^1.1.0" @@ -8395,6 +8527,23 @@ "node": ">=18.12.0" } }, + "node_modules/stylelint-config-html": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/stylelint-config-html/-/stylelint-config-html-1.1.0.tgz", + "integrity": "sha512-IZv4IVESjKLumUGi+HWeb7skgO6/g4VMuAYrJdlqQFndgbj6WJAXPhaysvBiXefX79upBdQVumgYcdd17gCpjQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12 || >=14" + }, + "funding": { + "url": "https://github.com/sponsors/ota-meshi" + }, + "peerDependencies": { + "postcss-html": "^1.0.0", + "stylelint": ">=14.0.0" + } + }, "node_modules/stylelint-config-recess-order": { "version": "6.0.0", "resolved": "https://registry.npmmirror.com/stylelint-config-recess-order/-/stylelint-config-recess-order-6.0.0.tgz", diff --git a/package.json b/package.json index 4aaa5cb..f6fb58f 100644 --- a/package.json +++ b/package.json @@ -1,16 +1,14 @@ { "dependencies": { - "crc": "^4.3.2", - "js-md5": "^0.8.3", "pinia": "^2.2.0", "pinia-plugin-unistorage": "^0.1.2", - "sm-crypto": "^0.3.13", "uview-plus": "^3.3.12" }, "devDependencies": { "@commitlint/cli": "^19.7.1", "@commitlint/config-conventional": "^19.7.1", "commitizen": "^4.3.1", + "crc": "^4.3.2", "cz-git": "^1.11.0", "eslint": "^8.57.0", "eslint-config-airbnb-base": "^15.0.0", @@ -19,9 +17,12 @@ "eslint-plugin-prettier": "^5.2.3", "eslint-plugin-vue": "^9.32.0", "husky": "^9.1.7", + "js-md5": "^0.8.3", "lint-staged": "^15.4.3", "prettier": "^3.4.2", + "sm-crypto": "^0.3.13", "stylelint": "^16.14.1", + "stylelint-config-html": "^1.1.0", "stylelint-config-recess-order": "^6.0.0", "stylelint-config-recommended-scss": "^14.1.0", "stylelint-config-standard": "^37.0.0", From 5085098c9d794773157b65ab88458d87c599a472 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= Date: Thu, 27 Mar 2025 16:57:59 +0800 Subject: [PATCH 02/10] =?UTF-8?q?perf:=20=E5=88=86=E5=8C=85+=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=9C=AC=E5=9C=B0=E5=9B=BE=E7=89=87=E4=B8=BA=E8=BF=9C?= =?UTF-8?q?=E7=A8=8B=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .stylelintrc.json | 204 +--- components/SwitchLoading/SwitchLoading.vue | 2 +- constant/keyType.js | 14 +- manifest.json | 52 +- package.json | 3 +- pages.json | 1052 +++++++++-------- .../addLockGuid.vue | 6 +- .../bindLock.vue | 0 .../searchDevice.vue | 7 +- .../selectAddress.vue | 2 +- .../bindCard.vue | 2 +- .../bindFace.vue | 4 +- .../bindFingerprint.vue | 2 +- .../bindPalmVein.vue | 2 +- .../bindRemote.vue | 2 +- .../cardDetail.vue | 0 .../cardList.vue | 4 +- .../createCard.vue | 0 .../createFace.vue | 0 .../createFingerprint.vue | 0 .../createPalmVein.vue | 0 .../createPassword.vue | 0 .../createRemote.vue | 0 .../faceDetail.vue | 0 .../faceList.vue | 4 +- .../fingerprintDetail.vue | 0 .../fingerprintList.vue | 4 +- .../palmVeinDetail.vue | 0 .../palmVeinList.vue | 4 +- .../passwordDetail.vue | 0 .../passwordList.vue | 4 +- .../recordDetail.vue | 0 .../recordList.vue | 2 +- .../remoteDetail.vue | 0 .../remoteList.vue | 4 +- .../typeRecordList.vue | 4 +- .../adminDetail.vue | 0 .../adminList.vue | 8 +- .../createAdmin.vue | 0 .../createKey.vue | 0 .../keyDetail.vue | 0 pages/{keyList => lockUserManage}/keyList.vue | 10 +- pages/{home => main}/home.vue | 9 +- pages/{lockDetail => main}/lockDetail.vue | 70 +- pages/{mine => main}/mine.vue | 30 +- .../notificationList.vue | 12 +- pages/{cycleDate => others}/cycleDate.vue | 0 .../notificationDetail.vue | 0 .../temporaryDate.vue | 0 pages/{webview => others}/webview.vue | 0 .../autoLock.vue | 0 .../catEye.vue | 0 .../catEyeMode.vue | 0 .../coercionFingerprint.vue | 10 +- .../coercionOpenDoor.vue | 2 +- .../customCatEye.vue | 0 .../faceSetting.vue | 0 .../lockDate.vue} | 0 .../lockInfo.vue | 0 .../lockSound.vue | 0 .../lockUser.vue | 10 +- .../lowElecNotice.vue | 0 .../messageReminder.vue | 0 .../motorTorsion.vue | 0 .../notOpenDoor.vue | 0 .../noticeDetail.vue | 0 .../noticeWay.vue | 0 .../openDirection.vue | 14 +- .../openDoorNotice.vue | 2 +- .../passageMode.vue | 12 +- .../realTimePicture.vue | 0 .../selectGroup.vue | 0 .../setting.vue | 0 .../syncElec.vue | 0 .../updateSetting.vue | 0 .../uploadLockData.vue | 0 .../videoSlot.vue | 0 pages/{updateEmail => user}/updateEmail.vue | 0 pages/{updateName => user}/updateName.vue | 0 .../updatePassword.vue | 0 pages/{userInfo => user}/userInfo.vue | 30 +- pages/{verifyEmail => user}/verifyEmail.vue | 0 static/images/background_close_door.png | Bin 20090 -> 0 bytes static/images/background_empty_list.png | Bin 527 -> 0 bytes static/images/background_main.jpg | Bin 51517 -> 0 bytes static/images/background_open_door.png | Bin 22286 -> 0 bytes static/images/icon_add.png | Bin 198 -> 0 bytes static/images/icon_add_blue.png | Bin 552 -> 0 bytes static/images/icon_add_card.png | Bin 12578 -> 0 bytes static/images/icon_add_face_1.png | Bin 24518 -> 0 bytes static/images/icon_add_face_2.png | Bin 24910 -> 0 bytes static/images/icon_add_palm_vein.png | Bin 108408 -> 0 bytes static/images/icon_add_remote.png | Bin 25180 -> 0 bytes static/images/icon_add_round.png | Bin 1088 -> 0 bytes static/images/icon_address.png | Bin 688 -> 0 bytes static/images/icon_admin.png | Bin 487 -> 0 bytes static/images/icon_admin_black.png | Bin 1494 -> 0 bytes static/images/icon_arrow.png | Bin 204 -> 0 bytes static/images/icon_card.png | Bin 1781 -> 0 bytes static/images/icon_card_white.png | Bin 2486 -> 0 bytes static/images/icon_cloud.png | Bin 683 -> 0 bytes static/images/icon_cloud_active.png | Bin 683 -> 0 bytes static/images/icon_delete.png | Bin 268 -> 0 bytes static/images/icon_door_lock.png | Bin 1147 -> 0 bytes static/images/icon_face.png | Bin 1942 -> 0 bytes static/images/icon_face_white.png | Bin 1962 -> 0 bytes static/images/icon_fingerprint.png | Bin 2974 -> 0 bytes static/images/icon_fingerprint_0.png | Bin 41096 -> 0 bytes static/images/icon_fingerprint_1.png | Bin 58313 -> 0 bytes static/images/icon_fingerprint_2.png | Bin 78514 -> 0 bytes static/images/icon_fingerprint_3.png | Bin 80897 -> 0 bytes static/images/icon_fingerprint_4.png | Bin 89422 -> 0 bytes static/images/icon_fingerprint_5.png | Bin 93920 -> 0 bytes static/images/icon_fingerprint_white.png | Bin 8193 -> 0 bytes static/images/icon_key.png | Bin 1615 -> 0 bytes static/images/icon_lock.png | Bin 1801 -> 0 bytes static/images/icon_lock_touch_screen.png | Bin 13972 -> 0 bytes static/images/icon_lock_transparent.png | Bin 1285 -> 0 bytes static/images/icon_menu.png | Bin 1522 -> 0 bytes static/images/icon_not_select.png | Bin 2018 -> 0 bytes static/images/icon_notification_read.png | Bin 3208 -> 0 bytes static/images/icon_notification_unread.png | Bin 3001 -> 0 bytes static/images/icon_open_direction.png | Bin 68687 -> 0 bytes static/images/icon_palm_vein.png | Bin 2197 -> 0 bytes static/images/icon_palm_vein_white.png | Bin 821 -> 0 bytes static/images/icon_password.png | Bin 3640 -> 0 bytes static/images/icon_password_green.png | Bin 2154 -> 0 bytes static/images/icon_power_1.png | Bin 859 -> 0 bytes static/images/icon_power_2.png | Bin 907 -> 0 bytes static/images/icon_power_3.png | Bin 940 -> 0 bytes static/images/icon_power_4.png | Bin 930 -> 0 bytes static/images/icon_power_5.png | Bin 826 -> 0 bytes static/images/icon_record.png | Bin 1767 -> 0 bytes static/images/icon_remind.png | Bin 1752 -> 0 bytes static/images/icon_remote.png | Bin 2073 -> 0 bytes static/images/icon_remote_unlock.png | Bin 3495 -> 0 bytes static/images/icon_remote_white.png | Bin 929 -> 0 bytes static/images/icon_role.png | Bin 2454 -> 0 bytes static/images/icon_select.png | Bin 2343 -> 0 bytes static/images/icon_setting.png | Bin 3227 -> 0 bytes static/images/icon_sync.png | Bin 923 -> 0 bytes static/images/icon_tips.png | Bin 1809 -> 0 bytes static/images/icon_user.png | Bin 4127 -> 0 bytes static/images/img.png | Bin 1562 -> 0 bytes stores/basic.js | 152 +-- stores/lock.js | 10 +- 146 files changed, 867 insertions(+), 898 deletions(-) rename pages/{addLockGuid => addDeviceForBluetooth}/addLockGuid.vue (92%) rename pages/{bindLock => addDeviceForBluetooth}/bindLock.vue (100%) rename pages/{searchDevice => addDeviceForBluetooth}/searchDevice.vue (95%) rename pages/{selectAddress => addDeviceForBluetooth}/selectAddress.vue (98%) rename pages/{bindCard => featureForBluetooth}/bindCard.vue (98%) rename pages/{bindFace => featureForBluetooth}/bindFace.vue (96%) rename pages/{bindFingerprint => featureForBluetooth}/bindFingerprint.vue (97%) rename pages/{bindPalmVein => featureForBluetooth}/bindPalmVein.vue (97%) rename pages/{bindRemote => featureForBluetooth}/bindRemote.vue (98%) rename pages/{cardDetail => featureForBluetooth}/cardDetail.vue (100%) rename pages/{cardList => featureForBluetooth}/cardList.vue (98%) rename pages/{createCard => featureForBluetooth}/createCard.vue (100%) rename pages/{createFace => featureForBluetooth}/createFace.vue (100%) rename pages/{createFingerprint => featureForBluetooth}/createFingerprint.vue (100%) rename pages/{createPalmVein => featureForBluetooth}/createPalmVein.vue (100%) rename pages/{createPassword => featureForBluetooth}/createPassword.vue (100%) rename pages/{createRemote => featureForBluetooth}/createRemote.vue (100%) rename pages/{faceDetail => featureForBluetooth}/faceDetail.vue (100%) rename pages/{faceList => featureForBluetooth}/faceList.vue (98%) rename pages/{fingerprintDetail => featureForBluetooth}/fingerprintDetail.vue (100%) rename pages/{fingerprintList => featureForBluetooth}/fingerprintList.vue (98%) rename pages/{palmVeinDetail => featureForBluetooth}/palmVeinDetail.vue (100%) rename pages/{palmVeinList => featureForBluetooth}/palmVeinList.vue (98%) rename pages/{passwordDetail => featureForBluetooth}/passwordDetail.vue (100%) rename pages/{passwordList => featureForBluetooth}/passwordList.vue (98%) rename pages/{recordDetail => featureForBluetooth}/recordDetail.vue (100%) rename pages/{recordList => featureForBluetooth}/recordList.vue (99%) rename pages/{remoteDetail => featureForBluetooth}/remoteDetail.vue (100%) rename pages/{remoteList => featureForBluetooth}/remoteList.vue (98%) rename pages/{typeRecordList => featureForBluetooth}/typeRecordList.vue (98%) rename pages/{adminDetail => lockUserManage}/adminDetail.vue (100%) rename pages/{adminList => lockUserManage}/adminList.vue (97%) rename pages/{createAdmin => lockUserManage}/createAdmin.vue (100%) rename pages/{createKey => lockUserManage}/createKey.vue (100%) rename pages/{keyDetail => lockUserManage}/keyDetail.vue (100%) rename pages/{keyList => lockUserManage}/keyList.vue (97%) rename pages/{home => main}/home.vue (98%) rename pages/{lockDetail => main}/lockDetail.vue (88%) rename pages/{mine => main}/mine.vue (91%) rename pages/{notificationList => main}/notificationList.vue (96%) rename pages/{cycleDate => others}/cycleDate.vue (100%) rename pages/{notificationDetail => others}/notificationDetail.vue (100%) rename pages/{temporaryDate => others}/temporaryDate.vue (100%) rename pages/{webview => others}/webview.vue (100%) rename pages/{autoLock => settingForBluetooth}/autoLock.vue (100%) rename pages/{catEye => settingForBluetooth}/catEye.vue (100%) rename pages/{catEyeMode => settingForBluetooth}/catEyeMode.vue (100%) rename pages/{coercionFingerprint => settingForBluetooth}/coercionFingerprint.vue (96%) rename pages/{coercionOpenDoor => settingForBluetooth}/coercionOpenDoor.vue (98%) rename pages/{customCatEye => settingForBluetooth}/customCatEye.vue (100%) rename pages/{faceSetting => settingForBluetooth}/faceSetting.vue (100%) rename pages/{LockDate/LockDate.vue => settingForBluetooth/lockDate.vue} (100%) rename pages/{lockInfo => settingForBluetooth}/lockInfo.vue (100%) rename pages/{lockSound => settingForBluetooth}/lockSound.vue (100%) rename pages/{lockUser => settingForBluetooth}/lockUser.vue (97%) rename pages/{lowElecNotice => settingForBluetooth}/lowElecNotice.vue (100%) rename pages/{messageReminder => settingForBluetooth}/messageReminder.vue (100%) rename pages/{motorTorsion => settingForBluetooth}/motorTorsion.vue (100%) rename pages/{notOpenDoor => settingForBluetooth}/notOpenDoor.vue (100%) rename pages/{noticeDetail => settingForBluetooth}/noticeDetail.vue (100%) rename pages/{noticeWay => settingForBluetooth}/noticeWay.vue (100%) rename pages/{openDirection => settingForBluetooth}/openDirection.vue (89%) rename pages/{openDoorNotice => settingForBluetooth}/openDoorNotice.vue (98%) rename pages/{passageMode => settingForBluetooth}/passageMode.vue (96%) rename pages/{realTimePicture => settingForBluetooth}/realTimePicture.vue (100%) rename pages/{selectGroup => settingForBluetooth}/selectGroup.vue (100%) rename pages/{setting => settingForBluetooth}/setting.vue (100%) rename pages/{syncElec => settingForBluetooth}/syncElec.vue (100%) rename pages/{updateSetting => settingForBluetooth}/updateSetting.vue (100%) rename pages/{uploadLockData => settingForBluetooth}/uploadLockData.vue (100%) rename pages/{videoSlot => settingForBluetooth}/videoSlot.vue (100%) rename pages/{updateEmail => user}/updateEmail.vue (100%) rename pages/{updateName => user}/updateName.vue (100%) rename pages/{updatePassword => user}/updatePassword.vue (100%) rename pages/{userInfo => user}/userInfo.vue (90%) rename pages/{verifyEmail => user}/verifyEmail.vue (100%) delete mode 100755 static/images/background_close_door.png delete mode 100644 static/images/background_empty_list.png delete mode 100644 static/images/background_main.jpg delete mode 100644 static/images/background_open_door.png delete mode 100644 static/images/icon_add.png delete mode 100644 static/images/icon_add_blue.png delete mode 100755 static/images/icon_add_card.png delete mode 100755 static/images/icon_add_face_1.png delete mode 100755 static/images/icon_add_face_2.png delete mode 100755 static/images/icon_add_palm_vein.png delete mode 100644 static/images/icon_add_remote.png delete mode 100644 static/images/icon_add_round.png delete mode 100644 static/images/icon_address.png delete mode 100755 static/images/icon_admin.png delete mode 100644 static/images/icon_admin_black.png delete mode 100644 static/images/icon_arrow.png delete mode 100644 static/images/icon_card.png delete mode 100755 static/images/icon_card_white.png delete mode 100644 static/images/icon_cloud.png delete mode 100644 static/images/icon_cloud_active.png delete mode 100644 static/images/icon_delete.png delete mode 100755 static/images/icon_door_lock.png delete mode 100644 static/images/icon_face.png delete mode 100755 static/images/icon_face_white.png delete mode 100644 static/images/icon_fingerprint.png delete mode 100755 static/images/icon_fingerprint_0.png delete mode 100755 static/images/icon_fingerprint_1.png delete mode 100755 static/images/icon_fingerprint_2.png delete mode 100755 static/images/icon_fingerprint_3.png delete mode 100755 static/images/icon_fingerprint_4.png delete mode 100644 static/images/icon_fingerprint_5.png delete mode 100755 static/images/icon_fingerprint_white.png delete mode 100644 static/images/icon_key.png delete mode 100644 static/images/icon_lock.png delete mode 100755 static/images/icon_lock_touch_screen.png delete mode 100644 static/images/icon_lock_transparent.png delete mode 100644 static/images/icon_menu.png delete mode 100644 static/images/icon_not_select.png delete mode 100755 static/images/icon_notification_read.png delete mode 100755 static/images/icon_notification_unread.png delete mode 100755 static/images/icon_open_direction.png delete mode 100644 static/images/icon_palm_vein.png delete mode 100644 static/images/icon_palm_vein_white.png delete mode 100755 static/images/icon_password.png delete mode 100644 static/images/icon_password_green.png delete mode 100755 static/images/icon_power_1.png delete mode 100755 static/images/icon_power_2.png delete mode 100755 static/images/icon_power_3.png delete mode 100755 static/images/icon_power_4.png delete mode 100755 static/images/icon_power_5.png delete mode 100644 static/images/icon_record.png delete mode 100644 static/images/icon_remind.png delete mode 100644 static/images/icon_remote.png delete mode 100755 static/images/icon_remote_unlock.png delete mode 100644 static/images/icon_remote_white.png delete mode 100644 static/images/icon_role.png delete mode 100644 static/images/icon_select.png delete mode 100644 static/images/icon_setting.png delete mode 100644 static/images/icon_sync.png delete mode 100644 static/images/icon_tips.png delete mode 100755 static/images/icon_user.png delete mode 100644 static/images/img.png 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/addDeviceForBluetooth/searchDevice.vue b/pages/addDevice/searchDevice.vue similarity index 100% rename from pages/addDeviceForBluetooth/searchDevice.vue rename to pages/addDevice/searchDevice.vue diff --git a/pages/addDeviceForBluetooth/selectAddress.vue b/pages/addDevice/selectAddress.vue similarity index 100% rename from pages/addDeviceForBluetooth/selectAddress.vue rename to pages/addDevice/selectAddress.vue diff --git a/pages/others/selectDeviceType.vue b/pages/addDevice/selectDeviceType.vue similarity index 100% rename from pages/others/selectDeviceType.vue rename to pages/addDevice/selectDeviceType.vue diff --git a/pages/lockUserManage/adminDetail.vue b/pages/feature/adminDetail.vue similarity index 100% rename from pages/lockUserManage/adminDetail.vue rename to pages/feature/adminDetail.vue diff --git a/pages/lockUserManage/adminList.vue b/pages/feature/adminList.vue similarity index 99% rename from pages/lockUserManage/adminList.vue rename to pages/feature/adminList.vue index ccfa4e8..4d7cd40 100644 --- a/pages/lockUserManage/adminList.vue +++ b/pages/feature/adminList.vue @@ -13,9 +13,9 @@ .search { - padding: 32rpx; width: 686rpx !important; + padding: 32rpx; } .button { - display: flex; - align-items: center; position: fixed; bottom: calc(env(safe-area-inset-bottom) + 20rpx); + display: flex; + align-items: center; font-weight: bold; .button-create { - margin-left: 32rpx; width: 686rpx; height: 88rpx; - background-color: #63b8af; + margin-left: 32rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #63b8af; border-radius: 44rpx; } } @@ -344,29 +344,29 @@ .item { display: flex; align-items: center; - background-color: #ffffff; - height: 120rpx; width: 750rpx; + height: 120rpx; + background-color: #ffffff; .item-left { - margin-left: 32rpx; width: 80rpx; height: 80rpx; + margin-left: 32rpx; } .item-right { + width: 574rpx; margin-right: 32rpx; margin-left: 32rpx; - width: 574rpx; .item-right-top { max-width: 400rpx; - font-size: 32rpx; - font-weight: bold; padding-bottom: 6rpx; - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + font-size: 32rpx; + font-weight: bold; + white-space: nowrap; } .item-right-bottom { @@ -390,9 +390,9 @@ } .empty-list-text { - text-align: center; font-size: 32rpx; color: #999999; + text-align: center; } .status { diff --git a/pages/featureForBluetooth/bindCard.vue b/pages/feature/bindCard.vue similarity index 100% rename from pages/featureForBluetooth/bindCard.vue rename to pages/feature/bindCard.vue diff --git a/pages/featureForBluetooth/bindFace.vue b/pages/feature/bindFace.vue similarity index 100% rename from pages/featureForBluetooth/bindFace.vue rename to pages/feature/bindFace.vue diff --git a/pages/featureForBluetooth/bindFingerprint.vue b/pages/feature/bindFingerprint.vue similarity index 100% rename from pages/featureForBluetooth/bindFingerprint.vue rename to pages/feature/bindFingerprint.vue diff --git a/pages/featureForBluetooth/bindPalmVein.vue b/pages/feature/bindPalmVein.vue similarity index 100% rename from pages/featureForBluetooth/bindPalmVein.vue rename to pages/feature/bindPalmVein.vue diff --git a/pages/featureForBluetooth/bindRemote.vue b/pages/feature/bindRemote.vue similarity index 100% rename from pages/featureForBluetooth/bindRemote.vue rename to pages/feature/bindRemote.vue diff --git a/pages/featureForBluetooth/cardDetail.vue b/pages/feature/cardDetail.vue similarity index 100% rename from pages/featureForBluetooth/cardDetail.vue rename to pages/feature/cardDetail.vue diff --git a/pages/featureForBluetooth/cardList.vue b/pages/feature/cardList.vue similarity index 99% rename from pages/featureForBluetooth/cardList.vue rename to pages/feature/cardList.vue index 09cee70..22c19c7 100644 --- a/pages/featureForBluetooth/cardList.vue +++ b/pages/feature/cardList.vue @@ -13,9 +13,9 @@ .search { - padding: 32rpx; width: 686rpx !important; + padding: 32rpx; } .button { - display: flex; - align-items: center; position: fixed; bottom: calc(env(safe-area-inset-bottom) + 20rpx); + display: flex; + align-items: center; font-weight: bold; .button-reset { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #df282d; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #df282d; border-radius: 44rpx; } .button-create { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #63b8af; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #63b8af; border-radius: 44rpx; } } @@ -410,29 +410,29 @@ .item { display: flex; align-items: center; - background-color: #ffffff; - height: 120rpx; width: 750rpx; + height: 120rpx; + background-color: #ffffff; .item-left { - margin-left: 32rpx; width: 80rpx; height: 80rpx; + margin-left: 32rpx; } .item-right { + width: 574rpx; margin-right: 32rpx; margin-left: 32rpx; - width: 574rpx; .item-right-top { max-width: 400rpx; - font-size: 32rpx; - font-weight: bold; padding-bottom: 6rpx; - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + font-size: 32rpx; + font-weight: bold; + white-space: nowrap; } .item-right-bottom { @@ -456,9 +456,9 @@ } .empty-list-text { - text-align: center; font-size: 32rpx; color: #999999; + text-align: center; } .status { diff --git a/pages/lockUserManage/createAdmin.vue b/pages/feature/createAdmin.vue similarity index 100% rename from pages/lockUserManage/createAdmin.vue rename to pages/feature/createAdmin.vue diff --git a/pages/featureForBluetooth/createCard.vue b/pages/feature/createCard.vue similarity index 100% rename from pages/featureForBluetooth/createCard.vue rename to pages/feature/createCard.vue diff --git a/pages/featureForBluetooth/createFace.vue b/pages/feature/createFace.vue similarity index 100% rename from pages/featureForBluetooth/createFace.vue rename to pages/feature/createFace.vue diff --git a/pages/featureForBluetooth/createFingerprint.vue b/pages/feature/createFingerprint.vue similarity index 100% rename from pages/featureForBluetooth/createFingerprint.vue rename to pages/feature/createFingerprint.vue diff --git a/pages/lockUserManage/createKey.vue b/pages/feature/createKey.vue similarity index 100% rename from pages/lockUserManage/createKey.vue rename to pages/feature/createKey.vue diff --git a/pages/featureForBluetooth/createPalmVein.vue b/pages/feature/createPalmVein.vue similarity index 100% rename from pages/featureForBluetooth/createPalmVein.vue rename to pages/feature/createPalmVein.vue diff --git a/pages/featureForBluetooth/createPassword.vue b/pages/feature/createPassword.vue similarity index 100% rename from pages/featureForBluetooth/createPassword.vue rename to pages/feature/createPassword.vue diff --git a/pages/featureForBluetooth/createRemote.vue b/pages/feature/createRemote.vue similarity index 100% rename from pages/featureForBluetooth/createRemote.vue rename to pages/feature/createRemote.vue diff --git a/pages/featureForBluetooth/faceDetail.vue b/pages/feature/faceDetail.vue similarity index 100% rename from pages/featureForBluetooth/faceDetail.vue rename to pages/feature/faceDetail.vue diff --git a/pages/featureForBluetooth/faceList.vue b/pages/feature/faceList.vue similarity index 99% rename from pages/featureForBluetooth/faceList.vue rename to pages/feature/faceList.vue index 74152c4..f18c453 100644 --- a/pages/featureForBluetooth/faceList.vue +++ b/pages/feature/faceList.vue @@ -13,9 +13,9 @@ .search { - padding: 32rpx; width: 686rpx !important; + padding: 32rpx; } .button { - display: flex; - align-items: center; position: fixed; bottom: calc(env(safe-area-inset-bottom) + 20rpx); + display: flex; + align-items: center; font-weight: bold; .button-reset { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #df282d; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #df282d; border-radius: 44rpx; } .button-create { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #63b8af; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #63b8af; border-radius: 44rpx; } } @@ -411,29 +411,29 @@ .item { display: flex; align-items: center; - background-color: #ffffff; - height: 120rpx; width: 750rpx; + height: 120rpx; + background-color: #ffffff; .item-left { - margin-left: 32rpx; width: 80rpx; height: 80rpx; + margin-left: 32rpx; } .item-right { + width: 574rpx; margin-right: 32rpx; margin-left: 32rpx; - width: 574rpx; .item-right-top { max-width: 400rpx; - font-size: 32rpx; - font-weight: bold; padding-bottom: 6rpx; - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + font-size: 32rpx; + font-weight: bold; + white-space: nowrap; } .item-right-bottom { @@ -457,9 +457,9 @@ } .empty-list-text { - text-align: center; font-size: 32rpx; color: #999999; + text-align: center; } .status { diff --git a/pages/featureForBluetooth/fingerprintDetail.vue b/pages/feature/fingerprintDetail.vue similarity index 100% rename from pages/featureForBluetooth/fingerprintDetail.vue rename to pages/feature/fingerprintDetail.vue diff --git a/pages/featureForBluetooth/fingerprintList.vue b/pages/feature/fingerprintList.vue similarity index 99% rename from pages/featureForBluetooth/fingerprintList.vue rename to pages/feature/fingerprintList.vue index 21d1fe6..a6f2e92 100644 --- a/pages/featureForBluetooth/fingerprintList.vue +++ b/pages/feature/fingerprintList.vue @@ -13,9 +13,9 @@ .search { - padding: 32rpx; width: 686rpx !important; + padding: 32rpx; } .button { - display: flex; - align-items: center; position: fixed; bottom: calc(env(safe-area-inset-bottom) + 20rpx); + display: flex; + align-items: center; font-weight: bold; .button-reset { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #df282d; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #df282d; border-radius: 44rpx; } .button-create { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #63b8af; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #63b8af; border-radius: 44rpx; } } @@ -410,29 +410,29 @@ .item { display: flex; align-items: center; - background-color: #ffffff; - height: 120rpx; width: 750rpx; + height: 120rpx; + background-color: #ffffff; .item-left { - margin-left: 32rpx; width: 80rpx; height: 80rpx; + margin-left: 32rpx; } .item-right { + width: 574rpx; margin-right: 32rpx; margin-left: 32rpx; - width: 574rpx; .item-right-top { max-width: 400rpx; - font-size: 32rpx; - font-weight: bold; padding-bottom: 6rpx; - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + font-size: 32rpx; + font-weight: bold; + white-space: nowrap; } .item-right-bottom { @@ -456,9 +456,9 @@ } .empty-list-text { - text-align: center; font-size: 32rpx; color: #999999; + text-align: center; } .status { diff --git a/pages/lockUserManage/keyDetail.vue b/pages/feature/keyDetail.vue similarity index 100% rename from pages/lockUserManage/keyDetail.vue rename to pages/feature/keyDetail.vue diff --git a/pages/lockUserManage/keyList.vue b/pages/feature/keyList.vue similarity index 99% rename from pages/lockUserManage/keyList.vue rename to pages/feature/keyList.vue index 37da67e..6d6ebbe 100644 --- a/pages/lockUserManage/keyList.vue +++ b/pages/feature/keyList.vue @@ -13,9 +13,9 @@ .search { - margin-top: 32rpx; width: 686rpx !important; + margin-top: 32rpx; margin-left: 32rpx; } .button { - display: flex; - align-items: center; position: fixed; bottom: calc(env(safe-area-inset-bottom) + 48rpx); + display: flex; + align-items: center; font-weight: bold; .button-reset { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #df282d; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #df282d; border-radius: 44rpx; } .button-create { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #63b8af; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #63b8af; border-radius: 44rpx; } } @@ -404,37 +404,37 @@ .key { display: flex; align-items: center; - background-color: #ffffff; - height: 120rpx; width: 750rpx; + height: 120rpx; + background-color: #ffffff; .key-left { - margin-left: 32rpx; width: 80rpx; height: 80rpx; + margin-left: 32rpx; border-radius: 50%; } .key-right { - margin-left: 32rpx; - margin-right: 32rpx; width: 574rpx; + margin-right: 32rpx; + margin-left: 32rpx; .key-right-top { max-width: 400rpx; - font-size: 32rpx; - font-weight: bold; padding-bottom: 6rpx; - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + font-size: 32rpx; + font-weight: bold; + white-space: nowrap; } .key-admin { - margin-top: 8rpx; - margin-left: 10rpx; width: 25rpx; height: 25rpx; + margin-top: 8rpx; + margin-left: 10rpx; } .key-right-bottom { @@ -465,8 +465,8 @@ } .empty-list-text { - text-align: center; font-size: 32rpx; color: #999999; + text-align: center; } diff --git a/pages/featureForBluetooth/palmVeinDetail.vue b/pages/feature/palmVeinDetail.vue similarity index 100% rename from pages/featureForBluetooth/palmVeinDetail.vue rename to pages/feature/palmVeinDetail.vue diff --git a/pages/featureForBluetooth/palmVeinList.vue b/pages/feature/palmVeinList.vue similarity index 99% rename from pages/featureForBluetooth/palmVeinList.vue rename to pages/feature/palmVeinList.vue index 51e8111..810bf21 100644 --- a/pages/featureForBluetooth/palmVeinList.vue +++ b/pages/feature/palmVeinList.vue @@ -13,9 +13,9 @@ .search { - padding: 32rpx; width: 686rpx !important; + padding: 32rpx; } .button { - display: flex; - align-items: center; position: fixed; bottom: calc(env(safe-area-inset-bottom) + 20rpx); + display: flex; + align-items: center; font-weight: bold; .button-reset { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #df282d; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #df282d; border-radius: 44rpx; } .button-create { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #63b8af; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #63b8af; border-radius: 44rpx; } } @@ -415,29 +415,29 @@ .item { display: flex; align-items: center; - background-color: #ffffff; - height: 120rpx; width: 750rpx; + height: 120rpx; + background-color: #ffffff; .item-left { - margin-left: 32rpx; width: 80rpx; height: 80rpx; + margin-left: 32rpx; } .item-right { + width: 574rpx; margin-right: 32rpx; margin-left: 32rpx; - width: 574rpx; .item-right-top { max-width: 400rpx; - font-size: 32rpx; - font-weight: bold; padding-bottom: 6rpx; - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + font-size: 32rpx; + font-weight: bold; + white-space: nowrap; } .item-right-bottom { @@ -461,9 +461,9 @@ } .empty-list-text { - text-align: center; font-size: 32rpx; color: #999999; + text-align: center; } .status { diff --git a/pages/featureForBluetooth/passwordDetail.vue b/pages/feature/passwordDetail.vue similarity index 100% rename from pages/featureForBluetooth/passwordDetail.vue rename to pages/feature/passwordDetail.vue diff --git a/pages/featureForBluetooth/passwordList.vue b/pages/feature/passwordList.vue similarity index 99% rename from pages/featureForBluetooth/passwordList.vue rename to pages/feature/passwordList.vue index 09ce4af..dcf8c37 100644 --- a/pages/featureForBluetooth/passwordList.vue +++ b/pages/feature/passwordList.vue @@ -13,9 +13,9 @@ .search { - margin-top: 32rpx; width: 686rpx !important; + margin-top: 32rpx; margin-left: 32rpx; } .button { - display: flex; - align-items: center; position: fixed; bottom: calc(env(safe-area-inset-bottom) + 48rpx); + display: flex; + align-items: center; font-weight: bold; .button-reset { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #df282d; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #df282d; border-radius: 44rpx; } .button-create { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #63b8af; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #63b8af; border-radius: 44rpx; } } @@ -379,29 +379,29 @@ .password { display: flex; align-items: center; - background-color: #ffffff; - height: 120rpx; width: 750rpx; + height: 120rpx; + background-color: #ffffff; .password-left { - margin-left: 32rpx; width: 80rpx; height: 80rpx; + margin-left: 32rpx; } .password-right { + width: 574rpx; margin-right: 32rpx; margin-left: 32rpx; - width: 574rpx; .password-right-top { max-width: 400rpx; - font-size: 32rpx; - font-weight: bold; padding-bottom: 6rpx; - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + font-size: 32rpx; + font-weight: bold; + white-space: nowrap; } .password-right-bottom { @@ -425,9 +425,9 @@ } .empty-list-text { - text-align: center; font-size: 32rpx; color: #999999; + text-align: center; } .key-status { diff --git a/pages/featureForBluetooth/recordDetail.vue b/pages/feature/recordDetail.vue similarity index 100% rename from pages/featureForBluetooth/recordDetail.vue rename to pages/feature/recordDetail.vue diff --git a/pages/featureForBluetooth/recordList.vue b/pages/feature/recordList.vue similarity index 100% rename from pages/featureForBluetooth/recordList.vue rename to pages/feature/recordList.vue diff --git a/pages/featureForBluetooth/remoteDetail.vue b/pages/feature/remoteDetail.vue similarity index 100% rename from pages/featureForBluetooth/remoteDetail.vue rename to pages/feature/remoteDetail.vue diff --git a/pages/featureForBluetooth/remoteList.vue b/pages/feature/remoteList.vue similarity index 99% rename from pages/featureForBluetooth/remoteList.vue rename to pages/feature/remoteList.vue index 86a9206..3853299 100644 --- a/pages/featureForBluetooth/remoteList.vue +++ b/pages/feature/remoteList.vue @@ -13,9 +13,9 @@ .search { - padding: 32rpx; width: 686rpx !important; + padding: 32rpx; } .button { - display: flex; - align-items: center; position: fixed; bottom: calc(env(safe-area-inset-bottom) + 20rpx); + display: flex; + align-items: center; font-weight: bold; .button-reset { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #df282d; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #df282d; border-radius: 44rpx; } .button-create { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #63b8af; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #63b8af; border-radius: 44rpx; } } @@ -413,29 +413,29 @@ .item { display: flex; align-items: center; - background-color: #ffffff; - height: 120rpx; width: 750rpx; + height: 120rpx; + background-color: #ffffff; .item-left { - margin-left: 32rpx; width: 80rpx; height: 80rpx; + margin-left: 32rpx; } .item-right { + width: 574rpx; margin-right: 32rpx; margin-left: 32rpx; - width: 574rpx; .item-right-top { max-width: 400rpx; - font-size: 32rpx; - font-weight: bold; padding-bottom: 6rpx; - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + font-size: 32rpx; + font-weight: bold; + white-space: nowrap; } .item-right-bottom { @@ -459,9 +459,9 @@ } .empty-list-text { - text-align: center; font-size: 32rpx; color: #999999; + text-align: center; } .status { diff --git a/pages/featureForBluetooth/typeRecordList.vue b/pages/feature/typeRecordList.vue similarity index 100% rename from pages/featureForBluetooth/typeRecordList.vue rename to pages/feature/typeRecordList.vue diff --git a/pages/main/home.vue b/pages/main/home.vue index 45605ef..c41a2b9 100644 --- a/pages/main/home.vue +++ b/pages/main/home.vue @@ -17,11 +17,11 @@ v-if="!(lockList.length === 0 && lockSearch.searchStr === '' && !focus)" > { console.log(1111113, error) - }0 + } const startVoice = () => { - console.log(1111113, playerRef.value) + const page = getCurrentPages().pop() + const playerRef = page.selectComponent('#playerRef') + console.log(1111113, playerRef) + playerRef.requestFullScreen() // const voiceNode = res[0].node // if (voiceNode) { // voiceNode.startVoice({ diff --git a/pages/settingForBluetooth/autoLock.vue b/pages/setting/autoLock.vue similarity index 100% rename from pages/settingForBluetooth/autoLock.vue rename to pages/setting/autoLock.vue diff --git a/pages/settingForBluetooth/catEye.vue b/pages/setting/catEye.vue similarity index 100% rename from pages/settingForBluetooth/catEye.vue rename to pages/setting/catEye.vue diff --git a/pages/settingForBluetooth/catEyeMode.vue b/pages/setting/catEyeMode.vue similarity index 100% rename from pages/settingForBluetooth/catEyeMode.vue rename to pages/setting/catEyeMode.vue diff --git a/pages/settingForBluetooth/coercionFingerprint.vue b/pages/setting/coercionFingerprint.vue similarity index 99% rename from pages/settingForBluetooth/coercionFingerprint.vue rename to pages/setting/coercionFingerprint.vue index 0e4e950..f264e99 100644 --- a/pages/settingForBluetooth/coercionFingerprint.vue +++ b/pages/setting/coercionFingerprint.vue @@ -13,9 +13,9 @@ .search { - padding: 32rpx; width: 686rpx !important; + padding: 32rpx; } .button { - display: flex; - align-items: center; position: fixed; bottom: calc(env(safe-area-inset-bottom) + 20rpx); + display: flex; + align-items: center; font-weight: bold; .button-reset { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #df282d; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #df282d; border-radius: 44rpx; } .button-create { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #63b8af; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #63b8af; border-radius: 44rpx; } } @@ -274,29 +274,29 @@ .item { display: flex; align-items: center; - background-color: #ffffff; - height: 120rpx; width: 750rpx; + height: 120rpx; + background-color: #ffffff; .item-left { - margin-left: 32rpx; width: 80rpx; height: 80rpx; + margin-left: 32rpx; } .item-right { + width: 574rpx; margin-right: 32rpx; margin-left: 32rpx; - width: 574rpx; .item-right-top { max-width: 400rpx; - font-size: 32rpx; - font-weight: bold; padding-bottom: 6rpx; - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + font-size: 32rpx; + font-weight: bold; + white-space: nowrap; } .item-right-bottom { @@ -320,9 +320,9 @@ } .empty-list-text { - text-align: center; font-size: 32rpx; color: #999999; + text-align: center; } .status { diff --git a/pages/settingForBluetooth/coercionOpenDoor.vue b/pages/setting/coercionOpenDoor.vue similarity index 100% rename from pages/settingForBluetooth/coercionOpenDoor.vue rename to pages/setting/coercionOpenDoor.vue diff --git a/pages/settingForBluetooth/customCatEye.vue b/pages/setting/customCatEye.vue similarity index 100% rename from pages/settingForBluetooth/customCatEye.vue rename to pages/setting/customCatEye.vue diff --git a/pages/settingForBluetooth/faceSetting.vue b/pages/setting/faceSetting.vue similarity index 100% rename from pages/settingForBluetooth/faceSetting.vue rename to pages/setting/faceSetting.vue diff --git a/pages/settingForBluetooth/lockDate.vue b/pages/setting/lockDate.vue similarity index 100% rename from pages/settingForBluetooth/lockDate.vue rename to pages/setting/lockDate.vue diff --git a/pages/settingForBluetooth/lockInfo.vue b/pages/setting/lockInfo.vue similarity index 100% rename from pages/settingForBluetooth/lockInfo.vue rename to pages/setting/lockInfo.vue diff --git a/pages/settingForBluetooth/lockSound.vue b/pages/setting/lockSound.vue similarity index 100% rename from pages/settingForBluetooth/lockSound.vue rename to pages/setting/lockSound.vue diff --git a/pages/settingForBluetooth/lockUser.vue b/pages/setting/lockUser.vue similarity index 99% rename from pages/settingForBluetooth/lockUser.vue rename to pages/setting/lockUser.vue index 9ad9c32..6e1e683 100644 --- a/pages/settingForBluetooth/lockUser.vue +++ b/pages/setting/lockUser.vue @@ -9,9 +9,9 @@ .search { - padding: 32rpx; width: 686rpx !important; + padding: 32rpx; } .button { - display: flex; - align-items: center; position: fixed; bottom: calc(env(safe-area-inset-bottom) + 20rpx); + display: flex; + align-items: center; font-weight: bold; .button-reset { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #df282d; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #df282d; border-radius: 44rpx; } .button-create { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #63b8af; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #63b8af; border-radius: 44rpx; } } @@ -338,29 +338,29 @@ .item { display: flex; align-items: center; - background-color: #ffffff; - height: 120rpx; width: 750rpx; + height: 120rpx; + background-color: #ffffff; .item-left { - margin-left: 32rpx; width: 80rpx; height: 80rpx; + margin-left: 32rpx; } .item-right { + width: 574rpx; margin-right: 32rpx; margin-left: 32rpx; - width: 574rpx; .item-right-top { max-width: 400rpx; - font-size: 32rpx; - font-weight: bold; padding-bottom: 6rpx; - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + font-size: 32rpx; + font-weight: bold; + white-space: nowrap; } .item-right-bottom { @@ -384,9 +384,9 @@ } .empty-list-text { - text-align: center; font-size: 32rpx; color: #999999; + text-align: center; } .status { diff --git a/pages/settingForBluetooth/lowElecNotice.vue b/pages/setting/lowElecNotice.vue similarity index 100% rename from pages/settingForBluetooth/lowElecNotice.vue rename to pages/setting/lowElecNotice.vue diff --git a/pages/settingForBluetooth/messageReminder.vue b/pages/setting/messageReminder.vue similarity index 100% rename from pages/settingForBluetooth/messageReminder.vue rename to pages/setting/messageReminder.vue diff --git a/pages/settingForBluetooth/motorTorsion.vue b/pages/setting/motorTorsion.vue similarity index 100% rename from pages/settingForBluetooth/motorTorsion.vue rename to pages/setting/motorTorsion.vue diff --git a/pages/settingForBluetooth/notOpenDoor.vue b/pages/setting/notOpenDoor.vue similarity index 100% rename from pages/settingForBluetooth/notOpenDoor.vue rename to pages/setting/notOpenDoor.vue diff --git a/pages/settingForBluetooth/noticeDetail.vue b/pages/setting/noticeDetail.vue similarity index 100% rename from pages/settingForBluetooth/noticeDetail.vue rename to pages/setting/noticeDetail.vue diff --git a/pages/settingForBluetooth/noticeWay.vue b/pages/setting/noticeWay.vue similarity index 100% rename from pages/settingForBluetooth/noticeWay.vue rename to pages/setting/noticeWay.vue diff --git a/pages/settingForBluetooth/openDirection.vue b/pages/setting/openDirection.vue similarity index 100% rename from pages/settingForBluetooth/openDirection.vue rename to pages/setting/openDirection.vue diff --git a/pages/settingForBluetooth/openDoorNotice.vue b/pages/setting/openDoorNotice.vue similarity index 100% rename from pages/settingForBluetooth/openDoorNotice.vue rename to pages/setting/openDoorNotice.vue diff --git a/pages/settingForBluetooth/passageMode.vue b/pages/setting/passageMode.vue similarity index 100% rename from pages/settingForBluetooth/passageMode.vue rename to pages/setting/passageMode.vue diff --git a/pages/settingForBluetooth/realTimePicture.vue b/pages/setting/realTimePicture.vue similarity index 100% rename from pages/settingForBluetooth/realTimePicture.vue rename to pages/setting/realTimePicture.vue diff --git a/pages/settingForBluetooth/selectGroup.vue b/pages/setting/selectGroup.vue similarity index 100% rename from pages/settingForBluetooth/selectGroup.vue rename to pages/setting/selectGroup.vue diff --git a/pages/settingForBluetooth/setting.vue b/pages/setting/setting.vue similarity index 100% rename from pages/settingForBluetooth/setting.vue rename to pages/setting/setting.vue diff --git a/pages/settingForBluetooth/syncElec.vue b/pages/setting/syncElec.vue similarity index 100% rename from pages/settingForBluetooth/syncElec.vue rename to pages/setting/syncElec.vue diff --git a/pages/settingForBluetooth/updateSetting.vue b/pages/setting/updateSetting.vue similarity index 100% rename from pages/settingForBluetooth/updateSetting.vue rename to pages/setting/updateSetting.vue diff --git a/pages/settingForBluetooth/uploadLockData.vue b/pages/setting/uploadLockData.vue similarity index 100% rename from pages/settingForBluetooth/uploadLockData.vue rename to pages/setting/uploadLockData.vue diff --git a/pages/settingForBluetooth/videoSlot.vue b/pages/setting/videoSlot.vue similarity index 100% rename from pages/settingForBluetooth/videoSlot.vue rename to pages/setting/videoSlot.vue diff --git a/stores/basic.js b/stores/basic.js index 8faa7b9..474f642 100644 --- a/stores/basic.js +++ b/stores/basic.js @@ -49,52 +49,52 @@ const pages = [ }, { name: 'searchDevice', - path: '/pages/addDeviceForBluetooth/searchDevice', + path: '/pages/addDevice/searchDevice', tabBar: false }, { name: 'selectAddress', - path: '/pages/addDeviceForBluetooth/selectAddress', + path: '/pages/addDevice/selectAddress', tabBar: false }, { name: 'bindLock', - path: '/pages/addDeviceForBluetooth/bindLock', + path: '/pages/addDevice/bindLock', tabBar: false }, { name: 'setting', - path: '/pages/settingForBluetooth/setting', + path: '/pages/setting/setting', tabBar: false }, { name: 'keyList', - path: '/pages/lockUserManage/keyList', + path: '/pages/feature/keyList', tabBar: false }, { name: 'createKey', - path: '/pages/lockUserManage/createKey', + path: '/pages/feature/createKey', tabBar: false }, { name: 'passwordList', - path: '/pages/featureForBluetooth/passwordList', + path: '/pages/feature/passwordList', tabBar: false }, { name: 'createPassword', - path: '/pages/featureForBluetooth/createPassword', + path: '/pages/feature/createPassword', tabBar: false }, { name: 'passwordDetail', - path: '/pages/featureForBluetooth/passwordDetail', + path: '/pages/feature/passwordDetail', tabBar: false }, { name: 'keyDetail', - path: '/pages/lockUserManage/keyDetail', + path: '/pages/feature/keyDetail', tabBar: false }, { @@ -109,137 +109,137 @@ const pages = [ }, { name: 'addLockGuid', - path: '/pages/addDeviceForBluetooth/addLockGuid', + path: '/pages/addDevice/addLockGuid', tabBar: false }, { name: 'cardList', - path: '/pages/featureForBluetooth/cardList', + path: '/pages/feature/cardList', tabBar: false }, { name: 'createCard', - path: '/pages/featureForBluetooth/createCard', + path: '/pages/feature/createCard', tabBar: false }, { name: 'cardDetail', - path: '/pages/featureForBluetooth/cardDetail', + path: '/pages/feature/cardDetail', tabBar: false }, { name: 'bindCard', - path: '/pages/featureForBluetooth/bindCard', + path: '/pages/feature/bindCard', tabBar: false }, { name: 'fingerprintList', - path: '/pages/featureForBluetooth/fingerprintList', + path: '/pages/feature/fingerprintList', tabBar: false }, { name: 'createFingerprint', - path: '/pages/featureForBluetooth/createFingerprint', + path: '/pages/feature/createFingerprint', tabBar: false }, { name: 'fingerprintDetail', - path: '/pages/featureForBluetooth/fingerprintDetail', + path: '/pages/feature/fingerprintDetail', tabBar: false }, { name: 'bindFingerprint', - path: '/pages/featureForBluetooth/bindFingerprint', + path: '/pages/feature/bindFingerprint', tabBar: false }, { name: 'faceList', - path: '/pages/featureForBluetooth/faceList', + path: '/pages/feature/faceList', tabBar: false }, { name: 'createFace', - path: '/pages/featureForBluetooth/createFace', + path: '/pages/feature/createFace', tabBar: false }, { name: 'faceDetail', - path: '/pages/featureForBluetooth/faceDetail', + path: '/pages/feature/faceDetail', tabBar: false }, { name: 'bindFace', - path: '/pages/featureForBluetooth/bindFace', + path: '/pages/feature/bindFace', tabBar: false }, { name: 'remoteList', - path: '/pages/featureForBluetooth/remoteList', + path: '/pages/feature/remoteList', tabBar: false }, { name: 'createRemote', - path: '/pages/featureForBluetooth/createRemote', + path: '/pages/feature/createRemote', tabBar: false }, { name: 'remoteDetail', - path: '/pages/featureForBluetooth/remoteDetail', + path: '/pages/feature/remoteDetail', tabBar: false }, { name: 'bindRemote', - path: '/pages/featureForBluetooth/bindRemote', + path: '/pages/feature/bindRemote', tabBar: false }, { name: 'palmVeinList', - path: '/pages/featureForBluetooth/palmVeinList', + path: '/pages/feature/palmVeinList', tabBar: false }, { name: 'createPalmVein', - path: '/pages/featureForBluetooth/createPalmVein', + path: '/pages/feature/createPalmVein', tabBar: false }, { name: 'palmVeinDetail', - path: '/pages/featureForBluetooth/palmVeinDetail', + path: '/pages/feature/palmVeinDetail', tabBar: false }, { name: 'bindPalmVein', - path: '/pages/featureForBluetooth/bindPalmVein', + path: '/pages/feature/bindPalmVein', tabBar: false }, { name: 'createAdmin', - path: '/pages/lockUserManage/createAdmin', + path: '/pages/feature/createAdmin', tabBar: false }, { name: 'adminDetail', - path: '/pages/lockUserManage/adminDetail', + path: '/pages/feature/adminDetail', tabBar: false }, { name: 'adminList', - path: '/pages/lockUserManage/adminList', + path: '/pages/feature/adminList', tabBar: false }, { name: 'recordList', - path: '/pages/featureForBluetooth/recordList', + path: '/pages/feature/recordList', tabBar: false }, { name: 'recordDetail', - path: '/pages/featureForBluetooth/recordDetail', + path: '/pages/feature/recordDetail', tabBar: false }, { name: 'typeRecordList', - path: '/pages/featureForBluetooth/typeRecordList', + path: '/pages/feature/typeRecordList', tabBar: false }, { @@ -254,142 +254,142 @@ const pages = [ }, { name: 'lockInfo', - path: '/pages/settingForBluetooth/lockInfo', + path: '/pages/setting/lockInfo', tabBar: false }, { name: 'syncElec', - path: '/pages/settingForBluetooth/syncElec', + path: '/pages/setting/syncElec', tabBar: false }, { name: 'selectGroup', - path: '/pages/settingForBluetooth/selectGroup', + path: '/pages/setting/selectGroup', tabBar: false }, { name: 'updateSetting', - path: '/pages/settingForBluetooth/updateSetting', + path: '/pages/setting/updateSetting', tabBar: false }, { name: 'lockSound', - path: '/pages/settingForBluetooth/lockSound', + path: '/pages/setting/lockSound', tabBar: false }, { name: 'autoLock', - path: '/pages/settingForBluetooth/autoLock', + path: '/pages/setting/autoLock', tabBar: false }, { name: 'faceSetting', - path: '/pages/settingForBluetooth/faceSetting', + path: '/pages/setting/faceSetting', tabBar: false }, { name: 'lockDate', - path: '/pages/settingForBluetooth/lockDate', + path: '/pages/setting/lockDate', tabBar: false }, { name: 'uploadLockData', - path: '/pages/settingForBluetooth/uploadLockData', + path: '/pages/setting/uploadLockData', tabBar: false }, { name: 'openDirection', - path: '/pages/settingForBluetooth/openDirection', + path: '/pages/setting/openDirection', tabBar: false }, { name: 'motorTorsion', - path: '/pages/settingForBluetooth/motorTorsion', + path: '/pages/setting/motorTorsion', tabBar: false }, { name: 'catEye', - path: '/pages/settingForBluetooth/catEye', + path: '/pages/setting/catEye', tabBar: false }, { name: 'messageReminder', - path: '/pages/settingForBluetooth/messageReminder', + path: '/pages/setting/messageReminder', tabBar: false }, { name: 'openDoorNotice', - path: '/pages/settingForBluetooth/openDoorNotice', + path: '/pages/setting/openDoorNotice', tabBar: false }, { name: 'noticeDetail', - path: '/pages/settingForBluetooth/noticeDetail', + path: '/pages/setting/noticeDetail', tabBar: false }, { name: 'lockUser', - path: '/pages/settingForBluetooth/lockUser', + path: '/pages/setting/lockUser', tabBar: false }, { name: 'noticeWay', - path: '/pages/settingForBluetooth/noticeWay', + path: '/pages/setting/noticeWay', tabBar: false }, { name: 'notOpenDoor', - path: '/pages/settingForBluetooth/notOpenDoor', + path: '/pages/setting/notOpenDoor', tabBar: false }, { name: 'lowElecNotice', - path: '/pages/settingForBluetooth/lowElecNotice', + path: '/pages/setting/lowElecNotice', tabBar: false }, { name: 'coercionOpenDoor', - path: '/pages/settingForBluetooth/coercionOpenDoor', + path: '/pages/setting/coercionOpenDoor', tabBar: false }, { name: 'coercionFingerprint', - path: '/pages/settingForBluetooth/coercionFingerprint', + path: '/pages/setting/coercionFingerprint', tabBar: false }, { name: 'catEyeMode', - path: '/pages/settingForBluetooth/catEyeMode', + path: '/pages/setting/catEyeMode', tabBar: false }, { name: 'customCatEye', - path: '/pages/settingForBluetooth/customCatEye', + path: '/pages/setting/customCatEye', tabBar: false }, { name: 'realTimePicture', - path: '/pages/settingForBluetooth/realTimePicture', + path: '/pages/setting/realTimePicture', tabBar: false }, { name: 'videoSlot', - path: '/pages/settingForBluetooth/videoSlot', + path: '/pages/setting/videoSlot', tabBar: false }, { name: 'passageMode', - path: '/pages/settingForBluetooth/passageMode', + path: '/pages/setting/passageMode', tabBar: false }, { name: 'selectDeviceType', - path: '/pages/others/selectDeviceType', + path: '/pages/addDevice/selectDeviceType', tabBar: false }, { name: 'distributionNetwork', - path: '/pages/addDeviceForWiFi/distributionNetwork', + path: '/pages/addDevice/distributionNetwork', tabBar: false }, { From 52959a97d25dc2b55797b11ed5e7d65a8d160ed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= Date: Sun, 6 Apr 2025 15:19:55 +0800 Subject: [PATCH 09/10] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=9B=91?= =?UTF-8?q?=E6=8E=A7=E9=A1=B5=E9=9D=A2=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/sdk.js | 12 -- config/constants.js | 9 - package-lock.json | 254 +++--------------------- package.json | 4 - pages.json | 8 +- pages/addDevice/distributionNetwork.vue | 122 +++--------- pages/addDevice/selectDeviceType.vue | 39 ---- pages/main/home.vue | 14 +- pages/main/lockDetail.vue | 17 ++ pages/p2p/p2pPlayer.vue | 183 +++++++++++++---- stores/basic.js | 5 - stores/sdk.js | 45 ----- 12 files changed, 224 insertions(+), 488 deletions(-) delete mode 100644 api/sdk.js delete mode 100644 config/constants.js delete mode 100644 pages/addDevice/selectDeviceType.vue delete mode 100644 stores/sdk.js diff --git a/api/sdk.js b/api/sdk.js deleted file mode 100644 index c417029..0000000 --- a/api/sdk.js +++ /dev/null @@ -1,12 +0,0 @@ -import request from '../utils/request' - -// sdk 模块 - -// 获取SDK Token -export function getSdkToken(data) { - return request({ - url: '/wechat/tencentYunBind', - method: 'POST', - data - }) -} diff --git a/config/constants.js b/config/constants.js deleted file mode 100644 index 264739d..0000000 --- a/config/constants.js +++ /dev/null @@ -1,9 +0,0 @@ -/** - * 应用全局常量配置 - */ - -// P2P相关常量 -export const P2P_PLAYER_ID = 'p2p-player' -export const P2P_PUSHER_ID = 'p2p-pusher' - -// 其他常量可以在这里添加 diff --git a/package-lock.json b/package-lock.json index 192787a..32037f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,10 +7,6 @@ "dependencies": { "pinia": "^2.2.0", "pinia-plugin-unistorage": "^0.1.2", - "qcloud-iotexplorer-appdev-plugin-wificonf-blecombo": "^3.0.118", - "qcloud-iotexplorer-appdev-plugin-wificonf-core": "^3.0.118", - "qcloud-iotexplorer-appdev-sdk": "^3.0.118", - "qcloud-iotexplorer-bluetooth-adapter": "^3.0.118", "uview-plus": "^3.3.12" }, "devDependencies": { @@ -1152,31 +1148,6 @@ "buffer": "^6.0.3" } }, - "node_modules/@keyv/serialize/node_modules/buffer": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", - "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.2.1" - } - }, "node_modules/@meoc/utils": { "version": "0.2.9", "resolved": "https://registry.npmjs.org/@meoc/utils/-/utils-0.2.9.tgz", @@ -2464,6 +2435,31 @@ "readable-stream": "^3.4.0" } }, + "node_modules/bl/node_modules/buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, "node_modules/boolbase": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", @@ -2496,9 +2492,9 @@ } }, "node_modules/buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", + "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", "dev": true, "funding": [ { @@ -2517,7 +2513,7 @@ "license": "MIT", "dependencies": { "base64-js": "^1.3.1", - "ieee754": "^1.1.13" + "ieee754": "^1.2.1" } }, "node_modules/cac": { @@ -3303,15 +3299,6 @@ } } }, - "node_modules/decode-uri-component": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz", - "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==", - "license": "MIT", - "engines": { - "node": ">=0.10" - } - }, "node_modules/dedent": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", @@ -4339,12 +4326,6 @@ "node": ">=0.10.0" } }, - "node_modules/event-emitter-for-miniprogram": { - "version": "3.0.118", - "resolved": "https://registry.npmjs.org/event-emitter-for-miniprogram/-/event-emitter-for-miniprogram-3.0.118.tgz", - "integrity": "sha512-1PcFkCGtSrYX7Fwwrrz5OxmO1vrkDZuLOrrS/Ok2XYjADcTUspxXENlh/PaizTH3VIlF1T3W27QXEoixrzKyQA==", - "license": "MIT" - }, "node_modules/eventemitter3": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz", @@ -4558,15 +4539,6 @@ "node": ">=8" } }, - "node_modules/filter-obj": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz", - "integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==", - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/find-node-modules": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/find-node-modules/-/find-node-modules-2.1.3.tgz", @@ -5453,15 +5425,6 @@ "node": ">= 0.4" } }, - "node_modules/iotexplorer-ui-dev-config": { - "version": "3.0.118", - "resolved": "https://registry.npmjs.org/iotexplorer-ui-dev-config/-/iotexplorer-ui-dev-config-3.0.118.tgz", - "integrity": "sha512-XC1tQ+oY/0C0/n7qG4ofxAGxfONFDGHQ3tpgK2F2JmF2sQIlRSAd4L80cHQKxPFqyIbmIB751DEqupCPnh+F4w==", - "license": "MIT", - "dependencies": { - "tslib": "^2.1.0" - } - }, "node_modules/is-array-buffer": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz", @@ -5993,12 +5956,6 @@ "jiti": "lib/jiti-cli.mjs" } }, - "node_modules/js-base64": { - "version": "3.7.7", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.7.tgz", - "integrity": "sha512-7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw==", - "license": "BSD-3-Clause" - }, "node_modules/js-md5": { "version": "0.8.3", "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.8.3.tgz", @@ -6411,12 +6368,6 @@ "dev": true, "license": "MIT" }, - "node_modules/lodash.uniqwith": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.uniqwith/-/lodash.uniqwith-4.5.0.tgz", - "integrity": "sha512-7lYL8bLopMoy4CTICbxygAUq6CdRJ36vFc80DucPueUee+d5NBRxz3FdT9Pes/HEx5mPoT9jwnsEJWz1N7uq7Q==", - "license": "MIT" - }, "node_modules/lodash.upperfirst": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz", @@ -7664,103 +7615,6 @@ "node": ">=6" } }, - "node_modules/qcloud-iotexplorer-appdev-plugin-wificonf-blecombo": { - "version": "3.0.118", - "resolved": "https://registry.npmjs.org/qcloud-iotexplorer-appdev-plugin-wificonf-blecombo/-/qcloud-iotexplorer-appdev-plugin-wificonf-blecombo-3.0.118.tgz", - "integrity": "sha512-ni8uOa8m1L2gSPkAa2/afKOzaLpeCPdmEW39Hbn2j7S4V5UPbWL+1lObNy8stlRUR++vKPIhb/DOlW1OTHAcDQ==", - "license": "MIT", - "dependencies": { - "iotexplorer-ui-dev-config": "3.0.118", - "qcloud-iotexplorer-appdev-plugin-wificonf-core": "3.0.118", - "qcloud-iotexplorer-appdev-sdk": "3.0.118", - "qcloud-iotexplorer-bluetooth-adapter": "3.0.118", - "qcloud-iotexplorer-bluetooth-adapter-llsync": "3.0.118", - "qcloud-iotexplorer-common-libs": "3.0.118", - "qcloud-iotexplorer-logger": "3.0.118", - "shortid-for-miniprogram": "^2.2.15", - "spark-md5": "^3.0.1", - "tslib": "^2.1.0" - } - }, - "node_modules/qcloud-iotexplorer-appdev-plugin-wificonf-core": { - "version": "3.0.118", - "resolved": "https://registry.npmjs.org/qcloud-iotexplorer-appdev-plugin-wificonf-core/-/qcloud-iotexplorer-appdev-plugin-wificonf-core-3.0.118.tgz", - "integrity": "sha512-2iObI2Hifi3ew+5EraINeNm0APF0jv2BYs2vyIuRwuJwNN6bPTrDGo1LIPyQpGBq03y4h9MUy11VxSVbeN9jbA==", - "license": "MIT", - "dependencies": { - "iotexplorer-ui-dev-config": "3.0.118", - "qcloud-iotexplorer-appdev-sdk": "3.0.118", - "tslib": "^2.1.0" - } - }, - "node_modules/qcloud-iotexplorer-appdev-sdk": { - "version": "3.0.118", - "resolved": "https://registry.npmjs.org/qcloud-iotexplorer-appdev-sdk/-/qcloud-iotexplorer-appdev-sdk-3.0.118.tgz", - "integrity": "sha512-UzlvJgizhWeKGh75gaj3w6fuHNKF0oB418U733/lyexlUX5a9KWySrSO49AYwfOrPPp4vllTbZ2vP5jXJ7+l2w==", - "license": "MIT", - "dependencies": { - "event-emitter-for-miniprogram": "3.0.118", - "js-base64": "^3.2.4", - "qcloud-iotexplorer-common-libs": "3.0.118", - "qcloud-iotexplorer-logger": "3.0.118", - "query-string": "^6.9.0", - "shortid-for-miniprogram": "^2.2.15", - "tslib": "^2.1.0" - } - }, - "node_modules/qcloud-iotexplorer-bluetooth-adapter": { - "version": "3.0.118", - "resolved": "https://registry.npmjs.org/qcloud-iotexplorer-bluetooth-adapter/-/qcloud-iotexplorer-bluetooth-adapter-3.0.118.tgz", - "integrity": "sha512-K/Qw14PID86VxL6vA6JiuxOYrnOgiX7yUSxlmuXlqNsJcbc7AaSUUCQUPP3Ds0AKcRp5EIzdMy8f5ANF9WIv1w==", - "license": "MIT", - "dependencies": { - "event-emitter-for-miniprogram": "3.0.118", - "lodash.uniqwith": "^4.5.0", - "qcloud-iotexplorer-appdev-sdk": "3.0.118", - "qcloud-iotexplorer-common-libs": "3.0.118", - "qcloud-iotexplorer-logger": "3.0.118", - "tslib": "^2.1.0" - } - }, - "node_modules/qcloud-iotexplorer-bluetooth-adapter-llsync": { - "version": "3.0.118", - "resolved": "https://registry.npmjs.org/qcloud-iotexplorer-bluetooth-adapter-llsync/-/qcloud-iotexplorer-bluetooth-adapter-llsync-3.0.118.tgz", - "integrity": "sha512-dklNG7VFyQJkwnhl/aUxBMKhqhghl4y7RrcPih6q8AjJPHLY5k7DpP8tUVcLKCymXaiq3K6S6d1C9CTgL5AA9g==", - "license": "MIT", - "dependencies": { - "event-emitter-for-miniprogram": "3.0.118", - "iotexplorer-ui-dev-config": "3.0.118", - "qcloud-iotexplorer-appdev-sdk": "3.0.118", - "qcloud-iotexplorer-bluetooth-adapter": "3.0.118", - "qcloud-iotexplorer-common-libs": "3.0.118", - "qcloud-iotexplorer-logger": "3.0.118", - "shortid-for-miniprogram": "^2.2.15", - "spark-md5": "^3.0.1", - "tslib": "^2.1.0" - } - }, - "node_modules/qcloud-iotexplorer-common-libs": { - "version": "3.0.118", - "resolved": "https://registry.npmjs.org/qcloud-iotexplorer-common-libs/-/qcloud-iotexplorer-common-libs-3.0.118.tgz", - "integrity": "sha512-nnCnfMwDjzCOY3wjNxvdkZZwLn91tYSie1TgwuC6oOD4pDRcbkOSRHG7W24l8gX/VLqOMkF+OiJzL6LRCQ3q+A==", - "license": "MIT", - "dependencies": { - "qcloud-iotexplorer-logger": "3.0.118", - "rxjs": "^7.8.0", - "shortid-for-miniprogram": "^2.2.15", - "spark-md5": "^3.0.1", - "tslib": "^2.1.0" - } - }, - "node_modules/qcloud-iotexplorer-logger": { - "version": "3.0.118", - "resolved": "https://registry.npmjs.org/qcloud-iotexplorer-logger/-/qcloud-iotexplorer-logger-3.0.118.tgz", - "integrity": "sha512-kVW5Kq1vqBwRMAUs2wOYLMCCfrs1FKt0AFDRPnIEoZiTeBzXtk9QF1K50rb+zMtmZ6RUlwIKoomWZRMI3oqR/w==", - "license": "MIT", - "dependencies": { - "tslib": "^2.1.0" - } - }, "node_modules/quansync": { "version": "0.2.10", "resolved": "https://registry.npmjs.org/quansync/-/quansync-0.2.10.tgz", @@ -7778,24 +7632,6 @@ ], "license": "MIT" }, - "node_modules/query-string": { - "version": "6.14.1", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.14.1.tgz", - "integrity": "sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==", - "license": "MIT", - "dependencies": { - "decode-uri-component": "^0.2.0", - "filter-obj": "^1.1.0", - "split-on-first": "^1.0.0", - "strict-uri-encode": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -8115,6 +7951,7 @@ "version": "7.8.2", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz", "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==", + "dev": true, "license": "Apache-2.0", "dependencies": { "tslib": "^2.1.0" @@ -8294,12 +8131,6 @@ "node": ">=8" } }, - "node_modules/shortid-for-miniprogram": { - "version": "2.2.15", - "resolved": "https://registry.npmjs.org/shortid-for-miniprogram/-/shortid-for-miniprogram-2.2.15.tgz", - "integrity": "sha512-Ulw76O5R9UtanxKhiaN9fbQJc0B3YtqFHhDCV8B6/Ay/tjq0RlS4thRxWNI5rnxMVq7EOTrlFFE6QVFsWKLz5w==", - "license": "MIT" - }, "node_modules/side-channel": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", @@ -8450,21 +8281,6 @@ "node": ">=0.10.0" } }, - "node_modules/spark-md5": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/spark-md5/-/spark-md5-3.0.2.tgz", - "integrity": "sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw==", - "license": "(WTFPL OR MIT)" - }, - "node_modules/split-on-first": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz", - "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==", - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/split2": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz", @@ -8475,15 +8291,6 @@ "node": ">= 10.x" } }, - "node_modules/strict-uri-encode": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz", - "integrity": "sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==", - "license": "MIT", - "engines": { - "node": ">=4" - } - }, "node_modules/string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", @@ -9343,6 +9150,7 @@ "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "dev": true, "license": "0BSD" }, "node_modules/type-check": { diff --git a/package.json b/package.json index 21115b4..51c700d 100644 --- a/package.json +++ b/package.json @@ -2,10 +2,6 @@ "dependencies": { "pinia": "^2.2.0", "pinia-plugin-unistorage": "^0.1.2", - "qcloud-iotexplorer-appdev-plugin-wificonf-blecombo": "^3.0.118", - "qcloud-iotexplorer-appdev-plugin-wificonf-core": "^3.0.118", - "qcloud-iotexplorer-appdev-sdk": "^3.0.118", - "qcloud-iotexplorer-bluetooth-adapter": "^3.0.118", "uview-plus": "^3.3.12" }, "devDependencies": { diff --git a/pages.json b/pages.json index b3f0e56..b85c5ba 100644 --- a/pages.json +++ b/pages.json @@ -14,6 +14,7 @@ { "path": "p2pPlayer", "style": { + "navigationStyle": "custom", "navigationBarTitleText": "监控", "mp-weixin": { "usingComponents": { @@ -61,13 +62,6 @@ "navigationBarTitleText": "WiFi配网", "disableScroll": true } - }, - { - "path": "selectDeviceType", - "style": { - "navigationBarTitleText": "选择设备类型", - "disableScroll": true - } } ] }, diff --git a/pages/addDevice/distributionNetwork.vue b/pages/addDevice/distributionNetwork.vue index c0a6c76..30780f7 100644 --- a/pages/addDevice/distributionNetwork.vue +++ b/pages/addDevice/distributionNetwork.vue @@ -109,23 +109,9 @@ - - diff --git a/pages/main/home.vue b/pages/main/home.vue index c41a2b9..93cdf65 100644 --- a/pages/main/home.vue +++ b/pages/main/home.vue @@ -182,7 +182,6 @@ import { deleteKeyRequest } from '@/api/key' import { deleteLockRequest } from '@/api/lock' import { setStorage, getStorage } from '@/utils/storage' - import { useSdkStore } from '@/stores/sdk' export default { data() { @@ -225,11 +224,7 @@ this.deviceInfo = await this.getDeviceInfo() const token = getStorage('token') if (token) { - await Promise.all([ - this.getLockList(this.lockSearch), - this.getUserInfo(), - this.initSdk() - ]).then(res => { + await Promise.all([this.getLockList(this.lockSearch), this.getUserInfo()]).then(res => { this.pending = false uni.hideLoading() const list = getStorage('lockList') @@ -277,7 +272,6 @@ 'resetDevice' ]), ...mapActions(useBasicStore, ['routeJump', 'getDeviceInfo', 'getNetworkType', 'shareJump']), - ...mapActions(useSdkStore, ['initSdk']), async deleteLock(lock, groupIndex, lockIndex) { const that = this const netWork = await this.getNetworkType() @@ -422,7 +416,6 @@ that.getLockList(that.lockSearch) await that.getUserInfo() that.updateLoginStatus(true) - that.initSdk() resolve(true) } else { that.updateLoginStatus(false) @@ -537,11 +530,8 @@ this.focus = false }, async toSearchDevice() { - // this.routeJump({ - // name: 'selectDeviceType' - // }) this.routeJump({ - name: 'p2pPlayer' + name: 'addLockGuid' }) }, async toLockDetail(lock) { diff --git a/pages/main/lockDetail.vue b/pages/main/lockDetail.vue index b2041be..b4de880 100644 --- a/pages/main/lockDetail.vue +++ b/pages/main/lockDetail.vue @@ -172,6 +172,13 @@ > 掌静脉 + + + 监控 + 操作记录 + + + 视频日志 + - - - + + + + + + + + + + + 长按说话 + + + + + + 挂断 + + + + + + 开锁 + + + + diff --git a/stores/basic.js b/stores/basic.js index 474f642..f62d83e 100644 --- a/stores/basic.js +++ b/stores/basic.js @@ -382,11 +382,6 @@ const pages = [ path: '/pages/setting/passageMode', tabBar: false }, - { - name: 'selectDeviceType', - path: '/pages/addDevice/selectDeviceType', - tabBar: false - }, { name: 'distributionNetwork', path: '/pages/addDevice/distributionNetwork', diff --git a/stores/sdk.js b/stores/sdk.js deleted file mode 100644 index 05cfd76..0000000 --- a/stores/sdk.js +++ /dev/null @@ -1,45 +0,0 @@ -import { defineStore } from 'pinia' -import { AppDevSdk } from 'qcloud-iotexplorer-appdev-sdk' -import { getSdkToken } from '@/api/sdk' - -export const useSdkStore = defineStore('sdk', { - state() { - return { - sdk: null - } - }, - actions: { - async getSdk() { - if (this.sdk.loginManager.isLogin) { - return this.sdk - } - await this.initSdk() - return this.sdk - }, - async initSdk() { - try { - const getAccessToken = async () => { - const { code, data, message } = await getSdkToken() - if (code === 0) { - return data - } - uni.showToast({ - title: message, - icon: 'none' - }) - return null - } - - this.sdk = await new AppDevSdk({ - appKey: 'mtBfaXFtISXFYVVsd', - getAccessToken - }) - - this.sdk.init() - } catch (error) { - console.log(111, this.sdk) - console.log('error', error) - } - } - } -}) From 5954c8a838fb8fa51e234216da108c1b95bd7412 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= Date: Sun, 6 Apr 2025 15:20:03 +0800 Subject: [PATCH 10/10] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=9B=91?= =?UTF-8?q?=E6=8E=A7=E9=A1=B5=E9=9D=A2=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/p2p.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 api/p2p.js diff --git a/api/p2p.js b/api/p2p.js new file mode 100644 index 0000000..7f6d4a4 --- /dev/null +++ b/api/p2p.js @@ -0,0 +1,12 @@ +import request from '../utils/request' + +// p2p 模块 + +// 获取p2pInfo +export function getP2pInfo(data) { + return request({ + url: '/v1/tencentYun/getDeviceDetail', + method: 'POST', + data + }) +}