diff --git a/app/Admin/Controllers/ImsCjdcMarketController.php b/app/Admin/Controllers/ImsCjdcMarketController.php index 2eae5c7..8210f71 100644 --- a/app/Admin/Controllers/ImsCjdcMarketController.php +++ b/app/Admin/Controllers/ImsCjdcMarketController.php @@ -54,6 +54,7 @@ class ImsCjdcMarketController extends AdminController } }); $grid->address; + $grid->column('status')->switch(); $grid->created_at->display(function ($time){ return date('Y-m-d H:i:s',$time); }); @@ -168,10 +169,12 @@ class ImsCjdcMarketController extends AdminController $form->hidden('lat'); $form->saving(function (Form $form){ - $coordinates = explode(',',$form->coordinates); - $form->lng = $coordinates[0]; - $form->lat = $coordinates[1]; - $form->deleteInput('coordinates'); + if($form->coordinates){ + $coordinates = explode(',',$form->coordinates); + $form->lng = $coordinates[0]; + $form->lat = $coordinates[1]; + $form->deleteInput('coordinates'); + } }); $form->deleting(function (Form $form){ diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php index 5691890..0a268c2 100644 --- a/app/Admin/Controllers/ImsCjdcOrderMainController.php +++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php @@ -7,6 +7,7 @@ use App\Admin\Common\Rpc; use App\Admin\Extensions\CheckRow; use App\Admin\Extensions\MyDetailPage; use App\Admin\Extensions\OrderDetail; +use App\Admin\Extensions\OrderDetailCopy; use App\Admin\Extensions\OrderPrint; use App\Admin\Extensions\OrderRefund; use App\Admin\Extensions\OrderStateHandle; @@ -19,6 +20,7 @@ use Dcat\Admin\Layout\Content; use Dcat\Admin\Show; use Dcat\Admin\Controllers\AdminController; use Dcat\Admin\Widgets\Lazy; +use Dcat\Admin\Widgets\Modal; class ImsCjdcOrderMainController extends AdminController { @@ -69,19 +71,20 @@ class ImsCjdcOrderMainController extends AdminController $grid->actions(function (Grid\Displayers\Actions $actions) use ($grid) { $state = $actions->row->state; + $actions->append(new OrderDetail($actions->row->id, $grid->model()->getCurrentPage(), '
详情
')); + if ($state == 2) { - $actions->append(new OrderStateHandle('
接单
', 3)); + $actions->append(new OrderStateHandle('
接单
', 3)); } elseif ($state == 311) { - $actions->append(new OrderStateHandle('
完成
', 4)); - $actions->append(new OrderPrint('
打印
')); + $actions->append(new OrderStateHandle('
完成
', 4)); + $actions->append(new OrderPrint('
打印
')); } elseif ($state == 3) { - $actions->append(new OrderPrint('
打印
')); - $actions->append(new CheckRow($actions->row->id, $grid->model()->getCurrentPage(), '
自送
')); + $actions->append(new OrderPrint('
打印
')); + $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(), '
拒绝退款
')); + $actions->append(new OrderStateHandle('
同意
', 9)); + $actions->append(new OrderRefund($actions->row->id, $grid->model()->getCurrentPage(), '
拒绝
')); } - $actions->append(new OrderDetail($actions->row->id, $grid->model()->getCurrentPage(), '
详情
')); }); @@ -90,6 +93,8 @@ class ImsCjdcOrderMainController extends AdminController if (!(Admin::user()->isRole('market_service'))){ $filter->equal('market_id','所属市场')->select(ImsCjdcMarket::getMarket()); } + $filter->between('created_at','下单时间')->datetime(); + $filter->between('money','订单金额'); }); $grid->disableViewButton(); diff --git a/app/Admin/Controllers/v3/GoodsController.php b/app/Admin/Controllers/v3/GoodsController.php index b855eb5..01051b5 100644 --- a/app/Admin/Controllers/v3/GoodsController.php +++ b/app/Admin/Controllers/v3/GoodsController.php @@ -4,7 +4,9 @@ namespace App\Admin\Controllers\v3; use App\Admin\Actions\Grid\v3\GoodsCopy; use App\Admin\Actions\Grid\v3\GoodsImage; +use App\Admin\Common\Auth; use App\Admin\Repositories\v3\Goods; +use Dcat\Admin\Admin; use Dcat\Admin\Form; use Dcat\Admin\Grid; use Dcat\Admin\Show; @@ -25,7 +27,14 @@ class GoodsController extends AdminController */ protected function grid() { - return Grid::make(new Goods(), function (Grid $grid) { + $marketId = Auth::getMarket(); + if ($marketId){ + $build = new \App\Models\v3\Goods(); + $build = $build::where('market_id',$marketId); + }else{ + $build = new Goods(); + } + return Grid::make($build, function (Grid $grid) { // 二级分类 $categoryList = CategoryModel::getArray([['parent_id','>',0]],['选择分类'=>0]); // 店铺 @@ -49,7 +58,7 @@ class GoodsController extends AdminController $item .= $specKey.'：'.$specValue.'
'; } } - + return $item; }); $grid->column('market_id')->display(function($marketId) use($marketList){ @@ -77,7 +86,9 @@ class GoodsController extends AdminController $filter->equal('store_id')->select($storeList); $filter->equal('category_id')->select($categoryList); $filter->equal('goods_category_id')->select($goodsCategoryList); - $filter->equal('market_id')->select($marketList); + if (!(Admin::user()->isRole('market_service'))){ + $filter->equal('market_id')->select($marketList); + } $filter->equal('on_sale')->select(GoodsModel::$_ONSALE); $filter->equal('price'); $filter->equal('goods_unit'); diff --git a/app/Admin/Extensions/OrderDetailCopy.php b/app/Admin/Extensions/OrderDetailCopy.php new file mode 100644 index 0000000..aebd95a --- /dev/null +++ b/app/Admin/Extensions/OrderDetailCopy.php @@ -0,0 +1,55 @@ +order_id = $orderId; + $this->currentPage = $currentPage; + parent::__construct($title); + } + + public function render() + { + + // 实例化表单类并传递自定义参数 + $form = MyDetailPage::make(['order_id' => $this->order_id]); + return Modal::make() + ->xl() + ->title('订单详情') + ->body($form) + ->button($this->title); + + } + +// /** +// * 添加JS +// * @return string +// */ +// protected function script() +// { +// return <<order_id}').on('click', function () { +// window.location.href ="detail?order_id={$this->order_id}&page={$this->currentPage}"; +// }); +//JS; +// } +// + public function html() + { + $this->setHtmlAttribute(['class'=>"detail_{$this->order_id}"]); + return parent::html(); + } + +} diff --git a/app/Admin/Repositories/ImsCjdcOrderMain.php b/app/Admin/Repositories/ImsCjdcOrderMain.php index 220a7ad..eac9aed 100644 --- a/app/Admin/Repositories/ImsCjdcOrderMain.php +++ b/app/Admin/Repositories/ImsCjdcOrderMain.php @@ -17,6 +17,7 @@ class ImsCjdcOrderMain extends EloquentRepository public function get(Grid\Model $model) { + $builder = new \App\Models\ImsCjdcOrderMain(); $builder = $builder::leftJoin('lanzu_user','lanzu_user.id','lanzu_order_main.user_id') ->with('market') @@ -33,6 +34,12 @@ class ImsCjdcOrderMain extends EloquentRepository $value['arguments'][1] = $this->getGridColumns(); } elseif ($value['method'] == 'get') { $value['arguments'] = [$this->getGridColumns()]; + }elseif ($value['method']=='whereBetween'){ + if ($value['arguments'][0]=='created_at'){ + $value['arguments'][0] = 'lanzu_order_main.created_at'; + $value['arguments'][1][0] = strtotime($value['arguments'][1][0]); + $value['arguments'][1][1] = strtotime($value['arguments'][1][1]); + } } $query = call_user_func_array([$query, $value['method']], $value['arguments'] ?? []); }); diff --git a/config/admin.php b/config/admin.php index cb25c10..d653267 100644 --- a/config/admin.php +++ b/config/admin.php @@ -157,7 +157,9 @@ return [ | The global Grid action display class. |-------------------------------------------------------------------------- */ - 'grid_action_class' => Dcat\Admin\Grid\Displayers\DropdownActions::class, + //'grid_action_class' => Dcat\Admin\Grid\Displayers\DropdownActions::class, + 'grid_action_class' => Dcat\Admin\Grid\Displayers\Actions::class, + //'grid_action_class' => Dcat\Admin\Grid\Displayers\ContextMenuActions::class, ], /* diff --git a/resources/views/orderdetail.php b/resources/views/orderdetail.php index 708d6de..697f483 100644 --- a/resources/views/orderdetail.php +++ b/resources/views/orderdetail.php @@ -23,12 +23,12 @@ 配送费：{{delivery_money}} 元 - 订单备注：{{note}} + 订单备注：{{note}} 拒绝退款原因：{{refuse_refund_note}} - 拒绝退款原因：{{total_refund_note}} + 退款原因：{{total_refund_note}} @@ -49,7 +49,7 @@

￥{{goods.price}}

- {{refund_2}} + {{refund_2}}

{{refund_3}}

{{refund_3}}