diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php index b1f22af..fc8c17a 100644 --- a/app/Admin/Controllers/ImsCjdcOrderMainController.php +++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php @@ -4,17 +4,22 @@ namespace App\Admin\Controllers; use App\Admin\Extensions\CheckRow; use App\Admin\Extensions\CouponTieEdit; +use App\Admin\Extensions\MyDetailPage; use App\Admin\Extensions\OrderDetail; use App\Admin\Extensions\OrderPrint; use App\Admin\Extensions\OrderRefund; use App\Admin\Extensions\OrderStateHandle; use App\Admin\Forms\CouponTieForm; +use App\Admin\Renderable\PostChart; use App\Admin\Repositories\ImsCjdcOrderMain; use Dcat\Admin\Admin; use Dcat\Admin\Form; use Dcat\Admin\Grid; use Dcat\Admin\Show; -use Dcat\Admin\Controllers\AdminController;; +use Dcat\Admin\Controllers\AdminController; +use Dcat\Admin\Widgets\Modal; + +; class ImsCjdcOrderMainController extends AdminController { @@ -65,9 +70,10 @@ class ImsCjdcOrderMainController extends AdminController $actions->append(new OrderStateHandle('同意退款',9)); $actions->append(new OrderRefund($actions->row->id,$grid->model()->getCurrentPage(),'拒绝退款')); } - $actions->append(new OrderDetail('详情')); + $actions->append(new OrderDetail($actions->row->id,'详情')); }); + $grid->filter(function (Grid\Filter $filter) { $filter->equal('id'); diff --git a/app/Admin/Controllers/Test.php b/app/Admin/Controllers/Test.php index a196d53..6989300 100644 --- a/app/Admin/Controllers/Test.php +++ b/app/Admin/Controllers/Test.php @@ -5,6 +5,7 @@ namespace App\Admin\Controllers; use App\Admin\Repositories\ImsCjdcMarket; +use App\Models\ImsCjdcOrderMain; use Dcat\Admin\Controllers\AdminController; use Dcat\Admin\Grid; @@ -14,4 +15,10 @@ class Test extends AdminController { } + public function getOrderDetail() + { + $oid = request()->get('oid'); + $order = ImsCjdcOrderMain::where('id',$oid)->first(); + return $order; + } } diff --git a/app/Admin/Extensions/MyDetailPage.php b/app/Admin/Extensions/MyDetailPage.php new file mode 100644 index 0000000..a57fac8 --- /dev/null +++ b/app/Admin/Extensions/MyDetailPage.php @@ -0,0 +1,40 @@ +order_id)->first()->toArray(); + +// Admin::script( +// <<'000000000000000000000009999']); + } + + +} diff --git a/app/Admin/Extensions/OrderDetail.php b/app/Admin/Extensions/OrderDetail.php index 7ae0e87..a1f32f4 100644 --- a/app/Admin/Extensions/OrderDetail.php +++ b/app/Admin/Extensions/OrderDetail.php @@ -4,13 +4,37 @@ namespace App\Admin\Extensions; +use App\Admin\Forms\RefundNote; use Dcat\Admin\Grid\RowAction; +use Dcat\Admin\Layout\Content; +use Dcat\Admin\Widgets\Modal; class OrderDetail extends RowAction { - public function __construct($title=null) + protected $title; + protected $order_id; + + public function __construct($orderId,$title=null) { + $this->order_id = $orderId; parent::__construct($title); } + + public function render() + { + // 实例化表单类并传递自定义参数 + $detail = MyDetailPage::make(['order_id'=>$this->order_id]); + + + + + return Modal::make() + ->xl() + ->title('订单详情') + ->body($detail) + ->delay(300) + ->button($this->title); + } + } diff --git a/app/Admin/Renderable/PostChart.php b/app/Admin/Renderable/PostChart.php new file mode 100644 index 0000000..9c1e393 --- /dev/null +++ b/app/Admin/Renderable/PostChart.php @@ -0,0 +1,12 @@ +resource('/horseman', 'LanzuServiceHorsemanController'); $router->any('/test', 'Test@test'); + $router->any('/detail', 'Test@getOrderDetail'); }); diff --git a/public/css/deatail.css b/public/css/deatail.css new file mode 100644 index 0000000..7a3aa2b --- /dev/null +++ b/public/css/deatail.css @@ -0,0 +1,49 @@ +#detail .table-bordered td { + width: 50%; + white-space: initial !important; + font-size: 1.4rem; +} + +.shop-box { + margin-top: 1rem; + font-size: 1.4rem; +} + +.logo-img { + width: 8vw; + height: 10vh; + margin-right: 1rem; +} + +.media { + padding: 1rem 2rem; + background-color: #f8f8f8; +} + +.shop-logo { + width: 2rem; + height: 2rem; + margin-right: 0.6rem; +} + +.alert { + margin-bottom: 0; + border-radius: 0; +} + +.mt-0 { + max-width: 50rem; + font-size: 1.4rem; +} + +.price { + max-width: 48rem; + display: inline-block; + overflow: hidden; + font-size: 1rem; + color: #27272788; +} +.money{ + float: right; + font-size: 1.4rem; +}