|
|
@@ -1,97 +1,102 @@
|
|
|
import houseApi from '../../apis/house'
|
|
|
import cityApi from '../../apis/city'
|
|
|
-import { isPhoneX } from '../../utils/tools'
|
|
|
-import { bindInput } from '../../utils/utils'
|
|
|
+import {
|
|
|
+ isPhoneX
|
|
|
+} from '../../utils/tools'
|
|
|
+import {
|
|
|
+ bindInput
|
|
|
+} from '../../utils/utils'
|
|
|
|
|
|
const app = getApp();
|
|
|
-const panelData={
|
|
|
- 'region':[{
|
|
|
- id:'quyu',
|
|
|
- items:[{
|
|
|
- name:'',
|
|
|
- id:''
|
|
|
- }]
|
|
|
- },
|
|
|
- {
|
|
|
- id:'didian',
|
|
|
- items:[{
|
|
|
- name:'不限',
|
|
|
- id:''
|
|
|
- }]
|
|
|
- },
|
|
|
- {
|
|
|
- id:'xianshi',
|
|
|
- items:[{
|
|
|
- name:'不限',
|
|
|
- id:''
|
|
|
- }]
|
|
|
- }],
|
|
|
- 'jiage':[{
|
|
|
- id:'jiage',
|
|
|
- filter:'价格',
|
|
|
- items:[{
|
|
|
- name:'不限',
|
|
|
- id:''
|
|
|
- },{
|
|
|
- name:'50万以下',
|
|
|
- id:'0#50'
|
|
|
- },{
|
|
|
- name:'50万-100万',
|
|
|
- id:'50#100'
|
|
|
- },{
|
|
|
- name:'100万-150万',
|
|
|
- id:'100#150'
|
|
|
- },{
|
|
|
- name:'150万-200万',
|
|
|
- id:'150#200'
|
|
|
- },{
|
|
|
- name:'200万-250万',
|
|
|
- id:'200#250'
|
|
|
- },{
|
|
|
- name:'250万-300万',
|
|
|
- id:'250#300'
|
|
|
+const panelData = {
|
|
|
+ 'region': [{
|
|
|
+ id: 'quyu',
|
|
|
+ items: [{
|
|
|
+ name: '',
|
|
|
+ id: ''
|
|
|
}]
|
|
|
- }],
|
|
|
- 'woshi':[{
|
|
|
- id:'jushi',
|
|
|
- filter:'卧室',
|
|
|
- items:[{
|
|
|
- name:'不限',
|
|
|
- id:''
|
|
|
- },{
|
|
|
- name:'1',
|
|
|
- id:'1'
|
|
|
- },{
|
|
|
- name:'2',
|
|
|
- id:'2'
|
|
|
- },{
|
|
|
- name:'3',
|
|
|
- id:'3'
|
|
|
- },{
|
|
|
- name:'4',
|
|
|
- id:'4'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ id: 'didian',
|
|
|
+ items: [{
|
|
|
+ name: '不限',
|
|
|
+ id: ''
|
|
|
+ }]
|
|
|
+ },
|
|
|
+ {
|
|
|
+ id: 'xianshi',
|
|
|
+ items: [{
|
|
|
+ name: '不限',
|
|
|
+ id: ''
|
|
|
}]
|
|
|
+ }
|
|
|
+ ],
|
|
|
+ 'jiage': [{
|
|
|
+ id: 'jiage',
|
|
|
+ filter: '价格',
|
|
|
+ items: [{
|
|
|
+ name: '不限',
|
|
|
+ id: ''
|
|
|
+ }, {
|
|
|
+ name: '50万以下',
|
|
|
+ id: '0#50'
|
|
|
+ }, {
|
|
|
+ name: '50万-100万',
|
|
|
+ id: '50#100'
|
|
|
+ }, {
|
|
|
+ name: '100万-150万',
|
|
|
+ id: '100#150'
|
|
|
+ }, {
|
|
|
+ name: '150万-200万',
|
|
|
+ id: '150#200'
|
|
|
+ }, {
|
|
|
+ name: '200万-250万',
|
|
|
+ id: '200#250'
|
|
|
+ }, {
|
|
|
+ name: '250万-300万',
|
|
|
+ id: '250#300'
|
|
|
+ }]
|
|
|
+ }],
|
|
|
+ 'woshi': [{
|
|
|
+ id: 'jushi',
|
|
|
+ filter: '卧室',
|
|
|
+ items: [{
|
|
|
+ name: '不限',
|
|
|
+ id: ''
|
|
|
+ }, {
|
|
|
+ name: '1',
|
|
|
+ id: '1'
|
|
|
+ }, {
|
|
|
+ name: '2',
|
|
|
+ id: '2'
|
|
|
+ }, {
|
|
|
+ name: '3',
|
|
|
+ id: '3'
|
|
|
+ }, {
|
|
|
+ name: '4',
|
|
|
+ id: '4'
|
|
|
+ }]
|
|
|
}],
|
|
|
- 'yushi':[{
|
|
|
- id:'yushi',
|
|
|
- filter:'浴室',
|
|
|
- items:[{
|
|
|
- name:'不限',
|
|
|
- id:''
|
|
|
- },{
|
|
|
- name:'1',
|
|
|
- id:'1'
|
|
|
- },{
|
|
|
- name:'2',
|
|
|
- id:'2'
|
|
|
- },{
|
|
|
- name:'3',
|
|
|
- id:'3'
|
|
|
- },{
|
|
|
- name:'4',
|
|
|
- id:'4'
|
|
|
+ 'yushi': [{
|
|
|
+ id: 'yushi',
|
|
|
+ filter: '浴室',
|
|
|
+ items: [{
|
|
|
+ name: '不限',
|
|
|
+ id: ''
|
|
|
+ }, {
|
|
|
+ name: '1',
|
|
|
+ id: '1'
|
|
|
+ }, {
|
|
|
+ name: '2',
|
|
|
+ id: '2'
|
|
|
+ }, {
|
|
|
+ name: '3',
|
|
|
+ id: '3'
|
|
|
+ }, {
|
|
|
+ name: '4',
|
|
|
+ id: '4'
|
|
|
}]
|
|
|
-}]
|
|
|
+ }]
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -113,37 +118,50 @@ Page({
|
|
|
data: {
|
|
|
houses: [],
|
|
|
type_acive,
|
|
|
- tab_panel:panelData[type_acive]||[],
|
|
|
- icon_list: [
|
|
|
- {name: '总价',icon:'edit',type:"jiage"},
|
|
|
- {name: '卧室',icon:'write',type:"woshi"},
|
|
|
- {name: '浴室',icon:'write',type:"yushi"}
|
|
|
+ tab_panel: panelData[type_acive] || [],
|
|
|
+ icon_list: [{
|
|
|
+ name: '总价',
|
|
|
+ icon: 'edit',
|
|
|
+ type: "jiage"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '卧室',
|
|
|
+ icon: 'write',
|
|
|
+ type: "woshi"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '浴室',
|
|
|
+ icon: 'write',
|
|
|
+ type: "yushi"
|
|
|
+ }
|
|
|
],
|
|
|
fetcherData: {
|
|
|
page_num: 1,
|
|
|
city: '',
|
|
|
page_size: 10,
|
|
|
saleState: 1,
|
|
|
- district:'',
|
|
|
- price_s:'',
|
|
|
- rooms:'',
|
|
|
- bathRooms:'',
|
|
|
+ district: '',
|
|
|
+ price_s: '',
|
|
|
+ rooms: '',
|
|
|
+ bathRooms: '',
|
|
|
},
|
|
|
has_next: true,
|
|
|
navbarInitTop: 80,
|
|
|
- seachKey:'',
|
|
|
- currentCity:'珠海市'
|
|
|
+ seachKey: '',
|
|
|
+ currentCity: '珠海市'
|
|
|
// currentCity:''
|
|
|
},
|
|
|
|
|
|
- changeListType(e){
|
|
|
- let {type} = e.currentTarget.dataset
|
|
|
+ changeListType(e) {
|
|
|
+ let {
|
|
|
+ type
|
|
|
+ } = e.currentTarget.dataset
|
|
|
let obj = {
|
|
|
type_acive: type,
|
|
|
tab_panel: panelData[type]
|
|
|
}
|
|
|
-
|
|
|
- if (type===this.data.type_acive) {
|
|
|
+
|
|
|
+ if (type === this.data.type_acive) {
|
|
|
obj['type_acive'] = ''
|
|
|
}
|
|
|
this.setData({
|
|
|
@@ -153,46 +171,49 @@ Page({
|
|
|
this.setData(obj)
|
|
|
},
|
|
|
|
|
|
- getCityListByProv(){
|
|
|
+ getCityListByProv() {
|
|
|
// app.wxshowloading('拼命加载中...');
|
|
|
var province = app.globalData.province;
|
|
|
cityApi.getCityListByProv(province).then(res => {
|
|
|
let items = res.data
|
|
|
- let quyu = panelData['region'].find(item=>item.id==='quyu')
|
|
|
+ let quyu = panelData['region'].find(item => item.id === 'quyu')
|
|
|
quyu['items'] = items
|
|
|
|
|
|
- let city = items.find(sub=>sub.name===this.data.currentCity)
|
|
|
+ let city = items.find(sub => sub.name === this.data.currentCity)
|
|
|
city && this.getSubList({
|
|
|
- selectObj:{
|
|
|
- didian:LD,
|
|
|
- xianshi:LD,
|
|
|
- quyu:city
|
|
|
+ selectObj: {
|
|
|
+ didian: LD,
|
|
|
+ xianshi: LD,
|
|
|
+ quyu: city
|
|
|
},
|
|
|
- type:'quyu'
|
|
|
+ type: 'quyu'
|
|
|
})
|
|
|
}).finally(() => {
|
|
|
// wx.hideLoading()
|
|
|
})
|
|
|
},
|
|
|
|
|
|
- getSubList(data){
|
|
|
- let {selectObj,type} = data
|
|
|
+ getSubList(data) {
|
|
|
+ let {
|
|
|
+ selectObj,
|
|
|
+ type
|
|
|
+ } = data
|
|
|
let current = selectObj[type]
|
|
|
cityApi.getSubList(current.id).then(res => {
|
|
|
let items = res.data
|
|
|
let tmp = []
|
|
|
- if (type==='quyu') {
|
|
|
- tmp = panelData['region'].find(item=>item.id==='didian')
|
|
|
- let sub = panelData['region'].find(item=>item.id==='xianshi')
|
|
|
+ if (type === 'quyu') {
|
|
|
+ tmp = panelData['region'].find(item => item.id === 'didian')
|
|
|
+ let sub = panelData['region'].find(item => item.id === 'xianshi')
|
|
|
sub['items'] = [LD]
|
|
|
}
|
|
|
- if (type==='didian') {
|
|
|
- tmp = panelData['region'].find(item=>item.id==='xianshi')
|
|
|
+ if (type === 'didian') {
|
|
|
+ tmp = panelData['region'].find(item => item.id === 'xianshi')
|
|
|
}
|
|
|
items.unshift(LD)
|
|
|
tmp['items'] = tmp['items'] && items
|
|
|
this.setData({
|
|
|
- tab_panel:panelData['region']
|
|
|
+ tab_panel: panelData['region']
|
|
|
})
|
|
|
}).finally(() => {
|
|
|
// wx.hideLoading()
|
|
|
@@ -200,14 +221,14 @@ Page({
|
|
|
|
|
|
},
|
|
|
|
|
|
- comfirmhandle(e){
|
|
|
+ comfirmhandle(e) {
|
|
|
let data = e.detail
|
|
|
let fetData = this.data.fetcherData
|
|
|
console.log(data.jushi)
|
|
|
- let tmp = Object.assign(fetData,{
|
|
|
- price_s:data.jiage||fetData.price||'',
|
|
|
- room_s:data.jushi||'',
|
|
|
- bathRoom_s:data.yushi||''
|
|
|
+ let tmp = Object.assign(fetData, {
|
|
|
+ price_s: data.jiage || fetData.price || '',
|
|
|
+ room_s: data.jushi || '',
|
|
|
+ bathRoom_s: data.yushi || ''
|
|
|
})
|
|
|
this.closeTypeActive()
|
|
|
this.setData({
|
|
|
@@ -217,19 +238,22 @@ Page({
|
|
|
this.getHouseList()
|
|
|
},
|
|
|
|
|
|
- selecthandle(e){
|
|
|
- let {selectObj,type} = e.detail
|
|
|
- console.log( e.detail)
|
|
|
- if (type === 'quyu'||type === 'xianshi'||type === 'didian') {
|
|
|
+ selecthandle(e) {
|
|
|
+ let {
|
|
|
+ selectObj,
|
|
|
+ type
|
|
|
+ } = e.detail
|
|
|
+ console.log(e.detail)
|
|
|
+ if (type === 'quyu' || type === 'xianshi' || type === 'didian') {
|
|
|
this.getSubList(e.detail)
|
|
|
}
|
|
|
console.log(selectObj)
|
|
|
console.log(selectObj.jushi)
|
|
|
- let tmp = Object.assign(this.data.fetcherData,{
|
|
|
+ let tmp = Object.assign(this.data.fetcherData, {
|
|
|
// district:selectObj.didian.name,
|
|
|
- price_s:selectObj.jiage?selectObj.jiage.id:'',
|
|
|
- rooms:selectObj.jushi?selectObj.jushi.id:'',
|
|
|
- bathRooms:selectObj.yushi?selectObj.yushi.id:'',
|
|
|
+ price_s: selectObj.jiage ? selectObj.jiage.id : '',
|
|
|
+ rooms: selectObj.jushi ? selectObj.jushi.id : '',
|
|
|
+ bathRooms: selectObj.yushi ? selectObj.yushi.id : '',
|
|
|
// city: selectObj.quyu.name.replace('市', '')
|
|
|
city: ''
|
|
|
})
|
|
|
@@ -241,7 +265,7 @@ Page({
|
|
|
}
|
|
|
this.getHouseList()
|
|
|
},
|
|
|
- bindInputValue(e){
|
|
|
+ bindInputValue(e) {
|
|
|
const {
|
|
|
value
|
|
|
} = e.detail
|
|
|
@@ -249,15 +273,15 @@ Page({
|
|
|
seachKey: value
|
|
|
})
|
|
|
},
|
|
|
- tapSearch(){
|
|
|
+ tapSearch() {
|
|
|
this.setData({
|
|
|
'fetcherData.title': this.data.seachKey
|
|
|
})
|
|
|
this.getHouseList()
|
|
|
},
|
|
|
- closeTypeActive(){
|
|
|
+ closeTypeActive() {
|
|
|
this.setData({
|
|
|
- type_acive:''
|
|
|
+ type_acive: ''
|
|
|
})
|
|
|
},
|
|
|
// onReachBottomDistance: 50,
|
|
|
@@ -271,7 +295,7 @@ Page({
|
|
|
onShow: function () {
|
|
|
this.getInitData()
|
|
|
},
|
|
|
- getInitData(){
|
|
|
+ getInitData() {
|
|
|
this.getHouseList()
|
|
|
this.getCityListByProv()
|
|
|
},
|
|
|
@@ -296,19 +320,37 @@ Page({
|
|
|
isIphoneX: res
|
|
|
})
|
|
|
})
|
|
|
+
|
|
|
+
|
|
|
+ //订阅状态查询
|
|
|
+
|
|
|
+ if (getApp().globalData.token) {
|
|
|
+ wx.getSetting({
|
|
|
+ withSubscriptions: true,
|
|
|
+ success: (setting) => {
|
|
|
+ if (setting.subscriptionsSetting.itemSettings && setting.subscriptionsSetting.itemSettings['zWTBJFpALA3KR3qx1keYJCzJdVtRjFbxrnOJc_Htn-g']) {} else {
|
|
|
+ wx.showToast({
|
|
|
+ title: '请前往【我的】-【消息订阅】订阅带看提醒，否则无法带看。',
|
|
|
+ icon: 'none'
|
|
|
+ })
|
|
|
+ }
|
|
|
+ },
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
},
|
|
|
- stop () {
|
|
|
+ stop() {
|
|
|
return
|
|
|
},
|
|
|
onShareAppMessage: function (res) {
|
|
|
- var path ='/pages/index/index'
|
|
|
+ var path = '/pages/index/index'
|
|
|
return {
|
|
|
- title: 'RealtorEasier，海量复刻真房源',
|
|
|
- path: path,
|
|
|
- imageUrl: 'https://usa-4dkankan-project.oss-us-west-1.aliyuncs.com/4dHouse/share.png', // 分享的封面图
|
|
|
+ title: 'RealtorEasier，海量复刻真房源',
|
|
|
+ path: path,
|
|
|
+ imageUrl: 'https://usa-4dkankan-project.oss-us-west-1.aliyuncs.com/4dHouse/share.png', // 分享的封面图
|
|
|
}
|
|
|
- },
|
|
|
- getPermission:function(){
|
|
|
+ },
|
|
|
+ getPermission: function () {
|
|
|
var that = this;
|
|
|
return new Promise((resolve, reject) => {
|
|
|
wx.getLocation({
|
|
|
@@ -330,11 +372,11 @@ Page({
|
|
|
that.setData({
|
|
|
// 'fetcherData.city': city
|
|
|
})
|
|
|
-
|
|
|
+
|
|
|
that.getInitData()
|
|
|
app.ShowToast('定位城市：' + city)
|
|
|
},
|
|
|
- fail:function (res) {
|
|
|
+ fail: function (res) {
|
|
|
wx.showModal({
|
|
|
title: '定位失败，请手动选择城市',
|
|
|
});
|
|
|
@@ -350,4 +392,4 @@ Page({
|
|
|
})
|
|
|
})
|
|
|
}
|
|
|
-});
|
|
|
+});
|
