From 7f11dd8eb2ac474cc9571fa7d0b97194c988e943 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Mon, 17 Jul 2023 20:04:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8B=A6=E6=88=AA=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main.js b/src/main.js
index f4a0580c6..b2bdb84a4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -66,13 +66,22 @@ import { Loading } from 'element-ui';
 
 // 路由拦截
 router.beforeEach(function (to, from, next) {
+  const currentURL = window.location.href
+  if (currentURL.indexOf('#/') > 0) {
+    const index = currentURL.indexOf('#/')
+    const startUrl = currentURL.slice(0, index)
+    const endUrl = currentURL.slice(index + 2)
+    window.location.href = startUrl + endUrl
+  }
   let loading = Loading.service({
     text: '加载中...',
     background: '#fff'
   });
   function closeLoading(){
-    loading.close()
-    loading = null
+    setTimeout(() => {
+      loading.close()
+      loading = null
+    }, 1000)
   }
   let fromName = from.name
   if(fromName === undefined || fromName === null){

From d5eb45f8b11261e960039501ddd15b417601d3a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Mon, 17 Jul 2023 20:15:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8B=A6=E6=88=AA=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/blankPage/index.vue | 3 ++-
 src/router/index.js           | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/blankPage/index.vue b/src/pages/blankPage/index.vue
index 160185587..117a20ca7 100644
--- a/src/pages/blankPage/index.vue
+++ b/src/pages/blankPage/index.vue
@@ -19,7 +19,8 @@ export default {
   },
   methods: {
     closeWindow(){
-        hwh5.close()
+        // hwh5.close()
+      this.$router.go(-2)
     }
   }
 }
diff --git a/src/router/index.js b/src/router/index.js
index 863051a93..7299ca608 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -4466,7 +4466,7 @@ Router.prototype.push = function push (location) {
 
 const router = new Router({
   routes,
-  mode: 'history', // default: hash ,history
+  mode: 'hash', // default: hash ,history
   scrollBehavior (to, from, savedPosition) {
     if (savedPosition) {
       return savedPosition