From c7b2e35bff350e421b398a04e742f69a683ad779 Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Sun, 31 Oct 2021 13:12:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E3=80=81=E6=A0=B8=E9=94=80?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=8D=95=E7=8B=AC=E4=B8=80=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/IndustryOrderController.php   |  2 +-
 .../Controllers/OrderController.php           |  4 +--
 .../Controllers/IndustryOrderController.php   | 26 ++++++++++---------
 .../Controllers/OrderController.php           | 11 ++++----
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/app/AdminAgent/Controllers/IndustryOrderController.php b/app/AdminAgent/Controllers/IndustryOrderController.php
index 9b6fd8e..8be8cde 100644
--- a/app/AdminAgent/Controllers/IndustryOrderController.php
+++ b/app/AdminAgent/Controllers/IndustryOrderController.php
@@ -63,7 +63,7 @@ class IndustryOrderController extends AdminController
 					return Table::make([], $info);
 				})->xl();
             $grid->column('title')->limit(15);
-            $grid->column('picture')->image('', 80, 80);
+//            $grid->column('picture')->image('', 60, 60);
 			$grid->column('pay_type')->using(PayType::array());
 			$grid->column('status')
 				->using(OrderStatus::array())
diff --git a/app/AdminAgent/Controllers/OrderController.php b/app/AdminAgent/Controllers/OrderController.php
index 3a4249b..52983a0 100644
--- a/app/AdminAgent/Controllers/OrderController.php
+++ b/app/AdminAgent/Controllers/OrderController.php
@@ -139,8 +139,8 @@ class OrderController extends AdminController
 							])->value('price');
 					}
 				});
-            $grid->column('paid_at');
-            $grid->column('created_at');
+            $grid->column('paid_at')->width(100);
+            $grid->column('created_at')->width(100);
 
 			$grid->filter(function (Grid\Filter $filter) {
 				$filter->panel();
diff --git a/app/AdminSupplier/Controllers/IndustryOrderController.php b/app/AdminSupplier/Controllers/IndustryOrderController.php
index 137fc12..dbba950 100644
--- a/app/AdminSupplier/Controllers/IndustryOrderController.php
+++ b/app/AdminSupplier/Controllers/IndustryOrderController.php
@@ -59,19 +59,14 @@ class IndustryOrderController extends AdminController
 				})->xl();
 			$grid->column('industry_product_id', '产品ID');
             $grid->column('title')->limit(15);
-            $grid->column('picture')->image('', 60, 60);
+//            $grid->column('picture')->image('', 60, 60);
 			$grid->column('pay_type')->using(PayType::array());
-			$grid->column('订单状态')
-				//待审核
-				->if(fn() => $this->audit_status == 0)
-				->then(function ($column) {
-					$column->append((new IndustryOrderAudit(null, 1))->setKey($this->id))->append('&nbsp;');
-					$column->append((new IndustryOrderAudit(null, 2))->setKey($this->id));
-				})
+			$grid->column('status')
+				->using(OrderStatus::array())
 				//审核拒绝
 				->if(fn() => $this->audit_status == -1)
 				->then(function ($column) {
-					$column->append('已拒绝')->label();
+					$column->display('已拒绝')->label();
 				})
 				//审核通过
 				->if(fn() => $this->audit_status == 1)
@@ -79,12 +74,19 @@ class IndustryOrderController extends AdminController
 					if ($this->status == OrderStatus::OFFLINE_UNPAID) {
 						$column->action(new IndustryOrderStatus);
 					} else {
-						$column->append(OrderStatus::array()[$this->status]);
+						$column->display(OrderStatus::array()[$this->status]);
 					}
 				});
-            $grid->column('paid_at');
+			$grid->column('审核')
+				//待审核
+				->if(fn() => $this->audit_status == 0)
+				->then(function ($column) {
+					$column->append((new IndustryOrderAudit(null, 1))->setKey($this->id))->append('&nbsp;');
+					$column->append((new IndustryOrderAudit(null, 2))->setKey($this->id));
+				});
+            $grid->column('paid_at')->width(100);
 //            $grid->column('timeout');
-            $grid->column('created_at');
+            $grid->column('created_at')->width(100);
 
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->equal('id')->width(2);
diff --git a/app/AdminSupplier/Controllers/OrderController.php b/app/AdminSupplier/Controllers/OrderController.php
index aff9170..50bd82d 100644
--- a/app/AdminSupplier/Controllers/OrderController.php
+++ b/app/AdminSupplier/Controllers/OrderController.php
@@ -65,11 +65,10 @@ class OrderController extends AdminController
 					}, $info);
 					return Table::make([], $info);
 				})->xl();
-			$grid->column('status', '订单状态')
+			$grid->column('status', '订单状态')->using(OrderStatus::array());
+			$grid->column('核销')
 				->if(fn() => in_array($this->status, [OrderStatus::PAID, OrderStatus::PAID_RETAINAGE, OrderStatus::OFFLINE_PAID, OrderStatus::REFUSED_REFUND]))
-				->action(new VerificationOrder())
-				->else()
-				->using(OrderStatus::array());
+				->action(new VerificationOrder());
 			$grid->column('pay_type')->using(PayType::array());
 			$grid->column('price');
 			$grid->column('paid_money');
@@ -84,8 +83,8 @@ class OrderController extends AdminController
 						])->value('price');
 					}
 				});
-			$grid->column('paid_at');
-			$grid->column('created_at');
+			$grid->column('paid_at')->width(100);
+			$grid->column('created_at')->width(100);
 
 			$grid->filter(function (Grid\Filter $filter) {
 				$filter->panel();