Merge remote-tracking branch 'origin/develop' into develop

chenyabin

2021-04-14 ca6c15a55e1aca6afc26885366eb7b23249b6968

 src/components/BaseNav/SolidWaste/SolidWaste.js

@@ -63,7 +63,7 @@
        // 点击 事件
        marker.on('click', (e) => {
          try {
            // console.log(e)
            console.log(e.target.getLatLng())
            this.setPanTo(e.target.getLatLng(), 200)
            this.EffectOfPulse(e.target.getLatLng())
            this.SolidWastePopup.setData(data[i], 'gufei')