Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5

packages/effects/layouts/src/authentication/authentication.vue

@@ -50,12 +50,17 @@ const rememberMe = ref(false)
 
 // 页面加载时恢复用户名
 onMounted(() => {
-  const savedUser = localStorage.getItem('rememberedUser')
+  const savedUser = localStorage.getItem('rememberedUser');
   if (savedUser) {
-    username.value = savedUser
-    rememberMe.value = true
+    username.value = savedUser;
+    rememberMe.value = true;
   }
-})
+});
+function getRetUrlParam() {
+  const urlParams = new URLSearchParams(window.location.search);
+  return urlParams.get('returl');
+}
+const retUrl : string | null = getRetUrlParam();
 
 // 登录逻辑
 const login = () => {
@@ -96,6 +101,7 @@ const handleAccountLogin = async () => {
       password: password.value,
       tenantId: "000000",
       username: username.value,
+      retUrl: retUrl,
     });
   } catch (error) {
     console.error(error);
@@ -146,18 +152,18 @@ const handleAccountLogin = async () => {
       </div>
     </div>
   </div>
-  <div
+  <!-- <div
     :class="[isDark ? 'dark' : '']"
     class="flex min-h-full flex-1 select-none overflow-x-hidden"
     style="display: none;"
-  >
-    <template v-if="toolbar">
+  > -->
+    <!--<template v-if="toolbar">
       <slot name="toolbar">
         <Toolbar :toolbar-list="toolbarList" />
       </slot>
-    </template>
+    </template>-->
     <!-- 左侧认证面板 -->
-    <AuthenticationFormView
+    <!--<AuthenticationFormView
       v-if="authPanelLeft"
       class="min-h-full w-2/5 flex-1"
       transition-name="slide-left"
@@ -170,10 +176,10 @@ const handleAccountLogin = async () => {
           />
         </slot>
       </template>
-    </AuthenticationFormView>
+    </AuthenticationFormView>-->
 
     <!-- 头部 Logo 和应用名称 -->
-    <div
+    <!--<div
       v-if="logo || appName"
       class="absolute left-0 top-0 z-10 flex flex-1"
       @click="clickLogo"
@@ -186,10 +192,10 @@ const handleAccountLogin = async () => {
           {{ appName }}
         </p>
       </div>
-    </div>
+    </div>-->
 
     <!-- 系统介绍 -->
-    <div v-if="!authPanelCenter" class="relative hidden w-0 flex-1 lg:block">
+    <!--<div v-if="!authPanelCenter" class="relative hidden w-0 flex-1 lg:block">
       <div
         class="bg-background-deep absolute inset-0 h-full w-full dark:bg-[#070709]"
       >
@@ -211,10 +217,10 @@ const handleAccountLogin = async () => {
           </div>
         </div>
       </div>
-    </div>
+    </div>-->
 
     <!-- 中心认证面板 -->
-    <div v-if="authPanelCenter" class="flex-center relative w-full">
+    <!--<div v-if="authPanelCenter" class="flex-center relative w-full">
       <div class="login-background absolute left-0 top-0 size-full"></div>
       <AuthenticationFormView
         class="md:bg-background shadow-primary/5 shadow-float w-full rounded-3xl pb-20 md:w-2/3 lg:w-1/2 xl:w-[36%]"
@@ -228,10 +234,10 @@ const handleAccountLogin = async () => {
           </slot>
         </template>
       </AuthenticationFormView>
-    </div>
+    </div>-->
 
     <!-- 右侧认证面板 -->
-    <AuthenticationFormView
+    <!--<AuthenticationFormView
       v-if="authPanelRight"
       class="min-h-full w-[34%] flex-1"
     >
@@ -243,8 +249,8 @@ const handleAccountLogin = async () => {
           />
         </slot>
       </template>
-    </AuthenticationFormView>
-  </div>
+    </AuthenticationFormView>-->
+  <!-- </div> -->
 </template>
 
 <!-- <style scoped>