解决冲突

src/assets/less/index.less

@@ -1,63 +1,68 @@
+@import "./amap-item";
+
 .type-time {
-    padding-right: 4%;
-    padding-top: 3%;
-    font-size: 16px;
-    display: flex;
-    justify-content: right;
+  padding-right: 4%;
+  padding-top: 3%;
+  font-size: 16px;
+  display: flex;
+  justify-content: right;
 
-    span {
-        padding: 0 2%;
-        cursor: pointer;
+  span {
+    padding: 0 2%;
+    cursor: pointer;
+  }
+
+  .select {
+    color: #45a2ff;
+    position: relative;
+
+    &:after {
+      content: '';
+      position: absolute;
+      display: block;
+      width: 72%;
+      left: 6px;
+      bottom: -12px;
+      height: 6px;
+      background: url('../images/light.png') no-repeat;
+      background-size: 100% 100%;
     }
+  }
 
-    .select {
-        color: #45a2ff;
-        position: relative;
-
-        &:after {
-            content: '';
-            position: absolute;
-            display: block;
-            width: 72%;
-            left: 6px;
-            bottom: -12px;
-            height: 6px;
-            background: url('../images/light.png') no-repeat;
-            background-size: 100% 100%;
-        }
-    }
-
-    .unSelect {
-        color: #a3a4a4;
-    }
+  .unSelect {
+    color: #a3a4a4;
+  }
 }
 
 *::-webkit-scrollbar {
-    width: 12px;
-    height: 12px;
+  width: 12px;
+  height: 12px;
 }
 
 *::-webkit-scrollbar-button {
-    width: 0;
-    height: 0;
-    display: none;
+  width: 0;
+  height: 0;
+  display: none;
 }
 
 *::-webkit-scrollbar-corner {
-    background-color: transparent;
+  background-color: transparent;
 }
 
 *::-webkit-scrollbar-thumb {
-    border: 4px solid rgba(0, 0, 0, 0);
-    height: 6px;
-    border-radius: 25px;
-    background-clip: padding-box;
-    background-color: rgba(0, 0, 0, 0.3);
+  border: 4px solid rgba(0, 0, 0, 0);
+  height: 6px;
+  border-radius: 25px;
+  background-clip: padding-box;
+  background-color: rgba(0, 0, 0, 0.3);
 }
 
+//直升机
 .helicopter {
-    width: 60px;
-    height: 60px;
-    background: url('../img/helicopter.png') no-repeat;
-    background-size: 100% 100%;
+  width: 60px;
+  height: 37px;
+  background: url("../img/helicopter.png") no-repeat;
+  background-size: 100% 100%;
+  margin-bottom: 4px;
 }
+