From 181faeb4a1db5af94996c8b1236dbc5fde834246 Mon Sep 17 00:00:00 2001
From: pushuo <pushuo@guangda.work>
Date: Thu, 12 Jan 2023 10:22:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E5=92=8C=E7=9B=B8=E5=85=B3=E5=95=86=E5=93=81=E7=AD=89?=
 =?UTF-8?q?ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shop/default/css/bootstrap/bootstrap.scss |  7 -------
 .../beike/shop/default/css/page-product.scss  |  9 ++++++++
 resources/beike/shop/default/js/common.js     |  2 ++
 themes/default/category.blade.php             | 21 +++++++++----------
 themes/default/design/slideshow.blade.php     | 13 ++++++------
 themes/default/product.blade.php              | 13 +++++++++---
 6 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/resources/beike/shop/default/css/bootstrap/bootstrap.scss b/resources/beike/shop/default/css/bootstrap/bootstrap.scss
index 88c28877..ae843962 100644
--- a/resources/beike/shop/default/css/bootstrap/bootstrap.scss
+++ b/resources/beike/shop/default/css/bootstrap/bootstrap.scss
@@ -100,13 +100,6 @@ $form-feedback-icon-valid-color: inherit;
   border-radius: 0;
 }
 
-// .btn.btn-dark {
-//   &:hover {
-//     background-color: #fff;
-//     color: #212529;
-//   }
-// }
-
 .card {
   // box-shadow: rgba(0, 0, 0, .1) 0px 1px 4px 0px;
   // border: none;
diff --git a/resources/beike/shop/default/css/page-product.scss b/resources/beike/shop/default/css/page-product.scss
index 45ad126e..f3d69b53 100644
--- a/resources/beike/shop/default/css/page-product.scss
+++ b/resources/beike/shop/default/css/page-product.scss
@@ -259,4 +259,13 @@ body.page-product {
       }
     }
   }
+
+  .relations-wrap {
+    .swiper-pagination {
+      .swiper-pagination-bullet {
+        height: 3px;
+        border-radius: 0;
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/resources/beike/shop/default/js/common.js b/resources/beike/shop/default/js/common.js
index f804171d..a93a5094 100644
--- a/resources/beike/shop/default/js/common.js
+++ b/resources/beike/shop/default/js/common.js
@@ -41,6 +41,7 @@ export default {
     const btnHtml = $btn.html();
     const loadHtml = '<span class="spinner-border spinner-border-sm"></span>';
     $btn.html(loadHtml).prop('disabled', true);
+    $(document).find('.tooltip').remove();
 
     $http.post('/carts', {sku_id, quantity, buy_now: isBuyNow}, {hload: !!event}).then((res) => {
       this.getCarts();
@@ -61,6 +62,7 @@ export default {
     const btnHtml = $btn.html();
     const isWishlist = $btn.attr('data-in-wishlist') * 1;
     const loadHtml = '<span class="spinner-border spinner-border-sm"></span>';
+    $(document).find('.tooltip').remove();
 
     if (isWishlist) {
       $btn.html(loadHtml).prop('disabled', true);
diff --git a/themes/default/category.blade.php b/themes/default/category.blade.php
index 2a5498c3..b91ff11b 100644
--- a/themes/default/category.blade.php
+++ b/themes/default/category.blade.php
@@ -30,18 +30,17 @@
           </ul>
         </div>
 
-        @include('shared.filter_bar_block')
-
         @if (count($products_format))
-        <div class="row {{ request('style_list') == 'list' ? 'product-list-wrap' : ''}}">
-          @foreach ($products_format as $product)
-            <div class="{{ !request('style_list') || request('style_list') == 'grid' ? 'col-6 col-md-4' : 'col-12'}}">
-              @include('shared.product')
-            </div>
-          @endforeach
-        </div>
-        @else
-        <x-shop-no-data />
+          @include('shared.filter_bar_block')
+          <div class="row {{ request('style_list') == 'list' ? 'product-list-wrap' : ''}}">
+            @foreach ($products_format as $product)
+              <div class="{{ !request('style_list') || request('style_list') == 'grid' ? 'col-6 col-md-4' : 'col-12'}}">
+                @include('shared.product')
+              </div>
+            @endforeach
+          </div>
+          @else
+          <x-shop-no-data />
         @endif
       </div>
     </div>
diff --git a/themes/default/design/slideshow.blade.php b/themes/default/design/slideshow.blade.php
index 488b13a4..4ba52efb 100644
--- a/themes/default/design/slideshow.blade.php
+++ b/themes/default/design/slideshow.blade.php
@@ -15,9 +15,9 @@
           </div>
         @endforeach
       </div>
-      <div class="swiper-pagination"></div>
-      <div class="swiper-button-prev"></div>
-      <div class="swiper-button-next"></div>
+      <div class="swiper-pagination slideshow-pagination-{{ $module_id }}"></div>
+      <div class="swiper-button-prev slideshow-btnprev-{{ $module_id }}"></div>
+      <div class="swiper-button-next slideshow-btnnext-{{ $module_id }}"></div>
     </div>
   </div>
 
@@ -30,13 +30,14 @@
 
       // 如果需要分页器
       pagination: {
-        el: '.swiper-pagination',
+        el: '.slideshow-pagination-{{ $module_id }}',
+        clickable :true
       },
 
       // 如果需要前进后退按钮
       navigation: {
-        nextEl: '.swiper-button-next',
-        prevEl: '.swiper-button-prev',
+        nextEl: '.slideshow-btnnext-{{ $module_id }}',
+        prevEl: '.slideshow-btnprev-{{ $module_id }}',
       },
     })
   </script>
diff --git a/themes/default/product.blade.php b/themes/default/product.blade.php
index 007a24c0..89954b99 100644
--- a/themes/default/product.blade.php
+++ b/themes/default/product.blade.php
@@ -44,7 +44,7 @@
                   <img :src="image.preview" class="img-fluid">
                 </div>
               </div>
-              <div class="swiper-pagination"></div>
+              <div class="swiper-pagination mobile-pagination"></div>
             </div>
           @endif
         </div>
@@ -181,6 +181,7 @@
               @endforeach
             </div>
           </div>
+          <div class="swiper-pagination relations-pagination"></div>
           <div class="swiper-button-prev relations-swiper-prev"></div>
           <div class="swiper-button-next relations-swiper-next"></div>
         </div>
@@ -350,6 +351,7 @@
     });
 
     var relationsSwiper = new Swiper ('.relations-swiper', {
+      watchSlidesProgress: true,
       breakpoints:{
         320: {
           slidesPerView: 2,
@@ -366,14 +368,19 @@
         nextEl: '.relations-swiper-next',
         prevEl: '.relations-swiper-prev',
       },
+
+      // 如果需要分页器
+      pagination: {
+        el: '.relations-pagination',
+        clickable: true,
+      },
     })
 
     @if (is_mobile())
       swiperMobile = new Swiper("#swiper-mobile", {
         slidesPerView: 1,
         pagination: {
-          el: ".swiper-pagination",
-          clickable: true,
+          el: ".mobile-pagination",
         },
         observer: true,
         observeParents: true