From 5cf9752f0831e68db70cc381fe2efb4601695e58 Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Wed, 9 Sep 2020 21:01:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/ImsCjdcOrderMainController.php | 5 +++--
 app/Admin/Extensions/MyDetailPage.php                | 9 +++------
 app/Admin/Extensions/OrderDetail.php                 | 7 ++++---
 resources/lang/zh-CN/ims-cjdc-order-main.php         | 5 +++--
 resources/views/orderdetail.php                      | 3 ++-
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php
index a237a9f..5ae55fd 100644
--- a/app/Admin/Controllers/ImsCjdcOrderMainController.php
+++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php
@@ -72,7 +72,7 @@ class ImsCjdcOrderMainController extends AdminController
                     $actions->append(new OrderStateHandle('同意退款',9));
                     $actions->append(new OrderRefund($actions->row->id,$grid->model()->getCurrentPage(),'拒绝退款'));
                 }
-                $actions->append(new OrderDetail($actions->row->id,'详情'));
+                $actions->append(new OrderDetail($actions->row->id,$grid->model()->getCurrentPage(),'详情'));
             });
 
 
@@ -138,11 +138,12 @@ class ImsCjdcOrderMainController extends AdminController
     public function orderDetail(Content $content)
     {
         $oid = request()->get('order_id');
+        $page = request()->get('page');
         // 实例化表单类并传递自定义参数
         $detail = MyDetailPage::make(['order_id'=>$oid]);
         return $content->header('订单详情')
             ->breadcrumb(
-                ['text'=>'列表','url'=>'order'],
+                ['text'=>'列表','url'=>"order?page={$page}"],
                 ['text' => '详情', 'url' => 'detail'],
             )
             ->body(Lazy::make($detail));
diff --git a/app/Admin/Extensions/MyDetailPage.php b/app/Admin/Extensions/MyDetailPage.php
index 267d9f6..97038fe 100644
--- a/app/Admin/Extensions/MyDetailPage.php
+++ b/app/Admin/Extensions/MyDetailPage.php
@@ -21,6 +21,7 @@ class MyDetailPage extends LazyRenderable
 
     public function render()
     {
+        //>>1.主订单数据
         $order = ImsCjdcOrderMain::where('id',$this->order_id)->first()->toArray();
         if ($order){
             $order['created_at'] = date('Y-m-d H:i:s',$order['created_at']);
@@ -28,9 +29,7 @@ class MyDetailPage extends LazyRenderable
             $order['pay_type'] = config('order.pay_type')[$order['pay_type']];
             $order['shipping_type'] = config('order.shipping_type')[$order['shipping_type']];
             $order['horseman_name'] = LanzuServiceHorseman::getName($order['horseman_id']);
-
-
-            //获取子订单
+            //>>2.获取子订单
             $orders = ImsCjdcOrder::with('user')->with('store')
                 ->where('order_main_id',$order['id'])->get()->toArray();
             if (count($orders)){
@@ -39,14 +38,11 @@ class MyDetailPage extends LazyRenderable
                 }
             }
             $orders = json_encode($orders);
-
-
         }
         //配送距离
         //配送费
         //拒绝退款理由
         //退款总备注原因，单个商品或者单个子订单
-        //dd($order);
         Admin::script(
             <<<JS
             var orders =  JSON.stringify($orders)
@@ -61,6 +57,7 @@ class MyDetailPage extends LazyRenderable
                     shipping_type: "{$order['shipping_type']}",
                     tel: "{$order['tel']}",
                     delivery_time_note: "{$order['delivery_time_note']}",
+                    refuse_refund_note: "{$order['refuse_refund_note']}",
                     address: "{$order['address']}",
                     note: "{$order['note']}",
                     money: "{$order['money']}",
diff --git a/app/Admin/Extensions/OrderDetail.php b/app/Admin/Extensions/OrderDetail.php
index bb9420d..df03ab8 100644
--- a/app/Admin/Extensions/OrderDetail.php
+++ b/app/Admin/Extensions/OrderDetail.php
@@ -10,10 +10,11 @@ class OrderDetail extends RowAction
 {
     protected $title;
     protected $order_id;
-
-    public function __construct($orderId,$title=null)
+    protected $currentPage;
+    public function __construct($orderId,$currentPage,$title=null)
     {
         $this->order_id = $orderId;
+        $this->currentPage = $currentPage;
         parent::__construct($title);
     }
 
@@ -25,7 +26,7 @@ class OrderDetail extends RowAction
     {
         return <<<JS
 $('.detail_{$this->order_id}').on('click', function () {
-        window.location.href ="detail?order_id={$this->order_id}";
+        window.location.href ="detail?order_id={$this->order_id}&page={$this->currentPage}";
     });
 JS;
     }
diff --git a/resources/lang/zh-CN/ims-cjdc-order-main.php b/resources/lang/zh-CN/ims-cjdc-order-main.php
index 3600905..79dfe36 100644
--- a/resources/lang/zh-CN/ims-cjdc-order-main.php
+++ b/resources/lang/zh-CN/ims-cjdc-order-main.php
@@ -1,7 +1,8 @@
-<?php 
+<?php
 return [
     'labels' => [
-        'ImsCjdcOrderMain' => 'ImsCjdcOrderMain',
+        'ImsCjdcOrderMain' => '订单',
+        'order'=>'订单列表'
     ],
     'fields' => [
         'user_id' => '用户id',
diff --git a/resources/views/orderdetail.php b/resources/views/orderdetail.php
index 745e4ea..ad66e5f 100644
--- a/resources/views/orderdetail.php
+++ b/resources/views/orderdetail.php
@@ -24,7 +24,8 @@
             <td colspan="5">配送费：{{delivery_money}} 元</td>
         </tr>
         <tr>
-            <td class="text-nowrap" scope="col">备注：{{note}}</td>
+            <td class="text-nowrap" scope="col">订单备注：{{note}}</td>
+            <td class="text-nowrap" scope="col" v-if="refuse_refund_note">拒绝退款原因：{{refuse_refund_note}}</td>
 
         </tr>
         </tbody>