管理后台--更新

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, '-');

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) {//审核通过才修改推广员的归属关系

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;

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) {
+        if ($res) {
-            $this->error('操作失败');
-        } else {
             $this->success('操作成功', U('withdraw'));
+        } else {
+            $this->error('操作失败');
         }
     }
 

Application/Admin/View/Promote/belong.html

@@ -133,6 +133,7 @@
                         <th>工会类型</th>
                         <th>充值信息权限</th>
                         <th>申请时间</th>
+                        <th>审核时间</th>
                         <th>备注</th>
                         <th>审核</th>
                         <th>申请人</th>
@@ -243,6 +244,7 @@
                                     <?php }?>
                                 </td>
                                 <td>{:set_show_time($data['applicant_time'])}</td>
+                                <td>{:set_show_time($data['verify_time'])}</td>
                                 <td>{$data['remark']}</td>
                                 <td>
                                     <?php if($data['verify_status'] == 0) {?>

Application/Admin/View/Query/withdraw.html

@@ -170,11 +170,11 @@
                         </php>
                         <tr>
                             <td>
-                                <eq name="data.status" value="0">
+                                <if condition="$data['status'] eq 0 or $data['status'] eq 1">
                                     <input class="ids" type="checkbox" value="{$data['id']}" name="ids[]">
-                                    <else />
+                                    <else/>
                                     <input class="ids disabled" disabled="disabled" type="checkbox" value="{$data['id']}" name="ids[]">
-                                </eq>
+                                </if>
                             </td>
                             <td>{$data.widthdraw_number}</td>
                             <td onclick="details('{$data["id"]}')"><span class="money_color">{$data.sum_money}</span></td>

Application/Admin/View/VerifyBill/company_show.html

@@ -104,7 +104,7 @@
             </if>
             <notemtpy name = "data">
                 <volist name="data.statement_info" id="item">
-                    <if condition="$item.statement_type eq 1">
+                    <if condition="$item.statement_type eq 1 or $item.statement_type eq 2">
 
                         <tr>
                             <td >-</td>

Application/Admin/View/VerifyBill/partner_show.html

@@ -101,7 +101,7 @@
             </if>
             <notemtpy name = "data">
                 <volist name="data.statement_info" id="item">
-                    <if condition="$item.statement_type eq 1">
+                    <if condition="$item.statement_type eq 1 or $item.statement_type eq 2">
 
                         <tr>
                             <td >-</td>
@@ -113,6 +113,7 @@
                             <td >-</td>
                             <td >{$item.sum_money}元</td>
                         </tr>
+                        
 
                         <else/>