Merge remote-tracking branch 'origin/dev1.4' into dev1.4

storePages/store/store-choose.vue

@@ -212,9 +212,9 @@
                     this.markers.push(
                         {
                             id: i,
-                            iconPath: '/static/index/u55.png',
-                            width: 30,
-                            height: 30,
+                            iconPath: '/static/index/address.png',
+                            width: 28,
+                            height: 35,
                             latitude: p.latitude,
                             longitude: p.longitude,
                             // joinCluster: true, // 指定了该参数才会参与聚合