From 41f6797e97da756114ae65dd0e839e5dc720b5c7 Mon Sep 17 00:00:00 2001
From: sunke <18850253506@163.com>
Date: Mon, 16 Mar 2020 17:55:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/Deposit/lists.html | 2 +-
 Application/Admin/View/Spend/lists.html   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/View/Deposit/lists.html b/Application/Admin/View/Deposit/lists.html
index 25a450bf2..51262e4a4 100644
--- a/Application/Admin/View/Deposit/lists.html
+++ b/Application/Admin/View/Deposit/lists.html
@@ -205,7 +205,7 @@
                 </empty>
                 <tr class="data_summary">
                     <td>汇总</td>
-                    <td colspan="8">
+                    <td colspan="9">
                         当页充值：{:array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount'))}；
                         今日充值：{$ttotal} ；
                         昨日充值：{$ytotal} ；
diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html
index 3f14a8f8c..ea1f7e6f7 100644
--- a/Application/Admin/View/Spend/lists.html
+++ b/Application/Admin/View/Spend/lists.html
@@ -191,7 +191,7 @@
                             <td>{:set_show_time($data['pay_time'])}</td>
                             <td>
                                 <if condition="$data['pay_status'] eq 1">
-                                    {$data.payed_time}
+                                    {:set_show_time($data['payed_time'])}
                                     <else />
                                     ------
                                 </if>
@@ -271,7 +271,7 @@
                     <if condition="$rule_count_check">
                     <tr class="data_summary">
                         <td>汇总</td>
-                        <td colspan="16">
+                        <td colspan="17">
                             当页充值：{:null_to_0(array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount')))}
                             <!-- 今日充值：{$ttotal}-->
                             <!-- 昨日充值：{$ytotal}-->