From eae7f583d07928a6223e443c2712b9e7b2dc7a0c Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Sun, 27 Sep 2020 09:48:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=87=8D=E7=BD=AE=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Actions/Tools/ShowOrderStateHandle.php     | 8 ++++++--
 app/Admin/Controllers/ImsCjdcOrderMainController.php | 2 ++
 app/Admin/Repositories/ImsCjdcOrderMain.php          | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/Admin/Actions/Tools/ShowOrderStateHandle.php b/app/Admin/Actions/Tools/ShowOrderStateHandle.php
index 7d46b06..e18493d 100644
--- a/app/Admin/Actions/Tools/ShowOrderStateHandle.php
+++ b/app/Admin/Actions/Tools/ShowOrderStateHandle.php
@@ -17,7 +17,11 @@ class ShowOrderStateHandle extends  AbstractTool
 
     protected function script()
     {
-        $url = "order?state=".$this->state.'&'."time=".(time()-(7*86400));
+        if ($this->state){
+            $url = "order?state=".$this->state.'&'."time=".(time()-(7*86400));
+        }else{
+            $url = "order";
+        }
         return <<<JS
 $(".order_state_{$this->state}").on('click',function () {
         window.location.href = "{$url}"
@@ -27,7 +31,7 @@ JS;
 
     public function render()
     {
-        $title = '';
+        $title = '<i class="feather icon-rotate-ccw"></i> 重置';
         $count = ImsCjdcOrderMain::getOrderStateCount($this->state,Auth::getMarket());
         if ($this->state==8){
             $title = "退款申请(".$count.")";
diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php
index 778d53c..b64f20d 100644
--- a/app/Admin/Controllers/ImsCjdcOrderMainController.php
+++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php
@@ -41,6 +41,7 @@ class ImsCjdcOrderMainController extends AdminController
             //>6.退款
             $grid->tools(new ShowOrderStateHandle(2));
             $grid->tools(new ShowOrderStateHandle(8));
+            $grid->tools(new ShowOrderStateHandle());
             $grid->paginate(10);//每页展示数据10条
             //$grid->id;
             //$grid->user_id('用户信息');
@@ -107,6 +108,7 @@ class ImsCjdcOrderMainController extends AdminController
                 $filter->equal('state','订单状态')->select(
                     [1=>'待付款',2=>'待接单',4=>'已完成',6=>'已取消',8=>'退款中',9=>'已退款',10=>'退款拒绝']
                 );
+                $filter->disableResetButton();
             });
 
             $grid->disableViewButton();
diff --git a/app/Admin/Repositories/ImsCjdcOrderMain.php b/app/Admin/Repositories/ImsCjdcOrderMain.php
index 9554683..bfd6bf4 100644
--- a/app/Admin/Repositories/ImsCjdcOrderMain.php
+++ b/app/Admin/Repositories/ImsCjdcOrderMain.php
@@ -20,7 +20,6 @@ class ImsCjdcOrderMain extends EloquentRepository
 
         $builder = new \App\Models\ImsCjdcOrderMain();
         $time = request()->input('time');
-
         $builder = $builder::leftJoin('lanzu_user','lanzu_user.id','lanzu_order_main.user_id')
             ->with('market')
             ->select('lanzu_order_main.*','lanzu_user.nick_name')
@@ -54,6 +53,7 @@ class ImsCjdcOrderMain extends EloquentRepository
             if ($value['state']==3&&$value['shipping_type']==1&&!empty($value['horseman_id'])){
                 $value['state'] = 311;
             }
+            $value['time'] = time()-(7*86400);
         }
 
         $query = $model->makePaginator($query['total'],$query['data']);