From 3cd01f3b4c7fe109f256299640525ec28743a9f2 Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Thu, 10 Sep 2020 11:34:40 +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

---
 .../ImsCjdcOrderMainController.php            |  4 ++
 app/Admin/Extensions/MyDetailPage.php         | 39 +++++--------------
 app/Models/ImsCjdcOrder.php                   | 15 ++++++-
 app/Models/ImsCjdcOrderMain.php               | 11 ++++++
 resources/views/orderdetail.php               |  2 +-
 5 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php
index 5ae55fd..51c4707 100644
--- a/app/Admin/Controllers/ImsCjdcOrderMainController.php
+++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php
@@ -148,4 +148,8 @@ class ImsCjdcOrderMainController extends AdminController
             )
             ->body(Lazy::make($detail));
     }
+
+
+
+
 }
diff --git a/app/Admin/Extensions/MyDetailPage.php b/app/Admin/Extensions/MyDetailPage.php
index ab648bb..61c3ca1 100644
--- a/app/Admin/Extensions/MyDetailPage.php
+++ b/app/Admin/Extensions/MyDetailPage.php
@@ -22,34 +22,16 @@ class MyDetailPage extends LazyRenderable
     public function render()
     {
         //>>1.主订单数据
-        $order = ImsCjdcOrderMain::where('id', $this->order_id)->first()->toArray();
+        $order = ImsCjdcOrderMain::getOrderData($this->order_id);
         if ($order) {
-            $order['created_at'] = date('Y-m-d H:i:s', $order['created_at']);
-            $order['updated_at'] = $order['updated_at'] ? date('Y-m-d H:i:s', $order['updated_at']) : null;
-            $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)) {
-                foreach ($orders as &$or) {
-                    if (substr($or['store']['logo'], 0, 4) != 'http') {
-                        $or['store']['logo'] = env('IMG_HOST') . '/' . $or['store']['logo'];
-                    }
-                    $or['goods'] = LanzuOrderGoods::where('order_id', $or['id'])->get()->toArray();
-                }
-            }
-            //dd($orders);
-            $orders = json_encode($orders);
-        }
-
-        //配送距离
-        //配送费
-        //拒绝退款理由
-        //退款总备注原因，单个商品或者单个子订单
-        Admin::script(
-            <<<JS
+            $orders = ImsCjdcOrder::getOrdersData($order['id']);
+            //配送距离
+            //配送费
+            //拒绝退款理由
+            //退款总备注原因，单个商品或者单个子订单
+            Admin::script(
+                <<<JS
             var orders =  JSON.stringify($orders)
             var app = new Vue({
                 el:"#detail",
@@ -82,7 +64,6 @@ class MyDetailPage extends LazyRenderable
                             cancelButtonText: '取消',
                             type: 'warning'
                         }).then(() => {
-                            
 
 
 
@@ -97,8 +78,8 @@ class MyDetailPage extends LazyRenderable
                 }
             });
 JS
-        );
-
+            );
+        }
         return view('orderdetail');
     }
 
diff --git a/app/Models/ImsCjdcOrder.php b/app/Models/ImsCjdcOrder.php
index cf06d40..48f925c 100644
--- a/app/Models/ImsCjdcOrder.php
+++ b/app/Models/ImsCjdcOrder.php
@@ -22,5 +22,18 @@ class ImsCjdcOrder extends Model
         return $this->hasOne('\App\Models\LanzuStore','id','store_id');
     }
 
-
+    public static function getOrdersData($oid)
+    {
+        $orders = ImsCjdcOrder::with('user')->with('store')
+            ->where('order_main_id', $oid)->get()->toArray();
+        if (count($orders)) {
+            foreach ($orders as &$or) {
+                if (substr($or['store']['logo'], 0, 4) != 'http') {
+                    $or['store']['logo'] = env('IMG_HOST') . '/' . $or['store']['logo'];
+                }
+                $or['goods'] = LanzuOrderGoods::where('order_id', $or['id'])->get()->toArray();
+            }
+        }
+        return json_encode($orders);
+    }
 }
diff --git a/app/Models/ImsCjdcOrderMain.php b/app/Models/ImsCjdcOrderMain.php
index 382fa3a..8b5e7f4 100644
--- a/app/Models/ImsCjdcOrderMain.php
+++ b/app/Models/ImsCjdcOrderMain.php
@@ -50,4 +50,15 @@ class ImsCjdcOrderMain extends Model
     {
         return self::where('id',$oid)->update(['shipping_type'=>$type]);
     }
+
+    public static function getOrderData($oid)
+    {
+        $order =  ImsCjdcOrderMain::where('id', $oid)->first()->toArray();
+        $order['created_at'] = date('Y-m-d H:i:s', $order['created_at']);
+        $order['updated_at'] = $order['updated_at'] ? date('Y-m-d H:i:s', $order['updated_at']) : null;
+        $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']);
+        return $order;
+    }
 }
diff --git a/resources/views/orderdetail.php b/resources/views/orderdetail.php
index 8dbec21..b1298e6 100644
--- a/resources/views/orderdetail.php
+++ b/resources/views/orderdetail.php
@@ -50,7 +50,7 @@
 
                 </div>
                 <p class="mb-0" style="color: red;font-size: 1.4rem;">￥{{goods.price}}</p>
-                <el-button type="info" style="float: right;" @click="refund()">退款审核</el-button>
+                <el-button type="danger" style="float: right;" @click="refund()">退款审核</el-button>
             </div>
         </div>
         <p v-if="item.note">店铺备注: ({{item.note}})</p>