feat:merge dev

src/components/ContainerStatus/src/ContainerStatus.vue

@@ -105,7 +105,7 @@ watch(
   height: 100%;
   overflow: auto;
   .container {
-    height: 394px;
+    height: 358px;
     padding-bottom: 8px;
     overflow: auto;
   }
@@ -113,9 +113,19 @@ watch(
     display: flex;
     flex-direction: column;
     align-items: center;
+<<<<<<< HEAD
     height: 394px;
     padding-top: 125px;
 
+=======
+    height: 358px;
+    .el-image {
+      width: 200px;
+      height: 200px;
+      margin-top: 20px;
+      object-fit: cover;
+    }
+>>>>>>> dev
     .empty-text {
       margin-top: 8px;
       color: #b5b9bf;

src/views/Booking/src/components/BookingDetail/src/components/EmailView.vue

@@ -302,6 +302,9 @@ const sendEmail = () => {
     padding-left: 0px;
 
     .avatar {
+      display: flex;
+      justify-content: center;
+      align-items: center;
       width: 24px;
       height: 24px;
       padding-top: 5px;

src/views/Layout/src/components/Header/HeaderView.vue

@@ -278,6 +278,9 @@ const handleLogin = () => {
 
 <style lang="scss" scoped>
 .header-avatar {
+  display: flex;
+  align-items: center;
+  justify-content: center;
   width: 24px;
   height: 24px;
   padding: 2px;
@@ -422,6 +425,9 @@ div.el-popover.el-popper.user-config-popover {
     height: 70px;
     border-bottom: 1px solid var(--color-user-config-title-bottom-border);
     & > .avatar {
+      display: flex;
+      align-items: center;
+      justify-content: center;
       width: 48px;
       height: 48px;
       padding-top: 7px;

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

@@ -305,6 +305,9 @@ const sendEmail = () => {
     padding-left: 0px;
 
     .avatar {
+      display: flex;
+      justify-content: center;
+      align-items: center;
       width: 24px;
       height: 24px;
       padding-top: 5px;

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

@@ -44,7 +44,11 @@ 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', {
@@ -348,7 +352,15 @@ onMounted(() => {
 })
 
 onUnmounted(() => {
+<<<<<<< HEAD
   map?.remove()
+=======
+  // 清除地图实例，防止内存泄漏
+  if (map) {
+    map.off() // 移除所有事件监听器
+    map.remove() // 移除地图
+  }
+>>>>>>> dev
 })
 </script>