From 2155e84e3ec088c642a3c5680a27e3b3af6b5994 Mon Sep 17 00:00:00 2001 From: zyronon Date: Sun, 26 Sep 2021 01:12:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E6=84=9F=E5=85=B4=E8=B6=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/data/resource.js | 81 +- src/assets/img/icon/add.svg | 1 - src/assets/img/icon/epe.webp | Bin 633 -> 0 bytes src/assets/img/icon/hepai.svg | 1 - src/assets/img/icon/href.svg | 1 - src/assets/img/icon/sina.svg | 1 - src/components/Footer.vue | 2 +- src/components/Other.vue | 302 ------- src/components/Share.vue | 2 +- src/components/Video.vue | 67 +- .../slide/SlideColumnVirtualList.vue | 11 +- src/pages/home/Index.vue | 3 +- src/pages/home/Index2.vue | 744 +----------------- src/pages/me/VideoDetail.vue | 3 +- src/pages/me/userinfo/EditUserInfo.vue | 7 +- 15 files changed, 79 insertions(+), 1147 deletions(-) delete mode 100644 src/assets/img/icon/add.svg delete mode 100644 src/assets/img/icon/epe.webp delete mode 100644 src/assets/img/icon/hepai.svg delete mode 100644 src/assets/img/icon/href.svg delete mode 100644 src/assets/img/icon/sina.svg delete mode 100644 src/components/Other.vue diff --git a/src/assets/data/resource.js b/src/assets/data/resource.js index 38d0640..c21dd1a 100644 --- a/src/assets/data/resource.js +++ b/src/assets/data/resource.js @@ -266,83 +266,6 @@ export default { "is_private": 0 } }, - { - "id": "080a3b3d-0f76-4427-9ec9-661e1621cb1a", - video: 'http://douyin.ttentau.top/4.mp4', - "video_data_size": 37824020, - "duration": 312474, - "desc": "男子野外露营遇到三只豹子，结局出乎意料", - "allow_download": 0, - "allow_duet": 0, - "allow_react": 0, - "allow_music": 1, - "allow_douplus": 1, - "allow_share": 1, - "digg_count": 141000, - "comment_count": 8827, - "download_count": 431, - "play_count": 0, - "share_count": 44000, - "forward_count": 22, - "collect_count": 1341, - "sort": 311, - "is_top": 0, - city: '开封市', - address: '', - "musicId": "02792e4a-d4b3-4b30-8e1e-fa0bd0eabe1b", - "create_time": "1630423884", - "creator_id": "93864497380", - "status": 1, - "topics": [ - { - "id": "85ceda30-898f-4b57-b891-0e58b3ab99a9", - "name": "DOU+小助手", - "creator_id": "93864497380", - "create_time": "1630423555", - "status": 1 - }, - { - "id": "85ceda30-898f-4b57-b891-0e58b3ab99a9", - "name": "抖音小助手", - "creator_id": "93864497380", - "create_time": "1630423555", - "status": 1 - }, - ], - "music": { - "id": "cde50af2-628c-4d28-b9c6-67237a62518e", - "cover": "https://p29.douyinpic.com/img/tos-cn-avt-0015/f4de202ff2e41b523838a4a767aebd16~c5_100x100.jpeg?from=116350172", - "mp3": "https://sf3-cdn-tos.douyinstatic.com/obj/ies-music/1658584661080088.mp3", - "title": "@印象网开封新闻创作的原声-印象网开封新闻", - "creator_id": "93864497380", - "create_time": "1630423555", - "status": 1 - }, - "author": { - "id": "93864497380", - "unique_id_modify_time": "1630393144", - "unique_id": "dyg141319", - "favoriting_count": 0, - "avatar": "https://p26.douyinpic.com/img/tos-cn-avt-0015/f4de202ff2e41b523838a4a767aebd16~c5_1080x1080.jpeg?from=116350172", - "city": "", - "province": null, - "country": "", - "location": "", - "birthday": "1990-01-01", - "cover": "https://p3.douyinpic.com/obj/c8510002be9a3a61aad2?from=116350172", - "following_count": 0, - "follower_count": 0, - "aweme_count": 0, - "nickname": "印象网开封新闻", - "phone": "", - "sex": "0", - "last_login_time": "1630423555", - "create_time": "1630423555", - "status": 1, - "desc": null, - "is_private": 0 - } - }, { "id": "08a90c93-807b-4a7a-aad3-68f75d65a9c8", video: 'http://douyin.ttentau.top/3.mp4', @@ -508,7 +431,7 @@ export default { "collect_count": 1, "sort": 8, "is_top": 0, - "city": "350100", + "city": "", "musicId": "9db983b3-b68c-465b-85f5-030f5646e01f", "create_time": "1630391758", "creator_id": "54884802577", @@ -1230,6 +1153,6 @@ export default { "desc": "108线网红，福州人在上海，没有更新就是在吃土", "is_private": 0 } - } + }, ], } \ No newline at end of file diff --git a/src/assets/img/icon/add.svg b/src/assets/img/icon/add.svg deleted file mode 100644 index 61083e8..0000000 --- a/src/assets/img/icon/add.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/img/icon/epe.webp b/src/assets/img/icon/epe.webp deleted file mode 100644 index ca97b2086a9bc21af1d10d9784295c60a7c48f4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 633 zcmV-<0*3vGP)Px#OHfQyMGe$^4c2`B|Nkr7j11O$3)OoK)Obv3aS6|K z3)Fkz`tOG8y`=EY@cs99=(b7Vox=6r9N2_t<*k+O#5T`|4Hv% zbW!N^gtYE@mUiZ|#6%n#Ylp6-uhRC`+Qtqy`Z~Aa9|Dd>YI?dPUDI9zwGCaApM~bM zZZ0r~`?RL{V<>HbpEIV9pfvGI+@glegDEo_9h3sUi90kEb~%GZ@Wn>`=o6GBVAFw|iSggmR=#Wka4&`0MhipN%as#R3HsRBiQs+ z(C)yOkp?0YV4*Q2_vJx)h&(8?3Ze;hB8G6moq-U@3En{v!hIPDLoh4oL>08(%P$HU z!hPwC4B;fui7JRZD6|S96PNj?Pa>{6_UW#H`ewN1Xza?vI&1s3qLv_SH(2`zgFGZ3 TpN&4J00000NkvXXu0mjf&3_%Z diff --git a/src/assets/img/icon/hepai.svg b/src/assets/img/icon/hepai.svg deleted file mode 100644 index e7d25db..0000000 --- a/src/assets/img/icon/hepai.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/img/icon/href.svg b/src/assets/img/icon/href.svg deleted file mode 100644 index fccc311..0000000 --- a/src/assets/img/icon/href.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/img/icon/sina.svg b/src/assets/img/icon/sina.svg deleted file mode 100644 index b69b0bb..0000000 --- a/src/assets/img/icon/sina.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/components/Footer.vue b/src/components/Footer.vue index 5e13c7e..0619fad 100644 --- a/src/components/Footer.vue +++ b/src/components/Footer.vue @@ -5,7 +5,7 @@
- 关注 + 同城
diff --git a/src/components/Other.vue b/src/components/Other.vue deleted file mode 100644 index 6123e05..0000000 --- a/src/components/Other.vue +++ /dev/null @@ -1,302 +0,0 @@ - - - - - diff --git a/src/components/Share.vue b/src/components/Share.vue index 0436866..d1a19da 100644 --- a/src/components/Share.vue +++ b/src/components/Share.vue @@ -109,7 +109,7 @@ 动态壁纸
-
+
不感兴趣
diff --git a/src/components/Video.vue b/src/components/Video.vue index 7099d35..77e359f 100644 --- a/src/components/Video.vue +++ b/src/components/Video.vue @@ -13,7 +13,7 @@
-
+
@@ -52,13 +52,27 @@ />
-
@{{ lVideo.author.nickname }}
+
+
+ + {{ lVideo.city }} + + {{ lVideo.address }} +
+
+
@{{ lVideo.author.nickname }}
{{ lVideo.desc }}
- +
@@ -172,8 +186,7 @@ export default { clickTimer: null, dbClickTimer: null, isDbClick: false, - videoPoster: `?vframe/jpg/offset/1/w/${document.body.clientWidth}` - // videoPoster: `?vframe/jpg/offset/1/w/${document.body.clientWidth}/h/${document.body.clientHeight - 50}` + videoPoster: `?vframe/jpg/offset/0/w/${document.body.clientWidth}` } }, mounted() { @@ -359,8 +372,8 @@ export default { } .pause { - width: 4.5rem; - height: 4.5rem; + width: 10rem; + height: 10rem; opacity: 0.5; position: absolute; margin: auto; @@ -397,7 +410,7 @@ export default { .normal { position: absolute; - bottom: 1rem; + bottom: 0; width: 100%; transition: all .3s; @@ -467,13 +480,15 @@ export default { justify-content: center; align-items: center; + @width: 3.5rem; + img { - width: 40px; - height: 40px; + width: @width; + height: @width; } span { - font-size: 11px; + font-size: 1.2rem; } } @@ -488,6 +503,36 @@ export default { position: absolute; bottom: 0; width: 75%; + //display: flex; + //flex-direction: column; + + .location-wrapper { + display: flex; + + .location { + margin-bottom: 1rem; + + display: flex; + align-items: center; + font-size: 1.2rem; + padding: .4rem; + border-radius: .3rem; + background: @second-btn-color-tran; + + .gang { + height: .8rem; + width: 1.5px; + margin: 0 .5rem; + background: gray; + } + + img { + margin-right: .7rem; + width: 1.8rem; + } + } + } + .music { position: relative; diff --git a/src/components/slide/SlideColumnVirtualList.vue b/src/components/slide/SlideColumnVirtualList.vue index 3b98760..97f5df0 100644 --- a/src/components/slide/SlideColumnVirtualList.vue +++ b/src/components/slide/SlideColumnVirtualList.vue @@ -11,6 +11,7 @@