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}元 +