Merge branch 'dev' into release-1.0.0

Application/Admin/Controller/StatisticsController.class.php

@@ -1035,15 +1035,17 @@ class StatisticsController extends ThinkController {
 
 		$map = " 1=1 ";
 		$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'));
 			$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 ";
 			if (isset($_REQUEST['server_name'])) $game_map .= " AND upi.server_name = '{$_REQUEST['server_name']}' ";
 			$game_map .= ") ";
-		}
-		if (isset($_REQUEST['server_name'])) {
-            $map .= " AND server_name = '{$_REQUEST['server_name']}' ";
+		} else if (isset($_REQUEST['game_name'])) {
+            $game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id'));
+			$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
 		$users = M()->query("

Application/Admin/View/Promote/linkInfo.html

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

Application/Admin/View/SuperStatistical/index.html

@@ -107,14 +107,14 @@
         {$_page|default=''}
     </div>
 
-		<div class="common_settings">
-			<span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>
-			<form class="addShortcutIcon">
-				<input type="hidden" name="title" value="{$m_title}">
-				<input type="hidden" name="url" value="Spend/lists">
-			</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>
-		</div>
+        <div class="common_settings">
+            <span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>
+            <form class="addShortcutIcon">
+                <input type="hidden" name="title" value="{$m_title}">
+                <input type="hidden" name="url" value="Spend/lists">
+            </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>
+        </div>
 
 </block>