From 703a436cc93d5e4b649db5a5cf7140ceda3aeb82 Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Sun, 27 Sep 2020 15:44:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=9A=E5=8A=A1=E5=91=98?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Actions/Tools/SalesmanOption.php    | 49 ++++++++-----------
 app/Admin/Controllers/v3/Salesman.php         |  1 +
 app/Admin/Extensions/MyDetailPage.php         |  2 +-
 .../views/admin/tools/salesman.blade.php      | 18 ++-----
 resources/views/orderdetail.php               |  4 +-
 5 files changed, 30 insertions(+), 44 deletions(-)

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 <<<JS
-$('#today').change(function () {
-    var url = "salesman?type=today&option=1"
-    Dcat.reload(url);
-});
-$('#yesterday').change(function () {
-    var url = "salesman?type=yesterday&option=-1"
-
-    Dcat.reload(url);
-});
-$('#week').change(function () {
-    var url = "salesman?type=week&option=w"
-
-    Dcat.reload(url);
-});
-$('#month').change(function () {
-    var url = "salesman?type=month&option=30"
-
-    Dcat.reload(url);
+$("#{$this->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 @@
-
 <div class="btn-group btn-group-toggle" data-toggle="buttons">
-    <label class="btn btn-primary {{request()->get('type','today')=='today'? 'active':''}}">
-        <input type="radio" name="options" id="today" checked> 今日
-    </label>
-    <label class="btn btn-primary {{request()->get('type')=='yesterday'? 'active':''}}">
-        <input type="radio" name="options" checked id="yesterday"> 昨日
-    </label>
-    <label class="btn btn-primary {{request()->get('type')=='week'? 'active':''}}">
-        <input type="radio" name="options" id="week"> 本周
-    </label>
-    <label class="btn btn-primary {{request()->get('type')=='month'? 'active':''}}">
-        <input type="radio" name="options" id="month"> 本月
-    </label>
+    @foreach($options as $option => $label)
+        <label class="btn btn-primary {{request()->get('type','today')==$option? 'active':''}}">
+            <input type="radio" name="options" id="{{$option}}"> {{$label}}
+        </label>
+    @endforeach
 </div>
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 @@
 
             <td colspan="5">更新时间：{{updated_at}}</td>
         </tr>
-       
+
         <tr>
             <td class="text-nowrap" scope="row" v-if="shipping_type_num == 1 || shipping_type_num == 2">预约送达时间：{{delivery_time_note}}</td>
             <td class="text-nowrap" scope="col" v-if="shipping_type_num == 1 || shipping_type_num == 2">配送员: {{horseman_name}}</td>
@@ -25,7 +25,7 @@
             <td class="text-nowrap" scope="row" v-if="shipping_type_num == 1 || shipping_type_num == 2">配送距离：{{distance}}</td>
             <td colspan="5" v-if="shipping_type_num == 1 || shipping_type_num == 2">配送费：{{delivery_money}} 元</td>
         </tr>
-       
+
         <tr>
             <td class="text-nowrap" scope="row">配送方式：{{shipping_type}}</td>
             <td class="text-nowrap" scope="col"></td>