From 0c565e52abba1947b31e47653d1eaac173f6a789 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Tue, 28 May 2024 18:32:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Forward.vue | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/views/Forward.vue b/src/views/Forward.vue
index 3097ca9c..a2f35614 100644
--- a/src/views/Forward.vue
+++ b/src/views/Forward.vue
@@ -27,29 +27,23 @@ import portalFooter from "@/components/PortalFooter.vue";
       if(params){
          this.url=this.url+'?'+params;
       }
-      window.addEventListener('hashchange', this.handleHashChange);
-    window.addEventListener('popstate', this.handlePopState);
+      window.addEventListener('message', this.handleMessageFromChild);
     },
     beforeDestroy() {
-    window.removeEventListener('hashchange', this.handleHashChange);
-    window.removeEventListener('popstate', this.handlePopState);
-  },
+      window.removeEventListener('message', this.handleMessageFromChild);
+    },
     methods:{
-      handleHashChange() {
-      this.navigate();
-    },
-    handlePopState() {
-      this.navigate();
-    },
-    navigate() {
-      const navigatePath = new URLSearchParams(window.location.search).get('navigate');
-      if (navigatePath) {
-        // 清除查询参数
-        window.history.replaceState({}, '', location.pathname);
-        // 导航
-        this.$refs.iframe.src = navigatePath;
-      }
-    },
+      handleMessageFromChild(event) {
+        if (event.origin !== process.env.VUE_APP_BOE_MOBILE_URL) return;
+        if (event.data && event.data.type === 'navigate') {
+          this.navigate(event.data.path);
+        }
+      },
+      navigate(path) {
+        this.$router.push({
+          path:path
+        })
+      },
     }
   }
 </script>

From 078d64f45d31c8deb1e7d2cd816179f2d849ca1f Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Thu, 30 May 2024 15:07:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=8E=92=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/user/ranking.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/user/ranking.vue b/src/views/user/ranking.vue
index 372fe06b..e890e5f0 100644
--- a/src/views/user/ranking.vue
+++ b/src/views/user/ranking.vue
@@ -32,7 +32,7 @@
           </div>
           <div class="myselftext">
              <div class="myranking">
-                 累计排名 :  <span> {{currentUserRankingTotalData.rankNo}}</span>
+                 当前排名 :  <span> {{currentUserRankingTotalData.rankNo}}</span>
              </div>
              <div class="myexperience">
                  累计经验值 :  <span>{{currentUserRankingTotalData.rankValue}}</span>
@@ -125,7 +125,7 @@
           </div>
           <div class="myselftext">
              <div class="myranking">
-                 累计排名 :  <span> {{learningDurationTotalData.rankNo}}</span>
+                 当前排名 :  <span> {{learningDurationTotalData.rankNo}}</span>
              </div>
              <div class="myexperience">
                  累计学习时长:  <span> {{formatSecondToHour(learningDurationTotalData.rankValue)}}</span> h
@@ -213,7 +213,7 @@
           </div>
           <div class="myselftext">
              <div class="myranking">
-                 累计排名 :  <span> {{learningDaysTotalData.rankNo}}</span>
+                 当前排名 :  <span> {{learningDaysTotalData.rankNo}}</span>
              </div>
              <div class="myexperience">
                  累计学习天数 :  <span>{{learningDaysTotalData.rankValue}}</span>