From 934796b15e6ec62a3b4ccdfab846da812be4aaa7 Mon Sep 17 00:00:00 2001 From: zyronon Date: Tue, 23 Apr 2024 18:30:03 +0800 Subject: [PATCH 1/3] refactor: optimize the code --- package.json | 13 +- pnpm-lock.yaml | 69 +-------- src/components/dialog/FromBottomDialog.vue | 1 - .../slide/{SlideAlbum.vue => SlideAlbum.txt} | 0 .../slide/SlideVerticalInfinite.vue | 2 +- src/utils/hooks/useSlideListItemRender.jsx | 7 +- src/utils/index.tsx | 136 ++++++++---------- 7 files changed, 71 insertions(+), 157 deletions(-) rename src/components/slide/{SlideAlbum.vue => SlideAlbum.txt} (100%) diff --git a/package.json b/package.json index b34de4d..94c0908 100644 --- a/package.json +++ b/package.json @@ -26,17 +26,12 @@ "axios": "^1.6.8", "axios-mock-adapter": "^1.22.0", "core-js": "3.21.1", - "dayjs": "1.11.0", - "gl-matrix": "3.4.3", - "jquery": "^3.7.1", + "libarchive-wasm": "^1.1.0", "mitt": "3.0.0", - "mobile-select": "1.1.2", "mockjs": "^1.1.0", "pinia": "^2.1.7", "vue": "3.4.21", - "vue-router": "4.3.0", - "vue-switches": "2.0.1", - "libarchive-wasm": "^1.1.0" + "vue-router": "4.3.0" }, "devDependencies": { "@commitlint/cli": "^19.2.1", @@ -56,6 +51,7 @@ "cz-conventional-changelog": "^3.3.0", "eslint": "^8.57.0", "eslint-plugin-vue": "^9.17.0", + "git-last-commit": "^1.0.1", "husky": "^9.0.11", "less": "4.1.3", "lint-staged": "^15.2.2", @@ -66,8 +62,7 @@ "vite": "^5.1.7", "vite-plugin-cdn-import": "0.3.5", "vite-plugin-commonjs": "^0.10.1", - "vue-tsc": "^2.0.6", - "git-last-commit": "^1.0.1" + "vue-tsc": "^2.0.6" }, "lint-staged": { "*.{js,ts,vue,jsx,tsx}": [ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b11c9c0..93c88d0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -17,24 +17,12 @@ dependencies: core-js: specifier: 3.21.1 version: 3.21.1 - dayjs: - specifier: 1.11.0 - version: 1.11.0 - gl-matrix: - specifier: 3.4.3 - version: 3.4.3 - jquery: - specifier: ^3.7.1 - version: 3.7.1 libarchive-wasm: specifier: ^1.1.0 version: 1.1.0 mitt: specifier: 3.0.0 version: 3.0.0 - mobile-select: - specifier: 1.1.2 - version: 1.1.2 mockjs: specifier: ^1.1.0 version: 1.1.0 @@ -47,9 +35,6 @@ dependencies: vue-router: specifier: 4.3.0 version: 4.3.0(vue@3.4.21) - vue-switches: - specifier: 2.0.1 - version: 2.0.1 devDependencies: '@commitlint/cli': @@ -360,6 +345,7 @@ packages: /@babel/helper-string-parser@7.23.4: resolution: {integrity: sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==} engines: {node: '>=6.9.0'} + dev: true /@babel/helper-validator-identifier@7.22.20: resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==} @@ -400,14 +386,6 @@ packages: picocolors: 1.0.0 dev: true - /@babel/parser@7.23.0: - resolution: {integrity: sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==} - engines: {node: '>=6.0.0'} - hasBin: true - dependencies: - '@babel/types': 7.24.0 - dev: false - /@babel/parser@7.24.0: resolution: {integrity: sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==} engines: {node: '>=6.0.0'} @@ -525,6 +503,7 @@ packages: '@babel/helper-string-parser': 7.23.4 '@babel/helper-validator-identifier': 7.22.20 to-fast-properties: 2.0.0 + dev: true /@commitlint/cli@19.2.1(@types/node@20.12.4)(typescript@5.3.3): resolution: {integrity: sha512-cbkYUJsLqRomccNxvoJTyv5yn0bSy05BBizVyIcLACkRbVUqYorC351Diw/XFSWC/GtpwiwT2eOvQgFZa374bg==} @@ -1505,14 +1484,6 @@ packages: '@vue/compiler-core': 3.4.21 '@vue/shared': 3.4.21 - /@vue/compiler-sfc@2.7.14: - resolution: {integrity: sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==} - dependencies: - '@babel/parser': 7.23.0 - postcss: 8.4.35 - source-map: 0.6.1 - dev: false - /@vue/compiler-sfc@3.4.21: resolution: {integrity: sha512-me7epoTxYlY+2CUM7hy9PCDdpMPfIwrOvAXud2Upk10g4YLv9UBW7kL798TvMeDhPthkZ0CONNrK2GoeI1ODiQ==} dependencies: @@ -2055,17 +2026,9 @@ packages: hasBin: true dev: true - /csstype@3.1.2: - resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==} - dev: false - /csstype@3.1.3: resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==} - /dayjs@1.11.0: - resolution: {integrity: sha512-JLC809s6Y948/FuCZPm5IX8rRhQwOiyMb2TfVVQEixG7P8Lm/gt5S7yoQZmC8x1UehI9Pb7sksEt4xx14m+7Ug==} - dev: false - /debug@4.3.4: resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} engines: {node: '>=6.0'} @@ -2482,10 +2445,6 @@ packages: split2: 4.2.0 dev: true - /gl-matrix@3.4.3: - resolution: {integrity: sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA==} - dev: false - /glob-parent@5.1.2: resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} engines: {node: '>= 6'} @@ -2747,10 +2706,6 @@ packages: requiresBuild: true dev: true - /jquery@3.7.1: - resolution: {integrity: sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==} - dev: false - /js-tokens@4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} dev: true @@ -3038,10 +2993,6 @@ packages: ufo: 1.4.0 dev: true - /mobile-select@1.1.2: - resolution: {integrity: sha512-FrVAun32DsxLUZziTE1LPlXC72kD13f8N8tqgf7zVWRIOIIJakNxVs8mR2KMzm3QJAYq5+EJ4ji98pHdWJ7ekw==} - dev: false - /mockjs@1.1.0: resolution: {integrity: sha512-eQsKcWzIaZzEZ07NuEyO4Nw65g0hdWAyurVol1IPl1gahRwY+svqzfgfey8U8dahLwG44d6/RwEzuK52rSa/JQ==} hasBin: true @@ -3487,6 +3438,8 @@ packages: resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==} engines: {node: '>=0.10.0'} requiresBuild: true + dev: true + optional: true /source-map@0.7.4: resolution: {integrity: sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==} @@ -3789,12 +3742,6 @@ packages: vue: 3.4.21(typescript@5.3.3) dev: false - /vue-switches@2.0.1: - resolution: {integrity: sha512-rDqBtK3TKy1pEvyZeWmnSHVeXqAcn+ozch7LiNThBzr1QMjg5rhvqBY7uWeli/baDDslf6CXmBJbHPwASJLqoA==} - dependencies: - vue: 2.7.14 - dev: false - /vue-template-compiler@2.7.16: resolution: {integrity: sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ==} dependencies: @@ -3814,14 +3761,6 @@ packages: typescript: 5.3.3 dev: true - /vue@2.7.14: - resolution: {integrity: sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==} - deprecated: Vue 2 has reached EOL and is no longer actively maintained. See https://v2.vuejs.org/eol/ for more details. - dependencies: - '@vue/compiler-sfc': 2.7.14 - csstype: 3.1.2 - dev: false - /vue@3.4.21(typescript@5.3.3): resolution: {integrity: sha512-5hjyV/jLEIKD/jYl4cavMcnzKwjMKohureP8ejn3hhEjwhWIhWeuzL2kJAjzl/WyVsgPY56Sy4Z40C3lVshxXA==} peerDependencies: diff --git a/src/components/dialog/FromBottomDialog.vue b/src/components/dialog/FromBottomDialog.vue index d31f347..ecfba75 100644 --- a/src/components/dialog/FromBottomDialog.vue +++ b/src/components/dialog/FromBottomDialog.vue @@ -30,7 +30,6 @@ diff --git a/src/pages/home/LivePage.vue b/src/pages/home/LivePage.vue index e5ddf3b..f08fbe0 100644 --- a/src/pages/home/LivePage.vue +++ b/src/pages/home/LivePage.vue @@ -376,7 +376,7 @@ export default { .barrage { position: fixed; top: 50%; - transform: translateX(100vw); + transform: translateX(100%); display: flex; align-items: center; font-size: 12rem; @@ -384,7 +384,7 @@ export default { @keyframes anim { from { - transform: translateX(100vw); + transform: translateX(100%); } to { transform: translateX(-100%); @@ -467,14 +467,14 @@ export default { @import '../../assets/less/index'; .LivePage { - width: 100vw; + width: 100%; height: calc(var(--vh, 1vh) * 100); color: white; font-size: 14rem; position: relative; .live-wrapper { - width: 100vw; + width: 100%; height: calc(var(--vh, 1vh) * 100); background: black; display: flex; @@ -487,7 +487,7 @@ export default { } img { - width: 100vw; + width: 100%; height: calc(var(--vh, 1vh) * 100); color: rgb(229, 229, 229); } @@ -496,7 +496,7 @@ export default { .float { position: absolute; top: 0; - width: 100vw; + width: 100%; height: calc(var(--vh, 1vh) * 100); @tag-bg: rgba(58, 58, 70, 0.3); @@ -634,7 +634,7 @@ export default { .bottom { position: absolute; bottom: 0; - width: 100vw; + width: 100%; box-sizing: border-box; padding: var(--page-padding); padding-bottom: 10rem; diff --git a/src/pages/home/Music.vue b/src/pages/home/Music.vue index fd96b15..c4932f6 100644 --- a/src/pages/home/Music.vue +++ b/src/pages/home/Music.vue @@ -75,11 +75,11 @@
-
+
分享到日常
-
+
拍同款
@@ -130,7 +130,7 @@ import { myVideo } from '@/api/videos' import { onDeactivated, onMounted, onUnmounted, reactive, watch } from 'vue' import { useRoute, useRouter } from 'vue-router' import { useNav } from '@/utils/hooks/useNav' -import { $no, $notice, _checkImgUrl, _formatNumber } from '@/utils' +import { _checkImgUrl, _formatNumber, _no, _notice } from '@/utils' const route = useRoute() const router = useRouter() @@ -203,7 +203,7 @@ async function loadData(init = false) { if (data.loading) return if (!init) { if (data.total <= data.videos.length) { - return $notice('暂时没有更多了') + _notice('暂时没有更多了') } data.pageNo++ } @@ -376,7 +376,7 @@ function stopPlay() { .options { font-size: 14rem; - width: 100vw; + width: 100%; position: fixed; bottom: 20rem; display: flex; diff --git a/src/pages/home/MusicRankList.vue b/src/pages/home/MusicRankList.vue index e10ae16..320982b 100644 --- a/src/pages/home/MusicRankList.vue +++ b/src/pages/home/MusicRankList.vue @@ -305,7 +305,7 @@ @@ -347,7 +347,7 @@ function dislike() { .sidebar { touch-action: pan-y; - width: 80vw; + width: 80%; height: calc(var(--vh, 1vh) * 100); overflow: auto; background: rgb(22, 22, 22); diff --git a/src/pages/home/slide/Community.vue b/src/pages/home/slide/Community.vue index d450872..9c87e2f 100644 --- a/src/pages/home/slide/Community.vue +++ b/src/pages/home/slide/Community.vue @@ -4,7 +4,7 @@