Merge branch 'hotfix/ltv' into dev

Application/Admin/Controller/AjaxController.class.php

@@ -91,6 +91,8 @@ class AjaxController extends ThinkController{
         $map = [];
         if ($game) {
             $map['game_id'] = ['in', $game];
+        } else {
+            $map['game_id'] = ['in', [-1]];
         }
         $data = M('Server', 'tab_')->field('id, server_name, server_id')->where($map)->group('server_name')->select();
         $this->AjaxReturn($data);

Application/Admin/View/Statistics/ltv.html

@@ -4,6 +4,29 @@
 <block name="body">
     <link rel="stylesheet" href="__CSS__/select2.min.css" type="text/css" />
     <script type="text/javascript" src="__JS__/select2.min.js"></script>
+    <link href="__STATIC__/datetimepicker/css/datetimepicker.css" rel="stylesheet" type="text/css">
+    <style>
+        .select2-container--default .select2-selection--single {
+                color: #000;
+            resize: none;
+            border-width: 1px;
+            border-style: solid;
+            border-color: #a7b5bc #ced9df #ced9df #a7b5bc;
+            box-shadow: 0px 3px 3px #F7F8F9 inset;height:35px;
+            height:28px;border-radius:3px;font-size:12px;
+        }
+        .select2-container--default .select2-selection--single .select2-selection__rendered {
+            line-height:35px;
+            line-height:28px;
+        }
+        .select2-container--default .select2-selection--single .select2-selection__arrow {
+            height:26px;
+        }
+        .select2-container--default .select2-search--dropdown .select2-search__field {
+          height:26px;line-height:26px;font-size:12px;
+        }
+        .select2-results__option[aria-selected] {font-size:12px;}
+    </style>
 <script type="text/javascript" src="__JS__/bootstrap.min.js"></script>     
         
 	<div class="cf main-place top_nav_list navtab_list">
@@ -20,7 +43,10 @@
             <div class="input-list">
                 <input type="text" id="time-start" name="start" class="" value="{:I('start',date('Y-m-d',strtotime('-30 day')))}" placeholder="选择开始时间" />
                 &nbsp;-&nbsp;
-                <input type="text" id="time-end" name="end" class="" value="{:I('end',date('Y-m-d',strtotime('-1 day')))}" placeholder="选择结束时间" />
+                <div class="input-append date" id="datetimepicker"  style="display:inline-block">
+                <input type="text" readonly id="time-end" name="end" class="" value="{:I('end',date('Y-m-d',strtotime('-1 day')))}" placeholder="选择结束时间" />
+                <span class="add-on"><i class="icon-th"></i></span>
+                </div>
             </div>
 			<div class="input-list input-list-game search_label_rehab">
                 <select id="game_name" name="game_name" class="select_gallery" >
@@ -118,7 +144,6 @@ Think.setValue('start',"{$Think.get.start|default=''}");
 Think.setValue('end',"{$Think.get.end|default=''}");
 Think.setValue('row',"{$Think.get.row|default='10'}");
 </script>
-<link href="__STATIC__/datetimepicker/css/datetimepicker.css" rel="stylesheet" type="text/css">
 <php>if(C('COLOR_STYLE')=='blue_color') echo '<link href="__STATIC__/datetimepicker/css/datetimepicker_blue.css" rel="stylesheet" type="text/css">';</php>
 <link href="__STATIC__/datetimepicker/css/dropdown.css" rel="stylesheet" type="text/css">
 <script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>