From 03976d94f7d848a38f11a28a2c6b74e104c7948e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Wed, 7 Apr 2021 13:44:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/controller/user/Balance.php  | 4 ++--
 app/data/view/user/balance/index.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/data/controller/user/Balance.php b/app/data/controller/user/Balance.php
index 17f9adef4..fb28f5e6a 100644
--- a/app/data/controller/user/Balance.php
+++ b/app/data/controller/user/Balance.php
@@ -57,7 +57,7 @@ class Balance extends Controller
         $users = $this->app->db->name('SystemUser')->whereIn('id', $uids)->column('username', 'id');
         $this->upgrades = UserUpgradeService::instance()->levels();
         foreach ($data as &$vo) {
-            $vo['vip_upgradeinfo'] = $this->upgrades[$vo['vip_upgrade']] ?? [];
+            $vo['upgradeinfo'] = $this->upgrades[$vo['upgrade']] ?? [];
             $vo['create_byname'] = $users[$vo['create_by']] ?? '';
         }
     }
@@ -91,7 +91,7 @@ class Balance extends Controller
         }
         if ($this->request->isPost()) {
             $data['create_by'] = AdminService::instance()->getUserId();
-            if (empty(floatval($data['amount'])) && empty($data['vip_upgrade'])) {
+            if (empty(floatval($data['amount'])) && empty($data['upgrade'])) {
                 $this->error('金额为零并且没有升级行为！');
             }
         }
diff --git a/app/data/view/user/balance/index.html b/app/data/view/user/balance/index.html
index 783813974..6d169d072 100644
--- a/app/data/view/user/balance/index.html
+++ b/app/data/view/user/balance/index.html
@@ -42,7 +42,7 @@
             </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 class="color-red">升级到</span> [ <b class="color-red">VIP{$vo.vip_upgrade}</b> ] <b class="color-red">{$vo.vip_upgradeinfo.name|default=''}</b>{else}<span class="color-desc">不进行用户升级</span>{/if}</div>
+                <div>升级等级：{if $vo.upgrade>0}<span class="color-red">升级到</span> [ <b class="color-red">VIP{$vo.upgrade}</b> ] <b class="color-red">{$vo.upgradeinfo.name|default=''}</b>{else}<span class="color-desc">不进行用户升级</span>{/if}</div>
                 <div>操作时间：<span>{$vo.create_at|format_datetime}</span></div>
             </td>
             <td class="nowrap sub-strong-blue">