diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php
index 6eb9f25..ac463a2 100644
--- a/app/Admin/Controllers/ImsCjdcOrderMainController.php
+++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php
@@ -80,7 +80,11 @@ class ImsCjdcOrderMainController extends AdminController
$actions->append(new OrderPrint('
打印
'));
} elseif ($state == 3) {
$actions->append(new OrderPrint('打印
'));
- $actions->append(new CheckRow($actions->row->id, $grid->model()->getCurrentPage(), '自送
'));
+ if($actions->row->shipping_type == 3){
+ $actions->append(new OrderStateHandle('完成
', 4));
+ }else{
+ $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(), '拒绝
'));
diff --git a/config/order.php b/config/order.php
index b28cdb7..b98c7b3 100644
--- a/config/order.php
+++ b/config/order.php
@@ -39,7 +39,7 @@ return [
],
//配送方式:1服务站配送,2达达配送
- 'shipping_type'=>[1=>'服务站配送',2=>'达达配送'],
+ 'shipping_type'=>[1=>'服务站配送',2=>'达达配送',3=>'用户自提'],
//达达测试0 如果为1则用为正式环境