t

src/views/map/dtl.vue

@@ -50,9 +50,12 @@
           :animation="marker.animation"
           :offset="marker.offset"
           :extData="{index}"
+          :icon="marker.icon"
+          :title="marker.text"
           :events="markersEvents">
-          <div class="scoped-marker-text" :style="`color: ${marker.color}`">{{marker.content}}</div>
+          <div class="scoped-marker-text" v-if="!marker.icon" :style="`color: ${marker.color}`">{{marker.text}}</div>
         </el-amap-marker>
+          <!-- :label="{content: marker.text}" -->
       </template>
       <template v-else>
         <template v-if="mapDiyObj.isAreaShow === '1'">
@@ -539,11 +542,11 @@ export default {
 
 .scoped-marker-text {
   color: #fff;
-  min-width: 120px;
+  min-width: 100px;
   font-weight: bold;
-  box-shadow: 0 0 10px #fff;
+  box-shadow: 0 0 2px #fff;
   text-align: center;
-  padding: 6px 10px;
+  padding: 2px 6px;
   border-radius: 6px;
   background: #369af7;
 }
@@ -578,8 +581,8 @@ export default {
   opacity:0;
 }
 ::v-deep .amap-icon img {
-  width: 11px !important;
-  height: 11px !important;
+  width: 20px !important;
+  height: 20px !important;
 }
 
 .scoped-marker-area {