diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 761c20785..3bec61a7b 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -1481,19 +1481,19 @@ class DownloadController extends BaseController - if (!empty(I('begtime')) && empty(I('endtime'))) { + if (!empty(I('begtime')) && empty(I('endtime'))) { $map['tab_spend.spend_time'] = ['egt', strtotime(I('begtime'))]; } elseif (empty(I('begtime')) && !empty(I('endtime'))) { $map['tab_spend.spend_time'] = ['elt', strtotime(I('endtime')) + 86399]; } elseif (!empty(I('begtime')) && !empty(I('endtime'))) { $map['tab_spend.spend_time'] = ['between', [strtotime(I('begtime')), strtotime(I('endtime')) + 86399]]; }else { - $nowTime = date('Y-m-d'); - $initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime))); - $initEndTime = date('Y-m-d'); - $initBegTime = strtotime($initBegTime); - $initEndTime = strtotime($initEndTime); - $map['tab_spend.spend_time'] = ['between',[$initBegTime,$initEndTime]]; +// $nowTime = date('Y-m-d'); +// $initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime))); +// $initEndTime = date('Y-m-d'); +// $initBegTime = strtotime($initBegTime); +// $initEndTime = strtotime($initEndTime); +// $map['tab_spend.spend_time'] = ['between',[$initBegTime,$initEndTime]]; } if ($payedBegTime) { diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 16993ad90..99937ace3 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -241,6 +241,8 @@ class QueryController extends BaseController $parameter['row'] = $row; $parameter['begtime'] = $initBegTime; $parameter['endtime'] = $initEndTime; + $parameter['payed_begtime'] = I("payed_begtime", ''); + $parameter['payed_endtime'] = I("payed_endtime", ''); $parameter['relation_game_id'] = $relationGameId; $parameter['sdk_version'] = $sdkVersion; $parameter['server_id'] = $serverId; diff --git a/Application/Home/View/default/Query/recharge.html b/Application/Home/View/default/Query/recharge.html index 05b9e23fe..587322d0e 100644 --- a/Application/Home/View/default/Query/recharge.html +++ b/Application/Home/View/default/Query/recharge.html @@ -432,15 +432,28 @@ layer.msg('到账时间间隔不能超过31天,请重新选择日期'); return false; } + + if (sdate && !edate) { + layer.msg('下单结束时间不能为空'); + return false; + } + if (!sdate && edate) { + layer.msg('下单开始时间不能为空'); + return false; + } + if (payed_sdate && !payed_edate) { layer.msg('到账结束时间不能为空'); + return false; } if (!payed_sdate && payed_edate) { layer.msg('到账开始时间不能为空'); + return false; } if (!edate && !sdate && !payed_sdate && !payed_edate) { layer.msg('时间不能为空'); + return false; } var url = $(this).attr('url');