Merge branch 'v3.5.1' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into v3.5.1

src/components/amap/PoiAround.js

@@ -2,9 +2,32 @@ import Taro, { Component } from '@tarojs/taro'
 import { Map } from '@tarojs/components'
 import icons from './icons'
 
+const centerIcon = require('@assets/dingwei.png')
+const centerProject = 'project-999'
+
+function ObjEqual (a = {}, b = {}) { return JSON.stringify(a) === JSON.stringify(b) }
+
 export default class PoiAround extends Component {
+  map = null;
+
+  componentDidMount () {
+    this.map = wx.createMapContext('poi-around', this)
+  }
+
+  componentWillReceiveProps (nextProps) {
+    if (this.map) {
+      if (!ObjEqual(nextProps.markers, this.props.markers)) {
+        this.map.moveToLocation({
+          latitude: nextProps.latitude,
+          longitude: nextProps.longitude,
+        })
+      }
+    }
+  }
 
   handleTap = (e) => {
+    if (e.markerId === centerProject) return;
+
     const marker = this.props.markers.filter(x => x.id === e.markerId)[0]
     this.props.onMarkerClick && this.props.onMarkerClick(marker)
   }
@@ -24,9 +47,21 @@ export default class PoiAround extends Component {
       }
     })
 
+    // 最后放项目位置
+    markers.push({
+      id: centerProject,
+      latitude: this.props.latitude,
+      longitude: this.props.longitude,
+      iconPath: centerIcon,
+      width: 20,
+      height: 20,
+    })
+
     return this.props.longitude && (
       <Map
+        id="poi-around"
         showLocation
+        show-location={true}
         scale={12}
         markers={markers}
         longitude={this.props.longitude}