elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新功能添加

Browse Source
master
zhengyongxing 4 years ago
parent 1abaa7c646
commit 960903a31c
4 changed files with 52 additions and 34 deletions
Show Stats Download Patch File Download Diff File

4
Application/Admin/Controller/UserActionLogController.class.php
Unescape Escape View File

@ -318,6 +318,10 @@ class UserActionLogController extends AdminController
$map['op_type'] = $_REQUEST['op_type']; $map['op_type'] = $_REQUEST['op_type'];
} }
if ($_REQUEST['menu']) {
$map['menu'] = ['like',"%{$_REQUEST['menu']}%"];
}
$data = M('operation_log','tab_') $data = M('operation_log','tab_')
->where($map) ->where($map)
->page($page,$row) ->page($page,$row)

68
Application/Admin/View/Game/edit.html
Unescape Escape View File

@ -711,40 +711,40 @@
<!-- <span class="notice-text" style="line-height:1.4;width:68%;">ios版游戏内的支付方式，二选一，默认是第三方支付。上架版：选择第三方支付则为wap支付，选择苹果内购则为苹果内购；非上架版：选择第三方支付则为wap支付，选择苹果内购则为app支付。金猪支付下支付宝始终是app支付（订单充值方式记录为支付宝），其它皆为wap支付（订单充值方式记录为金猪支付）</span> --> <!-- <span class="notice-text" style="line-height:1.4;width:68%;">ios版游戏内的支付方式，二选一，默认是第三方支付。上架版：选择第三方支付则为wap支付，选择苹果内购则为苹果内购；非上架版：选择第三方支付则为wap支付，选择苹果内购则为app支付。金猪支付下支付宝始终是app支付（订单充值方式记录为支付宝），其它皆为wap支付（订单充值方式记录为金猪支付）</span> -->
</td> </td>
</tr> </tr>
<tr> <!-- <tr>-->
<td class="l noticeinfo">支付宝</td> <!-- <td class="l noticeinfo">支付宝</td>-->
<td class="r table_radio"> <!-- <td class="r table_radio">-->
<span class="form_select"> <!-- <span class="form_select">-->
<select name="pay_config[zfb]"> <!-- <select name="pay_config[zfb]">-->
<option value="gf" <?php echo $data['pay_config']['zfb'] == 'gf' ? "selected" : ''; ?>>官方</option> <!-- <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="sq" <?php echo $data['pay_config']['zfb'] == 'sq' ? "selected" : ''; ?>>双乾</option>-->
<option value="heepay" <?php echo $data['pay_config']['zfb'] == 'heepay' ? "selected" : ''; ?>>汇付宝</option> <!-- <option value="heepay" <?php echo $data['pay_config']['zfb'] == 'heepay' ? "selected" : ''; ?>>汇付宝</option>-->
</select> <!-- </select>-->
</span> <!-- </span>-->
</td> <!-- </td>-->
</tr> <!-- </tr>-->
<tr> <!-- <tr>-->
<td class="l noticeinfo">微信</td> <!-- <td class="l noticeinfo">微信</td>-->
<td class="r table_radio"> <!-- <td class="r table_radio">-->
<span class="form_select"> <!-- <span class="form_select">-->
<select name="pay_config[wx]"> <!-- <select name="pay_config[wx]">-->
<option value="gf" selected="selected">官方</option> <!-- <option value="gf" selected="selected">官方</option>-->
</select> <!-- </select>-->
</span> <!-- </span>-->
</td> <!-- </td>-->
</tr> <!-- </tr>-->
<tr> <!-- <tr>-->
<td class="l noticeinfo">快捷支付</td> <!-- <td class="l noticeinfo">快捷支付</td>-->
<td class="r table_radio"> <!-- <td class="r table_radio">-->
<span class="form_select"> <!-- <span class="form_select">-->
<select name="pay_config[quick]"> <!-- <select name="pay_config[quick]">-->
<option value="sq" selected="selected">双乾</option> <!-- <option value="sq" selected="selected">双乾</option>-->
</select> <!-- </select>-->
</span> <!-- </span>-->
</td> <!-- </td>-->
</tr> <!-- </tr>-->
<tr> <tr>
<td class="l noticeinfo">是否开启强更</td> <td class="l noticeinfo">是否开启强更</td>
<td class="r table_radio table_radio2"> <td class="r table_radio table_radio2">

4
Application/Admin/View/UserActionLog/operateLog.html
Unescape Escape View File

@ -72,6 +72,10 @@
</select> </select>
</div> </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"> <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> <a class="sch-btn" href="javascript:;" id="search" url="{:U('UserActionLog/operateLog','model='.$model['name'].'&row='.I('row'),false)}" style="">搜索</a>

10
Data/update.sql
Unescape Escape View File

@ -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 `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);
Write Preview
Loading…
Cancel
Save