From 8ab026f52e403f76394b6ae3e8f0c909cb2dff6f Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 18 Aug 2023 15:41:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E9=9D=9E=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E8=B4=AD=E4=B9=B0=E5=95=86=E5=93=81=E7=A6=81=E6=AD=A2?=
 =?UTF-8?q?=E4=B8=8B=E5=8D=95=EF=BC=88=E4=BD=86=E6=98=AF=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=92=8C=E6=94=B6?=
 =?UTF-8?q?=E8=97=8F=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Shop/Http/Resources/CartDetail.php |  1 +
 beike/Shop/Services/CartService.php      |  7 +++++++
 themes/default/cart/cart.blade.php       | 11 +++--------
 themes/default/cart/mini.blade.php       |  7 +++++--
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/beike/Shop/Http/Resources/CartDetail.php b/beike/Shop/Http/Resources/CartDetail.php
index df6f9807..ceb00e35 100644
--- a/beike/Shop/Http/Resources/CartDetail.php
+++ b/beike/Shop/Http/Resources/CartDetail.php
@@ -47,6 +47,7 @@ class CartDetail extends JsonResource
             'subtotal'        => $subTotal,
             'subtotal_format' => currency_format($subTotal),
             'variant_labels'  => trim($sku->getVariantLabel()),
+            'active'          => $product->active
         ];
 
         return hook_filter('resource.cart.detail', $result);
diff --git a/beike/Shop/Services/CartService.php b/beike/Shop/Services/CartService.php
index 0ba7f8ad..b9af543d 100644
--- a/beike/Shop/Services/CartService.php
+++ b/beike/Shop/Services/CartService.php
@@ -195,6 +195,13 @@ class CartService
         if (empty($carts)) {
             $carts = self::list(current_customer());
         }
+        // 判断：禁止选中 非直接下单产品
+        $carts = array_map(function($cartItem){
+            if(!$cartItem['active']){
+                $cartItem['selected'] = 0;
+            }
+            return $cartItem;
+        },$carts);
 
         $cartList = collect($carts)->where('selected', 1);
 
diff --git a/themes/default/cart/cart.blade.php b/themes/default/cart/cart.blade.php
index 43104ec9..8c696f7b 100644
--- a/themes/default/cart/cart.blade.php
+++ b/themes/default/cart/cart.blade.php
@@ -46,7 +46,8 @@
                   <tr v-for="product, index in products" :key="index" :class="product.selected ? 'active' : ''">
                     <td>
                       <div class="d-flex align-items-center p-image">
-                        <input class="form-check-input" type="checkbox" @change="checkedCartTr(index)" v-model="product.selected">
+                        <input v-if="!product.active" class="form-check-input" type="checkbox" disabled="disabled">
+                        <input v-else class="form-check-input" type="checkbox" @change="checkedCartTr(index)" v-model="product.selected">
                         <div class="border d-flex align-items-center justify-content-center wh-80 ms-3"><img :src="product.image_url" class="img-fluid"></div>
                       </div>
                     </td>
@@ -57,7 +58,7 @@
                     </td>
                     <td>
                       <div class="quantity-wrap">
-                        <input type="text" class="form-control" @input="quantityChange(product.quantity, product.cart_id, product.sku_id)" onkeyup="this.value=this.value.replace(/\D/g,'')" v-model.number="product.quantity" name="quantity" minimum="1">
+                        <input type="text" class="form-control" @input="quantityChange(product.quantity, product.cart_id, product.sku_id)" onkeyup="this.value=this.value.replace(/\D/g,'')" v-model.number="product.quantity" name="quantity" minimum="0">
                         <div class="right">
                           <i class="bi bi-chevron-up"></i>
                           <i class="bi bi-chevron-down"></i>
@@ -149,12 +150,6 @@
         allProduct() {
           return this.products.map(e => e.quantity).reduce((n,m) => n + m);
         },
-      },
-      mounted(){
-
-        console.log(this.totals);
-
-
       },
       methods: {
         checkedBtnToCheckout() {
diff --git a/themes/default/cart/mini.blade.php b/themes/default/cart/mini.blade.php
index afe16a97..4b3ccf39 100644
--- a/themes/default/cart/mini.blade.php
+++ b/themes/default/cart/mini.blade.php
@@ -2,6 +2,7 @@
   <h5 id="offcanvasRightLabel" class="mx-auto mb-0">{{ __('shop/carts.mini') }}</h5>
   <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
 </div>
+
 <div class="offcanvas-body pt-0">
   @php $check = 0 @endphp
 
@@ -10,8 +11,10 @@
     @foreach ($carts as $cart)
       @if ($cart['selected']) @php $check = $check + 1 @endphp @endif
       <div class="product-list d-flex align-items-center">
-        <div class="select-wrap">
-          <i class="bi {{ $cart['selected'] ? 'bi-check-circle-fill' : 'bi-circle' }}" data-id="{{ $cart['cart_id'] }}"></i>
+        <div class="select-wrap" style="min-width: 20px;">
+          @if ($cart['active'])
+            <i class="bi {{ $cart['selected'] ? 'bi-check-circle-fill' : 'bi-circle' }}" data-id="{{ $cart['cart_id'] }}"></i>
+          @endif
         </div>
         <div class="product-info d-flex align-items-center">
           <div class="left"><a href="{{ shop_route('products.show', $cart['product_id']) }}" class="d-flex justify-content-between align-items-center h-100"><img src="{{ $cart['image_url'] ?: image_resize('', 160, 160) }}" class="img-fluid"></a></div>