From dfd198e9b73bd55a18dc1f8a8194313c0503b4e0 Mon Sep 17 00:00:00 2001 From: liuweiwen <529520975@qq.com> Date: Mon, 10 Feb 2020 18:11:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AF=B9=E8=B4=A6=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A5=96=E7=BD=9A=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 4 ++-- Application/Admin/Controller/PublicController.class.php | 2 +- Application/Admin/View/VerifyBill/company_show.html | 2 +- Application/Admin/View/VerifyBill/partner_show.html | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index a5edb032a..8ebfc1ae6 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -1865,7 +1865,7 @@ function excelUpStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_all_ foreach ($data['statement_info'] as $key => $value) { $objPHPExcel->getActiveSheet()->insertNewRowBefore($line,1)->mergeCells("J$line:K$line"); $objPHPExcel->getActiveSheet()->setCellValue('C'.$line, $value['statement_begin_time'] . '-' . $value['statement_end_time']); - if ($value['statement_type'] == 1) {//罚款 + if ($value['statement_type'] > 0) {//罚款 $product_name = $value['type_name']; $objPHPExcel->getActiveSheet()->setCellValue('F'.$line , '-'); $objPHPExcel->getActiveSheet()->setCellValue('G'.$line, '-'); @@ -1950,7 +1950,7 @@ function excelDownStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_al $objPHPExcel->getActiveSheet()->removeConditionalStyles(); $objPHPExcel->getActiveSheet()->setCellValue('A'.$line, $value['statement_begin_time'] . '-' . $value['statement_end_time']); - if ($value['statement_type'] == 1) {//罚款 + if ($value['statement_type']>0) {//罚款 $product_name = $value['type_name']; $objPHPExcel->getActiveSheet()->setCellValue('D'.$line, '-'); $objPHPExcel->getActiveSheet()->setCellValue('E'.$line, '-'); diff --git a/Application/Admin/Controller/PublicController.class.php b/Application/Admin/Controller/PublicController.class.php index 7daf4f29a..7b210c0f2 100644 --- a/Application/Admin/Controller/PublicController.class.php +++ b/Application/Admin/Controller/PublicController.class.php @@ -346,7 +346,7 @@ class PublicController extends \Think\Controller public function telsafecode($phone = '', $delay = 10, $flag = true) { $taskClient = new TaskClient(); - $result = $taskClient->sendSmsCode($phone, get_client_ip()); + $result = $taskClient->sendSms($phone, get_client_ip()); $data = []; if ($result['code'] == TaskClient::SUCCESS) { $data['status'] = 1; diff --git a/Application/Admin/View/VerifyBill/company_show.html b/Application/Admin/View/VerifyBill/company_show.html index 995ba6c54..cafdcf067 100644 --- a/Application/Admin/View/VerifyBill/company_show.html +++ b/Application/Admin/View/VerifyBill/company_show.html @@ -104,7 +104,7 @@ - + - diff --git a/Application/Admin/View/VerifyBill/partner_show.html b/Application/Admin/View/VerifyBill/partner_show.html index 688ac0c83..c19d3007c 100644 --- a/Application/Admin/View/VerifyBill/partner_show.html +++ b/Application/Admin/View/VerifyBill/partner_show.html @@ -101,7 +101,7 @@ - + - @@ -113,6 +113,7 @@ - {$item.sum_money}元 + From 2cd5574de7488813b72a8079a71e34b1c434d936 Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Tue, 11 Feb 2020 10:28:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/PromoteController.class.php | 1 + Application/Admin/View/Promote/belong.html | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php index a0b36d08a..6aada89f3 100644 --- a/Application/Admin/Controller/PromoteController.class.php +++ b/Application/Admin/Controller/PromoteController.class.php @@ -1352,6 +1352,7 @@ class PromoteController extends ThinkController 'verify_status' => $verify_status, 'approver_id' => getAdmin(), 'approver_name' => getAdmin('username'), + 'verify_time' => time() ]); if (!is_null($res) ) { if ($verify_status == 1) {//审核通过才修改推广员的归属关系 diff --git a/Application/Admin/View/Promote/belong.html b/Application/Admin/View/Promote/belong.html index 9678510a2..7a0db395f 100644 --- a/Application/Admin/View/Promote/belong.html +++ b/Application/Admin/View/Promote/belong.html @@ -133,6 +133,7 @@ 工会类型 充值信息权限 申请时间 + 审核时间 备注 审核 申请人 @@ -243,6 +244,7 @@ {:set_show_time($data['applicant_time'])} + {:set_show_time($data['verify_time'])} {$data['remark']} From e9581a2e040e0f1751d1e2f2426dacad4252f736 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Tue, 11 Feb 2020 13:17:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0>?= =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98>=E7=BB=93=E7=AE=97=E7=AE=A1?= =?UTF-8?q?=E7=90=86>=E6=8E=A8=E5=B9=BF=E6=8F=90=E7=8E=B0--=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/QueryController.class.php | 6 +++--- Application/Admin/View/Query/withdraw.html | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Application/Admin/Controller/QueryController.class.php b/Application/Admin/Controller/QueryController.class.php index 4f558fbcf..259fccaa8 100644 --- a/Application/Admin/Controller/QueryController.class.php +++ b/Application/Admin/Controller/QueryController.class.php @@ -1224,10 +1224,10 @@ class QueryController extends ThinkController $save['audit_time'] = time(); $save['status'] = $status; $res = $withdraw->where($map)->save($save); - if ($res === false) { - $this->error('操作失败'); - } else { + if ($res) { $this->success('操作成功', U('withdraw')); + } else { + $this->error('操作失败'); } } diff --git a/Application/Admin/View/Query/withdraw.html b/Application/Admin/View/Query/withdraw.html index 9932b2f13..67937146e 100644 --- a/Application/Admin/View/Query/withdraw.html +++ b/Application/Admin/View/Query/withdraw.html @@ -170,11 +170,11 @@ - + - + - + {$data.widthdraw_number} {$data.sum_money}