解决冲突

This commit is contained in:
A1300399510 2023-07-27 18:41:48 +08:00
parent bb45673420
commit 57dcf597ff
2 changed files with 12 additions and 6 deletions

View File

@ -6,8 +6,9 @@
<!-- 房源展示 -->
<div class="dis-f jus-x al-item" style="margin-top:25px;">
<div class="body-maxWidth dis-f al-item">
<div v-for="(item, i) in apartmentData.data" :key="i">
<listItem :style="{ 'margin-left': i === 0 ? 0 : '12px' }" :data="item" v-if="i < 4"></listItem>
<div v-for="(item, i) in apartmentData.data.slice(0, 4)" :key="i">
<listItem :style="{ 'margin-left': i === 0 ? 0 : '12px' }" :data="item"
@click="publicJump(`/apartmentDetail?uniqid=${item['id']}`)"></listItem>
</div>
</div>
</div>
@ -22,7 +23,8 @@
<img src="../assets/homeImage/informationO.png" class="img" alt="">
<span class="title">攻略</span>
</div>
<div v-for="(item, i) in informationData && informationData[0].list" :key="i" class="dis-f al-item list-li">
<div v-for="(item, i) in informationData && informationData[0].list" :key="i"
class="dis-f al-item list-li">
<div class="list-mark"></div>
<div class="text-s" @click="informationDataOpen(item)">
<span class="text">{{ item.title }}</span>
@ -34,7 +36,8 @@
<img src="../assets/homeImage/informationT.png" class="img" alt="">
<span class="title">科普</span>
</div>
<div v-for="(item, i) in informationData && informationData[1].list" :key="i" class="dis-f al-item list-li">
<div v-for="(item, i) in informationData && informationData[1].list" :key="i"
class="dis-f al-item list-li">
<div class="list-mark"></div>
<div class="text-s" @click="informationDataOpen(item)">
<span class="text">{{ item.title }}</span>
@ -188,7 +191,6 @@
<!-- <indexRegularBox></indexRegularBox> -->
</div>
<back-to-top></back-to-top>
</template>
<script setup>
@ -386,6 +388,7 @@ let personHouseingInfo = (type, data, areaItem) => {
query: {
[type]:setData,
areaItem:areaItems['id']?`${areaItems['id']}`:''
},
// params:{
// type,
@ -408,6 +411,9 @@ onBeforeUnmount(() => {
window.removeEventListener('scroll', onPageSrcoll, true);
})
//
const publicJump = path => router.push(path)
</script>
<script>

View File

@ -724,7 +724,7 @@
附近房源
</div>
</div>
<div class="dis-f jus-x al-item" style="position: relative;z-index:-1;" v-if="pageType != 3">
<div class="dis-f jus-x al-item" style="position: relative;" v-if="pageType != 3">
<div class="body-maxWidth" v-show="recommendListData.length > 0">
<div ref="gridContainer"
style="margin-top:15px;display: flex;flex-wrap: wrap;margin-bottom: 50px;width:876px">