Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into feature/operation_log

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;

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){

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">