Merge branch 'test' into dev_zyh

src/components/ContainerStatus/src/ContainerStatus.vue

@@ -10,7 +10,8 @@ const emptyImg = computed(() => {
   return themeStore.theme === 'dark' ? darkPng : lightPng
 })
 const props = defineProps({
-  data: Object
+  data: Object,
+  website: String
 })
 
 const activeNames = ref<number[]>([])
@@ -68,9 +69,9 @@ watch(
       <img :src="emptyImg" :class="{ 'is-dark': themeStore.theme === 'dark' }" alt="empty" />
       <div class="empty-text" style="">No data</div>
     </div>
-    <div class="footer">
+    <div class="footer" v-if="props.website">
       Tracking on carrier website:
-      <a href="http://www.rcjgroup.com/" target="_blank" class="link">http://www.rcjgroup.com/</a>
+      <a :href="props.website" target="_blank" class="link">{{ props.website }}</a>
     </div>
   </div>
 </template>
@@ -78,11 +79,13 @@ watch(
 <style lang="scss" scoped>
 .container-status {
   position: relative;
+  display: flex;
+  flex-direction: column;
   width: 100%;
   height: 100%;
   overflow: auto;
   .container {
-    height: 358px;
+    flex: 1;
     padding-bottom: 8px;
     overflow: auto;
   }

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

@@ -43,7 +43,7 @@ const handleTabClick = (name: string) => {
           activeName === 'containerStatus' && props.data?.transportInfo?.mode !== 'Air Freight'
         "
       >
-        <ContainerStatus :data="props.data?.containerStatusData" />
+        <ContainerStatus :data="props.data?.containerStatusData" :website="props.data?.website" />
       </template>
     </div>
   </div>
@@ -87,4 +87,4 @@ const handleTabClick = (name: string) => {
     border-bottom: none;
   }
 }
-</style>
+</style>