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 @@
+
+ {{-- --}}
+
+
@@ -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 @@
- - {{ __('shop/carts.all') }}@{{ products.length }}
+ - {{ __('shop/carts.all') }}@{{ allProduct }}
- {{ __('shop/carts.selected') }}@{{ total_quantity }}
- {{ __('shop/carts.product_total') }}@{{ amount_format }}
-
@@ -129,6 +129,10 @@
this.selectedBtnSelected()
}
},
+
+ allProduct() {
+ return this.products.map(e => e.quantity).reduce((n,m) => n + m);
+ },
},
// 侦听器
watch: {},