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

project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue

@@ -218,6 +218,7 @@ export default {
         this.map = new AMap.Map('map', {
           resizeEnable: true,
           zooms: [6, 20],
+          center:[104.067923463,30.6799428454],
           zoom: 11,
         })
         this.placeSearch = new AMap.PlaceSearch({ map: this.map })
@@ -276,7 +277,7 @@ export default {
           zooms: [6, 20],
           zoom: 11,
         })
-        var marker = new AMap.Marker({
+        let marker = new AMap.Marker({
           position: new AMap.LngLat(lng,lat),
           title: address
         })

project/tianfuxing/AppMerchantList/AppMerchantList.vue

@@ -162,6 +162,7 @@ export default {
           resizeEnable: true,
           zooms: [6, 20],
           zoom: 11,
+          center:[104.067923463, 30.6799428454],
         })
         this.placeSearch = new AMap.PlaceSearch({ map: this.map })
         new AMap.AutoComplete({