diff --git a/pages/look-detail/look-detail.js b/pages/look-detail/look-detail.js index 9bb66ac..3a23000 100644 --- a/pages/look-detail/look-detail.js +++ b/pages/look-detail/look-detail.js @@ -117,15 +117,16 @@ Page({ $api.AJAX('GET', 'applets/landlistedlonlat/list/' + id, { landListedId: id }, true).then(res => { - console.log(res); - if (res.data.length > 0) { - centerPoint = res.data[0].centerPoint; + if (res&&res.data&&res.data.length > 0) { this.setWKT1(res, 2) - let point = WKT.parse(centerPoint); - this.setData({ - latitude: point.coordinates[1], - longitude: point.coordinates[0], - }) + if(res.data[0].centerPoint){ + centerPoint = res.data[0].centerPoint; + let point = WKT.parse(centerPoint); + this.setData({ + latitude: point.coordinates[1], + longitude: point.coordinates[0], + }) + } } }) @@ -196,10 +197,10 @@ Page({ let { polygons } = this.data; - let newPolygons = data.data.map(item => { - console.log(item); + let newPolygons = data.data.filter(item=>{ + return item.geoms || item.geom; + }).map(item => { let geomPoints = WKT.parse(item.geoms || item.geom); - console.log(geomPoints); let points = []; geomPoints.coordinates[0].forEach(ele => { if (typeof (ele[0]) === 'number') { diff --git a/pages/look-detail/look-detail.wxss b/pages/look-detail/look-detail.wxss index 8981f78..c965a3b 100644 --- a/pages/look-detail/look-detail.wxss +++ b/pages/look-detail/look-detail.wxss @@ -79,9 +79,9 @@ .gener-title { flex: 1; text-indent: 10rpx; - overflow: hidden; + /* overflow: hidden; white-space: nowrap; - text-overflow: ellipsis; + text-overflow: ellipsis; */ font-size: 34rpx; font-weight: bold; color: #262936; diff --git a/pages/look/look.js b/pages/look/look.js index 23a4b1c..e67e2ca 100644 --- a/pages/look/look.js +++ b/pages/look/look.js @@ -902,7 +902,9 @@ Page({ let { polygons } = this.data; - let newPolygons = data.data.map(item => { + let newPolygons = data.data.filter(item=>{ + return item.geoms || item.geom; + }).map(item => { let geomPoints = WKT.parse(item.geoms || item.geom); console.log(geomPoints); let points = []; @@ -945,7 +947,9 @@ Page({ let { polygons } = this.data; - let newPolygons = data.data.map(item => { + let newPolygons = data.data.filter(item=>{ + return item.geoms || item.geom; + }).map(item => { let geomPoints = WKT.parse(item.geoms || item.geom); console.log(geomPoints); let points = []; diff --git a/pages/look/look.wxml b/pages/look/look.wxml index 19dffd1..3c55d58 100644 --- a/pages/look/look.wxml +++ b/pages/look/look.wxml @@ -35,11 +35,11 @@ + {{item.landCode}} + + {{item.characteristicName}} - diff --git a/pages/lookStay-detail/lookStay-detail.js b/pages/lookStay-detail/lookStay-detail.js index 7b4d97a..9c63261 100644 --- a/pages/lookStay-detail/lookStay-detail.js +++ b/pages/lookStay-detail/lookStay-detail.js @@ -100,8 +100,18 @@ Page({ }, getData() { - $api.AJAX('GET', 'applets/landtolistlonlat/list/' + this.data.landListedId, true).then(data => { - this.setWKT1(data, 3); + $api.AJAX('GET', 'applets/landtolistlonlat/list/' + this.data.landListedId, true).then(res => { + if (res&&res.data&&res.data.length > 0) { + this.setWKT1(res, 3); + if(res.data[0].centerPoint){ + centerPoint = res.data[0].centerPoint; + let point = WKT.parse(centerPoint); + this.setData({ + latitude: point.coordinates[1], + longitude: point.coordinates[0], + }) + } + } }) $api.AJAX('GET', 'applets/landtolist/' + this.data.landListedId, { id: this.data.landListedId }, true).then(res => { @@ -129,7 +139,7 @@ Page({ res.data.commerceSpaceRatio=0; } - + let totalConsArea = res.data.totalConsArea; this.setData({ myData: res.data }) @@ -163,7 +173,9 @@ Page({ let { polygons } = this.data; - let newPolygons = data.data.map(item => { + let newPolygons = data.data.filter(item=>{ + return item.geoms || item.geom; + }).map(item => { let geomPoints = WKT.parse(item.geoms || item.geom); console.log(geomPoints); let points = []; diff --git a/pages/lookStay-detail/lookStay-detail.wxss b/pages/lookStay-detail/lookStay-detail.wxss index 8981f78..c965a3b 100644 --- a/pages/lookStay-detail/lookStay-detail.wxss +++ b/pages/lookStay-detail/lookStay-detail.wxss @@ -79,9 +79,9 @@ .gener-title { flex: 1; text-indent: 10rpx; - overflow: hidden; + /* overflow: hidden; white-space: nowrap; - text-overflow: ellipsis; + text-overflow: ellipsis; */ font-size: 34rpx; font-weight: bold; color: #262936;