Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Application/Home/Controller/DownloadController.class.php

@@ -1240,8 +1240,8 @@ class DownloadController extends BaseController {
         $costBegin = I('cost_begin', '');     //充值总额范围
         $costEnd = I('cost_end', '');
         $nowTime = date('Y-m-d');
-        $initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
+        $initBegTime = date('Y-m-d', strtotime('-7 day', strtotime($nowTime)));
-        $initBegTime = empty(I('begtime')) ? $initBegTime : I('begtime');
+        $initBegTime = empty(I('begtime')) ? $initBegTime  : I('begtime');
         $initEndTime = $nowTime;
         $initEndTime = empty(I('endtime')) ? $initEndTime : I('endtime');
         $begTime = strtotime($initBegTime);
@@ -2908,7 +2908,7 @@ class DownloadController extends BaseController {
             $map['_string'] = 'ui.role_id in (' . $subQuery . ')';
         }
         $secondDay = 24*3600 + 1;
-        $map['uc.create_time'] = ['between', [$map['begintime']-24*3600, $map['endtime'] - $secondDay]];
+        $map['uc.create_time'] = ['between', [$map['begintime'], $map['endtime'] - $secondDay]];
         unset($map['begintime']);
         unset($map['endtime']);
         //$spendMap['_string'] = 'uc.game_id = tab_user_play_info.game_id and uc.server_id = tab_user_play_info.server_id and uc.role_id = tab_user_play_info.role_id';

Application/Home/Controller/QueryController.class.php

@@ -1844,8 +1844,15 @@ class QueryController extends BaseController
             list($records, $pagination, $count) = $this->paginate($query);
 
             foreach ($records as &$list) {
-                $list['user_account'] = encryption($list['user_account']);
+                $list['user_account'] = empty($list['user_account']) ? '--' : encryption($list['user_account']);
-                $list['unlogin_day'] = intval((strtotime(date('Y-m-d 00:00:00')) - strtotime(date('Y-m-d 00:00:00', $list['play_time']))) / (24 * 3600));
+                $list['game_name'] = empty($list['game_name']) ? '--' : $list['game_name'];
+                $list['sdk_version'] = empty($list['sdk_version']) ? '--' : getSDKTypeName($list['sdk_version']);
+                $list['server_name'] = empty($list['server_name']) ? '--' : $list['server_name'];
+                $list['role_name'] = empty($list['role_name']) ? '--' : $list['role_name'];
+                $list['role_level'] = empty($list['role_level']) ? '--' : $list['role_level'];
+                $list['unlogin_day'] = empty($list['unlogin_day']) ? '--' : intval((strtotime(date('Y-m-d 00:00:00')) - strtotime(date('Y-m-d 00:00:00', $list['play_time']))) / (24 * 3600));
+                $list['play_time'] = empty($list['play_time']) ? '--' : date('Y-m-d H:i:s', $list['play_time']);
+                $list['promote_account'] = empty($list['promote_account']) ? '--' : $list['promote_account'];
             }
         }
 

Application/Home/View/default/Home/landingPage.html

@@ -24,6 +24,7 @@
   }
   .layui-layer-btn1 {
     font-size: 18px;
+    margin-right: 18%;
   }
 </style>
 <input type="hidden" name="title" value="{$game['relation_game_name']}">

Application/Home/View/default/Query/userRecharges.html

@@ -155,7 +155,7 @@
                 <tr data-id="{$vo.id}" class="<eq name='mod' value='1'>odd</eq>">
                   <td>{$record.user_account}</td>
                   <td>{$record.game_name}</td>
-                  <td>{:getSDKTypeName($record['sdk_version'])}</td>
+                  <td>{$record.sdk_version}</td>
                   <td>{$record.server_name}</td>
                   <td>{$record.role_name}</td>
                   <td>{$record.role_level}</td>
@@ -163,7 +163,7 @@
                   <td>{$record.recharge_count}</td>
                   <td>{$record.recharge_cost_today}</td>
                   <td>{$record.unlogin_day}</td>
-                  <td>{$record.play_time|date='Y-m-d H:i:s',###}</td>
+                  <td>{$record.play_time}</td>
                   <td>{$record.promote_account}</td>
                 </tr>
               </volist>