From a0832fd60017a5fcd3f99dd75e3ce95c2c563068 Mon Sep 17 00:00:00 2001
From: lanzu_qsy <334039090@qq.com>
Date: Thu, 6 Aug 2020 20:18:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B8=82=E5=9C=BA=E7=BB=8F?=
 =?UTF-8?q?=E7=90=86=E6=B7=BB=E5=8A=A0=E8=A1=A8=E5=8D=95=E7=9A=84=E6=89=80?=
 =?UTF-8?q?=E5=B1=9E=E5=B8=82=E5=9C=BA=E9=80=89=E6=8B=A9=E9=A1=B9,?=
 =?UTF-8?q?=E6=89=80=E5=B1=9E=E5=B8=82=E5=9C=BA=E5=8F=AA=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=9C=8D=E5=8A=A1=E5=95=86=E4=B8=8B=E7=9A=84?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B8=82=E5=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/LanzuMmInfoController.php     | 6 ++++--
 app/Admin/Controllers/LanzuMmWithdrawController.php | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/Admin/Controllers/LanzuMmInfoController.php b/app/Admin/Controllers/LanzuMmInfoController.php
index 08577ad..edc3558 100644
--- a/app/Admin/Controllers/LanzuMmInfoController.php
+++ b/app/Admin/Controllers/LanzuMmInfoController.php
@@ -7,6 +7,7 @@ use App\Models\AdminUsers;
 use \App\Models\AdminRoles;
 use \App\Models\AdminRoleUsers;
 use App\Models\ImsCjdcMarket;
+use App\Models\LanzuMpInfo;
 use App\Models\LanzuMpInfo as mpInfo;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
@@ -27,7 +28,6 @@ class LanzuMmInfoController extends AdminController
      */
     protected function grid()
     {
-
         return Grid::make(new LanzuMmInfo(), function (Grid $grid) {
 
             $user = Admin::user();
@@ -163,7 +163,9 @@ class LanzuMmInfoController extends AdminController
      */
     protected function getMarket()
     {
-        $markets = ImsCjdcMarket::all();
+        $user = Admin::user();
+        $mp = LanzuMpInfo::where('admin_user_id',$user->id)->first();
+        $markets = ImsCjdcMarket::where('mp_id',$mp->id)->get();
         $data = [];
         foreach ($markets as $market){
             $item = [];
diff --git a/app/Admin/Controllers/LanzuMmWithdrawController.php b/app/Admin/Controllers/LanzuMmWithdrawController.php
index c226941..c839338 100644
--- a/app/Admin/Controllers/LanzuMmWithdrawController.php
+++ b/app/Admin/Controllers/LanzuMmWithdrawController.php
@@ -19,12 +19,10 @@ class LanzuMmWithdrawController extends AdminController
 {
     /**
      * Make a grid builder.
-     *
      * @return Grid
      */
     protected function grid()
     {
-
         $user = Admin::user();
         $mp_info = mpInfo::where('admin_user_id',$user->id)->first();
         $mk = ImsCjdcMarket::where('mp_id',$mp_info->id)->get()->pluck('id');
@@ -45,7 +43,9 @@ class LanzuMmWithdrawController extends AdminController
             $grid->money;
             $grid->status('提现状态')->using([-1=>'拒绝',0=>'审核中',1=>'通过'])
             ->label([-1=>'danger',0=>'default',1=>'success']);
-            $grid->created_at('提现时间');
+            $grid->created_at('提现时间')->display(function ($time){
+                return date('Y-m-d H:i',$time);
+            });
 
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->equal('id');