diff --git a/components/bottom-line/bottom-line.vue b/components/bottom-line/bottom-line.vue index c91eb162..db1491d0 100644 --- a/components/bottom-line/bottom-line.vue +++ b/components/bottom-line/bottom-line.vue @@ -50,8 +50,8 @@ } .data-bottom-line .line-item.left, .data-bottom-line .line-item.right { - margin-top: 8px; - border-bottom: 1px solid #e1e1e1; + margin-top: 16rpx; + border-bottom: 2rpx solid #e1e1e1; } .data-bottom-line .line-item.msg { color: #999; @@ -65,4 +65,4 @@ .data-bottom-line .line-item.right { float: right; } - \ No newline at end of file + diff --git a/pages/plugins/live/pull/components/h5-hls-video/h5-hls-video.vue b/pages/plugins/live/pull/components/h5-hls-video/h5-hls-video.vue index 47531cd1..51c3f910 100644 --- a/pages/plugins/live/pull/components/h5-hls-video/h5-hls-video.vue +++ b/pages/plugins/live/pull/components/h5-hls-video/h5-hls-video.vue @@ -369,8 +369,8 @@ initHlsPlayer(src) { if (hlsjs.isSupported()) { this.hlsPlayer = new hlsjs({ - manifestLoadingTimeOut: 30000, // 设置播放列表加载超时时间(毫秒) - fragLoadingTimeOut: 3000, // 设置片段加载超时时间(毫秒) + manifestLoadingTimeOut: 60000, // 设置播放列表加载超时时间(毫秒) + fragLoadingTimeOut: 60000, // 设置片段加载超时时间(毫秒) maxLiveSyncPlaybackRate: 1, // 最大追赶播放速率(1.05倍速) lowLatencyMode: true, // 启用低延迟模式 debug: false // 启用调试日志 diff --git a/pages/plugins/live/pull/components/video/video.vue b/pages/plugins/live/pull/components/video/video.vue index 12ed81c1..77bbe55b 100644 --- a/pages/plugins/live/pull/components/video/video.vue +++ b/pages/plugins/live/pull/components/video/video.vue @@ -1,12 +1,12 @@ @@ -62,25 +62,16 @@ methods: { reload_video() { // #ifndef MP - const video = this.$refs.videoPlayer; // 深拷贝视频源地址,避免直接修改原地址 let src = ''; if (!isEmpty(this.propSrc)) { src = this.propSrc; } this.video_src = ''; // 清除原地址 - //#ifdef H5 this.video_player_show = false; - //#endif setTimeout(() => { this.video_src = src; // 重新赋值 - //#ifdef H5 this.video_player_show = true; - //#endif - // #ifdef APP-NVUE - video.load(); // 重新加载 - video.play().catch(() => this.retryLoadVideo()); - // #endif }, 100); // #endif }, diff --git a/pages/plugins/live/pull/mixins/mixins.js b/pages/plugins/live/pull/mixins/mixins.js index eff029b1..e4ddb1bc 100644 --- a/pages/plugins/live/pull/mixins/mixins.js +++ b/pages/plugins/live/pull/mixins/mixins.js @@ -117,6 +117,8 @@ export default { // this.is_live_ended = true; // } } else if (new_data.code == -400) { // 没有登陆的跳转到登陆页 + // 隐藏加载提示 + uni.hideLoading(); if (app.globalData.is_login_check(res.data)) { app.globalData.showToast(res.data.msg); } else { diff --git a/pages/plugins/live/pull/pull.nvue b/pages/plugins/live/pull/pull.nvue index a9ff91d7..dd7e9d7f 100644 --- a/pages/plugins/live/pull/pull.nvue +++ b/pages/plugins/live/pull/pull.nvue @@ -1,13 +1,13 @@