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

no message

Browse Source
This commit is contained in:
A1300399510
2023-07-27 15:12:14 +08:00
parent 570849c02f
commit bee5f42a99
3 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/b528b17b4ab40e6ec459e03f4c77b634.mp4 Normal file
View File

Binary file not shown.

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

@@ -9,8 +9,9 @@
<img :src="item && item.url || item['imageurl'] || item['image']" class="img" alt=""> <img :src="item && item.url || item['imageurl'] || item['image']" class="img" alt="">
</div> </div>
<div class="img-box dis-f jus-x" style="width:600px" v-if="!item.thumbnail"> <div class="img-box dis-f jus-x" style="width:600px" v-if="!item.thumbnail">
<source :src="item && item.url || item['videourl']" class="img" style="width:600px" <!-- <source :src="item && item.url || item['videourl']" class="img" style="width:600px" -->
type="video/mp4"> <!-- type="video/mp4"> -->
<video autoplay controls :src="item.url"></video>
</div> </div>
</div> </div>
</el-carousel-item> </el-carousel-item>
@@ -26,12 +27,12 @@
<div class="list-img-box dis-f al-item jus-x"> <div class="list-img-box dis-f al-item jus-x">
<div v-for="(item, i) in list" :key="i" @click="watchSet(i)" class="pos-r"> <div v-for="(item, i) in list" :key="i" @click="watchSet(i)" class="pos-r">
<div class="voide" :class="{ 'select-box': imageTab === i }" v-if="!item.thumbnail"> <div class="voide" :class="{ 'select-box': imageTab === i }" v-if="!item.thumbnail">
<div class="icon-box dis-f jus-x al-item" :class="{'bor-r-8':imageTab === i}"> <div class="icon-box dis-f jus-x al-item" :class="{ 'bor-r-8': imageTab === i }">
<img src="../../assets/img/detail/videoStop.svg" class="icon" alt=""> <img src="../../assets/img/detail/videoStop.svg" class="icon" alt="">
</div> </div>
</div> </div>
<div class="img-box-s dis-f jus-x" <div class="img-box-s dis-f jus-x"
:class="[{ 'select-box': imageTab === i&&item.thumbnail }, { 'voide-img': !item.thumbnail }]"> :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 :src="item.thumbnail || item.image" alt="" class="img-s" style="object-fit: cover;">
</div> </div>
</div> </div>
@@ -62,6 +63,11 @@ const props = defineProps({
} }
}) })
setTimeout(() => {
console.log("list", props.list);
}, 1000);
let show = props.show let show = props.show
let list = ref([]) let list = ref([])
let close = props.close let close = props.close
@@ -222,8 +228,9 @@ img {
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
.bor-r-8{
border-radius:8px !important; .bor-r-8 {
border-radius: 8px !important;
} }
.icon-box { .icon-box {
@@ -256,5 +263,6 @@ img {
::-webkit-scrollbar { ::-webkit-scrollbar {
display: none; display: none;
}</style> }
</style>

24
src/views/detail.vue
View File

@@ -420,7 +420,9 @@
</div> </div>
</div> </div>
<!-- --> <!-- -->
<div class="map-box" v-if="pageType != 3 && housingInfo['data'] && housingInfo['data'].info.longitude">
<div class="map-box"
v-if="pageType != 3 && housingInfo['data'] && housingInfo['data'].info.longitude">
<div class="dis-f al-item title-box"> <div class="dis-f al-item title-box">
<img src="../assets/img/detail/mapIcon.png" class="img" alt=""> <img src="../assets/img/detail/mapIcon.png" class="img" alt="">
<span class="title">{{ <span class="title">{{
@@ -737,7 +739,9 @@
</div> </div>
</div> </div>
</div> </div>
<div class="dis-f jus-x bottom-tps" v-if="pageType != 3 && (recommendListData.length > 0 || publisherList.length > 0)">
<div class="dis-f jus-x bottom-tps"
v-if="pageType != 3 && (recommendListData.length > 0 || publisherList.length > 0)">
- {{ loadText }} - - {{ loadText }} -
</div> </div>
<footerTool></footerTool> <footerTool></footerTool>
@@ -1106,7 +1110,18 @@ let setHousingArr = () => {
arr = housingInfo['data'].info.video ? arr.concat(housingInfo['data'] && housingInfo['data'].info.video) : [] arr = housingInfo['data'].info.video ? arr.concat(housingInfo['data'] && housingInfo['data'].info.video) : []
arr = housingInfo['data'].info.picturegroup ? arr.concat(housingInfo['data'] && housingInfo['data'].info.picturegroup) : [] arr = housingInfo['data'].info.picturegroup ? arr.concat(housingInfo['data'] && housingInfo['data'].info.picturegroup) : []
imgList.value = imgList.value.concat(arr) imgList.value = imgList.value.concat(arr)
// console.log(imgList.value)
console.log(imgList.value)
housingInfo['data'].info.video.forEach(element => {
console.log("element", element);
element['type'] = 'videos'
})
// lives
console.log("housingInfo['data'].info.video", housingInfo['data'].info.video);
} }
let location = store.state.indexData.config && store.state.indexData.config.location let location = store.state.indexData.config && store.state.indexData.config.location
@@ -2629,6 +2644,9 @@ img {
} }
.school-info { .school-info {
height: 500px;
overflow-y: scroll;
font-family: 'PingFangSC-Semibold', 'PingFang SC Semibold', 'PingFang SC', sans-serif; font-family: 'PingFangSC-Semibold', 'PingFang SC Semibold', 'PingFang SC', sans-serif;
font-weight: 650; font-weight: 650;
font-style: normal; font-style: normal;