diff --git a/Application/Admin/Controller/UserActionLogController.class.php b/Application/Admin/Controller/UserActionLogController.class.php
index 1f806d1f1..6f97c25a8 100644
--- a/Application/Admin/Controller/UserActionLogController.class.php
+++ b/Application/Admin/Controller/UserActionLogController.class.php
@@ -318,6 +318,10 @@ class UserActionLogController extends AdminController
             $map['op_type'] = $_REQUEST['op_type'];
         }
 
+        if ($_REQUEST['menu']) {
+            $map['menu'] = ['like',"%{$_REQUEST['menu']}%"];
+        }
+
         $data = M('operation_log','tab_')
             ->where($map)
             ->page($page,$row)
diff --git a/Application/Admin/View/Game/edit.html b/Application/Admin/View/Game/edit.html
index 4db4ca49f..cf4c1d6e6 100644
--- a/Application/Admin/View/Game/edit.html
+++ b/Application/Admin/View/Game/edit.html
@@ -711,40 +711,40 @@
                         <!-- <span class="notice-text" style="line-height:1.4;width:68%;">ios版游戏内的支付方式，二选一，默认是第三方支付。上架版：选择第三方支付则为wap支付，选择苹果内购则为苹果内购；非上架版：选择第三方支付则为wap支付，选择苹果内购则为app支付。金猪支付下支付宝始终是app支付（订单充值方式记录为支付宝），其它皆为wap支付（订单充值方式记录为金猪支付）</span> -->
                     </td>
                 </tr>
-                <tr>
-                    <td class="l noticeinfo">支付宝</td>
-                    <td class="r table_radio">
-                                <span class="form_select">
-                                    <select name="pay_config[zfb]">
-                                            <option value="gf" <?php echo $data['pay_config']['zfb'] == 'gf' ? "selected" : ''; ?>>官方</option>
-                                        <option value="sq" <?php echo $data['pay_config']['zfb'] == 'sq' ? "selected" : ''; ?>>双乾</option>
-                                        <option value="heepay" <?php echo $data['pay_config']['zfb'] == 'heepay' ? "selected" : ''; ?>>汇付宝</option>
-
-                                    </select>
-                                </span>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="l noticeinfo">微信</td>
-                    <td class="r table_radio">
-                                <span class="form_select">
-                                    <select name="pay_config[wx]">
-                                            <option value="gf" selected="selected">官方</option>
-                                    </select>
-                                </span>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="l noticeinfo">快捷支付</td>
-                    <td class="r table_radio">
-                                <span class="form_select">
-                                    <select name="pay_config[quick]">
-                                            <option value="sq" selected="selected">双乾</option>
-
-                                    </select>
-                                </span>
-                    </td>
-                </tr>
+<!--                <tr>-->
+<!--                    <td class="l noticeinfo">支付宝</td>-->
+<!--                    <td class="r table_radio">-->
+<!--                                <span class="form_select">-->
+<!--                                    <select name="pay_config[zfb]">-->
+<!--                                            <option value="gf" <?php echo $data['pay_config']['zfb'] == 'gf' ? "selected" : ''; ?>>官方</option>-->
+<!--                                        <option value="sq" <?php echo $data['pay_config']['zfb'] == 'sq' ? "selected" : ''; ?>>双乾</option>-->
+<!--                                        <option value="heepay" <?php echo $data['pay_config']['zfb'] == 'heepay' ? "selected" : ''; ?>>汇付宝</option>-->
+
+<!--                                    </select>-->
+<!--                                </span>-->
+<!--                    </td>-->
+<!--                </tr>-->
+<!--                <tr>-->
+<!--                    <td class="l noticeinfo">微信</td>-->
+<!--                    <td class="r table_radio">-->
+<!--                                <span class="form_select">-->
+<!--                                    <select name="pay_config[wx]">-->
+<!--                                            <option value="gf" selected="selected">官方</option>-->
+<!--                                    </select>-->
+<!--                                </span>-->
+<!--                    </td>-->
+<!--                </tr>-->
+<!--                <tr>-->
+<!--                    <td class="l noticeinfo">快捷支付</td>-->
+<!--                    <td class="r table_radio">-->
+<!--                                <span class="form_select">-->
+<!--                                    <select name="pay_config[quick]">-->
+<!--                                            <option value="sq" selected="selected">双乾</option>-->
+
+<!--                                    </select>-->
+<!--                                </span>-->
+<!--                    </td>-->
+<!--                </tr>-->
                 <tr>
                     <td class="l noticeinfo">是否开启强更</td>
                     <td class="r table_radio table_radio2">
diff --git a/Application/Admin/View/UserActionLog/operateLog.html b/Application/Admin/View/UserActionLog/operateLog.html
index 06aa38571..aa2f890f9 100644
--- a/Application/Admin/View/UserActionLog/operateLog.html
+++ b/Application/Admin/View/UserActionLog/operateLog.html
@@ -72,6 +72,10 @@
         </select>
       </div>
 
+      <div class="input-list input-list-game search_label_rehab">
+          <input style="width: 200px" type="text" id="menu" name="menu" class="" value="{:I('menu')}" placeholder="请输入位置" autocomplete="off"/>
+
+      </div>
 
       <div class="input-list">
         <a class="sch-btn" href="javascript:;" id="search" url="{:U('UserActionLog/operateLog','model='.$model['name'].'&row='.I('row'),false)}" style="">搜索</a>
diff --git a/Data/update.sql b/Data/update.sql
index aa6d436fe..317316185 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -2166,3 +2166,13 @@ CREATE TABLE `tab_payment_member` (
 INSERT INTO `tab_payment_member` (`id`, `real_name`, `mobile`, `last_login_time`) VALUES ('1', '胡歌', '18959188422', '0')
 
 
+INSERT INTO `sj_game_channel`.`sj_cptogether_company`(`name`, `channel_id`) VALUES ('数据误差渠道', 1);
+INSERT INTO `sj_game_channel`.`sj_cptogether_company`(`name`, `channel_id`) VALUES ('官方主渠道', 9);
+INSERT INTO `sj_game_channel`.`sj_cptogether_company`(`name`, `channel_id`) VALUES ('测试一级渠道', 685);
+INSERT INTO `sj_game_channel`.`sj_cptogether_company`(`name`, `channel_id`) VALUES ('坚果', 686);
+INSERT INTO `sj_game_channel`.`sj_cptogether_company`(`name`, `channel_id`) VALUES ('万盟天下', 687);
+INSERT INTO `sj_game_channel`.`sj_cptogether_company`(`name`, `channel_id`) VALUES ('海南万盟天下科技有限公司', 688);
+INSERT INTO `sj_game_channel`.`sj_cptogether_company`(`name`, `channel_id`) VALUES ('河南南北网络科技有限公司', 689);
+INSERT INTO `sj_game_channel`.`sj_cptogether_company`(`name`, `channel_id`) VALUES ('福建君易道网络科技有限公司', 690);
+INSERT INTO `sj_game_channel`.`sj_cptogether_company`(`name`, `channel_id`) VALUES ('泉州神战网络科技有限公司', 691);
+INSERT INTO `sj_game_channel`.`sj_cptogether_company`(`name`, `channel_id`) VALUES ('北京浩游网讯科技有限公司', 692);
\ No newline at end of file