pdkj
/
jiqu-library-server
6
0
Fork 0
Code Releases Activity

调整批零订单显示

release
vine_liutk 2022-01-24 14:23:36 +08:00
parent 14f21ee151
commit cd5f3b6b4f
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Admin/Controllers/DealerOrderController.php
View File

@ -26,7 +26,7 @@ class DealerOrderController extends AdminController
*/ */
protected function grid() protected function grid()
{ {
$builder = DealerOrder::with(['user', 'consignor']); $builder = DealerOrder::with(['user', 'userInfo', 'consignor']);
return Grid::make($builder, function (Grid $grid) { return Grid::make($builder, function (Grid $grid) {
$type = Request::input('type', ''); $type = Request::input('type', '');
if ($type == 'manager') { if ($type == 'manager') {
@ -38,6 +38,7 @@ class DealerOrderController extends AdminController
$grid->column('id')->sortable(); $grid->column('id')->sortable();
$grid->column('sn'); $grid->column('sn');
$grid->column('user.phone')->copyable(); $grid->column('user.phone')->copyable();
$grid->column('userInfo.nickname');
$grid->column('consignor.phone')->display(function ($value) { $grid->column('consignor.phone')->display(function ($value) {
return $value??'系统'; return $value??'系统';
}); });
@ -119,6 +120,11 @@ class DealerOrderController extends AdminController
DealerOrderStatus::Completed->value => 'success', DealerOrderStatus::Completed->value => 'success',
DealerOrderStatus::Cancelled->value => '#b3b9bf', DealerOrderStatus::Cancelled->value => '#b3b9bf',
]); ]);
$show->field('user.phone');
$show->field('user_info.nickname');
$show->field('consignor.phone')->as(function ($value) {
return $value??'系统';
});
$show->field('pay_image')->image(); $show->field('pay_image')->image();
// $show->field('order_status') // $show->field('order_status')
$show->divider(); $show->divider();

6
resources/lang/zh_CN/dealer-order.php
View File

@ -12,6 +12,12 @@ return [
'user'=>[ 'user'=>[
'phone' => '下单用户', 'phone' => '下单用户',
], ],
'userInfo' => [
'nickname' => '昵称',
],
'user_info'=>[
'nickname' => '昵称',
],
'consignor_id' => '发货用户', 'consignor_id' => '发货用户',
'consignor' => [ 'consignor' => [
'phone' => '发货用户', 'phone' => '发货用户',