diff --git a/app/Admin/Controllers/LanzuMmWithdrawController.php b/app/Admin/Controllers/LanzuMmWithdrawController.php index 33c83a5..e75bac3 100644 --- a/app/Admin/Controllers/LanzuMmWithdrawController.php +++ b/app/Admin/Controllers/LanzuMmWithdrawController.php @@ -16,6 +16,7 @@ use Dcat\Admin\Show; use Dcat\Admin\Controllers\AdminController; use Dcat\Admin\Admin; use EasyWeChat\Factory; +use Illuminate\Support\Facades\Log; class LanzuMmWithdrawController extends AdminController { @@ -118,7 +119,10 @@ class LanzuMmWithdrawController extends AdminController $form->display('可提现金额')->value($this->getBalance($current_user->id)); $form->display('提现人')->value(LanzuMmInfo::find($mmId)->name); } else {//非市场经理登陆时 - $form->display('提现人')->value(LanzuMmInfo::find($form->model()->mm_id)->name); + $mmInfo = LanzuMmInfo::find($form->model()->mm_id); + if ($mmInfo){ + $form->display('提现人')->value($mmInfo->name); + } } if ($form->isEditing()) {//判断是否是编辑请求,如果是编辑请求,判断状态是否被编辑过. @@ -154,6 +158,8 @@ class LanzuMmWithdrawController extends AdminController $mmw->save(); }else{ //记录失败日志 + $res['data'] = $data; + Log::error('提现失败.', $res); } } }); diff --git a/app/Admin/Controllers/LanzuMpWithdrawController.php b/app/Admin/Controllers/LanzuMpWithdrawController.php index 1719db3..b6fce9b 100755 --- a/app/Admin/Controllers/LanzuMpWithdrawController.php +++ b/app/Admin/Controllers/LanzuMpWithdrawController.php @@ -35,6 +35,7 @@ class LanzuMpWithdrawController extends AdminController $grid->money; $grid->status('提现状态')->using([-1=>'拒绝',0=>'审核中',1=>'通过']) ->label([-1=>'danger',0=>'default',1=>'success']); + $grid->is_pay('是否到账')->using([0=>'否',1=>'是']); $grid->created_at; $grid->filter(function (Grid\Filter $filter) { $filter->equal('id'); @@ -126,7 +127,12 @@ class LanzuMpWithdrawController extends AdminController $form->disableSubmitButton(); $form->disableResetButton(); }else{ - $form->radio('status')->options([1 => '通过审核', -1=> '拒绝'])->default(-1); + if ($form->isCreating()){ + $form->radio('status')->options([1 => '通过审核', -1=> '拒绝'])->default(-1)->disable(); + }else{ + $form->radio('status')->options([1 => '通过审核', -1=> '拒绝'])->default(-1); + } + } $form->saved(function (Form $form,$result){ @@ -173,7 +179,7 @@ class LanzuMpWithdrawController extends AdminController $form->display('id'); $form->hidden('mp_id')->value($mp->id); $form->text('balance','当前可提现余额')->value($balance)->disable()->help('当前可提现金额'); - $form->number('money','提现金额')->required(); + $form->number('money','提现金额')->required()->min(0); $form->ignore(['balance']); //添加成功之后,扣减掉可提现金额 $form->saved(function (Form $form,$result)use ($mpb){ diff --git a/config/admin.php b/config/admin.php index 0e674ed..30339b8 100644 --- a/config/admin.php +++ b/config/admin.php @@ -316,8 +316,8 @@ return [ // indigo, blue, blue-light, blue-dark, green 'color' => 'green', - //'body_class' => 'dark-mode', - 'body_class' => '', + 'body_class' => 'dark-mode', + //'body_class' => '', 'sidebar_collapsed' => false,