Merge branch 'feature' of United_Software/k_online_ui into dev

src/router/index.ts

@@ -135,8 +135,17 @@ router.beforeEach(async (to, from, next) => {
 
   // 判断是否从systemMessage详情页跳转到systemMessage列表页，或者从systemMessage列表页跳转到systemMessage详情页
   if (
-    !(from.name === 'System Message Detail' || from.name === 'System Message' || !from.name) ||
-    !(to.name === 'System Message' || to.name === 'System Message Detail')
+    !(
+      from.name === 'System Message Detail' ||
+      from.name === 'System Message' ||
+      !from.name ||
+      from.name === 'Tracking Detail'
+    ) ||
+    !(
+      to.name === 'System Message' ||
+      to.name === 'System Message Detail' ||
+      to.name === 'Tracking Detail'
+    )
   ) {
     sessionStorage.removeItem('activeCardTypeName')
   }

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

@@ -174,9 +174,8 @@ const SubscribeShipments = () => {
             <span class="font_family icon-icon_log_b" style="margin-right: 4px"></span
             >AMS/ISF</el-button
           >
-
           <el-button
-            class="recent_button"
+            class="el-button--default"
             @click="SubscribeShipments"
             :class="is_subscribe ? 'IsSubscribe' : ''"
           >
@@ -558,18 +557,6 @@ const SubscribeShipments = () => {
   text-overflow: ellipsis; /* 超出部分显示省略号 */
 }
 
-.recent_button {
-  background-color: var(--color-white);
-  border: 1px solid var(--color-border);
-  &:hover {
-    border: 1px solid var(--color-btn-main-plain-bg-hover);
-    background-color: var(--color-btn-main-plain-bg-hover);
-    fill: var(--color-theme);
-    .Subscribe {
-      color: var(--color-theme);
-    }
-  }
-}
 .IsSubscribe {
   border: 1px solid var(--color-theme);
   background-color: var(--color-theme);

src/views/Tracking/src/components/TrackingTable/src/TrackingTable.vue

@@ -627,7 +627,6 @@ defineExpose({
           <span class="font_family icon-icon_vgm_b"></span>
           <span style="font-size: 12px">VGM</span>
         </el-button>
-
         <el-button
           class="recent_button el-button--blue"
           @click="SubscribeShipments(row)"