Merge branch 'qs_local_mp' into develop

app/Admin/Controllers/LanzuFinancialRecord.php

@@ -35,6 +35,8 @@ class LanzuFinancialRecord extends AdminController
         }
 
         return Grid::make($builder, function (Grid $grid) use ($adu,$type) {
+            $grid->model()->orderBy('created_at','desc');
+            $grid->paginate(10);
             $grid->id;
             $grid->user_id('用户')->display(function () {
                 if ($this->user_type == 1) {

app/Admin/Controllers/LanzuMmInfoController.php

@@ -32,7 +32,7 @@ class LanzuMmInfoController extends AdminController
     protected function grid()
     {
         return Grid::make(new LanzuMmInfo(), function (Grid $grid) {
-
+            $grid->model()->orderBy('created_at','desc');
             $user = Admin::user();
             //根据登陆帐户获取服务商信息
             $mp_info = mpInfo::where('admin_user_id', $user->id)->first();

app/Admin/Controllers/LanzuMmWithdrawController.php

@@ -51,6 +51,7 @@ class LanzuMmWithdrawController extends AdminController
         }
 
         return Grid::make($buider, function (Grid $grid) use ($mp_info, $mm_id) {
+            $grid->model()->orderBy('created_at','desc');
             $grid->actions(function (Grid\Displayers\Actions $actions) use ($grid) {
                 if ($actions->row->status != 0) {
                     $actions->disableEdit();
@@ -141,7 +142,9 @@ class LanzuMmWithdrawController extends AdminController
                 $form->display('提现人')->value(LanzuMmInfo::find($mmId)->name);
             } else {//非市场经理登陆时
                 $mm = LanzuMmInfo::find($form->model()->mm_id);
-                $form->display('可提现金额')->value($this->getBalance($mm->admin_user_id));
+                if ($mm){
+                    $form->display('可提现金额')->value($this->getBalance($mm->admin_user_id));
+                }
                 $mmInfo = LanzuMmInfo::find($form->model()->mm_id);
                 if ($mmInfo) {
                     $form->display('提现人')->value($mmInfo->name);

app/Admin/Controllers/LanzuMpInfoController.php

@@ -42,6 +42,7 @@ class LanzuMpInfoController extends AdminController
     protected function grid()
     {
         return Grid::make(new LanzuMpInfo(), function (Grid $grid) {
+            $grid->model()->orderBy('created_at','desc');
             $grid->name;
             $grid->phone;
             $grid->actions(function (Grid\Displayers\Actions $actions) {

app/Admin/Controllers/LanzuMpWithdrawController.php

@@ -32,6 +32,7 @@ class LanzuMpWithdrawController extends AdminController
         }
 
         return Grid::make($buider, function (Grid $grid) use ($current_user) {
+            $grid->model()->orderBy('created_at','desc');
             $grid->id->sortable();
             $grid->column('mpInfo.name', '服务商名字');
             $grid->money;