From e9ffc0af799bdbdbc4bd429ca4a39a6edde4a19f Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Tue, 31 Dec 2019 17:10:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=B8=81=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A8=E5=B9=BF=E5=91=98=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=8E=A9=E5=AE=B6?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=97=B6=E9=97=B4=E6=A3=80=E7=B4=A2=E9=9D=9E?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/DepositController.class.php | 1 +
 Application/Admin/Controller/ExportController.class.php  | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/DepositController.class.php b/Application/Admin/Controller/DepositController.class.php
index 49dfcea2f..bd1c1aa67 100644
--- a/Application/Admin/Controller/DepositController.class.php
+++ b/Application/Admin/Controller/DepositController.class.php
@@ -250,6 +250,7 @@ class DepositController extends ThinkController {
         $page = set_pagination($count,$row);
         if($page) {$this->assign('_page', $page);}
 
+        $this->assign("is_admin",is_administrator());
         $this->assign('list_data', $data);
         $this->meta_title = '平台币充值列表';
         $this->display();die();
diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index d7c753ab6..ada850d40 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -2278,7 +2278,7 @@ class ExportController extends Controller
                         array('pay_order_number', "订单号"),
                         array('promote_account', L('Subordinate_channel')),
                         array('pay_amount', "充值平台币"),
-                        array('pay_way', "充值方式", 'get_pay_way', '*'),
+                        array('pay_way', "充值方式"),
                         array('create_time', "充值时间"),
                         array('pay_status', L('Order_status'), 'get_info_status', '*', '9'),
                         array('', "共计充值{$total}"),
@@ -2295,6 +2295,11 @@ class ExportController extends Controller
 //                    var_dump($xlsData);die();
                     foreach ($xlsData as $key => $value) {
                         $xlsData[$key]['create_time'] = date('Y-m-d H:i:s', $value['create_time']);
+                        if(!$xlsData[$key]['pay_way']) {
+                            $xlsData[$key]['pay_way'] = '无';
+                        } else {
+                            $xlsData[$key]['pay_way'] = get_pay_way($xlsData[$key]['pay_way'],'*');
+                        }
                     }
 
 //                dd($xlsData);