diff --git a/app/Admin/Actions/Tools/SalesmanOption.php b/app/Admin/Actions/Tools/SalesmanOption.php index 3e33414..bc28dab 100644 --- a/app/Admin/Actions/Tools/SalesmanOption.php +++ b/app/Admin/Actions/Tools/SalesmanOption.php @@ -9,46 +9,39 @@ use Dcat\Admin\Grid\Tools\AbstractTool; class SalesmanOption extends AbstractTool { + protected $url; + protected $option; protected function script() { return <<option}").change(function () { + var url = "{$this->url}" + Dcat.reload(url) }); JS; } public function render() { - Admin::script($this->script()); -// $options = [ -// 't' => '今日', -// 'y' => '昨日', -// 'w' => '本周', -// 'm' => '本月', -// ]; $options = [ - 'all' => 'All', - 'm' => 'Male', - 'f' => 'Female', + 'today' => '今日', + 'yesterday' => '昨日', + 'week' => '本周', + 'month' => '本月', + ]; + + $data = [ + 'today' => '1', + 'yesterday' => '-1', + 'week' => 'w', + 'month' => '30', ]; + foreach ($data as $key=>$value){ + $this->url = "salesman?type={$key}&option={$value}"; + $this->option = $key; + Admin::script($this->script()); + } return view('admin.tools.salesman', compact('options')); } } diff --git a/app/Admin/Controllers/v3/Salesman.php b/app/Admin/Controllers/v3/Salesman.php index ea0d255..d9fa51b 100644 --- a/app/Admin/Controllers/v3/Salesman.php +++ b/app/Admin/Controllers/v3/Salesman.php @@ -5,6 +5,7 @@ namespace App\Admin\Controllers\v3; use App\Admin\Actions\Tools\SalesmanOption; +use App\Admin\Actions\Tools\SalesmanOptionCopy; use App\Models\v3\SalesmanData; use Dcat\Admin\Controllers\AdminController; use Dcat\Admin\Grid; diff --git a/app/Admin/Extensions/MyDetailPage.php b/app/Admin/Extensions/MyDetailPage.php index 9af40e7..b415440 100644 --- a/app/Admin/Extensions/MyDetailPage.php +++ b/app/Admin/Extensions/MyDetailPage.php @@ -131,7 +131,7 @@ JS ); } - return view('orderdetail'); + return view('orderdetail',['desion'=>'DESION']); } diff --git a/resources/views/admin/tools/salesman.blade.php b/resources/views/admin/tools/salesman.blade.php index 779c74c..b2a76f6 100644 --- a/resources/views/admin/tools/salesman.blade.php +++ b/resources/views/admin/tools/salesman.blade.php @@ -1,15 +1,7 @@ -
- - - - + @foreach($options as $option => $label) + + @endforeach
diff --git a/resources/views/orderdetail.php b/resources/views/orderdetail.php index 863ead0..71e2457 100644 --- a/resources/views/orderdetail.php +++ b/resources/views/orderdetail.php @@ -16,7 +16,7 @@ 更新时间:{{updated_at}} - + 预约送达时间:{{delivery_time_note}} 配送员: {{horseman_name}} @@ -25,7 +25,7 @@ 配送距离:{{distance}} 配送费:{{delivery_money}} 元 - + 配送方式:{{shipping_type}}