diff --git a/package-lock.json b/package-lock.json index 59c7973..f46f5a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,7 @@ "@dcloudio/uni-mp-xhs": "3.0.0-4070620250821001", "@dcloudio/uni-quickapp-webview": "3.0.0-4070620250821001", "pinia": "^3.0.3", - "sass": "^1.93.2", + "sass": "^1.77.4", "vue": "^3.5.22", "vue-i18n": "^9.1.9" }, @@ -4091,302 +4091,6 @@ "node": ">= 8" } }, - "node_modules/@parcel/watcher": { - "version": "2.5.1", - "resolved": "https://registry.npmmirror.com/@parcel/watcher/-/watcher-2.5.1.tgz", - "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==", - "hasInstallScript": true, - "license": "MIT", - "optional": true, - "dependencies": { - "detect-libc": "^1.0.3", - "is-glob": "^4.0.3", - "micromatch": "^4.0.5", - "node-addon-api": "^7.0.0" - }, - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - }, - "optionalDependencies": { - "@parcel/watcher-android-arm64": "2.5.1", - "@parcel/watcher-darwin-arm64": "2.5.1", - "@parcel/watcher-darwin-x64": "2.5.1", - "@parcel/watcher-freebsd-x64": "2.5.1", - "@parcel/watcher-linux-arm-glibc": "2.5.1", - "@parcel/watcher-linux-arm-musl": "2.5.1", - "@parcel/watcher-linux-arm64-glibc": "2.5.1", - "@parcel/watcher-linux-arm64-musl": "2.5.1", - "@parcel/watcher-linux-x64-glibc": "2.5.1", - "@parcel/watcher-linux-x64-musl": "2.5.1", - "@parcel/watcher-win32-arm64": "2.5.1", - "@parcel/watcher-win32-ia32": "2.5.1", - "@parcel/watcher-win32-x64": "2.5.1" - } - }, - "node_modules/@parcel/watcher-android-arm64": { - "version": "2.5.1", - "resolved": "https://registry.npmmirror.com/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz", - "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-darwin-arm64": { - "version": "2.5.1", - "resolved": "https://registry.npmmirror.com/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz", - "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-darwin-x64": { - "version": "2.5.1", - "resolved": "https://registry.npmmirror.com/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz", - "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-freebsd-x64": { - "version": "2.5.1", - "resolved": "https://registry.npmmirror.com/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz", - "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-linux-arm-glibc": { - "version": "2.5.1", - "resolved": "https://registry.npmmirror.com/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz", - "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==", - "cpu": [ - "arm" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-linux-arm-musl": { - "version": "2.5.1", - "resolved": "https://registry.npmmirror.com/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz", - "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==", - "cpu": [ - "arm" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-linux-arm64-glibc": { - "version": "2.5.1", - "resolved": "https://registry.npmmirror.com/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz", - "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-linux-arm64-musl": { - "version": "2.5.1", - "resolved": "https://registry.npmmirror.com/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz", - "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-linux-x64-glibc": { - "version": "2.5.1", - "resolved": "https://registry.npmmirror.com/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz", - "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-linux-x64-musl": { - "version": "2.5.1", - "resolved": "https://registry.npmmirror.com/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz", - "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-win32-arm64": { - "version": "2.5.1", - "resolved": "https://registry.npmmirror.com/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz", - "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-win32-ia32": { - "version": "2.5.1", - "resolved": "https://registry.npmmirror.com/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz", - "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==", - "cpu": [ - "ia32" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-win32-x64": { - "version": "2.5.1", - "resolved": "https://registry.npmmirror.com/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz", - "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, "node_modules/@rollup/pluginutils": { "version": "5.3.0", "resolved": "https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-5.3.0.tgz", @@ -6472,19 +6176,6 @@ "npm": "1.2.8000 || >= 1.4.16" } }, - "node_modules/detect-libc": { - "version": "1.0.3", - "resolved": "https://registry.npmmirror.com/detect-libc/-/detect-libc-1.0.3.tgz", - "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==", - "license": "Apache-2.0", - "optional": true, - "bin": { - "detect-libc": "bin/detect-libc.js" - }, - "engines": { - "node": ">=0.10" - } - }, "node_modules/detect-newline": { "version": "3.1.0", "resolved": "https://registry.npmmirror.com/detect-newline/-/detect-newline-3.1.0.tgz", @@ -7528,9 +7219,9 @@ "license": "BSD-3-Clause" }, "node_modules/immutable": { - "version": "5.1.4", - "resolved": "https://registry.npmmirror.com/immutable/-/immutable-5.1.4.tgz", - "integrity": "sha512-p6u1bG3YSnINT5RQmx/yRZBpenIl30kVxkTLDyHLIMk0gict704Q9n+thfDI7lTRm9vXdDYutVzXhzcThxTnXA==", + "version": "4.3.7", + "resolved": "https://registry.npmmirror.com/immutable/-/immutable-4.3.7.tgz", + "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==", "license": "MIT" }, "node_modules/import-local": { @@ -9206,13 +8897,6 @@ "node": ">= 0.6" } }, - "node_modules/node-addon-api": { - "version": "7.1.1", - "resolved": "https://registry.npmmirror.com/node-addon-api/-/node-addon-api-7.1.1.tgz", - "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==", - "license": "MIT", - "optional": true - }, "node_modules/node-int64": { "version": "0.4.0", "resolved": "https://registry.npmmirror.com/node-int64/-/node-int64-0.4.0.tgz", @@ -10357,13 +10041,13 @@ "license": "MIT" }, "node_modules/sass": { - "version": "1.93.2", - "resolved": "https://registry.npmmirror.com/sass/-/sass-1.93.2.tgz", - "integrity": "sha512-t+YPtOQHpGW1QWsh1CHQ5cPIr9lbbGZLZnbihP/D/qZj/yuV68m8qarcV17nvkOX81BCrvzAlq2klCQFZghyTg==", + "version": "1.77.4", + "resolved": "https://registry.npmmirror.com/sass/-/sass-1.77.4.tgz", + "integrity": "sha512-vcF3Ckow6g939GMA4PeU7b2K/9FALXk2KF9J87txdHzXbUF9XRQRwSxcAs/fGaTnJeBFd7UoV22j3lzMLdM0Pw==", "license": "MIT", "dependencies": { - "chokidar": "^4.0.0", - "immutable": "^5.0.2", + "chokidar": ">=3.0.0 <4.0.0", + "immutable": "^4.0.0", "source-map-js": ">=0.6.2 <2.0.0" }, "bin": { @@ -10371,37 +10055,6 @@ }, "engines": { "node": ">=14.0.0" - }, - "optionalDependencies": { - "@parcel/watcher": "^2.4.1" - } - }, - "node_modules/sass/node_modules/chokidar": { - "version": "4.0.3", - "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-4.0.3.tgz", - "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", - "license": "MIT", - "dependencies": { - "readdirp": "^4.0.1" - }, - "engines": { - "node": ">= 14.16.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/sass/node_modules/readdirp": { - "version": "4.1.2", - "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-4.1.2.tgz", - "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==", - "license": "MIT", - "engines": { - "node": ">= 14.18.0" - }, - "funding": { - "type": "individual", - "url": "https://paulmillr.com/funding/" } }, "node_modules/sax": { diff --git a/package.json b/package.json index d3a9547..2c4f1f0 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "@dcloudio/uni-mp-xhs": "3.0.0-4070620250821001", "@dcloudio/uni-quickapp-webview": "3.0.0-4070620250821001", "pinia": "^3.0.3", - "sass": "^1.93.2", + "sass": "^1.77.4", "vue": "^3.5.22", "vue-i18n": "^9.1.9" }, diff --git a/src/App.vue b/src/App.vue index 3908903..0c61c93 100644 --- a/src/App.vue +++ b/src/App.vue @@ -16,6 +16,7 @@ body, uni-page-body { margin: 0; padding: 0; + font-family: 'PingFangSC'; } /* #ifdef H5 */ diff --git a/src/pages/components/comments/comments.vue b/src/pages/components/comments/comments.vue index 440db56..4b59073 100644 --- a/src/pages/components/comments/comments.vue +++ b/src/pages/components/comments/comments.vue @@ -188,7 +188,6 @@ const totalCommentCount = computed(() => .commentcount { width: fit-content; height: 100%; - font-family: PingFangSC; font-size: 14px; font-weight: 500; font-stretch: normal; @@ -197,6 +196,8 @@ const totalCommentCount = computed(() => letter-spacing: normal; text-align: left; color: #333; + display: flex; + align-items: center; } .headswitch { @@ -220,7 +221,6 @@ const totalCommentCount = computed(() => display: flex; align-items: center; justify-content: center; - font-family: PingFangSC; font-weight: normal; font-stretch: normal; font-style: normal; @@ -273,7 +273,7 @@ const totalCommentCount = computed(() => .commentusername { width: fit-content; height: 18px; - font-family: PingFangSC; + font-family: 'SFPro'; font-size: 13px; font-weight: normal; font-stretch: normal; @@ -285,7 +285,6 @@ const totalCommentCount = computed(() => } .commentusercontent { - font-family: PingFangSC; font-size: 13px; font-weight: normal; font-stretch: normal; @@ -334,7 +333,6 @@ const totalCommentCount = computed(() => .commentlikecount { min-width: 40px; height: 17px; - font-family: PingFangSC; font-size: 12px; font-weight: normal; font-stretch: normal; @@ -388,7 +386,6 @@ const totalCommentCount = computed(() => .expandcommenttext { flex: 1; - font-family: PingFangSC; font-size: 12px; font-weight: normal; font-stretch: normal; @@ -433,7 +430,6 @@ const totalCommentCount = computed(() => .edittext { flex: 1; flex-grow: 0; - font-family: PingFangSC; font-size: 14px; font-weight: normal; font-stretch: normal; @@ -467,8 +463,8 @@ const totalCommentCount = computed(() => .collectioncount, .likecount { height: 17px; - font-family: SFPro; - font-size: 17px; + font-family: 'SFPro'; + font-size: 14px; font-weight: 500; font-stretch: normal; font-style: normal; diff --git a/src/pages/components/findmore/findmore.vue b/src/pages/components/findmore/findmore.vue index f81bfd9..5a2ecf2 100644 --- a/src/pages/components/findmore/findmore.vue +++ b/src/pages/components/findmore/findmore.vue @@ -28,7 +28,6 @@ const common = useCommonStore() .openapptext { width: 96px; height: 22px; - font-family: PingFangSC; font-size: 16px; font-weight: 600; font-stretch: normal; diff --git a/src/pages/components/head/head.vue b/src/pages/components/head/head.vue index 4f546e6..9be10b3 100644 --- a/src/pages/components/head/head.vue +++ b/src/pages/components/head/head.vue @@ -44,7 +44,6 @@ const common = useCommonStore() border-radius: 29px; background-image: linear-gradient(156deg, #7c45ed -1%, #7c68ef 19%, #7bd8f8 97%); color: #fff; - font-family: PingFangSC; font-size: 14px; display: flex; align-items: center; diff --git a/src/pages/components/news/news.vue b/src/pages/components/news/news.vue index fae1faa..198395b 100644 --- a/src/pages/components/news/news.vue +++ b/src/pages/components/news/news.vue @@ -265,7 +265,6 @@ swiper-item { } .title { - font-family: PingFangSC; font-size: 20px; font-weight: 600; font-stretch: normal; @@ -283,7 +282,6 @@ swiper-item { } .copywriting { - font-family: PingFangSC; font-size: 14px; font-weight: normal; font-stretch: normal; @@ -301,7 +299,6 @@ swiper-item { .source, .date-text { - font-family: PingFangSC; font-size: 13px; font-weight: normal; font-stretch: normal; @@ -330,7 +327,6 @@ swiper-item { } .toseealltext { - font-family: PingFangSC; font-size: 13px; font-weight: 500; font-stretch: normal; diff --git a/src/pages/components/postpage/postpage.vue b/src/pages/components/postpage/postpage.vue index 00e5655..84ef5eb 100644 --- a/src/pages/components/postpage/postpage.vue +++ b/src/pages/components/postpage/postpage.vue @@ -208,7 +208,6 @@ page, .username { flex: 1; - font-family: PingFangSC; font-size: 17px; font-weight: 600; color: #333 @@ -221,7 +220,6 @@ page, font-size: 14px; font-weight: 600; line-height: 32px; - font-family: PingFangSC; border-radius: 8px; background-color: rgba(51, 51, 51, .05); display: flex; @@ -297,7 +295,6 @@ swiper-item { } .copywriting { - font-family: PingFangSC; font-size: 15px; font-weight: normal; font-stretch: normal; diff --git a/src/pages/components/videopage/videopage.vue b/src/pages/components/videopage/videopage.vue index ef36646..4ef509e 100644 --- a/src/pages/components/videopage/videopage.vue +++ b/src/pages/components/videopage/videopage.vue @@ -360,7 +360,6 @@ const toggleMute = () => { } .username { - font-family: PingFangSC; font-size: 17px; font-weight: 600; font-stretch: normal; @@ -376,7 +375,6 @@ const toggleMute = () => { } .datetime { - font-family: PingFangSC; font-size: 11px; font-weight: normal; font-stretch: normal; @@ -392,7 +390,6 @@ const toggleMute = () => { } .content { - font-family: PingFangSC; font-size: 13px; font-weight: normal; font-stretch: normal; diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 787e1ea..a21ae0d 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -61,7 +61,6 @@ page, border-radius: 29px; background-image: linear-gradient(156deg, #7c45ed -1%, #7c68ef 19%, #7bd8f8 97%); color: #fff; - font-family: PingFangSC; font-size: 14px; display: inline-block; text-align: center;