From ee9bbf0687ec2aee29411be7338a98515a7aded4 Mon Sep 17 00:00:00 2001 From: imsyy Date: Fri, 15 Dec 2023 17:31:55 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8C=88=20style:=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=A0=B7=E5=BC=8F=E6=98=BE=E7=A4=BA=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Global/Menu.vue | 14 ------------ src/components/Global/Provider.vue | 35 +++++++++++++++++------------ src/components/List/SongList.vue | 36 ++++++++++++++++++++++++++++++ src/router/routes.js | 19 +--------------- src/views/Discover/artists.vue | 15 ++++++++----- src/views/Videos/index.vue | 3 --- src/views/Videos/list.vue | 3 --- src/views/{Videos => }/player.vue | 0 8 files changed, 68 insertions(+), 57 deletions(-) delete mode 100644 src/views/Videos/index.vue delete mode 100644 src/views/Videos/list.vue rename src/views/{Videos => }/player.vue (100%) diff --git a/src/components/Global/Menu.vue b/src/components/Global/Menu.vue index fdeb8b0a..0e415dd2 100644 --- a/src/components/Global/Menu.vue +++ b/src/components/Global/Menu.vue @@ -148,20 +148,6 @@ const menuOptions = computed(() => [ key: "record", icon: renderIcon("record"), }, - { - label: () => - h( - RouterLink, - { - to: { - name: "videos", - }, - }, - () => ["视频"], - ), - key: "videos", - icon: renderIcon("video"), - }, { key: "divider-1", type: "divider", diff --git a/src/components/Global/Provider.vue b/src/components/Global/Provider.vue index 4e40646a..d6513822 100644 --- a/src/components/Global/Provider.vue +++ b/src/components/Global/Provider.vue @@ -87,20 +87,27 @@ const changeThemeColor = (val, isCover = false) => { themeOverrides.value = { common: isCover && Object.keys(val)?.length - ? { - primaryColor, - primaryColorHover, - primaryColorPressed, - primaryColorSuppl, - textColor1: `rgba(${mainColorData.bg}, 0.9)`, - textColor2: `rgba(${mainColorData.bg}, 0.82)`, - textColor3: `rgba(${mainColorData.bg}, 0.52)`, - bodyColor: `rgb(${val.dark.mainBg})`, - cardColor: `rgb(${coverAutobgCover})`, - tagColor: `rgb(${coverAutobgCover})`, - modalColor: `rgb(${coverAutobgCover})`, - popoverColor: `rgb(${coverAutobgCover})`, - } + ? themeType.value === "dark" + ? { + primaryColor, + primaryColorHover, + primaryColorPressed, + primaryColorSuppl, + textColor1: `rgba(${mainColorData.bg}, 0.9)`, + textColor2: `rgba(${mainColorData.bg}, 0.82)`, + textColor3: `rgba(${mainColorData.bg}, 0.52)`, + bodyColor: `rgb(${val.dark.mainBg})`, + cardColor: `rgb(${coverAutobgCover})`, + tagColor: `rgb(${coverAutobgCover})`, + modalColor: `rgb(${coverAutobgCover})`, + popoverColor: `rgb(${coverAutobgCover})`, + } + : { + primaryColor, + primaryColorHover, + primaryColorPressed, + primaryColorSuppl, + } : mainColorData, Icon: { color: isCover ? primaryColor : null }, }; diff --git a/src/components/List/SongList.vue b/src/components/List/SongList.vue index dd0a7d18..6acf673b 100644 --- a/src/components/List/SongList.vue +++ b/src/components/List/SongList.vue @@ -139,6 +139,25 @@ 未知专辑 + +
+ + + + +
{{ item.duration }} -- @@ -483,6 +502,23 @@ onBeforeUnmount(() => { color: var(--main-color); } } + .action { + width: 40px; + display: flex; + align-items: center; + justify-content: space-evenly; + .favorite { + padding-top: 1px; + transition: transform 0.3s; + cursor: pointer; + &:hover { + transform: scale(1.15); + } + &:active { + transform: scale(1); + } + } + } .duration { width: 40px; text-align: center; diff --git a/src/router/routes.js b/src/router/routes.js index 477e2f56..5c8a8ab5 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -80,23 +80,6 @@ const routes = [ }, ], }, - // 视频 - { - path: "/videos", - name: "videos", - meta: { - title: "视频", - }, - component: () => import("@/views/Videos/index.vue"), - redirect: "/videos/list", - children: [ - { - path: "list", - name: "video-list", - component: () => import("@/views/Videos/list.vue"), - }, - ], - }, // 视频播放 { path: "/videos-player", @@ -104,7 +87,7 @@ const routes = [ meta: { title: "视频播放器", }, - component: () => import("@/views/Videos/player.vue"), + component: () => import("@/views/player.vue"), }, // 评论 { diff --git a/src/views/Discover/artists.vue b/src/views/Discover/artists.vue index 0692fbb9..b0dbdb6a 100644 --- a/src/views/Discover/artists.vue +++ b/src/views/Discover/artists.vue @@ -8,8 +8,7 @@ v-for="item in artistInitials" :key="item" :bordered="false" - :type="item.key == artistInitialChoose ? 'primary' : 'default'" - class="tag" + :class="['tag', { choose: item.key == artistInitialChoose }]" round @click="artistInitialChange(item.key)" > @@ -21,10 +20,12 @@ @@ -199,6 +200,10 @@ onMounted(() => { &:active { transform: scale(0.95); } + &.choose { + background-color: var(--main-second-color); + color: var(--main-color); + } } .category { margin-top: 18px; diff --git a/src/views/Videos/index.vue b/src/views/Videos/index.vue deleted file mode 100644 index 090ab25d..00000000 --- a/src/views/Videos/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/src/views/Videos/list.vue b/src/views/Videos/list.vue deleted file mode 100644 index c121c6e8..00000000 --- a/src/views/Videos/list.vue +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/src/views/Videos/player.vue b/src/views/player.vue similarity index 100% rename from src/views/Videos/player.vue rename to src/views/player.vue