diff --git a/app/Admin/Controllers/OrderController.php b/app/Admin/Controllers/OrderController.php index bff2c06b..17a6cde0 100644 --- a/app/Admin/Controllers/OrderController.php +++ b/app/Admin/Controllers/OrderController.php @@ -189,7 +189,7 @@ class OrderController extends AdminController ]) ); $grid->column('pay_way')->display(function ($v) { - return $v?->mallText(); + return $v?->text(); })->circleDot(PayWay::colors()); $grid->column('pay_at'); $grid->column('created_at')->sortable(); @@ -211,6 +211,7 @@ class OrderController extends AdminController $filter->equal('pay_way')->select([ PayWay::WxpayMiniProgram->value => PayWay::WxpayMiniProgram->text(), PayWay::Offline->value => PayWay::Offline->text(), + PayWay::None->value => PayWay::None->text(), ])->width(3); $filter->where('order_type', function ($builder) { if ($this->input == 1) { diff --git a/app/Enums/PayWay.php b/app/Enums/PayWay.php index 4a87e27f..1a3548ad 100644 --- a/app/Enums/PayWay.php +++ b/app/Enums/PayWay.php @@ -41,19 +41,6 @@ enum PayWay: string { }; } - public function mallText() - { - return match ($this) { - static::None => '无', - static::Offline => '线下', - static::Balance => '余额', - static::Wallet => '可提', - static::WxpayApp, static::WxpayH5, static::WxpayJsApi, static::WxpayMiniProgram, static::WxPayShare => '微信支付', - static::AlipayApp => '支付宝', - default => 'Unknown', - }; - } - /** * 支付方式文本 *