Merge branch 'feature' into feat_system_g

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')
   }