From 590e90a2b628f1d9359d0398e953b32a1c85b780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Thu, 25 Mar 2021 11:16:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/controller/ShopOrder.php   |  2 +-
 app/data/service/OrderService.php   |  2 +-
 app/data/view/shop_order/index.html | 12 ++++++++----
 vendor/services.php                 |  2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/data/controller/ShopOrder.php b/app/data/controller/ShopOrder.php
index fd4daba90..4dc96bcb9 100644
--- a/app/data/controller/ShopOrder.php
+++ b/app/data/controller/ShopOrder.php
@@ -86,7 +86,7 @@ class ShopOrder extends Controller
     protected function _index_page_filter(array &$data)
     {
         UserAdminService::instance()->buildByUid($data);
-        UserAdminService::instance()->buildByUid($data, 'puid1', 'fromer');
+        UserAdminService::instance()->buildByUid($data, 'puid1', 'from');
         OrderService::instance()->buildData($data);
         foreach ($data as &$vo) $vo['payment_name'] = PaymentService::name($vo['payment_type']);
     }
diff --git a/app/data/service/OrderService.php b/app/data/service/OrderService.php
index 08d194ec8..5d5072edd 100644
--- a/app/data/service/OrderService.php
+++ b/app/data/service/OrderService.php
@@ -131,7 +131,7 @@ class OrderService extends Service
         $query = $this->app->db->name('ShopOrderItem')->where(['status' => 1, 'deleted' => 0]);
         $items = $query->withoutField('id,uid,status,deleted,create_at')->whereIn('order_no', $nobs)->select()->toArray();
         // 关联用户数据
-        $fields = 'phone,username,nickname,headimg,status';
+        $fields = 'phone,username,nickname,headimg,status,vip_code,vip_name';
         UserAdminService::instance()->buildByUid($data, 'uid', 'user', $fields);
         if ($fromer) UserAdminService::instance()->buildByUid($data, 'puid1', 'fromer', $fields);
         foreach ($data as &$vo) {
diff --git a/app/data/view/shop_order/index.html b/app/data/view/shop_order/index.html
index c84d9f4f7..e68d8d6ed 100644
--- a/app/data/view/shop_order/index.html
+++ b/app/data/view/shop_order/index.html
@@ -40,16 +40,20 @@
                 </td>
                 <td class="nowrap relative">
                     <div>
-                        <div class="headimg" data-tips-image data-lazy-src="{$vo.fromer.headimg|default='__ROOT__/static/theme/img/headimg.png'}"></div>
+                        <!--{notempty name='vo.from'}-->
+                        <div class="headimg" data-tips-image data-lazy-src="{$vo.from.headimg|default='__ROOT__/static/theme/img/headimg.png'}"></div>
                         <div class="inline-block sub-span-blue">
-                            推荐用户：{$vo.fromer.nickname|default='--'}<br>
-                            推荐手机：<span>{$vo.fromer.phone|default='--'}</span><br>
+                            推荐用户：{$vo.from.nickname|default='--'} <span>[ <b class="color-red">VIP{$vo.from.vip_code}</b> ] <b class="color-red">{$vo.from.vip_name}</b></span><br>
+                            推荐手机：<span>{$vo.from.phone|default='--'}</span><br>
                         </div>
+                        <!--{else}-->
+                        <div class="color-desc padding-10">没有推荐人</div>
+                        <!--{/notempty}-->
                     </div>
                     <div>
                         <div class="headimg" data-tips-image data-lazy-src="{$vo.user.headimg|default='__ROOT__/static/theme/img/headimg.png'}"></div>
                         <div class="inline-block sub-span-blue">
-                            用户昵称：{$vo.user.nickname|default='--'}<br>
+                            用户昵称：{$vo.user.nickname|default='--'} <span>[ <b class="color-red">VIP{$vo.user.vip_code}</b> ] <b class="color-red">{$vo.user.vip_name}</b></span><br>
                             用户手机：<span>{$vo.user.phone|default='--'}</span><br>
                         </div>
                     </div>
diff --git a/vendor/services.php b/vendor/services.php
index 17b712bfb..d5faa64f4 100644
--- a/vendor/services.php
+++ b/vendor/services.php
@@ -1,5 +1,5 @@
 <?php 
-// This file is automatically generated at:2021-03-24 15:02:16
+// This file is automatically generated at:2021-03-25 11:06:42
 declare (strict_types = 1);
 return array (
   0 => 'think\\admin\\Library',