From 46c26a3b4a5ddfea4f2471beadd4a732648a53a2 Mon Sep 17 00:00:00 2001
From: travis <310243791@qq.com>
Date: Tue, 10 Dec 2019 19:55:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=90=8E=E5=8F=B0=E5=B7=B2=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E5=95=86=E5=93=81=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/shop/models/ars/DeliveryGoods.php | 11 +++++
 .../shop/views/delivery/delivery_goods.php    | 42 +++++++++++--------
 2 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/backend/modules/shop/models/ars/DeliveryGoods.php b/backend/modules/shop/models/ars/DeliveryGoods.php
index ba5bab4..7a93e52 100644
--- a/backend/modules/shop/models/ars/DeliveryGoods.php
+++ b/backend/modules/shop/models/ars/DeliveryGoods.php
@@ -2,6 +2,7 @@
 
 namespace backend\modules\shop\models\ars;
 
+use backend\modules\goods\models\ars\Goods;
 use Yii;
 use yii\behaviors\TimestampBehavior;
 
@@ -76,4 +77,14 @@ class DeliveryGoods extends \yii\db\ActiveRecord
             ],
         ];
     }
+
+    public function getGoods()
+    {
+        return $this->hasOne(Goods::className(), ['id' => 'goods_id']);
+    }
+
+    public function getOrderGoods()
+    {
+        return $this->hasOne(OrderGoods::className(), ['id' => 'order_goods_id']);
+    }
 }
diff --git a/backend/modules/shop/views/delivery/delivery_goods.php b/backend/modules/shop/views/delivery/delivery_goods.php
index e21f592..92b666a 100644
--- a/backend/modules/shop/views/delivery/delivery_goods.php
+++ b/backend/modules/shop/views/delivery/delivery_goods.php
@@ -4,22 +4,28 @@ use yii\widgets\DetailView;
 use backend\modules\shop\models\ars\DeliveryGoods;
 ?>
 
-<?php
-    $deliveryGoods = DeliveryGoods::findAll(['delivery_id' => $model->id]);
-    if ($deliveryGoods) {
-        echo '<table>';
-        foreach ($deliveryGoods as $value) {
-            echo
-            '<tr>' .
-                 '<td>商品名称：</td>' .
-                 '<td>' . $value->goods_name . '</td>' .
-            '</tr>' .
-            '<tr>' .
-            '<td>商品数量：</td>' .
-            '<td>' . $value->goods_count . '</td>' .
-            '</tr>';
-
+<div class="deliveryGoods">
+    <?php
+        $deliveryGoods = DeliveryGoods::findAll(['delivery_id' => $model->id]);
+        if ($deliveryGoods) {
+            echo '<table class="table table-striped table-bordered detail-view">
+                <tr>
+                    <th>商品图片</th>
+                    <th>商品ID</th>
+                    <th>商品名称</th>
+                    <th>商品数量</th>
+                    <th>创建时间</th>
+                </tr>';
+            foreach ($deliveryGoods as $value) {
+                echo '<tr>';
+                echo '<td>' . ($value->orderGoods->goods_img ? "<img src= $value->orderGoods->goods_img />" : '') . '</td>';
+                echo '<td>' . $value->goods_id . '</td>';
+                echo '<td>' . $value->goods_name . '</td>';
+                echo '<td>' . $value->goods_count . '</td>';
+                echo '<td>' . date('Y-m-d H:i:s', $value->created_at) . '</td>';
+                echo '</tr>';
+            }
+            echo '</table>';
         }
-        echo '</table>';
-    }
-?>
\ No newline at end of file
+    ?>
+</div>