diff --git a/src/assets/data/resource.js b/src/assets/data/resource.js index f791a8d..d4dbcda 100644 --- a/src/assets/data/resource.js +++ b/src/assets/data/resource.js @@ -8,7 +8,7 @@ export default { video: 'http://douyin.ttentau.top/0.mp4', "video_data_size": 26829508, "duration": 427780, - "desc": "我不管我们宿舍第一好看", + "desc": "1我不管我们宿舍第一好看", "allow_download": 0, "allow_duet": 0, "allow_react": 0, @@ -93,7 +93,7 @@ export default { video: 'http://douyin.ttentau.top/1.mp4', "video_data_size": 6038796, "duration": 90927, - "desc": "只要速度够快,小姐姐就追不上...", + "desc": "2只要速度够快,小姐姐就追不上...", "allow_download": 1, "allow_duet": 0, "allow_react": 0, @@ -184,7 +184,7 @@ export default { video: 'http://douyin.ttentau.top/2.mp4', "video_data_size": 8996120, "duration": 118703, - "desc": "注意安全", + "desc": "3注意安全", "allow_download": 1, "allow_duet": 0, "allow_react": 0, @@ -296,7 +296,7 @@ export default { video: 'http://douyin.ttentau.top/3.mp4', "video_data_size": 12371092, "duration": 139652, - "desc": "秋天来了,新疆的可可托海~", + "desc": "4秋天来了,新疆的可可托海~", "allow_download": 1, "allow_duet": 0, "allow_react": 0, @@ -386,7 +386,7 @@ export default { video: 'http://douyin.ttentau.top/5.mp4', "video_data_size": 16916839, "duration": 384068, - "desc": "在地铁上看见一个女生,刷着刷着屏幕突然把手机倒过来,然后露出了诡异的笑容,我基本已经知道她在看什么了", + "desc": "5在地铁上看见一个女生,刷着刷着屏幕突然把手机倒过来,然后露出了诡异的笑容,我基本已经知道她在看什么了", "allow_download": 0, "allow_duet": 0, "allow_react": 0, @@ -454,7 +454,7 @@ export default { video: 'http://douyin.ttentau.top/6.mp4', "video_data_size": 26944285, "duration": 276000, - "desc": "终于找到爱情公寓拍摄取景地了,熟悉的场景配上熟悉的音乐仿佛青春就在昨天,简直一代一人回忆", + "desc": "6终于找到爱情公寓拍摄取景地了,熟悉的场景配上熟悉的音乐仿佛青春就在昨天,简直一代一人回忆", "allow_download": 0, "allow_duet": 0, "allow_react": 0, @@ -522,7 +522,7 @@ export default { video: 'http://douyin.ttentau.top/7.mp4', "video_data_size": 9321536, "duration": 129583, - "desc": "一定要跟心爱的人来看一次西岭的日出,at对你很重要的人一起来吧", + "desc": "7一定要跟心爱的人来看一次西岭的日出,at对你很重要的人一起来吧", "allow_download": 1, "allow_duet": 0, "allow_react": 0, @@ -620,7 +620,7 @@ export default { video: 'http://douyin.ttentau.top/8.mp4', "video_data_size": 25251313, "duration": 449263, - "desc": "这车应该叫啥名字", + "desc": "8这车应该叫啥名字", "allow_download": 0, "allow_duet": 0, "allow_react": 0, @@ -692,11 +692,11 @@ export default { } }, { - "id": "0be47c89-f6e8-4d5d-820a-072e75c52fbf", + "id": "f6e8-0be47c89-4d5d-820a-adsfaswewer", video: 'http://douyin.ttentau.top/9.mp4', "video_data_size": 17839401, "duration": 262127, - "desc": "遍历山河,人音值得....", + "desc": "9遍历山河,人音值得....", "allow_download": 1, "allow_duet": 0, "allow_react": 0, @@ -769,11 +769,11 @@ export default { } }, { - "id": "0be47c89-f6e8-4d5d-820a-072e75c52fbf", + "id": "0be47c89-f6e8-wqeq-820a-qerq", video: 'http://douyin.ttentau.top/10.mp4', "video_data_size": 17839401, "duration": 262127, - "desc": "当你找不到答案的时候 就来西藏看看。", + "desc": "10当你找不到答案的时候 就来西藏看看。", "allow_download": 1, "allow_duet": 0, "allow_react": 0, @@ -853,11 +853,11 @@ export default { } }, { - "id": "0be47c89-f6e8-4d5d-820a-072e75c52fbf", + "id": "0be47c89-qwerqw-4derq5d-r-072e75c52fbf", video: 'http://douyin.ttentau.top/11.mp4', "video_data_size": 17839401, "duration": 262127, - "desc": "在家门口画一个坑,差点被丈母娘打了!", + "desc": "11在家门口画一个坑,差点被丈母娘打了!", "allow_download": 1, "allow_duet": 0, "allow_react": 0, @@ -922,11 +922,11 @@ export default { } }, { - "id": "0be47c89-f6e8-4d5d-820a-072e75c52fbf", + "id": "0be47c89qwerqwerqwerqwerbf", video: 'http://douyin.ttentau.top/12.mp4', "video_data_size": 17839401, "duration": 262127, - "desc": "他乡纵有当头月,不抵家乡一盏灯", + "desc": "12他乡纵有当头月,不抵家乡一盏灯", "allow_download": 1, "allow_duet": 0, "allow_react": 0, @@ -1013,11 +1013,11 @@ export default { } }, { - "id": "0be47c89-f6e8-4d5d-820a-072e75c52fbf", + "id": "0be47c8fasdfwer1221312-072e75c52fbf", video: 'http://douyin.ttentau.top/13.mp4', "video_data_size": 17839401, "duration": 262127, - "desc": "去爬山游玩不要在乱拍视频了,来...!我教你拍。最后的云海太美啦", + "desc": "13去爬山游玩不要在乱拍视频了,来...!我教你拍。最后的云海太美啦", "allow_download": 1, "allow_duet": 0, "allow_react": 0, @@ -1111,11 +1111,11 @@ export default { } }, { - "id": "0be47c89-f6e8-4d5d-820a-072e75c52fbf", + "id": "0be47cadfasdf23234fbf", video: 'http://douyin.ttentau.top/14.mp4', "video_data_size": 17839401, "duration": 262127, - "desc": "这是什么鱼", + "desc": "14这是什么鱼", "allow_download": 1, "allow_duet": 0, "allow_react": 0, @@ -1173,11 +1173,11 @@ export default { } }, { - "id": "0be47c89-f6e8-4d5d-820a-072e75c52fbf", + "id": "0besdfsdfgwe2342123f", video: 'http://douyin.ttentau.top/15.mp4', "video_data_size": 17839401, "duration": 262127, - "desc": "这个秋天来成都吧,和喜欢的人一起来看一场日出云海", + "desc": "15这个秋天来成都吧,和喜欢的人一起来看一场日出云海", "allow_download": 1, "allow_duet": 0, "allow_react": 0, @@ -1257,11 +1257,11 @@ export default { } }, { - "id": "0be47c89-f6e8-4d5d-820a-072e75c52fbf", + "id": "0be4asdfasdf5466452375c52fbf", video: 'http://douyin.ttentau.top/16.mp4', "video_data_size": 17839401, "duration": 262127, - "desc": "水刀的原理,为什么被称为最锋利的刀?", + "desc": "16水刀的原理,为什么被称为最锋利的刀?", "allow_download": 1, "allow_duet": 0, "allow_react": 0, diff --git a/src/assets/less/custom.less b/src/assets/less/custom.less index 60f0b55..ad3feac 100644 --- a/src/assets/less/custom.less +++ b/src/assets/less/custom.less @@ -184,6 +184,7 @@ p { .slide { height: 100%; width: 100%; + transition: height .3s; .slide-list { height: 100%; diff --git a/src/components/Footer.vue b/src/components/Footer.vue index a54c6e0..7b26d97 100644 --- a/src/components/Footer.vue +++ b/src/components/Footer.vue @@ -26,7 +26,7 @@ + + \ No newline at end of file diff --git a/src/pages/slideComponent/V.vue b/src/pages/slideComponent/V.vue new file mode 100644 index 0000000..46f239d --- /dev/null +++ b/src/pages/slideComponent/V.vue @@ -0,0 +1,168 @@ + + + diff --git a/src/pages/slideComponent/index.vue b/src/pages/slideComponent/index.vue new file mode 100644 index 0000000..733fd29 --- /dev/null +++ b/src/pages/slideComponent/index.vue @@ -0,0 +1,180 @@ + + + + + \ No newline at end of file diff --git a/src/pages/slideHooks/H.vue b/src/pages/slideHooks/H.vue index 0f6f2db..d05121b 100644 --- a/src/pages/slideHooks/H.vue +++ b/src/pages/slideHooks/H.vue @@ -68,7 +68,7 @@ function canNext(isNext) {