From e38a6a8ab46f27b0508bd05b276dc63ecabbf4e6 Mon Sep 17 00:00:00 2001
From: pushuo <pushuo@guangda.work>
Date: Wed, 2 Nov 2022 11:23:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=AE=A2=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=AD=9B=E9=80=89=EF=BC=8C=E5=89=8D=E5=8F=B0=E8=B4=AD?=
 =?UTF-8?q?=E7=89=A9=E8=BD=A6=20ALL=20=E4=BF=AE=E6=94=B9=E4=B8=BA=20?=
 =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E4=B8=AD=E6=89=80=E6=9C=89=E5=95=86?=
 =?UTF-8?q?=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/beike/admin/views/pages/orders/index.blade.php | 9 +++++++++
 themes/default/cart/cart.blade.php                       | 6 +++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/resources/beike/admin/views/pages/orders/index.blade.php b/resources/beike/admin/views/pages/orders/index.blade.php
index eade55d5..12bb213c 100644
--- a/resources/beike/admin/views/pages/orders/index.blade.php
+++ b/resources/beike/admin/views/pages/orders/index.blade.php
@@ -22,6 +22,14 @@
             <el-form-item label="{{ __('order.email') }}">
               <el-input @keyup.enter.native="search" v-model="filter.email" size="small" placeholder="{{ __('order.email') }}"></el-input>
             </el-form-item>
+            <el-form-item label="{{ __('common.status') }}">
+              {{-- <el-input @keyup.enter.native="search" v-model="filter.email" size="small" placeholder="{{ __('order.email') }}"></el-input> --}}
+              <select v-model="filter.status" class="form-control wp-100">
+                <option value="">{{ __('common.all') }}</option>
+                <option value="1">{{ __('product.active') }}</option>
+                <option value="0">{{ __('product.inactive') }}</option>
+              </select>
+            </el-form-item>
           </div>
           <el-form-item label="{{ __('order.created_at') }}">
             <el-form-item>
@@ -108,6 +116,7 @@
         exportUrl: @json(admin_route('orders.export')),
         filter: {
           number: bk.getQueryString('number'),
+          status: bk.getQueryString('status'),
           customer_name: bk.getQueryString('customer_name'),
           email: bk.getQueryString('email'),
           start: bk.getQueryString('start'),
diff --git a/themes/default/cart/cart.blade.php b/themes/default/cart/cart.blade.php
index 0d8ec513..f824b966 100644
--- a/themes/default/cart/cart.blade.php
+++ b/themes/default/cart/cart.blade.php
@@ -76,7 +76,7 @@
           <div class="card-header"><h5 class="mb-0">{{ __('shop/carts.product_total') }}</h5></div>
           <div class="card-body">
             <ul class="list-group list-group-flush">
-              <li class="list-group-item"><span>{{ __('shop/carts.all') }}</span><span>@{{ products.length }}</span></li>
+              <li class="list-group-item"><span>{{ __('shop/carts.all') }}</span><span>@{{ allProduct }}</span></li>
               <li class="list-group-item"><span>{{ __('shop/carts.selected') }}</span><span>@{{ total_quantity }}</span></li>
               <li class="list-group-item border-bottom-0"><span>{{ __('shop/carts.product_total') }}</span><span class="total-price">@{{ amount_format }}</span></li>
               <li class="list-group-item d-grid gap-2 mt-3 border-bottom-0">
@@ -129,6 +129,10 @@
             this.selectedBtnSelected()
           }
         },
+
+        allProduct() {
+          return this.products.map(e => e.quantity).reduce((n,m) => n + m);
+        },
       },
       // 侦听器
       watch: {},