From b48dce26d37b26c27370cc1fce67f67bed26fecf Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Mon, 16 Nov 2020 14:42:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=8F=96=E6=B6=88=E6=8E=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php
index 75443a1..7587073 100644
--- a/app/Admin/Controllers/ImsCjdcOrderMainController.php
+++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php
@@ -93,6 +93,7 @@ class ImsCjdcOrderMainController extends AdminController
                         $actions->append(new OrderStateHandle('<div type="button"  class="btn btn-outline-warning btn-sm">完成</div>', 4));
                     }else{
                         $actions->append(new CheckRow($actions->row->id, $grid->model()->getCurrentPage(), '<div type="button"  class="btn btn-outline-info btn-sm">自送</div>'));
+                        $actions->append(new OrderStateHandle('<div type="button"  class="btn btn-outline-warning btn-sm">取消接单</div>', 2));
                     }
                 } elseif ($state == 8) {
                     $actions->append(new OrderStateHandle('<div type="button"  class="btn btn-outline-secondary btn-sm">同意</div>', 9));
diff --git a/app/Admin/Extensions/OrderStateHandle.php b/app/Admin/Extensions/OrderStateHandle.php
index ad19a2f..3f9084d 100644
--- a/app/Admin/Extensions/OrderStateHandle.php
+++ b/app/Admin/Extensions/OrderStateHandle.php
@@ -63,6 +63,9 @@ class OrderStateHandle extends RowAction
             }else{
                 return $this->response()->error('操作失败');
             }
+        }elseif($state==2){
+            $orderMain->modifyState($id,$state);
+            return $this->response()->success('操作成功')->refresh();
         }
 
     }