Просмотр исходного кода

fix: 返回按钮在进入iframe后需要点击两次

chenlei 2 лет назад
Родитель
Сommit
754fabcc37
2 измененных файлов с 73 добавлено и 4 удалено
  1. 63 3
      public/limit.json
  2. 10 1
      src/components/back-btn/index.vue

+ 63 - 3
public/limit.json

@@ -1,12 +1,42 @@
 {
 {
   "江苏省文化和旅游厅": {
   "江苏省文化和旅游厅": {
     "南京博物院": {
     "南京博物院": {
-      "2023-08-15": 14,
+      "2023-08-15": 20,
       "2023-08-16": 20,
       "2023-08-16": 20,
       "2023-08-17": 20,
       "2023-08-17": 20,
       "2023-08-18": 20,
       "2023-08-18": 20,
       "2023-08-19": 50,
       "2023-08-19": 50,
-      "2023-08-20": 50
+      "2023-08-20": 50,
+      "2023-08-22": 20,
+      "2023-08-23": 20,
+      "2023-08-24": 20,
+      "2023-08-25": 20,
+      "2023-08-26": 50,
+      "2023-08-27": 50,
+      "2023-08-29": 20,
+      "2023-08-30": 20,
+      "2023-08-31": 20,
+      "2023-09-01": 20,
+      "2023-09-02": 50,
+      "2023-09-03": 50,
+      "2023-09-05": 20,
+      "2023-09-06": 20,
+      "2023-09-07": 20,
+      "2023-09-08": 20,
+      "2023-09-09": 50,
+      "2023-09-10": 50,
+      "2023-09-12": 20,
+      "2023-09-13": 20,
+      "2023-09-14": 20,
+      "2023-09-15": 20,
+      "2023-09-16": 50,
+      "2023-09-17": 50,
+      "2023-09-19": 20,
+      "2023-09-20": 20,
+      "2023-09-21": 20,
+      "2023-09-22": 20,
+      "2023-09-23": 50,
+      "2023-09-24": 50
     },
     },
     "扬州中国大运河博物馆": {
     "扬州中国大运河博物馆": {
       "2023-08-15": 15,
       "2023-08-15": 15,
@@ -14,7 +44,37 @@
       "2023-08-17": 15,
       "2023-08-17": 15,
       "2023-08-18": 15,
       "2023-08-18": 15,
       "2023-08-19": 30,
       "2023-08-19": 30,
-      "2023-08-20": 30
+      "2023-08-20": 30,
+      "2023-08-22": 15,
+      "2023-08-23": 15,
+      "2023-08-24": 15,
+      "2023-08-25": 15,
+      "2023-08-26": 30,
+      "2023-08-27": 30,
+      "2023-08-29": 15,
+      "2023-08-30": 15,
+      "2023-08-31": 15,
+      "2023-09-01": 15,
+      "2023-09-02": 30,
+      "2023-09-03": 30,
+      "2023-09-05": 15,
+      "2023-09-06": 15,
+      "2023-09-07": 15,
+      "2023-09-08": 15,
+      "2023-09-09": 30,
+      "2023-09-10": 30,
+      "2023-09-12": 15,
+      "2023-09-13": 15,
+      "2023-09-14": 15,
+      "2023-09-15": 15,
+      "2023-09-16": 30,
+      "2023-09-17": 30,
+      "2023-09-19": 15,
+      "2023-09-20": 15,
+      "2023-09-21": 15,
+      "2023-09-22": 15,
+      "2023-09-23": 30,
+      "2023-09-24": 30
     }
     }
   }
   }
 }
 }

+ 10 - 1
src/components/back-btn/index.vue

@@ -14,7 +14,16 @@ const props = defineProps<{
 }>();
 }>();
 
 
 const handleBack = () => {
 const handleBack = () => {
-  props.handleClick ? props.handleClick() : router.go(-1);
+  if (props.handleClick) {
+    props.handleClick();
+  } else {
+    const path = sessionStorage.getItem("lastRoute") || "/";
+    if (path.startsWith("/iframe")) {
+      router.replace({ path: "/" });
+    } else {
+      router.back();
+    }
+  }
 };
 };
 </script>
 </script>