diff --git a/src/assets/data/resource.js b/src/assets/data/resource.js index 8260f6d..717a9ee 100644 --- a/src/assets/data/resource.js +++ b/src/assets/data/resource.js @@ -287,7 +287,7 @@ export default { "create_time": "1630423555", "status": 1, "desc": "108线网红,福州人在上海,没有更新就是在吃土", - "is_private":0 + "is_private": 0 } }, { @@ -377,7 +377,7 @@ export default { "create_time": "1630423555", "status": 1, "desc": "谢谢关注\n浅谈&合作v:a1231231234\n旅行&报名v: 1231231891242\n新疆 西藏 四川摄影旅拍路线规划与设计", - "is_private":0 + "is_private": 0 } }, { @@ -14441,5 +14441,187 @@ export default { "music": null }, ], - users: [] + users: [], + music: [ + { + name: '龙卷风', + "mp3": "http://im5.tongbu.com/rings/singerring/zt_uunGo_1/5605.mp3", + cover: require('../../assets/img/music-cover/1.png'), + author: '周杰伦', + duration: 99, + use_count: 37441000, + is_collect: false, + is_play: false, + }, + { + name: '爱在西元前', + mp3: 'https://m3.8js.net:99/1916/501204165042405.mp3', + cover: require('../../assets/img/music-cover/2.png'), + author: '周杰伦', + duration: 60, + use_count: 37441000, + is_collect: false, + is_play: false, + }, + { + name: '蜗牛', + mp3: 'http://im5.tongbu.com/rings/singerring/zt_uunGo_1/3684.mp3', + cover: require('../../assets/img/music-cover/3.png'), + author: '周杰伦', + duration: 60, + use_count: 37441000, + is_collect: false, + is_play: false, + }, + { + name: '半岛铁盒', + mp3: 'https://m3.8js.net:99/2016n/46/94745.mp3', + cover: require('../../assets/img/music-cover/4.png'), + author: '周杰伦', + duration: 60, + use_count: 37441000, + is_collect: false, + is_play: false, + }, + { + name: '轨迹', + mp3: 'https://m3.8js.net:99/1832/411204324135934.mp3', + cover: require('../../assets/img/music-cover/5.png'), + author: '周杰伦', + duration: 60, + use_count: 37441000, + is_collect: false, + is_play: false, + }, + { + name: '七里香', + mp3: 'https://m3.8js.net:99/2016n/14/53717.mp3', + cover: require('../../assets/img/music-cover/6.png'), + author: '周杰伦', + duration: 60, + use_count: 37441000, + is_collect: false, + is_play: false, + }, + { + name: '发如雪', + mp3: 'https://m3.8js.net:99/2014/211204142150965.mp3', + cover: require('../../assets/img/music-cover/7.png'), + author: '周杰伦', + duration: 60, + use_count: 37441000, + is_collect: false, + is_play: false, + }, + { + name: '霍元甲', + mp3: 'https://m3.8js.net:99/1921/261204212643140.mp3', + cover: require('../../assets/img/music-cover/8.png'), + author: '周杰伦', + duration: 60, + use_count: 37441000, + is_collect: false, + is_play: false, + }, + { + name: '千里之外(周杰伦/费玉清)', + mp3: 'http://im5.tongbu.com/rings/singerring/zt_uunGo_1/121.mp3', + cover: require('../../assets/img/music-cover/9.png'), + author: '周杰伦', + duration: 60, + use_count: 37441000, + is_collect: false, + is_play: false, + }, + { + name: '菊花台', + mp3: 'http://im5.tongbu.com/rings/singerring/zt_uunGo_1/2022.mp3', + cover: require('../../assets/img/music-cover/10.png'), + author: '周杰伦', + duration: 60, + use_count: 37441000, + is_collect: false, + is_play: false, + }, + { + name: '不能说的秘密', + mp3: 'http://im5.tongbu.com/rings/singerring/zt_uunGo_1/165.mp3', + cover: require('../../assets/img/music-cover/11.png'), + author: '周杰伦', + duration: 60, + use_count: 37441000, + is_collect: false, + is_play: false, + }, + { + name: '牛仔很忙', + mp3: 'http://im5.tongbu.com/rings/singerring/zt_uunGo_1/219.mp3', + cover: require('../../assets/img/music-cover/12.png'), + author: '周杰伦', + duration: 60, + use_count: 37441000, + is_collect: false, + is_play: false, + }, + { + name: '给我一首歌的时间', + mp3: 'https://m3.8js.net:99/1938/041204380445445.mp3', + cover: require('../../assets/img/music-cover/13.jpg'), + author: '周杰伦', + duration: 60, + use_count: 37441000, + is_collect: false, + is_play: false, + }, + { + name: '烟花易冷', + mp3: 'https://m3.8js.net:99/1828/051204280535192.mp3', + cover: require('../../assets/img/music-cover/14.jpg'), + author: '周杰伦', + duration: 60, + use_count: 37441000, + is_collect: false, + is_play: false, + }, + { + name: '惊叹号', + mp3: 'https://m3.8js.net:99/20111103/150.mp3', + cover: require('../../assets/img/music-cover/15.jpg'), + author: '周杰伦', + duration: 60, + use_count: 37441000, + is_collect: false, + is_play: false, + }, + { + name: '明明就', + mp3: 'https://m3.8js.net:99/2016n/27/96537.mp3', + cover: require('../../assets/img/music-cover/16.jpg'), + author: '周杰伦', + duration: 60, + use_count: 37441000, + is_collect: false, + is_play: false, + }, + { + name: '算什么男人', + mp3: 'https://m3.8js.net:99/20150107/429.mp3', + cover: require('../../assets/img/music-cover/17.jpg'), + author: '周杰伦', + duration: 60, + use_count: 37441000, + is_collect: false, + is_play: false, + }, + { + name: '告白气球', + mp3: 'https://m3.8js.net:99/20161016/481.mp3', + cover: require('../../assets/img/music-cover/18.jpg'), + author: '周杰伦', + duration: 60, + use_count: 37441000, + is_collect: false, + is_play: false, + }, + ], } \ No newline at end of file diff --git a/src/assets/img/icon/location.webp b/src/assets/img/icon/location.webp new file mode 100644 index 0000000..ca97b20 Binary files /dev/null and b/src/assets/img/icon/location.webp differ diff --git a/src/assets/img/icon/me/camera-light.png b/src/assets/img/icon/me/camera-light.png new file mode 100644 index 0000000..ac0a641 Binary files /dev/null and b/src/assets/img/icon/me/camera-light.png differ diff --git a/src/assets/img/icon/me/certification.webp b/src/assets/img/icon/me/certification.webp new file mode 100644 index 0000000..46dcc02 Binary files /dev/null and b/src/assets/img/icon/me/certification.webp differ diff --git a/src/assets/img/icon/me/code-bg.png b/src/assets/img/icon/me/code-bg.png new file mode 100644 index 0000000..23b9100 Binary files /dev/null and b/src/assets/img/icon/me/code-bg.png differ diff --git a/src/assets/img/icon/me/copy.png b/src/assets/img/icon/me/copy.png new file mode 100644 index 0000000..87d1abe Binary files /dev/null and b/src/assets/img/icon/me/copy.png differ diff --git a/src/mock/index.js b/src/mock/index.js index d1fc4f8..df3756d 100644 --- a/src/mock/index.js +++ b/src/mock/index.js @@ -111,17 +111,15 @@ Mock.mock(/private1/, options => { }) Mock.mock(/collect/, options => { - let page = getPage(options) return Mock.mock({ data: { - pageNo: page.pageNo, video: { total: 0, - list: [], + list: resource.videos, }, - audio: { + music: { total: 0, - list: [], + list: resource.music, } }, code: 200, msg: '', }) diff --git a/src/pages/me/Me.less b/src/pages/me/Me.less index 41f9abb..fee9ffe 100644 --- a/src/pages/me/Me.less +++ b/src/pages/me/Me.less @@ -96,9 +96,15 @@ } .right { + font-size: 1.4rem; display: flex; align-items: center; color: @second-text-color; + + img { + height: 1.5rem; + width: 1.5rem; + } } } @@ -113,6 +119,7 @@ position: relative; .poster { + object-fit: cover; border-radius: .4rem; width: 100%; height: 100%; @@ -138,7 +145,7 @@ } } - .audio { + .music { background: @active-main-bg; border-radius: .5rem; padding: 1rem; @@ -164,6 +171,11 @@ display: flex; align-items: center; color: @second-text-color; + + img { + height: 1.5rem; + width: 1.5rem; + } } } @@ -263,7 +275,7 @@ transform: translateY(-1rem); background: @main-bg; padding: 0 2rem 0 2rem; - border-radius: 1rem 1rem 0 0 ; + border-radius: 1rem 1rem 0 0; .head { width: 100%; @@ -340,7 +352,7 @@ margin-left: .6rem; } - .text{ + .text { white-space: pre-wrap; } } diff --git a/src/pages/me/Me.vue b/src/pages/me/Me.vue index e5a10a2..7988722 100644 --- a/src/pages/me/Me.vue +++ b/src/pages/me/Me.vue @@ -35,18 +35,17 @@
获赞 - 18 + {{ $likeNum(localAuthor.aweme_count) }}
关注 - 8 + {{ $likeNum(localAuthor.following_count) }}
粉丝 - 62 + {{ $likeNum(localAuthor.follower_count) }}
-

{{ userinfo.nickname }}

@@ -160,20 +159,20 @@
-
+
视频
全部 - +
- +
{{ $likeNum(i.likeNum) }} @@ -182,7 +181,7 @@
-
+
@@ -190,15 +189,14 @@
全部 - +
- -
用户创作的原声用户创作的原声用户创作的原声 -
+ v-for="i in videos.collect.music.list.length>3?videos.collect.music.list.slice(0,3):videos.collect.music.list"> + +
{{ i.name }}
@@ -376,7 +374,7 @@ export default { list: [], total: -1, }, - audio: { + music: { list: [], total: -1, } @@ -395,16 +393,21 @@ export default { sprint: 15, canScroll: true, localAuthor: { + school: { + name: '中央戏剧学院', + department: null, + joinTime: null, + education: null, + displayType: 1, + }, "id": "93864497380", "unique_id_modify_time": "1630393144", "unique_id": "10040050", "favoriting_count": 143, "avatar": require('../../assets/img/icon/avatar/1.png'), - "city": "北京", - "school": "中央戏剧学院", - "province": null, - "country": "", - "location": "", + "city": "成都", + "province": '四川', + "country": "中国", "birthday": "2002-01-01", "cover": "https://p3.douyinpic.com/obj/c8510002be9a3a61aad2?from=116350172", "following_count": 66, @@ -416,11 +419,10 @@ export default { "last_login_time": "1630423555", "create_time": "1630423555", "status": 1, - "desc": `一个普普通通学表演的 - 看到的人都能开开心心 - `, - "is_private": 0 - } + "desc": `一个普普通通学表演的\n看到的人都能开开心心`, + "is_private": 1 + }, + videoPoster: `?vframe/jpg/offset/0/w/${document.body.clientWidth}` } }, computed: { @@ -554,7 +556,8 @@ export default { if (this.loadings['loading' + this.contentIndex]) return console.log('到底了') let videoOb = this.videos[Object.keys(this.videos)[this.contentIndex]] - if (videoOb.total > videoOb.list.length) { + + if (this.contentIndex !== 3 && videoOb.total > videoOb.list.length) { videoOb.pageNo++ this.loadings['loading' + this.contentIndex] = true let res diff --git a/src/store/index.js b/src/store/index.js index b08f8b2..7afd597 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -38,7 +38,7 @@ const store = Vuex.createStore({ "create_time": "1630423555", "status": 1, "desc": `一个普普通通学表演的\n看到的人都能开开心心`, - "is_private": 0 + "is_private": 1 }, friends: { "all": [