From ae12fcffd100cd5617dff4775c5f799b26f5f324 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Mon, 18 Jul 2022 18:49:22 +0800
Subject: [PATCH] wip

---
 .../pages/design/builder/index.blade.php      |  3 +-
 themes/default/design/image401.blade.php      | 45 +++++++-------
 themes/default/design/slideshow.blade.php     |  2 +-
 themes/default/home.blade.php                 | 10 +--
 themes/default/layout/header.blade.php        | 62 +++++++++----------
 5 files changed, 60 insertions(+), 62 deletions(-)

diff --git a/resources/beike/admin/views/pages/design/builder/index.blade.php b/resources/beike/admin/views/pages/design/builder/index.blade.php
index 058294d2..a1298af7 100644
--- a/resources/beike/admin/views/pages/design/builder/index.blade.php
+++ b/resources/beike/admin/views/pages/design/builder/index.blade.php
@@ -168,8 +168,7 @@
           }
 
           $http.post('design/builder/preview?design=1', _data, {hload: true}).then((res) => {
-            console.log(res)
-            // $(previewWindow.document).find('#module-' + data.module_id).replaceWith(res);
+            $(previewWindow.document).find('.modules-box').append(res);
           })
         },
 
diff --git a/themes/default/design/image401.blade.php b/themes/default/design/image401.blade.php
index 73759482..e282e581 100644
--- a/themes/default/design/image401.blade.php
+++ b/themes/default/design/image401.blade.php
@@ -1,28 +1,27 @@
-<div class="column-item" id="">
-  <div  class="container">
-    <div class="module-transverse-2">
+<section class="module-item" id="module-{{ $module_id }}">
+  @if ($design)
+  <div class="module-edit">
+    <div class="edit-wrap">
+      <div class=""><i class="bi bi-chevron-down"></i></div>
+      <div class=""><i class="bi bi-chevron-up"></i></div>
+      <div class="delete"><i class="bi bi-x-lg"></i></div>
+      <div class="edit"><i class="bi bi-pencil-square"></i></div>
+    </div>
+  </div>
+  @endif
+
+  <div class="module-image-plus module-info mb-5">
+    <div class="container">
       <div class="row">
-        <div class="col-md-6 hidden-sm col-xs-12">
-          <a href="">
-            <img src="" class="img-responsive">
-          </a>
-        </div>
-
-        <div class="col-md-3 hidden-xs col-sm-6 right">
-          <a href="">
-            <img src="" class="img-responsive">
-          </a>
-        </div>
-
-        <div class="col-md-3 hidden-xs col-sm-6 right">
-          <a href="">
-            <img src="" class="img-responsive">
-          </a>
-          <a href="">
-            <img src="" class="img-responsive">
-          </a>
+        <div class="col-6"><img src="{{ asset('image/default/image_plus_1.png') }}" class="img-fluid"></div>
+        <div class="col-6">
+          <div class="module-image-plus-top">
+            <a href=""><img src="{{ asset('image/default/image_plus_2.png') }}" class="img-fluid"></a>
+            <a href="" class="right"><img src="{{ asset('image/default/image_plus_3.png') }}" class="img-fluid"></a>
+          </div>
+          <div class="module-image-plus-bottom"><a href=""><img src="{{ asset('image/default/image_plus_4.png') }}" class="img-fluid"></a></div>
         </div>
       </div>
     </div>
   </div>
-</div>
+</section>
\ No newline at end of file
diff --git a/themes/default/design/slideshow.blade.php b/themes/default/design/slideshow.blade.php
index f4b2dc90..8de59c9c 100644
--- a/themes/default/design/slideshow.blade.php
+++ b/themes/default/design/slideshow.blade.php
@@ -14,7 +14,7 @@
     </div>
   </div>
   @endif
-  <div class="module-info">
+  <div class="module-info mb-5">
     <div class="swiper module-swiper-{{ $module_id }} module-slideshow">
       <div class="swiper-wrapper">
         @foreach($content['images'] as $image)
diff --git a/themes/default/home.blade.php b/themes/default/home.blade.php
index df177d09..51c175e4 100644
--- a/themes/default/home.blade.php
+++ b/themes/default/home.blade.php
@@ -2,10 +2,10 @@
 @section('body-class', 'page-home')
 @section('content')
 
-
-    @foreach($modules as $module)
-        @include($module['view_path'], $module)
-    @endforeach
-
+<div class="modules-box">
+  @foreach($modules as $module)
+    @include($module['view_path'], $module)
+  @endforeach
+</div>
 
 @endsection
diff --git a/themes/default/layout/header.blade.php b/themes/default/layout/header.blade.php
index d63ee03e..a018db76 100644
--- a/themes/default/layout/header.blade.php
+++ b/themes/default/layout/header.blade.php
@@ -87,38 +87,38 @@
       </div>
     </div>
   </div>
-</header>
-
-<div class="offcanvas offcanvas-end" tabindex="-1" id="offcanvas-right-cart" aria-labelledby="offcanvasRightLabel">
-  <div class="offcanvas-header">
-    <h5 id="offcanvasRightLabel" class="mx-auto mb-0">您的购物车</h5>
-    <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
-  </div>
-  <div class="offcanvas-body">
-    <div class="offcanvas-right-products">
-{{--       @for ($i = 0; $i < 20; $i++)
-        <div class="product-list d-flex align-items-center">
-          <div class="left"><img src="https://via.placeholder.com/140x140.png/eeeeee" calss="img-fluid"></div>
-          <div class="right flex-grow-1">
-            <div class="name fs-sm fw-bold mb-2">测试商品名称事实上</div>
-            <div class="price mb-2">22.22</div>
-            <div class="product-bottom d-flex justify-content-between align-items-center">
-              @include('shared.quantity', ['quantity' => '1'])
-              <span>删除</span>
+  <div class="offcanvas offcanvas-end" tabindex="-1" id="offcanvas-right-cart" aria-labelledby="offcanvasRightLabel">
+    <div class="offcanvas-header">
+      <h5 id="offcanvasRightLabel" class="mx-auto mb-0">您的购物车</h5>
+      <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+    </div>
+    <div class="offcanvas-body">
+      <div class="offcanvas-right-products">
+  {{--       @for ($i = 0; $i < 20; $i++)
+          <div class="product-list d-flex align-items-center">
+            <div class="left"><img src="https://via.placeholder.com/140x140.png/eeeeee" calss="img-fluid"></div>
+            <div class="right flex-grow-1">
+              <div class="name fs-sm fw-bold mb-2">测试商品名称事实上</div>
+              <div class="price mb-2">22.22</div>
+              <div class="product-bottom d-flex justify-content-between align-items-center">
+                @include('shared.quantity', ['quantity' => '1'])
+                <span>删除</span>
+              </div>
             </div>
           </div>
-        </div>
-      @endfor --}}
+        @endfor --}}
+      </div>
+    </div>
+    <div class="offcanvas-footer">
+      <div class="d-flex justify-content-between align-items-center mb-2 p-4 bg-light">
+        <strong>小计（<span class="offcanvas-right-cart-count"></span>）</strong>
+        <strong class="ms-auto offcanvas-right-cart-amount"></strong>
+      </div>
+      <div class="p-4">
+        <a href="{{ shop_route('checkout.index') }}" class="btn w-100 btn-dark">去结账</a>
+        <a href="{{ shop_route('carts.index') }}" class="btn w-100 btn-outline-dark mt-2">查看购物车</a>
+      </div>
     </div>
   </div>
-  <div class="offcanvas-footer">
-    <div class="d-flex justify-content-between align-items-center mb-2 p-4 bg-light">
-      <strong>小计（<span class="offcanvas-right-cart-count"></span>）</strong>
-      <strong class="ms-auto offcanvas-right-cart-amount"></strong>
-    </div>
-    <div class="p-4">
-      <a href="{{ shop_route('checkout.index') }}" class="btn w-100 btn-dark">去结账</a>
-      <a href="{{ shop_route('carts.index') }}" class="btn w-100 btn-outline-dark mt-2">查看购物车</a>
-    </div>
-  </div>
-</div>
+</header>
+