From 871fa17952c03199ae61ac71b578544d2836ef0f Mon Sep 17 00:00:00 2001
From: huangzhen <huangzhen@rd3.ngsoft.com>
Date: Fri, 13 Sep 2024 09:24:07 +0800
Subject: [PATCH] =?UTF-8?q?update=20@=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/base-dialog/index.scss | 5 ++---
 src/components/base-dialog/index.vue  | 2 +-
 src/router/index.ts                   | 5 +----
 src/views/home.vue                    | 4 ++--
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/components/base-dialog/index.scss b/src/components/base-dialog/index.scss
index 2aca338..3ee88a7 100644
--- a/src/components/base-dialog/index.scss
+++ b/src/components/base-dialog/index.scss
@@ -16,8 +16,7 @@
   }
 
   .dialog-text {
-    height: 55px;
-    line-height: 55px;
+    min-height: 55px;
     text-align: center;
     font-size: 15px;
     color: rgb(82, 77, 77);
@@ -33,6 +32,6 @@
     font-size: 19px;
     color: rgb(255, 255, 255);
     line-height: 45px;
-    margin: auto;
+    margin: 10px auto;
   }
 }
\ No newline at end of file
diff --git a/src/components/base-dialog/index.vue b/src/components/base-dialog/index.vue
index 01ab4d7..d30325b 100644
--- a/src/components/base-dialog/index.vue
+++ b/src/components/base-dialog/index.vue
@@ -4,7 +4,7 @@
     v-model:show="model"
     :width="width"
     :height="height"
-    :style="{ height: height }"
+    :style="{ minHeight: height }"
     :showConfirmButton="false"
     v-bind:close="close"
   >
diff --git a/src/router/index.ts b/src/router/index.ts
index 47c33df..523b04c 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -73,10 +73,7 @@ router.beforeEach(async (to, from, next) => {
     const strP = str[str.length - 1];
     localStorage.setItem("key", strP || "");
     next({
-      path: "/home",
-      query: {
-        key: strP || "",
-      }
+      name: 'home', query: { key: strP }
     });
   } else {
     next();
diff --git a/src/views/home.vue b/src/views/home.vue
index 6605cf4..dfcc5db 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -12,7 +12,7 @@ export default {
   name: 'home',
   data() {
     return {
-      key: this.$route.query.key || localStorage.getItem("openid") || '',
+      key: this.$route.query.key || localStorage.getItem("key") || '',
       loginBack: this.$route.query.loginBack,
       // jumpPath: this.$route.query.jumpPath,
       openid: this.$route.query.openid || localStorage.getItem("openid") || '', // 微信授权id
@@ -31,7 +31,7 @@ export default {
     if (!this.loginBack) {
       sessionStorage.clear();
       localStorage.clear();
-      this.key && localStorage.setItem("token", this.key);
+      this.key && localStorage.setItem("key", this.key);
       this.openid && localStorage.setItem("openid", this.openid);
       this.preLogic();
     } else {