Skip to content

飞
飞鹤小程序
Commit a73c375b authored by 劳琪峰's avatar 劳琪峰
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 3ed124c7 6dd73681
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
views/Home.vue
View file @ a73c375b
...@@ -705,7 +705,7 @@ export default { ...@@ -705,7 +705,7 @@ export default {
componentContent: item.title componentContent: item.title
}); });
if (item.videoUrl) { if (item.videoUrl) {
this.currentVideoUrl = this.$baseUrl + item.videoUrl; this.currentVideoUrl = item.videoUrl.indexOf('http') === -1 ? this.$baseUrl + item.videoUrl : item.videoUrl;
this.showVideo = true; this.showVideo = true;
return; return;
} }
...@@ -1143,7 +1143,7 @@ export default { ...@@ -1143,7 +1143,7 @@ export default {
if (this.floatIcon.videoUrl) { if (this.floatIcon.videoUrl) {
// 播放视频 // 播放视频
this.currentVideoUrl = this.$baseUrl + this.floatIcon.videoUrl; this.currentVideoUrl = this.floatIcon.videoUrl.indexOf('http') === -1 ? this.$baseUrl + this.floatIcon.videoUrl : this.floatIcon.videoUrl;
this.showVideo = true; this.showVideo = true;
return; return;
} else if (this.floatIcon.link) { } else if (this.floatIcon.link) {
...@@ -1757,9 +1757,9 @@ export default { ...@@ -1757,9 +1757,9 @@ export default {
.channelscroll { .channelscroll {
width: 718rpx; width: 718rpx;
overflow-y: scroll; // overflow-y: scroll;
margin-top: 32rpx; margin-top: 32rpx;
height: 620rpx; // height: 620rpx;
.box { .box {
display: flex; display: flex;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment