Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/components/detail/imageWatch.vue
This commit is contained in:
A1300399510 2023-08-02 17:40:51 +08:00
commit 51b047b11e

View File

@ -1,13 +1,15 @@
<template>
<div class="watch-box" v-show="show">
<div class="pos-r dis-f al-item mg-t-60">
<div class="s-w-100" style="">
<div class="pos-r dis-f al-item jus-x mg-t-60">
<div class="carousel-w">
<el-carousel arrow="never" height="600px" :autoplay="false" :initial-index="props.index"
indicator-position="none" ref="carousel" @change="carouselChange">
<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:auto;" v-if="item['type'] != 'attachment'">
<video style="width: 666px;" :autoplay="false" controls :src="item.url || item['videourl']"></video>
<div class="img-box dis-f jus-x" v-if="item['type'] != 'attachment'">
<video :autoplay="false" controls :src="item.url || item['videourl']" style="width:800px;"></video>
</div>
<div class="img-box dis-f jus-x" v-else>
<!-- <img v-lazy="item && item.url || item['imageurl'] || item['image']" class="img" alt=""> -->
@ -172,6 +174,9 @@ img {
.select-box {
border: 1px solid #50e3c2 !important;
}
.carousel-w{
min-width:800px;
}
.watch-box {
width: 100%;
@ -254,12 +259,13 @@ img {
}
.img-box {
/* width: 1200px; */
width: 800px;
height: 600px;
border-radius: 10px;
overflow: hidden;
.img {
width: 800px;
height: 600px;
}
}