Merge branch 'dev-lhk' into shenzhen-dev

This commit is contained in:
kun 2024-01-24 16:40:44 +08:00
commit 01d6397340
2 changed files with 7 additions and 4 deletions

View File

@ -1,7 +1,7 @@
<!--ckplayer 视频播放-->
<template>
<div style="height: 100%">
<video :id="'videoItem' + name" style="width: 100%; height: 100%; object-fit: fill" :autoplay="autoPlay" muted />
<video :id="'videoItem' + name" style="width: 100%; height: 100%; object-fit: fill" controls :autoplay="autoPlay" muted />
</div>
</template>

View File

@ -180,12 +180,15 @@ export default {
},
changeVideo(item) {
console.log("点击了列表----");
console.log(item, "xxxxxxxxxx");
let itemVal = null;
itemVal = this.videoList.find((item2) => item.itemId == item2.itemId);
console.log(itemVal)
if (!itemVal) {
console.log(itemVal);
if (this.showType == 1) {
this.videoList = [item];
this.changeShowType(this.showType);
}
if (!itemVal && this.showType != 1) {
this.videoList.push(item);
this.changeShowType(this.showType);
}