diff --git a/src/project/xicheng/AppMerchanGird/AddMerchan.vue b/src/project/xicheng/AppMerchanGird/AddMerchan.vue index 6035fec1..b345b4c9 100644 --- a/src/project/xicheng/AppMerchanGird/AddMerchan.vue +++ b/src/project/xicheng/AppMerchanGird/AddMerchan.vue @@ -67,7 +67,7 @@ if (this.current > this.pages && this.current !== 1) return this.$loading() - this.$http.post('/app/appcompany/list', null, { + this.$http.post('/app/appgirdmembercompany/getUnbindCompany', null, { params: { size: 10, current: this.current, diff --git a/src/project/xicheng/AppMerchanStatistics/AppMerchanStatistics.vue b/src/project/xicheng/AppMerchanStatistics/AppMerchanStatistics.vue index 5e2478d4..fad74f3d 100644 --- a/src/project/xicheng/AppMerchanStatistics/AppMerchanStatistics.vue +++ b/src/project/xicheng/AppMerchanStatistics/AppMerchanStatistics.vue @@ -3,21 +3,21 @@

一级网格

-
-

中山门街道

+
+

{{ topGrid.girdName }}

-
+

二级网格

-
群策巷社区
+
{{ item.girdName }}
-
+

三级网格

专属网格

-

(12个)

+

({{ tertiaryGrid.length }}个)

@@ -26,12 +26,12 @@

数据统计

-
+
-

网格数

+

{{ index }}

- 12 + {{ item }}
@@ -52,8 +52,8 @@

网格列表

-
- 群策巷社区 +
+ {{ item.girdName }}
@@ -71,16 +71,44 @@ data () { return { isShowStreet: false, - isShowVillage: false + streetInfo: {}, + isShowVillage: false, + topGrid: [], + secondaryGrid: [], + tertiaryGrid: [] } }, onLoad () { - + this.getInfo() }, methods: { + getStatistics (girdId) { + this.$loading() + this.$http.post(`/api/appgirdinfo/girdInfoCountById?girdId=${girdId}`).then(res => { + if (res.code === 0) { + this.isShowStreet = true + this.streetInfo = res.data + } + }) + }, + getInfo () { + this.$http.post(`/api/appgirdinfo/listAllByTop`).then(res => { + if (res.code === 0) { + this.topGrid = res.data + + if (res.data.girdList.length) { + this.secondaryGrid = res.data.girdList + + res.data.girdList.forEach(e => { + this.tertiaryGrid.push(...e.girdList) + }) + } + } + }) + } } } diff --git a/src/project/xicheng/AppMerchantMap/AppMerchantMap.vue b/src/project/xicheng/AppMerchantMap/AppMerchantMap.vue index b1097473..66603e89 100644 --- a/src/project/xicheng/AppMerchantMap/AppMerchantMap.vue +++ b/src/project/xicheng/AppMerchantMap/AppMerchantMap.vue @@ -71,9 +71,6 @@ let {lib: TMap, map} = this if (map) { if (this.markers.length) { - console.log(this.MarkerCluster) - // this.MarkerCluster.destroy() - // this.MarkerCluster = null this.markers.forEach(v => { v.setMap(null) }) @@ -134,6 +131,7 @@ enableDefaultStyle: false, // 关闭默认样式 geometries: points.map(e => ({ position: new TMap.LatLng(e.lat, e.lng), + id: e.id, content: `${e.name}`, properties: {...e} })) || [], @@ -164,11 +162,12 @@ cls.push(clusterBubble) } else { //点标记样式 - let {content} = item.geometries?.[0] || {}, + let {content, id} = item.geometries?.[0] || {}, overlay = new ClusterBubble({map, position: item.center, content}) overlay.on('click', () => { - this.buildPopup = true - this.building = item.geometries?.[0]?.properties || {} + uni.navigateTo({ + url: `../AppMerchantManage/detail?id=${id}` + }) }) this.markers.push(overlay) }