From a580ece7b36721b123b6209d886bb133a13a1791 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 8 Sep 2022 10:50:03 +0800
Subject: [PATCH] wip

---
 beike/Installer/Views/finished.blade.php                | 2 +-
 resources/beike/admin/views/pages/login/login.blade.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/beike/Installer/Views/finished.blade.php b/beike/Installer/Views/finished.blade.php
index 783063b6..0b103de8 100644
--- a/beike/Installer/Views/finished.blade.php
+++ b/beike/Installer/Views/finished.blade.php
@@ -26,7 +26,7 @@
 
 			<div class="d-flex justify-content-center">
 				<a href="{{ url('/') }}" class="btn btn-lg btn-primary"><i class="bi bi-window-dock me-2"></i> {{ trans('installer::installer_messages.final.to_front') }}</a>
-				<a href="{{ url('/admin') }}" class="btn btn-lg btn-outline-primary ms-4"><i class="bi bi-window-sidebar me-2"></i> {{ trans('installer::installer_messages.final.to_admin') }}</a>
+				<a href="{{ url('/admin/login') }}?admin_email={{ $admin_email }}&admin_password={{ $admin_password }}" class="btn btn-lg btn-outline-primary ms-4"><i class="bi bi-window-sidebar me-2"></i> {{ trans('installer::installer_messages.final.to_admin') }}</a>
 			</div>
     </div>
   </div>
diff --git a/resources/beike/admin/views/pages/login/login.blade.php b/resources/beike/admin/views/pages/login/login.blade.php
index 1c0b32fa..0c4d0d2b 100644
--- a/resources/beike/admin/views/pages/login/login.blade.php
+++ b/resources/beike/admin/views/pages/login/login.blade.php
@@ -23,7 +23,7 @@
               @csrf
 
               <div class="form-floating mb-4">
-                <input type="text" name="email" class="form-control" id="email-input" value="{{ old('email') }}" placeholder="邮箱地址">
+                <input type="text" name="email" class="form-control" id="email-input" value="{{ old('email', $admin_email) }}" placeholder="{{ __('common.email') }}">
                 <label for="email-input">{{ __('common.email') }}</label>
                 @error('email')
                   <x-admin::form.error :message="$message" />
@@ -31,7 +31,7 @@
               </div>
 
               <div class="form-floating mb-5">
-                <input type="password" name="password" class="form-control" id="password-input" placeholder="{{ __('shop/login.password') }}">
+                <input type="password" name="password" class="form-control" id="password-input" value="{{ old('password', $admin_password) }}" placeholder="{{ __('shop/login.password') }}">
                 <label for="password-input">{{ __('shop/login.password') }}</label>
                 @error('password')
                   <x-admin::form.error :message="$message" />