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

Merge branch 'dev' into release-1.0.0

Browse Source
master
ELF 5 years ago
parent a5c926b2cd ad67717292
commit 8c683406ed
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File

10
Application/Admin/Controller/StatisticsController.class.php
Unescape Escape View File

@ -1035,15 +1035,17 @@ class StatisticsController extends ThinkController {
$map = " 1=1 "; $map = " 1=1 ";
$game_map = ""; $game_map = "";
if (isset($_REQUEST['game_name'])) { if (isset($_REQUEST['game_name']) && isset($_REQUEST['server_name'])) {
$game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')); $game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id'));
$map .= " AND game_id in ({$game_ids})"; $map .= " AND game_id in ({$game_ids})";
$game_map = " AND EXISTS (SELECT upi.user_id FROM tab_user_play_info as upi where upi.game_id in ({$game_ids}) AND upi.user_id = u.id "; $game_map = " AND EXISTS (SELECT upi.user_id FROM tab_user_play_info as upi where upi.game_id in ({$game_ids}) AND upi.user_id = u.id ";
if (isset($_REQUEST['server_name'])) $game_map .= " AND upi.server_name = '{$_REQUEST['server_name']}' "; if (isset($_REQUEST['server_name'])) $game_map .= " AND upi.server_name = '{$_REQUEST['server_name']}' ";
$game_map .= ") "; $game_map .= ") ";
} } else if (isset($_REQUEST['game_name'])) {
if (isset($_REQUEST['server_name'])) { $game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id'));
$map .= " AND server_name = '{$_REQUEST['server_name']}' "; $map .= " AND game_id in ({$game_ids})";
$game_map = " AND EXISTS (SELECT upi.user_id FROM tab_user_play as upi where upi.game_id in ({$game_ids}) AND upi.user_id = u.id ";
$game_map .= ") ";
} }
// 获取包含的用户id // 获取包含的用户id
$users = M()->query(" $users = M()->query("

2
Application/Admin/View/Promote/linkInfo.html
Unescape Escape View File

@ -130,7 +130,7 @@ $(".select_gallery").select2();
</script> </script>
<script type="text/javascript"> <script type="text/javascript">
//导航高亮 //导航高亮
highlight_subnav('{:U('Support/lists')}'); highlight_subnav('{:U('Promote/linkInfo')}');
$(function(){ $(function(){
//搜索功能 //搜索功能
$("#search").click(function(){ $("#search").click(function(){

16
Application/Admin/View/SuperStatistical/index.html
Unescape Escape View File

@ -107,14 +107,14 @@
{$_page|default=''} {$_page|default=''}
</div> </div>
<div class="common_settings"> <div class="common_settings">
<span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span> <span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>
<form class="addShortcutIcon"> <form class="addShortcutIcon">
<input type="hidden" name="title" value="{$m_title}"> <input type="hidden" name="title" value="{$m_title}">
<input type="hidden" name="url" value="Spend/lists"> <input type="hidden" name="url" value="Spend/lists">
</form> </form>
<a class="ajax-post add-butn <notempty name='commonset'>addSIsetted</notempty>" href="javascript:;" target-form="addShortcutIcon" url="{:U('Think/addShortcutIcon')}"><img src="__IMG__/zwmimages/icon_jia.png"><span><notempty name='commonset'>已添加<else />添加至常用设置</notempty></span></a> <a class="ajax-post add-butn <notempty name='commonset'>addSIsetted</notempty>" href="javascript:;" target-form="addShortcutIcon" url="{:U('Think/addShortcutIcon')}"><img src="__IMG__/zwmimages/icon_jia.png"><span><notempty name='commonset'>已添加<else />添加至常用设置</notempty></span></a>
</div> </div>
</block> </block>

Write Preview
Loading…
Cancel
Save