From 8684e718fe85ff48875f025c688d3b3ad10a5e40 Mon Sep 17 00:00:00 2001
From: wally <18603454788@163.com>
Date: Fri, 3 Apr 2020 11:10:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=98=BE=E7=A4=BA=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/history-map/history-map.vue       | 41 +++++++++-----------
 pages/statistics/components/location-map.vue |  2 +
 store/modules/user/actions.js                |  1 -
 3 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/components/history-map/history-map.vue b/components/history-map/history-map.vue
index c68bcc7..fcbf9f5 100644
--- a/components/history-map/history-map.vue
+++ b/components/history-map/history-map.vue
@@ -7,18 +7,18 @@
     :polyline="polyline"
     id="map"
     ref="map"
+    scale="12"
     show-location="true"
-    :include-points="markers"
-    style="width: 100%; height: 1000rpx;"
+    style="width: 100%; min-height: 1000rpx;height:100%"
   />
 </template>
 
 <script>
 export default {
   props: {
-    markers: { type: Array, default: null },
-    polyline: { type: Array, default: null },
-    polygons: { type: Array, default: null },
+    markers: { type: Array, default: () => [] },
+    polyline: { type: Array, default: () => [] },
+    polygons: { type: Array, default: () => [] },
   },
   data() {
     return {
@@ -26,24 +26,19 @@ export default {
       longitude: 112.55067,
     };
   },
-
-  onLoad() {
-    this.getLocation();
-  },
-
-  methods: {
-    // 获取当前的地址位置
-    // 注意用国测局的数据 map只支持gcj02
-    getLocation() {
-      uni.getLocation({
-        type: 'gcj02',
-        success: res => {
-          this.longitude = res.longitude;
-          this.latitude = res.latitude;
-          console.log('当前位置的经度：' + res.longitude);
-          console.log('当前位置的纬度：' + res.latitude);
-        },
-      });
+  watch: {
+    markers: {
+      deep: true,
+      handler(value) {
+        if (value && value.length) {
+          const { latitude, longitude } = value[0];
+          this.latitude = latitude;
+          this.longitude = longitude;
+        } else {
+          this.latitude = 37.87059;
+          this.longitude = 112.55067;
+        }
+      },
     },
   },
 };
diff --git a/pages/statistics/components/location-map.vue b/pages/statistics/components/location-map.vue
index 5fc36c1..da398f4 100644
--- a/pages/statistics/components/location-map.vue
+++ b/pages/statistics/components/location-map.vue
@@ -33,6 +33,7 @@ export default {
       this.schoolSigns.forEach(item => {
         const content = `${item.siteName}\n${item.number}人`;
         const obj = {
+          id: Math.random(),
           latitude: item.latitude,
           longitude: item.longitude,
           iconPath: '/static/location.png',
@@ -48,6 +49,7 @@ export default {
         };
         result.push(obj);
       });
+      console.log('result: ', result);
 
       return result;
     },
diff --git a/store/modules/user/actions.js b/store/modules/user/actions.js
index 4028819..9a8f93a 100644
--- a/store/modules/user/actions.js
+++ b/store/modules/user/actions.js
@@ -78,7 +78,6 @@ const actions = {
         .post(GET_USER_INFO, params)
         .then(res => {
           hideLoading();
-          console.log('getUserInfo data: ', res.data);
           const { data } = res.data;
           resolve(data);
           // 获取自己的信息采取设置