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

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

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>