guolong
/
mini_program
0
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

gsy

master
ganshuyu 4 years ago
parent
deb56c0fa1
commit
ed6e9e2da0
4 changed files with 74 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app.json
  2. 4
      components/detail-announcement/detail-announcement.js
  3. 5
      components/ui-calendar/ui-calendar.wxss
  4. 83
      pages/look/look.js

2
app.json
Unescape View File

@ -1,8 +1,8 @@
{
"pages": [
"pages/calendar/calendar",
"pages/look/look",
"pages/auth/auth",
"pages/look/look",
"pages/auctionRecord/auctionRecord",
"pages/index/index",
"pages/calculation/calculation",

4
components/detail-announcement/detail-announcement.js
Unescape View File

@ -83,9 +83,9 @@ Component({
// }
// })
var proposedseriaId = this.properties.info.proposedseriaId
var proposedseriaId = 'CQ20210617152223'
// var proposedseriaId = 'CQ20210617152223'
var landListedId = this.properties.info.landListedId
var landListedId = 'CQ202106280037'
// var landListedId = 'CQ202106280037'
if (this.properties.info.transactionStatus == 'toBeListed') {
$api.AJAX('GET', 'applets/landtolistlonlat/list/' + proposedseriaId, true).then(res => {
var latitude = res.data[0].landLonLat.split(';')[0].split(',')[0]

5
components/ui-calendar/ui-calendar.wxss
Unescape View File

@ -78,12 +78,13 @@
/* 有挂牌数量日期 */
.active-back-two .item_view {
background: linear-gradient(to left, #FFCC00 0%, #FFCC00 50%, #ffffff 50%, #ffffff 100%);
background: linear-gradient(to right, #FFCC00 0%, #FFCC00 50%, #ffffff 50%, #ffffff 100%);
}
/* 有拍卖数量日期 */
.active-back-three .item_view {
background: linear-gradient(to left, #ffffff 0%, #ffffff 50%, #37F492 50%, #37F492 100%);
/* background: linear-gradient(to left, #ffffff 0%, #ffffff 50%, #37F492 50%, #37F492 100%); */
background: linear-gradient(to left, #37F492 0%, #37F492 50%, #ffffff 50%, #ffffff 100%);
}
/* 两个数量都有 */

83
pages/look/look.js
Unescape View File

@ -184,17 +184,23 @@ Page({
let log = number.substr(l, z - l);
let lag = number.substr(z, r - z);
console.log(lag, log)
let polygon = this.wkt2polygon(data.data[0].geom);
polygon.strokeColor = '#fe00fe';
polygon.strokeWidth = 2;
polygon.fillColor = '#00fe04' + util.ten2XO(50);
let polygons = [polygon];
// console.log(data)
this.setWKT1(data, 2)
// let polygon = this.wkt2polygon(data.data[0].geom);
// polygon.strokeColor = '#fe00fe';
// polygon.strokeWidth = 2;
// polygon.fillColor = '#00fe04' + util.ten2XO(50);
// let polygons = [polygon];
this.setData({
polygons,
// polygons,
latitude: lag,
longitude: log,
})
this.addFeaturesToList(data, 2);
}
})
},
@ -250,7 +256,7 @@ Page({
dialogVisible: true,
});
global.selectFeature = feature;
// console.log(feature)
console.log(555, feature)
//tid 代表地块类型，1:已出让，2:挂牌中；3：拟挂牌。
let tid = feature.tid;//tid:1,2,3
//属性property 包含 地块id字段，按需使用。
@ -259,10 +265,10 @@ Page({
console.log('添加---接口对接---获取地块数据------以下全部替换')
//变量 tid 代表地块类型，1:已出让，2:挂牌中；3：拟挂牌。
//变量 property 包含 地块id字段，按需使用。
// console.log(property);
console.log(121212, property);
// console.log(tid);
if (tid == 1 || tid == 2) {
$apiT.AJAX('GET', 'applets/landlisted/' + property.land_listed_id, true).then(res => {
$apiT.AJAX('GET', 'applets/landlisted/' + (property.land_listed_id || property.landListedId), true).then(res => {
this.setData({
titleLand: res.data.landCode,
landListedId: res.data.landListedId,
@ -273,7 +279,7 @@ Page({
});
})
} else {
$apiT.AJAX('GET', 'applets/landtolist/' + property.proposedseria_id, true).then(res => {
$apiT.AJAX('GET', 'applets/landtolist/' + (property.proposedseria_id || property.proposedseriaId), true).then(res => {
this.setData({
titleLand: res.data.landCode,
landListedId: res.data.proposedseriaId,
@ -491,6 +497,7 @@ Page({
longitude
} = e.detail;
let point = { latitude, longitude } // 地图点击点的经纬度
console.log(point);
let features = that.selectFeatureList(point);
console.log(features);
if (features && features.length > 0) {
@ -674,8 +681,10 @@ Page({
that.setData({
// latitude: latitude,
// longitude: longitude,
latitude: '29.57',
longitude: '106.55',
// latitude: '29.57',
// longitude: '106.55',
latitude: '29.53864220087573',
longitude: '106.50061908820558',
centerLocation: {
latitude,
longitude,
@ -777,7 +786,7 @@ Page({
addFeaturesToList(data, tid) {
let key = 'key' + tid;
let features = data.data.map(item => {
let geomPoints = WKT.parse(item.geoms).coordinates;
let geomPoints = WKT.parse(item.geoms || item.geom).coordinates;
let properties = item;
properties.tid = tid;//类型
let polygon = {
@ -889,7 +898,7 @@ Page({
} = this.data;
let newPolygons = data.data.map(item => {
console.log(item);
let geomPoints = WKT.parse(item.geoms);
let geomPoints = WKT.parse(item.geoms || item.geom);
console.log(geomPoints);
let points = [];
geomPoints.coordinates[0].forEach(ele => {
@ -926,6 +935,50 @@ Page({
polygons
})
},
//复制了一份，因为参数问题
setWKT1(data, id) {
let {
polygons
} = this.data;
let newPolygons = data.data.map(item => {
console.log(item);
let geomPoints = WKT.parse(item.geoms || item.geom);
console.log(geomPoints);
let points = [];
geomPoints.coordinates[0].forEach(ele => {
if (typeof (ele[0]) === 'number') {
points.push({
longitude: ele[0],
latitude: ele[1]
})
} else {
points = ele.map(once => {
let lonlat = {
longitude: once[0],
latitude: once[1]
}
return lonlat
})
}
})
let strokeColor = '' + item.lineColor + util.ten2XO(item.lineOpaqueness);
let strokeWidth = item.strokeWidth ? Number(item.strokeWidth) : 2;
let fillColor = '' + item.fillColor + util.ten2XO(item.fillOpaqueness);
let polygon = {
points,
strokeColor,
strokeWidth,
fillColor,
zIndex: 1,
id
}
return polygon
});
polygons = polygons.concat(newPolygons);
this.setData({
polygons
})
},

Write Preview
Loading…
Cancel
Save