feat:merge dev

src/views/Tracking/src/components/TrackingDetail/src/components/MapView.vue

@@ -44,11 +44,7 @@ const initMap = () => {
     return
   }
 
-<<<<<<< HEAD
-  map = L.map('tracking-map', {}).setView([51.505, -0.09], 3)
-=======
   map = L.map('tracking-map', { scrollWheelZoom: false }).setView([51.505, -0.09], 3)
->>>>>>> dev
 
   // 添加 TileLayer
   L.tileLayer('https://map.kerryapex.com/osm_tiles/{z}/{x}/{y}.png', {
@@ -352,15 +348,11 @@ onMounted(() => {
 })
 
 onUnmounted(() => {
-<<<<<<< HEAD
-  map?.remove()
-=======
   // 清除地图实例，防止内存泄漏
   if (map) {
     map.off() // 移除所有事件监听器
     map.remove() // 移除地图
   }
->>>>>>> dev
 })
 </script>