diff --git a/public/build/beike/shop/default/css/app.css b/public/build/beike/shop/default/css/app.css index 927fa52f..fe4eab7a 100644 --- a/public/build/beike/shop/default/css/app.css +++ b/public/build/beike/shop/default/css/app.css @@ -1,4 +1,37 @@ @charset "UTF-8"; +@font-face { + font-family: "iconfont"; + src: url("/vendor/iconfont/iconfont.woff") format("woff"), url("/vendor/iconfont/iconfont.ttf") format("truetype"); + /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ +} +.iconfont { + font-family: "iconfont"; + font-size: 1rem; + font-style: normal; + -webkit-font-smoothing: antialiased; + -webkit-text-stroke-width: 0.2px; + -moz-osx-font-smoothing: grayscale; +} + +.module-title { + font-size: 1.5rem; + text-align: center; + font-weight: bold; + position: relative; + padding-bottom: 10px; + margin-bottom: 2rem; +} +.module-title:after { + position: absolute; + bottom: 0; + transform: translateX(-50%); + left: 50%; + content: ""; + width: 100px; + height: 1px; + background: #FD560F; +} + header .top-wrap { height: 44px; background: #F7F8FA; @@ -29,16 +62,36 @@ header .header-content .right-btn .nav-link i { font-size: 1.1rem; } -@font-face { - font-family: "iconfont"; - src: url("/vendor/iconfont/iconfont.woff") format("woff"), url("/vendor/iconfont/iconfont.ttf") format("truetype"); - /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ +.module-image-plus .module-image-plus-top { + display: flex; } -.iconfont { - font-family: "iconfont"; - font-size: 1rem; - font-style: normal; - -webkit-font-smoothing: antialiased; - -webkit-text-stroke-width: 0.2px; - -moz-osx-font-smoothing: grayscale; +.module-image-plus .module-image-plus-top .right { + margin-left: 20px; +} +.module-image-plus .module-image-plus-bottom { + margin-top: 20px; +} + +.product-wrap { + margin-bottom: 26px; + text-align: center; +} +.product-wrap .image { + margin-bottom: 10px; +} +.product-wrap .product-name { + margin-bottom: 6px; +} +.product-wrap .product-price .price-new { + color: #fd560f; + font-weight: bold; +} +.product-wrap .product-price .price-lod { + color: #aaa; + margin-left: 4px; + text-decoration: line-through; +} + +.module-brand .brand-item { + margin-bottom: 20px; } diff --git a/public/build/beike/shop/default/css/bootstrap.css b/public/build/beike/shop/default/css/bootstrap.css index d69a88c5..341e492f 100644 --- a/public/build/beike/shop/default/css/bootstrap.css +++ b/public/build/beike/shop/default/css/bootstrap.css @@ -10018,3 +10018,7 @@ h3 { border-color: #dee2e6; } } +.container-fluid, .container-sm, .container-md, .container-lg, .container-xl { + padding-right: 50px; + padding-left: 50px; +} diff --git a/public/image/default/banner-2.png b/public/image/default/banner-2.png new file mode 100644 index 00000000..6dd57b9c Binary files /dev/null and b/public/image/default/banner-2.png differ diff --git a/public/image/default/zhanweitu.png b/public/image/default/zhanweitu.png new file mode 100644 index 00000000..302403b4 Binary files /dev/null and b/public/image/default/zhanweitu.png differ diff --git a/public/vendor/iconfont/iconfont.ttf b/public/vendor/iconfont/iconfont.ttf index 727aca17..df91bdcd 100644 Binary files a/public/vendor/iconfont/iconfont.ttf and b/public/vendor/iconfont/iconfont.ttf differ diff --git a/public/vendor/iconfont/iconfont.woff b/public/vendor/iconfont/iconfont.woff index 232ff88d..263ad33f 100644 Binary files a/public/vendor/iconfont/iconfont.woff and b/public/vendor/iconfont/iconfont.woff differ diff --git a/public/vendor/iconfont/iconfont.woff2 b/public/vendor/iconfont/iconfont.woff2 index b97f0801..31962438 100644 Binary files a/public/vendor/iconfont/iconfont.woff2 and b/public/vendor/iconfont/iconfont.woff2 differ diff --git a/resources/beike/shop/default/app.scss b/resources/beike/shop/default/app.scss index 0e115524..ea26abcf 100644 --- a/resources/beike/shop/default/app.scss +++ b/resources/beike/shop/default/app.scss @@ -1,4 +1,11 @@ @charset "UTF-8"; +$primary: #fd560f; + +@import './iconfont'; +@import './global'; + @import './header'; -@import './iconfont'; \ No newline at end of file +@import './module-image-plus'; +@import './product-style'; +@import './module-brand'; \ No newline at end of file diff --git a/resources/beike/shop/default/bootstrap/bootstrap.scss b/resources/beike/shop/default/bootstrap/bootstrap.scss index 2de33bea..1af3700e 100644 --- a/resources/beike/shop/default/bootstrap/bootstrap.scss +++ b/resources/beike/shop/default/bootstrap/bootstrap.scss @@ -12,3 +12,8 @@ $primary: #fd560f; $font-size-base: 0.8rem; @import 'node_modules/bootstrap/scss/bootstrap'; + +.container-fluid { + padding-right: 50px; + padding-left: 50px; +} \ No newline at end of file diff --git a/resources/beike/shop/default/global.scss b/resources/beike/shop/default/global.scss new file mode 100644 index 00000000..260f16d4 --- /dev/null +++ b/resources/beike/shop/default/global.scss @@ -0,0 +1,21 @@ +@charset "UTF-8"; + +.module-title { + font-size: 1.5rem; + text-align: center; + font-weight: bold; + position: relative; + padding-bottom: 10px; + margin-bottom: 2rem; + + &:after { + position: absolute; + bottom: 0; + transform:translateX(-50%); + left: 50%; + content: ''; + width: 100px; + height: 1px; + background: #FD560F; + } +} \ No newline at end of file diff --git a/resources/beike/shop/default/module-brand.scss b/resources/beike/shop/default/module-brand.scss new file mode 100644 index 00000000..4d0bb649 --- /dev/null +++ b/resources/beike/shop/default/module-brand.scss @@ -0,0 +1,7 @@ +@charset "UTF-8"; + +.module-brand { + .brand-item { + margin-bottom: 20px; + } +} \ No newline at end of file diff --git a/resources/beike/shop/default/module-image-plus.scss b/resources/beike/shop/default/module-image-plus.scss index d271fae7..97f87035 100644 --- a/resources/beike/shop/default/module-image-plus.scss +++ b/resources/beike/shop/default/module-image-plus.scss @@ -1,5 +1,15 @@ @charset "UTF-8"; .module-image-plus { + .module-image-plus-top { + display: flex; + .right { + margin-left: 20px; + } + } + + .module-image-plus-bottom { + margin-top: 20px; + } } \ No newline at end of file diff --git a/resources/beike/shop/default/module-tab-product.scss b/resources/beike/shop/default/module-tab-product.scss new file mode 100644 index 00000000..2b0ba756 --- /dev/null +++ b/resources/beike/shop/default/module-tab-product.scss @@ -0,0 +1,9 @@ +@charset "UTF-8"; + +.module-tab-product { + .nav { + .nav-link { + color: #333; + } + } +} \ No newline at end of file diff --git a/resources/beike/shop/default/product-style.scss b/resources/beike/shop/default/product-style.scss new file mode 100644 index 00000000..e139f8fb --- /dev/null +++ b/resources/beike/shop/default/product-style.scss @@ -0,0 +1,27 @@ +@charset "UTF-8"; + +.product-wrap { + margin-bottom: 26px; + text-align: center; + + .image { + margin-bottom: 10px; + } + + .product-name { + margin-bottom: 6px; + } + + .product-price { + .price-new { + color: $primary; + font-weight: bold; + } + + .price-lod { + color: #aaa; + margin-left: 4px; + text-decoration: line-through; + } + } +} \ No newline at end of file diff --git a/themes/default/home.blade.php b/themes/default/home.blade.php index 9f946443..2d140297 100644 --- a/themes/default/home.blade.php +++ b/themes/default/home.blade.php @@ -1,18 +1,66 @@ @extends('layout.master') @section('content') - - -
+
+{{-- @foreach ($categories as $category) + {{ $category->description->name }} +@endforeach --}} +
-
-
-
- - +
+
+
+
+ + +
+
-
-
+
+
+
推荐商品模块
+
+
+ Women + Men + Kids +
+
+
+
+ @for ($i = 0; $i < 10; $i++) +
+ @include('layout.product') +
+ @endfor +
+
+
+ 22222 +
+
+ 33333 +
+
+
+
+ +
+ +
+ +
+
推荐品牌模块
+
+
+ @for ($i = 0; $i < 8; $i++) +
+
+
+ @endfor +
+
+
@endsection diff --git a/themes/default/layout/footer.blade.php b/themes/default/layout/footer.blade.php new file mode 100644 index 00000000..7624e5c7 --- /dev/null +++ b/themes/default/layout/footer.blade.php @@ -0,0 +1,8 @@ + diff --git a/themes/default/layout/header.blade.php b/themes/default/layout/header.blade.php index 116c5f53..d2534a34 100644 --- a/themes/default/layout/header.blade.php +++ b/themes/default/layout/header.blade.php @@ -39,24 +39,21 @@
- @foreach ($categories as $category) - {{ $category->description->name }} - @endforeach + {{-- {{ $category->description->name }} --}}