From 0e74f37569db78d2072fb99243562478cf24a210 Mon Sep 17 00:00:00 2001 From: zyronon Date: Tue, 5 Oct 2021 19:50:28 +0800 Subject: [PATCH] debug --- README.md | 26 +-- .../img/icon/newicon/left_menu/clock.png | Bin 759 -> 7242 bytes src/assets/less/custom.less | 1 + src/pages/me/Me.vue | 36 ++-- src/pages/me/MyMusic.vue | 182 ++++++++++++++++-- src/pages/me/collect/VideoCollect.vue | 46 ++++- src/pages/me/rightMenu/LookHistory.vue | 6 +- src/pages/me/userinfo/EditUserInfo.vue | 4 +- src/pages/me/userinfo/EditUserInfoItem.vue | 22 +-- src/store/index.js | 2 +- 10 files changed, 255 insertions(+), 70 deletions(-) diff --git a/README.md b/README.md index 21b3ded..2771c07 100644 --- a/README.md +++ b/README.md @@ -13,30 +13,24 @@ 首页|50% -- 音乐|☑ -- 抖音音乐榜|☑ --- 搜索|50%; --- 直播|50%; +-- 搜索|50% +-- 直播|50% 朋友|0% 消息|80% +-- 私聊|☑ 我|90% +-- 求更新|☑ -- 关注|0 -- 粉丝|0 -- 编辑资料|☑ -- 添加朋友|☑ --- 我的音乐|30% +-- 我的音乐|50% +-- 收藏视频\音乐|50% -- 抖音商城|0 --- 我的订单|0 --- 钱包|0 --- 我的二维码|☑ --- 我的二维码|☑ --- 设置|30% -首页| -首页| -首页| -首页| -首页| -首页| -首页| -首页| +-- 右侧菜单子页面|10% +-- 设置|☑ +-- -- 子页面|☑ +登录\注册|☑ 首页| ## 目标功能 diff --git a/src/assets/img/icon/newicon/left_menu/clock.png b/src/assets/img/icon/newicon/left_menu/clock.png index 7932ce943c5365f769c9b68de07071dadd75721f..7c4f37dae5791ea5d03399ffffdd4e86d4153e07 100644 GIT binary patch literal 7242 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 diff --git a/src/assets/less/custom.less b/src/assets/less/custom.less index 8f08b01..edc91b4 100644 --- a/src/assets/less/custom.less +++ b/src/assets/less/custom.less @@ -60,6 +60,7 @@ } .right { + max-width: 80%; display: flex; justify-content: space-between; align-items: center; diff --git a/src/pages/me/Me.vue b/src/pages/me/Me.vue index 810e6e4..a73d881 100644 --- a/src/pages/me/Me.vue +++ b/src/pages/me/Me.vue @@ -225,26 +225,30 @@
-
- - 观看历史 -
我的二维码
-
+
+ + 观看历史 +
+
+ + 时间管理 +
+
创作者服务中心
-
+
小程序
-
+
抖音公益
@@ -252,7 +256,7 @@ 未成年保护工具
-
+
我的客服
@@ -264,38 +268,38 @@
生活服务
-
+
卡券
-
+
免流量
-
+
视频彩铃
拓展功能
-
+
我的动态
-
+
我的缓存
-
+
上热门
-
+
小店随心推
-
+
投教园地
diff --git a/src/pages/me/MyMusic.vue b/src/pages/me/MyMusic.vue index 04c3ae8..6a9644b 100644 --- a/src/pages/me/MyMusic.vue +++ b/src/pages/me/MyMusic.vue @@ -16,15 +16,15 @@
-
+
-
{{ item.c }}
+
{{ item.c }}
-
+
-
+
{{ item.c }}
@@ -36,7 +36,8 @@
- + + 收藏
@@ -72,7 +73,46 @@
- + +
+
+
+ + 播放全部 + (2) +
+ +
+
+
+
+
+ +
+
+ {{ item.name }} +
{{ item.author }}
+
+
完整版
+
{{ $duration(item.duration) }}
+
+
+
+
+
+ + +
+
+
+
+
+ 推荐收藏 +
+ 自动播放 +
+
+
@@ -81,19 +121,14 @@ import {mapState} from "vuex"; import globalMethods from "../../utils/global-methods"; import {nextTick} from "vue"; -// import lyricsFaruxue from '../../assets/data/lyrics/faruxue.txt' import gaobaiqiqiu from '../../assets/data/lyrics/gaobaiqiqiu.lrc' - export default { name: "MyMusic", components: {}, - props: { - modelValue: false - }, data() { return { - slideIndex: 0, + slideIndex: 1, music: { name: '告白气球', mp3: 'https://mp32.9ku.com/upload/128/2017/02/05/858423.mp3', @@ -104,11 +139,14 @@ export default { is_collect: false, is_play: false, }, + collectMusic: [], + recommendMusic: [], lyricsTexts: [], lyricsFullTexts: [], isPlay: false, isLoop: false, isMove: false, + isCollect: false, isFullLyrics: false, lastPageX: 0, pageX: 0, @@ -124,6 +162,7 @@ export default { ...mapState(['bodyWidth']) }, created() { + this.getCollectMusic() }, mounted() { this.audio.src = this.music.mp3 @@ -178,6 +217,15 @@ export default { }) }, methods: { + async getCollectMusic() { + this.loading = true + let res = await this.$api.videos.collect() + this.loading = false + if (res.code === this.SUCCESS) { + this.collectMusic = res.data.music.list.slice(0, 2) + this.recommendMusic = res.data.music.list.slice(2, -1) + } + }, createLrcObj(lrc) { let oLRC = { ti: "", //歌曲名 @@ -290,6 +338,12 @@ export default { color: white; font-size: 1.4rem; + .base-slide-item { + &:nth-child(1) { + background: rgb(136, 132, 133); + } + } + .music-play { display: flex; flex-direction: column; @@ -480,6 +534,110 @@ export default { } } + .my-collect { + padding: @padding-page; + + .play-all { + margin-bottom: 2rem; + display: flex; + justify-content: space-between; + align-items: center; + + .left { + display: flex; + align-items: center; + + img { + width: 3rem; + margin-right: 1rem; + } + + .num { + color: gray; + margin-left: .5rem; + } + } + + .menu { + height: 2rem; + } + } + + .collect-list { + .item { + display: flex; + justify-content: space-between; + margin-bottom: 1.5rem; + + .left { + display: flex; + + .cover-wrapper { + margin-right: 1rem; + position: relative; + display: flex; + align-items: center; + justify-content: center; + + .cover { + border-radius: .2rem; + @width: 6rem; + width: @width; + object-fit: cover; + height: @width; + } + } + + .desc { + display: flex; + flex-direction: column; + justify-content: space-between; + + .name { + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + max-width: 40vw; + } + + .author, .desc-bottom { + font-size: 1.2rem; + color: @second-text-color; + } + + .desc-bottom { + display: flex; + align-items: center; + + .tag { + font-size: 1rem; + background: @second-btn-color-tran; + padding: .2rem .5rem; + margin-right: .5rem; + } + + .duration { + margin-right: 1.4rem; + position: relative; + } + } + } + } + + .right { + display: flex; + align-items: center; + + .collect-icon { + img { + width: 2.4rem; + } + } + } + + } + } + } } diff --git a/src/pages/me/collect/VideoCollect.vue b/src/pages/me/collect/VideoCollect.vue index 576bb40..e0762de 100644 --- a/src/pages/me/collect/VideoCollect.vue +++ b/src/pages/me/collect/VideoCollect.vue @@ -6,33 +6,57 @@
- - + + + + +
@@ -50,7 +74,11 @@ export default { font-size: 1.4rem; .content { - padding-top: 6rem; + padding-top: @header-height; + + .Scroll { + height: calc(100vh - @header-height)!important; + } } } diff --git a/src/pages/me/rightMenu/LookHistory.vue b/src/pages/me/rightMenu/LookHistory.vue index 2f15798..cd6cf91 100644 --- a/src/pages/me/rightMenu/LookHistory.vue +++ b/src/pages/me/rightMenu/LookHistory.vue @@ -75,10 +75,10 @@ export default { computed: { isClear() { if (this.currentSlideItemIndex === 0) { - return this.historyVideo.list = [] + return this.historyVideo.list.length } - return this.historyOther.list = [] - } + return this.historyOther.list.length + }, }, created() { this.getHistoryVideo(true) diff --git a/src/pages/me/userinfo/EditUserInfo.vue b/src/pages/me/userinfo/EditUserInfo.vue index eb0a055..3b8dcf8 100644 --- a/src/pages/me/userinfo/EditUserInfo.vue +++ b/src/pages/me/userinfo/EditUserInfo.vue @@ -19,14 +19,14 @@
名字
- {{ isEmpty(userinfo.name) }} + {{ isEmpty(userinfo.nickname) }}
抖音号
- {{ isEmpty(userinfo.account) }} + {{ isEmpty(userinfo.unique_id) }}
diff --git a/src/pages/me/userinfo/EditUserInfoItem.vue b/src/pages/me/userinfo/EditUserInfoItem.vue index aa07020..0cec408 100644 --- a/src/pages/me/userinfo/EditUserInfoItem.vue +++ b/src/pages/me/userinfo/EditUserInfoItem.vue @@ -17,22 +17,22 @@
我的名字
- - + + @click="localUserinfo.nickname = ''">
-
{{ localUserinfo.name.length }}/20
+
{{ localUserinfo.nickname.length }}/20
我的抖音号
- + + @click="localUserinfo.unique_id = ''">
最多16个字，只允许包含字母、数字、下划线和点，30天内仅能修改一次
@@ -65,11 +65,11 @@ export default { }, computed: { isChanged() { - if (this.type === 1) if (!this.localUserinfo.name) return false + if (this.type === 1) if (!this.localUserinfo.nickname) return false if (this.type === 2) if (!this.localUserinfo.desc) return false - if (this.userinfo.name !== this.localUserinfo.name) return true + if (this.userinfo.nickname !== this.localUserinfo.nickname) return true if (this.userinfo.desc !== this.localUserinfo.desc) return true - return this.userinfo.account !== this.localUserinfo.account; + return this.userinfo.unique_id !== this.localUserinfo.unique_id; }, ...mapState({ userinfo: 'userinfo', @@ -89,7 +89,7 @@ export default { async save() { if (!this.isChanged) return if (this.type === 1) { - if (!this.localUserinfo.name) return this.$notice('名字不能为空') + if (!this.localUserinfo.nickname) return this.$notice('名字不能为空') } this.$showLoading() this.$store.commit('setUserinfo', this.localUserinfo) diff --git a/src/store/index.js b/src/store/index.js index 7afd597..1af2e9c 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -37,7 +37,7 @@ const store = Vuex.createStore({ "last_login_time": "1630423555", "create_time": "1630423555", "status": 1, - "desc": `一个普普通通学表演的\n看到的人都能开开心心`, + "desc": `一个普普通通学表演的\n看到的人都能开开心心~~~~~~~~~~~~~`, "is_private": 1 }, friends: {