From 19d85f3717851d057dd88abd23f14e96870c4a69 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 4 Mar 2020 10:14:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=8F=AF=E7=94=A8=E4=BD=99=E9=A2=9D=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/PresidentDepositController.class.php     | 3 +++
 Application/Admin/View/UserActionLog/operateLog.html          | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/PresidentDepositController.class.php b/Application/Admin/Controller/PresidentDepositController.class.php
index 3f771d80b..5f935cd85 100644
--- a/Application/Admin/Controller/PresidentDepositController.class.php
+++ b/Application/Admin/Controller/PresidentDepositController.class.php
@@ -280,6 +280,9 @@ class PresidentDepositController extends ThinkController
     {
         $promoteId = I('id', 0);
         M('president_deposit', 'tab_')->where(['promote_id' => $promoteId])->delete();
+
+        addOperationLog(['op_type'=>2,'key'=>$promoteId,'op_name'=>'删除会长押金记录','url'=>U('PresidentDeposit/records',['id'=>$promoteId]),'menu'=>'推广员-结算单管理-奖罚记录管理-删除会长押金记录']);
+
         $this->ajaxReturn([
             'status' => 1,
             'message' => '删除成功'
diff --git a/Application/Admin/View/UserActionLog/operateLog.html b/Application/Admin/View/UserActionLog/operateLog.html
index 93395c4e1..01ec89429 100644
--- a/Application/Admin/View/UserActionLog/operateLog.html
+++ b/Application/Admin/View/UserActionLog/operateLog.html
@@ -118,7 +118,9 @@
           <volist name="data" id="data" key="$key">
             <tr>
               <td >{$data.id}</td>
-              <td ><if condition="$data['op_type'] neq 2"><a href="{$data.url}" target="_blank">{$data.menu}-{$data.key}</a><else/>{$data.menu}-{$data.key}</if></td>
+              <td >
+                  <a href="{$data.url}" target="_blank">{$data.menu}-{$data.key}</a>
+              </td>
               <td >{$data.op_name}</td>
               <td >{$data.admin_account}</td>
               <td >{$data.create_time|date='Y-m-d H:i:s',###}</td>

From 7fa400a0a5aab74737bae1c76c4f150592400698 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Wed, 4 Mar 2020 10:50:55 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=AC=E4=BC=9A?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=BB=9F=E8=AE=A1=E6=A0=8F=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/FinancePromote/index.html | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Application/Admin/View/FinancePromote/index.html b/Application/Admin/View/FinancePromote/index.html
index 1e4a00369..4c66fc343 100644
--- a/Application/Admin/View/FinancePromote/index.html
+++ b/Application/Admin/View/FinancePromote/index.html
@@ -242,14 +242,13 @@
                             </tr>
                         </volist>
                     </empty>
-                    <tr class="data_summary">
-                        <td colspan="2" style="text-align: center;">汇总:</td>
-                        <td style="text-align: center;">---</td>
-                        <td>{$all_count['cash_count']}</td>
-                        <td>{$all_count['balance_coin_count']}</td>
-                        <td>{$all_count['bind_coin_count']}</td>
-                        <td>{$all_count['inside_cash_count']}</td>
-                        <td>{$all_count['all_count']}</td>
+                    <tr class="data_summary" style="text-align: center;">
+                        <td colspan="3" style="text-align: center;">汇总:</td>
+                        <td style="text-align: center;">{$all_count['cash_count']}</td>
+                        <td style="text-align: center;">{$all_count['balance_coin_count']}</td>
+                        <td style="text-align: center;">{$all_count['bind_coin_count']}</td>
+                        <td style="text-align: center;">{$all_count['inside_cash_count']}</td>
+                        <td style="text-align: center;">{$all_count['all_count']}</td>
                         <td style="text-align: center;">
                             <a
                                 href="{:U('FinancePromote/gameStatistics',array_merge(I('get.'),['promote_type'=>1,'p'=>1]))}">游戏查看</a>