Merge branch 'develop/3.1.5' into test

src/pages/map/index.vue

@@ -244,11 +244,10 @@ export default {
       })
       const marker = new AMap.Marker({
         position: new AMap.LngLat(lng, lat),
-        offset: new AMap.Pixel(-5, -25),
-        icon: icon,
-        zoom: 16
+        offset: new AMap.Pixel(-20, -25),
+        icon: icon
       })
-      marker.setMap(this.map)
+      this.map.add(marker)
     },
 
     // 打开地图
@@ -342,6 +341,7 @@ export default {
     // 切换店铺
     changeActive(item, index) {
       this.active = index
+      this.map.setZoom(16)
       this.map.setCenter([item.longitude, item.latitude])
     },