diff --git a/beike/Installer/Views/environment-wizard.blade.php b/beike/Installer/Views/environment-wizard.blade.php
index 84a2a387..58db8114 100644
--- a/beike/Installer/Views/environment-wizard.blade.php
+++ b/beike/Installer/Views/environment-wizard.blade.php
@@ -1,204 +1,229 @@
@extends('installer::layouts.master')
@section('template_title')
- {{ trans('installer::installer_messages.environment.wizard.templateTitle') }}
+ {{ trans('installer::installer_messages.environment.wizard.templateTitle') }}
@endsection
@section('title')
-
- {!! trans('installer::installer_messages.environment.wizard.title') !!}
+
+ {!! trans('installer::installer_messages.environment.wizard.title') !!}
@endsection
-@section('container')
-
+
+
+
+
+ @if ($errors->has('mail_host'))
+
+
+ {{ $errors->first('mail_host') }}
+
+ @endif
+
+
+
+
+ @if ($errors->has('mail_port'))
+
+
+ {{ $errors->first('mail_port') }}
+
+ @endif
+
+
+
+
+ @if ($errors->has('mail_username'))
+
+
+ {{ $errors->first('mail_username') }}
+
+ @endif
+
+
+
+
+ @if ($errors->has('mail_password'))
+
+
+ {{ $errors->first('mail_password') }}
+
+ @endif
+
+
+
+
+ @if ($errors->has('mail_encryption'))
+
+
+ {{ $errors->first('mail_encryption') }}
+
+ @endif
+
+
+
@endsection
@section('scripts')
-
+
@endsection
diff --git a/beike/Installer/Views/finished.blade.php b/beike/Installer/Views/finished.blade.php
index 38f015dd..cb2001f4 100644
--- a/beike/Installer/Views/finished.blade.php
+++ b/beike/Installer/Views/finished.blade.php
@@ -9,7 +9,7 @@
{{ trans('installer::installer_messages.final.title') }}
@endsection
-@section('container')
+@section('content')
@if(session('message')['dbOutputLog'])
{{ trans('installer::installer_messages.final.migration') }}
diff --git a/beike/Installer/Views/layouts/master.blade.php b/beike/Installer/Views/layouts/master.blade.php
index f3332dad..4a28117e 100644
--- a/beike/Installer/Views/layouts/master.blade.php
+++ b/beike/Installer/Views/layouts/master.blade.php
@@ -1,67 +1,73 @@
-
-
-
-
-
- @if (trim($__env->yieldContent('template_title')))@yield('template_title') | @endif {{ trans('installer::installer_messages.title') }}
-
-
-
-
- @yield('style')
-
-
-
-
-
-
-
- @if (session('message'))
-
-
- @if(is_array(session('message')))
- {{ session('message')['message'] }}
- @else
- {{ session('message') }}
- @endif
-
-
- @endif
- @if(session()->has('errors'))
-
-
-
-
- {{ trans('installer::installer_messages.forms.errorTitle') }}
-
-
- @foreach($errors->all() as $error)
- - {{ $error }}
- @endforeach
-
-
- @endif
- @yield('container')
-
-
-
- @yield('scripts')
-
-
+
+
+
+
+
+
+
+ @if (trim($__env->yieldContent('template_title')))
+ @yield('template_title') |
+ @endif {{ trans('installer::installer_messages.title') }}
+
+
+
+
+
+
+
+ @yield('style')
+
+
+
+
+
+
+ @if (session('message'))
+
+
+ @if (is_array(session('message')))
+ {{ session('message')['message'] }}
+ @else
+ {{ session('message') }}
+ @endif
+
+
+ @endif
+ @if (session()->has('errors'))
+
+
+ @foreach ($errors->all() as $error)
+ - {{ $error }}
+ @endforeach
+
+
+ @endif
+
+ @yield('content')
+
+ @yield('scripts')
+
+
diff --git a/beike/Installer/Views/permissions.blade.php b/beike/Installer/Views/permissions.blade.php
index 3beb4776..b871089f 100644
--- a/beike/Installer/Views/permissions.blade.php
+++ b/beike/Installer/Views/permissions.blade.php
@@ -9,7 +9,7 @@
{{ trans('installer::installer_messages.permissions.title') }}
@endsection
-@section('container')
+@section('content')
@foreach($permissions['permissions'] as $permission)
diff --git a/beike/Installer/Views/requirements.blade.php b/beike/Installer/Views/requirements.blade.php
index fcd0fa8e..dd4c7a0d 100644
--- a/beike/Installer/Views/requirements.blade.php
+++ b/beike/Installer/Views/requirements.blade.php
@@ -1,50 +1,52 @@
@extends('installer::layouts.master')
@section('template_title')
- {{ trans('installer::installer_messages.requirements.templateTitle') }}
+ {{ trans('installer::installer_messages.requirements.templateTitle') }}
@endsection
@section('title')
-
- {{ trans('installer::installer_messages.requirements.title') }}
+
+ {{ trans('installer::installer_messages.requirements.title') }}
@endsection
-@section('container')
-
- @foreach($requirements['requirements'] as $type => $requirement)
-
- -
- {{ ucfirst($type) }}
- @if($type == 'php')
-
-
- (version {{ $phpSupportInfo['minimum'] }} required)
-
-
-
-
- {{ $phpSupportInfo['current'] }}
-
-
-
- @endif
-
- @foreach($requirements['requirements'][$type] as $extention => $enabled)
- -
- {{ $extention }}
-
-
- @endforeach
-
+@section('content')
+
+ @foreach ($requirements['requirements'] as $type => $requirement)
+
+ -
+ {{ ucfirst($type) }}
+ @if ($type == 'php')
+
+
+ (version {{ $phpSupportInfo['minimum'] }} required)
+
+
+
+
+ {{ $phpSupportInfo['current'] }}
+
+
+
+ @endif
+
+ @foreach ($requirements['requirements'][$type] as $extention => $enabled)
+ -
+ {{ $extention }}
+
+
+ @endforeach
+
@endforeach
- @if ( ! isset($requirements['errors']) && $phpSupportInfo['supported'] )
-
+ @if (!isset($requirements['errors']) && $phpSupportInfo['supported'])
+
@endif
+
@endsection
diff --git a/beike/Installer/Views/welcome.blade.php b/beike/Installer/Views/welcome.blade.php
index b03c4160..26b65fb1 100644
--- a/beike/Installer/Views/welcome.blade.php
+++ b/beike/Installer/Views/welcome.blade.php
@@ -8,7 +8,7 @@
{{ trans('installer::installer_messages.welcome.title') }}
@endsection
-@section('container')
+@section('content')
{{ trans('installer::installer_messages.welcome.message') }}
diff --git a/beike/Installer/assets/scss/_steps.scss b/beike/Installer/assets/scss/_steps.scss
new file mode 100644
index 00000000..d2b7959f
--- /dev/null
+++ b/beike/Installer/assets/scss/_steps.scss
@@ -0,0 +1,74 @@
+@charset "UTF-8";
+
+.aside-wrap {
+ .logo {
+ img {
+ max-width: 180px;
+ }
+ }
+
+ .steps-wrap {
+ ul {
+ padding-left: 0;
+ list-style: none;
+
+ li {
+ margin-bottom: 30px;
+ font-size: 16px;
+ color: #333;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+
+ .left {
+ display: flex;
+ align-items: center;
+ }
+
+ .right {
+ i {
+ font-size: 24px;
+ line-height: 1;
+ }
+ }
+
+ span.index {
+ width: 40px;
+ height: 40px;
+ border: 2px solid #ddd;
+ border-radius: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-right: 18px;
+ color: #666;
+ }
+
+ &.success {
+ color: #999;
+
+ span.index {
+ background-color: #5dca86;
+ border-color: #5dca86;
+ color: #fff;
+ i {
+ font-size: 24px;
+ }
+ }
+ }
+
+ &.ing {
+ color: $primary;
+
+ span.index {
+ border-color: $primary;
+ color: $primary;
+ i {
+ font-size: 24px;
+ }
+ }
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/beike/Installer/assets/scss/app.scss b/beike/Installer/assets/scss/app.scss
new file mode 100644
index 00000000..5973a6d8
--- /dev/null
+++ b/beike/Installer/assets/scss/app.scss
@@ -0,0 +1,25 @@
+@charset "UTF-8";
+
+$primary: #fd560f;
+
+body {
+ background-color: #f6f7f8;
+ display: flex;
+ height: 100vh;
+ // flex-direction: column;
+
+ > .aside-wrap {
+ width: 30%;
+ background-color: #fff;
+ padding: 40px 20px 40px 40px;
+ // flex: 1;
+ }
+
+ > .content {
+ width: 70%;
+ padding: 40px;
+ // flex: 1;
+ }
+}
+
+@import "steps";
diff --git a/public/build/beike/admin/js/app.js b/public/build/beike/admin/js/app.js
index 10eea3b3..98767625 100644
--- a/public/build/beike/admin/js/app.js
+++ b/public/build/beike/admin/js/app.js
@@ -2536,6 +2536,19 @@ axios.defaults.baseURL = base;
}
});
+/***/ }),
+
+/***/ "./beike/installer/assets/scss/app.scss":
+/*!**********************************************!*\
+ !*** ./beike/installer/assets/scss/app.scss ***!
+ \**********************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+// extracted by mini-css-extract-plugin
+
+
/***/ }),
/***/ "./resources/beike/admin/css/design/app.scss":
@@ -2937,7 +2950,8 @@ module.exports = JSON.parse('{"name":"axios","version":"0.21.4","description":"P
/******/ "build/beike/admin/css/filemanager": 0,
/******/ "build/beike/admin/css/app": 0,
/******/ "build/beike/admin/css/bootstrap": 0,
-/******/ "build/beike/admin/css/design": 0
+/******/ "build/beike/admin/css/design": 0,
+/******/ "build/beike/installer/app": 0
/******/ };
/******/
/******/ // no chunk on demand loading
@@ -2987,13 +3001,14 @@ module.exports = JSON.parse('{"name":"axios","version":"0.21.4","description":"P
/******/ // startup
/******/ // Load entry module and return exports
/******/ // This entry module depends on other loaded chunks and execution need to be delayed
-/******/ __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/admin/css/design"], () => (__webpack_require__("./resources/beike/admin/js/app.js")))
-/******/ __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/admin/css/design"], () => (__webpack_require__("./resources/beike/admin/css/bootstrap/bootstrap.scss")))
-/******/ __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/admin/css/design"], () => (__webpack_require__("./resources/beike/admin/css/app.scss")))
-/******/ __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/admin/css/design"], () => (__webpack_require__("./resources/beike/admin/css/filemanager/app.scss")))
-/******/ __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/admin/css/design"], () => (__webpack_require__("./resources/beike/shop/default/css/bootstrap/bootstrap.scss")))
-/******/ __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/admin/css/design"], () => (__webpack_require__("./resources/beike/shop/default/css/app.scss")))
-/******/ var __webpack_exports__ = __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/admin/css/design"], () => (__webpack_require__("./resources/beike/admin/css/design/app.scss")))
+/******/ __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/admin/css/design","build/beike/installer/app"], () => (__webpack_require__("./resources/beike/admin/js/app.js")))
+/******/ __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/admin/css/design","build/beike/installer/app"], () => (__webpack_require__("./resources/beike/admin/css/bootstrap/bootstrap.scss")))
+/******/ __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/admin/css/design","build/beike/installer/app"], () => (__webpack_require__("./resources/beike/admin/css/app.scss")))
+/******/ __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/admin/css/design","build/beike/installer/app"], () => (__webpack_require__("./resources/beike/admin/css/filemanager/app.scss")))
+/******/ __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/admin/css/design","build/beike/installer/app"], () => (__webpack_require__("./resources/beike/shop/default/css/bootstrap/bootstrap.scss")))
+/******/ __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/admin/css/design","build/beike/installer/app"], () => (__webpack_require__("./resources/beike/shop/default/css/app.scss")))
+/******/ __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/admin/css/design","build/beike/installer/app"], () => (__webpack_require__("./beike/installer/assets/scss/app.scss")))
+/******/ var __webpack_exports__ = __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/filemanager","build/beike/admin/css/app","build/beike/admin/css/bootstrap","build/beike/admin/css/design","build/beike/installer/app"], () => (__webpack_require__("./resources/beike/admin/css/design/app.scss")))
/******/ __webpack_exports__ = __webpack_require__.O(__webpack_exports__);
/******/
/******/ })()
diff --git a/public/build/beike/installer/app.css b/public/build/beike/installer/app.css
new file mode 100644
index 00000000..3fff76c6
--- /dev/null
+++ b/public/build/beike/installer/app.css
@@ -0,0 +1,70 @@
+body {
+ background-color: #f6f7f8;
+ display: flex;
+ height: 100vh;
+}
+body > .aside-wrap {
+ width: 30%;
+ background-color: #fff;
+ padding: 40px 20px 40px 40px;
+}
+body > .content {
+ width: 70%;
+ padding: 40px;
+}
+
+.aside-wrap .logo img {
+ max-width: 180px;
+}
+.aside-wrap .steps-wrap ul {
+ padding-left: 0;
+ list-style: none;
+}
+.aside-wrap .steps-wrap ul li {
+ margin-bottom: 30px;
+ font-size: 16px;
+ color: #333;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+.aside-wrap .steps-wrap ul li .left {
+ display: flex;
+ align-items: center;
+}
+.aside-wrap .steps-wrap ul li .right i {
+ font-size: 24px;
+ line-height: 1;
+}
+.aside-wrap .steps-wrap ul li span.index {
+ width: 40px;
+ height: 40px;
+ border: 2px solid #ddd;
+ border-radius: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-right: 18px;
+ color: #666;
+}
+.aside-wrap .steps-wrap ul li.success {
+ color: #999;
+}
+.aside-wrap .steps-wrap ul li.success span.index {
+ background-color: #5dca86;
+ border-color: #5dca86;
+ color: #fff;
+}
+.aside-wrap .steps-wrap ul li.success span.index i {
+ font-size: 24px;
+}
+.aside-wrap .steps-wrap ul li.ing {
+ color: #fd560f;
+}
+.aside-wrap .steps-wrap ul li.ing span.index {
+ border-color: #fd560f;
+ color: #fd560f;
+}
+.aside-wrap .steps-wrap ul li.ing span.index i {
+ font-size: 24px;
+}
diff --git a/public/image/favicon.png b/public/image/favicon.png
new file mode 100644
index 00000000..08b4a455
Binary files /dev/null and b/public/image/favicon.png differ
diff --git a/storage/installed-bak b/storage/installed-bak
new file mode 100644
index 00000000..e69de29b
diff --git a/webpack.mix.js b/webpack.mix.js
index 889eb318..8224ccb2 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -31,6 +31,10 @@ mix.sass('resources/beike/shop/default/css/bootstrap/bootstrap.scss', 'public/bu
mix.sass('resources/beike/shop/default/css/app.scss', 'public/build/beike/shop/default/css/app.css');
mix.js('resources/beike/shop/default/js/app.js', 'public/build/beike/shop/default/js/app.js');
+// 安装引导
+mix.sass('beike/installer/assets/scss/app.scss', 'public/build/beike/installer/app.css');
+
+
// design
mix.sass('resources/beike/admin/css/design/app.scss', 'public/build/beike/admin/css/design.css');