+
系统环境检测
+
+
+ | 环境 |
+ 状态 |
+
+
+ @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
+
+ {{--
+ -
+ {{ ucfirst($type) }}
+ @if ($type == 'php')
+ (version {{ $phpSupportInfo['minimum'] }} required)
+
+ {{ $phpSupportInfo['current'] }}
+
+
+ @endif
+
+ @foreach ($requirements['requirements'][$type] as $extention => $enabled)
+ -
+ {{ $extention }}
+
+
+ @endforeach
+
--}}
@endforeach
-
- @endforeach
+
+
@if (!isset($requirements['errors']) && $phpSupportInfo['supported'])
-
-
@endsection
diff --git a/beike/Installer/Views/welcome.blade.php b/beike/Installer/Views/welcome.blade.php
index 26b65fb1..2e60780d 100644
--- a/beike/Installer/Views/welcome.blade.php
+++ b/beike/Installer/Views/welcome.blade.php
@@ -9,13 +9,17 @@
@endsection
@section('content')
-
- {{ trans('installer::installer_messages.welcome.message') }}
-
-
-
- {{ trans('installer::installer_messages.welcome.next') }}
-
-
-
+
@endsection
diff --git a/beike/Installer/assets/scss/_install-1.scss b/beike/Installer/assets/scss/_install-1.scss
new file mode 100644
index 00000000..33e4d495
--- /dev/null
+++ b/beike/Installer/assets/scss/_install-1.scss
@@ -0,0 +1,12 @@
+@charset "UTF-8";
+
+.install-1 {
+ .welcome-img {
+ max-width: 400px;
+ margin: 60px 0;
+ }
+
+ .guide-text {
+ max-width: 500px;
+ }
+}
\ No newline at end of file
diff --git a/beike/Installer/assets/scss/_steps.scss b/beike/Installer/assets/scss/_steps.scss
index d2b7959f..919e5c10 100644
--- a/beike/Installer/assets/scss/_steps.scss
+++ b/beike/Installer/assets/scss/_steps.scss
@@ -26,10 +26,7 @@
}
.right {
- i {
- font-size: 24px;
- line-height: 1;
- }
+ display: none;
}
span.index {
@@ -67,6 +64,14 @@
font-size: 24px;
}
}
+
+ .right {
+ display: block;
+ i {
+ font-size: 24px;
+ line-height: 1;
+ }
+ }
}
}
}
diff --git a/beike/Installer/assets/scss/app.scss b/beike/Installer/assets/scss/app.scss
index 5973a6d8..5c0b0b08 100644
--- a/beike/Installer/assets/scss/app.scss
+++ b/beike/Installer/assets/scss/app.scss
@@ -3,23 +3,23 @@
$primary: #fd560f;
body {
- background-color: #f6f7f8;
+ // background-color: #f6f7f8;
+ background-color: #f3f6f8;
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;
+ padding: 40px 60px;
}
}
@import "steps";
+@import "install-1";
+
diff --git a/public/build/beike/admin/js/app.js b/public/build/beike/admin/js/app.js
index 98767625..23121f12 100644
--- a/public/build/beike/admin/js/app.js
+++ b/public/build/beike/admin/js/app.js
@@ -2951,7 +2951,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.21.4","description":"P
/******/ "build/beike/admin/css/app": 0,
/******/ "build/beike/admin/css/bootstrap": 0,
/******/ "build/beike/admin/css/design": 0,
-/******/ "build/beike/installer/app": 0
+/******/ "install/css/app": 0
/******/ };
/******/
/******/ // no chunk on demand loading
@@ -3001,14 +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","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_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","install/css/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","install/css/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","install/css/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","install/css/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","install/css/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","install/css/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","install/css/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","install/css/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/install/css/app.css
similarity index 79%
rename from public/build/beike/installer/app.css
rename to public/install/css/app.css
index 3fff76c6..d57edbd7 100644
--- a/public/build/beike/installer/app.css
+++ b/public/install/css/app.css
@@ -1,5 +1,5 @@
body {
- background-color: #f6f7f8;
+ background-color: #f3f6f8;
display: flex;
height: 100vh;
}
@@ -10,7 +10,7 @@ body > .aside-wrap {
}
body > .content {
width: 70%;
- padding: 40px;
+ padding: 40px 60px;
}
.aside-wrap .logo img {
@@ -32,9 +32,8 @@ body > .content {
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 .right {
+ display: none;
}
.aside-wrap .steps-wrap ul li span.index {
width: 40px;
@@ -68,3 +67,18 @@ body > .content {
.aside-wrap .steps-wrap ul li.ing span.index i {
font-size: 24px;
}
+.aside-wrap .steps-wrap ul li.ing .right {
+ display: block;
+}
+.aside-wrap .steps-wrap ul li.ing .right i {
+ font-size: 24px;
+ line-height: 1;
+}
+
+.install-1 .welcome-img {
+ max-width: 400px;
+ margin: 60px 0;
+}
+.install-1 .guide-text {
+ max-width: 500px;
+}
diff --git a/public/install/image/install-1.png b/public/install/image/install-1.png
new file mode 100644
index 00000000..9b979b33
Binary files /dev/null and b/public/install/image/install-1.png differ
diff --git a/webpack.mix.js b/webpack.mix.js
index 8224ccb2..1c993b65 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -32,7 +32,7 @@ mix.sass('resources/beike/shop/default/css/app.scss', 'public/build/beike/shop/d
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');
+mix.sass('beike/installer/assets/scss/app.scss', 'public/install/css/app.css');
// design