后台订单状态筛选,前台购物车 ALL 修改为 购物车中所有商品

This commit is contained in:
pushuo 2022-11-02 11:23:01 +08:00 committed by Edward Yang
parent 971158a11c
commit e38a6a8ab4
2 changed files with 14 additions and 1 deletions

View File

@ -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'),

View File

@ -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: {},