From 27a6affcd32539fcbbe802ce90a809ecbb725ba4 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, 18 Mar 2021 15:25:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/view/shop_order/index.html    | 14 +++++++++++---
 app/data/view/user_transfer/index.html | 17 ++++++++++-------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/app/data/view/shop_order/index.html b/app/data/view/shop_order/index.html
index 219b24072..13a02f48d 100644
--- a/app/data/view/shop_order/index.html
+++ b/app/data/view/shop_order/index.html
@@ -115,10 +115,18 @@
                     {/empty}
                 </td>
                 <td class="nowrap">
-                    {foreach $vo.items as $item}
+                    {foreach $vo.items as $g}
                     <div>
-                        <b class="color-blue">{$item.stock_sales|default=0}件</b><b class="color-green"> x </b><b class="color-blue">{$item.price_market+0}元 </b>
-                        {$item.goods_name|default=''} <span class="color-green"> ( {$item.goods_spec|show_goods_spec} ) </span>
+                        {if $g.vip_entry > 0 and $g.vip_upgrade > $g.vip_code}
+                        [ <b class="color-red">VIP{$g.vip_code}</b> <span class="layui-icon font-s10 color-blue">&#xe602;</span> <b class="color-red">VIP{$g.vip_upgrade}</b> ]
+                        {else}
+                        [ <b class="color-blue">VIP{$g.vip_code}</b> ]
+                        {/if}
+                        {if $g.discount_rate < 100.00}
+                        <b class="color-blue">享{$g.discount_rate+0}%折扣</b><span class="color-red"> x </span>
+                        {/if}
+                        <b class="color-blue">{$g.stock_sales|default=0}件</b><span class="color-red"> x </span><b class="color-blue">{$g.price_selling+0}元 </b>
+                        {$g.goods_name|default=''} <span class="color-green"> ( {$g.goods_spec|show_goods_spec} )</span>
                     </div>
                     {/foreach}
                 </td>
diff --git a/app/data/view/user_transfer/index.html b/app/data/view/user_transfer/index.html
index e456fdaef..ebf12b22d 100644
--- a/app/data/view/user_transfer/index.html
+++ b/app/data/view/user_transfer/index.html
@@ -43,15 +43,18 @@
             <td class='list-table-check-td think-checkbox'>
                 <label><input class="list-check-box" value='{$vo.id}' type='checkbox'></label>
             </td>
-            <td class="sub-span-blue nowrap">
+            <td class="nowrap">
                 <div class="headimg" data-tips-image data-lazy-src="{$vo.user.headimg|default='__ROOT__/static/theme/img/headimg.png'}"></div>
                 <div class="inline-block">
-                    {notempty name='vo.user.username'}
-                    <div>姓名：<span>{$vo.user.username|default='-'}</span></div>
-                    {else}
-                    <div>昵称：<span>{$vo.user.nickname|default='-'}</span></div>
-                    {/notempty}
-                    <div>手机：<span>{$vo.user.phone|default='-'}</span></div>
+                    <div>
+                        {notempty name='vo.user.username'}
+                        姓名：<span class="color-blue">{$vo.user.username|default='-'}</span>
+                        {else}
+                        昵称：<span class="color-blue">{$vo.user.nickname|default='-'}</span>
+                        {/notempty}
+                        <span class="margin-left-5">[ <b class="color-red">VIP{$vo.user.vip_code}</b> ] <b class="color-red">{$vo.user.vip_name}</b></span>
+                    </div>
+                    <div>手机：<span class="color-blue">{$vo.user.phone|default='-'}</span></div>
                 </div>
             </td>
             <td class='text-left nowrap'>