Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0

Application/Admin/Controller/PlatformController.class.php

@@ -403,7 +403,7 @@ class PlatformController extends ThinkController
             count(IF(register_time ' . $mounth . ',1,null)) as mounth')
             ->join("tab_promote AS tp2 ON tp2.`chain` LIKE CONCAT('%/', tp1.id, '/%') OR tp2.id = tp1.id", 'left')
             ->join("tab_user as u on tp2.id = u.promote_id", 'left')
-//            ->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false)
+            ->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false)
             ->where($map)
             ->group('tp1.id')
             ->order('count desc, register_time')

Application/Admin/Controller/RechargeSumController.class.php

@@ -7,6 +7,7 @@ class RechargeSumController extends ThinkController
 
     public function summation($p = 1)
     {
+        
         $startDateTime = empty($_REQUEST['timeStart']) ? date('Y-m-d', strtotime('-6 day', time())) : $_REQUEST['timeStart'];
         $endDateTime = empty($_REQUEST['timeEnd']) ? date('Y-m-d') : $_REQUEST['timeEnd'];
         $startTime = strtotime($startDateTime);
@@ -56,7 +57,6 @@ class RechargeSumController extends ThinkController
                 if (!empty($_REQUEST['server_id'])) {
                     $rmap['tab_user_play.server_id'] = $map['server_id'] = $_REQUEST['server_id'];
                 }
-
                 if ($_REQUEST['bindcoin'] == 1) {
                     $map['pay_way'] = array('egt', 0);
                 }

Application/Admin/View/RechargeSum/summation.html

@@ -81,7 +81,7 @@
                 </select>
             </div>
             <div class="input-list input-list-server search_label_rehab">
-                <select id="server_name" name="server_name" class="select_gallery"  style="width:120px;">
+                <select id="server_id" name="server_id" class="select_gallery"  style="width:120px;">
                     <option value="">区服名称</option>
                 </select>
             </div>
@@ -321,7 +321,7 @@
             });
             $("#promote_level").change();
 
-            var game_server = "{:I('server_name')}";
+            var server_id = "{:I('server_id')}";
             $("#game_type").change(function(){
                 $.ajax({
                     url:"{:U('Ajax/getGmeServer')}",
@@ -331,11 +331,11 @@
                     success:function(data){
                         str = "<option value=''>请选择区服</option>";
                         for (var i in data){
-                            str += "<option value='"+data[i].server_name+"' "+(game_server && data[i].server_name == game_server?'selected':'')+">"+data[i].server_name+"</option>"
+                            str += "<option value='"+data[i].server_id+"' "+(server_id && data[i].server_id == server_id?'selected':'')+">"+data[i].server_name+"</option>"
                         }
-                        $("#server_name").empty();
-                        $("#server_name").append(str);
-                        $("#server_name").select2();
+                        $("#server_id").empty();
+                        $("#server_id").append(str);
+                        $("#server_id").select2();
                     }
                 })
             });