From 947a9f9099813a7d4ef2d9bb3f6d653637cf70f2 Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Tue, 15 Sep 2020 08:58:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95=E6=8C=89?=
=?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Admin/Controllers/ImsCjdcOrderMainController.php | 12 ++++++------
app/Admin/Extensions/CheckRow.php | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php
index 4c704fc..7d4d10d 100644
--- a/app/Admin/Controllers/ImsCjdcOrderMainController.php
+++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php
@@ -66,14 +66,14 @@ class ImsCjdcOrderMainController extends AdminController
if ($state == 2) {
$actions->append(new OrderStateHandle('
接单
', 3));
} elseif ($state == 311) {
- $actions->append(new OrderStateHandle('完成', 4));
- $actions->append(new OrderPrint('打印'));
+ $actions->append(new OrderStateHandle('完成
', 4));
+ $actions->append(new OrderPrint('打印
'));
} elseif ($state == 3) {
- $actions->append(new OrderPrint('打印'));
- $actions->append(new CheckRow($actions->row->id, $grid->model()->getCurrentPage(), '自送'));
+ $actions->append(new OrderPrint('打印
'));
+ $actions->append(new CheckRow($actions->row->id, $grid->model()->getCurrentPage(), '自送
'));
} elseif ($state == 8) {
- $actions->append(new OrderStateHandle('同意退款', 9));
- $actions->append(new OrderRefund($actions->row->id, $grid->model()->getCurrentPage(), '拒绝退款'));
+ $actions->append(new OrderStateHandle('同意退款
', 9));
+ $actions->append(new OrderRefund($actions->row->id, $grid->model()->getCurrentPage(), '拒绝退款
'));
}
$actions->append(new OrderDetail($actions->row->id, $grid->model()->getCurrentPage(), '详情
'));
});
diff --git a/app/Admin/Extensions/CheckRow.php b/app/Admin/Extensions/CheckRow.php
index 5d5ca48..45485c7 100644
--- a/app/Admin/Extensions/CheckRow.php
+++ b/app/Admin/Extensions/CheckRow.php
@@ -30,7 +30,7 @@ class CheckRow extends RowAction
$form = SelectHorseman::make(['order_id'=>$this->order_id,'current_page'=>$this->currentPage]);
return Modal::make()
->lg()
- ->title($this->title)
+ ->title('选择配送员')
->body($form)
->button($this->title);