From 417b36c337b02d8d76bf8c6dbe74ae6c1d8c3078 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:39:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=99=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/service/UserBalanceService.php            |  2 +-
 app/data/service/payment/BalancePyamentService.php |  2 +-
 app/data/view/user_balance/index.html              | 11 +++--------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/data/service/UserBalanceService.php b/app/data/service/UserBalanceService.php
index 29ac137c7..36a9e6a89 100644
--- a/app/data/service/UserBalanceService.php
+++ b/app/data/service/UserBalanceService.php
@@ -55,7 +55,7 @@ class UserBalanceService extends Service
             'uid'    => $order['uid'],
             'code'   => "CZ{$order['order_no']}",
             'name'   => "订单余额充值",
-            'remark' => "来自订单{$order['order_no']}的余额充值",
+            'remark' => "来自订单{$order['order_no']}的余额充值{$order['reward_balance']}元",
             'amount' => $order['reward_balance'],
         ], 'code');
 
diff --git a/app/data/service/payment/BalancePyamentService.php b/app/data/service/payment/BalancePyamentService.php
index 2678bc52f..656b26480 100644
--- a/app/data/service/payment/BalancePyamentService.php
+++ b/app/data/service/payment/BalancePyamentService.php
@@ -69,7 +69,7 @@ class BalancePyamentService extends PaymentService
                     'uid'    => $order['uid'],
                     'code'   => "KC{$order['order_no']}",
                     'name'   => "账户余额支付",
-                    'remark' => "使用余额支付订单{$order['order_no']}金额{$paymentAmount}元",
+                    'remark' => "扣除订单{$order['order_no']}的余额支付{$paymentAmount}元",
                     'amount' => -$paymentAmount,
                 ], 'code');
                 // 更新支付行为
diff --git a/app/data/view/user_balance/index.html b/app/data/view/user_balance/index.html
index afe2b595b..22f018f35 100644
--- a/app/data/view/user_balance/index.html
+++ b/app/data/view/user_balance/index.html
@@ -42,14 +42,9 @@
                 </div>
             </td>
             <td class="nowrap">
-                <div>交易金额：{if $vo.amount>=0}<b class="color-blue">{$vo.amount+0}</b>{else}<b class="color-red">{$vo.amount+0}</b>{/if} 元</div>
-                <div class="sub-strong-blue">升级等级：{if $vo.vip_upgrade > 0}
-                    <span class="color-blue">升级到 [ <b>VIP{$vo.vip_upgrade}</b> ] <b>{$vo.vip_upgradeinfo.name|default=''}</b></span>
-                    {else}
-                    <span class="color-desc">不升级</span>
-                    {/if}
-                </div>
-                <div>充值单号：{$vo.code|default='-'}</div>
+                <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>充值单号：<b class="color-blue">{$vo.code|default='-'}</b></div>
             </td>
             <td class="nowrap sub-strong-blue">
                 <div>充值名称：{$vo.name|default='-'}</div>