From 5224eec9f28dec14872645820cb9871b44955416 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Thu, 27 Feb 2020 15:01:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=B8=B8=E7=BB=93=E7=AE=97=E5=8D=95?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/PresidentDepositController.class.php   | 2 +-
 Application/Admin/Controller/StatementController.class.php  | 6 ++++++
 Application/Admin/View/Query/marketList.html                | 6 +++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/PresidentDepositController.class.php b/Application/Admin/Controller/PresidentDepositController.class.php
index 7b5ec904c..3f771d80b 100644
--- a/Application/Admin/Controller/PresidentDepositController.class.php
+++ b/Application/Admin/Controller/PresidentDepositController.class.php
@@ -140,7 +140,7 @@ class PresidentDepositController extends ThinkController
                     'pay_confirm_time' => '押金确认时间',
                 ];
 
-                addOperationLog(['op_type'=>3,'key'=>getNowDate(),'op_name'=>'导出会长押金记录','url'=>U('PresidentDeposit/records'),'menu'=>'推广员-结算单管理-奖罚记录管理-导出会长押金记录']);
+                addOperationLog(['op_type'=>3,'key'=>getNowDate(),'op_name'=>'导出会长押金记录','url'=>U('PresidentDeposit/records'),'menu'=>'推广员-结算管理-奖罚记录管理-导出会长押金记录']);
 
                 data2csv($records, '会长押金记录', $field);
                 exit;
diff --git a/Application/Admin/Controller/StatementController.class.php b/Application/Admin/Controller/StatementController.class.php
index e2a28bf2f..c26264535 100644
--- a/Application/Admin/Controller/StatementController.class.php
+++ b/Application/Admin/Controller/StatementController.class.php
@@ -319,8 +319,14 @@ class StatementController extends ThinkController
             "statement_info"=>json_encode($statement_info,JSON_UNESCAPED_UNICODE)
         );
         if($id == 0){
+//            var_dump(1);die();
+            addOperationLog(['op_type'=>0,'key'=>$company['partner'].getNowDate(),'op_name'=>'新增上游对账单','url'=>U('StatementMangement/lists'),'menu'=>'推广员-结算管理-结算单管理-新增上游对账单']);
+
             $res = M("statement","tab_")->add($adddata);
         }else{
+
+            addOperationLog(['op_type'=>1,'key'=>$company['partner'].getNowDate(),'op_name'=>'编辑上游对账单','url'=>U('StatementMangement/lists'),'menu'=>'推广员-结算管理-结算单管理-编辑上游对账单']);
+
             $res = M("statement","tab_")->where("id = '{$id}'")->save($adddata);
         }
         if($res !== false){
diff --git a/Application/Admin/View/Query/marketList.html b/Application/Admin/View/Query/marketList.html
index 78188596f..3789f7498 100644
--- a/Application/Admin/View/Query/marketList.html
+++ b/Application/Admin/View/Query/marketList.html
@@ -169,9 +169,9 @@
 
     </div>
     <div class="page">
-        <if condition="$is_admin eq true ">
-            <a class="sch-btn" href="{:U('Export/promote_list',array_merge(['xlsname'=>'推广员管理_推广员列表'.((I('type',1)==2)?'_混服申请':'_推广员列表')],I('get.')))}">导出</a>
-        </if>
+<!--        <if condition="$is_admin eq true ">-->
+<!--            <a class="sch-btn" href="{:U('Export/promote_list',array_merge(['xlsname'=>'推广员管理_推广员列表'.((I('type',1)==2)?'_混服申请':'_推广员列表')],I('get.')))}">导出</a>-->
+<!--        </if>-->
         {$_page|default=''}
     </div>
     <div class="pro_promot" style="display:none">