XiaoMo/gterFang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并冲突

Browse Source
This commit is contained in:
A1300399510
2023-07-28 11:46:11 +08:00
parent 65f43ea7db
commit e9b0f2b425
6 changed files with 194 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/detail/imageWatch.vue
View File

@@ -6,10 +6,10 @@
<el-carousel-item v-for="(item, i) in list" :key="i">
<div class="dis-f jus-x al-item" v-if="item">
<div class="img-box dis-f jus-x" style="width:600px" v-if="item['type'] != 'attachment'">
<video autoplay controls :src="item.url || item['videourl']"></video>
<video autoplay="false" controls :src="item.url || item['videourl']"></video>
</div>
<div class="img-box dis-f jus-x" v-else>
<img :src="item && item.url || item['imageurl'] || item['image']" class="img" alt="">
<img v-lazy="item && item.url || item['imageurl'] || item['image']" class="img" alt="">
</div>
</div>
</el-carousel-item>
@@ -31,7 +31,7 @@
</div>
<div class="img-box-s dis-f jus-x"
:class="[{ 'select-box': imageTab === i && item.thumbnail }, { 'voide-img': !item.thumbnail }]">
<img :src="item.thumbnail || item.image" alt="" class="img-s" style="object-fit: cover;">
<img v-lazy="item.thumbnail || item.image" alt="" class="img-s" style="object-fit: cover;">
</div>
</div>
</div>
@@ -61,11 +61,6 @@ const props = defineProps({
}
})
setTimeout(() => {
console.log("list1111", props.list);
}, 5000);
let show = props.show
let list = ref([])
let close = props.close