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

图片查看更新

Browse Source
This commit is contained in:
luJianJun
2023-07-27 14:21:48 +08:00
parent ad303096ca
commit 25561ff12d
9 changed files with 94 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/views/detail.vue
View File

@@ -311,7 +311,7 @@
</div>
</div>
<!-- -->
<div class="info-box-s" v-if="pageType == 1 || pageType == 2">
<div class="info-box-s" v-if="pageType !=3">
<div class="info dis-f al-item">
<div class="title-box">
房屋类型
@@ -413,7 +413,7 @@
</div>
</div>
<!-- -->
<div class="map-box" v-if="pageType == 1 || pageType == 2">
<div class="map-box" v-if="pageType !=3&&housingInfo['data']&&housingInfo['data'].info.longitude">
<div class="dis-f al-item title-box">
<img src="../assets/img/detail/mapIcon.png" class="img" alt="">
<span class="title">{{
@@ -442,6 +442,7 @@
<span class="title">房源距离院校</span>
<img src="../assets/img/detail/close.png" class="close-icon" @click="showDistance=false" alt="">
</div>
{{ distanceList }}
<div class="distance-info-data dis-f" v-if="distanceList.length > 0">
<div class="dis-f al-item school-info" v-for="(item, index) in distanceList"
:key="index" :class="{ 'mg-t-50': index > 0 }">
@@ -1129,12 +1130,12 @@ let setNavigation = () => {
id:1
}
} ,
title: `${location[housingInfo['data']['info'].location.substring(0, 1)]}${type[housingInfo['data']['info'].type.substring(0, 1)]}房源`
title: ``
}
if (housingInfo['data']['info'].location.length > 0)
store.state.routeList['fourthIndex'] = {
path: `${store.state.routeList['secondaryIndex'].path}`,
title: `${location[housingInfo['data']['info'].location]}${type[housingInfo['data']['info'].type]}`
title: ``
}
}
}
@@ -1154,7 +1155,7 @@ let getHousingInfo = () => {
housingInfo['data'] = res.data
setHousingArr()
setNavigation()
distanceList.value = distanceList.value.concat(housingInfo['data']['info'].pointData)
distanceList.value = distanceList.value.concat(housingInfo['data']['info'].pointData||[])
distanceList.value.unshift({
address: true,
name: housingInfo['data']['info'].address,
@@ -1334,7 +1335,7 @@ let router = useRouter()
onMounted(() => {
let { id, type } = router.currentRoute.value.query
uniqid.value = id
pageType.value = type //1个人 2中介 3求房源 4搜索
pageType.value = type //1个人 2中介 3求房源
getHousingInfo()
masonryInstance = new Masonry(gridContainer.value, {
itemSelector: '.waterfall-box',
@@ -2559,7 +2560,6 @@ img {
cursor: pointer;
position: relative;
.distance-info-box {
background: inherit;
background-color: rgba(255, 255, 255, 1);
@@ -2572,8 +2572,8 @@ img {
z-index: 666;
width: 100%;
max-height: 610px;
overflow-y: scroll;
transition: all 0.2s linear;
overflow: hidden;
.top-box {
height: 70px;
@@ -2616,6 +2616,8 @@ 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;

2
src/views/housingView/intermediary.vue
View File

@@ -104,7 +104,7 @@ let getDataList = (data) => {
let addListData = () => {
let num = null
if (pageList.tab > (dataList.count>20?dataList.data.length-2:dataList.count-2)) {
if(dataList.data.length>20){
if(dataList.data.length>=20){
loading.value = true
}else{
loading.value = false

2
src/views/housingView/needHousing.vue
View File

@@ -106,7 +106,7 @@ let addListData = () => {
let num = null
if (pageList.tab > (dataList.count>20?dataList.data.length-2:dataList.count-2)) {
console.log(dataList.data.length,20,loading.value)
if(dataList.data.length>20){
if(dataList.data.length>=20){
loading.value = true
}else{
loading.value = false

2
src/views/housingView/person.vue
View File

@@ -110,7 +110,7 @@ let getDataList = (data) => {
let addListData = () => {
let num = null
if (pageList.tab > (dataList.count > 20 ? dataList.data.length - 2 : dataList.count - 2)) {
if (dataList.data.length > 20) {
if (dataList.data.length >= 20) {
loading.value = true
} else {
loading.value = false

29
src/views/seachIndex.vue
View File

@@ -15,7 +15,8 @@
listId="2"></biserialItem>
</div>
</div>
<div v-show="seachSelectData.data.intermediary === ''&&dataList.data && dataList.data.length > 0" ref="gridContainer">
<div v-show="seachSelectData.data.intermediary === '' && dataList.data && dataList.data.length > 0"
ref="gridContainer">
<apartment-item v-for="item in listApartment" :item="item"></apartment-item>
</div>
<div class="dis-f jus-x no-list-box al-item" v-show="dataList.data && dataList.data.length === 0">
@@ -23,7 +24,7 @@
</div>
</div>
</div>
<loadMoreText :loadText="loading?'加载中....':'到底了'"></loadMoreText>
<loadMoreText :loadText="loading ? '加载中....' : '到底了'"></loadMoreText>
<listBtmPrompt></listBtmPrompt>
<footerTool></footerTool>
</div>
@@ -89,7 +90,7 @@ let getDataList = (data) => {
if (!loading.value) return
let postData = {
page: pages.value,
limit:20,
limit: 20,
...data
}
loading.value = false
@@ -112,8 +113,8 @@ let getDataList = (data) => {
dataList.count = res.data.count
dataCount.value = res.data.count
nextTick(() => {
if(dataList.data[0])pageList['1'].push(dataList.data[0])
if(dataList.data[1])pageList['2'].push(dataList.data[1])
if (dataList.data[0]) pageList['1'].push(dataList.data[0])
if (dataList.data[1]) pageList['2'].push(dataList.data[1])
})
} else {
let data = res.data
@@ -125,7 +126,7 @@ let getDataList = (data) => {
masonryInstance.layout();
})
}
inputModuleInfo.value.setListCount(seachSelectData.data,dataList.count)
inputModuleInfo.value.setListCount(seachSelectData.data, dataList.count)
} else {
ElMessage({
@@ -140,10 +141,10 @@ let getDataList = (data) => {
let addListData = () => {
let num = null
// console.log(pageList.tab , (dataList.count>20?dataList.data.length-2:dataList.count-2))
if (pageList.tab > (dataList.count>20?dataList.data.length-2:dataList.count-2)) {
if(dataList.data.length>20){
if (pageList.tab > (dataList.count > 20 ? dataList.data.length - 2 : dataList.count - 2)) {
if (dataList.data.length >= 20) {
loading.value = true
}else{
} else {
loading.value = false
}
return
@@ -174,7 +175,7 @@ let downLoadMore = () => {
}
let inputModuleInfo=ref(null)
let inputModuleInfo = ref(null)
const gridContainer = ref(null);
//listImg
onMounted(() => {
@@ -183,10 +184,10 @@ onMounted(() => {
gutter: 20
});
routeQuery.data = route.currentRoute.value.query
if(routeQuery.data.keyword&&routeQuery.data.keyword.replace(/\s/g, "")){
inputModuleInfo.value.searchInit(routeQuery.data.keyword)//调用搜索组件的搜索功能
route.currentRoute.value.query.keyword=''
}else{
if (routeQuery.data.keyword && routeQuery.data.keyword.replace(/\s/g, "")&&routeQuery.data.houseingPageType!=6) {
inputModuleInfo.value.searchInit(routeQuery.data.keyword)//调用搜索组件的搜索功能
route.currentRoute.value.query.keyword = ''
} else {
console.log(seachSelectData.data)
inputModuleInfo.value.checkPageType()
// getDataList(seachSelectData.data)