From a7891d6b575416f710c459eecf5858093195fc88 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Thu, 6 Feb 2020 17:57:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0>=E6=8E=A8?=
 =?UTF-8?q?=E5=B9=BF=E5=91=98>=E7=BB=93=E7=AE=97=E7=AE=A1=E7=90=86>?=
 =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E6=8F=90=E7=8E=B0--=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/QueryController.class.php   | 16 +++++++++++-----
 Application/Admin/View/Query/settlement.html     |  4 +---
 Application/Admin/View/Query/withdraw.html       |  3 ++-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Application/Admin/Controller/QueryController.class.php b/Application/Admin/Controller/QueryController.class.php
index a28fb5f2e..544d7eb71 100644
--- a/Application/Admin/Controller/QueryController.class.php
+++ b/Application/Admin/Controller/QueryController.class.php
@@ -1194,11 +1194,10 @@ class QueryController extends ThinkController
         $this->ajaxReturn(['msg' => $msg]);
     }
 
-    public function set_withdraw_status()
+    public function set_withdraw_status($status = 1)
     {
         $withdraw = M('withdraw', "tab_");
         $ids = I('ids', 0);
-        $status = 1;
         if (empty($ids)) {
             $this->error('参数异常');
         }
@@ -1207,14 +1206,21 @@ class QueryController extends ThinkController
         } else {
             $map['id'] = $ids;
         }
-        $map['status'] = 0;
+        switch ($status) {
+            case 1:
+                $map['status'] = 0;
+                break;
+            case 2:
+                $map['status'] = 1;
+                break;
+        }
         $save['audit_time'] = time();
         $save['status'] = $status;
         $res = $withdraw->where($map)->save($save);
         if ($res === false) {
-            $this->error('审核失败');
+            $this->error('操作失败');
         } else {
-            $this->success('审核成功', U('withdraw'));
+            $this->success('操作成功', U('withdraw'));
         }
     }
 
diff --git a/Application/Admin/View/Query/settlement.html b/Application/Admin/View/Query/settlement.html
index 4f1e6ad94..74123ec83 100644
--- a/Application/Admin/View/Query/settlement.html
+++ b/Application/Admin/View/Query/settlement.html
@@ -219,9 +219,7 @@
                           <td>{$record.status_text}</td>
                           <td>{$record.respond}</td>
                           <td>
-                            <if condition="$record['status'] eq 2">
-                              <a href="{:U('downloadProve', ['id'=>$record['id']])}">汇款证明</a>
-                              <elseif condition="$record['status'] eq -1"/>
+                            <if condition="$record['status'] eq -1">
                               <span class="renew-review" data-id="{$record['id']}" style="color: #0bb20c;cursor: pointer;">重新审核</span>
                             </if>
                             <if condition="$record['status'] eq -1 or $record['status'] eq 0">
diff --git a/Application/Admin/View/Query/withdraw.html b/Application/Admin/View/Query/withdraw.html
index afb677218..2946f9515 100644
--- a/Application/Admin/View/Query/withdraw.html
+++ b/Application/Admin/View/Query/withdraw.html
@@ -59,6 +59,7 @@
                     <a class="ajax-post" target-form="ids" url="{:U('set_withdraw_status')}"><span class="button_icon button_icon12"></span>通 过</a>
                     <a class="agree" data-id="ids"><span class="button_icon button_icon13"></span>驳 回</a>
                     <a href="{:U('autoReview')}"><span class="button_icon button_icon9 "></span>自动审核管理</a>
+                    <a class="ajax-post" target-form="ids" url="{:U('set_withdraw_status', array('status' => 2))}" style="border: 1px solid #3C95C8;background-color: #3C95C8;background-image: initial"><span style="margin-left: 10px;float: initial;color: #fff;">确认汇款</span></a>
                 </div>
             </div>
         </empty>
@@ -187,7 +188,7 @@
                                         <a class="ajax-get" url="{:U('set_withdraw_status',array('ids'=>$data['id']))}">通过</a>
                                         <a class="agree" data-id="{$data['id']}">驳回</a>
                                         <elseif condition="$data.status eq 1"/>
-                                        <a class="upload-transfer-proof" data-id="{$data['id']}">上传汇款证明</a>
+                                        <a class="ajax-get" url="{:U('set_withdraw_status',array('ids'=>$data['id'], 'status' => 2))}">确认汇款</a>
                                     </if>
                                 </div>
                             </td>