diff --git a/src/components/content/user/Login.vue b/src/components/content/user/Login.vue index 0fc8d87..f042a08 100644 --- a/src/components/content/user/Login.vue +++ b/src/components/content/user/Login.vue @@ -35,7 +35,7 @@

{{pwdMessage}}

- 登陆 + 登陆
注册
@@ -67,6 +67,7 @@ export default { this.$parent.hiddleLogin(); localStorage.setItem('cookie',res.data.cookie); localStorage.setItem('avatar',res.data.profile.avatarUrl); + localStorage.setItem('uid',res.data.profile.userId) // this.$bus.$emit("pullResource", res.data.cookie); } }); @@ -130,9 +131,6 @@ export default { bottom: 0; margin: auto; } -.son img { - width: 100%; -} .from-item { width: 60%; @@ -164,7 +162,7 @@ p { margin-right: 35px; } .phone { - color: var(--light-main-color); + color: var(--main-color); font-size: 64px; } \ No newline at end of file diff --git a/src/layout/Aside.vue b/src/layout/Aside.vue index 9daefd4..facff6d 100644 --- a/src/layout/Aside.vue +++ b/src/layout/Aside.vue @@ -5,23 +5,33 @@ :menu="menuList" vertical item-width="100%" + item-height="50px" :text-color="theme == 'dark' ? 'var(--dark-text-color)' : ''" :active-color="getActiveColor" > -
+

创建的歌单

-
    -
  • -
+ +
    +
  • + +
    {{ item.name }}
    +
  • +
+
@@ -72,16 +119,20 @@ export default { } &-dark { background: var(--dark-aside-bg-color); + color: var(--dark-text-color); } &-green { background: var(--green-aside-bg-color); } } .menu { - height: 420px; + height: 300px; +} +.aside-scroll { + height: calc(100% - 300px -60px); } .my-music-list { - height: calc(100% - 420px); + height: calc(100% - 300px -60px); padding: 10px 0px; .title { font-size: 13px; @@ -90,8 +141,21 @@ export default { list-style-type: none; padding-left: 20px; li { - height: 60px; - border: 1px solid red; + height: 30px; + font-size: 13px; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + cursor: pointer; + display: flex; + align-items: center; + img { + height: 80%; + border-radius: 2px; + } + } + &-name { + padding: 0px 10px; } } } diff --git a/src/network/request.js b/src/network/request.js index 52bb2f5..1878422 100644 --- a/src/network/request.js +++ b/src/network/request.js @@ -12,7 +12,7 @@ export function request(config) { ajaxTimer++; return data; }, err => { - // $store.commit('hiddenLoading'); + $store.commit('hiddenLoading'); return err }); install.interceptors.response.use(data => { diff --git a/src/network/user.js b/src/network/user.js index 01addb0..552f2c5 100644 --- a/src/network/user.js +++ b/src/network/user.js @@ -27,4 +27,12 @@ export function _getSongList(id){ uid:id } }) +} + +export class PlayList{ + constructor(playlist){ + this.name=playlist.name;//为了方便menu使用 + this.id=playlist.id; + this.cover=playlist.coverImgUrl; + } } \ No newline at end of file diff --git a/src/store/index.js b/src/store/index.js index 6f3b54e..8a53757 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -60,7 +60,14 @@ export default new Vuex.Store({ /**获取网络请求状态 */ getRequestType(state){ return state.requestErr; - } + }, + /**获取用户id */ + getUserId(state){ + if(localStorage.getItem('uid')){ + state.uid=localStorage.getItem('uid'); + } + return state.uid + }, }, actions: { }, diff --git a/src/views/artist-list/artist-category.vue b/src/views/artist-list/artist-category.vue index 0756c93..612843d 100644 --- a/src/views/artist-list/artist-category.vue +++ b/src/views/artist-list/artist-category.vue @@ -1,6 +1,6 @@ @@ -77,6 +81,10 @@ export default { this.getNewMv(); this.Personalized(); this.getTopMv(); + this.$Notice.info({ + title:'系统提示:', + desc:'点击更多按钮可查看全部MV哦~' + }) }, methods: { handleAreasClick(index) { @@ -146,7 +154,7 @@ export default { .mv-title { display: flex; align-items: flex-end; - padding: 0px 10px; + padding: 0px 20px; position: relative; h4 { padding: 10px 0px; @@ -164,7 +172,10 @@ a { color: inherit; text-decoration: none; } -h4 { +.mv-h4 { padding: 10px 20px; } +.mv-rank-list { + padding: 0px 20px; +} \ No newline at end of file