From 306083076de68fccd238e3a4b66e9cfa6df29365 Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Wed, 16 Sep 2020 18:33:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=AC=BE=E7=8A=B6=E6=80=81=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/LanzuServiceRewardController.php | 1 +
 app/Admin/Extensions/OrderStateHandle.php              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Admin/Controllers/LanzuServiceRewardController.php b/app/Admin/Controllers/LanzuServiceRewardController.php
index cd412bf..b06bd29 100644
--- a/app/Admin/Controllers/LanzuServiceRewardController.php
+++ b/app/Admin/Controllers/LanzuServiceRewardController.php
@@ -88,6 +88,7 @@ class LanzuServiceRewardController extends AdminController
                 $ssdb->multi_hset('set_reward_' . $form->type, $data);
             });
             $form->disableViewButton();
+            $form->disableDeleteButton();
         });
     }
 }
diff --git a/app/Admin/Extensions/OrderStateHandle.php b/app/Admin/Extensions/OrderStateHandle.php
index 05c1bb5..ad19a2f 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();
             }
-            //$orderMain->modifyState($id,$state);
+            $orderMain->modifyState($id,$state);
             return $this->response()->success($result['message'])->refresh();
         }elseif ($state==3){//接单
             $res = $orderMain->modifyState($id,$state);