修改bug

master
ELF 5 years ago
parent 8d56157601
commit adb10b2959

@ -755,7 +755,7 @@ class QueryController extends BaseController
$timeout = 0; $timeout = 0;
$records = []; $records = [];
if (intval($endTime - $beginTime) / (24 * 3600) <= 31) { if (intval($endTime - $beginTime) / (24 * 3600) <= 7) {
$userRepository = new UserRepository(); $userRepository = new UserRepository();
$spendRepository = new SpendRepository(); $spendRepository = new SpendRepository();
$payGameCountList = $spendRepository->getPayGameCountGroupByDay($params); $payGameCountList = $spendRepository->getPayGameCountGroupByDay($params);
@ -2040,6 +2040,10 @@ class QueryController extends BaseController
list($beginTime, $endTime) = $this->getBetweenTime($time); list($beginTime, $endTime) = $this->getBetweenTime($time);
$params['begin_time'] = $beginTime; $params['begin_time'] = $beginTime;
$params['end_time'] = $endTime; $params['end_time'] = $endTime;
$timeout = 0;
$records = [];
if (intval($endTime - $beginTime) / (24 * 3600) <= 7) {
$promoteRepository = new PromoteRepository(); $promoteRepository = new PromoteRepository();
$createRoleCountList = $promoteRepository->getCreateRoleCountByIds($ids, $params); $createRoleCountList = $promoteRepository->getCreateRoleCountByIds($ids, $params);
$createRoleUserCountList = $promoteRepository->getCreateRoleUserCountByIds($ids, $params); $createRoleUserCountList = $promoteRepository->getCreateRoleUserCountByIds($ids, $params);
@ -2051,7 +2055,6 @@ class QueryController extends BaseController
$rechargeUserCountList = $promoteRepository->getRechargeUserCountByIds($ids, $params); $rechargeUserCountList = $promoteRepository->getRechargeUserCountByIds($ids, $params);
$rechargeAmountList = $promoteRepository->getRechargeAmountByIds($ids, $params); $rechargeAmountList = $promoteRepository->getRechargeAmountByIds($ids, $params);
$records = [];
if (I('p', 1) == 1) { if (I('p', 1) == 1) {
$selfParams = $params; $selfParams = $params;
$selfParams['isContainSubs'] = false; $selfParams['isContainSubs'] = false;
@ -2107,6 +2110,9 @@ class QueryController extends BaseController
'current_display' => '', 'current_display' => '',
]; ];
} }
} else {
$timeout = 1;
}
$this->assign('prevParentId', $prevParentId); $this->assign('prevParentId', $prevParentId);
$this->assign('searchLevelName', $searchLevelName); $this->assign('searchLevelName', $searchLevelName);
@ -2117,6 +2123,7 @@ class QueryController extends BaseController
$this->assign('pagination', $pagination); $this->assign('pagination', $pagination);
$this->assign('parentid', $parentId); $this->assign('parentid', $parentId);
$this->assign('count', $count); $this->assign('count', $count);
$this->assign('timeout', $timeout);
$this->display(); $this->display();
} }

@ -149,6 +149,11 @@
<script src="__STATIC__/flatpickr/flatpickr.min.js"></script> <script src="__STATIC__/flatpickr/flatpickr.min.js"></script>
<script src="__STATIC__/flatpickr/l10n/zh.js"></script> <script src="__STATIC__/flatpickr/l10n/zh.js"></script>
<script type="text/javascript" src="__JS__/20170831/select2.min.js"></script> <script type="text/javascript" src="__JS__/20170831/select2.min.js"></script>
<eq name='timeout' value='1'>
<script>
layer.msg('时间间隔不能超过7天');
</script>
</eq>
<script type="text/javascript"> <script type="text/javascript">
$(function() { $(function() {
var defaultDate = $('.range-date').val() var defaultDate = $('.range-date').val()

@ -242,7 +242,7 @@
<script type="text/javascript" src="__JS__/common.js"></script> <script type="text/javascript" src="__JS__/common.js"></script>
<eq name='timeout' value='1'> <eq name='timeout' value='1'>
<script> <script>
layer.msg('时间间隔不能超过30天'); layer.msg('时间间隔不能超过7天');
</script> </script>
</eq> </eq>
<script> <script>

Loading…
Cancel
Save