From ba15d75377a56fe0a54a1794ddf349e0a2b4cdf6 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, 15 Apr 2021 16:49:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E6=9D=BF=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/view/shop/goods/index.html    | 15 ++++++---------
 app/data/view/user/admin/index.html    |  4 ++--
 app/data/view/user/transfer/audit.html |  8 +++-----
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/app/data/view/shop/goods/index.html b/app/data/view/shop/goods/index.html
index c7b9655a6..df9d2b48a 100644
--- a/app/data/view/shop/goods/index.html
+++ b/app/data/view/shop/goods/index.html
@@ -80,18 +80,15 @@
                     </div>
                 </td>
                 <td class='nowrap'>
-                    <div>创建时间：{$vo.create_at|format_datetime}</div>
-                    <div>
-                        {eq name='vo.status' value='0'}<span class="layui-badge">已下架</span>{else}<span class="layui-badge layui-bg-green">销售中</span>{/eq}
-                        {eq name='vo.vip_entry' value='0'}<span class="layui-badge layui-bg-blue">非入会礼包</span>{else}<span class="layui-badge layui-bg-green">是入会礼包</span>{/eq}
-                        {eq name='vo.truck_type' value='0'}<span class="layui-badge layui-bg-blue">无需发货</span>{else}<span class="layui-badge layui-bg-green">需要发货</span>{/eq}
-                        {eq name='vo.rebate_type' value='0'}<span class="layui-badge layui-bg-blue">非返利商品</span>{else}<span class="layui-badge layui-bg-green">是返利商品</span>{/eq}
+                    累计库存 <b>{$vo.stock_total}</b> 件，剩余库存 <b>{$vo.stock_total-$vo.stock_sales}</b> 件 ( 已销售 <b>{$vo.stock_sales}</b> 件 )
+                    <div class="notselect margin-top-5">
+                        {eq name='vo.status' value='0'}<span class="layui-badge layui-bg-gray layui-border-red">已下架</span>{else}<span class="layui-badge layui-bg-gray layui-border-green">销售中</span>{/eq}
+                        {eq name='vo.vip_entry' value='0'}<span class="layui-badge layui-bg-gray layui-border-blue">非入会礼包</span>{else}<span class="layui-badge layui-bg-gray layui-border-green">是入会礼包</span>{/eq}
+                        {eq name='vo.truck_type' value='0'}<span class="layui-badge layui-bg-gray layui-border-blue">无需发货</span>{else}<span class="layui-badge layui-bg-gray layui-border-green">需要发货</span>{/eq}
+                        {eq name='vo.rebate_type' value='0'}<span class="layui-badge layui-bg-gray layui-border-blue">非返利商品</span>{else}<span class="layui-badge layui-bg-gray layui-border-green">是返利商品</span>{/eq}
                     </div>
                 </td>
                 <td class='nowrap sub-strong-blue'>
-                    <div class="margin-bottom-5">
-                        剩余库存 <b>{$vo.stock_total-$vo.stock_sales}</b> 件 ( 已销售 <b>{$vo.stock_sales}</b> 件 )
-                    </div>
 
                     <!--{if auth('copy')}-->
                     <a class="layui-btn layui-btn-xs layui-btn-normal" data-open='{:url("copy")}?code={$vo.code}'>复 制</a>
diff --git a/app/data/view/user/admin/index.html b/app/data/view/user/admin/index.html
index 7a34b9770..7f6f6c99a 100644
--- a/app/data/view/user/admin/index.html
+++ b/app/data/view/user/admin/index.html
@@ -15,12 +15,12 @@
     <ul class="layui-tab-title notselect">
         {foreach $total as $k=>$v}{if isset($type) and 't'.$type eq $k}
         <li class="layui-this" data-open="{:url('index')}?type={$k}">
-            {if is_numeric($v.vip)}<span class="color-red margin-right-5">[<span class="margin-col-5">VIP{$v.vip}</span>]</span>{/if}
+            {if is_numeric($v.vip)}<span class="color-red margin-right-5">[<span class="margin-col-5 font-s12">VIP{$v.vip}</span>]</span>{/if}
             <span>{$v.name}</span><sup class="layui-badge border-radius">{$v.count|default=0}</sup>
         </li>
         {else}
         <li data-open="{:url('index')}?type={$k}">
-            {if is_numeric($v.vip)}<span class="color-desc margin-right-5">[<span class="margin-col-5">VIP{$v.vip}</span>]</span>{/if}
+            {if is_numeric($v.vip)}<span class="color-desc margin-right-5">[<span class="margin-col-5 font-s12">VIP{$v.vip}</span>]</span>{/if}
             <span>{$v.name}</span><sup class="layui-badge border-radius">{$v.count|default=0}</sup>
         </li>
         {/if}{/foreach}
diff --git a/app/data/view/user/transfer/audit.html b/app/data/view/user/transfer/audit.html
index e20c9050f..0ad4ee1dd 100644
--- a/app/data/view/user/transfer/audit.html
+++ b/app/data/view/user/transfer/audit.html
@@ -2,7 +2,6 @@
 
     <div class="layui-card-body padding-left-40">
 
-
         <div class="layui-row layui-form-item layui-col-space15">
             <label class="layui-col-xs3">
                 <span class="color-green font-w7">提现单号</span>
@@ -22,7 +21,6 @@
             </label>
         </div>
 
-
         {in name='vo.type' value='wechat_qrcode,alipay_qrcode'}
         <fieldset class="layui-form-item">
             <legend><span class="layui-badge layui-bg-blue">付款二维码</span></legend>
@@ -83,9 +81,9 @@
 
             {if $vo.status eq 2}
             <!--{in name='vo.type' value='wechat_wallet,wechat_banks'}-->
-            {php} $types = [2=>'审核已通过', 3=>'自动打款']; {/php}
+            {php} $types = [2=>'审核通过', 3=>'自动打款']; {/php}
             <!--{else}-->
-            {php} $types = [2=>'审核已通过', 3=>'线下打款']; {/php}
+            {php} $types = [2=>'审核通过', 3=>'准备打款', 4=>'已经打款']; {/php}
             <!--{/in}-->
             {/if}
 
@@ -93,7 +91,7 @@
             <!--{in name='vo.type' value='wechat_wallet,wechat_banks'}-->
             {php} $types = [3=>'正在打款']; {/php}
             <!--{else}-->
-            {php} $types = [3=>'线下打款', 4=>'已经打款']; {/php}
+            {php} $types = [3=>'准备打款', 4=>'已经打款']; {/php}
             <!--{/in}-->
             {/if}