From e6ae117fd77f34c5467554ea3b572b76f4297a4e Mon Sep 17 00:00:00 2001 From: tping Date: Fri, 30 Oct 2020 14:21:57 +0800 Subject: [PATCH] =?UTF-8?q?1,=E9=9A=90=E8=97=8F=E5=88=A0=E9=99=A4=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=88=E5=90=8E=E5=8F=B0->=E6=8E=A8=E5=B9=BF->?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E5=88=86=E5=8C=85=EF=BC=89=202,=E6=8E=A8?= =?UTF-8?q?=E5=B9=BF=E5=90=8E=E5=8F=B0=E5=A2=9E=E5=8A=A0=E4=B8=8B=E5=8D=95?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/ApplyController.class.php | 3 +- Application/Admin/View/Apply/and_lists.html | 2 + .../Home/Controller/QueryController.class.php | 14 +++++ .../Home/View/default/Query/recharge.html | 62 +++++++++++++++++-- 4 files changed, 76 insertions(+), 5 deletions(-) diff --git a/Application/Admin/Controller/ApplyController.class.php b/Application/Admin/Controller/ApplyController.class.php index 575d541eb..adea430bd 100644 --- a/Application/Admin/Controller/ApplyController.class.php +++ b/Application/Admin/Controller/ApplyController.class.php @@ -418,7 +418,8 @@ class ApplyController extends ThinkController public function android_del($model = null, $ids = null) { - + echo "不允许删除"; + return ; \Think\Log ::actionLog('Apply/android_del', 'Apply', 1); $this -> del($model, $ids); } diff --git a/Application/Admin/View/Apply/and_lists.html b/Application/Admin/View/Apply/and_lists.html index 2d532e612..0c0793d81 100644 --- a/Application/Admin/View/Apply/and_lists.html +++ b/Application/Admin/View/Apply/and_lists.html @@ -49,7 +49,9 @@
1,"msg_type"=>5,"field"=>"status"))}">审 核 $_GET['p'],'type'=>$_GET['type']))}" >打 包 + 开启自动审核 diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 0c3222223..5e6dbd698 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -48,6 +48,14 @@ class QueryController extends BaseController $begTime = strtotime($initBegTime); $endTime = strtotime($initEndTime); $endTime += 3600 * 24; + + $payedBegTime = I("payed_begtime", ''); + if ($payedBegTime) $payedBegTime = strtotime($payedBegTime); + $payedEndTime = I("payed_endtime", ''); + if ($payedEndTime) { + $payedEndTime = strtotime($payedEndTime) + 3600 * 24; + } + $levelPromote = $this->getLevelPromote(); $queryPromote = $this->getQueryPromote($levelPromote); $loginPromote = $this->getLoginPromote(); @@ -100,6 +108,9 @@ class QueryController extends BaseController } } $map['tab_spend.spend_time'] = ['between', [$begTime, $endTime - 1]]; + if ($payedBegTime && $payedEndTime) { + $map['tab_spend.payed_time'] = ['between', [$payedBegTime, $payedEndTime - 1]]; + } $data = []; $count = 0; @@ -175,6 +186,7 @@ class QueryController extends BaseController break; } $list['user_account'] = substr($list['user_account'], 0, 2) . '******' . substr($list['user_account'], 8); + $list['spend_time'] = date('Y-m-d H:i:s', $list['spend_time']); $list['pay_time'] = ($list['pay_status'] == 1) ? date('Y-m-d H:i:s', $list['pay_time']) : '--'; $list['pay_status'] = isset(QueryController::$payStatus[$list['pay_status']]) ? QueryController::$payStatus[$list['pay_status']] : '未知状态'; $list['sdk_version'] = getSDKTypeName($list['sdk_version']); @@ -224,6 +236,8 @@ class QueryController extends BaseController $this->assign('income', $income); $this->assign('initBegTime', $initBegTime); $this->assign('initEndTime', $initEndTime); + $this->assign('payedBegTime', I("payed_begtime", '')); + $this->assign('payedEndTime', I("payed_endtime", '')); $this->assign('setdate', date("Y-m-d")); $this->assign('serverData', $serverData['data']); $this->assign('ownId', $ownId); diff --git a/Application/Home/View/default/Query/recharge.html b/Application/Home/View/default/Query/recharge.html index 476c2891e..c9805aafe 100644 --- a/Application/Home/View/default/Query/recharge.html +++ b/Application/Home/View/default/Query/recharge.html @@ -116,7 +116,7 @@
- +
@@ -125,6 +125,17 @@
+ +
+ +
+ +
+ +
+ +
+
部门长 组长 推广员 - 付款时间 + 下单时间 + 到账时间 @@ -216,6 +228,7 @@ {$vo.p_p_pro_account}({$vo.p_p_pro_real_name}/{$vo.p_p_pro_group_remark}) {$vo.p_pro_account}({$vo.p_pro_real_name}/{$vo.p_pro_group_remark}) {$vo.pro_account}({$vo.pro_real_name}) + {$vo.spend_time} {$vo.pay_time} @@ -292,6 +305,30 @@ scrollInput: false, endDate: date }); + + $('#payed_sdate').datetimepicker({ + format: 'yyyy-mm-dd', + language: "zh-CN", + minView: 2, + autoclose: true, + scrollMonth: false, + scrollTime: false, + scrollInput: false, + endDate: date + }); + + $('#payed_edate').datetimepicker({ + format: 'yyyy-mm-dd', + language: "zh-CN", + minView: 2, + autoclose: true, + pickerPosition: 'bottom-left', + scrollMonth: false, + scrollTime: false, + scrollInput: false, + endDate: date + }); + function showPromoteSelect(html) { @@ -373,13 +410,30 @@ var sdate = Date.parse($('#sdate').val()) / 1000; var edate = Date.parse($('#edate').val()) / 1000; if (sdate > edate) { - layer.msg('开始时间必须小于等于结束时间'); + layer.msg('下单开始时间必须小于等于结束时间'); return false; } if ((edate - sdate) > 2592000) { - layer.msg('时间间隔不能超过31天，请重新选择日期'); + layer.msg('下单时间间隔不能超过31天，请重新选择日期'); + return false; + } + + var payed_sdate = Date.parse($('#payed_sdate').val()) / 1000; + var payed_edate = Date.parse($('#payed_edate').val()) / 1000; + if (payed_sdate > payed_edate) { + layer.msg('到账开始时间必须小于等于结束时间'); return false; } + if ((payed_edate - payed_sdate) > 2592000) { + layer.msg('到账时间间隔不能超过31天，请重新选择日期'); + return false; + } + if (payed_sdate && !payed_edate) { + layer.msg('到账结束时间不能为空'); + } + if (!payed_sdate && payed_edate) { + layer.msg('到账开始时间不能为空'); + } var url = $(this).attr('url'); console.log(url);