From e8a8ba353faa52cca70c083dfc97ed75c7d1c3dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 17 Oct 2024 16:01:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                         | 2 +-
 src/layout/index.vue                    | 2 +-
 src/views/passport/loginToken/index.vue | 4 ++--
 src/views/system/profile/index.vue      | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.env.production b/.env.production
index f4821c9..b356e41 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
 VITE_APP_NAME=后台管理系统
 VITE_SOCKET_URL=wss://server.gxwebsoft.com
-VITE_SERVER_URL=https://server.websoft.top/api
+VITE_SERVER_URL=https://server.gxwebsoft.com/api
 VITE_THINK_URL=https://gxtyzx-api.websoft.top/api
 VITE_API_URL=https://modules.gxwebsoft.com/api
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 66b0be6..83da88e 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -129,7 +129,7 @@
   // 租户信息
   const { company } = storeToRefs(tenantStore);
   // 菜单数据
-  const { menus, config } = storeToRefs(userStore);
+  const { menus } = storeToRefs(userStore);
   // 网站名称
   const projectName = ref<string>('控制台');
   // 当前用户信息
diff --git a/src/views/passport/loginToken/index.vue b/src/views/passport/loginToken/index.vue
index 9fe54e3..9c97eb4 100644
--- a/src/views/passport/loginToken/index.vue
+++ b/src/views/passport/loginToken/index.vue
@@ -7,8 +7,8 @@
 
   if (getTokenBySpm()) {
     setToken(getTokenBySpm(), true);
-    localStorage.setItem('TenantId', String(getIdBySpm(5)));
-    localStorage.setItem('UserId', String(getIdBySpm(1)));
+    localStorage.setItem('TenantId', String(getIdBySpm(1)));
+    localStorage.setItem('UserId', String(getIdBySpm(5)));
     push('/');
   }
 </script>
diff --git a/src/views/system/profile/index.vue b/src/views/system/profile/index.vue
index fd58e69..f15bfd4 100644
--- a/src/views/system/profile/index.vue
+++ b/src/views/system/profile/index.vue
@@ -74,6 +74,7 @@
               <span class="ele-text-heading">{{ form.createTime }}</span>
             </a-form-item>
             <a-form-item label="到期时间" v-if="form.version != 30">
+              <a-tag color="red">已到期</a-tag>
               <span class="ele-text-heading">{{ form.expirationTime }}</span>
             </a-form-item>
             <a-divider style="padding-bottom: 20px" />