From 5e39cf56a4f986e1e6ffe175b626d87cf3bc6388 Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Wed, 9 Sep 2020 20:31:00 +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            |  7 +++++-
 app/Admin/Extensions/MyDetailPage.php         | 19 +++++++++++++++-
 app/Admin/Extensions/OrderDetail.php          |  5 +----
 app/Models/ImsCjdcOrder.php                   |  2 +-
 app/Models/LanzuGoods.php                     | 20 +++++++++++++++++
 app/Models/LanzuOrderGoods.php                | 20 +++++++++++++++++
 app/Models/LanzuServiceHorseman.php           |  2 +-
 public/css/deatail.css                        |  4 ++--
 resources/views/orderdetail.php               | 22 +++++++++----------
 9 files changed, 80 insertions(+), 21 deletions(-)
 create mode 100644 app/Models/LanzuGoods.php
 create mode 100644 app/Models/LanzuOrderGoods.php

diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php
index 3f56787..a237a9f 100644
--- a/app/Admin/Controllers/ImsCjdcOrderMainController.php
+++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php
@@ -140,6 +140,11 @@ class ImsCjdcOrderMainController extends AdminController
         $oid = request()->get('order_id');
         // 实例化表单类并传递自定义参数
         $detail = MyDetailPage::make(['order_id'=>$oid]);
-        return $content->header('订单详情')->body(Lazy::make($detail));
+        return $content->header('订单详情')
+            ->breadcrumb(
+                ['text'=>'列表','url'=>'order'],
+                ['text' => '详情', 'url' => 'detail'],
+            )
+            ->body(Lazy::make($detail));
     }
 }
diff --git a/app/Admin/Extensions/MyDetailPage.php b/app/Admin/Extensions/MyDetailPage.php
index 394cf9b..267d9f6 100644
--- a/app/Admin/Extensions/MyDetailPage.php
+++ b/app/Admin/Extensions/MyDetailPage.php
@@ -3,10 +3,13 @@
 
 namespace App\Admin\Extensions;
 
+use App\Models\ImsCjdcOrder;
 use App\Models\ImsCjdcOrderMain;
+use App\Models\LanzuOrderGoods;
 use App\Models\LanzuServiceHorseman;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Support\LazyRenderable;
+use Endroid\QrCode\Exceptions\DataDoesntExistsException;
 
 class MyDetailPage extends LazyRenderable
 {
@@ -27,6 +30,17 @@ class MyDetailPage extends LazyRenderable
             $order['horseman_name'] = LanzuServiceHorseman::getName($order['horseman_id']);
 
 
+            //获取子订单
+            $orders = ImsCjdcOrder::with('user')->with('store')
+                ->where('order_main_id',$order['id'])->get()->toArray();
+            if (count($orders)){
+                foreach ($orders as &$or){
+                    $or['goods'] = LanzuOrderGoods::where('order_id',$or['id'])->get()->toArray();
+                }
+            }
+            $orders = json_encode($orders);
+
+
         }
         //配送距离
         //配送费
@@ -35,6 +49,7 @@ class MyDetailPage extends LazyRenderable
         //dd($order);
         Admin::script(
             <<<JS
+            var orders =  JSON.stringify($orders)
             var app = new Vue({
                 el:"#detail",
                 data:{
@@ -53,7 +68,9 @@ class MyDetailPage extends LazyRenderable
                     services_money: "{$order['services_money']}",
                     coupon_money: "{$order['coupon_money']}",
                     delivery_money: "{$order['delivery_money']}",
-                    horseman_name: "{$order['horseman_name']}"
+                    horseman_name: "{$order['horseman_name']}",
+                    orders: JSON.parse(orders)
+
                 }
             });
 JS
diff --git a/app/Admin/Extensions/OrderDetail.php b/app/Admin/Extensions/OrderDetail.php
index 09531d4..bb9420d 100644
--- a/app/Admin/Extensions/OrderDetail.php
+++ b/app/Admin/Extensions/OrderDetail.php
@@ -3,11 +3,8 @@
 
 namespace App\Admin\Extensions;
 
-
-use App\Admin\Forms\RefundNote;
 use Dcat\Admin\Grid\RowAction;
-use Dcat\Admin\Layout\Content;
-use Dcat\Admin\Widgets\Modal;
+
 
 class OrderDetail extends RowAction
 {
diff --git a/app/Models/ImsCjdcOrder.php b/app/Models/ImsCjdcOrder.php
index 6793cf7..cf06d40 100644
--- a/app/Models/ImsCjdcOrder.php
+++ b/app/Models/ImsCjdcOrder.php
@@ -19,7 +19,7 @@ class ImsCjdcOrder extends Model
 
     public function store()
     {
-        return $this->hasOne('\App\Models\ImsCjdcStore','id','store_id');
+        return $this->hasOne('\App\Models\LanzuStore','id','store_id');
     }
 
 
diff --git a/app/Models/LanzuGoods.php b/app/Models/LanzuGoods.php
new file mode 100644
index 0000000..4c90286
--- /dev/null
+++ b/app/Models/LanzuGoods.php
@@ -0,0 +1,20 @@
+<?php
+
+
+namespace App\Models;
+
+
+
+use Dcat\Admin\Traits\HasDateTimeFormatter;
+use Illuminate\Database\Eloquent\Model;
+
+class LanzuGoods extends Model
+{
+    use HasDateTimeFormatter;
+
+    protected $table = 'lanzu_goods';
+    protected $dateFormat = 'U';
+
+
+
+}
diff --git a/app/Models/LanzuOrderGoods.php b/app/Models/LanzuOrderGoods.php
new file mode 100644
index 0000000..d2d2d4c
--- /dev/null
+++ b/app/Models/LanzuOrderGoods.php
@@ -0,0 +1,20 @@
+<?php
+
+
+namespace App\Models;
+
+use Dcat\Admin\Traits\HasDateTimeFormatter;
+use Illuminate\Database\Eloquent\Model;
+
+class LanzuOrderGoods extends Model
+{
+    use HasDateTimeFormatter;
+
+    protected $table = 'lanzu_order_goods';
+    protected $dateFormat = 'U';
+
+    public function goods()
+    {
+        return $this->belongsTo('\App\Models\LanzuGoods','goods_id','id');
+    }
+}
diff --git a/app/Models/LanzuServiceHorseman.php b/app/Models/LanzuServiceHorseman.php
index 1d7415b..d230d2f 100644
--- a/app/Models/LanzuServiceHorseman.php
+++ b/app/Models/LanzuServiceHorseman.php
@@ -35,7 +35,7 @@ class LanzuServiceHorseman extends Model
             $horseman = LanzuServiceHorseman::find($hid);
             return $horseman->name;
         }else{
-            return '-';
+            return '--';
         }
     }
 }
diff --git a/public/css/deatail.css b/public/css/deatail.css
index 7a3aa2b..0f375ed 100644
--- a/public/css/deatail.css
+++ b/public/css/deatail.css
@@ -10,8 +10,8 @@
 }
 
 .logo-img {
-    width: 8vw;
-    height: 10vh;
+    width: 80px;
+    height: 80px;
     margin-right: 1rem;
 }
 
diff --git a/resources/views/orderdetail.php b/resources/views/orderdetail.php
index 3629173..745e4ea 100644
--- a/resources/views/orderdetail.php
+++ b/resources/views/orderdetail.php
@@ -31,21 +31,21 @@
     </table>
     <!-- 用户信息表格END -->
     <!-- 店铺 -->
-    <div class="shop-box" v-for="">
+    <div class="shop-box" v-for="item in orders">
         <div class="alert alert-secondary" role="alert">
-            <img class="shop-logo" src="https://store.lanzu.vip/attachment/zh_cjdianc/2020/06/08/0695939116515895.jpg" alt="店铺logo"/>
-            <span>2222</span>
+            <img class="shop-logo" :src="item.store.logo" alt="店铺logo"/>
+            <span>{{item.store.name}}</span>
         </div>
-         店铺商品
-        <div class="media">
-            <img class="logo-img" src="https://store.lanzu.vip/attachment/zh_cjdianc/2020/06/08/0695939116515895.jpg" class="align-self-center mr-3" alt="商品图片">
+        店铺商品
+        <div class="media" v-for= "goods in item.goods">
+            <img class="logo-img" :src="goods.cover_img" class="align-self-center mr-3" alt="商品图片">
             <div class="media-body">
-                <h5 class="mt-0">2222</h5>
+                <h5 class="mt-0">{{goods.name}}</h5>
                 <div>
-                    <span class="price">222</span>
-                    <span style="float: right;">X 2222</span>
+                    <span class="price">/{{goods.goods_unit}}</span>
+                    <span style="float: right;">X {{goods.number}}</span>
                 </div>
-                <p class="mb-0" style="color: red;font-size: 1.4rem;">￥222</p>
+                <p class="mb-0" style="color: red;font-size: 1.4rem;">￥{{goods.price}}</p>
             </div>
         </div>
     </div>
@@ -58,7 +58,7 @@
         &ensp;&ensp;
         增值服务费: <span style="color: green">+{{services_money}}</span> 元
         &ensp;&ensp;
-        实付金额: {money} 元
+        实付金额: {{money}} 元
 
     </div>
     <!-- 店铺END -->