Browse Source

小程序城市切换修改

master
王健 4 years ago
parent
commit
b6ebddc5f9
  1. 7
      custom-tab-bar/index.js
  2. 4
      pages/calendar/calendar.js
  3. 10
      pages/look-list/look-list.js
  4. 52
      pages/look-list/look-list.wxml
  5. 89
      pages/look/look.js
  6. 46
      pages/look/look.wxml
  7. 2
      utils/api.js

7
custom-tab-bar/index.js

@ -27,11 +27,10 @@ Component({
switchTab(e) {
const data = e.currentTarget.dataset
const url = data.path
console.log(data)
wx.switchTab({url})
this.setData({
selected: data.index
})
// this.setData({
// selected: data.index
// })
}
}
})

4
pages/calendar/calendar.js

@ -136,9 +136,11 @@ Page({
})
}
$api.getCityList().then(res => {
let index = res.data.indexOf(CITY)
let city = wx.getStorageSync('city')
let index = res.data.indexOf(city)
if (index !== -1) {
this.setData({
cityName: city,
cityIndex: index
})
}

10
pages/look-list/look-list.js

@ -167,12 +167,14 @@ Page({
this.setData({
multiRegion: [data, ['全部']]
})
let index = data.indexOf(CITY);
if (CITY && CITY !== '' && index !== -1) {
$api.getAreaList(CITY).then(res => {
let city = wx.getStorageSync('city')
let index = data.indexOf(city);
if (city && city !== '' && index !== -1) {
$api.getAreaList(city).then(res => {
let data = res.data
data.unshift('全部')
this.setData({
'page.city': city,
multiIndex: [index],
'multiRegion[1]': data
})
@ -186,7 +188,7 @@ Page({
this.setData({
'multiRegion[1]': ['全部']
})
} else if (e.detail.column === 0){
} else if (e.detail.column === 0) {
let city = this.data.multiRegion[e.detail.column][e.detail.value];
$api.getAreaList(city).then(res => {
let data = res.data

52
pages/look-list/look-list.wxml

@ -17,12 +17,12 @@
sname: 'lp',
text: '流拍'
}
}else if (state === 'dealDone'){
} else if (state === 'dealDone') {
obj = {
sname: 'ycj',
text: '已成交'
}
}else {
} else {
obj = false
}
return obj
@ -38,10 +38,13 @@
class="form-input" bindinput="vmodel" type="text" />
</view> -->
<view class="look-search center {{is_search?'focusing':''}}" bindtap="searchFun">
<image class="look-s-icon" src="../../assets/images/search.png"></image>
<input type="text" focus="{{is_focusing}}" auto-focus="{{is_focusing}}" bindconfirm="refresh" model:value="{{page.landCode}}" hold-keyboard="true" bindinput="vmodel" bindblur="blurFun" placeholder="请输入搜索内容" />
<image class="del ml10" wx:if="{{page.landCode != '' && page.landCode}}" bindtap="emptyFun" src="../../assets/images/del-icon.png" mode="widthFix"></image>
</view>
<image class="look-s-icon" src="../../assets/images/search.png"></image>
<input type="text" focus="{{is_focusing}}" auto-focus="{{is_focusing}}" bindconfirm="refresh"
model:value="{{page.landCode}}" hold-keyboard="true" bindinput="vmodel" bindblur="blurFun"
placeholder="请输入搜索内容" />
<image class="del ml10" wx:if="{{page.landCode != '' && page.landCode}}" bindtap="emptyFun"
src="../../assets/images/del-icon.png" mode="widthFix"></image>
</view>
<view class="look-top-right flex-center" bindtap="comeBack">
@ -50,10 +53,10 @@
</view>
</view>
<view class="table">
<!-- 城市 -->
<!-- 城市 -->
<view style="margin-left:30rpx" class="table-item center">
<picker class="flex_center flex_items" mode="multiSelector" range="{{multiRegion}}"
value="{{multiIndex}}" bindchange="bindAddressChangeCity" bindcolumnchange="bindMultiPickerColumnChange">
<picker class="flex_center flex_items" mode="multiSelector" range="{{multiRegion}}" value="{{multiIndex}}"
bindchange="bindAddressChangeCity" bindcolumnchange="bindMultiPickerColumnChange">
<text>{{page.city}}{{page.canton?page.canton:'全部'}}</text>
<image class="table-icon" src="../../assets/images/tab-icon.png"></image>
</picker>
@ -81,7 +84,7 @@
bindchange="bindTimeChange" data-type="start">
<view class="picker centerIn">
<text> 开始时间:</text>
<input class="searchInput" disabled placeholder="拍卖开始时间" value="{{page.startDate}}"/>
<input class="searchInput" disabled placeholder="拍卖开始时间" value="{{page.startDate}}" />
</view>
</picker>
</view>
@ -90,7 +93,7 @@
bindchange="bindTimeChange">
<view class="picker centerIn">
<text> 结束时间:</text>
<input class="searchInput" disabled placeholder="拍卖结束时间" value="{{page.endDate}}"/>
<input class="searchInput" disabled placeholder="拍卖结束时间" value="{{page.endDate}}" />
</view>
</picker>
</view>
@ -103,7 +106,7 @@
<!-- 交易状态下拉 -->
<view class="displayDown" style="height:{{searchNode.sale.height}}rpx;bottom:{{searchNode.sale.bottom}}rpx">
<view class="searchDate" style="justify-content:center">
<view class="{{saleNum==i?'radioView isChose':'radioView'}}" wx:for="{{saleList}}" wx:for-index="i"
<view class="{{saleNum==i?'radioView isChose':'radioView'}}" wx:for="{{saleList}}" wx:for-index="i" wx:key="i"
wx:for-item="item" bindtap="changeRadio" data-num="{{i}}" data-type="sale">
{{item.label}}
</view>
@ -116,7 +119,7 @@
<!-- 测算状态下拉 -->
<view class="displayDown" style="height:{{searchNode.calcu.height}}rpx;bottom:{{searchNode.calcu.bottom}}rpx">
<view class="searchDate" style="justify-content:center">
<view class="{{calcuNum==i?'radioView isChose':'radioView'}}" wx:for="{{calcuList}}" wx:for-index="i"
<view class="{{calcuNum==i?'radioView isChose':'radioView'}}" wx:for="{{calcuList}}" wx:for-index="i" wx:key="i"
wx:for-item="item" bindtap="changeRadio" data-num="{{i}}" data-type="calcu">
{{item.label}}
</view>
@ -132,14 +135,17 @@
</view>
<scroll-view class="list" style="height:100%" scroll-y="{{setScroll}}" refresher-enabled
refresher-triggered="{{refresher}}" bindscrolltolower="getList" bindrefresherrefresh="refresh">
<view class="list-item" wx:for="{{list}}" wx:for-index="i" wx:for-item="item" bindtap="comeDetail"
data-status="{{item.transactionStatus}}"
data-id="{{item.landListedId}}">
<view class="list-item" wx:for="{{list}}" wx:for-index="i" wx:for-item="item" bindtap="comeDetail" wx:key="i"
data-status="{{item.transactionStatus}}" data-id="{{item.landListedId}}">
<image wx:if="{{item.transactionStatus == 'toBeListed'}}" class="item-img" src="../../assets/images/state-icon1.png"></image>
<image wx:elif="{{item.transactionStatus == 'listed'}}" class="item-img" src="../../assets/images/state-icon2.png"></image>
<image wx:elif="{{item.transactionStatus == 'passBy'}}" class="item-img" src="../../assets/images/state-icon3.png"></image>
<image wx:elif="{{item.transactionStatus == 'dealDone'}}" class="item-img" src="../../assets/images/state-icon4.png"></image>
<image wx:if="{{item.transactionStatus == 'toBeListed'}}" class="item-img"
src="../../assets/images/state-icon1.png"></image>
<image wx:elif="{{item.transactionStatus == 'listed'}}" class="item-img"
src="../../assets/images/state-icon2.png"></image>
<image wx:elif="{{item.transactionStatus == 'passBy'}}" class="item-img"
src="../../assets/images/state-icon3.png"></image>
<image wx:elif="{{item.transactionStatus == 'dealDone'}}" class="item-img"
src="../../assets/images/state-icon4.png"></image>
<image wx:else class="item-img" src="../../assets/images/list-img.png"></image>
@ -147,12 +153,12 @@
<view class="item-right">
<view class="list-info">
<view class="list-tag center {{filter.setTag(item.transactionStatus).sname}}"
wx:if="{{filter.setTag(item.transactionStatus)}}" >
<view class="list-tag center {{filter.setTag(item.transactionStatus).sname}}"
wx:if="{{filter.setTag(item.transactionStatus)}}">
{{filter.setTag(item.transactionStatus).text}}
</view>
<text class="list-title one-title" wx:if="{{item.transactionStatus=='toBeListed'}}">{{item.landCode}}</text>
<text class="list-title one-title" wx:else>{{item.annoId}}-{{item.landCode}}</text>
<text class="list-title one-title" wx:else>{{item.annoId}}-{{item.landCode}}</text>
</view>
<view class="list-detail">
<view class="detail-item" style="width:55%">计容建筑面积:{{item.totalConsArea}}㎡</view>

89
pages/look/look.js

@ -7,7 +7,6 @@ const gisUtil = require('../../utils/gitUtil')
const util = require('../../utils/util')
let qqmapsdk;
const global = {};
//年份范围
const date = new Date();
@ -23,8 +22,8 @@ for (let idx = min; idx < max; idx++) {
label: '' + idx + '年'
});
};
const CITY = wx.getStorageSync('city')
Page({
/**
* 页面的初始数据
@ -32,7 +31,7 @@ Page({
data: {
cityList: [],
cityIndex: 0,
cityName: '',
cityName: CITY,
switchYear: true,
satellite: 2,
scale: 13,
@ -156,11 +155,9 @@ Page({
this.inputFun();
},
inputFun() { //输入框输入内容
console.log(this.data.land_name);
$apiT.AJAX('get', 'applets/landlisted/page', {
landCode: this.data.land_name,
}, true).then(data => {
console.log(data);
if (data.code == 0) {
this.setData({
list_arr: data.data.records,
@ -169,7 +166,6 @@ Page({
})
},
chooseFun(e) { //选择看地列表
console.log(e)
let item = e.currentTarget.dataset.item;
this.setData({
land_name: item.landCode,
@ -183,23 +179,19 @@ Page({
getLatitude(landListedId) {
$apiT.AJAX('GET', 'applets/landlistedlonlat/list/' + landListedId, {
landListedId: landListedId,
}, true).then(data => {
console.log(data);
if (data.code == 0) {
let number = data.data[0].centerPoint;
console.log(number)
let l = number.indexOf('(') + 1;
let z = number.indexOf(' ');
let r = number.indexOf(')');
let log = number.substr(l, z - l);
let lag = number.substr(z, r - z);
this.setWKT1(data, 2)
this.setData({
// polygons,
latitude: lag,
longitude: log,
})
this.addFeaturesToList(data, 2);
}, true).then(res => {
if (res && res.data && res.data.length > 0) {
this.setWKT1(res, 3);
if (res.data[0].centerPoint) {
let centerPoint = res.data[0].centerPoint;
let point = WKT.parse(centerPoint);
this.setData({
latitude: point.coordinates[1],
longitude: point.coordinates[0],
})
this.setWKT1(res, 2)
this.addFeaturesToList(res, 2);
}
}
})
},
@ -240,17 +232,10 @@ Page({
dialogVisible: true,
});
global.selectFeature = feature;
console.log(555, feature)
//tid 代表地块类型,1:已出让,2:挂牌中;3:拟挂牌。
let tid = feature.tid; //tid:1,2,3
//属性property 包含 地块id字段,按需使用。
let property = feature.properties;
//添加---接口对接---获取地块数据------以下全部替换
console.log('添加---接口对接---获取地块数据------以下全部替换')
//变量 tid 代表地块类型,1:已出让,2:挂牌中;3:拟挂牌。
//变量 property 包含 地块id字段,按需使用。
console.log(121212, property);
// console.log(tid);
if (tid == 1 || tid == 2) {
$apiT.AJAX('GET', 'applets/landlisted/' + (property.land_listed_id || property.landListedId), true).then(res => {
this.setData({
@ -494,13 +479,9 @@ Page({
latitude,
longitude
} // 地图点击点的经纬度
console.log(point);
let features = that.selectFeatureList(point);
console.log(features);
if (features && features.length > 0) {
let f = features[0];
// console.log(f);
// console.log(f);
that.openLandInfo(f)
}
},
@ -546,7 +527,6 @@ Page({
markers: markers
})
}
// console.log(this.data.markers);
},
// 清除标记
clearPoint(id) {
@ -931,7 +911,6 @@ Page({
}
return polygon
});
// polygons = polygons.concat(newPolygons);
this.setData({
polygons: polygons.concat(newPolygons)
})
@ -981,7 +960,6 @@ Page({
}
return polygon
});
// polygons = polygons.concat(newPolygons);
this.setData({
polygons: polygons.concat(newPolygons)
})
@ -990,11 +968,14 @@ Page({
bindAddressChange(e) {
let city = this.data.cityList[e.detail.value]
wx.setStorageSync('city', city)
this.setCity(city);
},
setCity: function (city) {
let index = this.data.cityList.indexOf(city)
let that = this;
qqmapsdk.geocoder({
address: city,
sig:'FvbPshzJis7X9P4A5wbkLVnnOuYdtv',
sig: 'FvbPshzJis7X9P4A5wbkLVnnOuYdtv',
success: function (res) {
var latitude = res.result.location.lat;
var longitude = res.result.location.lng;
@ -1008,7 +989,19 @@ Page({
cityName: city,
cityIndex: index
})
this.checkBtn(2)
this.setData({
actives: [2]
})
let {
latitude,
longitude,
} = this.data.centerLocation;
this.deletPolygon(2);
this.removeFeaturesToList(2);
this.inQuotation({
latitude,
longitude
}, 2);
},
/**
* 生命周期函数--监听页面加载
@ -1032,17 +1025,6 @@ Page({
end: arryList[eIdx].value,
})
// this.scaleBack();
$apiT.getCityList().then(res => {
let index = res.data.indexOf(CITY)
if (index !== -1) {
this.setData({
cityIndex: index
})
}
this.setData({
cityList: res.data
})
})
},
/**
* 生命周期函数--监听页面显示
@ -1054,5 +1036,12 @@ Page({
selected: 1
})
}
$apiT.getCityList().then(res => {
this.setData({
cityList: res.data
})
})
let city = wx.getStorageSync('city')
this.setCity(city)
}
})

46
pages/look/look.wxml

@ -17,14 +17,14 @@
<view class="main">
<view class="look-top">
<view class="address">
<picker value="{{cityIndex}}" range="{{cityList}}" bindchange="bindAddressChange">
<view class="picker">
当前选择
</view>
</picker>
<text>{{cityName?cityName:"重庆"}}</text>
<image class="tag" src="../../assets/images/arrow-down.png"></image>
</view>
<picker value="{{cityIndex}}" range="{{cityList}}" bindchange="bindAddressChange">
<view class="picker">
当前选择
</view>
</picker>
<text>{{cityName?cityName:"重庆"}}</text>
<image class="tag" src="../../assets/images/arrow-down.png"></image>
</view>
<view class="look-search center {{is_search?'focusing':''}}" bindtap="searchFun">
<image class="look-s-icon" src="../../assets/images/search.png"></image>
<input type="text" focus="{{is_focusing}}" auto-focus="{{is_focusing}}" model:value="{{land_name}}"
@ -42,7 +42,7 @@
<view class="searchList" wx:if="{{ is_searchList}}">
<scroll-view class="list_ul pl20" scroll-y="true">
<view class="list_li ptb30 pr20" data-item="{{item}}" bindtap="chooseFun" wx:for="{{list_arr}}"
key="{{index}}">
wx:key="{{index}}">
<view class="title f32 c3 bold one-title">
{{item.landCode}}
</view>
@ -84,15 +84,15 @@
已出让
</view>
<view class="timer timer-start">
<picker range="{{years}}" header-text="开始年份" value="{{indexStart}}" range-key="label" disabled="{{switchYear}}"
bindchange="bindPickerChangeStart">
<picker range="{{years}}" header-text="开始年份" value="{{indexStart}}" range-key="label"
disabled="{{switchYear}}" bindchange="bindPickerChangeStart">
<text>{{start}}年</text>
</picker>
</view>
<text class="timer-link">-</text>
<view class="timer timer-end">
<picker range="{{years}}" header-text="结束年份" value="{{indexEnd}}" range-key="label" disabled="{{switchYear}}"
bindchange="bindPickerChangeEnd">
<picker range="{{years}}" header-text="结束年份" value="{{indexEnd}}" range-key="label"
disabled="{{switchYear}}" bindchange="bindPickerChangeEnd">
<text>{{end}}年</text>
</picker>
</view>
@ -140,8 +140,7 @@
bindclose="closeVisionDialog" title="图层设置">
<view class="tab-list1" slot="footer">
<view class="vision1" data-id="1" bindtap="mapTabItem">
<image data-type="reduce" mode="scaleToFill" class="vision_img"
src="../../assets/images/vision2.jpg">
<image data-type="reduce" mode="scaleToFill" class="vision_img" src="../../assets/images/vision2.jpg">
</image>
<view class="vision-font">卫星地图</view>
<view class="{{satellite==1?'blueActive':''}}">
@ -149,8 +148,7 @@
</view>
</view>
<view class="vision2" data-id="2" bindtap="mapTabItem">
<image data-type="reduce" mode="scaleToFill" class="vision_img"
src="../../assets/images/vision1.png">
<image data-type="reduce" mode="scaleToFill" class="vision_img" src="../../assets/images/vision1.png">
</image>
<view class="vision-font">标准地图</view>
<view class="{{satellite==2?'blueActive':''}}">
@ -161,16 +159,10 @@
</mp-half-screen-dialog>
<map class="map" enable-satellite="{{satellite==1?true:false}}" scale="{{scale}}" markers="{{markers}}"
latitude="{{latitude}}" longitude="{{longitude}}" bindmarkertap="markertap" polygons="{{polygons}}"
circles="{{circles}}" bindtap="onMapTaped" show-location>
<cover-image bindtap="changeVision" class="map-scale map-scale-vision"
src="../../assets/images/mapVision.png">
</cover-image>
<cover-image data-type="add" bindtap="showLayerSetting" class="map-scale map-scale-layer"
src="../../assets/images/add.png"></cover-image>
<cover-image data-type="reduce" bindtap="scaleBack" class="map-scale map-scale-reduce"
src="../../assets/images/myback.png"></cover-image>
circles="{{circles}}" bindtap="onMapTaped" show-location>
<cover-image bindtap="changeVision" class="map-scale map-scale-vision" src="../../assets/images/mapVision.png" />
<cover-image bindtap="showLayerSetting" class="map-scale map-scale-layer" src="../../assets/images/add.png" />
<cover-image bindtap="scaleBack" class="map-scale map-scale-reduce" src="../../assets/images/myback.png" />
</map>
</view>
</view>

2
utils/api.js

@ -11,7 +11,7 @@ const DELETE = 'DELETE';
function request(method, url, data, hasToke = true) {
let token = wx.getStorageSync('access_token')
let Authorization = token && hasToke ? `Bearer ${token}` : 'Basic YXBwOmFwcA==';
if (method === GET) {
if (method.toUpperCase() === GET) {
let city = wx.getStorageSync('city')
city = city ? city : defaultCity
if (url.indexOf('?') !== -1) {

Loading…
Cancel
Save