|
|
@@ -49,10 +49,12 @@
|
|
|
class="video-player vjs-custom-skin"
|
|
|
:playsinline="true"
|
|
|
:options="playerO[0]"
|
|
|
+ ref="zVideo"
|
|
|
@play="onPlayerPlay($event)"
|
|
|
style="width: 100%; height: 100%"
|
|
|
></video-player>
|
|
|
</div>
|
|
|
+ <div class="video_wrapper" v-if="videoBlock == 6"></div>
|
|
|
</div>
|
|
|
<div
|
|
|
style="
|
|
|
@@ -1425,9 +1427,9 @@ export default {
|
|
|
type: "success",
|
|
|
});
|
|
|
this.selectSWork();
|
|
|
- if(this.tools[this.ppage - 1].tools.indexOf(12) != -1){
|
|
|
+ if (this.tools[this.ppage - 1].tools.indexOf(12) != -1) {
|
|
|
this.pick();
|
|
|
- this.isBlock = 0
|
|
|
+ this.isBlock = 0;
|
|
|
}
|
|
|
})
|
|
|
.catch((err) => {
|
|
|
@@ -1777,11 +1779,28 @@ export default {
|
|
|
res.data[0][0].handle &&
|
|
|
JSON.parse(res.data[0][0].handle).type == 2 &&
|
|
|
JSON.parse(res.data[0][0].handle).userid == this.userid &&
|
|
|
- this.isBlock != 10 &&
|
|
|
+ this.isBlock != 10 &&
|
|
|
this.tools[res.data[0][0].page - 1].tools.indexOf(12) != -1
|
|
|
) {
|
|
|
this.dialogVisiblePick = true;
|
|
|
}
|
|
|
+ // if (
|
|
|
+ // res.data[0][0].handle &&
|
|
|
+ // JSON.parse(res.data[0][0].handle).type == 1 &&
|
|
|
+ // this.videoList.length
|
|
|
+ // ) {
|
|
|
+ // let handle = JSON.parse(res.data[0][0].handle);
|
|
|
+ // let a = this.$refs.zVideo;
|
|
|
+
|
|
|
+ // if (handle.isPlay == 1) {
|
|
|
+ // a.player.play();
|
|
|
+ // } else if (handle.isPlay == 2) {
|
|
|
+ // a.player.pause();
|
|
|
+ // }
|
|
|
+ // } else if(this.$refs.zVideo){
|
|
|
+ // this.$refs.zVideo.player.pause();
|
|
|
+ // }
|
|
|
+
|
|
|
if (this.ppage == res.data[0][0].page && this.isBlock !== 0) {
|
|
|
return;
|
|
|
} else {
|
|
|
@@ -2391,4 +2410,14 @@ img {
|
|
|
.tfalse {
|
|
|
color: rgb(189, 30, 30) !important;
|
|
|
}
|
|
|
+
|
|
|
+.video_wrapper {
|
|
|
+ width: 100%;
|
|
|
+ height: 100%;
|
|
|
+ position: absolute;
|
|
|
+ z-index: 99999;
|
|
|
+ background: #fff;
|
|
|
+ background: transparent;
|
|
|
+ top: 0;
|
|
|
+}
|
|
|
</style>
|
zengyicheng