From 26f0c2caa4a73e31779233b2fe637ce955f7c1f6 Mon Sep 17 00:00:00 2001
From: songliang <songliang@opencart.cn>
Date: Tue, 2 Aug 2022 09:48:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=93=81=E7=89=8C=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/build/beike/shop/default/css/app.css   |  4 ++++
 .../beike/shop/default/css/page-list.scss     |  4 ++++
 themes/default/brand/info.blade.php           | 21 +++++++++++++++++++
 themes/default/brand/list.blade.php           |  6 ++++--
 themes/default/product.blade.php              | 10 +++++++--
 5 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 themes/default/brand/info.blade.php

diff --git a/public/build/beike/shop/default/css/app.css b/public/build/beike/shop/default/css/app.css
index 7a7385fe..be81ba20 100644
--- a/public/build/beike/shop/default/css/app.css
+++ b/public/build/beike/shop/default/css/app.css
@@ -1066,6 +1066,10 @@ body.page-account-address .addresses-wrap .item .address-bottom a, body.page-che
 body.page-list li {
   list-style: none;
 }
+body.page-list li a {
+  color: #242424;
+  text-decoration: none;
+}
 body.page-list .curser {
   cursor: pointer;
 }
diff --git a/resources/beike/shop/default/css/page-list.scss b/resources/beike/shop/default/css/page-list.scss
index f3e67610..9d817dc2 100644
--- a/resources/beike/shop/default/css/page-list.scss
+++ b/resources/beike/shop/default/css/page-list.scss
@@ -3,6 +3,10 @@
 body.page-list {
   li {
     list-style: none;
+    a{
+      color: #242424;
+      text-decoration: none;
+    }
   }
 
   .curser {
diff --git a/themes/default/brand/info.blade.php b/themes/default/brand/info.blade.php
new file mode 100644
index 00000000..9b241a31
--- /dev/null
+++ b/themes/default/brand/info.blade.php
@@ -0,0 +1,21 @@
+@extends('layout.master')
+@section('body-class', 'page-categories')
+
+@section('content')
+<div class="container">
+
+  <nav aria-label="breadcrumb">
+    <ol class="breadcrumb">
+      <li class="breadcrumb-item"><a href="#">Home</a></li>
+      <li class="breadcrumb-item active" aria-current="page">Library</li>
+    </ol>
+  </nav>
+
+    <div class="row">
+      @foreach ($products as $product)
+      <div class="col-6 col-md-3">@include('shared.product')</div>
+      @endforeach
+    </div>
+</div>
+
+@endsection
diff --git a/themes/default/brand/list.blade.php b/themes/default/brand/list.blade.php
index 48e7bcc5..e518aa5c 100644
--- a/themes/default/brand/list.blade.php
+++ b/themes/default/brand/list.blade.php
@@ -23,8 +23,10 @@
       <div class="flex-wrap d-flex justity-content-between align-items-center">
         @foreach ($brand as $item)
           <div class="text-center">
-            <img src="{{ $item['logo'] }}" class="img-responsive mx-5" alt="{{ $item['name'] }}">
-            <p class="mb-0 mt-1">{{ $item['name'] }}</p>
+            <a href="{{ shop_route('brands.show', [$item['id']]) }}">
+              <img src="{{ $item['logo'] }}" class="img-fluid mx-5" alt="{{ $item['name'] }}">
+              <p class="mb-0 mt-1">{{ $item['name'] }}</p>
+            </a>
           </div>
         @endforeach
       </div>
diff --git a/themes/default/product.blade.php b/themes/default/product.blade.php
index f8c7774e..58956db6 100644
--- a/themes/default/product.blade.php
+++ b/themes/default/product.blade.php
@@ -4,6 +4,8 @@
 
 @push('header')
   <script src="{{ asset('vendor/vue/2.6.14/vue.js') }}"></script>
+  <script src="{{ asset('vendor/swiper/swiper-bundle.min.js') }}"></script>
+  <link rel="stylesheet" href="{{ asset('vendor/swiper/swiper-bundle.min.css') }}">
   {{-- <script src="{{ asset('vendor/element-ui/2.15.6/js.js') }}"></script> --}}
   {{-- <link rel="stylesheet" href="{{ asset('vendor/element-ui/2.15.6/css.css') }}"> --}}
 @endpush
@@ -17,9 +19,13 @@
     <div class="row mb-5" id="product-top">
       <div class="col-12 col-md-6">
         <div class="product-image d-flex align-items-start">
-          <div class="left" v-if="images.length">
-            <div :class="!index ? 'active' : ''" :data-image="image.image" v-for="image, index in images"><img :src="image.thumb" class="img-fluid"></div>
+
+          <div class="left swiper mySwiper" v-if="images.length">
+            <div class="swiper-wrapper">
+              <div class="swiper-slide" :class="!index ? 'active' : ''" :data-image="image.image" v-for="image, index in images"><img :src="image.thumb" class="img-fluid"></div>
+            </div>
           </div>
+
           <div class="right">
             <img :src="images[0]?.image || '{{ asset('image/placeholder.png') }}'" class="img-fluid">
           </div>