diff --git a/src/components/Music/index.vue b/src/components/Music/index.vue index 3b23220..1c272a2 100644 --- a/src/components/Music/index.vue +++ b/src/components/Music/index.vue @@ -92,12 +92,10 @@ :songServer="playerData.server" :songType="playerData.type" :songId="playerData.id" + :volume="volumeNum" + :shuffle="true" ref="playerRef" /> -
- - 音乐播放器加载失败 -
@@ -105,7 +103,7 @@ @@ -184,12 +175,10 @@ watch( flex-direction: column; animation: fade; -webkit-animation: fade 0.5s; - .btns { display: flex; align-items: center; margin-bottom: 6px; - span { background: #ffffff26; padding: 2px 8px; @@ -198,20 +187,17 @@ watch( text-overflow: ellipsis; overflow-x: hidden; white-space: nowrap; - &:hover { background: #ffffff4d; } } } - .control { display: flex; flex-direction: row; align-items: center; justify-content: space-evenly; width: 100%; - .state { .i-icon { width: 50px; @@ -219,7 +205,6 @@ watch( display: block; } } - .i-icon { width: 36px; height: 36px; @@ -229,17 +214,14 @@ watch( justify-content: center; border-radius: 6px; transform: scale(1); - &:hover { background: #ffffff33; } - &:active { transform: scale(0.95); } } } - .menu { height: 26px; width: 100%; @@ -248,18 +230,15 @@ watch( flex-direction: column; align-items: center; justify-content: center; - .name { width: 100%; text-align: center; text-overflow: ellipsis; overflow-x: hidden; white-space: nowrap; - // font-size: 1.1rem; animation: fade; -webkit-animation: fade 0.3s; } - .volume { width: 100%; padding: 0 12px; @@ -268,25 +247,20 @@ watch( flex-direction: row; animation: fade; -webkit-animation: fade 0.3s; - .icon { margin-right: 12px; - span { width: 24px; height: 24px; display: block; } } - :deep(*) { transition: none; } - :deep(.el-slider__button) { transition: 0.3s; } - .el-slider { margin-right: 12px; --el-slider-main-bg-color: #efefef; @@ -296,7 +270,6 @@ watch( } } } - .music-list { position: fixed; top: 0; @@ -307,7 +280,6 @@ watch( background-color: #00000080; backdrop-filter: blur(20px); z-index: 1; - .list { position: absolute; display: flex; @@ -320,7 +292,6 @@ watch( background-color: #ffffff66; border-radius: 6px; z-index: 999; - .close { position: absolute; top: 12px; @@ -328,33 +299,22 @@ watch( width: 28px; height: 28px; display: block; - &:hover { transform: scale(1.2); } - &:active { transform: scale(0.95); } } - - .error { - display: flex; - flex-direction: column; - align-items: center; - .i-icon { - margin-bottom: 20px; - } - } } } // 弹窗动画 .fade-enter-active { - animation: fade 0.3s ease-in-out; + animation: fade 0.3s ease-in-out; } .fade-leave-active { - animation: fade 0.3s ease-in-out reverse; + animation: fade 0.3s ease-in-out reverse; } .zoom-enter-active { animation: zoom 0.4s ease-in-out; diff --git a/src/components/Music/test.vue b/src/components/Music/old.vue similarity index 87% rename from src/components/Music/test.vue rename to src/components/Music/old.vue index 31922e6..3b23220 100644 --- a/src/components/Music/test.vue +++ b/src/components/Music/old.vue @@ -92,10 +92,12 @@ :songServer="playerData.server" :songType="playerData.type" :songId="playerData.id" - :volume="volumeNum" - :shuffle="true" ref="playerRef" /> +
+ + 音乐播放器加载失败 +
@@ -103,7 +105,7 @@ @@ -175,10 +184,12 @@ watch( flex-direction: column; animation: fade; -webkit-animation: fade 0.5s; + .btns { display: flex; align-items: center; margin-bottom: 6px; + span { background: #ffffff26; padding: 2px 8px; @@ -187,17 +198,20 @@ watch( text-overflow: ellipsis; overflow-x: hidden; white-space: nowrap; + &:hover { background: #ffffff4d; } } } + .control { display: flex; flex-direction: row; align-items: center; justify-content: space-evenly; width: 100%; + .state { .i-icon { width: 50px; @@ -205,6 +219,7 @@ watch( display: block; } } + .i-icon { width: 36px; height: 36px; @@ -214,14 +229,17 @@ watch( justify-content: center; border-radius: 6px; transform: scale(1); + &:hover { background: #ffffff33; } + &:active { transform: scale(0.95); } } } + .menu { height: 26px; width: 100%; @@ -230,15 +248,18 @@ watch( flex-direction: column; align-items: center; justify-content: center; + .name { width: 100%; text-align: center; text-overflow: ellipsis; overflow-x: hidden; white-space: nowrap; + // font-size: 1.1rem; animation: fade; -webkit-animation: fade 0.3s; } + .volume { width: 100%; padding: 0 12px; @@ -247,20 +268,25 @@ watch( flex-direction: row; animation: fade; -webkit-animation: fade 0.3s; + .icon { margin-right: 12px; + span { width: 24px; height: 24px; display: block; } } + :deep(*) { transition: none; } + :deep(.el-slider__button) { transition: 0.3s; } + .el-slider { margin-right: 12px; --el-slider-main-bg-color: #efefef; @@ -270,6 +296,7 @@ watch( } } } + .music-list { position: fixed; top: 0; @@ -280,6 +307,7 @@ watch( background-color: #00000080; backdrop-filter: blur(20px); z-index: 1; + .list { position: absolute; display: flex; @@ -292,6 +320,7 @@ watch( background-color: #ffffff66; border-radius: 6px; z-index: 999; + .close { position: absolute; top: 12px; @@ -299,22 +328,33 @@ watch( width: 28px; height: 28px; display: block; + &:hover { transform: scale(1.2); } + &:active { transform: scale(0.95); } } + + .error { + display: flex; + flex-direction: column; + align-items: center; + .i-icon { + margin-bottom: 20px; + } + } } } // 弹窗动画 .fade-enter-active { - animation: fade 0.3s ease-in-out; + animation: fade 0.3s ease-in-out; } .fade-leave-active { - animation: fade 0.3s ease-in-out reverse; + animation: fade 0.3s ease-in-out reverse; } .zoom-enter-active { animation: zoom 0.4s ease-in-out; diff --git a/src/components/Player/Beta.vue b/src/components/Player/Beta.vue deleted file mode 100644 index 6bd7ce9..0000000 --- a/src/components/Player/Beta.vue +++ /dev/null @@ -1,306 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/components/Player/index.vue b/src/components/Player/index.vue index 10a0553..6bd7ce9 100644 --- a/src/components/Player/index.vue +++ b/src/components/Player/index.vue @@ -1,11 +1,27 @@ \ No newline at end of file diff --git a/src/views/Func/index.vue b/src/views/Func/index.vue index 695d4d6..3166a89 100644 --- a/src/views/Func/index.vue +++ b/src/views/Func/index.vue @@ -34,7 +34,7 @@