diff --git a/.env.production b/.env.production index f258504..730c67a 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,4 @@ ENV = 'production' -VUE_APP_BASE_API = 'http://36.133.205.221:81' +VUE_APP_BASE_API = 'https://lcny-api.peidikeji.cn' diff --git a/package.json b/package.json index 04e5cdd..9d39c93 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,9 @@ "core-js": "^3.6.5", "flv.js": "^1.6.2", "flyio": "^0.6.2", + "hls.js": "^1.4.12", "lodash-es": "^4.17.21", + "mui-player": "^1.8.1", "portal-vue": "^2.1.7", "node-sass": "^6.0.1", "sass-loader": "^13.3.2", diff --git a/src/App.vue b/src/App.vue index 1776d82..1aabbc4 100644 --- a/src/App.vue +++ b/src/App.vue @@ -664,4 +664,15 @@ uni-page-body { pointer-events: none; } } + +.right-part { + .full-switch { + display: none; + } +} +.left-part{ + .live-mode{ + display: none; + } +} diff --git a/src/components/live-video/index.vue b/src/components/live-video/index.vue new file mode 100644 index 0000000..0a80a60 --- /dev/null +++ b/src/components/live-video/index.vue @@ -0,0 +1,94 @@ + + + diff --git a/src/components/video-flv-h5/video-flv-h5.vue b/src/components/video-flv-h5/video-flv-h5.vue index 3928512..903ef29 100644 --- a/src/components/video-flv-h5/video-flv-h5.vue +++ b/src/components/video-flv-h5/video-flv-h5.vue @@ -49,7 +49,8 @@ export default { player.x5VideoPlayerType='h5-page' player.x5VideoPlayerFullscreen="false" player.autoplay= true // 以上均为 video标签的属性配置 - player.style = 'width: 100%;height:100%'; + // player.poster = 'https://img.yzcdn.cn/vant/cat.jpeg' + player.style = 'width: 100%;height:100%;object-fit:cover;'; let videoElement = this.$refs.myPlayer; // console.log(videoElement,'videoPlayer=========') diff --git a/src/components/video-m3u8-h5/video-m3u8-h5.vue b/src/components/video-m3u8-h5/video-m3u8-h5.vue index 67db73a..16da37f 100644 --- a/src/components/video-m3u8-h5/video-m3u8-h5.vue +++ b/src/components/video-m3u8-h5/video-m3u8-h5.vue @@ -32,12 +32,15 @@ export default { initVideo() { let video = document.createElement('video') video.id = this.id - video.style = 'width: 100%; height: 100%;' + video.style = 'width: 100%; height: 100%;object-fit:cover;' video.controls = true video.preload = 'auto' + video.setAttribute('x5-playsinline', 'true') + video.setAttribute('x-webkit-airplay', 'allow') video.setAttribute('playsinline', true) //IOS微信浏览器支持小窗内播放 video.setAttribute('webkit-playsinline', true) //这个bai属性是ios 10中设置可以让视频在小du窗内播放,也就是不是全zhi屏播放的video标签的一个属性 video.setAttribute('x5-video-player-type', 'h5') //安卓 声明启用同层H5播放器 可以在video上面加东西 + // video.setAttribute('poster', 'https://img.yzcdn.cn/vant/cat.jpeg') let source = document.createElement('source') source.src = this.url video.appendChild(source) diff --git a/src/pages/basics/components/basics-edit.vue b/src/pages/basics/components/basics-edit.vue index 01f2446..23c1ba1 100644 --- a/src/pages/basics/components/basics-edit.vue +++ b/src/pages/basics/components/basics-edit.vue @@ -10,6 +10,9 @@ + + + @@ -155,6 +158,7 @@ export default { description: '', address_lng: '', address_lat: '', + extends:{} }, } }, diff --git a/src/pages/index/monitor.vue b/src/pages/index/monitor.vue index cc8aa1f..9e66986 100644 --- a/src/pages/index/monitor.vue +++ b/src/pages/index/monitor.vue @@ -138,8 +138,10 @@ - - + + + @@ -166,8 +168,9 @@ > - - + + @@ -200,10 +203,11 @@