From 849f2477bb1892c83b797d123759553475632331 Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Sat, 12 Sep 2020 11:07:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/ImsCjdcOrderMainController.php | 2 +-
 app/Admin/Extensions/OrderStateHandle.php            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php
index 90dc60e..a71252f 100644
--- a/app/Admin/Controllers/ImsCjdcOrderMainController.php
+++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php
@@ -41,7 +41,7 @@ class ImsCjdcOrderMainController extends AdminController
 
             $grid->state('订单状态')
                 ->using(config('order.state'))
-                ->label([1 => 'dark', 2 => 'danger', 3 => 'indigo', 4 => 'success']);
+                ->label([1 => 'dark', 2 => 'danger', 3 => 'indigo', 4 => 'success',8=>'warning']);
             $grid->money;
             $grid->column('market.name', '所属市场');
             $grid->pay_time('支付时间')->display(function () {
diff --git a/app/Admin/Extensions/OrderStateHandle.php b/app/Admin/Extensions/OrderStateHandle.php
index ec3c054..687832c 100644
--- a/app/Admin/Extensions/OrderStateHandle.php
+++ b/app/Admin/Extensions/OrderStateHandle.php
@@ -52,7 +52,7 @@ class OrderStateHandle extends RowAction
                 Log::error('订单退款接口调用失败',$result);
                 return $this->response()->error($result['message'])->refresh();
             }else{
-                $orderMain->modifyState($id,$state);
+                //$orderMain->modifyState($id,$state);
             }
             return $this->response()->success($result['message'])->refresh();
         }