diff --git a/public/build/beike/admin/css/filemanager.css b/public/build/beike/admin/css/filemanager.css index 068d480c..05659951 100644 --- a/public/build/beike/admin/css/filemanager.css +++ b/public/build/beike/admin/css/filemanager.css @@ -14,23 +14,31 @@ body.page-filemanager .filemanager-wrap { body.page-filemanager .filemanager-wrap .filemanager-navbar { width: 20%; } -body.page-filemanager .filemanager-wrap .filemanager-divider { - position: absolute; - top: 0; - height: 100%; - left: 20%; - width: 10px; +body.page-filemanager .filemanager-wrap .filemanager-navbar .tree-wrap .el-tree-node__content { + height: 36px; +} +body.page-filemanager .filemanager-wrap .filemanager-navbar .tree-wrap .custom-tree-node { + width: 100%; display: flex; - justify-content: center; align-items: center; - cursor: move; + justify-content: space-between; +} +body.page-filemanager .filemanager-wrap .filemanager-navbar .tree-wrap .custom-tree-node .right span { + margin-right: 8px; +} +body.page-filemanager .filemanager-wrap .filemanager-navbar .tree-wrap .custom-tree-node .right span:hover { + color: #fd560f; +} +body.page-filemanager .filemanager-wrap .filemanager-divider { + top: 0; + width: 3px; + cursor: col-resize; } body.page-filemanager .filemanager-wrap .filemanager-divider:hover { - background: red; + background: #fd560f; } body.page-filemanager .filemanager-wrap .filemanager-content { - width: 80%; - padding-left: 10px; + flex: 1; display: flex; flex-direction: column; justify-content: space-between; @@ -39,6 +47,7 @@ body.page-filemanager .filemanager-wrap .filemanager-content .content-head { height: 56px; position: relative; display: flex; + background-color: #fff; align-items: center; justify-content: space-between; padding: 0 16px; @@ -54,16 +63,16 @@ body.page-filemanager .filemanager-wrap .filemanager-content .content-center { flex-wrap: wrap; background: #f9fafa; padding: 20px; - margin-right: -10px; + margin-right: -20px; overflow-y: auto; } body.page-filemanager .filemanager-wrap .filemanager-content .content-center .image-list { - width: calc(20% - 10px); + width: calc(20% - 20px); display: flex; flex-direction: column; margin-bottom: 20px; background: #fff; - margin-right: 10px; + margin-right: 20px; box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1); cursor: pointer; } @@ -91,8 +100,9 @@ body.page-filemanager .filemanager-wrap .filemanager-content .content-center .im body.page-filemanager .filemanager-wrap .filemanager-content .content-footer { height: 56px; padding: 0 16px; + background-color: #fff; display: flex; box-shadow: 0 -2px 4px rgba(0, 0, 0, 0.1); align-items: center; - justify-content: center; + justify-content: space-between; } diff --git a/public/catalog/demo/banner-1.png b/public/catalog/demo/banner-1.png new file mode 100644 index 00000000..a4d01a3c Binary files /dev/null and b/public/catalog/demo/banner-1.png differ diff --git a/public/catalog/demo/banner-2.png b/public/catalog/demo/banner-2.png new file mode 100644 index 00000000..6dd57b9c Binary files /dev/null and b/public/catalog/demo/banner-2.png differ diff --git a/public/catalog/demo/banner.png b/public/catalog/demo/banner.png new file mode 100644 index 00000000..19972158 Binary files /dev/null and b/public/catalog/demo/banner.png differ diff --git a/public/catalog/demo/footer-icon-1.png b/public/catalog/demo/footer-icon-1.png new file mode 100644 index 00000000..942ba9b5 Binary files /dev/null and b/public/catalog/demo/footer-icon-1.png differ diff --git a/public/catalog/demo/footer-payment.png b/public/catalog/demo/footer-payment.png new file mode 100644 index 00000000..e9be781e Binary files /dev/null and b/public/catalog/demo/footer-payment.png differ diff --git a/public/catalog/demo/image_plus_1.png b/public/catalog/demo/image_plus_1.png new file mode 100644 index 00000000..a63f6e42 Binary files /dev/null and b/public/catalog/demo/image_plus_1.png differ diff --git a/public/catalog/demo/image_plus_2.png b/public/catalog/demo/image_plus_2.png new file mode 100644 index 00000000..ae305b1a Binary files /dev/null and b/public/catalog/demo/image_plus_2.png differ diff --git a/public/catalog/demo/image_plus_3.png b/public/catalog/demo/image_plus_3.png new file mode 100644 index 00000000..a81630f9 Binary files /dev/null and b/public/catalog/demo/image_plus_3.png differ diff --git a/public/catalog/demo/image_plus_4.png b/public/catalog/demo/image_plus_4.png new file mode 100644 index 00000000..4555ef98 Binary files /dev/null and b/public/catalog/demo/image_plus_4.png differ diff --git a/public/catalog/demo/zhanweitu.png b/public/catalog/demo/zhanweitu.png new file mode 100644 index 00000000..302403b4 Binary files /dev/null and b/public/catalog/demo/zhanweitu.png differ diff --git a/public/catalog/image_plus_3.png b/public/catalog/image_plus_3.png new file mode 100644 index 00000000..a81630f9 Binary files /dev/null and b/public/catalog/image_plus_3.png differ diff --git a/resources/beike/admin/css/filemanager/app.scss b/resources/beike/admin/css/filemanager/app.scss index 96847a13..dd0eb705 100644 --- a/resources/beike/admin/css/filemanager/app.scss +++ b/resources/beike/admin/css/filemanager/app.scss @@ -17,28 +17,44 @@ body.page-filemanager { .filemanager-navbar { width: 20%; + + .tree-wrap { + .el-tree-node__content { + height: 36px; + } + + .custom-tree-node { + width: 100%; + display: flex; + align-items: center; // flex-start | center + justify-content: space-between; // flex-end | center | space-between + + .right { + span { + margin-right: 8px; + &:hover { + color: $primary; + } + } + } + } + } } .filemanager-divider { - position: absolute; top: 0; - height: 100%; - left: 20%; - width: 10px; - display: flex; - justify-content: center; - align-items: center; - // cursor: col-resize; - cursor: move; + width: 3px; + cursor: col-resize; &:hover { - background: red; + background: $primary; } } .filemanager-content { - width: 80%; - padding-left: 10px; + // width: 80%; + flex: 1; + // padding-left: 10px; display: flex; flex-direction: column; justify-content: space-between; @@ -47,6 +63,7 @@ body.page-filemanager { height: 56px; position: relative; display: flex; + background-color: #fff; align-items: center; // flex-start | center justify-content: space-between; // flex-end | center | space-between // flex-wrap: wrap; @@ -70,17 +87,17 @@ body.page-filemanager { padding: 20px; // justify-content: space-between; // flex-end | center | space-between // flex-wrap: wrap; - margin-right: -10px; + margin-right: -20px; overflow-y: auto; .image-list { - width: calc(20% - 10px); + width: calc(20% - 20px); display: flex; flex-direction: column; // align-items: center; margin-bottom: 20px; background: #fff; - margin-right: 10px; + margin-right: 20px; box-shadow: 0 0 2px 1px rgba(0, 0, 0, .1); cursor: pointer; // border: 1px solid transparent; @@ -114,10 +131,11 @@ body.page-filemanager { .content-footer { height: 56px; padding: 0 16px; + background-color: #fff; display: flex; box-shadow: 0 -2px 4px rgba(0, 0, 0, .1); align-items: center; // flex-start | center - justify-content: center; // flex-end | center | space-between + justify-content: space-between; } } } diff --git a/resources/beike/admin/views/pages/filemanager/index.blade.php b/resources/beike/admin/views/pages/filemanager/index.blade.php index 35fb2cbc..297118f7 100644 --- a/resources/beike/admin/views/pages/filemanager/index.blade.php +++ b/resources/beike/admin/views/pages/filemanager/index.blade.php @@ -15,19 +15,39 @@