From c1ad1396bcc39675e3c48baae076d8eb304acb22 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Mon, 2 Mar 2020 15:58:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=93=8D=E4=BD=9Cbug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/ApplyController.class.php        | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/ApplyController.class.php b/Application/Admin/Controller/ApplyController.class.php
index 17ac0548e..b8fd8a25d 100644
--- a/Application/Admin/Controller/ApplyController.class.php
+++ b/Application/Admin/Controller/ApplyController.class.php
@@ -493,7 +493,7 @@ class ApplyController extends ThinkController
 
         foreach ($data as $key => $value) {
 
-            addOperationLog(['op_type'=>1,'key'=>$value['game_name'].$value['promote_account'],'op_name'=>'打包游戏分包','url'=>U('Promote/lists'),'menu'=>'推广员-推广员管理-游戏分包-打包游戏分包']);
+            addOperationLog(['op_type'=>1,'key'=>$value['game_name'].$value['promote_account'],'op_name'=>'打包游戏分包','url'=>U('Apply/and_lists'),'menu'=>'推广员-推广员管理-游戏分包-打包游戏分包']);
 
         }
 
@@ -545,6 +545,15 @@ class ApplyController extends ThinkController
             $this -> error("游戏原包不存在", $url);
             exit();
         }
+
+        $data = M('apply','tab_')->where(['id'=>['in',$ids]])->select();
+
+        foreach ($data as $key => $value) {
+
+            addOperationLog(['op_type'=>1,'key'=>$value['game_name'].$value['promote_account'],'op_name'=>'打包游戏分包','url'=>U('Apply/and_lists'),'menu'=>'推广员-推广员管理-游戏分包-打包游戏分包']);
+
+        }
+
         M('apply', 'tab_') -> where(['id' => $ids]) -> setField(['enable_status'=>2, 'pack_url'=>'', 'plist_url'=>'']);
         M('apply_launch', 'tab_')->where(['apply_id'=>$ids])->setField('launch_packge', 0);
         \Think\Log ::actionLog('Apply/package', 'Apply', $ids);

From d0f07315dae09ee15b0266cc82b30f69abb7c50b Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Tue, 3 Mar 2020 10:30:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=A3=80=E7=B4=A2=E5=90=8D=E8=AF=8D=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/UserActionLog/operateLog.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/View/UserActionLog/operateLog.html b/Application/Admin/View/UserActionLog/operateLog.html
index 93395c4e1..9d359d8f8 100644
--- a/Application/Admin/View/UserActionLog/operateLog.html
+++ b/Application/Admin/View/UserActionLog/operateLog.html
@@ -53,9 +53,9 @@
         <select id="op_type" name="op_type" class="select_gallery" >
           <option value="">请选择类型</option>
           <option value="0" <if condition="$_GET['op_type'] eq '0'">selected</if> >新增</option>
-            <option value="1" <if condition="$_GET['op_type'] eq 1">selected</if> >编辑</option>
+            <option value="1" <if condition="$_GET['op_type'] eq 1">selected</if> >修改</option>
           <option value="2" <if condition="$_GET['op_type'] eq  2">selected</if> >删除</option>
-          <option value="3" <if condition="$_GET['op_type'] eq  3">selected</if> >下载</option>
+          <option value="3" <if condition="$_GET['op_type'] eq  3">selected</if> >导出</option>
         </select>
       </div>