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);