From 50d5173a74c0cb2391b8bb6e1bd2571fc2327927 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Fri, 17 Dec 2021 17:46:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E6=B7=BB=E5=8A=A0=E7=89=A9?=
 =?UTF-8?q?=E6=B5=81=E5=85=AC=E5=8F=B8=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/OrderController.php |  1 +
 app/Admin/Forms/OrderPackage.php          | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/Admin/Controllers/OrderController.php b/app/Admin/Controllers/OrderController.php
index 62f951f3..773406f6 100644
--- a/app/Admin/Controllers/OrderController.php
+++ b/app/Admin/Controllers/OrderController.php
@@ -228,6 +228,7 @@ class OrderController extends AdminController
                     })->setHeaderAttributes(['style' => 'color:#5b69bc']);
                     $grid->column('created_at', '发货时间');
                     $grid->column('status', '包裹状态');
+                    $grid->column('is_failed', '作废')->bool();
                     $grid->model()->orderBy('created_at', 'desc');
 
                     $grid->disableActions();
diff --git a/app/Admin/Forms/OrderPackage.php b/app/Admin/Forms/OrderPackage.php
index 3dfd6158..5c8c2798 100644
--- a/app/Admin/Forms/OrderPackage.php
+++ b/app/Admin/Forms/OrderPackage.php
@@ -67,7 +67,16 @@ class OrderPackage extends Form implements LazyRenderable
 
         $order = Order::findOrFail($orderId);
 
-        $this->text('shipping_company')->required();
+        $this->select('shipping_company')->options([
+            '圆通速递'=>'圆通速递',
+            '韵达快递'=>'韵达快递',
+            '中通快递'=>'中通快递',
+            '申通快递'=>'申通快递',
+            '百世快递'=>'百世快递',
+            'EMS'=>'EMS',
+            '顺丰速运'=>'顺丰速运',
+            '德邦快递'=>'德邦快递',
+        ])->required();
         $this->text('shipping_number')->required();
         $this->hasMany('packages', function (Form $form) use ($order) {
             $form->select('order_product_id')->options($order->products()->where('after_sale_state', '<>', 1)->pluck('name', 'id'));