From 52f268bd5245417db896c1fad0d9c0adcd09934a Mon Sep 17 00:00:00 2001 From: lanzu_qsy <334039090@qq.com> Date: Thu, 6 Aug 2020 17:53:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9C=8D=E5=8A=A1=E5=95=86?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=A1=A8=E5=8D=95=E8=BE=93=E5=85=A5=E5=A1=AB?= =?UTF-8?q?=E9=A1=B9,=20=E5=A2=9E=E5=8A=A0=E5=AF=B9=E7=99=BB=E9=99=86?= =?UTF-8?q?=E5=B8=90=E5=8F=B7=E7=9A=84=E7=8A=B6=E6=80=81=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/AuthController.php | 13 ++++++++++++ .../Controllers/ImsCjdcMarketController.php | 12 +++++++---- .../Controllers/LanzuMmInfoController.php | 2 +- .../Controllers/LanzuMmWithdrawController.php | 21 +++++++++++++++---- .../Controllers/LanzuMpInfoController.php | 12 +++++------ app/Models/LanzuMmWithdraw.php | 3 ++- config/admin.php | 1 + 7 files changed, 48 insertions(+), 16 deletions(-) diff --git a/app/Admin/Controllers/AuthController.php b/app/Admin/Controllers/AuthController.php index 37efcb4..4220988 100644 --- a/app/Admin/Controllers/AuthController.php +++ b/app/Admin/Controllers/AuthController.php @@ -2,8 +2,21 @@ namespace App\Admin\Controllers; +use App\Models\AdminUsers; use Dcat\Admin\Controllers\AuthController as BaseAuthController; +use Illuminate\Http\Request; class AuthController extends BaseAuthController { + public function postLogin(Request $request) + { + $username = $request->post('username'); + //校验该帐号状态是否正常 + $adu = new AdminUsers(); + $adu = $adu->where(['username'=>$username])->first(); + if ($adu&&$adu->status==0){ + return $this->error('该帐号已被冻结,请联系管理员'); + } + return parent::postLogin($request); + } } diff --git a/app/Admin/Controllers/ImsCjdcMarketController.php b/app/Admin/Controllers/ImsCjdcMarketController.php index 31a5b15..a2e254c 100644 --- a/app/Admin/Controllers/ImsCjdcMarketController.php +++ b/app/Admin/Controllers/ImsCjdcMarketController.php @@ -112,10 +112,14 @@ class ImsCjdcMarketController extends AdminController { return Form::make(new ImsCjdcMarket(), function (Form $form) { $form->display('id'); - $form->text('name'); - $form->select('mp_id','服务商')->options('/api/getMpInfo'); - $form->text('address'); - $form->text('coordinates'); + $form->text('name')->required(); + $form->select('mp_id','服务商')->options('/api/getMpInfo')->required(); + $form->text('address')->required(); + $form->text('coordinates') + ->required() + ->placeholder('输入 经纬度,如: 108.281552,22.83731') + ->help("通过网址 https://lbs.amap.com/console/show/picker 获取经纬度"); + $form->text('poundage'); $form->text('dn_poundage'); $form->text('dm_poundage'); diff --git a/app/Admin/Controllers/LanzuMmInfoController.php b/app/Admin/Controllers/LanzuMmInfoController.php index 8811438..397b864 100644 --- a/app/Admin/Controllers/LanzuMmInfoController.php +++ b/app/Admin/Controllers/LanzuMmInfoController.php @@ -90,7 +90,7 @@ class LanzuMmInfoController extends AdminController $form->image('id_frond')->uniqueName(); $form->image('id_back')->uniqueName(); $form->text('id_number'); - $form->radio('status','状态')->options(['禁用','启用']); + $form->radio('status','状态')->options(['禁用','启用'])->default(1); $form->saved(function (Form $form,$result){ $adu = new AdminUsers(); if ($form->isCreating()){ diff --git a/app/Admin/Controllers/LanzuMmWithdrawController.php b/app/Admin/Controllers/LanzuMmWithdrawController.php index 8205272..2ff904f 100644 --- a/app/Admin/Controllers/LanzuMmWithdrawController.php +++ b/app/Admin/Controllers/LanzuMmWithdrawController.php @@ -21,10 +21,22 @@ class LanzuMmWithdrawController extends AdminController { return Grid::make(new LanzuMmWithdraw(), function (Grid $grid) { $grid->id->sortable(); - $grid->mm_id('提现'); + $grid->column('mm_id','提现人')->display(function (){ + return Auth::guard('admin')->user()->toArray()['name']; + }); $grid->money; - $grid->status('提现状态'); - $grid->created_at('提现时间'); + $grid->status('提现状态')->display(function ($status){ + if ($status==0){ + return '待审核'; + }elseif ($status==1){ + return '已同意'; + }else{ + return '已拒绝'; + } + }); + $grid->created_at('提现时间')->display(function ($time){ + return date('Y-m-d H:i',$time); + }); $grid->filter(function (Grid\Filter $filter) { $filter->equal('id'); @@ -60,8 +72,9 @@ class LanzuMmWithdrawController extends AdminController protected function form() { return Form::make(new LanzuMmWithdraw(), function (Form $form) { + $form->display('name','提现用户')->value(Auth::guard('admin')->user()->toArray()['name']); $form->display('id'); - $form->text('mm_id'); + $form->hidden('mm_id')->value(Auth::guard('admin')->user()->getAuthIdentifier()); $form->text('money'); $form->display('created_at'); $form->display('updated_at'); diff --git a/app/Admin/Controllers/LanzuMpInfoController.php b/app/Admin/Controllers/LanzuMpInfoController.php index 36173aa..71c158c 100644 --- a/app/Admin/Controllers/LanzuMpInfoController.php +++ b/app/Admin/Controllers/LanzuMpInfoController.php @@ -101,15 +101,15 @@ class LanzuMpInfoController extends AdminController { return Form::make(new LanzuMpInfo(), function (Form $form) { $form->display('id')->hideInDialog(); - $form->text('name'); - $form->text('phone'); - $form->text('bank_name'); - $form->text('bank_card'); - $form->text('bank_addr'); + $form->text('name')->required(); + $form->text('phone')->required(); + $form->text('bank_name')->required(); + $form->text('bank_card')->required(); + $form->text('bank_addr')->required(); $form->image('id_frond')->uniqueName(); $form->image('id_back')->uniqueName(); $form->text('id_number'); - $form->radio('status','状态')->options(['禁用','启用']); + $form->radio('status','状态')->options(['禁用','启用'])->default(1); $form->saved(function (Form $form,$result){ $adu = new AdminUsers(); if ($form->isCreating()){ diff --git a/app/Models/LanzuMmWithdraw.php b/app/Models/LanzuMmWithdraw.php index 48a38b8..11e289c 100644 --- a/app/Models/LanzuMmWithdraw.php +++ b/app/Models/LanzuMmWithdraw.php @@ -12,5 +12,6 @@ class LanzuMmWithdraw extends Model use SoftDeletes; protected $table = 'lanzu_mm_withdraw'; - + protected $dateFormat = 'U'; + } diff --git a/config/admin.php b/config/admin.php index 207271e..6ac6ef1 100644 --- a/config/admin.php +++ b/config/admin.php @@ -316,6 +316,7 @@ return [ // indigo, blue, blue-light, blue-dark, green 'color' => 'indigo', + //'body_class' => 'dark-mode', 'body_class' => '', 'sidebar_collapsed' => false,