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('控制台'); // 当前用户信息 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('/'); } 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 @@ {{ form.createTime }} + 已到期 {{ form.expirationTime }}