From 733ceeee62b54ba4c1bc86fd15bd6fadbd348307 Mon Sep 17 00:00:00 2001
From: travis <310243791@qq.com>
Date: Sat, 7 Dec 2019 10:28:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=A2=E5=8D=95=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shop/views/order/table_consignee_info.php | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/backend/modules/shop/views/order/table_consignee_info.php b/backend/modules/shop/views/order/table_consignee_info.php
index a6617d9..1fff1c4 100644
--- a/backend/modules/shop/views/order/table_consignee_info.php
+++ b/backend/modules/shop/views/order/table_consignee_info.php
@@ -13,19 +13,28 @@
         <td><?= $model->consignee ?></td>
     </tr>
     <tr>
-        <td>省份：</td>
-        <td><?= $model->province ? $model->provinceId->name : ''?></td>
+        <td>联系电话：</td>
+        <td><?= $model->phone ?></td>
     </tr>
     <tr>
-        <td>城市：</td>
-        <td><?= $model->city ? $model->cityId->name : ''?></td>
+        <td>联系地址：</td>
+        <td>
+            <?php
+            $info = '';
+            if ($model->province) {
+                $info .= $model->provinceId->name . '/';
+            }
+            if ($model->city) {
+                $info .= $model->cityId->name . '/';
+            }
+            if ($model->area) {
+                $info .= $model->areaId->name;
+            }
+            ?>
+        </td>
     </tr>
     <tr>
-        <td>县区：</td>
-        <td><?= $model->area ? $model->areaId->name : ''?></td>
-    </tr>
-    <tr>
-        <td>地址：</td>
-        <td><?= $model->shipping_amount ?></td>
+        <td>详细地址：</td>
+        <td><?= $model->address ?></td>
     </tr>
 </table>