diff --git a/mapFind/img/20230609113522.png b/mapFind/img/20230609113522.png
new file mode 100644
index 0000000..94c0c32
Binary files /dev/null and b/mapFind/img/20230609113522.png differ
diff --git a/mapFind/img/downIcon.png b/mapFind/img/downIcon.png
new file mode 100644
index 0000000..ea4bf9d
Binary files /dev/null and b/mapFind/img/downIcon.png differ
diff --git a/mapFind/img/placeLogo.svg b/mapFind/img/placeLogo.svg
new file mode 100644
index 0000000..d9e9d2b
--- /dev/null
+++ b/mapFind/img/placeLogo.svg
@@ -0,0 +1,6 @@
+
+
\ No newline at end of file
diff --git a/mapFind/pages/placeMap/index.js b/mapFind/pages/placeMap/index.js
index 7695aac..2675e53 100644
--- a/mapFind/pages/placeMap/index.js
+++ b/mapFind/pages/placeMap/index.js
@@ -1,6 +1,6 @@
// pages/Map/Map.js
let app = getApp()
-var miucms = require('../../utils/miucms.js');
+var miucms = require('../../../utils/miucms.js');
Page({
data: {
headerObj: {
@@ -126,6 +126,7 @@ Page({
this.setData({
placePopBox: !this.data.placePopBox
})
+ if (this.data.headerObj === 'apartment') return
this.getSelectPlaceList()
this.setListOperations()
},
@@ -439,18 +440,29 @@ Page({
},
//返回选择学校/区域页面
backPerson() {
- console.log('返回')
- this.setData({
- loadingMoreData: true,
- mapFirstLoading: true,
- selectPlace: '',
- showPlace: false,
- mapScale: 11,
- priceList: [],
- priceIdList: null,
- selectPlacePrice: null
- })
+ if (this.data.showPlace) {
+ this.setData({
+ loadingMoreData: true,
+ mapFirstLoading: true,
+ selectPlace: '',
+ showPlace: false,
+ mapScale: 11,
+ priceList: [],
+ priceIdList: null,
+ selectPlacePrice: null
+ })
+ } else {
+ wx.navigateBack({
+ fail: function () {
+ wx.navigateTo({
+ url: '/pages/index/index',
+ })
+ }
+ })
+ }
},
+
+ //
//个人/中介加载更多
loadingMore() {
if (!this.data.loadingMoreData) return
@@ -523,7 +535,7 @@ Page({
if (ele[element] == -1) {} else if (ele[element] == 0) ele[differentNames[element] ? differentNames[element] : element] = '不限' // 当 值为 [0] 时为不限
else ele[differentNames[element] ? differentNames[element] : element] = langs[element][ele[element]]
})
- let tabArr = ["gptype", "property", "elevator", "sunshinearea", "gender"]
+ let tabArr = ["gptype", "type", "elevator", "sunshinearea", "gender"]
let tabList = []
tabArr.forEach(el => {
if (ele[el] && ele[el] != -1) tabList.push(ele[el])
@@ -639,7 +651,7 @@ Page({
priceIdList: arr,
placePriceList: obj,
selectPriceList: List,
- listCount:res.data.count,
+ listCount: res.data.count,
latitude: placeData[0] ? placeData[0].latitude : '',
longitude: placeData[0] ? placeData[0].longitude : '',
})
diff --git a/mapFind/pages/placeMap/index.wxml b/mapFind/pages/placeMap/index.wxml
index 35ad4b9..416e516 100644
--- a/mapFind/pages/placeMap/index.wxml
+++ b/mapFind/pages/placeMap/index.wxml
@@ -1,4 +1,4 @@
-
+
-
-
+
+
-
+
共
@@ -60,7 +59,7 @@
有疑问? 来找
-
+
{{cloneInfo.nickname}}!
@@ -74,12 +73,10 @@
-
-
-
+
+
@@ -128,21 +123,21 @@
-
+
{{item.author}}
{{langs.intermediary[item.intermediary]}}
-
+
-
-
-
-
+
+
+
+
@@ -150,8 +145,7 @@
-
+
diff --git a/mapFind/pages/placeMap/index.wxss b/mapFind/pages/placeMap/index.wxss
index 001eb21..39d57ae 100644
--- a/mapFind/pages/placeMap/index.wxss
+++ b/mapFind/pages/placeMap/index.wxss
@@ -1,5 +1,5 @@
/* pages/placeMap/placeMap.wxss */
-@import "/common/common.wxss";
+@import "/pages/common/common.wxss";
page {
height: 100%;
diff --git a/pages/common/common.wxml b/pages/common/common.wxml
index 8ccaab7..707da11 100644
--- a/pages/common/common.wxml
+++ b/pages/common/common.wxml
@@ -476,9 +476,9 @@
-
+
diff --git a/pages/index/index.json b/pages/index/index.json
index f1afd82..eb2f81d 100644
--- a/pages/index/index.json
+++ b/pages/index/index.json
@@ -5,7 +5,7 @@
"filtrate-box": "../../template/filtrate/filtrate",
"go-login": "../../template/goLogin/goLogin",
"head-swiper": "../../template/headSwiper/headSwiper",
- "xin-head-swiper": "/template/xinHeadSwiper/xinHeadSwiper",
+ "xin-head-swiper": "../../template/xinHeadSwiper/xinHeadSwiper",
"form-id": "../../template/formId/formId",
"fix-footer": "../../template/fixFooter/fixFooter",
"announcement-popup": "../../template/announcementPopup/announcementPopup",
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index dcc362c..2318ac7 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -13,12 +13,19 @@
-
-
+
+
+
+
+
+ 地图找房
+
+
-
+
+
@@ -176,7 +183,7 @@
-
+
重置
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 9d09b9c..31085f8 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -633,4 +633,19 @@
.waterfall-item {
width: 300rpx;
+}
+
+.finding-house-map {
+ color: #333;
+ font-size: 22rpx;
+ padding: 0 32rpx;
+ border-left: 3rpx solid #d7d7d7;
+ height: 30rpx;
+
+}
+
+.finding-house-map .finding-house-map-icon {
+ width: 31.5rpx;
+ height: 30rpx;
+ margin-right: 10rpx;
}
\ No newline at end of file
diff --git a/pages/search/search.wxml b/pages/search/search.wxml
index f7b75ef..283b78a 100644
--- a/pages/search/search.wxml
+++ b/pages/search/search.wxml
@@ -12,9 +12,9 @@
-
+
diff --git a/template/listOperations/listOperations.js b/template/listOperations/listOperations.js
index 7873984..89517b8 100644
--- a/template/listOperations/listOperations.js
+++ b/template/listOperations/listOperations.js
@@ -146,6 +146,39 @@ Component({
valueKey: "orderby",
valueText: "最新",
},
+ },
+ placeSelect: {
+ types: {
+ name: "出租方式",
+ valueKey: "types"
+ },
+ rent: {
+ name: "租金",
+ },
+ moreCondition: {
+ name: "更多",
+ last: true,
+ valueKey: "brands",
+ },
+ },
+ placeSelectList: {
+ types: {
+ name: "出租方式",
+ valueKey: "types"
+ },
+ rent: {
+ name: "租金",
+ },
+ moreCondition: {
+ name: "更多",
+ valueKey: "brands",
+ },
+ orderby: {
+ name: "最新",
+ valueKey: "orderby",
+ show: false,
+ valueText: "最新发布",
+ }
}
},
conditionObj: {},
@@ -486,6 +519,19 @@ Component({
})
},
+ //是否显示发布
+ setSelectData(data) {
+ let obj = this.data.conditionObj
+ if (!obj['orderby']) return
+ obj['orderby'].show = data
+ // if(obj['orderby'].show)
+ // obj.
+ this.setData({
+ conditionObj: obj,
+ conditionState: "",
+ })
+ },
+
// 处理 更多 确定和重置按钮
clickMorePitch(e) {
let type = e.currentTarget.dataset.type
diff --git a/template/listOperations/listOperations.wxml b/template/listOperations/listOperations.wxml
index 1aeefce..22cc764 100644
--- a/template/listOperations/listOperations.wxml
+++ b/template/listOperations/listOperations.wxml
@@ -6,15 +6,19 @@
-
+
+
{{ item['valueText'] }}
{{ item.name }}
-
+
+
-
+
+
+