diff --git a/src/assets/img/icon/collect-white.svg b/src/assets/img/icon/collect-white.svg deleted file mode 100644 index 8b8d792..0000000 --- a/src/assets/img/icon/collect-white.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/img/icon/collect.svg b/src/assets/img/icon/collect.svg deleted file mode 100644 index f8b511f..0000000 --- a/src/assets/img/icon/collect.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/img/icon/img-loading.png b/src/assets/img/icon/img-loading.png new file mode 100644 index 0000000..8ad97b2 Binary files /dev/null and b/src/assets/img/icon/img-loading.png differ diff --git a/src/assets/img/icon/menu1-white.png b/src/assets/img/icon/menu1-white.png new file mode 100644 index 0000000..80de78d Binary files /dev/null and b/src/assets/img/icon/menu1-white.png differ diff --git a/src/assets/img/icon/menu2-white.png b/src/assets/img/icon/menu2-white.png new file mode 100644 index 0000000..e1a1ab5 Binary files /dev/null and b/src/assets/img/icon/menu2-white.png differ diff --git a/src/assets/img/icon/music-rank-list.webp b/src/assets/img/icon/music-rank-list.webp new file mode 100644 index 0000000..434f980 Binary files /dev/null and b/src/assets/img/icon/music-rank-list.webp differ diff --git a/src/assets/img/icon/newicon/gk0.webp b/src/assets/img/icon/newicon/gk0.webp new file mode 100644 index 0000000..6b0e132 Binary files /dev/null and b/src/assets/img/icon/newicon/gk0.webp differ diff --git a/src/assets/img/icon/newicon/gk1.webp b/src/assets/img/icon/newicon/gk1.webp new file mode 100644 index 0000000..939ba92 Binary files /dev/null and b/src/assets/img/icon/newicon/gk1.webp differ diff --git a/src/assets/img/icon/newicon/gks.webp b/src/assets/img/icon/newicon/gks.webp new file mode 100644 index 0000000..cfb4c2b Binary files /dev/null and b/src/assets/img/icon/newicon/gks.webp differ diff --git a/src/assets/img/icon/newicon/gkt.webp b/src/assets/img/icon/newicon/gkt.webp new file mode 100644 index 0000000..33f6efd Binary files /dev/null and b/src/assets/img/icon/newicon/gkt.webp differ diff --git a/src/assets/img/icon/newicon/gku.webp b/src/assets/img/icon/newicon/gku.webp new file mode 100644 index 0000000..5f8acb5 Binary files /dev/null and b/src/assets/img/icon/newicon/gku.webp differ diff --git a/src/assets/img/icon/newicon/gkv.webp b/src/assets/img/icon/newicon/gkv.webp new file mode 100644 index 0000000..d17274d Binary files /dev/null and b/src/assets/img/icon/newicon/gkv.webp differ diff --git a/src/assets/img/icon/newicon/gkw.webp b/src/assets/img/icon/newicon/gkw.webp new file mode 100644 index 0000000..e87e784 Binary files /dev/null and b/src/assets/img/icon/newicon/gkw.webp differ diff --git a/src/assets/img/icon/newicon/gkx.webp b/src/assets/img/icon/newicon/gkx.webp new file mode 100644 index 0000000..1ae4583 Binary files /dev/null and b/src/assets/img/icon/newicon/gkx.webp differ diff --git a/src/assets/img/icon/newicon/gky.webp b/src/assets/img/icon/newicon/gky.webp new file mode 100644 index 0000000..8f8a133 Binary files /dev/null and b/src/assets/img/icon/newicon/gky.webp differ diff --git a/src/assets/img/icon/newicon/gkz.webp b/src/assets/img/icon/newicon/gkz.webp new file mode 100644 index 0000000..a1fc58d Binary files /dev/null and b/src/assets/img/icon/newicon/gkz.webp differ diff --git a/src/assets/img/icon/pause-white.png b/src/assets/img/icon/pause-white.png new file mode 100644 index 0000000..4aab546 Binary files /dev/null and b/src/assets/img/icon/pause-white.png differ diff --git a/src/assets/img/icon/pause.svg b/src/assets/img/icon/pause.svg deleted file mode 100644 index 6e5e820..0000000 --- a/src/assets/img/icon/pause.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/img/icon/play-white.png b/src/assets/img/icon/play-white.png new file mode 100644 index 0000000..d8b4837 Binary files /dev/null and b/src/assets/img/icon/play-white.png differ diff --git a/src/assets/img/icon/play.svg b/src/assets/img/icon/play.svg deleted file mode 100644 index 8bc1f67..0000000 --- a/src/assets/img/icon/play.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/img/icon/rank1.webp b/src/assets/img/icon/rank1.webp new file mode 100644 index 0000000..f3d8de7 Binary files /dev/null and b/src/assets/img/icon/rank1.webp differ diff --git a/src/assets/img/icon/rank2.webp b/src/assets/img/icon/rank2.webp new file mode 100644 index 0000000..a58cfa8 Binary files /dev/null and b/src/assets/img/icon/rank2.webp differ diff --git a/src/assets/img/icon/rank3.webp b/src/assets/img/icon/rank3.webp new file mode 100644 index 0000000..97ed255 Binary files /dev/null and b/src/assets/img/icon/rank3.webp differ diff --git a/src/assets/img/icon/star-yellow.png b/src/assets/img/icon/star-yellow.png new file mode 100644 index 0000000..e2c496d Binary files /dev/null and b/src/assets/img/icon/star-yellow.png differ diff --git a/src/components/DouyinCode.vue b/src/components/DouyinCode.vue index 4b02d51..12aab1c 100644 --- a/src/components/DouyinCode.vue +++ b/src/components/DouyinCode.vue @@ -14,7 +14,7 @@
- +
diff --git a/src/components/Other.vue b/src/components/Other.vue index a9e9209..b42d5e9 100644 --- a/src/components/Other.vue +++ b/src/components/Other.vue @@ -21,7 +21,7 @@
- + 收藏
diff --git a/src/components/Video.vue b/src/components/Video.vue index 96681f0..6262d49 100644 --- a/src/components/Video.vue +++ b/src/components/Video.vue @@ -8,7 +8,7 @@ :autoplay="isPlay" loop>

您的浏览器不支持 video 标签。

- +
@@ -279,27 +279,7 @@ export default { return globalMethods.$likeNum(v) }, $duration(v) { - if (!v) return - let m = Math.floor(v / 60) - // let s = v % 60 - let s = Math.round(v % 60) - let str = '' - if (m === 0) { - str = '00' - } else if (m > 0 && m < 10) { - str = '0' + m - } else { - str = m - } - str += ':' - if (s === 0) { - str += '00' - } else if (s > 0 && s < 10) { - str += '0' + s - } else { - str += s - } - return str + return globalMethods.$duration(v) }, attention() { let option = this.$refs['attention-option'] diff --git a/src/config/index.js b/src/config/index.js index d8a9f81..930589f 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -1,6 +1,6 @@ export default { - baseUrl: 'http://192.168.0.105/index.php/v1', - filePreview:'http://192.168.0.105/static/uploads/', + baseUrl: 'http://192.168.0.103/index.php/v1', + filePreview:'http://192.168.0.103/static/uploads/', // baseUrl: 'http://192.168.10.164/index.php/v1', // filePreview:'http://192.168.10.164/static/uploads/' // baseUrl: 'http://localhost/index.php/v1', diff --git a/src/pages/home/Music.vue b/src/pages/home/Music.vue index 4794e12..15cc4dd 100644 --- a/src/pages/home/Music.vue +++ b/src/pages/home/Music.vue @@ -28,7 +28,7 @@
>1 人使用
- + 收藏
diff --git a/src/pages/home/MusicRankList.vue b/src/pages/home/MusicRankList.vue index 12f817a..60e9552 100644 --- a/src/pages/home/MusicRankList.vue +++ b/src/pages/home/MusicRankList.vue @@ -19,9 +19,36 @@ name="musicRankList" v-model:active-index="contentIndex"> +
-
- +
+
+ + + +
{{ index + 1 }}
+
+
+ + + +
+
+ {{ item.name }} +
{{ item.author }}
+
+
{{ $duration(item.duration) }}
+
{{ $likeNum(item.use_count) }}人使用
+
+
+
+
+
+ + + +
@@ -43,28 +70,40 @@ export default { contentIndex: 0, hotList: [ { - name: '阳光宅男', + name: '阳光宅男阳光宅男阳光宅男阳光宅男阳光宅男', cover: '', author: '周杰伦', - duration: 60, - hot: 37441000, - is_collect: false + duration: 99, + use_count: 37441000, + is_collect: false, + is_play: false, }, { name: '阳光宅男', cover: '', author: '周杰伦', duration: 60, - hot: 37441000, - is_collect: false + use_count: 37441000, + is_collect: false, + is_play: false, }, { name: '阳光宅男', cover: '', author: '周杰伦', duration: 60, - hot: 37441000, - is_collect: false + use_count: 37441000, + is_collect: false, + is_play: false, + }, + { + name: '阳光宅男', + cover: '', + author: '周杰伦', + duration: 60, + use_count: 37441000, + is_collect: false, + is_play: false, }, ] } @@ -72,7 +111,19 @@ export default { computed: {}, created() { }, - methods: {} + methods: { + toggleCollect(item) { + item.is_collect = !item.is_collect + if (item.is_collect) { + this.$notice('收藏成功') + } else { + this.$notice('取消收藏') + } + }, + togglePlay(item) { + item.is_play = !item.is_play + } + } } @@ -91,6 +142,99 @@ export default { .content { padding-top: 6rem; + + .list { + .item { + padding: 1rem 1.5rem; + display: flex; + justify-content: space-between; + align-items: center; + + .left { + width: 73%; + display: flex; + align-items: center; + + .rank { + width: 1.8rem; + height: 1.8rem; + line-height: 1.8rem; + text-align: center; + margin-right: 1.5rem; + } + + .music { + display: flex; + + .cover-wrapper { + margin-right: 1rem; + position: relative; + display: flex; + align-items: center; + justify-content: center; + + .play { + width: 3rem; + height: 3rem; + position: absolute; + } + + .cover { + border-radius: .2rem; + @width: 6rem; + width: @width; + height: @width; + } + } + + .desc { + display: flex; + flex-direction: column; + justify-content: space-between; + + .name { + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + max-width: 60%; + } + + .author, .bottom { + font-size: 1.2rem; + color: @second-text-color; + } + + .bottom { + display: flex; + + .duration { + margin-right: 1.4rem; + position: relative; + + &:after { + content: ''; + position: absolute; + width: 1.5px; + height: 1.5px; + background: white; + right: -7px; + top: 7px; + } + } + } + } + } + } + + .right { + img { + width: 2rem; + height: 2rem; + margin-left: 2rem; + } + } + } + } } } diff --git a/src/pages/me/VideoDetail.vue b/src/pages/me/VideoDetail.vue index 0a347ab..833a75d 100644 --- a/src/pages/me/VideoDetail.vue +++ b/src/pages/me/VideoDetail.vue @@ -23,7 +23,7 @@
- + 3030浏览
diff --git a/src/pages/me/我的动态.vue b/src/pages/me/我的动态.vue index fce51e6..a46f305 100644 --- a/src/pages/me/我的动态.vue +++ b/src/pages/me/我的动态.vue @@ -23,7 +23,7 @@
吴三二 - 光年之外 - +
diff --git a/src/pages/message/components/ChatMessage.vue b/src/pages/message/components/ChatMessage.vue index b9d012a..7cc547f 100644 --- a/src/pages/message/components/ChatMessage.vue +++ b/src/pages/message/components/ChatMessage.vue @@ -17,7 +17,7 @@ v-if="message.type === MESSAGE_TYPE.DOUYIN_VIDEO">
{{ message.data.title }}
- +
{{ message.data.author.name }} @@ -27,7 +27,7 @@
- +
0 && m < 10) { + str = '0' + m + } else { + str = m + } + str += ':' + if (s === 0) { + str += '00' + } else if (s > 0 && s < 10) { + str += '0' + s + } else { + str += s + } + return str + }, } \ No newline at end of file