diff --git a/src/api/base.js b/src/api/base.js
index 9597259972edc494dbd87241fabf0a812d9b4ee2..12a73367d1bc700c1c13f15ba5bb1d7b4847a692 100644
--- a/src/api/base.js
+++ b/src/api/base.js
@@ -1,7 +1,7 @@
import axios from "axios";
-//const BASIC_URL = "http://zacharyzlj.cn:3000/";
-const BASIC_URL = "http://192.168.31.152:3000/";
+const BASIC_URL = "http://zacharyzlj.cn:3000/";
+//const BASIC_URL = "http://192.168.31.152:3000/";
function createBaseInstance() {
const instance = axios.create({ baseURL: BASIC_URL, withCredentials: true });
diff --git a/src/api/playlist.js b/src/api/playlist.js
index 32dedaf691d9b93df8927acce15e5aa1a79b1375..c47b82d83f94dad03cb608a186460b2e7ab0cc20 100644
--- a/src/api/playlist.js
+++ b/src/api/playlist.js
@@ -24,3 +24,9 @@ export const getCatList = () => requset.get("/playlist/catlist");
/* 登陆后使用 */
export const getUserPlaylists = id => requset.get(`/user/playlist?uid=${id}`);
+
+/* 收藏/取消收藏歌单
+ * 登陆后使用
+ * t : 类型,1:收藏,2:取消收藏 id : 歌单 id */
+export const toggleLikePlaylist = params =>
+ requset.get("/playlist/subscribe", { params: params });
diff --git a/src/assets/css/fakeqqmusic.scss b/src/assets/css/fakeqqmusic.scss
index a2bef0af34c7e12f2f8b7f3f45af6de37942ae82..3210ce240914d60a7a3dfe72c1310b4537bd2ac1 100644
--- a/src/assets/css/fakeqqmusic.scss
+++ b/src/assets/css/fakeqqmusic.scss
@@ -118,6 +118,10 @@ $black: #000;
background-position: -40px -100px;
vertical-align: -2px;
}
+.mod_btn__icon_like--like,
+.mod_btn_green__icon_like--like {
+ background-position: 0 -80px;
+}
.mod_btn__icon_add,
.mod_btn__icon_batch,
.mod_btn__icon_comment,
@@ -1304,6 +1308,14 @@ img .playlist__pic {
background-position: 0 -150px;
margin: 0 auto 16px;
}
+.popup_tips__icon_warn {
+ display: block;
+ width: 46px;
+ height: 46px;
+ margin: 0 auto 16px;
+ background-position: 0 -220px;
+ background-image: url(../img/icon_popup.png);
+}
.popup_tips__tit {
font-size: 14px;
color: $white;
diff --git a/src/components/common/BlackTip.vue b/src/components/common/BlackTip.vue
index da4972b01e71be424d9c713c8f7e4d19e3879eae..0f8ed83f3049a41d4e8e30bcf76db988a1cfc33f 100644
--- a/src/components/common/BlackTip.vue
+++ b/src/components/common/BlackTip.vue
@@ -5,7 +5,7 @@
style="z-index: 2147483647; left: 646px; top: 326px"
:style="{ display: ifShow ? '' : 'none' }"
>
-
+
@@ -20,6 +20,22 @@ export default {
type: String,
default: "",
},
+ // 0: tip, 1: warn
+ iconType: { default: 0 },
+ },
+ methods: {
+ processIcon() {
+ switch (this.iconType) {
+ case 0:
+ return "popup_tips__icon";
+ break;
+ case 1:
+ return "popup_tips__icon_warn";
+ break;
+ default:
+ return "";
+ }
+ },
},
};
diff --git a/src/components/common/DetailInfoCard.vue b/src/components/common/DetailInfoCard.vue
index 155ba5b603ee55c5e261701294d8517c4d929a17..55f41cd5becbb26c29f5cfe2ad66b167c7a4313c 100644
--- a/src/components/common/DetailInfoCard.vue
+++ b/src/components/common/DetailInfoCard.vue
@@ -35,7 +35,7 @@
{{ obj.desc }}
- [更多]
+ [更多]
@@ -110,7 +110,11 @@
{{ cardType == "song" ? "播放" : "播放全部" }}
- 收藏
+ 收藏
更多
diff --git a/src/components/common/HomeTop.vue b/src/components/common/HomeTop.vue
index 639d8a31ba87f642500f71bcc00b36f3616cc743..b3795d288bab73ef75c2ea25cdde3e2700c6722f 100644
--- a/src/components/common/HomeTop.vue
+++ b/src/components/common/HomeTop.vue
@@ -79,7 +79,6 @@ export default {
let trackIds = res.data.playlist.trackIds.map(({ id }) => id);
getSongDetail(trackIds).then((res) => {
let songs = createSongs(res.data.songs);
- console.log(songs);
this.toplists.push(songs);
});
});
diff --git a/src/views/musicLibrary/MvDetail.vue b/src/views/musicLibrary/MvDetail.vue
index a49279db6d74a274c215eba205df5ce43755382a..cc24e6a63b208cc80c08203f9883eba1803f711e 100644
--- a/src/views/musicLibrary/MvDetail.vue
+++ b/src/views/musicLibrary/MvDetail.vue
@@ -81,7 +81,7 @@ export default {
this.id = this.$route.query.id;
getMvDetail(this.id).then((res) => {
this.mv = createMv(res.data.data);
- console.log(this.mv);
+ //console.log(this.mv);
});
this.updateMv();
this.getComment();
diff --git a/src/views/musicLibrary/NewDisc.vue b/src/views/musicLibrary/NewDisc.vue
index 7dcc5ed3e2d7b5e2a63eef4538d01ef6dfc3314e..91ba9ab5b059e45f8dbc04ae6139045e93301e05 100644
--- a/src/views/musicLibrary/NewDisc.vue
+++ b/src/views/musicLibrary/NewDisc.vue
@@ -147,7 +147,6 @@ export default {
);
}
}
- console.log(this.currentAlbums);
},
selectArea(n) {
this.updateAlbum();
diff --git a/src/views/musicLibrary/PlaylistDetail.vue b/src/views/musicLibrary/PlaylistDetail.vue
index b9b8c85917628ec08c97193c991942ece4e0881c..1805fad30715d4c98c231a4c91c21c8383661a36 100644
--- a/src/views/musicLibrary/PlaylistDetail.vue
+++ b/src/views/musicLibrary/PlaylistDetail.vue
@@ -52,17 +52,20 @@
+
diff --git a/src/views/musicLibrary/SongDetail.vue b/src/views/musicLibrary/SongDetail.vue
index 5a78e008dfad22ee154d3b0106e6d44b48b7f840..acfd3d4ec3ab8c4f60eee4f3ebe66aed651172cf 100644
--- a/src/views/musicLibrary/SongDetail.vue
+++ b/src/views/musicLibrary/SongDetail.vue
@@ -159,7 +159,7 @@ export default {
// 获取歌曲信息
getSongDetail(this.songId).then((res) => {
let d = res.data.songs[0];
- //console.log(d);
+ //console.log(res);
this.song = createSong({
id: d.id,
name: d.name,
diff --git a/src/views/musicLibrary/SongerDetail.vue b/src/views/musicLibrary/SongerDetail.vue
index 94c3cbba440e4dfddacc537bcb1cb5fc5769f4a4..a98686baf523d612b4dca531bdc058818ba8c34c 100644
--- a/src/views/musicLibrary/SongerDetail.vue
+++ b/src/views/musicLibrary/SongerDetail.vue
@@ -228,9 +228,7 @@ export default {
// Get songer album
const res4 = await getSongerAlbums({ id: this.id, limit: 5, offset: 0 });
- console.log(res4);
this.albums = createAlbums(res4.data.hotAlbums);
- console.log(this.albums);
// Get songer mv
const res5 = await getSongerMvs(this.id);
diff --git a/src/views/musicLibrary/Songers.vue b/src/views/musicLibrary/Songers.vue
index e6e32b79d822857c5837c2891b99d8fd67de0e3b..abb6b97700b31c94da07520978af464e169c42a1 100644
--- a/src/views/musicLibrary/Songers.vue
+++ b/src/views/musicLibrary/Songers.vue
@@ -68,7 +68,6 @@ export default {
updateArtists() {
getSongers(this.initial, this.type, this.area, this.page)
.then((res) => {
- console.log(res);
this.artists = res.data.artists;
this.more = res.data.more;
this.loading = false;