From 2f723013c82ce003894e0e85de1fa36c478ddfca Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Thu, 30 Dec 2021 16:54:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/OrderController.php | 22 ++++++++--------------
 app/Models/Order.php                      |  8 ++++++++
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/Admin/Controllers/OrderController.php b/app/Admin/Controllers/OrderController.php
index c632e81f..4f7adc2f 100644
--- a/app/Admin/Controllers/OrderController.php
+++ b/app/Admin/Controllers/OrderController.php
@@ -77,15 +77,12 @@ class OrderController extends AdminController
                     10=>'已取消',
                 ])
             );
-            $grid->column('pay_way')->using([
-                'wxpay'=>'微信支付',
-                'alipay'=>'支付宝',
-                'offline'=>'线下支付',
-                'none'=>'无',
-            ])->label([
+            $grid->column('pay_way')->using(OrderModel::$payWayText)->label([
                 'wxpay'=>'success',
                 'alipay'=>'primary',
-                'offline'=>'warning',
+                'balance'=>'warning',
+                'wallet'=>'warning',
+                'offline'=>'danger',
                 'none'=>'#b3b9bf',
             ]);
             $grid->column('pay_at');
@@ -154,15 +151,12 @@ class OrderController extends AdminController
                         return bcdiv($v, 100, 2);
                     })->prepend('￥');
                     $show->field('created_at');
-                    $show->field('pay_way')->using([
-                        'wxpay'=>'微信支付',
-                        'alipay'=>'支付宝',
-                        'offline'=>'线下支付',
-                        'none'=>'无',
-                    ])->showLabel([
+                    $show->field('pay_way')->using(OrderModel::$payWayText)->showLabel([
                         '微信支付'=>'success',
                         '支付宝'=>'primary',
-                        '线下支付'=>'warning',
+                        '钱包'=>'warning',
+                        '余额'=>'warning',
+                        '线下支付'=>'danger',
                         '无'=>'#b3b9bf',
                     ]);
                     $show->field('pay_at');
diff --git a/app/Models/Order.php b/app/Models/Order.php
index cc896e4e..d52c62c7 100644
--- a/app/Models/Order.php
+++ b/app/Models/Order.php
@@ -89,6 +89,14 @@ class Order extends Model
         'is_settle',
     ];
 
+    public static $payWayText = [
+        self::PAY_WAY_WXPAY => '微信支付',
+        self::PAY_WAY_ALIPAY => '支付宝',
+        self::PAY_WAY_WALLET => '钱包',
+        self::PAY_WAY_BALANCE => '余额',
+        self::PAY_WAY_OFFLINE => '线下支付',
+    ];
+
     /**
      * 仅查询支付过期的订单
      */