lex 3 gadi atpakaļ
vecāks
revīzija
22bb1d2972

+ 5 - 2
src/components/video.vue

@@ -27,7 +27,10 @@ export default {
     poster: String,
     controls: Boolean,
     height: String,
-    fullscreen: Boolean,
+    fullscreen: {
+      type: Boolean,
+      default: true,
+    },
     preload: {
       type: String,
       default: "auto",
@@ -62,7 +65,7 @@ export default {
       if (this.currentTime) {
         controls.push("current-time");
       }
-      if (browser().android || this.fullscreen) {
+      if (browser().android && this.fullscreen) {
         controls.push("fullscreen");
       }
       this.player = new Plyr(this.$refs.video, {

+ 29 - 5
src/views/liveActive/model/previewVideo.vue

@@ -27,11 +27,17 @@
         style="width: 100%; margin-bottom: 0.1rem"
       />
 
-      <van-popup v-model="videoPopup" style="width: 90%" closeable>
+      <van-popup
+        v-model="videoPopup"
+        :class="[isAndroid && os == 'mobile' ? 'androidClass' : 'iosClass']"
+        closeable
+      >
+        <!-- height="1.915rem" -->
         <videoPlayer
           v-if="videoPopup"
           class="ql-video"
-          height="1.915rem"
+          :fullscreen="isAndroid && os == 'mobile' ? false : true"
+          :height="isAndroid && os == 'mobile' ? '100%' : '1.915rem'"
           :src="videoSrc"
         ></videoPlayer>
       </van-popup>
@@ -40,9 +46,10 @@
 </template>
 
 <script>
+import { browser } from "@/common/common";
 import MEmpty from "@/components/MEmpty";
 import videoPlayer from "@/components/video";
-import { queryRoomDetail } from "../api";
+import { queryRoomDetail } from "../../api";
 export default {
   components: {
     videoPlayer,
@@ -56,9 +63,15 @@ export default {
       videoList: [],
       videoPopup: false,
       videoSrc: "",
+      os: "",
     };
   },
   // props: ["videoList"],
+  computed: {
+    isAndroid() {
+      return browser().android;
+    },
+  },
   mounted() {
     document.title = "视频列表";
     this.getVideoList();
@@ -67,6 +80,7 @@ export default {
     onDetail(item) {
       this.videoPopup = true;
       this.videoSrc = item.url + "#t=1";
+      this.os = item.os;
     },
     async getVideoList() {
       try {
@@ -137,8 +151,18 @@ export default {
     color: #666666;
     line-height: 0.28rem;
   }
+  /deep/.plyr {
+    min-width: 100%;
+  }
 }
-/deep/.plyr {
-  min-width: 100%;
+
+.iosClass {
+  width: 90%;
+}
+
+.androidClass {
+  width: 100%;
+  height: 100%;
+  display: flex;
 }
 </style>