From 731faf536740af487492ba242f88b33a05b4bb8b Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Mon, 29 Aug 2022 16:50:14 +0800
Subject: [PATCH] https://guangdagit.com/beike/beikeshop/issues/206

---
 .../views/pages/customers/index.blade.php     |  4 +-
 themes/default/product.blade.php              | 52 ++++++++++---------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/resources/beike/admin/views/pages/customers/index.blade.php b/resources/beike/admin/views/pages/customers/index.blade.php
index acc6b9d4..591aa22c 100644
--- a/resources/beike/admin/views/pages/customers/index.blade.php
+++ b/resources/beike/admin/views/pages/customers/index.blade.php
@@ -15,7 +15,7 @@
               <el-input v-model="filter.email" size="small" placeholder="{{ __('customer.email') }}"></el-input>
             </el-form-item>
             <el-form-item label="{{ __('customer.customer_group') }}">
-              <el-select size="small" v-model="filter.customer_group" placeholder="{{ __('common.please_choose') }}">
+              <el-select size="small" v-model="filter.customer_group_id" placeholder="{{ __('common.please_choose') }}">
                 <el-option v-for="item in source.customer_group" :key="item.id" :label="item.name"
                   :value="item.id + ''">
                 </el-option>
@@ -153,7 +153,7 @@
         filter: {
           email: bk.getQueryString('email'),
           name: bk.getQueryString('name'),
-          customer_group: bk.getQueryString('customer_group'),
+          customer_group_id: bk.getQueryString('customer_group_id'),
           status: bk.getQueryString('status'),
         },
       },
diff --git a/themes/default/product.blade.php b/themes/default/product.blade.php
index ccb851f4..e6777182 100644
--- a/themes/default/product.blade.php
+++ b/themes/default/product.blade.php
@@ -85,32 +85,36 @@
             </div>
           </div>
 
-          <div class="quantity-btns d-flex">
-            <div class="quantity-wrap">
-              <input type="text" class="form-control" :disabled="!product.quantity" onkeyup="this.value=this.value.replace(/\D/g,'')" v-model="quantity" name="quantity">
-              <div class="right">
-                <i class="bi bi-chevron-up"></i>
-                <i class="bi bi-chevron-down"></i>
+          @if ($product['active'])
+            <div class="quantity-btns d-flex">
+              <div class="quantity-wrap">
+                <input type="text" class="form-control" :disabled="!product.quantity" onkeyup="this.value=this.value.replace(/\D/g,'')" v-model="quantity" name="quantity">
+                <div class="right">
+                  <i class="bi bi-chevron-up"></i>
+                  <i class="bi bi-chevron-down"></i>
+                </div>
               </div>
+              <button
+                class="btn btn-outline-dark ms-3 add-cart"
+                :disabled="!product.quantity"
+                @click="addCart(false, this)"
+                ><i class="bi bi-cart-fill me-1"></i>{{ __('shop/products.add_to_cart') }}
+              </button>
+              <button
+                class="btn btn-dark ms-3"
+                :disabled="!product.quantity"
+                @click="addCart(true, this)"
+                ><i class="bi bi-bag-fill me-1"></i>{{ __('shop/products.buy_now') }}
+              </button>
             </div>
-            <button
-              class="btn btn-outline-dark ms-3 add-cart"
-              :disabled="!product.quantity"
-              @click="addCart(false, this)"
-              ><i class="bi bi-cart-fill me-1"></i>{{ __('shop/products.add_to_cart') }}
-            </button>
-            <button
-              class="btn btn-dark ms-3"
-              :disabled="!product.quantity"
-              @click="addCart(true, this)"
-              ><i class="bi bi-bag-fill me-1"></i>{{ __('shop/products.buy_now') }}
-            </button>
-          </div>
-          <div class="add-wishlist">
-            <button class="btn btn-link ps-0 text-dark" data-in-wishlist="{{ $product['in_wishlist'] }}" onclick="bk.addWishlist('{{ $product['id'] }}', this)">
-              <i class="bi bi-heart{{ $product['in_wishlist'] ? '-fill' : '' }} me-1"></i> {{ __('shop/products.add_to_favorites') }}
-            </button>
-          </div>
+            <div class="add-wishlist">
+              <button class="btn btn-link ps-0 text-dark" data-in-wishlist="{{ $product['in_wishlist'] }}" onclick="bk.addWishlist('{{ $product['id'] }}', this)">
+                <i class="bi bi-heart{{ $product['in_wishlist'] ? '-fill' : '' }} me-1"></i> {{ __('shop/products.add_to_favorites') }}
+              </button>
+            </div>
+          @else
+            <div class="text-danger"><i class="bi bi-exclamation-circle-fill"></i> {{ __('product.has_been_inactive') }}</div>
+          @endif
         </div>
       </div>
     </div>