From 26bdf2e7768ee5dfc400c3970a5aa129fed49453 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期一, 20 三月 2023 15:31:43 +0800 Subject: [PATCH] Merge branch '级联' into main-dev --- web_src/src/components/live.vue | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/web_src/src/components/live.vue b/web_src/src/components/live.vue index 1f2d6ca..a691418 100644 --- a/web_src/src/components/live.vue +++ b/web_src/src/components/live.vue @@ -135,14 +135,17 @@ this.loading = true this.$axios({ method: 'get', - url: '/api/play/start/' + deviceId + '/' + channelId + url: './api/play/start/' + deviceId + '/' + channelId }).then(function (res) { - // that.isLoging = false; - console.log('=====----=====') - console.log(res) - if (res.data.code == 0 && res.data.data) { - itemData.playUrl = res.data.data.httpsFlv - that.setPlayUrl(res.data.data.ws_flv, idxTmp) + if (res.data.code === 0 && res.data.data) { + let videoUrl; + if (location.protocol === "https:") { + videoUrl = res.data.data.wss_flv; + } else { + videoUrl = res.data.data.ws_flv; + } + itemData.playUrl = videoUrl; + that.setPlayUrl(videoUrl, idxTmp); } else { that.$message.error(res.data.msg); } -- Gitblit v1.8.0