Merge branch 'order_shipp_type'

app/Admin/Controllers/ImsCjdcOrderMainController.php

@@ -80,7 +80,11 @@ class ImsCjdcOrderMainController extends AdminController
                     $actions->append(new OrderPrint('<div type="button"  class="btn btn-outline-dark btn-sm">打印</div>'));
                 } elseif ($state == 3) {
                     $actions->append(new OrderPrint('<div type="button"  class="btn btn-outline-dark btn-sm">打印</div>'));
+                    if($actions->row->shipping_type == 3){
+                        $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>'));
+                    }
                 } elseif ($state == 8) {
                     $actions->append(new OrderStateHandle('<div type="button"  class="btn btn-outline-secondary btn-sm">同意</div>', 9));
                     $actions->append(new OrderRefund($actions->row->id, $grid->model()->getCurrentPage(), '<div type="button"  class="btn btn-outline-secondary btn-sm">拒绝</div>'));

config/order.php

@@ -39,7 +39,7 @@ return [
     ],
 
     //配送方式:1服务站配送，2达达配送
-    'shipping_type'=>[1=>'服务站配送',2=>'达达配送'],
+    'shipping_type'=>[1=>'服务站配送',2=>'达达配送',3=>'用户自提'],
 
 
     //达达测试0 如果为1则用为正式环境