diff --git a/src/App.vue b/src/App.vue
index 0be8b58..2cf5548 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -151,4 +151,7 @@ input[type="number"] {
.rotate180 {
transform: rotate(180deg);
}
+.el-loading-mask{
+ z-index:2100 !important;
+}
diff --git a/src/components/biserialListItem/biserialListItem.vue b/src/components/biserialListItem/biserialListItem.vue
index 88e5971..c52321d 100644
--- a/src/components/biserialListItem/biserialListItem.vue
+++ b/src/components/biserialListItem/biserialListItem.vue
@@ -81,7 +81,7 @@
&& data.data.rent }}
{{ data && data.data
&&
- data.data.rent[0] }}~{{ data && data.data && data.data.rent[1] }}
+ data.data.rent[0] }}~{{ data && data.data && data.data.rent[1] }}
/{{ data && data.data && data.data.rentalperiod }}
[
diff --git a/src/components/seachModule/seachModule.vue b/src/components/seachModule/seachModule.vue
index 348d8cd..b801db6 100644
--- a/src/components/seachModule/seachModule.vue
+++ b/src/components/seachModule/seachModule.vue
@@ -137,7 +137,8 @@ let historyArr = reactive({ data: [] })//历史查找记录
let hotArr = reactive({ data: [] })
let seachAllType = reactive({
keyword: '',
- location: []
+ location: [],
+ orderby: 'timestamp'
})
diff --git a/src/components/selectTabBox/selectTabBox.vue b/src/components/selectTabBox/selectTabBox.vue
index 1bb52c3..b578b8a 100644
--- a/src/components/selectTabBox/selectTabBox.vue
+++ b/src/components/selectTabBox/selectTabBox.vue
@@ -368,6 +368,7 @@ let setSchoolData = () => {
//选择学校区域属性
let setSchoolObj = (obj) => {
+ if(obj.id===schoolSelectObj.id)return
schoolSelectObj.id = obj.id
schoolSelectObj.title = obj.title
selectTabCheck.id = '';
@@ -442,6 +443,7 @@ let setCheckBoxData = (data) => {
checkBoxGroupInfo.value && checkBoxGroupInfo.value.setCheckData(data)
}
+let loactionArr=shallowReactive({data:null})
//确认按钮
let selectSeach = (data = []) => {
selectData.data = seachAreaId(data)
@@ -449,10 +451,14 @@ let selectSeach = (data = []) => {
if (data.length === 0 && selectTabCheck.id) {
data.push(selectTabCheck.id)
selectData.data = [{ title: '不限', id: '' }]
+ setCheckBoxData([])
}
schoolSelectObj.id = ''
schoolSelectObj.title = ''
+ if(loactionArr.data&&(loactionArr.data.toString()===data.toString()))return
+
+ loactionArr.data=JSON.parse(JSON.stringify(data))
setSeachCondition('location', data)
}
@@ -479,6 +485,7 @@ let deleteSelect = (i, id) => {
//搜索列表排序
let listSortCheck = (item) => {
let obj = listSort.type[item]
+ if(obj.type===listSort.checkType)return
listSort.checkType = obj.type
listSort.check = obj.title
setSeachCondition('orderby', obj.type)
@@ -487,7 +494,7 @@ let listSortCheck = (item) => {
//出租方式
-let hireTypeArr = shallowReactive([{ hireType: [], title: '不限' }, { title: '合租', id: 1, hireType: [] }, { hireType: [], id: 2, title: '整租' }])
+let hireTypeArr = shallowReactive([{ hireType: [],id:'', title: '不限' }, { title: '合租', id: 1, hireType: [] }, { hireType: [], id: 2, title: '整租' }])
//设置出租方式
let setHireTypeArr = (type, id) => {
@@ -502,29 +509,27 @@ let setHireTypeArr = (type, id) => {
}
-let hireTypeObj = reactive({ id: '', title: '', hireId: '不限' })//出租方式所选
+let hireTypeObj = reactive({ id: '', title: '', hireId: '不限',checkId:'' })//出租方式所选
let setHireId = (item) => {
-
+ if(item.id===hireTypeObj.id)return
if (hireTypeObj.hireId != item.title) {
hireTypeObj.id = ''
hireTypeObj.title = ''
+ hireTypeObj.checkId=item.id
}
- if (item.hireType.length === 0) {
- setSeachCondition('types', '')
- }
+ if(hireTypeObj.checkId.toString().length>1)return
hireTypeObj.hireId = item.title
- if(!hireTypeObj.id){
- hireTypeObj.id = item.id
- setLocation('types',hireTypeObj.id)
- }
+ hireTypeObj.id = item.id
+ setSeachCondition('types',hireTypeObj.id)
}
let dropdownCommand = (obj) => {
+ if(obj.id===hireTypeObj.checkId)return
hireTypeObj.id = obj.id
+ hireTypeObj.checkId = obj.id
hireTypeObj.title = obj.title
// store.state.routeList['hireTypeObj'] = JSON.parse(JSON.stringify(hireTypeObj))
- console.log('obj',hireTypeObj)
setSeachCondition('types', obj.id)
}
@@ -547,6 +552,7 @@ let hireData = reactive([{ title: '不限', id: 0 }, { title: '一年以上', id
let hireDate = reactive({ id: 0, title: '' })
//设置租期
let setHireDate = (item) => {
+ if(item.id===hireDate.id)return
hireDate.id = item.id
setSeachCondition('leaseterm', item.id)
}
@@ -556,6 +562,7 @@ let genderData = reactive([{ title: '不限', id: 0 }, { title: '女', id: 1 },
let gender = reactive({ id: 0 })
//设置性别
let setGender = (item) => {
+ if(item.id===gender.id)return
gender.id = item.id
setSeachCondition('gender', item.id)
}
@@ -566,6 +573,7 @@ let releaseObj = reactive({ id: 0 })
//设置发布时间
let setReleaseObj = (item) => {
+ if(item.id===releaseObj.id)return
releaseObj.id = item.id
setSeachCondition('publish', item.id)
}
diff --git a/src/utils/loading.js b/src/utils/loading.js
index d7782af..54248aa 100644
--- a/src/utils/loading.js
+++ b/src/utils/loading.js
@@ -4,7 +4,7 @@ function startLoading() {
loading = ElLoading.service({
lock: true,
text: 'Loading',
- background: 'rgba(0, 0, 0, 0.7)',
+ background: 'rgba(0, 0, 0, 0.7)'
})
}
// 关闭loading事件
diff --git a/src/views/detail.vue b/src/views/detail.vue
index 7a6faff..40e9597 100644
--- a/src/views/detail.vue
+++ b/src/views/detail.vue
@@ -33,8 +33,8 @@
v-if="Array.isArray(housingInfo['data'] && housingInfo['data'].info.rent)">
{{
housingInfo['data'] && housingInfo['data'].info.rent[0]
- }}~{{ housingInfo['data']
+ }}~{{ housingInfo['data']
&& housingInfo['data'].info.rent[1] }}
/{{ housingInfo['data'] && housingInfo['data'].info.rentalperiod }}
@@ -110,7 +110,7 @@
{{
housingInfo['data'] && housingInfo['data'].info.rent[0]
- }}~{{ housingInfo['data'] &&
housingInfo['data'].info.rent[1] }}
@@ -735,7 +735,7 @@
- 代理人牌照号:
+ 所属公司:
{{ contacts['data'].companyname }}
diff --git a/src/views/housingView/person.vue b/src/views/housingView/person.vue
index c48293e..799a93c 100644
--- a/src/views/housingView/person.vue
+++ b/src/views/housingView/person.vue
@@ -83,6 +83,7 @@ let getDataList = (data) => {
intermediary: 0,
...data
}
+ if(!postData['orderby'])postData['orderby']='timestamp'
api.getLists(postData).then(res => {
if (res.code === 200) {
dataList.data = res.data.data
diff --git a/src/views/seachIndex.vue b/src/views/seachIndex.vue
index 812d77c..abba05d 100644
--- a/src/views/seachIndex.vue
+++ b/src/views/seachIndex.vue
@@ -18,7 +18,7 @@
-
+