From 8065baa5eb2e9161fbb38e3457ac1b1ceec34822 Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Thu, 21 Nov 2024 14:07:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=91=84=E5=83=8F=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/globalRouter.js       | 9 +++++----
 src/views/enforce/scanQrCode.vue | 4 ++--
 src/views/enforceHome.vue        | 6 +++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/common/globalRouter.js b/src/common/globalRouter.js
index 308fca6..b0bf51e 100644
--- a/src/common/globalRouter.js
+++ b/src/common/globalRouter.js
@@ -1,11 +1,11 @@
-import { createRouter, createWebHashHistory } from "vue-router";
+import { createRouter, createWebHistory, createWebHashHistory } from "vue-router";
 
 let routes = [
 	{
 		path: "/",
 		// redirect: "/home",
-		// redirect: "/enforceHome",
-		redirect: "/login",
+		redirect: "/enforceHome",
+		// redirect: "/login",
 		name: "App",
 	},
 	{
@@ -18,7 +18,8 @@ let routes = [
 routes = $globalRouterModules(routes); // 加载模块路由
 
 const $globalRouter = createRouter({
-	history: createWebHashHistory(),
+	// history: createWebHashHistory(),
+	history: createWebHistory(),
 	routes,
 });
 
diff --git a/src/views/enforce/scanQrCode.vue b/src/views/enforce/scanQrCode.vue
index 64fd303..7f50287 100644
--- a/src/views/enforce/scanQrCode.vue
+++ b/src/views/enforce/scanQrCode.vue
@@ -101,7 +101,7 @@
         let fullUrl = window.location.href;
         let code = fullUrl.substring(fullUrl.indexOf('code=') + 5, fullUrl.indexOf('&state='));
         let paramUrl = window.location.href.split("#")[0];
-        let param = {code: code, url: paramUrl};
+        let param = {code: code, url: fullUrl};
         szyptGetToken(param, success => {
             let resMsg = success.data;
             console.log(resMsg);
@@ -124,7 +124,7 @@
                 ClickScan()
             });
             wx.error((res) => {
-                console.log("获取失败");
+                console.log("获取失败", res);
             });
         }, error => {
         });
diff --git a/src/views/enforceHome.vue b/src/views/enforceHome.vue
index 593afcb..cec4c5d 100644
--- a/src/views/enforceHome.vue
+++ b/src/views/enforceHome.vue
@@ -1,7 +1,7 @@
 <template>
-   <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/>
-   <!-- <div class="home app_content" v-if="!isLoading"> -->
-    <div class="home app_content">
+<!--   <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/>-->
+   <div class="home app_content" v-if="!isLoading">
+<!--     <div class="home app_content">-->
         <!-- 导航栏 -->
         <!-- <div class="header_body">
                     <header-nav :leftArrow="false" titelText="执法监督码"></header-nav>