From aa9dfc05b6dbb2a8299bb8ea7cb6e185a70bc740 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 16:50:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=99=E9=A2=9D=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/controller/UserBalance.php   |  2 +-
 app/data/view/user_balance/index.html | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/data/controller/UserBalance.php b/app/data/controller/UserBalance.php
index 1789fa1eb..a48671ced 100644
--- a/app/data/controller/UserBalance.php
+++ b/app/data/controller/UserBalance.php
@@ -58,7 +58,7 @@ class UserBalance extends Controller
         $this->upgrades = UserUpgradeService::instance()->levels();
         foreach ($data as &$vo) {
             $vo['vip_upgradeinfo'] = $this->upgrades[$vo['vip_upgrade']] ?? [];
-            $vo['create_byname'] = $users[$vo['create_by']] ?? '系统内部';
+            $vo['create_byname'] = $users[$vo['create_by']] ?? '';
         }
     }
 
diff --git a/app/data/view/user_balance/index.html b/app/data/view/user_balance/index.html
index 22f018f35..b6f06ebfd 100644
--- a/app/data/view/user_balance/index.html
+++ b/app/data/view/user_balance/index.html
@@ -22,7 +22,6 @@
             <th class='text-left nowrap'>用户信息</th>
             <th class='text-left nowrap'>充值金额</th>
             <th class='text-left nowrap'>充值描述</th>
-            <th class='text-left nowrap'>操作用户</th>
             <th></th>
         </tr>
         </thead>
@@ -43,22 +42,18 @@
             </td>
             <td class="nowrap">
                 <div>交易金额：{if $vo.amount>=0}<b class="color-green">{$vo.amount+0}</b>{else}<b class="color-blue">{$vo.amount+0}</b>{/if} 元</div>
-                <div>升级等级：{if $vo.vip_upgrade>0}<span>升级到 [ <b class="color-text">VIP{$vo.vip_upgrade}</b> ] <b class="color-text">{$vo.vip_upgradeinfo.name|default=''}</b></span>{else}<span class="color-desc">不升级</span>{/if}</div>
+                <div>升级等级：{if $vo.vip_upgrade>0}<span>升级到 [ <b class="color-text">VIP{$vo.vip_upgrade}</b> ] <b class="color-text">{$vo.vip_upgradeinfo.name|default=''}</b></span>{else}<span class="color-desc">不进行用户升级</span>{/if}</div>
                 <div>充值单号：<b class="color-blue">{$vo.code|default='-'}</b></div>
             </td>
             <td class="nowrap sub-strong-blue">
                 <div>充值名称：{$vo.name|default='-'}</div>
-                <div>充值单号：<b>{$vo.code|default='-'}</b></div>
+                <div>操作时间：<span class="color-blue">{$vo.create_at|format_datetime}</span><span class="margin-left-5 color-desc">{$vo.create_byname|default=''}</span></div>
                 <!--{notempty name='vo.remark'}-->
                 <div>充值备注：{$vo.remark}</div>
                 <!--{else}-->
-                <div>充值备注：<span class="color-desc">未填写充值记录备注</span></div>
+                <div>充值备注：<span class="color-desc">未填写充值记录的备注内容</span></div>
                 <!--{/notempty}-->
             </td>
-            <td class="nowrap">
-                <div>操作账号：{$vo.create_byname|default=''}</div>
-                <div>操作时间：{$vo.create_at|format_datetime}</div>
-            </td>
             <td class="nowrap">
                 <!--{if auth("remove") and stripos($vo.code,'B') === 0}-->
                 <a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除数据吗?" data-action="{:url('remove')}" data-value="id#{$vo.id}">删 除</a>