From 9221b1895556262aca94ecf99ae44895709cf30b Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Thu, 27 Feb 2020 14:41:51 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=B1=87=E6=80=BB=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/Spend/lists.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html
index 884ea60a4..8762b8de3 100644
--- a/Application/Admin/View/Spend/lists.html
+++ b/Application/Admin/View/Spend/lists.html
@@ -260,7 +260,7 @@
                     </volist>
                 </empty>
 
-                <if condition="$is_admin eq true ">
+                    <if condition="$rule_count_check">
                     <tr class="data_summary">
                         <td>汇总</td>
                         <td colspan="16">
@@ -274,7 +274,8 @@
                             昨日充值：昨日平台所有推广员的累计充值（包括官方渠道）
                         </td>-->
                     </tr>
-                </if>
+                    </if>
+
                 </tbody>
             </table>
         </div>

From 4a45103650faf7cc23f26ee24a1400409116ada0 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Thu, 27 Feb 2020 15:07:16 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=B8=81=E5=85=85?=
 =?UTF-8?q?=E5=80=BC=E6=B1=87=E6=80=BB=E8=A1=A5=E4=B8=80=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/Deposit/lists.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Admin/View/Deposit/lists.html b/Application/Admin/View/Deposit/lists.html
index d1bd3e541..17c0cf809 100644
--- a/Application/Admin/View/Deposit/lists.html
+++ b/Application/Admin/View/Deposit/lists.html
@@ -198,7 +198,7 @@
                 </empty>
                 <tr class="data_summary">
                     <td>汇总</td>
-                    <td colspan="7">
+                    <td colspan="8">
                         当页充值：{:array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount'))}；
                         今日充值：{$ttotal} ；
                         昨日充值：{$ytotal} ；

From 22aa120ad64af2324a95198b54e92952de1764dd Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Thu, 27 Feb 2020 15:25:22 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E7=9A=84=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/Deposit/lists.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Application/Admin/View/Deposit/lists.html b/Application/Admin/View/Deposit/lists.html
index 17c0cf809..1d7a97cce 100644
--- a/Application/Admin/View/Deposit/lists.html
+++ b/Application/Admin/View/Deposit/lists.html
@@ -185,7 +185,6 @@
                             </td>
 
                             <td style="text-indent:0;">
-                                <br />
                                 <if condition="$data['pay_status'] eq 0">
                                     <a class="pay_repair" href="javascript:void(0);"
                                        href-data="{$data.pay_order_number}" href-hhh="{:U('Repair/noticePayed')}" style="width:100%;">通知到账</a>