Commit 8b9685de by 孙龙

订单详情

parent e6cab7b8
Showing with 6 additions and 4 deletions
...@@ -5,6 +5,7 @@ namespace App\Admin\Controllers; ...@@ -5,6 +5,7 @@ namespace App\Admin\Controllers;
use App\Admin\Actions\OrderAuditAction; use App\Admin\Actions\OrderAuditAction;
use App\Admin\Actions\OrderCancelAction; use App\Admin\Actions\OrderCancelAction;
use App\Admin\Actions\OrderReverseAuditAction; use App\Admin\Actions\OrderReverseAuditAction;
use App\Admin\Pages\OrderDetailPage;
use App\Models\Cms\CmsUser; use App\Models\Cms\CmsUser;
use App\Models\Order; use App\Models\Order;
use Dcat\Admin\Form; use Dcat\Admin\Form;
...@@ -55,8 +56,8 @@ class OrderController extends AdminController ...@@ -55,8 +56,8 @@ class OrderController extends AdminController
return $this->_index + 1; return $this->_index + 1;
}); });
$grid->column('order_id',"ID"); $grid->column('order_id',"ID");
$grid->column('order_sn')->width('120px')->link(function () { $grid->column('order_sn')->width('120px')->display(function () {
return admin_url('order/page?order_id='.$this->order_id); return '<a href="/admin/order/page?order_id="'.$this->user_id.' >'.$this->order_sn.'</a>';
}); });
$grid->column('status')->using(admin_trans('order.options.status'))->sortable(); $grid->column('status')->using(admin_trans('order.options.status'))->sortable();
$grid->column('company_name')->display(function ($company_name) { $grid->column('company_name')->display(function ($company_name) {
...@@ -64,6 +65,7 @@ class OrderController extends AdminController ...@@ -64,6 +65,7 @@ class OrderController extends AdminController
}); });
$grid->column('scmUser.user_sn',admin_trans('scm-user.options.user_sn'))->link(function () { $grid->column('scmUser.user_sn',admin_trans('scm-user.options.user_sn'))->link(function () {
return admin_url('smc_user/'.$this->user_id); return admin_url('smc_user/'.$this->user_id);
}); });
$grid->column('scmUser.name',admin_trans('scm-user.options.name')); $grid->column('scmUser.name',admin_trans('scm-user.options.name'));
$grid->column('order_amount')->help('订单详情里-结算信息的“运费”“支付手续费”“其他费用”为空时;应付金额一栏为“待确认”'); $grid->column('order_amount')->help('订单详情里-结算信息的“运费”“支付手续费”“其他费用”为空时;应付金额一栏为“待确认”');
...@@ -224,7 +226,7 @@ JS ...@@ -224,7 +226,7 @@ JS
}); });
} }
public function page(){ public function page(Content $content){
return view('admin.order-page'); return view('admin.pages.order-page');
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment