From f3a30a8e196535eff7015a8c9db766e852dd6814 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Fri, 26 Mar 2021 16:48:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0?=
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/shop_order/index.html                | 6 +++---
 app/data/view/shop_order_send/index.html           | 8 ++++----
 app/data/view/user_balance/index.html              | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/data/service/UserBalanceService.php b/app/data/service/UserBalanceService.php
index c83c9fee5..e86748170 100644
--- a/app/data/service/UserBalanceService.php
+++ b/app/data/service/UserBalanceService.php
@@ -31,7 +31,7 @@ class UserBalanceService extends Service
             'uid'    => $order['uid'],
             'code'   => "CZ{$order['order_no']}",
             'name'   => "订单余额充值",
-            'remark' => "来自订单{$order['order_no']}的余额充值{$order['reward_balance']}元",
+            '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 1d417c77d..80985fa0d 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/shop_order/index.html b/app/data/view/shop_order/index.html
index aebde6933..52a9d6483 100644
--- a/app/data/view/shop_order/index.html
+++ b/app/data/view/shop_order/index.html
@@ -43,8 +43,8 @@
                         <!--{notempty name='vo.from'}-->
                         <div class="headimg" data-lazy-src="{$vo.from.headimg|default='__ROOT__/static/theme/img/headimg.png'}" data-tips-image></div>
                         <div class="inline-block sub-span-blue">
-                            推荐用户：{$vo.from.nickname|default='--'} <span>[ <b class="color-red">VIP{$vo.from.vip_code}</b> ] <b class="color-red">{$vo.from.vip_name}</b></span><br>
-                            推荐手机：<span>{$vo.from.phone|default='--'}</span><br>
+                            <div>推荐用户：{$vo.from.nickname|default='--'}<span class="margin-left-5">[ <b class="color-red">VIP{$vo.from.vip_code}</b> ] <b class="color-red">{$vo.from.vip_name}</b></span></div>
+                            <div>推荐手机：<span>{$vo.from.phone|default='--'}</span></div>
                         </div>
                         <!--{else}-->
                         <div class="color-desc padding-10">没有推荐人</div>
@@ -111,7 +111,7 @@
                         <a class="margin-left-5" data-modal="{:url('truck')}?order_no={$vo.order_no}" data-title="修改发货信息">修改发货</a>
                         <!--{/if}-->
 
-                        <!--{if auth('cancel') and in_array($vo.status, [1,2])}-->
+                        <!--{if auth('cancel') and in_array($vo.status, [1,2,3])}-->
                         <a class="margin-left-5" data-confirm="确认要取消订单吗？" data-load="{:url('cancel')}?order_no={$vo.order_no}">取消订单</a>
                         <!--{/if}-->
                     </div>
diff --git a/app/data/view/shop_order_send/index.html b/app/data/view/shop_order_send/index.html
index c2686f815..70e6853f2 100644
--- a/app/data/view/shop_order_send/index.html
+++ b/app/data/view/shop_order_send/index.html
@@ -40,10 +40,10 @@
                 </td>
                 <td class="nowrap relative">
                     <div class="headimg" data-lazy-src="{$vo.user.headimg|default='__ROOT__/static/theme/img/headimg.png'}" data-tips-image style="width:56px;height:56px"></div>
-                    <div class="inline-block sub-span-blue">
-                        用户昵称：<span>{$vo.user.nickname|default='-'}</span><br>
-                        用户手机：<span>{$vo.user.phone|default='-'}</span><br>
-                        订单单号：<span>{$vo.order_no|default='-'}</span><br>
+                    <div class="inline-block sub-span-blue sub-strong-red">
+                        <div>用户昵称：<span>{$vo.user.nickname|default='-'}</span><span class="margin-left-5">[ <b>VIP{$vo.user.vip_code}</b> ] <b>{$vo.user.vip_name}</b></span></div>
+                        <div>用户手机：<span>{$vo.user.phone|default='-'}</span></div>
+                        <div>订单单号：<span>{$vo.order_no|default='-'}</span></div>
                     </div>
                 </td>
                 <td class="nowrap">
diff --git a/app/data/view/user_balance/index.html b/app/data/view/user_balance/index.html
index 0c4849909..6850990e4 100644
--- a/app/data/view/user_balance/index.html
+++ b/app/data/view/user_balance/index.html
@@ -42,12 +42,12 @@
             </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>充值单号：<b class="color-blue">{$vo.code|default='-'}</b></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>操作时间：<span>{$vo.create_at|format_datetime}</span></div>
             </td>
             <td class="nowrap sub-strong-blue">
                 <div>充值名称：{$vo.name|default='-'}</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>
+                <div>充值单号：<b class="color-blue">{$vo.code|default='-'}</b></div>
                 <!--{notempty name='vo.remark'}-->
                 <div>充值备注：{$vo.remark}</div>
                 <!--{else}-->