diff --git a/package-lock.json b/package-lock.json index 32037f5..3e19e4e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,6 +12,10 @@ "devDependencies": { "@commitlint/cli": "^19.7.1", "@commitlint/config-conventional": "^19.7.1", + "@iconify-json/material-symbols": "^1.2.22", + "@iconify-json/solar": "^1.2.2", + "@iconify/utils": "^2.3.0", + "@unocss/preset-icons": "^66.1.2", "commitizen": "^4.3.1", "crc": "^4.3.2", "cz-git": "^1.11.0", @@ -1049,6 +1053,26 @@ "dev": true, "license": "BSD-3-Clause" }, + "node_modules/@iconify-json/material-symbols": { + "version": "1.2.22", + "resolved": "https://registry.npmjs.org/@iconify-json/material-symbols/-/material-symbols-1.2.22.tgz", + "integrity": "sha512-raleOIRt8iPtwAkDzmw/c5zb06nIaicsYs5bZ3yfRjBxuYT/UYNa2ZFQQMl3uuTTiZuUXwFa1M8PJW3CFRAN0w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@iconify/types": "*" + } + }, + "node_modules/@iconify-json/solar": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@iconify-json/solar/-/solar-1.2.2.tgz", + "integrity": "sha512-lcTb6DWL4HZObiY1W3fHfuxxuQHUc6CFHFeywKEx7Ry0k+dU6POZCMC7oVLr0F8vuf+KgaQ3oOoGO/yFzOwrNg==", + "dev": true, + "license": "CC-BY-4.0", + "dependencies": { + "@iconify/types": "*" + } + }, "node_modules/@iconify/types": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@iconify/types/-/types-2.0.0.tgz", @@ -1771,20 +1795,30 @@ } }, "node_modules/@unocss/preset-icons": { - "version": "65.5.0", - "resolved": "https://registry.npmjs.org/@unocss/preset-icons/-/preset-icons-65.5.0.tgz", - "integrity": "sha512-lSwMNtj4nufpQDBFoioAM9S6hP8028lA9fLFM3Vw+KmI10/3TaZyOaCXJVH5UdsfNWexGGo/Qo+K1YFWfXLZ8A==", + "version": "66.1.2", + "resolved": "https://registry.npmjs.org/@unocss/preset-icons/-/preset-icons-66.1.2.tgz", + "integrity": "sha512-14390jFBJ2anuKvjX9TeRCm7adNjR/mey0bh0+S/k/5W3VugIY2y0E+OH3m+sx5d/5ZUYbYkUGsmtuKbVNwwxQ==", "dev": true, "license": "MIT", "dependencies": { "@iconify/utils": "^2.3.0", - "@unocss/core": "65.5.0", + "@unocss/core": "66.1.2", "ofetch": "^1.4.1" }, "funding": { "url": "https://github.com/sponsors/antfu" } }, + "node_modules/@unocss/preset-icons/node_modules/@unocss/core": { + "version": "66.1.2", + "resolved": "https://registry.npmjs.org/@unocss/core/-/core-66.1.2.tgz", + "integrity": "sha512-mN9h1hHEuhDcdbI4z74o7UnxlBZYVsJpYcdC1YLWBKROcLYTkuyZ7hgBzpo1FBNox2Bt3JnrSinVDmc44Bxjow==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/antfu" + } + }, "node_modules/@unocss/preset-mini": { "version": "65.5.0", "resolved": "https://registry.npmjs.org/@unocss/preset-mini/-/preset-mini-65.5.0.tgz", @@ -9402,6 +9436,21 @@ "unplugin-transform-class": "^0.5.3" } }, + "node_modules/unocss/node_modules/@unocss/preset-icons": { + "version": "65.5.0", + "resolved": "https://registry.npmjs.org/@unocss/preset-icons/-/preset-icons-65.5.0.tgz", + "integrity": "sha512-lSwMNtj4nufpQDBFoioAM9S6hP8028lA9fLFM3Vw+KmI10/3TaZyOaCXJVH5UdsfNWexGGo/Qo+K1YFWfXLZ8A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@iconify/utils": "^2.3.0", + "@unocss/core": "65.5.0", + "ofetch": "^1.4.1" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + } + }, "node_modules/unplugin": { "version": "1.16.1", "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.16.1.tgz", diff --git a/package.json b/package.json index 5a12c60..f7c9d92 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,10 @@ "devDependencies": { "@commitlint/cli": "^19.7.1", "@commitlint/config-conventional": "^19.7.1", + "@iconify-json/material-symbols": "^1.2.22", + "@iconify-json/solar": "^1.2.2", + "@iconify/utils": "^2.3.0", + "@unocss/preset-icons": "^66.1.2", "commitizen": "^4.3.1", "crc": "^4.3.2", "cz-git": "^1.11.0", diff --git a/pages.json b/pages.json index ac6329f..81ff30f 100644 --- a/pages.json +++ b/pages.json @@ -32,22 +32,11 @@ "disableScroll": true } }, - { - "path": "videoDetail", - "style": { - "navigationBarTitleText": "视频播放" - } - }, { "path": "videoLog", "style": { - "navigationBarTitleText": "云存" - } - }, - { - "path": "videoEdit", - "style": { - "navigationBarTitleText": "视频编辑" + "navigationBarTitleText": "门锁记录", + "disableScroll": true } } ], @@ -656,4 +645,4 @@ } ] } -} \ No newline at end of file +} diff --git a/pages/main/lockDetail.vue b/pages/main/lockDetail.vue index 5053c44..0b72e2e 100644 --- a/pages/main/lockDetail.vue +++ b/pages/main/lockDetail.vue @@ -214,7 +214,7 @@ class="menu-main-image" src="https://oss-lock.xhjcn.ltd/mp/icon_record.png" > - 视频日志 + 门锁记录 - - - - 暂无数据 - - - - {{ item.date }} - - - - - - - - - - - - {{ timeFormat(video.operateDate, 'yyyy-mm-dd hh:MM') }} - - - - - - - - - - diff --git a/pages/p2p/videoEdit.vue b/pages/p2p/videoEdit.vue deleted file mode 100644 index 3c255eb..0000000 --- a/pages/p2p/videoEdit.vue +++ /dev/null @@ -1,145 +0,0 @@ - - - diff --git a/pages/p2p/videoLog.vue b/pages/p2p/videoLog.vue index 578a84d..c1dd402 100644 --- a/pages/p2p/videoLog.vue +++ b/pages/p2p/videoLog.vue @@ -1,51 +1,337 @@ diff --git a/unocss.config.js b/unocss.config.js index 7528dde..e4ab282 100644 --- a/unocss.config.js +++ b/unocss.config.js @@ -1,5 +1,6 @@ import presetWeapp from 'unocss-preset-weapp' import { extractorAttributify, transformerClass } from 'unocss-preset-weapp/transformer' +import presetIcons from '@unocss/preset-icons' const { presetWeappAttributify, transformerAttributify } = extractorAttributify() @@ -8,7 +9,14 @@ export default { // https://github.com/MellowCo/unocss-preset-weapp presetWeapp(), // attributify autocomplete - presetWeappAttributify() + presetWeappAttributify(), + presetIcons({ + collections: { + solar: () => import('@iconify-json/solar/icons.json').then(i => i.default), + 'material-symbols': () => + import('@iconify-json/material-symbols/icons.json').then(i => i.default) + } + }) ], shortcuts: [ {