From 5f212c37403f64f9092b50e466e5f0ed174b3716 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Tue, 9 Aug 2022 14:30:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96page=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../beike/admin/views/pages/pages/form.blade.php     | 10 +++++-----
 .../admin/views/pages/products/form/form.blade.php   |  2 +-
 .../beike/shop/default/css/bootstrap/bootstrap.scss  |  7 +++++++
 themes/default/product.blade.php                     | 12 ++----------
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/resources/beike/admin/views/pages/pages/form.blade.php b/resources/beike/admin/views/pages/pages/form.blade.php
index 649d12cd..6bd1af24 100644
--- a/resources/beike/admin/views/pages/pages/form.blade.php
+++ b/resources/beike/admin/views/pages/pages/form.blade.php
@@ -24,17 +24,17 @@
 
           @foreach ($admin_languages as $language)
             <div class="tab-pane fade {{ $loop->first ? 'show active' : '' }}" id="tab-{{ $language['code'] }}">
-              <x-admin-form-input name="[{{ $language['code'] }}]title" title="信息标题" value="{{ old('title', '') }}" />
+              <x-admin-form-input name="{{ $language['code'] }}[title]" title="信息标题" value="{{ old('title', '') }}" />
               <x-admin::form.row title="内容">
                 <div class="w-max-1000">
-                  <textarea name="[{{ $language['code'] }}]content" data-tinymce-height="600" class="form-control tinymce">
+                  <textarea name="{{ $language['code'] }}[content]" data-tinymce-height="600" class="form-control tinymce">
                     {{ old('content', '') }}
                   </textarea>
                 </div>
               </x-admin::form.row>
-              <x-admin-form-input name="[{{ $language['code'] }}]meta_title" title="Meta Tag 标题" value="{{ old('meta_title', '') }}" />
-              <x-admin-form-input name="[{{ $language['code'] }}]meta_description" title="Meta Tag 描述" value="{{ old('meta_description', '') }}" />
-              <x-admin-form-input name="[{{ $language['code'] }}]meta_keyword" title="Meta Tag 关键字" value="{{ old('meta_keyword', '') }}" />
+              <x-admin-form-input name="{{ $language['code'] }}[meta_title]" title="Meta Tag 标题" value="{{ old('meta_title', '') }}" />
+              <x-admin-form-input name="{{ $language['code'] }}[meta_description]" title="Meta Tag 描述" value="{{ old('meta_description', '') }}" />
+              <x-admin-form-input name="{{ $language['code'] }}[meta_keyword]" title="Meta Tag 关键字" value="{{ old('meta_keyword', '') }}" />
               <x-admin::form.row title="">
                 <button type="submit" class="mt-3 btn btn-primary">提交</button>
               </x-admin::form.row>
diff --git a/resources/beike/admin/views/pages/products/form/form.blade.php b/resources/beike/admin/views/pages/products/form/form.blade.php
index cd67d7f4..64499781 100644
--- a/resources/beike/admin/views/pages/products/form/form.blade.php
+++ b/resources/beike/admin/views/pages/products/form/form.blade.php
@@ -50,7 +50,7 @@
             </x-admin::form.row>
             {{-- <x-admin-form-input name="video" title="视频" :value="old('video', $product->video ?? '')" /> --}}
             <input type="hidden" name="name" value="">
-            <x-admin-form-input name="position" title="排序" :value="old('position', $product->position ?? '')" />
+            <x-admin-form-input name="position" title="排序" :value="old('position', $product->position ?? '0')" />
             <x-admin-form-input name="brand_id" title="品牌" value="0" />
             <x-admin-form-input name="tax_class_id" title="税类" value="0" />
             <x-admin-form-switch name="active" title="状态" :value="old('active', $product->active ?? 1)" />
diff --git a/resources/beike/shop/default/css/bootstrap/bootstrap.scss b/resources/beike/shop/default/css/bootstrap/bootstrap.scss
index 395dd454..cc2c3045 100644
--- a/resources/beike/shop/default/css/bootstrap/bootstrap.scss
+++ b/resources/beike/shop/default/css/bootstrap/bootstrap.scss
@@ -89,6 +89,13 @@ $card-border-width: 0;
   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/themes/default/product.blade.php b/themes/default/product.blade.php
index 95f297cf..2ced2113 100644
--- a/themes/default/product.blade.php
+++ b/themes/default/product.blade.php
@@ -91,7 +91,7 @@
               </div>
             </div>
             <button
-              class="btn btn-outline-secondary ms-3 add-cart"
+              class="btn btn-outline-dark ms-3 add-cart"
               :disabled="!product.quantity"
               @click="addCart(false)"
               ><i class="bi bi-cart-fill me-1"></i>加入购物车
@@ -113,19 +113,11 @@
     <div class="product-description">
       <div class="nav nav-tabs nav-overflow justify-content-start justify-content-md-center border-bottom">
         <a class="nav-link fw-bold active" data-bs-toggle="tab" href="#product-description">
-          Description
-        </a>
-        <a class="nav-link fw-bold" data-bs-toggle="tab" href="#description-1">
-          Size &amp; Fit
-        </a>
-        <a class="nav-link fw-bold" data-bs-toggle="tab" href="#description-2">
-          Shipping &amp; Return
+          商品详情
         </a>
       </div>
       <div class="tab-content">
         <div class="tab-pane fade show active" id="product-description" role="tabpanel" aria-labelledby="pills-home-tab">111</div>
-        <div class="tab-pane fade" id="description-1" role="tabpanel" aria-labelledby="pills-profile-tab">222</div>
-        <div class="tab-pane fade" id="description-2" role="tabpanel" aria-labelledby="pills-contact-tab">333</div>
       </div>
     </div>
   </div>