diff --git a/src/assets/b528b17b4ab40e6ec459e03f4c77b634.mp4 b/src/assets/b528b17b4ab40e6ec459e03f4c77b634.mp4 new file mode 100644 index 0000000..7435260 Binary files /dev/null and b/src/assets/b528b17b4ab40e6ec459e03f4c77b634.mp4 differ diff --git a/src/components/detail/imageWatch.vue b/src/components/detail/imageWatch.vue index 68d54eb..0d6a6fc 100644 --- a/src/components/detail/imageWatch.vue +++ b/src/components/detail/imageWatch.vue @@ -9,8 +9,9 @@
- + + +
@@ -26,12 +27,12 @@
-
+
+ :class="[{ 'select-box': imageTab === i && item.thumbnail }, { 'voide-img': !item.thumbnail }]">
@@ -62,6 +63,11 @@ const props = defineProps({ } }) +setTimeout(() => { + console.log("list", props.list); +}, 1000); + + let show = props.show let list = ref([]) let close = props.close @@ -222,8 +228,9 @@ img { position: absolute; top: 0; left: 0; - .bor-r-8{ - border-radius:8px !important; + + .bor-r-8 { + border-radius: 8px !important; } .icon-box { @@ -256,5 +263,6 @@ img { ::-webkit-scrollbar { display: none; -} +} + \ No newline at end of file diff --git a/src/views/detail.vue b/src/views/detail.vue index 1a693f9..4c56aee 100644 --- a/src/views/detail.vue +++ b/src/views/detail.vue @@ -420,7 +420,9 @@
-
+ +
{{ @@ -737,7 +739,9 @@
-
+ +
- {{ loadText }} -
@@ -1106,7 +1110,18 @@ let setHousingArr = () => { 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) : [] 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 @@ -2629,6 +2644,9 @@ img { } .school-info { + + height: 500px; + overflow-y: scroll; font-family: 'PingFangSC-Semibold', 'PingFang SC Semibold', 'PingFang SC', sans-serif; font-weight: 650; font-style: normal;