diff --git a/app/AdminSupplier/Controllers/DepositLogController.php b/app/AdminSupplier/Controllers/DepositLogController.php
index 23c82e7..fd912e6 100755
--- a/app/AdminSupplier/Controllers/DepositLogController.php
+++ b/app/AdminSupplier/Controllers/DepositLogController.php
@@ -2,78 +2,98 @@
namespace App\AdminSupplier\Controllers;
-use App\AdminAgent\Controllers\AdvertisingController;
use App\AdminSupplier\Repositories\DepositLog;
+use App\AdminSupplier\Repositories\Withdrawal;
+use App\Traits\DemandTraits;
use App\Traits\StatementTraits;
+use App\Traits\WithdrawalTraits;
use Dcat\Admin\Admin;
use Dcat\Admin\Form;
use Dcat\Admin\Grid;
-use Dcat\Admin\Show;
+use Dcat\Admin\Layout\Column;
+use Dcat\Admin\Layout\Content;
+use Dcat\Admin\Layout\Row;
use Dcat\Admin\Http\Controllers\AdminController;
+use Dcat\Admin\Widgets\Card;
class DepositLogController extends AdminController
{
- /**
- * Make a grid builder.
- *
- * @return Grid
- */
- protected function grid()
- {
- return Grid::make(new DepositLog('supplier'), function (Grid $grid) {
- $grid->model()->where('supplier_id',Admin::user()->id);
- $grid->column('id')->sortable();
- $grid->column('price');
- $grid->column('supplier.name','供应商');
- $grid->column('type','类型')->using(StatementTraits::$depositText);
- $grid->column('created_at');
- $grid->column('updated_at')->sortable();
+ public function index(Content $content)
+ {
+ return $content
+ ->body(
+ <<
+
+
+ HTML
- ///**
- // * Make a show builder.
- // *
- // * @param mixed $id
- // *
- // * @return Show
- // */
- //protected function detail($id)
- //{
- // return Show::make($id, new DepositLog(), function (Show $show) {
- // $show->field('id');
- // $show->field('price');
- // $show->field('supplier_id');
- // $show->field('type');
- // $show->field('created_at');
- // $show->field('updated_at');
- // });
- //}
- //
- ///**
- // * Make a form builder.
- // *
- // * @return Form
- // */
- //protected function form()
- //{
- // return Form::make(new DepositLog(), function (Form $form) {
- // $form->display('id');
- // $form->text('price');
- // $form->text('supplier_id');
- // $form->text('type');
- //
- // $form->display('created_at');
- // $form->display('updated_at');
- // });
- //}
+ )
+ ->body(function (Row $row) {
+
+ $row->column(4, function (Column $column) {
+ $column->row(Card::make('正常', function () {
+ $price = Admin::user()->deposit_normal ?? 0;
+ return <<
+ $price
+
+HTML;
+ }));
+ });
+
+ $row->column(4, function (Column $column) {
+ $column->row(Card::make('冻结', function () {
+ $price = Admin::user()->deposit_frozen ?? 0;
+ return <<
+ $price
+
+HTML;
+ }));
+
+ });
+
+ $row->column(4, function (Column $column) {
+ $column->row(Card::make('消费', function () {
+ $price = Admin::user()->deposit_used ?? 0;
+ return <<
+ $price
+
+HTML;
+ }));
+
+ });
+
+ })
+ ->body(
+ Grid::make(new DepositLog('supplier'), function (Grid $grid) {
+ $grid->model()->where('supplier_id', Admin::user()->id);
+ $grid->column('id')->sortable();
+ $grid->column('price');
+ $grid->column('supplier.name', '供应商');
+ $grid->column('type', '类型')->using(StatementTraits::$depositText);
+ $grid->column('created_at');
+ $grid->column('updated_at')->sortable();
+
+ $grid->disableDeleteButton();
+ $grid->disableRowSelector();
+ $grid->disableCreateButton();
+ $grid->disableActions();
+ $grid->filter(function (Grid\Filter $filter) {
+ $filter->equal('type', '状态')->width(2)->select(StatementTraits::$depositText);
+
+ });
+ })
+
+ );
+ }
}
diff --git a/app/AdminSupplier/Controllers/WalletController.php b/app/AdminSupplier/Controllers/WalletController.php
index 5719119..2f8e3c6 100644
--- a/app/AdminSupplier/Controllers/WalletController.php
+++ b/app/AdminSupplier/Controllers/WalletController.php
@@ -24,7 +24,7 @@ class WalletController extends AdminController