From 0a9e7ed3efd30f71b5fafb44bae4f4574da89a4c Mon Sep 17 00:00:00 2001
From: yulingwei <2436953959@qq.com>
Date: Mon, 20 Jul 2020 19:59:54 +0800
Subject: [PATCH] upt

---
 .../Controller/PresidentDepositController.class.php   | 11 ++++++-----
 Application/Admin/View/PresidentDeposit/records.html  |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Application/Admin/Controller/PresidentDepositController.class.php b/Application/Admin/Controller/PresidentDepositController.class.php
index 1a064944f..2cb522999 100644
--- a/Application/Admin/Controller/PresidentDepositController.class.php
+++ b/Application/Admin/Controller/PresidentDepositController.class.php
@@ -482,17 +482,17 @@ class PresidentDepositController extends ThinkController
         $data['pay_account'] = '';
         $data['amount'] = 0;
         $data['payer'] = '';
+        $data['status'] = 1;
         $data['pay_confirm_time'] = time();
         $data['create_time'] = time();
         $data['update_time'] = time();
         $data['status'] = 1;
+        $data['pay_accept_time'] = $data['refund_time'] = 0;
+        
         if (!$record) {
-            $data['pay_accept_time'] = time();
-            $data['promote_id'] = $promoteId;
             M('president_deposit', 'tab_')->add($data);
         } else {
-            $data['pay_accept_time'] = strtotime(I('pay_accept_time', 0));
-            $data['refund_time'] = strtotime(I('refund_time', 0));
+            $data['promote_id'] = $promoteId;
             M('president_deposit', 'tab_')->where(['promote_id' => $promoteId])->save($data);
         }
         
@@ -556,7 +556,8 @@ class PresidentDepositController extends ThinkController
         M('president_deposit', 'tab_')->where(['promote_id' => ['in', $promoteIds]])->save([
             'status' => 2,
             'refund_time' => time(),
-            'update_time' => time()
+            'update_time' => time(),
+            'pay_accept_time' => 0
         ]);
         $this->ajaxReturn([
             'status' => 1,
diff --git a/Application/Admin/View/PresidentDeposit/records.html b/Application/Admin/View/PresidentDeposit/records.html
index 5a4d4c201..52b5c5288 100644
--- a/Application/Admin/View/PresidentDeposit/records.html
+++ b/Application/Admin/View/PresidentDeposit/records.html
@@ -272,7 +272,7 @@
                 
                 $("#pagechange").prepend("<option value='all' selected>全部</option>");
             } else {
-                $("#pagechange").append("<option value='all'>全部</option>");
+                $("#pagechange").prepend("<option value='all'>全部</option>");
             }
 
             $('.time-select').each(function(){