diff --git a/src/assets/css/fakeqqmusic.css b/src/assets/css/fakeqqmusic.css
index 2592301a20b40f888c09749c2e6002134499bc18..ed49f38bfecbe9a316c5212151c0a404bf8c735b 100644
--- a/src/assets/css/fakeqqmusic.css
+++ b/src/assets/css/fakeqqmusic.css
@@ -7,6 +7,11 @@
background-color: #31c27c;
color: #fff;
}
+.mod_btn_green:hover {
+ background-color: #2caf6f;
+ border-color: #2caf6f;
+ color: #fff;
+}
.mod_btn,
.mod_btn_green {
border-radius: 2px;
@@ -1095,3 +1100,41 @@ img .playlist__pic {
*width: 100%;
margin: 20px 30px 4px;
}
+
+/*
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ * pop detail */
+.popup_data_detail {
+ position: absolute;
+ top: 364px;
+ right: 303px;
+ width: 580px;
+ background: #fff;
+ box-shadow: 0 0 4px rgba(0, 0, 0, 0.35);
+ border-radius: 4px;
+ border: 1px solid #ddd;
+ z-index: 99;
+}
+.popup_data_detail__cont {
+ max-height: 400px;
+ font-size: 14px;
+ line-height: 22px;
+ margin: 30px 5px 30px 10px;
+ overflow-y: auto;
+}
+.popup_data_detail__cont p,
+.popup_data_detail__tit {
+ margin: 0 24px 0 19px;
+}
+.popup_data_detail__tit {
+ line-height: 22px;
+ font-size: 20px;
+ font-weight: 400;
+ padding: 0 0 20px;
+}
diff --git a/src/views/musicLibrary/Ranking.vue b/src/views/musicLibrary/Ranking.vue
index bb8a1ebdeb41273b6c45a6c981d1438de654ef95..c25d242b6e55278b6bda4432cc14da236dc01415 100644
--- a/src/views/musicLibrary/Ranking.vue
+++ b/src/views/musicLibrary/Ranking.vue
@@ -148,7 +148,13 @@
{{ song.rankingChange == -9999 ? "" : song.rankingChange }}
+ >{{
+ song.rankingChange > 0
+ ? song.rankingChange
+ : song.rankingChange == -9999
+ ? ""
+ : song.rankingChange * -1
+ }}
@@ -224,7 +230,7 @@ export default {
specialRankingtype: [
{ name: "古典榜", dataId: "71384707" },
{ name: "说唱榜", dataId: "99131959" },
- { name: "电子榜", dataId: "187894795" },
+ { name: "电子榜", dataId: "1978921795" },
{ name: "ACG榜", dataId: "71385702" },
{ name: "乡村榜", dataId: "3112516681" },
{ name: "摇滚榜", dataId: "5059633707" },
diff --git a/src/views/musicLibrary/SongerDetail.vue b/src/views/musicLibrary/SongerDetail.vue
index 0c61737621f8423182371bb3585094bffca8d191..bd52d86e34c4bbed95b220e77768f84f9de79a0e 100644
--- a/src/views/musicLibrary/SongerDetail.vue
+++ b/src/views/musicLibrary/SongerDetail.vue
@@ -33,7 +33,9 @@
{{ songer.desc }}
- [更多]
+ [更多]
@@ -69,9 +71,6 @@
播放歌手热门歌曲
-
- 关注 1.7万
-
@@ -136,7 +135,7 @@
-
+
专辑
@@ -158,15 +157,21 @@
:src="album.img"
:alt="album.name"
/>
-
+
{{ album.publishTime }}
-
+
-
+
相似歌手
@@ -231,8 +236,9 @@
@@ -252,6 +261,25 @@
+
+
@@ -264,6 +292,7 @@ import {
getSimiSongers,
getSongerAlbums,
getSongerMvs,
+ getAlbum,
} from "api";
import {
createSonger,
@@ -278,19 +307,18 @@ import {
export default {
data() {
return {
- activeName: "first",
+ moreInfo: false,
id: null,
songer: {},
- simiSongers: null,
+ simiSongers: [],
hotSongs: [],
songs: [],
- albums: null,
- mvs: null,
+ albums: [],
+ mvs: [],
};
},
created() {
this.id = this.$route.query.id;
- this.accountId = this.$route.query.accountId;
this.init();
},
methods: {
@@ -322,6 +350,7 @@ export default {
// Get songer album
const res4 = await getSongerAlbums({ id: this.id, limit: 5, offset: 0 });
+ console.log(res4);
this.albums = res4.data.hotAlbums.map(
({ id, name, publishTime, artists, picUrl }) => {
return createAlbum({
@@ -333,7 +362,6 @@ export default {
});
}
);
- console.log(this.albums);
// Get songer mv
const res5 = await getSongerMvs(this.id);
@@ -350,11 +378,40 @@ export default {
}
);
this.mvs = mvs.length > 5 ? mvs.slice(0, 5) : mvs;
- console.log(this.mvs);
},
playHotSongs() {
playSonglist(this.hotSongs);
},
+ toggleShowMoreInfo() {
+ this.moreInfo = !this.moreInfo;
+ },
+ playAlbum(id) {
+ getAlbum(id).then((res) => {
+ let songs = res.data.songs.map(
+ ({ id, name, ar, dt, al, mv, publishTime }) => {
+ return createSong({
+ id,
+ name,
+ artists: ar,
+ duration: dt,
+ albumName: al.name,
+ mvId: mv,
+ img: al.picUrl,
+ });
+ }
+ );
+ playSonglist(songs);
+ });
+ },
+ gotoAlbumDetail(id) {
+ this.$router.push({
+ path: "/musicLibrary/albumDetail",
+ query: { id: id },
+ });
+ },
+ gotoSongerDetail(query) {
+ this.$router.push({ path: "/musicLibrary/songerDetail", query: query });
+ },
},
components: {
ModListMenu,
@@ -526,4 +583,9 @@ ul {
.mod_mv {
height: 183px;
}
+
+.popup_data_detail {
+ top: 128px;
+ right: 85px;
+}
diff --git a/src/views/musicLibrary/Songers.vue b/src/views/musicLibrary/Songers.vue
index 881eab999774326272323692d7cb8bf39614e334..2d468f73d3ffceb82b70fafc8a7f526f22603add 100644
--- a/src/views/musicLibrary/Songers.vue
+++ b/src/views/musicLibrary/Songers.vue
@@ -29,9 +29,7 @@
href="javascript:;"
class="singer_list_txt__link js_singer"
:title="item.name"
- @click="
- gotoSongerDetail({ id: item.id, accountId: item.accountId })
- "
+ @click="gotoSongerDetail({ id: item.id })"
>{{ item.name }}