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

rk

4 天以前 609a1931953b2298016bd2b0d6b410666b5ad7b9

 bicycle/pages/maps/maps.vue

@@ -5,7 +5,7 @@
         :scale="16"
         class="ditu_map"
         :markers="markers"
         :show-location="true"
         :show-location="mapShowLocation"
         :polygons="eleBusinessArea"
         :latitude="latitude"
         :longitude="longitude"
@@ -59,6 +59,7 @@
            show: false,
            latitude: '',
            longitude: '',
            mapShowLocation: false,
            markers: [],
            info: {},
            rice: '',
@@ -181,6 +182,7 @@
               altitude: true,
               isHighAccuracy: true,
               success: function(res) {
                  that.mapShowLocation = true
                  that.latitude = res.latitude
                  that.longitude = res.longitude
                  if (that.type == 1) {