From ae3e5d4048c6e9ea8192b1c4601f59e875cab303 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Sat, 21 Dec 2019 11:57:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E5=AF=BC=E5=87=BA=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinancePromoteController.class.php        | 35 +++++++++++++++----
 .../Admin/View/FinancePromote/index.html      |  2 +-
 .../View/FinancePromote/insideCoinDetail.html | 14 ++------
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php
index 96b8286b2..cf1892921 100644
--- a/Application/Admin/Controller/FinancePromoteController.class.php
+++ b/Application/Admin/Controller/FinancePromoteController.class.php
@@ -742,9 +742,14 @@ class FinancePromoteController extends AdminController
                 $admininside = M("provide_user p","tab_")
                 ->field("order_number,user_account,amount,balance,create_time")
                 ->join("left join tab_user as u on u.id  = p.user_id")
-                ->page($page, $row)
-                ->where($pmap)
-                ->select();
+                ->where($pmap);
+
+                if(isset($_REQUEST['export'])){
+                    $admininside =  $admininside->select();
+                }else {
+                    $admininside =  $admininside->page($page, $row)->select();
+                } 
+
                 foreach ($admininside as $k => $v) {
                     $temp = [
                         "sn"=>$v['order_number'],
@@ -777,9 +782,12 @@ class FinancePromoteController extends AdminController
                 $ininside = M("promote_coin s", "tab_")
                     ->field($field)
                     ->where($map)
-                    ->page($page, $row)
-                    ->join("tab_promote promote ON s.promote_id = promote.id", "left")
-                    ->select();
+                    ->join("tab_promote promote ON s.promote_id = promote.id", "left");
+                if(isset($_REQUEST['export'])){
+                    $ininside = $ininside->select();
+                }else {
+                    $ininside = $ininside->page($page, $row)->select();
+                } 
                 foreach ($ininside as $k => $v) {
                     $temp = [
                         "sn"=>$v['sn'],
@@ -796,6 +804,21 @@ class FinancePromoteController extends AdminController
             }
 
         }
+        //
+        if (isset($_REQUEST['export'])) {
+            $field = array(
+                "sn"=>"流水号",
+                "op_type"=>"操作类型",
+                "op_sty"=>"操作方式",
+                "account"=>"对手账号类型",
+                "op_num"=>"平台币数量",
+                "balance_coin"=>"平台币余额",
+                "mark"=>"交易说明",
+                "create_time"=>"交易时间"
+            );
+            data2csv($senddata,"平台币内充明细",$field);
+        }
+
         $this->assign('total_cost', $total_cost);
         $page = set_pagination($count,$row);
         if($page) {$this->assign('_page', $page);}
diff --git a/Application/Admin/View/FinancePromote/index.html b/Application/Admin/View/FinancePromote/index.html
index d0f77fcc0..e7145b49a 100644
--- a/Application/Admin/View/FinancePromote/index.html
+++ b/Application/Admin/View/FinancePromote/index.html
@@ -299,7 +299,7 @@
             $(".coin-detail").click(function () {
                 var pay_type = $(this).data('pay_type');
                 var url = $(this).data('url');
-                var title = pay_type == -1 ? '内充支出明细' : '平台币直充明细';
+                var title = pay_type == -1 ? '内充支出明细' :(pay_type == 0 ? '平台币直充明细': '平台币内充明细');
                 layer.open({
                     type: 2,
                     title: title,
diff --git a/Application/Admin/View/FinancePromote/insideCoinDetail.html b/Application/Admin/View/FinancePromote/insideCoinDetail.html
index 696a95dac..c18d705b1 100644
--- a/Application/Admin/View/FinancePromote/insideCoinDetail.html
+++ b/Application/Admin/View/FinancePromote/insideCoinDetail.html
@@ -46,18 +46,6 @@
             </div>
             <div class="input-list">
                 <a class="sch-btn" href="javascript:;" id="search" url="{:U('FinancePromote/insideCoinDetail','model='.$model['name'].'&row='.I('row'),false)}"style="">搜索</a>
-                <if condition="$_GET['all'] neq 1">
-                    <a class="sch-btn" href="{:U('Export/coinDetail',
-                  array(
-                  'game_id'=>$_GET['game_id'],
-                  'game_name'=>$_GET['game_name'],
-                  'pay_way'=>$_GET['pay_way'],
-                  'timestart'=>$_GET['timestart'],
-                  'timeend'=>$_GET['timeend'],
-                  'user_account'=>$_GET['user_account'],
-                  'pay_order_number'=>$_GET['pay_order_number'],
-                  false))}">导出</a>
-                </if>
             </div>
         </div>
     </div>
@@ -103,6 +91,8 @@
         </div>
     </div>
     <div class="page">
+        <a class="sch-btn"
+            href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}">导出</a>
         {$_page}
     </div>