diff --git a/src/apps/AppAskForm/Result.vue b/src/apps/AppAskForm/Result.vue index 185536cf..bd726760 100644 --- a/src/apps/AppAskForm/Result.vue +++ b/src/apps/AppAskForm/Result.vue @@ -35,7 +35,8 @@ export default { computed: { params() { - return this.$route.query || {} + let {linkUrl} = this.$route.query + return {...this.$route.query, linkUrl: decodeURIComponent(linkUrl)} || {} } }, mounted() { @@ -73,7 +74,7 @@ export default { }) }, confirm() { - uni.navigateBack({}) + uni.navigateBack({delta: -2}) } }, onShow() { diff --git a/src/apps/AppBuilding/components/searchMap.vue b/src/apps/AppBuilding/components/searchMap.vue index 2a801e3a..eaa7a3d7 100644 --- a/src/apps/AppBuilding/components/searchMap.vue +++ b/src/apps/AppBuilding/components/searchMap.vue @@ -26,8 +26,7 @@ 楼栋
列表
- +
- @@ -62,7 +61,7 @@ export default { polygons: [] } }, - computed: {...mapState(['user'])}, + computed: {...mapState(['user', 'config'])}, created() { this.$dict.load('girdType', 'girdLevel') this.areaId = this.user.areaId @@ -82,7 +81,7 @@ export default { arr.push(e.points.map(p => [p.lng, p.lat])) } }) - arr.length>0&&this.renderGridMap(arr) + arr.length > 0 && this.renderGridMap(arr) } }) }, @@ -94,33 +93,38 @@ export default { this.polygons.forEach(e => e.destroy()) this.polygons = [] } - let bounds = [] - paths.forEach((path, i) => { - let color = colors[i % colors.length] - let polygon = new TMap.MultiPolygon({ - map, styles: { - default: new TMap.PolygonStyle({ - showBorder: true, - borderColor: color, - borderWidth: 2, - color: this.$colorUtils.Hex2RGBA(color, 0.1), - borderDashArray: [10, 10] - }) - }, - geometries: [{paths: path.map(e => new TMap.LatLng(e[1], e[0]))}] + if (paths?.length > 0) { + let bounds = [] + paths.forEach((path, i) => { + let color = colors[i % colors.length] + let polygon = new TMap.MultiPolygon({ + map, styles: { + default: new TMap.PolygonStyle({ + showBorder: true, + borderColor: color, + borderWidth: 2, + color: this.$colorUtils.Hex2RGBA(color, 0.1), + borderDashArray: [10, 10] + }) + }, + geometries: [{paths: path.map(e => new TMap.LatLng(e[1], e[0]))}] + }) + this.polygons.push(polygon) + bounds.push(fitBounds(path.map(e => new TMap.LatLng(e[1], e[0])))) }) - this.polygons.push(polygon) - bounds.push(fitBounds(path.map(e => new TMap.LatLng(e[1], e[0])))) - }) - bounds = bounds.reduce((a, b) => { - return fitBounds([ - a.getNorthEast(), - a.getSouthWest(), - b.getNorthEast(), - b.getSouthWest(), - ]); - }); - map.fitBounds(bounds, {padding: 100}) + bounds = bounds.reduce((a, b) => { + return fitBounds([ + a.getNorthEast(), + a.getSouthWest(), + b.getNorthEast(), + b.getSouthWest(), + ]); + }); + map.fitBounds(bounds, {padding: 100}) + } else { + map.setCenter(this.config.latlng) + } + } else { if (count < 5) { setTimeout(() => { diff --git a/src/main.js b/src/main.js index 8b63de46..53c9857d 100644 --- a/src/main.js +++ b/src/main.js @@ -32,5 +32,8 @@ const app = new Vue({ store, ...App }); +store.dispatch("agentSign").then(config => { + store.commit("getConfig", {...config, latlng: [config.lat, config.lng]}) + app.$mount(); +}) -app.$mount();