From fd53997094b24c90ddfbbea4fcc42993f1c1dc71 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Sun, 17 Nov 2019 17:09:20 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0->?=
 =?UTF-8?q?=E5=85=85=E5=80=BC->=E5=B9=B3=E5=8F=B0=E5=B8=81=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95->=E5=B9=B3=E5=8F=B0=E5=B8=81=E5=9B=9E=E6=94=B6--?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/PromoteCoinController.class.php | 3 +++
 Application/Admin/View/PromoteCoin/deduct.html               | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/Application/Admin/Controller/PromoteCoinController.class.php b/Application/Admin/Controller/PromoteCoinController.class.php
index c0cc1bc28..a4dd37503 100644
--- a/Application/Admin/Controller/PromoteCoinController.class.php
+++ b/Application/Admin/Controller/PromoteCoinController.class.php
@@ -110,6 +110,9 @@ class PromoteCoinController extends ThinkController
 
     public function deduct()
     {
+        if (empty(I('user_id'))) {
+            $this->error('请输入正确的玩家账号');
+        }
         $this->m_title = '平台币收回';
         $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'PromoteCoin/deduct_lists', 'status' => 1])->find());
         $this->add(2, 'deduct_lists', $_REQUEST['typee'] ? $_REQUEST['typee'] : 1);
diff --git a/Application/Admin/View/PromoteCoin/deduct.html b/Application/Admin/View/PromoteCoin/deduct.html
index c25e4db67..7a039908e 100644
--- a/Application/Admin/View/PromoteCoin/deduct.html
+++ b/Application/Admin/View/PromoteCoin/deduct.html
@@ -161,6 +161,8 @@ $('#user_account').change(function () {
                 var msgElement = $('.user-account-msg');
                 msgElement.text(data.msg);
                 msgElement.show();
+                $('#user_id').val('');
+                $(".coin_yue2").val('0.00');
             }
         },
         error:function (result) {

From 5caf75afb9e152c0b409cf93c843e4e955ef6319 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Sun, 17 Nov 2019 17:11:09 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0->?=
 =?UTF-8?q?=E5=85=85=E5=80=BC->=E5=B9=B3=E5=8F=B0=E5=B8=81=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95->=E5=B9=B3=E5=8F=B0=E5=B8=81=E5=9B=9E=E6=94=B6--?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/PromoteCoinController.class.php        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/Controller/PromoteCoinController.class.php b/Application/Admin/Controller/PromoteCoinController.class.php
index a4dd37503..8bd39244f 100644
--- a/Application/Admin/Controller/PromoteCoinController.class.php
+++ b/Application/Admin/Controller/PromoteCoinController.class.php
@@ -110,9 +110,6 @@ class PromoteCoinController extends ThinkController
 
     public function deduct()
     {
-        if (empty(I('user_id'))) {
-            $this->error('请输入正确的玩家账号');
-        }
         $this->m_title = '平台币收回';
         $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'PromoteCoin/deduct_lists', 'status' => 1])->find());
         $this->add(2, 'deduct_lists', $_REQUEST['typee'] ? $_REQUEST['typee'] : 1);
@@ -137,6 +134,9 @@ class PromoteCoinController extends ThinkController
             }
             //平台币修改
             if ($tt == 1) {
+                if (empty(I('user_id'))) {
+                    $this->error('请输入正确的玩家账号');
+                }
                 $res = D('User')->edit_user_balance_coin(I('user_id'), abs(I('num')));
             } else {
                 $promoteService = new PromoteService();

From 39378b1926aa68c72ee896384cb80edf6013fb5b Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Sun, 17 Nov 2019 17:27:59 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?=
 =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E7=AE=A1=E7=90=86->=E6=8F=90=E7=8E=B0?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95--=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/Controller/FinanceController.class.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Application/Home/Controller/FinanceController.class.php b/Application/Home/Controller/FinanceController.class.php
index becfd41c7..c73f1a300 100644
--- a/Application/Home/Controller/FinanceController.class.php
+++ b/Application/Home/Controller/FinanceController.class.php
@@ -420,6 +420,9 @@ class FinanceController extends BaseController
                 $list['create_time'] = date('Y-m-d H:i:s', $list['create_time']);
                 $list['settlement_end_time'] = date('Y-m-d H:i:s', $list['settlement_end_time']);
                 $list['status_name'] = FinanceController::$withdrawStatus[$list['status']];
+                if ($list['status'] == -1) {
+                    $list['status_name'] = '<span style="color: red;">' . $list['status_name'] . '</span>';
+                }
             }
         }
 

From 662eb93763c523cc00cd0980f73fc49e3687b0c0 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Sun, 17 Nov 2019 17:41:58 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?=
 =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E7=AE=A1=E7=90=86--=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/View/default/Finance/settlementDtl.html  | 2 ++
 Application/Home/View/default/Finance/withdrawDtl.html    | 2 ++
 Application/Home/View/default/Finance/withdrawRecord.html | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/Application/Home/View/default/Finance/settlementDtl.html b/Application/Home/View/default/Finance/settlementDtl.html
index 974d96336..2cbb07ea2 100644
--- a/Application/Home/View/default/Finance/settlementDtl.html
+++ b/Application/Home/View/default/Finance/settlementDtl.html
@@ -204,6 +204,8 @@
 
   <script type="text/javascript">
       $().ready(function () {
+          setValue('row', '{:I("get.row",10)}');
+
           $("#pagehtml a").on("click", function (event) {
               event.preventDefault();//使a自带的方法失效，即无法调整到href中的URL(http://www.baidu.com)
               var geturl = $(this).attr('href');
diff --git a/Application/Home/View/default/Finance/withdrawDtl.html b/Application/Home/View/default/Finance/withdrawDtl.html
index 334ecd7e0..7b67dbfb3 100644
--- a/Application/Home/View/default/Finance/withdrawDtl.html
+++ b/Application/Home/View/default/Finance/withdrawDtl.html
@@ -211,6 +211,8 @@
 
   <script type="text/javascript">
       $().ready(function () {
+          setValue('row', '{:I("get.row",10)}');
+
           $('.back-btn').on('click', function () {
               location.href = "{:U('withdrawRecord')}";
           });
diff --git a/Application/Home/View/default/Finance/withdrawRecord.html b/Application/Home/View/default/Finance/withdrawRecord.html
index b0b9283eb..c1592188b 100644
--- a/Application/Home/View/default/Finance/withdrawRecord.html
+++ b/Application/Home/View/default/Finance/withdrawRecord.html
@@ -206,6 +206,8 @@
 
   <script type="text/javascript">
       $().ready(function () {
+          setValue('row', '{:I("get.row",10)}');
+
           var date = "{$setdate}";
           $('#sdate').datetimepicker({
               format: 'yyyy-mm-dd',